开发

ghsApp/dist/build/mp-weixin/admin/clear/customOrderItem.json

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

ghsApp/dist/build/mp-weixin/admin/clear/orderItem.json

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

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-result.json

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

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/allMoreSelectInput.json

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

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.json

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

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

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/module/app-search"],{6615:function(t,e,n){"use strict";n.r(e);var u=n("83c3"),a=n.n(u);for(var i in u)["default"].indexOf(i)<0&&function(t){n.d(e,t,(function(){return u[t]}))}(i);e["default"]=a.a},"75c9":function(t,e,n){"use strict";var u=n("7f4d"),a=n.n(u);a.a},"7f4d":function(t,e,n){},"80f2":function(t,e,n){"use strict";n.r(e);var u=n("f796"),a=n("6615");for(var i in a)["default"].indexOf(i)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(i);n("75c9");var c,r=n("0095"),o=Object(r["a"])(a["default"],u["b"],u["c"],!1,null,"24ec2c92",null,!1,u["a"],c);e["default"]=o.exports},"83c3":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={name:"app-search-module",props:{height:{type:Number,default:66},placeholder:{type:String,default:"请输入"},fontSize:{type:Number,default:26},isIcon:{type:Boolean,default:!0},icon:{type:String,default:"iconsearch"},backColor:{type:String,default:"#F0F2F6"},isBtn:{type:Boolean,default:!1},isTextBtn:{type:Boolean,default:!0},btnText:{type:String,default:"搜索"},focus:{type:Boolean,default:!1}},data:function(){return{search:""}},methods:{searchFn:function(){this.$emit("search",this.search)},inputFn:function(t){var e=this;setTimeout((function(){e.$emit("input",e.search)}))},inputEmptyFn:function(t){this.search="",this.$emit("input",this.search)}}};e.default=u},f796:function(t,e,n){"use strict";var u;n.d(e,"b",(function(){return a})),n.d(e,"c",(function(){return i})),n.d(e,"a",(function(){return u}));var a=function(){var t=this,e=t.$createElement;t._self._c},i=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/module/app-search"],{1465: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=[]},"32ad":function(t,e,n){},6615:function(t,e,n){"use strict";n.r(e);var a=n("83c3"),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},"80f2":function(t,e,n){"use strict";n.r(e);var a=n("1465"),u=n("6615");for(var i in u)["default"].indexOf(i)<0&&function(t){n.d(e,t,(function(){return u[t]}))}(i);n("8334");var r,c=n("0095"),o=Object(c["a"])(u["default"],a["b"],a["c"],!1,null,"e7c29aaa",null,!1,a["a"],r);e["default"]=o.exports},8334:function(t,e,n){"use strict";var a=n("32ad"),u=n.n(a);u.a},"83c3":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a={name:"app-search-module",props:{height:{type:Number,default:66},placeholder:{type:String,default:"请输入"},fontSize:{type:Number,default:26},isIcon:{type:Boolean,default:!0},icon:{type:String,default:"iconsearch"},backColor:{type:String,default:"#F0F2F6"},isBtn:{type:Boolean,default:!1},isTextBtn:{type:Boolean,default:!0},btnText:{type:String,default:"搜索"},focus:{type:Boolean,default:!1}},data:function(){return{search:""}},methods:{searchFn:function(){this.$emit("search",this.search)},inputFn:function(t){var e=this;setTimeout((function(){e.$emit("input",e.search)}))},inputEmptyFn:function(t){this.search="",this.$emit("input",this.search)}}};e.default=a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/module/app-search-create-component',
     {

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

@@ -1 +1 @@
-<view class="app-search-module _div data-v-24ec2c92" style="{{'height:'+(height+'rpx')+';'}}"><view class="map-search _div data-v-24ec2c92" style="{{'height:80rpx;'+('background-color:'+(backColor)+';')}}"><block wx:if="{{isIcon}}"><view class="icon-wrap _div data-v-24ec2c92"><view class="{{['iconfont _i data-v-24ec2c92',icon]}}"></view></view></block><view class="input-wrap _div data-v-24ec2c92"><input style="{{'font-size:'+(fontSize+'rpx')+';'}}" type="text" placeholder-style="color:#ccc" focus="{{focus}}" placeholder="{{placeholder}}" placeholder-class="placeholder" confirm-type="search" data-ref="searchInput" data-event-opts="{{[['input',[['__set_model',['','search','$event',[]]],['inputFn',['$event']]]],['focus',[['inputEmptyFn',['$event']]]],['confirm',[['searchFn',['$event']]]]]}}" value="{{search}}" bindinput="__e" bindfocus="__e" bindconfirm="__e" class="data-v-24ec2c92 vue-ref"/></view></view><block wx:if="{{isBtn}}"><block class="data-v-24ec2c92"><block wx:if="{{isTextBtn}}"><button data-event-opts="{{[['tap',[['searchFn',['$event']]]]]}}" class="search-btn data-v-24ec2c92" style="{{'font-size:'+(fontSize+'rpx')+';'}}" bindtap="__e">{{''+btnText+''}}</button></block><block wx:else><button data-event-opts="{{[['tap',[['searchFn',['$event']]]]]}}" class="search-btn admin-button-com middle blue data-v-24ec2c92" style="{{'font-size:'+(fontSize+'rpx')+';'}}" bindtap="__e">{{''+btnText+''}}</button></block></block></block></view>
+<view class="app-search-module _div data-v-e7c29aaa" style="{{'height:'+(height+'rpx')+';'}}"><view class="map-search _div data-v-e7c29aaa" style="{{'height:80rpx;'+('background-color:'+(backColor)+';')}}"><block wx:if="{{isIcon}}"><view class="icon-wrap _div data-v-e7c29aaa"><view class="{{['iconfont _i data-v-e7c29aaa',icon]}}"></view></view></block><view class="input-wrap _div data-v-e7c29aaa"><input style="{{'font-size:'+(fontSize+'rpx')+';'}}" type="text" placeholder-style="color:#ccc" focus="{{focus}}" placeholder="{{placeholder}}" placeholder-class="placeholder" confirm-type="search" data-ref="searchInput" data-event-opts="{{[['input',[['__set_model',['','search','$event',[]]],['inputFn',['$event']]]],['focus',[['inputEmptyFn',['$event']]]],['confirm',[['searchFn',['$event']]]]]}}" value="{{search}}" bindinput="__e" bindfocus="__e" bindconfirm="__e" class="data-v-e7c29aaa vue-ref"/></view></view><block wx:if="{{isBtn}}"><block class="data-v-e7c29aaa"><block wx:if="{{isTextBtn}}"><button data-event-opts="{{[['tap',[['searchFn',['$event']]]]]}}" class="search-btn data-v-e7c29aaa" style="{{'font-size:'+(fontSize+'rpx')+';'}}" bindtap="__e">{{''+btnText+''}}</button></block><block wx:else><button data-event-opts="{{[['tap',[['searchFn',['$event']]]]]}}" class="search-btn admin-button-com middle blue data-v-e7c29aaa" style="{{'font-size:'+(fontSize+'rpx')+';'}}" bindtap="__e">{{''+btnText+''}}</button></block></block></block></view>

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

@@ -1 +1 @@
-.app-search-module.data-v-24ec2c92{width:100%;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}.app-search-module .map-search.data-v-24ec2c92{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;width:100%;height:100%;border-radius:30rpx}.app-search-module .map-search .icon-wrap.data-v-24ec2c92{margin-left:20rpx;width:40rpx}.app-search-module .map-search .icon-wrap .iconfont.data-v-24ec2c92{color:#ccc;font-size:32rpx}.app-search-module .map-search .input-wrap.data-v-24ec2c92{width:calc(100% - 90rpx);height:80rpx;margin-left:14rpx}.app-search-module .map-search .input-wrap input.data-v-24ec2c92{height:100%;font-size:30rpx!important;text-align:left}.app-search-module .map-search .input-wrap .placeholder.data-v-24ec2c92{color:#ccc}.app-search-module .search-btn.data-v-24ec2c92{height:100%;padding:0 20rpx;-webkit-flex-shrink:0;flex-shrink:0;margin-left:20rpx;background-color:inherit}
+.app-search-module.data-v-e7c29aaa{width:100%;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}.app-search-module .map-search.data-v-e7c29aaa{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;width:100%;height:100%;border-radius:30rpx}.app-search-module .map-search .icon-wrap.data-v-e7c29aaa{margin-left:20rpx;width:40rpx}.app-search-module .map-search .icon-wrap .iconfont.data-v-e7c29aaa{color:#ccc;font-size:32rpx}.app-search-module .map-search .input-wrap.data-v-e7c29aaa{width:calc(100% - 90rpx);height:80rpx;margin-left:14rpx}.app-search-module .map-search .input-wrap input.data-v-e7c29aaa{height:100%;font-size:30rpx!important;text-align:left}.app-search-module .map-search .input-wrap .placeholder.data-v-e7c29aaa{color:#ccc}.app-search-module .search-btn.data-v-e7c29aaa{height:100%;padding:0 20rpx;-webkit-flex-shrink:0;flex-shrink:0;margin-left:20rpx;background-color:inherit}

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/plugin/dropdown-list.json

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

ghsApp/dist/build/mp-weixin/components/plugin/fab.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.json

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

ghsApp/dist/build/mp-weixin/pagesInvite/inviteItem.json

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

ghsApp/src/components/module/app-search.vue

@@ -104,7 +104,6 @@ export default {
 			this.$emit("search", this.search);
 		},
 		inputFn(e) {
-			// console.log('sdfa', e)
 			setTimeout(() => {
 				this.$emit("input", this.search);
 			});

ghsApp/src/mixins/product.js

@@ -644,7 +644,13 @@ export default {
 				if(this.py.length <=1){
 					return
 				}
-				// clearInterval(this.timeFun)
+				//红色粉色花材太多，搜索时会卡住，所以设置输入第三个字母时才搜索
+				if(this.py.indexOf('fs') == 0 && this.py.length <= 2){
+					return
+				}
+				if(this.py.indexOf('hs') == 0 && this.py.length <= 2){
+					return
+				}
 				let commonChildList = [];
 				list.forEach(ele => {
 					//过滤常用

ghsApp/src/pagesPurchase/add.vue

@@ -221,13 +221,7 @@ export default {
 			this.$nextTick(()=>{
 				//取消
 				if (val.index === 0) {
-
-
-					//if((this.customData.bigCount>0||this.customData.smallCount>0) && /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.customData.itemPrice) == true){
-						//console.log(222222)
-					//}else{
-						this.delAllEvent(this.customData);
-					//}
+					this.delAllEvent(this.customData);
 					this.modalCancel();
 					return
 				}