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

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

@@ -234,7 +234,8 @@
     "navigationBarBackgroundColor": "#fff",
     "navigationBarTitleText": "花卉宝",
     "navigationBarTextStyle": "black",
-    "backgroundColor": "#f9fbfc"
+    "backgroundColor": "#f9fbfc",
+    "onReachBottomDistance": 300
   },
   "tabBar": {
     "color": "#C0C4CC",

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

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/module/allSelectInput"],{"2d69":function(t,n,e){"use strict";e.r(n);var u=e("4c39"),i=e("6bee");for(var l in i)["default"].indexOf(l)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(l);e("7466");var a,c=e("0095"),o=Object(c["a"])(i["default"],u["b"],u["c"],!1,null,"3cbf5b95",null,!1,u["a"],a);n["default"]=o.exports},"4c39":function(t,n,e){"use strict";var u;e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return l})),e.d(n,"a",(function(){return u}));var i=function(){var t=this,n=t.$createElement;t._self._c},l=[]},"6bee":function(t,n,e){"use strict";e.r(n);var u=e("7095"),i=e.n(u);for(var l in u)["default"].indexOf(l)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(l);n["default"]=i.a},7095:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={name:"allSelectInput",props:{width:"",height:"",isActive:"",isFocus:"",value:"",placeholder:"",inputType:""},data:function(){return{inputVal:""}},onLoad:function(t){this.title=t.title},methods:{initAllInput:function(){this.$emit("initAllInput")},moveAllInput:function(){var t=this.inputVal;this.inputVal="",this.$emit("moveAllInput",t)},changeAllInput:function(t){t.detail.keyCode,this.$emit("deleteInputVal")}}};n.default=u},7466:function(t,n,e){"use strict";var u=e("e5223"),i=e.n(u);i.a},e5223:function(t,n,e){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/module/allSelectInput"],{"2d69":function(t,n,e){"use strict";e.r(n);var i=e("f2e7"),u=e("6bee");for(var l in u)["default"].indexOf(l)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(l);e("b9dc");var a,c=e("0095"),o=Object(c["a"])(u["default"],i["b"],i["c"],!1,null,"5d471ee2",null,!1,i["a"],a);n["default"]=o.exports},"6bee":function(t,n,e){"use strict";e.r(n);var i=e("7095"),u=e.n(i);for(var l in i)["default"].indexOf(l)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(l);n["default"]=u.a},7095:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i={name:"allSelectInput",props:{width:"",height:"",fontSize:"",isActive:"",isFocus:"",value:"",placeholder:"",inputType:""},data:function(){return{inputVal:""}},onLoad:function(t){this.title=t.title},methods:{initAllInput:function(){this.$emit("initAllInput")},moveAllInput:function(){var t=this.inputVal;this.inputVal="",this.$emit("moveAllInput",t)},changeAllInput:function(t){t.detail.keyCode,this.$emit("deleteInputVal")}}};n.default=i},ae30c:function(t,n,e){},b9dc:function(t,n,e){"use strict";var i=e("ae30c"),u=e.n(i);u.a},f2e7:function(t,n,e){"use strict";var i;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return l})),e.d(n,"a",(function(){return i}));var u=function(){var t=this,n=t.$createElement;t._self._c},l=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/module/allSelectInput-create-component',
     {

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

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

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

@@ -1 +1 @@
-<view class="change-input data-v-3cbf5b95" style="{{('width:'+width+'rpx !important;height:'+height+'rpx !important;')}}"><input style="{{(isActive?'caret-color:rgba(0,0,0,0)':'caret-color:rgba(0,0,0,1)')}}" focus="{{isFocus}}" type="{{inputType?inputType:'number'}}" placeholder="{{value==''&&inputVal==''?placeholder:''}}" data-event-opts="{{[['focus',[['initAllInput',['$event']]]],['blur',[['moveAllInput',['$event']]]],['input',[['__set_model',['','inputVal','$event',[]]],['changeAllInput',['$event']]]]]}}" value="{{inputVal}}" bindfocus="__e" bindblur="__e" bindinput="__e" class="data-v-3cbf5b95"/><text class="{{['data-v-3cbf5b95',isActive?'active':'']}}">{{value?value:''}}</text></view>
+<view class="change-input data-v-5d471ee2" style="{{('width:'+width+'rpx !important;height:'+height+'rpx !important;font-size:'+fontSize+'rpx !important')}}"><input style="{{(isActive?'caret-color:rgba(0,0,0,0)':'caret-color:rgba(0,0,0,1)')}}" focus="{{isFocus}}" type="{{inputType?inputType:'number'}}" placeholder="{{value==''&&inputVal==''?placeholder:''}}" data-event-opts="{{[['focus',[['initAllInput',['$event']]]],['blur',[['moveAllInput',['$event']]]],['input',[['__set_model',['','inputVal','$event',[]]],['changeAllInput',['$event']]]]]}}" value="{{inputVal}}" bindfocus="__e" bindblur="__e" bindinput="__e" class="data-v-5d471ee2"/><text class="{{['data-v-5d471ee2',isActive?'active':'']}}">{{value?value:''}}</text></view>

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

@@ -1 +1 @@
-.change-input.data-v-3cbf5b95{position:relative;width:164rpx;height:60rpx;line-height:60rpx;text-align:center;background:#fff;border:1rpx solid #ddd;border-radius:4rpx;font-size:25rpx}.change-input input.data-v-3cbf5b95{position:absolute;width:100%;height:100%}.change-input text.active.data-v-3cbf5b95{background:rgba(10,150,210,.6)}
+.change-input.data-v-5d471ee2{position:relative;width:164rpx;height:60rpx;line-height:60rpx;text-align:center;background:#fff;border:1rpx solid #ddd;border-radius:4rpx;font-size:25rpx}.change-input input.data-v-5d471ee2{position:absolute;width:100%;height:100%}.change-input text.active.data-v-5d471ee2{background:rgba(10,150,210,.6)}

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

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

ghsApp/dist/build/mp-weixin/components/module/app-share-mask.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-fb733c2e"><block wx:if="{{isShowTit}}"><view data-event-opts="{{[['tap',[['switchCut',['$event']]]]]}}" class="{{['data-v-fb733c2e','select-title',dropdownShow?'select_corlor':'']}}" bindtap="__e"><block wx:if="{{typeTime}}"><text class="data-v-fb733c2e">{{selectItemId?menuObjActive:menuObj.title}}</text></block><block wx:else><text class="data-v-fb733c2e">{{menuObjActive?menuObjActive:getMyShopInfo.shopName}}</text></block><block wx:if="{{isShowMore}}"><view class="iconfont iconsanjiao_xia _i data-v-fb733c2e"></view></block></view></block><view data-event-opts="{{[['tap',[['switchCut',['$event']]]]]}}" hidden="{{!(dropdownShow)}}" class="select-mark-view data-v-fb733c2e" bindtap="__e"></view><block wx:if="{{dropdownShow}}"><view class="select-fixed_bx data-v-fb733c2e" style="{{'top:'+(top)+';'}}"><block wx:if="{{$slots.default}}"><slot></slot></block><block wx:else><view class="select-item-box data-v-fb733c2e"><view class="title data-v-fb733c2e">{{menuObj.titleChild}}</view><view class="item-child_box data-v-fb733c2e"><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-fb733c2e','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-fb733c2e"><view class="title data-v-fb733c2e">其他时间选择</view><view class="item-child_box data-v-fb733c2e"><view data-event-opts="{{[['tap',[['changeItem',[['o',['name','自定义'],['id','custom']]]]]]]}}" class="admin-button-com mini-btn default custom data-v-fb733c2e" bindtap="__e">自定义</view></view></view></block></block></view></block></view>
+<view class="select-bg_bx data-v-4a385013"><block wx:if="{{isShowTit}}"><view data-event-opts="{{[['tap',[['switchCut',['$event']]]]]}}" class="{{['data-v-4a385013','select-title',dropdownShow?'select_corlor':'']}}" bindtap="__e"><block wx:if="{{typeTime}}"><text class="data-v-4a385013">{{selectItemId?menuObjActive:menuObj.title}}</text></block><block wx:else><text class="data-v-4a385013">{{menuObjActive?menuObjActive:getMyShopInfo.shopName}}</text></block><block wx:if="{{isShowMore}}"><view class="iconfont iconsanjiao_xia _i data-v-4a385013"></view></block></view></block><view data-event-opts="{{[['tap',[['switchCut',['$event']]]]]}}" hidden="{{!(dropdownShow)}}" class="select-mark-view data-v-4a385013" bindtap="__e"></view><block wx:if="{{dropdownShow}}"><view class="select-fixed_bx data-v-4a385013" style="{{'top:'+(top)+';'}}"><block wx:if="{{$slots.default}}"><slot></slot></block><block wx:else><view class="select-item-box data-v-4a385013"><view class="title data-v-4a385013">{{menuObj.titleChild}}</view><view class="item-child_box data-v-4a385013"><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-4a385013','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-4a385013"><view class="title data-v-4a385013">其他时间选择</view><view class="item-child_box data-v-4a385013"><view data-event-opts="{{[['tap',[['changeItem',[['o',['name','自定义'],['id','custom']]]]]]]}}" class="admin-button-com mini-btn default custom data-v-4a385013" 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-fb733c2e{color:#666;font-size:26rpx}.select-bg_bx .select-title .iconsanjiao_xia.data-v-fb733c2e{margin-left:10rpx}.select-bg_bx .select-title.select_corlor.data-v-fb733c2e{color:#3385ff}.select-bg_bx .select-title.select_corlor .iconsanjiao_xia.data-v-fb733c2e{-webkit-transform:rotate(180deg);transform:rotate(180deg)}.select-bg_bx .select-mark-view.data-v-fb733c2e{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-fb733c2e{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-fb733c2e{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-fb733c2e{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-fb733c2e{margin-bottom:20rpx;padding:18rpx 50rpx}.select-bg_bx .select-fixed_bx .select-item-box .item-child_box .admin-button-com.custom.data-v-fb733c2e{width:100%}
+.select-bg_bx .select-title.data-v-4a385013{color:#666;font-size:26rpx}.select-bg_bx .select-title .iconsanjiao_xia.data-v-4a385013{margin-left:10rpx}.select-bg_bx .select-title.select_corlor.data-v-4a385013{color:#3385ff}.select-bg_bx .select-title.select_corlor .iconsanjiao_xia.data-v-4a385013{-webkit-transform:rotate(180deg);transform:rotate(180deg)}.select-bg_bx .select-mark-view.data-v-4a385013{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-4a385013{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-4a385013{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-4a385013{padding:20rpx 0 0;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.select-bg_bx .select-fixed_bx .select-item-box .item-child_box .admin-button-com.data-v-4a385013{margin-bottom:20rpx;padding:18rpx 50rpx;margin-right:20rpx}.select-bg_bx .select-fixed_bx .select-item-box .item-child_box .admin-button-com.custom.data-v-4a385013{width:100%}

ghsApp/dist/build/mp-weixin/components/none-hd.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 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

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

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/plugin/modal"],{"36e9":function(t,e,n){},"3a8f":function(t,e,n){"use strict";n.r(e);var a=n("e19c"),u=n("c17c");for(var i in u)["default"].indexOf(i)<0&&function(t){n.d(e,t,(function(){return u[t]}))}(i);n("e82c");var o,r=n("0095"),c=Object(r["a"])(u["default"],a["b"],a["c"],!1,null,"9e6b0bb8",null,!1,a["a"],o);e["default"]=c.exports},c17c:function(t,e,n){"use strict";n.r(e);var a=n("cadc"),u=n.n(a);for(var i in a)["default"].indexOf(i)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(i);e["default"]=u.a},cadc:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a={name:"tuiModal",props:{show:{type:Boolean,default:!1},width:{type:String,default:"84%"},padding:{type:String,default:"40rpx 30rpx"},radius:{type:String,default:"24rpx"},title:{type:String,default:""},content:{type:String,default:""},color:{type:String,default:"#999"},bgcolor:{type:String,default:"#fff"},size:{type:Number,default:28},shape:{type:String,default:"square"},button:{type:Array,default:function(){return[{text:"取消",plain:!0},{text:"确定",plain:!1}]}},maskClosable:{type:Boolean,default:!0},custom:{type:Boolean,default:!1},fadein:{type:Boolean,default:!1}},computed:{isCustomContent:function(){return!!this.$slots.customContent}},data:function(){return{}},mounted:function(){console.log(this)},methods:{handleClick:function(t){if(this.show){var e=t.currentTarget.dataset;this.$emit("click",{index:Number(e.index)})}},handleClickCancel:function(){this.maskClosable&&this.$emit("click",{index:0})}}};e.default=a},e19c:function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return u})),n.d(e,"c",(function(){return i})),n.d(e,"a",(function(){return a}));var u=function(){var t=this,e=t.$createElement;t._self._c},i=[]},e82c:function(t,e,n){"use strict";var a=n("36e9"),u=n.n(a);u.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/plugin/modal"],{"3a8f":function(t,e,n){"use strict";n.r(e);var a=n("f08a"),u=n("c17c");for(var i in u)["default"].indexOf(i)<0&&function(t){n.d(e,t,(function(){return u[t]}))}(i);n("ed6f");var o,r=n("0095"),c=Object(r["a"])(u["default"],a["b"],a["c"],!1,null,"35e74d41",null,!1,a["a"],o);e["default"]=c.exports},c17c:function(t,e,n){"use strict";n.r(e);var a=n("cadc"),u=n.n(a);for(var i in a)["default"].indexOf(i)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(i);e["default"]=u.a},cadc:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a={name:"tuiModal",props:{show:{type:Boolean,default:!1},width:{type:String,default:"84%"},padding:{type:String,default:"40rpx 30rpx"},radius:{type:String,default:"24rpx"},title:{type:String,default:""},content:{type:String,default:""},color:{type:String,default:"#999"},bgcolor:{type:String,default:"#fff"},size:{type:Number,default:28},shape:{type:String,default:"square"},button:{type:Array,default:function(){return[{text:"取消",plain:!0},{text:"确定",plain:!1}]}},maskClosable:{type:Boolean,default:!0},custom:{type:Boolean,default:!1},fadein:{type:Boolean,default:!1}},computed:{isCustomContent:function(){return!!this.$slots.customContent}},data:function(){return{}},mounted:function(){console.log(this)},methods:{handleClick:function(t){if(this.show){var e=t.currentTarget.dataset;this.$emit("click",{index:Number(e.index)})}},handleClickCancel:function(){this.maskClosable&&this.$emit("click",{index:0})}}};e.default=a},ec0c:function(t,e,n){},ed6f:function(t,e,n){"use strict";var a=n("ec0c"),u=n.n(a);u.a},f08a:function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return u})),n.d(e,"c",(function(){return i})),n.d(e,"a",(function(){return a}));var u=function(){var t=this,e=t.$createElement;t._self._c},i=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/plugin/modal-create-component',
     {

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/modal.wxml

@@ -1 +1 @@
-<view data-event-opts="{{[['touchmove',[['',['$event']]]]]}}" catchtouchmove="__e" class="data-v-9e6b0bb8"><view class="{{['tui-modal-box data-v-9e6b0bb8',fadein||show?'tui-modal-normal':'tui-modal-scale',show?'tui-modal-show':'']}}" style="{{'width:'+(width)+';'+('padding:'+(padding)+';')+('border-radius:'+(radius)+';')+('background:'+(bgcolor)+';')}}"><block wx:if="{{!custom}}"><view class="data-v-9e6b0bb8"><block wx:if="{{title}}"><view class="tui-modal-title data-v-9e6b0bb8">{{title}}</view></block><block wx:if="{{!isCustomContent}}"><view class="tui-modal-content data-v-9e6b0bb8"><block wx:if="{{content}}"><block class="data-v-9e6b0bb8"><view style="{{'color:'+(color)+';'+('font-size:'+(size+'rpx')+';')}}" class="_div data-v-9e6b0bb8">{{content}}</view></block></block><block wx:else><block class="data-v-9e6b0bb8"><slot name="content"></slot></block></block></view></block><block wx:else><slot name="customContent"></slot></block><view class="{{['tui-modalBtn-box data-v-9e6b0bb8',button.length!=2?'tui-flex-column':'']}}"><block wx:for="{{button}}" wx:for-item="item" wx:for-index="index" wx:key="index"><block class="data-v-9e6b0bb8"><button class="{{['tui-modal-btn data-v-9e6b0bb8','tui-primary'+(item.plain?'-outline':''),button.length!=2?'tui-btn-width':'',button.length>2?'tui-mbtm':'',shape=='circle'?'tui-circle-btn':'']}}" hover-class="{{'tui-'+(item.plain?'outline':'primary')+'-hover'}}" data-index="{{index}}" data-event-opts="{{[['tap',[['handleClick',['$event']]]]]}}" bindtap="__e">{{item.text||"确定"}}</button></block></block></view></view></block><block wx:else><view class="data-v-9e6b0bb8"><slot></slot></view></block></view><view data-event-opts="{{[['tap',[['handleClickCancel',['$event']]]]]}}" class="{{['tui-modal-mask data-v-9e6b0bb8',show?'tui-mask-show':'']}}" bindtap="__e"></view></view>
+<view data-event-opts="{{[['touchmove',[['',['$event']]]]]}}" catchtouchmove="__e" class="data-v-35e74d41"><view class="{{['tui-modal-box data-v-35e74d41',fadein||show?'tui-modal-normal':'tui-modal-scale',show?'tui-modal-show':'']}}" style="{{'margin-top:-150rpx;'+('width:'+(width)+';')+('padding:'+(padding)+';')+('border-radius:'+(radius)+';')+('background:'+(bgcolor)+';')}}"><block wx:if="{{!custom}}"><view class="data-v-35e74d41"><block wx:if="{{title}}"><view class="tui-modal-title data-v-35e74d41">{{title}}</view></block><block wx:if="{{!isCustomContent}}"><view class="tui-modal-content data-v-35e74d41"><block wx:if="{{content}}"><block class="data-v-35e74d41"><view style="{{'color:'+(color)+';'+('font-size:'+(size+'rpx')+';')}}" class="_div data-v-35e74d41">{{content}}</view></block></block><block wx:else><block class="data-v-35e74d41"><slot name="content"></slot></block></block></view></block><block wx:else><slot name="customContent"></slot></block><view class="{{['tui-modalBtn-box data-v-35e74d41',button.length!=2?'tui-flex-column':'']}}"><block wx:for="{{button}}" wx:for-item="item" wx:for-index="index" wx:key="index"><block class="data-v-35e74d41"><button class="{{['tui-modal-btn data-v-35e74d41','tui-primary'+(item.plain?'-outline':''),button.length!=2?'tui-btn-width':'',button.length>2?'tui-mbtm':'',shape=='circle'?'tui-circle-btn':'']}}" hover-class="{{'tui-'+(item.plain?'outline':'primary')+'-hover'}}" data-index="{{index}}" data-event-opts="{{[['tap',[['handleClick',['$event']]]]]}}" bindtap="__e">{{item.text||"确定"}}</button></block></block></view></view></block><block wx:else><view class="data-v-35e74d41"><slot></slot></view></block></view><view data-event-opts="{{[['tap',[['handleClickCancel',['$event']]]]]}}" class="{{['tui-modal-mask data-v-35e74d41',show?'tui-mask-show':'']}}" bindtap="__e"></view></view>

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 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

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

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesArrears/detailsItem"],{"12cc":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var c={props:{info:{required:!0},isEdit:{type:Boolean,default:!1},isCheck:{type:Boolean,default:!1}},methods:{checkEvent:function(){this.isEdit&&this.$emit("click",this.info)}}};e.default=c},4725:function(t,e,n){"use strict";var c=n("e1e9"),i=n.n(c);i.a},"6ddc":function(t,e,n){"use strict";var c;n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return u})),n.d(e,"a",(function(){return c}));var i=function(){var t=this,e=t.$createElement;t._self._c},u=[]},b910:function(t,e,n){"use strict";n.r(e);var c=n("12cc"),i=n.n(c);for(var u in c)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return c[t]}))}(u);e["default"]=i.a},d326:function(t,e,n){"use strict";n.r(e);var c=n("6ddc"),i=n("b910");for(var u in i)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(u);n("4725");var r,a=n("0095"),f=Object(a["a"])(i["default"],c["b"],c["c"],!1,null,"07fc1cf0",null,!1,c["a"],r);e["default"]=f.exports},e1e9:function(t,e,n){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesArrears/detailsItem"],{"12cc":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i={props:{info:{required:!0},isEdit:{type:Boolean,default:!1},isCheck:{type:Boolean,default:!1}},methods:{checkEvent:function(){this.isEdit&&this.$emit("click",this.info)}}};e.default=i},"3a2f":function(t,e,n){},"50b8":function(t,e,n){"use strict";var i;n.d(e,"b",(function(){return c})),n.d(e,"c",(function(){return u})),n.d(e,"a",(function(){return i}));var c=function(){var t=this,e=t.$createElement;t._self._c},u=[]},b910:function(t,e,n){"use strict";n.r(e);var i=n("12cc"),c=n.n(i);for(var u in i)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(u);e["default"]=c.a},c681:function(t,e,n){"use strict";var i=n("3a2f"),c=n.n(i);c.a},d326:function(t,e,n){"use strict";n.r(e);var i=n("50b8"),c=n("b910");for(var u in c)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return c[t]}))}(u);n("c681");var r,a=n("0095"),f=Object(a["a"])(c["default"],i["b"],i["c"],!1,null,"1111f0dc",null,!1,i["a"],r);e["default"]=f.exports}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pagesArrears/detailsItem-create-component',
     {

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

@@ -1 +1 @@
-<view data-event-opts="{{[['tap',[['checkEvent',['$event']]]]]}}" class="details-item data-v-07fc1cf0" catchtap="__e"><block wx:if="{{isEdit}}"><view class="details-select data-v-07fc1cf0"><block wx:if="{{isCheck}}"><text class="iconfont iconxuanzhong data-v-07fc1cf0"></text></block><block wx:else><text class="iconfont iconweixuanzhong data-v-07fc1cf0"></text></block></view></block><view class="details-main data-v-07fc1cf0"><view class="item-header data-v-07fc1cf0"><text class="name data-v-07fc1cf0">{{"销售出库 | "+info.orderSn+''}}</text></view><view class="item-row data-v-07fc1cf0"><view class="mark data-v-07fc1cf0">{{info.addTime}}</view></view><view class="item-row data-v-07fc1cf0"><view class="mark data-v-07fc1cf0">{{"成交金额："+info.actPrice}}</view><view class="price data-v-07fc1cf0">{{info.actPrice}}</view></view></view></view>
+<view data-event-opts="{{[['tap',[['checkEvent',['$event']]]]]}}" class="details-item data-v-1111f0dc" catchtap="__e"><block wx:if="{{isEdit}}"><view class="details-select data-v-1111f0dc"><block wx:if="{{isCheck}}"><text class="iconfont iconxuanzhong data-v-1111f0dc"></text></block><block wx:else><text class="iconfont iconweixuanzhong data-v-1111f0dc"></text></block></view></block><view class="details-main data-v-1111f0dc"><view class="item-header data-v-1111f0dc"><text class="name data-v-1111f0dc">{{"销售单 | "+info.orderSn+''}}</text></view><view class="item-row data-v-1111f0dc"><view class="mark data-v-1111f0dc">{{info.addTime}}</view></view><view class="item-row data-v-1111f0dc"><view class="mark data-v-1111f0dc">{{"成交金额："+info.actPrice}}</view><view class="price data-v-1111f0dc">{{info.actPrice}}</view></view></view></view>

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

@@ -1 +1 @@
-.details-item.data-v-07fc1cf0{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;padding:30rpx 20rpx;margin-bottom:20rpx;background-color:#fff;border-radius:10rpx}.details-item .details-select.data-v-07fc1cf0{margin-right:30rpx}.details-item .details-select .iconfont.data-v-07fc1cf0{font-size:40rpx;color:#ddd}.details-item .details-select .iconxuanzhong.data-v-07fc1cf0{color:#3385ff}.details-item .details-main.data-v-07fc1cf0{-webkit-box-flex:1;-webkit-flex:1;flex:1}.details-item .item-header.data-v-07fc1cf0{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.details-item .item-header .logo.data-v-07fc1cf0{margin-right:20rpx;width:50rpx;height:50rpx;border-radius:50%}.details-item .item-header .name.data-v-07fc1cf0{font-size:28rpx;font-family:PingFang SC;font-weight:600;color:#333}.details-item .item-row.data-v-07fc1cf0{margin-top:20rpx;display:-webkit-box;display:-webkit-flex;display: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}.details-item .item-row .mark.data-v-07fc1cf0{font-size:28rpx;font-weight:400;color:#666}.details-item .item-row .price.data-v-07fc1cf0{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;font-size:28rpx;font-weight:600;color:#333}.details-item .item-row .price .iconfont.data-v-07fc1cf0{font-size:28rpx;color:#999}
+.details-item.data-v-1111f0dc{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;padding:30rpx 20rpx;margin-bottom:20rpx;background-color:#fff;border-radius:10rpx}.details-item .details-select.data-v-1111f0dc{margin-right:30rpx}.details-item .details-select .iconfont.data-v-1111f0dc{font-size:40rpx;color:#ddd}.details-item .details-select .iconxuanzhong.data-v-1111f0dc{color:#3385ff}.details-item .details-main.data-v-1111f0dc{-webkit-box-flex:1;-webkit-flex:1;flex:1}.details-item .item-header.data-v-1111f0dc{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.details-item .item-header .logo.data-v-1111f0dc{margin-right:20rpx;width:50rpx;height:50rpx;border-radius:50%}.details-item .item-header .name.data-v-1111f0dc{font-size:28rpx;font-family:PingFang SC;font-weight:600;color:#333}.details-item .item-row.data-v-1111f0dc{margin-top:20rpx;display:-webkit-box;display:-webkit-flex;display: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}.details-item .item-row .mark.data-v-1111f0dc{font-size:28rpx;font-weight:400;color:#666}.details-item .item-row .price.data-v-1111f0dc{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;font-size:28rpx;font-weight:600;color:#333}.details-item .item-row .price .iconfont.data-v-1111f0dc{font-size:28rpx;color:#999}

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

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

ghsApp/dist/build/mp-weixin/pagesPurchase/components/CommodityPurchase.wxml

@@ -1 +1 @@
-<view class="item-cmd_bx data-v-b80ce9a4"><view class="img_bx data-v-b80ce9a4"><app-img vue-id="32bcb0b9-1" src="{{info.cover}}" alt="商品图" mode="aspectFit" height="{{160}}" class="data-v-b80ce9a4" bind:__l="__l"></app-img></view><view class="cmd-info_bx data-v-b80ce9a4"><view class="tit data-v-b80ce9a4">{{''+(info.itemName||"")+''}}</view><view class="kc data-v-b80ce9a4">{{info.rank+"级"}}</view><view class="num-open_bx data-v-b80ce9a4"><view class="price data-v-b80ce9a4"><text class="unit data-v-b80ce9a4">{{"库存："+info.stock}}</text></view><view class="open-bx data-v-b80ce9a4"><block wx:if="{{bigCount>0||smallCount>0}}"><view data-event-opts="{{[['tap',[['delEvent',['$event']]]]]}}" class="{{['iconfont iconjian _i data-v-b80ce9a4',delAnimationData?'animation':'']}}" bindtap="__e"></view></block><text data-event-opts="{{[['tap',[['customNum',['$event']]]]]}}" class="num data-v-b80ce9a4" bindtap="__e"><block wx:if="{{bigCount>0||smallCount>0}}"><text class="data-v-b80ce9a4">{{''+bigCount}}</text></block><block wx:if="{{smallCount>0}}"><text class="data-v-b80ce9a4">/</text></block><block wx:if="{{smallCount>0}}"><text class="data-v-b80ce9a4">{{''+smallCount}}</text></block></text><view data-event-opts="{{[['tap',[['customNum',['$event']]]]]}}" class="{{['iconfont iconzeng _i data-v-b80ce9a4',addAnimationData?'animation':'']}}" bindtap="__e"></view></view></view></view></view>
+<view data-event-opts="{{[['tap',[['customNum',['$event']]]]]}}" class="item-cmd_bx data-v-57c05a94" bindtap="__e"><view class="img_bx data-v-57c05a94"><app-img vue-id="32bcb0b9-1" src="{{info.cover}}" alt="商品图" mode="aspectFit" height="{{160}}" class="data-v-57c05a94" bind:__l="__l"></app-img></view><view class="cmd-info_bx data-v-57c05a94"><view class="tit data-v-57c05a94">{{''+(info.itemName||"")+''}}</view><view class="kc data-v-57c05a94">{{info.rank+"级"}}</view><view class="num-open_bx data-v-57c05a94"><view class="price data-v-57c05a94"><text class="unit data-v-57c05a94">{{"库存："+info.stock}}</text></view><view class="open-bx data-v-57c05a94"><block wx:if="{{bigCount>0||smallCount>0}}"><view data-event-opts="{{[['tap',[['delEvent',['$event']]]]]}}" class="{{['iconfont iconjian _i data-v-57c05a94',delAnimationData?'animation':'']}}" catchtap="__e"></view></block><text data-event-opts="{{[['tap',[['customNum',['$event']]]]]}}" class="num data-v-57c05a94" catchtap="__e"><block wx:if="{{bigCount>0||smallCount>0}}"><text class="data-v-57c05a94">{{''+bigCount}}</text></block><block wx:if="{{smallCount>0}}"><text class="data-v-57c05a94">/</text></block><block wx:if="{{smallCount>0}}"><text class="data-v-57c05a94">{{''+smallCount}}</text></block></text><view data-event-opts="{{[['tap',[['customNum',['$event']]]]]}}" class="{{['iconfont iconzeng _i data-v-57c05a94',addAnimationData?'animation':'']}}" catchtap="__e"></view></view></view></view></view>

ghsApp/dist/build/mp-weixin/pagesPurchase/components/CommodityPurchase.wxss

@@ -1 +1 @@
-.item-cmd_bx.data-v-b80ce9a4{position:relative;margin-bottom:20rpx}.item-cmd_bx .img_bx.data-v-b80ce9a4{height:160rpx;width:160rpx;position:absolute;left:0rpx;top:0rpx}.item-cmd_bx .cmd-info_bx.data-v-b80ce9a4{padding-left:177rpx}.item-cmd_bx .cmd-info_bx .tit.data-v-b80ce9a4{font-size:28rpx;font-weight:400;color:#333;padding-top:10rpx}.item-cmd_bx .cmd-info_bx .kc.data-v-b80ce9a4{color:#999;font-size:24rpx;padding:10rpx 0 24rpx}.item-cmd_bx .cmd-info_bx .num-open_bx.data-v-b80ce9a4{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.item-cmd_bx .cmd-info_bx .num-open_bx .price.data-v-b80ce9a4{-webkit-box-flex:1;-webkit-flex:1;flex:1;font-size:32rpx;color:#333}.item-cmd_bx .cmd-info_bx .num-open_bx .price .unit.data-v-b80ce9a4{font-size:22rpx}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx.data-v-b80ce9a4{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx .iconfont.data-v-b80ce9a4{color:#4db0e4;font-size:42rpx}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx .icondelete.data-v-b80ce9a4{margin:0 10rpx 0 30rpx;color:#ccc}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx .icondelete.edit.data-v-b80ce9a4{color:#4db0e4}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx > .num.data-v-b80ce9a4{display:inline-block;width:120rpx;height:45rpx;text-align:center;margin:0 8rpx;color:#868686;border-radius:22rpx;background-color:#f5f5f5;padding:3rpx 0;font-size:25rpx}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx .change-input.data-v-b80ce9a4{width:164rpx;height:60rpx;line-height:60rpx;text-align:center;background:#fff;border:1rpx solid #ddd;border-radius:4rpx;font-size:28rpx}
+.item-cmd_bx.data-v-57c05a94{position:relative;margin-bottom:20rpx}.item-cmd_bx .img_bx.data-v-57c05a94{height:160rpx;width:160rpx;position:absolute;left:0rpx;top:0rpx}.item-cmd_bx .cmd-info_bx.data-v-57c05a94{padding-left:177rpx}.item-cmd_bx .cmd-info_bx .tit.data-v-57c05a94{font-size:28rpx;font-weight:400;color:#333;padding-top:10rpx}.item-cmd_bx .cmd-info_bx .kc.data-v-57c05a94{color:#999;font-size:24rpx;padding:10rpx 0 24rpx}.item-cmd_bx .cmd-info_bx .num-open_bx.data-v-57c05a94{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.item-cmd_bx .cmd-info_bx .num-open_bx .price.data-v-57c05a94{-webkit-box-flex:1;-webkit-flex:1;flex:1;font-size:32rpx;color:#333}.item-cmd_bx .cmd-info_bx .num-open_bx .price .unit.data-v-57c05a94{font-size:22rpx}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx.data-v-57c05a94{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx .iconfont.data-v-57c05a94{color:#4db0e4;font-size:42rpx}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx .icondelete.data-v-57c05a94{margin:0 10rpx 0 30rpx;color:#ccc}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx .icondelete.edit.data-v-57c05a94{color:#4db0e4}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx > .num.data-v-57c05a94{display:inline-block;width:120rpx;height:45rpx;text-align:center;margin:0 8rpx;color:#868686;border-radius:22rpx;background-color:#f5f5f5;padding:3rpx 0;font-size:25rpx}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx .change-input.data-v-57c05a94{width:164rpx;height:60rpx;line-height:60rpx;text-align:center;background:#fff;border:1rpx solid #ddd;border-radius:4rpx;font-size:28rpx}

ghsApp/src/admin/shop/add.vue

@@ -174,7 +174,7 @@
                     this.$msg(promptText)
                     uni.removeStorageSync('modifyShopB')
                     setTimeout(() => {
-					    this.$util.pageTo({url:'/admin/shop/list', type: 2})
+					    this.$util.pageTo(1)
                     }, 1000)
 				})
 			},

ghsApp/src/admin/shop/list.vue

@@ -106,7 +106,6 @@
 				uni.setStorageSync('modifyShopB', item)
 				this.pageTo({
 					url: '/admin/shop/add',
-          type: 2,
 					query: {
 						id: item.id
 					}
@@ -127,7 +126,7 @@
       // 添加门店
       addModel() {
         uni.removeStorageSync('modifyShopB')
-        this.pageTo({url:'/admin/shop/add', type: 2})
+        this.pageTo({url:'/admin/shop/add'})
       },
 			// 会员码
 			downMemberCodeFn(item, index) {

ghsApp/src/admin/staff/add.vue

@@ -180,12 +180,7 @@ export default {
         roleSelData: this.roleSelData
       };
       uni.setStorageSync("addStaffData", data);
-      this.$util.pageTo({
-        url: "/admin/staff/sel-member",
-        query: {
-          ...this.option
-        }
-      });
+      this.$util.pageTo(1);
     },
     changeRoleFn(e) {
       this.roleSelData = this.roleList[e.detail.value];
@@ -216,10 +211,7 @@ export default {
           let promptText = this.option.id ? "修改成功！" : "添加成功！";
           this.$msg(promptText);
           setTimeout(() => {
-            this.$util.pageTo({
-              url: "/admin/staff/list",
-              type: 2
-            });
+            this.$util.pageTo(1);
           }, 1000);
         }
         

ghsApp/src/admin/staff/list.vue

@@ -34,7 +34,7 @@
 									<i class="iconfont iconshanchu1"></i>
 								</div>
 								<!-- 修改 -->
-								<div @click="pageTo({url: '/admin/staff/add',query: {id: item.id}, type: 2})">
+								<div @click="pageTo({url: '/admin/staff/add',query: {id: item.id}})">
 								<i class="iconfont iconbianji"></i>
 								</div>
 							</div>
@@ -47,7 +47,7 @@
 			</div>
 			<!-- 按钮 -->
 			<div class="app-footer">
-				<div class="admin-button-com middle blue" @click="pageTo({url: '/admin/staff/add', type: 2})">添加员工</div>
+				<div class="admin-button-com middle blue" @click="pageTo({url: '/admin/staff/add'})">添加员工</div>
 			</div>
 		</block>
 		<!-- 角色管理 -->

ghsApp/src/components/module/allSelectInput.vue

@@ -26,7 +26,7 @@
 	}
 </style>
 <template>
-	<view class="change-input" :style="'width:'+width+'rpx !important;height:'+height+'rpx !important;'" >
+	<view class="change-input" :style="'width:'+width+'rpx !important;height:'+height+'rpx !important;font-size:'+fontSize+'rpx !important'" >
 			<input :focus="isFocus" :style="isActive?'caret-color:rgba(0,0,0,0)':'caret-color:rgba(0,0,0,1)'"  :type="inputType?inputType:'number'" @focus="initAllInput" @blur="moveAllInput" v-model="inputVal" @input="changeAllInput" :placeholder="value==''&&inputVal==''?placeholder:''">
 			<text :class="isActive?'active':''">{{value?value:''}}</text>
 	</view>
@@ -37,6 +37,7 @@ export default {
 	props: {
 		width: '',
 		height: '',
+		fontSize: '',
 		isActive: '',
 		isFocus: '',
 		value: '',

ghsApp/src/mixins/product.js

@@ -315,6 +315,7 @@ export default {
 		 * 添加商品
 		 */
 		addEvent(item) {
+			console.log('****')
 			const list = this.selectList;
 			let has = false;
 			for (let index = 0; index < list.length; index++) {
@@ -338,6 +339,7 @@ export default {
 								}
 							}else{
 								this.$msg("库存不足");
+								return;
 							}
 							//  else if (element.smallCount < item.smallNum) {
 							// 	list[index] = { ...element, smallCount: ++element.smallCount };
@@ -396,6 +398,7 @@ export default {
 						list.push(params);
 					}else{
 						this.$msg("库存不足");
+						return;
 					}
 				}
 			}

ghsApp/src/pages.json

@@ -687,7 +687,8 @@
 		"navigationBarBackgroundColor": "#fff",
 		"navigationBarTitleText": "花卉宝",
 		"navigationBarTextStyle": "black",
-		"backgroundColor": "#f9fbfc"
+		"backgroundColor": "#f9fbfc",
+		"onReachBottomDistance": 300
 	},
 	"tabBar": {
 		"color": "#C0C4CC",

ghsApp/src/pagesPurchase/add.vue

@@ -77,7 +77,7 @@
 <!--								placeholder="请填写采购总价"-->
 <!--							/>元-->
 							<allSelectInput :isActive="isAloneAllActive" :isFocus="isAloneAllFocus" :value="customData.itemPrice" :placeholder="'请填写采购总价'"
-																							:width="400" :height="80"
+																							:width="400" :height="80" :fontSize="40"
 																							@deleteInputVal="deleteAloneInputVal" @initAllInput="initAloneAllInput" @moveAllInput="moveAloneAllInput">
 							</allSelectInput> <text style="margin-left: 20rpx">元</text>
 						</view>

ghsApp/src/pagesStore/me/recharge.vue

@@ -124,8 +124,6 @@ export default {
       });
     },
     payFail() {
-      this.$msg("没有充值成功");
-      return false;
     },
   },
   async onPullDownRefresh() {

ghsApp/src/pagesStorehouse/allot/addExDetails.vue

@@ -80,7 +80,7 @@
 					直接出库
 				</button>
 				<button class="admin-button-com middle" @click="confirmStockOutOrder">
-					保存
+					保存草稿
 				</button>
 			</view>
 		</view>

ghsApp/src/pagesStorehouse/allot/exDetails.vue

@@ -5,7 +5,7 @@
 			<view class="space-view ex-info">
 				<view class="info-cell">
 					<view class="cell-label"> 收货仓库</view>
-					<view class="cell-value"> {{ outData.orderSn || "" }}</view>
+					<view class="cell-value"> {{ outData.shopName || "" }}</view>
 				</view>
 				<view class="info-cell">
 					<view class="cell-label"> 日期</view>
@@ -59,13 +59,13 @@
 									</view>
 								</view>
 								<view v-else-if="column.custom == 'stock'">
-									<text v-if="item.bigNumStock > 0"> {{ item.bigNumStock }}/ </text>
+									<text > {{ item.bigNumStock }}/ </text>
 									<text>
 										{{ item.smallNumStock }}
 									</text>
 								</view>
 								<view v-else-if="column.custom == 'put'">
-									<text v-if="item.bigNum > 0"> {{ item.bigNum }}/ </text>
+									<text > {{ item.bigNum }}/ </text>
 									<text>
 										{{ item.smallNum }}
 									</text>

ghsApp/src/pagesStorehouse/allot/exSelect.vue

@@ -219,8 +219,9 @@ export default {
 							title: `库存只有${bigNum}${bigUnit}${smallNum}${smallUnit}`,
 							icon: "none"
 						});
-						this.customData.bigCount = bigNum;
-						this.customData.smallCount = smallNum;
+						this.customData.bigCount = 0;
+						this.customData.smallCount = 0;
+						this.delAllEvent(this.customData)
 					} else {
 						this.updateItemEvent(this.customData);
 						this.modalCancel();

ghsApp/src/pagesStorehouse/allot/putDetails.vue

@@ -5,7 +5,7 @@
 			<view class="space-view ex-info">
 				<view class="info-cell">
 					<view class="cell-label"> 收货仓库</view>
-					<view class="cell-value"> {{ putData.orderSn || "" }}</view>
+					<view class="cell-value"> {{ putData.shopName || "" }}</view>
 				</view>
 				<view class="info-cell">
 					<view class="cell-label"> 日期</view>
@@ -59,13 +59,13 @@
 									</view>
 								</view>
 								<view v-else-if="column.custom == 'stock'">
-									<text v-if="item.bigNumStock > 0"> {{ item.bigNumStock }}/ </text>
+									<text > {{ item.bigNumStock }}/ </text>
 									<text>
 										{{ item.smallNumStock }}
 									</text>
 								</view>
 								<view v-else-if="column.custom == 'put'">
-									<text v-if="item.bigNum > 0"> {{ item.bigNum }}/ </text>
+									<text > {{ item.bigNum }}/ </text>
 									<text>
 										{{ item.smallNum }}
 									</text>

hd/src/views/goods/goods-list.vue

@@ -239,12 +239,6 @@ export default {
 							emptyText: '无',
 							'min-width': 100
 						},
-						{
-							prop: 'belongCategory',
-							label: '所属分类',
-							align: 'center',
-							'min-width': 150
-						},
 						{
 							prop: 'actualSold',
 							label: '销量',
@@ -274,6 +268,12 @@ export default {
 							prop: 'createDate',
 							label: '创建时间',
 							align: 'center'
+						},
+            {
+							prop: 'updateTime',
+							label: '修改时间',
+							align: 'center',
+              'min-width': 100
 						}
 					],
 					// 操作列

hdApp/dist/build/h5/index.html

@@ -1,3 +1,3 @@
 <!DOCTYPE html><html lang="zh-CN"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>零售</title><script>document.addEventListener('DOMContentLoaded', function() {
 				document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
-			})</script><link rel="stylesheet" href="/static/index.css"></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id="app"></div><script>/*BAIDU_STAT*/</script><script src="/static/js/chunk-vendors.03d2b761.js"></script><script src="/static/js/index.51797d35.js"></script></body></html>
+			})</script><link rel="stylesheet" href="/static/index.css"></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id="app"></div><script>/*BAIDU_STAT*/</script><script src="/static/js/chunk-vendors.cafdd6d3.js"></script><script src="/static/js/index.7d458e14.js"></script></body></html>