Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghsApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/admin/home/components/module/operate.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/admin/shop/add.wxss

@@ -1 +1 @@
-.app-content.data-v-6e0f6027{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-6e0f6027{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-6e0f6027{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-6e0f6027{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-6e0f6027{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-6e0f6027{height:240rpx}.confirm-btn.data-v-6e0f6027{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-6e0f6027{width:100%}
+.app-content.data-v-2f7b0e20{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-2f7b0e20{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-2f7b0e20{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-2f7b0e20{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-2f7b0e20{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-2f7b0e20{height:240rpx}.confirm-btn.data-v-2f7b0e20{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-2f7b0e20{width:100%}

ghsApp/dist/build/mp-weixin/components/app-img.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/app-swiper.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/app-swiper"],{"150c":function(t,n,e){"use strict";e.r(n);var u=e("89d2"),i=e("26d5");for(var a in i)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(a);e("b56c");var r,o=e("0095"),c=Object(o["a"])(i["default"],u["b"],u["c"],!1,null,"5fab5b2a",null,!1,u["a"],r);n["default"]=c.exports},"26d5":function(t,n,e){"use strict";e.r(n);var u=e("f978"),i=e.n(u);for(var a in u)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(a);n["default"]=i.a},"89d2":function(t,n,e){"use strict";var u;e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){return u}));var i=function(){var t=this,n=t.$createElement;t._self._c},a=[]},a881:function(t,n,e){},b56c:function(t,n,e){"use strict";var u=e("a881"),i=e.n(u);i.a},f978:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u=function(){e.e("components/module/app-tag").then(function(){return resolve(e("1a62"))}.bind(null,e)).catch(e.oe)},i={name:"app-swiper",components:{AppTag:u},props:{list:{type:Array,default:function(){return[]}},tagShow:{type:Boolean,default:!1},autoplay:{type:Boolean,default:!0},width:{type:Object,default:function(){return{type:"string",val:"100%"}}},height:{type:Object,default:function(){return{type:"number",val:480}}}},data:function(){return{index:0}},computed:{widthFn:function(){return"number"==this.width.type?t.upx2px(this.width.val)+"px":this.width.val},heightFn:function(){return"number"==this.height.type?t.upx2px(this.height.val)+"px":this.height.val}},methods:{bannerChange:function(t){this.index=t.detail.current},detail:function(t){this.$emit("detail",t)}}};n.default=i}).call(this,e("f3be")["default"])}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/app-swiper"],{"150c":function(t,n,e){"use strict";e.r(n);var u=e("d5e8"),i=e("26d5");for(var a in i)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(a);e("9444");var r,o=e("0095"),c=Object(o["a"])(i["default"],u["b"],u["c"],!1,null,"93d0fdca",null,!1,u["a"],r);n["default"]=c.exports},"26d5":function(t,n,e){"use strict";e.r(n);var u=e("f978"),i=e.n(u);for(var a in u)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(a);n["default"]=i.a},9444:function(t,n,e){"use strict";var u=e("db71"),i=e.n(u);i.a},d5e8:function(t,n,e){"use strict";var u;e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){return u}));var i=function(){var t=this,n=t.$createElement;t._self._c},a=[]},db71:function(t,n,e){},f978:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u=function(){e.e("components/module/app-tag").then(function(){return resolve(e("1a62"))}.bind(null,e)).catch(e.oe)},i={name:"app-swiper",components:{AppTag:u},props:{list:{type:Array,default:function(){return[]}},tagShow:{type:Boolean,default:!1},autoplay:{type:Boolean,default:!0},width:{type:Object,default:function(){return{type:"string",val:"100%"}}},height:{type:Object,default:function(){return{type:"number",val:480}}}},data:function(){return{index:0}},computed:{widthFn:function(){return"number"==this.width.type?t.upx2px(this.width.val)+"px":this.width.val},heightFn:function(){return"number"==this.height.type?t.upx2px(this.height.val)+"px":this.height.val}},methods:{bannerChange:function(t){this.index=t.detail.current},detail:function(t){this.$emit("detail",t)}}};n.default=i}).call(this,e("f3be")["default"])}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/app-swiper-create-component',
     {

ghsApp/dist/build/mp-weixin/components/app-swiper.wxml

@@ -1 +1 @@
-<view class="swiper-wrap _div data-v-5fab5b2a" style="{{'width:'+(widthFn)+';'+('height:'+(heightFn)+';')}}"><swiper class="tui-banner-swiper data-v-5fab5b2a" indicator-dots="{{!tagShow}}" autoplay="{{autoplay}}" interval="{{5000}}" duration="{{150}}" circular="{{true}}" indicator-color="#969696" indicator-active-color="#F04545" data-event-opts="{{[['change',[['bannerChange',['$event']]]]]}}" bindchange="__e"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><swiper-item data-event-opts="{{[['tap',[['detail',['$event']]]]]}}" catchtap="__e" class="data-v-5fab5b2a"><image class="tui-slide-image _img data-v-5fab5b2a" src="{{item.img}}" mode="scaleToFill"></image></swiper-item></block></swiper><block wx:if="{{tagShow}}"><app-tag class="swiper-tag data-v-5fab5b2a" vue-id="4a80c472-1" type="translucent" shape="circleLeft" size="small" bind:__l="__l" vue-slots="{{['default']}}">{{index+1+"/"+list.length}}</app-tag></block></view>
+<view class="swiper-wrap _div data-v-93d0fdca" style="{{'width:'+(widthFn)+';'+('height:'+(heightFn)+';')}}"><swiper class="tui-banner-swiper data-v-93d0fdca" indicator-dots="{{!tagShow}}" autoplay="{{autoplay}}" interval="{{5000}}" duration="{{150}}" circular="{{true}}" indicator-color="#969696" indicator-active-color="#3387ff" data-event-opts="{{[['change',[['bannerChange',['$event']]]]]}}" bindchange="__e"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><swiper-item data-event-opts="{{[['tap',[['detail',['$event']]]]]}}" catchtap="__e" class="data-v-93d0fdca"><image class="tui-slide-image _img data-v-93d0fdca" src="{{item.img}}" mode="scaleToFill"></image><view class="info data-v-93d0fdca">2312</view></swiper-item></block></swiper><block wx:if="{{tagShow}}"><app-tag class="swiper-tag data-v-93d0fdca" vue-id="4a80c472-1" type="translucent" shape="circleLeft" size="small" bind:__l="__l" vue-slots="{{['default']}}">{{index+1+"/"+list.length}}</app-tag></block></view>

ghsApp/dist/build/mp-weixin/components/app-swiper.wxss

@@ -1 +1 @@
-.swiper-wrap.data-v-5fab5b2a{position:relative;height:480rpx}.swiper-wrap .tui-banner-swiper.data-v-5fab5b2a{height:100%}.swiper-wrap .tui-slide-image.data-v-5fab5b2a{width:100%;height:100%}
+.swiper-wrap.data-v-93d0fdca{position:relative;height:480rpx;margin:0 auto;border-radius:20rpx;overflow:hidden}.swiper-wrap .tui-banner-swiper.data-v-93d0fdca{height:100%}.swiper-wrap .tui-slide-image.data-v-93d0fdca{width:100%;height:100%}.swiper-wrap .info.data-v-93d0fdca{position:absolute;bottom:0;left:0;width:100%;height:88rpx;line-height:88rpx;text-align:center;font-size:32rpx;color:#fff;background:rgba(0,0,0,.6)}

ghsApp/dist/build/mp-weixin/components/app-uploader.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/module/app-footer-cart.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/module/app-footer-cart"],{"249a":function(t,e,n){"use strict";n.r(e);var r=n("d558"),u=n.n(r);for(var a in r)["default"].indexOf(a)<0&&function(t){n.d(e,t,(function(){return r[t]}))}(a);e["default"]=u.a},3758:function(t,e,n){},3854:function(t,e,n){"use strict";var r;n.d(e,"b",(function(){return u})),n.d(e,"c",(function(){return a})),n.d(e,"a",(function(){return r}));var u=function(){var t=this,e=t.$createElement;t._self._c},a=[]},"3ee4":function(t,e,n){"use strict";var r=n("3758"),u=n.n(r);u.a},a9f2:function(t,e,n){"use strict";n.r(e);var r=n("3854"),u=n("249a");for(var a in u)["default"].indexOf(a)<0&&function(t){n.d(e,t,(function(){return u[t]}))}(a);n("3ee4");var o,c=n("0095"),f=Object(c["a"])(u["default"],r["b"],r["c"],!1,null,"3e519366",null,!1,r["a"],o);e["default"]=f.exports},d558:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={name:"FooterCart",props:{price:{type:Number,default:0},count:{type:Number,default:0}},methods:{confirmEvent:function(){this.$emit("confirm")}}};e.default=r}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/module/app-footer-cart"],{"249a":function(t,n,e){"use strict";e.r(n);var r=e("d558"),u=e.n(r);for(var a in r)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return r[t]}))}(a);n["default"]=u.a},"2e63":function(t,n,e){"use strict";var r;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){return r}));var u=function(){var t=this,n=t.$createElement;t._self._c},a=[]},"3fab":function(t,n,e){},a9f2:function(t,n,e){"use strict";e.r(n);var r=e("2e63"),u=e("249a");for(var a in u)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(a);e("f795");var f,o=e("0095"),c=Object(o["a"])(u["default"],r["b"],r["c"],!1,null,"6117eadb",null,!1,r["a"],f);n["default"]=c.exports},d558:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={name:"FooterCart",props:{price:{type:Number,default:0},count:{type:Object,default:{}}},methods:{confirmEvent:function(){this.$emit("confirm")}}};n.default=r},f795:function(t,n,e){"use strict";var r=e("3fab"),u=e.n(r);u.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/module/app-footer-cart-create-component',
     {

ghsApp/dist/build/mp-weixin/components/module/app-footer-cart.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/module/app-footer-cart.wxml

@@ -1 +1 @@
-<view class="cart-ft_bx _div data-v-3e519366"><view class="cart-ct_bx _div data-v-3e519366"><view class="cart-lf_bx data-v-3e519366"><view class="cart-dot_bx data-v-3e519366"><view class="iconfont icongouwuche _i data-v-3e519366"></view><block wx:if="{{count>0}}"><text class="count data-v-3e519366">{{''+count+''}}</text></block></view><view class="price data-v-3e519366">{{'￥'+price+''}}</view></view><view data-event-opts="{{[['tap',[['confirmEvent',['$event']]]]]}}" class="cart-rg_bx data-v-3e519366" bindtap="__e">选好了</view></view></view>
+<view class="cart-ft_bx _div data-v-6117eadb"><view class="cart-ct_bx _div data-v-6117eadb"><view class="cart-lf_bx data-v-6117eadb"><view class="cart-dot_bx data-v-6117eadb"><view class="iconfont icongouwuche _i data-v-6117eadb"></view><block wx:if="{{count.bigLength>0||count.smallLength>0}}"><view class="count data-v-6117eadb">{{''+count.bigLength}}<block wx:if="{{count.smallLength>0}}"><text class="data-v-6117eadb">{{"/"+count.smallLength}}</text></block></view></block></view><view class="price data-v-6117eadb">{{'￥'+price+''}}</view></view><view data-event-opts="{{[['tap',[['confirmEvent',['$event']]]]]}}" class="cart-rg_bx data-v-6117eadb" bindtap="__e">选好了</view></view></view>

ghsApp/dist/build/mp-weixin/components/module/app-footer-cart.wxss

@@ -1 +1 @@
-.cart-ft_bx.data-v-3e519366{width:702rpx;height:88rpx;background-color:#444;position:fixed;bottom:15rpx;border-radius:50rpx;left:50%;-webkit-transform:translate(-50%);transform:translate(-50%);z-index:200;overflow:hidden}.cart-ft_bx .cart-ct_bx.data-v-3e519366{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;height:100%}.cart-ft_bx .cart-ct_bx .cart-lf_bx.data-v-3e519366{-webkit-box-flex:1;-webkit-flex:1;flex:1;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.cart-ft_bx .cart-ct_bx .cart-lf_bx .cart-dot_bx.data-v-3e519366{position:relative;width:72rpx;height:72rpx;border-radius:50%;background-color:#3385ff;text-align:center;line-height:72rpx;margin-left:6rpx}.cart-ft_bx .cart-ct_bx .cart-lf_bx .cart-dot_bx .iconfont.data-v-3e519366{font-size:40rpx;color:#fff}.cart-ft_bx .cart-ct_bx .cart-lf_bx .cart-dot_bx .count.data-v-3e519366{position:absolute;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;-webkit-box-align:center;-webkit-align-items:center;align-items:center;height:30rpx;padding:0 10rpx;right:0;top:0;-webkit-transform:translateX(50%);transform:translateX(50%);color:#fff;background-color:red;border-radius:10rpx;font-size:24rpx}.cart-ft_bx .cart-ct_bx .cart-lf_bx .price.data-v-3e519366{font-weight:500;color:#fff;font-size:36rpx;padding-left:24rpx}.cart-ft_bx .cart-ct_bx .cart-rg_bx.data-v-3e519366{height:100%;width:200rpx;text-align:center;font-size:28rpx;color:#fff;background-color:#3385ff;line-height:88rpx}
+.cart-ft_bx.data-v-6117eadb{width:702rpx;height:88rpx;background-color:#444;position:fixed;bottom:15rpx;border-radius:50rpx;left:50%;-webkit-transform:translate(-50%);transform:translate(-50%);z-index:200;overflow:hidden}.cart-ft_bx .cart-ct_bx.data-v-6117eadb{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;height:100%}.cart-ft_bx .cart-ct_bx .cart-lf_bx.data-v-6117eadb{-webkit-box-flex:1;-webkit-flex:1;flex:1;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.cart-ft_bx .cart-ct_bx .cart-lf_bx .cart-dot_bx.data-v-6117eadb{position:relative;width:72rpx;height:72rpx;border-radius:50%;background-color:#3385ff;text-align:center;line-height:72rpx;margin-left:6rpx}.cart-ft_bx .cart-ct_bx .cart-lf_bx .cart-dot_bx .iconfont.data-v-6117eadb{font-size:40rpx;color:#fff}.cart-ft_bx .cart-ct_bx .cart-lf_bx .cart-dot_bx .count.data-v-6117eadb{position:absolute;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;-webkit-box-align:center;-webkit-align-items:center;align-items:center;height:30rpx;padding:0 10rpx;right:0;top:0;-webkit-transform:translateX(50%);transform:translateX(50%);color:#fff;background-color:red;border-radius:10rpx;font-size:24rpx}.cart-ft_bx .cart-ct_bx .cart-lf_bx .price.data-v-6117eadb{font-weight:500;color:#fff;font-size:36rpx;padding-left:24rpx}.cart-ft_bx .cart-ct_bx .cart-rg_bx.data-v-6117eadb{height:100%;width:200rpx;text-align:center;font-size:28rpx;color:#fff;background-color:#3385ff;line-height:88rpx}

ghsApp/dist/build/mp-weixin/components/module/app-search.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/module/app-share-mask.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/module/app-vip.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/module/dorpdownSelect.wxml

@@ -1 +1 @@
-<view class="select-bg_bx data-v-5a5d25bd"><block wx:if="{{isShowTit}}"><view data-event-opts="{{[['tap',[['switchCut',['$event']]]]]}}" class="{{['data-v-5a5d25bd','select-title',dropdownShow?'select_corlor':'']}}" bindtap="__e">{{''+(menuObjActive?menuObjActive:menuObj.title)+''}}<block wx:if="{{isShowMore}}"><view class="iconfont iconsanjiao_xia _i data-v-5a5d25bd"></view></block></view></block><view data-event-opts="{{[['tap',[['switchCut',['$event']]]]]}}" hidden="{{!(dropdownShow)}}" class="select-mark-view data-v-5a5d25bd" bindtap="__e"></view><block wx:if="{{dropdownShow}}"><view class="select-fixed_bx data-v-5a5d25bd" style="{{'top:'+(top)+';'}}"><block wx:if="{{$slots.default}}"><slot></slot></block><block wx:else><view class="select-item-box data-v-5a5d25bd"><view class="title data-v-5a5d25bd">{{menuObj.titleChild}}</view><view class="item-child_box data-v-5a5d25bd"><block wx:for="{{menuObj.list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><button data-event-opts="{{[['tap',[['changeItem',['$0'],[[['menuObj.list','',index]]]]]]]}}" class="{{['data-v-5a5d25bd','admin-button-com','mini-btn',selectItemId===item.id?'blue':'default']}}" bindtap="__e">{{''+item.name+''}}</button></block></view></view><block wx:if="{{typeSelect===1}}"><view class="select-item-box data-v-5a5d25bd"><view class="title data-v-5a5d25bd">其他时间选择</view><view class="item-child_box data-v-5a5d25bd"><view data-event-opts="{{[['tap',[['changeItem',[['o',['name','自定义'],['id','custom']]]]]]]}}" class="admin-button-com mini-btn default custom data-v-5a5d25bd" bindtap="__e">自定义</view></view></view></block></block></view></block></view>
+<view class="select-bg_bx data-v-17e967a1"><block wx:if="{{isShowTit}}"><view data-event-opts="{{[['tap',[['switchCut',['$event']]]]]}}" class="{{['data-v-17e967a1','select-title',dropdownShow?'select_corlor':'']}}" bindtap="__e">{{''+(menuObjActive?menuObjActive:getMyShopInfo.shopName)+''}}<block wx:if="{{isShowMore}}"><view class="iconfont iconsanjiao_xia _i data-v-17e967a1"></view></block></view></block><view data-event-opts="{{[['tap',[['switchCut',['$event']]]]]}}" hidden="{{!(dropdownShow)}}" class="select-mark-view data-v-17e967a1" bindtap="__e"></view><block wx:if="{{dropdownShow}}"><view class="select-fixed_bx data-v-17e967a1" style="{{'top:'+(top)+';'}}"><block wx:if="{{$slots.default}}"><slot></slot></block><block wx:else><view class="select-item-box data-v-17e967a1"><view class="title data-v-17e967a1">{{menuObj.titleChild}}</view><view class="item-child_box data-v-17e967a1"><block wx:for="{{menuObj.list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><button data-event-opts="{{[['tap',[['changeItem',['$0'],[[['menuObj.list','',index]]]]]]]}}" class="{{['data-v-17e967a1','admin-button-com','mini-btn',selectItemId===item.id?'blue':'default']}}" bindtap="__e">{{''+item.name+''}}</button></block></view></view><block wx:if="{{typeSelect===1}}"><view class="select-item-box data-v-17e967a1"><view class="title data-v-17e967a1">其他时间选择</view><view class="item-child_box data-v-17e967a1"><view data-event-opts="{{[['tap',[['changeItem',[['o',['name','自定义'],['id','custom']]]]]]]}}" class="admin-button-com mini-btn default custom data-v-17e967a1" bindtap="__e">自定义</view></view></view></block></block></view></block></view>

ghsApp/dist/build/mp-weixin/components/module/dorpdownSelect.wxss

@@ -1 +1 @@
-.select-bg_bx .select-title.data-v-5a5d25bd{color:#666;font-size:26rpx}.select-bg_bx .select-title .iconsanjiao_xia.data-v-5a5d25bd{margin-left:10rpx}.select-bg_bx .select-title.select_corlor.data-v-5a5d25bd{color:#3385ff}.select-bg_bx .select-title.select_corlor .iconsanjiao_xia.data-v-5a5d25bd{-webkit-transform:rotate(180deg);transform:rotate(180deg)}.select-bg_bx .select-mark-view.data-v-5a5d25bd{height:100vh;height:100%;position:fixed;width:100%;background-color:rgba(0,0,0,.5);left:0;top:0rpx;z-index:900}.select-bg_bx .select-fixed_bx.data-v-5a5d25bd{position:fixed;width:100%;background-color:#fff;left:0;z-index:999;padding:120rpx 30rpx 40rpx;border-radius:0rpx 0rpx 20rpx 20rpx;-webkit-transition:all .5s ease-in-out;transition:all .5s ease-in-out}.select-bg_bx .select-fixed_bx .select-item-box .title.data-v-5a5d25bd{font-size:24rpx;color:#333;font-weight:600;text-align:left}.select-bg_bx .select-fixed_bx .select-item-box .item-child_box.data-v-5a5d25bd{display:-webkit-box;display:-webkit-flex;display:flex;padding:20rpx 0 20rpx;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-flex-flow:wrap;flex-flow:wrap;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.select-bg_bx .select-fixed_bx .select-item-box .item-child_box .admin-button-com.data-v-5a5d25bd{margin-bottom:20rpx;padding:18rpx 50rpx}.select-bg_bx .select-fixed_bx .select-item-box .item-child_box .admin-button-com.custom.data-v-5a5d25bd{width:100%}
+.select-bg_bx .select-title.data-v-17e967a1{color:#666;font-size:26rpx}.select-bg_bx .select-title .iconsanjiao_xia.data-v-17e967a1{margin-left:10rpx}.select-bg_bx .select-title.select_corlor.data-v-17e967a1{color:#3385ff}.select-bg_bx .select-title.select_corlor .iconsanjiao_xia.data-v-17e967a1{-webkit-transform:rotate(180deg);transform:rotate(180deg)}.select-bg_bx .select-mark-view.data-v-17e967a1{height:100vh;height:100%;position:fixed;width:100%;background-color:rgba(0,0,0,.5);left:0;top:0rpx;z-index:900}.select-bg_bx .select-fixed_bx.data-v-17e967a1{position:fixed;width:100%;background-color:#fff;left:0;z-index:999;padding:120rpx 30rpx 40rpx;border-radius:0rpx 0rpx 20rpx 20rpx;-webkit-transition:all .5s ease-in-out;transition:all .5s ease-in-out}.select-bg_bx .select-fixed_bx .select-item-box .title.data-v-17e967a1{font-size:24rpx;color:#333;font-weight:600;text-align:left}.select-bg_bx .select-fixed_bx .select-item-box .item-child_box.data-v-17e967a1{display:-webkit-box;display:-webkit-flex;display:flex;padding:20rpx 0 20rpx;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-flex-flow:wrap;flex-flow:wrap;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.select-bg_bx .select-fixed_bx .select-item-box .item-child_box .admin-button-com.data-v-17e967a1{margin-bottom:20rpx;padding:18rpx 50rpx}.select-bg_bx .select-fixed_bx .select-item-box .item-child_box .admin-button-com.custom.data-v-17e967a1{width:100%}

ghsApp/dist/build/mp-weixin/components/plugin/bottom-popup.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/plugin/modal.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/plugin/selectList.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/plugin/simple-address.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/w-picker/date-picker.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/w-picker/half-picker.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/w-picker/linkage-picker.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/w-picker/range-picker.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/w-picker/region-picker.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/w-picker/selector-picker.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/w-picker/shortterm-picker.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/w-picker/time-picker.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/pagesArrears/detailsItem.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/pagesClient/official/apply.wxss

@@ -1 +1 @@
-.module-com.data-v-2485f983{margin-bottom:20rpx;background-color:#fff}.module-com .module-tit.data-v-2485f983{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.module-com .module-det.data-v-2485f983{padding:0 30rpx}.line-cell .tui-title.data-v-2485f983{width:210rpx;color:#666}.line-cell .tui-input.data-v-2485f983{width:calc(100% - 210rpx);font-size:28rpx}.line-cell .tui-placeholder.data-v-2485f983{color:#ccc}.line-cell .phcolor.data-v-2485f983{color:#ccc}.btn-wrap.data-v-2485f983{width:90%;margin:60rpx auto}.btn-wrap .admin-button-com.data-v-2485f983{width:100%;margin:0 auto}.code-wrap .tui-input.data-v-2485f983{width:calc(100% - 410rpx);font-size:28rpx}.code-wrap .tui-code.data-v-2485f983{width:200rpx;text-align:center;border-left:1rpx solid #eee;color:#3385ff}.recommend-wrap.data-v-2485f983{padding:30rpx 45rpx}.recommend-wrap .recommend-tag.data-v-2485f983{font-size:28rpx;color:#666;margin-bottom:24rpx}.recommend-wrap .recommend-det.data-v-2485f983{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start}.recommend-wrap .recommend-det .recommend-info.data-v-2485f983{margin-left:20rpx}.recommend-wrap .recommend-det .recommend-info .app-size-32.data-v-2485f983{margin-bottom:4rpx}
+.module-com.data-v-45d1bd66{margin-bottom:20rpx;background-color:#fff}.module-com .module-tit.data-v-45d1bd66{padding:20rpx 18rpx;font-size:28rpx;font-weight:600;border-bottom:1rpx solid #eee}.module-com .module-det.data-v-45d1bd66{padding:0 30rpx}.line-cell .tui-title.data-v-45d1bd66{width:210rpx;color:#666}.line-cell .tui-input.data-v-45d1bd66{width:calc(100% - 210rpx);font-size:28rpx}.line-cell .tui-placeholder.data-v-45d1bd66{color:#ccc}.line-cell .phcolor.data-v-45d1bd66{color:#ccc}.btn-wrap.data-v-45d1bd66{width:90%;margin:60rpx auto}.btn-wrap .admin-button-com.data-v-45d1bd66{width:100%;margin:0 auto}.code-wrap .tui-input.data-v-45d1bd66{width:calc(100% - 410rpx);font-size:28rpx}.code-wrap .tui-code.data-v-45d1bd66{width:200rpx;text-align:center;border-left:1rpx solid #eee;color:#3385ff}.recommend-wrap.data-v-45d1bd66{padding:30rpx 45rpx}.recommend-wrap .recommend-tag.data-v-45d1bd66{font-size:28rpx;color:#666;margin-bottom:24rpx}.recommend-wrap .recommend-det.data-v-45d1bd66{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start}.recommend-wrap .recommend-det .recommend-info.data-v-45d1bd66{margin-left:20rpx}.recommend-wrap .recommend-det .recommend-info .app-size-32.data-v-45d1bd66{margin-bottom:4rpx}

ghsApp/dist/build/mp-weixin/pagesClient/official/index.json

@@ -1,7 +1,6 @@
 {
   "navigationBarTitleText": "花卉宝",
   "usingComponents": {
-    "app-swiper": "/components/app-swiper",
-    "app-img": "/components/app-img"
+    "app-swiper": "/components/app-swiper"
   }
 }

ghsApp/dist/build/mp-weixin/pagesClient/official/pay.wxss

@@ -1 +1 @@
-.app-content.data-v-9454a2f6{background-color:#fff}.banner-wrap.data-v-9454a2f6{padding:32rpx;width:calc(100% - 64rpx);border-bottom:20rpx solid #f5f5f5}.banner-wrap .banner-img.data-v-9454a2f6{width:100%;margin-bottom:6rpx;position:relative}.banner-wrap .banner-img .meal-det.data-v-9454a2f6{position:absolute;top:40rpx;left:30rpx;width:60%;color:#fff}.banner-wrap .banner-img .meal-det .meal-title.data-v-9454a2f6{font-size:42rpx;font-weight:600;margin-bottom:28rpx;letter-spacing:8rpx}.banner-wrap .banner-img .meal-det .meal-introduce.data-v-9454a2f6{line-height:40rpx;letter-spacing:2rpx}.module-wrap.data-v-9454a2f6{padding:40rpx 30rpx 0}.module-wrap .module-tit.data-v-9454a2f6{font-size:28rpx;font-weight:600;margin-bottom:24rpx}.module-wrap .module-det .list-wrap.data-v-9454a2f6{border:2rpx solid #f9f9f9;border-top:none;margin-bottom:110rpx}.module-wrap .module-det .list-wrap .list.data-v-9454a2f6{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;padding:20rpx 26rpx;border-top:2rpx solid #f9f9f9}.module-wrap .module-det .list-wrap .list.data-v-9454a2f6:nth-child(odd){background-color:#eee}.module-wrap .module-det .list-wrap .list .iconfont.data-v-9454a2f6{font-size:30rpx}.module-wrap .module-det .list-wrap .list .icondagou.data-v-9454a2f6{color:#3385ff}.module-wrap .module-det .list-wrap .list .iconguanbi.data-v-9454a2f6{font-size:24rpx;color:#999}.page-btn.data-v-9454a2f6{width:100vw;display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;padding:0 30rpx}.page-btn .app-price.data-v-9454a2f6{margin-bottom:8rpx;margin-left:4rpx}.page-btn .red.data-v-9454a2f6{width:270rpx}.page-btn .admin-button-com.data-v-9454a2f6{width:200rpx;font-size:32rpx}
+.app-content.data-v-05a256db{background-color:#fff}.banner-wrap.data-v-05a256db{padding:32rpx;width:calc(100% - 64rpx);border-bottom:20rpx solid #f5f5f5}.banner-wrap .banner-img.data-v-05a256db{width:100%;margin-bottom:6rpx;position:relative}.banner-wrap .banner-img .meal-det.data-v-05a256db{position:absolute;top:40rpx;left:30rpx;width:60%;color:#fff}.banner-wrap .banner-img .meal-det .meal-title.data-v-05a256db{font-size:42rpx;font-weight:600;margin-bottom:28rpx;letter-spacing:8rpx}.banner-wrap .banner-img .meal-det .meal-introduce.data-v-05a256db{line-height:40rpx;letter-spacing:2rpx}.module-wrap.data-v-05a256db{padding:40rpx 30rpx 0}.module-wrap .module-tit.data-v-05a256db{font-size:28rpx;font-weight:600;margin-bottom:24rpx}.module-wrap .module-det .list-wrap.data-v-05a256db{border:2rpx solid #f9f9f9;border-top:none;margin-bottom:110rpx}.module-wrap .module-det .list-wrap .list.data-v-05a256db{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;padding:20rpx 26rpx;border-top:2rpx solid #f9f9f9}.module-wrap .module-det .list-wrap .list.data-v-05a256db:nth-child(odd){background-color:#eee}.module-wrap .module-det .list-wrap .list .iconfont.data-v-05a256db{font-size:30rpx}.module-wrap .module-det .list-wrap .list .icondagou.data-v-05a256db{color:#3385ff}.module-wrap .module-det .list-wrap .list .iconguanbi.data-v-05a256db{font-size:24rpx;color:#999}.page-btn.data-v-05a256db{width:100vw;display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;padding:0 30rpx}.page-btn .app-price.data-v-05a256db{margin-bottom:8rpx;margin-left:4rpx}.page-btn .red.data-v-05a256db{width:270rpx}.page-btn .admin-button-com.data-v-05a256db{width:200rpx;font-size:32rpx}

ghsApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/pagesPurchase/orderItem.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/pagesStore/me/expressSet.wxml

@@ -1 +1 @@
-<view class="app-content _div data-v-72aa20d6"><view hidden="{{!(showStaffArea)}}" class="_div data-v-72aa20d6"><form data-event-opts="{{[['submit',[['formSubmit',['$event']]]],['reset',[['formReset',['$event']]]]]}}" bindsubmit="__e" bindreset="__e" class="data-v-72aa20d6"><view class="module-com input-line-wrap _div data-v-72aa20d6"><tui-list-cell class="line-cell data-v-72aa20d6" vue-id="30009b01-1" hover="{{false}}" bind:__l="__l" vue-slots="{{['default']}}"><view class="tui-title required _div data-v-72aa20d6">达达商户ID</view><input class="tui-input data-v-72aa20d6" placeholder-class="phcolor" name="sjId" placeholder="请输入商户ID" maxlength="50" type="text" data-event-opts="{{[['input',[['__set_model',['$0','sjId','$event',[]],['form']]]]]}}" value="{{form.sjId}}" bindinput="__e"/></tui-list-cell><tui-list-cell class="line-cell data-v-72aa20d6" vue-id="30009b01-2" hover="{{false}}" bind:__l="__l" vue-slots="{{['default']}}"><view class="tui-title required _div data-v-72aa20d6">达达门店编号</view><input class="tui-input data-v-72aa20d6" placeholder-class="phcolor" name="shopNo" placeholder="请输入编号" maxlength="50" type="text" data-event-opts="{{[['input',[['__set_model',['$0','shopNo','$event',[]],['form']]]]]}}" value="{{form.shopNo}}" bindinput="__e"/></tui-list-cell></view><view class="confirm-btn _div data-v-72aa20d6"><button class="admin-button-com big blue data-v-72aa20d6" formType="submit">提交</button></view></form></view><kd-entrance vue-id="30009b01-3" class="data-v-72aa20d6" bind:__l="__l"></kd-entrance></view>
+<view class="app-content _div data-v-4050bb76"><view hidden="{{!(showStaffArea)}}" class="_div data-v-4050bb76"><form data-event-opts="{{[['submit',[['formSubmit',['$event']]]],['reset',[['formReset',['$event']]]]]}}" bindsubmit="__e" bindreset="__e" class="data-v-4050bb76"><view class="module-com input-line-wrap _div data-v-4050bb76"><tui-list-cell class="line-cell data-v-4050bb76" vue-id="30009b01-1" hover="{{false}}" bind:__l="__l" vue-slots="{{['default']}}"><view class="tui-title required _div data-v-4050bb76">达达商户ID</view><input class="tui-input data-v-4050bb76" placeholder-class="phcolor" name="sjId" placeholder="请输入商户ID" maxlength="50" type="text" data-event-opts="{{[['input',[['__set_model',['$0','sjId','$event',[]],['form']]]]]}}" value="{{form.sjId}}" bindinput="__e"/></tui-list-cell><tui-list-cell class="line-cell data-v-4050bb76" vue-id="30009b01-2" hover="{{false}}" bind:__l="__l" vue-slots="{{['default']}}"><view class="tui-title required _div data-v-4050bb76">达达门店编号</view><input class="tui-input data-v-4050bb76" placeholder-class="phcolor" name="shopNo" placeholder="请输入编号" maxlength="50" type="text" data-event-opts="{{[['input',[['__set_model',['$0','shopNo','$event',[]],['form']]]]]}}" value="{{form.shopNo}}" bindinput="__e"/></tui-list-cell><view style="padding:20rpx 0 0 30rpx;color:#CCCCCC;" class="_div data-v-4050bb76">设置完成后请联系管理员进行授权</view></view><view class="confirm-btn _div data-v-4050bb76"><button class="admin-button-com big blue data-v-4050bb76" formType="submit">提交</button></view></form></view><kd-entrance vue-id="30009b01-3" class="data-v-4050bb76" bind:__l="__l"></kd-entrance></view>

ghsApp/dist/build/mp-weixin/pagesStore/me/expressSet.wxss

@@ -1 +1 @@
-.app-content.data-v-72aa20d6{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-72aa20d6{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-72aa20d6{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-72aa20d6{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-72aa20d6{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-72aa20d6{height:240rpx}.confirm-btn.data-v-72aa20d6{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-72aa20d6{width:100%}
+.app-content.data-v-4050bb76{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-4050bb76{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-4050bb76{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-4050bb76{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-4050bb76{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-4050bb76{height:240rpx}.confirm-btn.data-v-4050bb76{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-4050bb76{width:100%}

ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/allotEx.wxml

@@ -1 +1 @@
-<view class="allot-ex-page data-v-432466da"><view class="tabs data-v-432466da"><tabs vue-id="7621ee40-1" tabs="{{tabs}}" currentTab="{{tabIndex}}" addText="新增" isAdd="{{false}}" data-event-opts="{{[['^change',[['changeTabEvent']]],['^add',[['addEvent']]]]}}" bind:change="__e" bind:add="__e" class="data-v-432466da" bind:__l="__l"></tabs></view><scroll-view class="allot-list data-v-432466da" scroll-y="{{true}}"><block wx:if="{{!$root.g0}}"><block class="data-v-432466da"><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['gotoDetails',['$0'],[[['list.data','',index]]]]]]]}}" class="allot-item data-v-432466da" bindtap="__e"><view class="info data-v-432466da"><view class="info-order data-v-432466da">{{item.orderSn}}</view><view class="info-name data-v-432466da">{{"门店："+item.adminName}}</view><view class="info-name data-v-432466da">{{"数量："+(item.smallNum||"-")+"/"+(item.bigNum||"-")}}</view><view class="info-name data-v-432466da">{{"时间："+item.updateTime}}</view></view><view class="{{['data-v-432466da','status',item.status==OUT_STATUS.DONE?'primary':item.status==OUT_STATUS.CONFIRM?'warn':'gray']}}"><view class="{{['data-v-432466da','iconfont',item.status==OUT_STATUS.CANCEL?'iconcaozuojihuo':'icondairuku']}}"></view><view class="{{['data-v-432466da','status-name']}}">{{item.statusName}}</view></view></view></block></block></block><block wx:else><block class="data-v-432466da"><app-wrapper-empty vue-id="7621ee40-2" title="暂无记录" is-empty="{{$root.g1}}" class="data-v-432466da" bind:__l="__l"></app-wrapper-empty></block></block></scroll-view><view class="app-footer open_btn data-v-432466da"><view data-event-opts="{{[['tap',[['addEvent',['$event']]]]]}}" class="admin-button-com middle blue data-v-432466da" bindtap="__e">新增出库</view></view><kd-entrance vue-id="7621ee40-3" class="data-v-432466da" bind:__l="__l"></kd-entrance></view>
+<view class="allot-ex-page data-v-7517d676"><view class="tabs data-v-7517d676"><tabs vue-id="7621ee40-1" tabs="{{tabs}}" currentTab="{{tabIndex}}" addText="新增" isAdd="{{false}}" data-event-opts="{{[['^change',[['changeTabEvent']]],['^add',[['addEvent']]]]}}" bind:change="__e" bind:add="__e" class="data-v-7517d676" bind:__l="__l"></tabs></view><scroll-view class="allot-list data-v-7517d676" scroll-y="{{true}}"><block wx:if="{{!$root.g0}}"><block class="data-v-7517d676"><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['gotoDetails',['$0'],[[['list.data','',index]]]]]]]}}" class="allot-item data-v-7517d676" bindtap="__e"><view class="info data-v-7517d676"><view class="info-order data-v-7517d676">{{item.orderSn}}</view><view class="info-name data-v-7517d676">{{"门店："+item.adminName}}</view><view class="info-name data-v-7517d676">{{"数量："+(item.bigNum||"-")+"/"+(item.smallNum||"-")}}</view><view class="info-name data-v-7517d676">{{"时间："+item.updateTime}}</view></view><view class="{{['data-v-7517d676','status',item.status==OUT_STATUS.DONE?'primary':item.status==OUT_STATUS.CONFIRM?'warn':'gray']}}"><view class="{{['data-v-7517d676','iconfont',item.status==OUT_STATUS.CANCEL?'iconcaozuojihuo':'icondairuku']}}"></view><view class="{{['data-v-7517d676','status-name']}}">{{item.statusName}}</view></view></view></block></block></block><block wx:else><block class="data-v-7517d676"><app-wrapper-empty vue-id="7621ee40-2" title="暂无记录" is-empty="{{$root.g1}}" class="data-v-7517d676" bind:__l="__l"></app-wrapper-empty></block></block></scroll-view><view class="app-footer open_btn data-v-7517d676"><view data-event-opts="{{[['tap',[['addEvent',['$event']]]]]}}" class="admin-button-com middle blue data-v-7517d676" bindtap="__e">新增出库</view></view><kd-entrance vue-id="7621ee40-3" class="data-v-7517d676" bind:__l="__l"></kd-entrance></view>

ghsApp/dist/build/mp-weixin/pagesStorehouse/allot/allotEx.wxss

@@ -1 +1 @@
-.allot-ex-page.data-v-432466da{height:100%;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;background-color:#f9fbfc}.allot-ex-page .allot-list.data-v-432466da{margin-top:20rpx;-webkit-box-flex:1;-webkit-flex:1;flex:1;padding-bottom:150rpx}.allot-ex-page .allot-list .allot-item.data-v-432466da{margin-bottom:1rpx;padding:30rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;box-shadow:0rpx 1rpx 0rpx 0rpx #eee;background-color:#fff}.allot-ex-page .allot-list .allot-item .info.data-v-432466da{-webkit-box-flex:1;-webkit-flex:1;flex:1;margin-right:20rpx}.allot-ex-page .allot-list .allot-item .info .info-order.data-v-432466da{font-size:32rpx;font-weight:600;color:#333}.allot-ex-page .allot-list .allot-item .info .info-name.data-v-432466da{margin:20rpx 0 20rpx;font-size:28rpx;font-weight:400;color:#666}.allot-ex-page .allot-list .allot-item .info .info-time.data-v-432466da{margin-right:30rpx;font-size:28rpx;font-weight:400;color:#666}.allot-ex-page .allot-list .allot-item .status.data-v-432466da{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-flex-shrink:0;flex-shrink:0;width:100rpx;color:#ccc}.allot-ex-page .allot-list .allot-item .status .status-name.data-v-432466da{margin-top:10rpx;font-size:24rpx}.allot-ex-page .allot-list .allot-item .status .iconfont.data-v-432466da{font-size:46rpx}.allot-ex-page .allot-list .allot-item .status.primary.data-v-432466da{color:#3385ff}.allot-ex-page .allot-list .allot-item .status.gray.data-v-432466da{color:#ccc}.allot-ex-page .allot-list .allot-item .status.warn.data-v-432466da{color:#ffaf1d}
+.allot-ex-page.data-v-7517d676{height:100%;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;background-color:#f9fbfc}.allot-ex-page .allot-list.data-v-7517d676{margin-top:20rpx;-webkit-box-flex:1;-webkit-flex:1;flex:1;padding-bottom:150rpx}.allot-ex-page .allot-list .allot-item.data-v-7517d676{margin-bottom:1rpx;padding:30rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;box-shadow:0rpx 1rpx 0rpx 0rpx #eee;background-color:#fff}.allot-ex-page .allot-list .allot-item .info.data-v-7517d676{-webkit-box-flex:1;-webkit-flex:1;flex:1;margin-right:20rpx}.allot-ex-page .allot-list .allot-item .info .info-order.data-v-7517d676{font-size:32rpx;font-weight:600;color:#333}.allot-ex-page .allot-list .allot-item .info .info-name.data-v-7517d676{margin:20rpx 0 20rpx;font-size:28rpx;font-weight:400;color:#666}.allot-ex-page .allot-list .allot-item .info .info-time.data-v-7517d676{margin-right:30rpx;font-size:28rpx;font-weight:400;color:#666}.allot-ex-page .allot-list .allot-item .status.data-v-7517d676{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-flex-shrink:0;flex-shrink:0;width:100rpx;color:#ccc}.allot-ex-page .allot-list .allot-item .status .status-name.data-v-7517d676{margin-top:10rpx;font-size:24rpx}.allot-ex-page .allot-list .allot-item .status .iconfont.data-v-7517d676{font-size:46rpx}.allot-ex-page .allot-list .allot-item .status.primary.data-v-7517d676{color:#3385ff}.allot-ex-page .allot-list .allot-item .status.gray.data-v-7517d676{color:#ccc}.allot-ex-page .allot-list .allot-item .status.warn.data-v-7517d676{color:#ffaf1d}

ghsApp/dist/build/mp-weixin/pagesStorehouse/inventory/select.json

@@ -6,6 +6,7 @@
     "app-wrapper-empty": "/components/app-wrapper-empty",
     "commondity": "/components/module/app-commodity",
     "modal-module": "/components/plugin/modal",
-    "footer-cart": "/components/module/app-footer-cart"
+    "footer-cart": "/components/module/app-footer-cart",
+    "all-more-select-input": "/components/module/allMoreSelectInput"
   }
 }

ghsApp/dist/build/mp-weixin/project.config.json

@@ -10,7 +10,7 @@
   "compileType": "miniprogram",
   "libVersion": "",
   "appid": "wx21b7c3ef12082099",
-  "projectname": "花卉宝",
+  "projectname": "供货商",
   "condition": {
     "search": {
       "current": -1,

ghsApp/src/admin/billing/affirm.vue

@@ -43,7 +43,7 @@
 								重选花材
 							</view>
 							<view class="describe-view">
-								共{{ allCount }}种,
+								共{{ selectList.length }}种,
 								<!-- 共16扎9支， -->
 								合计 ¥<text class="price">{{ allPrice }}</text>
 							</view>

ghsApp/src/admin/billing/index.vue

@@ -128,6 +128,7 @@ export default {
 		return {
 			COMMODITY_TYPE,
 			isModel: false,
+			offVerifyRepertory:true,
 			customData: {
 				bigCount: 0,
 				smallCount: 0
@@ -181,18 +182,20 @@ export default {
 						ratio
 					} = this.customData;
 					const ratioNum = Number(ratio);
+					this.updateItemEvent(this.customData);
+					this.modalCancel();
 					//超过库存时 设置为库存最大值 1
-					if (Number(bigCount) * ratioNum + Number(smallCount) > Number(bigNum) * ratioNum + Number(smallNum)) {
-						uni.showToast({
-							title: `库存只有${bigNum}${bigUnit}${smallNum}${smallUnit}`,
-							icon: "none"
-						});
-						this.customData.bigCount = bigNum;
-						this.customData.smallCount = smallNum;
-					} else {
-						this.updateItemEvent(this.customData);
-						this.modalCancel();
-					}
+					// if (Number(bigCount) * ratioNum + Number(smallCount) > Number(bigNum) * ratioNum + Number(smallNum)) {
+					// 	uni.showToast({
+					// 		title: `库存只有${bigNum}${bigUnit}${smallNum}${smallUnit}`,
+					// 		icon: "none"
+					// 	});
+					// 	this.customData.bigCount = bigNum;
+					// 	this.customData.smallCount = smallNum;
+					// } else {
+					// 	this.updateItemEvent(this.customData);
+					// 	this.modalCancel();
+					// }
 				}
 			})
 

ghsApp/src/admin/home/workbench.vue

@@ -353,6 +353,7 @@ export default {
 			});
 		},
 		getMyMall(){
+			console.log('pagesPurchase/ghsProduct?shopId='+ this.loginInfo.shopId+'&id=0&ghsShopAdminId='+this.loginInfo.shopAdminId)
 			getWeixinId().then(res => {
 				uni.navigateToMiniProgram({
 					//姜枫-2021.04.13

ghsApp/src/admin/shop/add.vue

@@ -16,8 +16,8 @@
 					<input v-model="form.openTime" placeholder-class="phcolor" class="tui-input" name="openTime" placeholder="请输入营业时间 例如：8:00 - 22:00" maxlength="50" type="text" />
 				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false">
-					<div class="tui-title required">联系电话</div>
-					<input v-model="form.telephone" placeholder-class="phcolor" class="tui-input" name="telephone" placeholder="请输入联系电话" maxlength="50" type="text" />
+					<div class="tui-title required">手机号</div>
+					<input v-model="form.mobile" placeholder-class="phcolor" class="tui-input" name="mobile" placeholder="请输入手机号" maxlength="50" type="text" />
 				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="openAddres">
 					<div class="tui-title required">所在城市</div>
@@ -81,7 +81,7 @@
                     floor: '',
                     openTime: '8:00 - 22:00',
                     introduction: '',
-                    telephone: ''
+                    mobile: ''
 				},
 				// 详细地址
 				showRegion: false,
@@ -176,9 +176,9 @@
 						msg: ['请输入营业时间']
 					},
 					{
-						name: 'telephone',
+						name: 'mobile',
 						rule: ['required'],
-						msg: ['请输入联系电话']
+						msg: ['请输入手机号']
 					},
 					{
 						name: 'province',