8d926ab800
【主 题】： 【描 述】： [原因]： [过程]： [影响]： 【结 束】 # 类型 包含: # feat：新功能（feature） # fix：修补bug # docs：文档（documentation） # style： 格式（不影响代码运行的变动） # refactor：重构（即不是新增功能，也不是修改bug的代码变动） # test：增加测试 # chore：构建过程或辅助工具的变动 Merge branch 'master' of http://111.229.174.37:9090/Bonobo.Git.Server/food_wechat # Conflicts: # unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/components/cart/cart.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/components/cartFold/cartFold.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/components/listItem/listItem.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/components/mainBut/mainBut.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u--image/u--image.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u--text/u--text.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-avatar/u-avatar.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-badge/u-badge.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-divider/u-divider.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-empty/u-empty.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-image/u-image.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-line/u-line.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-link/u-link.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-modal/u-modal.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-navbar/u-navbar.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-number-box/u-number-box.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-parse/node/node.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-parse/u-parse.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-popup/u-popup.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-read-more/u-read-more.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-status-bar/u-status-bar.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-swiper/u-swiper.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-tabbar-item/u-tabbar-item.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-tabbar/u-tabbar.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-text/u-text.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/demo.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/pages/main/getTel.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/pages/main/index.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/content.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/list.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/order.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/pay.js.map # unpackage/dist/dev/mp-weixin/common/vendor.js |
||
|---|---|---|
| .. | ||
| common | ||
| components | ||
| node-modules/uview-ui/components | ||
| pages | ||