线上

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

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

@@ -381,6 +381,5 @@
     "t-tr": "/components/plugin/t-table/t-tr",
     "t-th": "/components/plugin/t-table/t-th",
     "t-td": "/components/plugin/t-table/t-td"
-  },
-  "sitemapLocation": "sitemap.json"
+  }
 }

ghsApp/dist/build/mp-weixin/components/app-coupon-sel.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 @@
 {
-  "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-close.json

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

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

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

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

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

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/plugin/t-table/t-table.json

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

ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-td.json

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

ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-th.json

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

ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-tr.json

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

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

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

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

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

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

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

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

@@ -1 +1 @@
-<app-result vue-id="2540701a-1" title="{{title?title:'成功'}}" class="data-v-9051a8f2" bind:__l="__l" vue-slots="{{['default']}}"><view class="flowers-list-box data-v-9051a8f2"><view class="flex title data-v-9051a8f2">已入库，建议修改售价：</view><checkbox-group data-event-opts="{{[['change',[['checkboxChange',['$event']]]]]}}" bindchange="__e" class="data-v-9051a8f2"><block wx:for="{{$root.l0}}" wx:for-item="res" wx:for-index="i" wx:key="i"><view class="data-v-9051a8f2"><view class="product-area data-v-9051a8f2"><view class="first-area data-v-9051a8f2"><text class="data-v-9051a8f2">{{res.$orig.name}}</text><input type="digit" data-event-opts="{{[['focus',[['priceFocus',[i]]]],['input',[['__set_model',['$0','autoPrice','$event',[]],[[['flowersList','',i]]]],['updatePrice',['$0','$1'],[[['flowersList','',i,'id']],[['flowersList','',i,'autoPrice']]]]]]]}}" value="{{res.$orig.autoPrice}}" bindfocus="__e" bindinput="__e" class="data-v-9051a8f2"/></view><view class="second-area data-v-9051a8f2"><block wx:if="{{res.m0!=res.m1&&res.m2>0}}"><view class="change-add-price data-v-9051a8f2"><label class="data-v-9051a8f2">{{'成本价'+res.m3+"，建议加价改成"+res.m4+"元，确认请勾选"}}<checkbox style="transform:scale(0.8);" value="{{res.$orig.id}}" class="data-v-9051a8f2"></checkbox></label></view></block></view></view></view></block></checkbox-group></view><button data-event-opts="{{[['tap',[['commitChange',['$event']]]]]}}" class="admin-button-com big blue data-v-9051a8f2" style="width:80%;margin-top:50rpx;" bindtap="__e">保存修改</button><navigator class="flex-center goHome data-v-9051a8f2" open-type="switchTab" data-event-opts="{{[['tap',[['goBackHome',['$event']]]]]}}" bindtap="__e">返回首页</navigator></app-result>
+<app-result vue-id="2540701a-1" title="已完成" class="data-v-78ad2a05" bind:__l="__l" vue-slots="{{['default']}}"><view class="flowers-list-box data-v-78ad2a05"><view class="flex title data-v-78ad2a05">建议修改以下花材售价：</view><checkbox-group data-event-opts="{{[['change',[['checkboxChange',['$event']]]]]}}" bindchange="__e" class="data-v-78ad2a05"><block wx:for="{{$root.l0}}" wx:for-item="res" wx:for-index="i" wx:key="i"><view class="data-v-78ad2a05"><view class="product-area data-v-78ad2a05"><view class="first-area data-v-78ad2a05"><text class="data-v-78ad2a05">{{res.$orig.name}}</text><input type="digit" data-event-opts="{{[['focus',[['priceFocus',[i,'$0'],[[['flowersList','',i]]]]]],['input',[['__set_model',['$0','autoPrice','$event',[]],[[['flowersList','',i]]]],['modifyPrice',['$0'],[[['flowersList','',i]]]]]]]}}" value="{{res.$orig.autoPrice}}" bindfocus="__e" bindinput="__e" class="data-v-78ad2a05"/>元</view><view class="second-area data-v-78ad2a05"><block wx:if="{{res.m0!=res.m1&&res.m2>0}}"><view class="one data-v-78ad2a05"><label class="data-v-78ad2a05">{{"成本 "+res.m3+"，加价建议改成"+res.m4+"元，修改请勾选"}}<checkbox style="transform:scale(0.7);" value="{{res.$orig.id}}" class="data-v-78ad2a05"></checkbox></label></view></block><block wx:else><view class="two data-v-78ad2a05">{{"成本 "+res.m5+"，加价 "+res.m6+"元"}}</view></block></view></view></view></block></checkbox-group></view><button data-event-opts="{{[['tap',[['commitChange',['$event']]]]]}}" class="admin-button-com big blue data-v-78ad2a05" style="width:80%;margin-top:50rpx;" bindtap="__e">确认修改</button><navigator class="flex-center goHome data-v-78ad2a05" open-type="switchTab" data-event-opts="{{[['tap',[['goBackHome',['$event']]]]]}}" bindtap="__e">返回首页</navigator></app-result>

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

@@ -1 +1 @@
-.admin-button-com.data-v-9051a8f2{margin-bottom:20rpx;width:100%}.goHome.data-v-9051a8f2{width:80%;height:80rpx;color:#fff;margin-top:50rpx;background:#3385ff;border-radius:10rpx;font-size:30rpx}.title.data-v-9051a8f2{font-weight:700;margin-bottom:30rpx}.product-area.data-v-9051a8f2{width:600rpx;height:120rpx}.product-area .first-area text.data-v-9051a8f2{width:270rpx;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:inline-block}.product-area .first-area input.data-v-9051a8f2{border:1rpx solid #ccc;display:inline-block;width:150rpx;margin-left:30rpx}.product-area .second-area.data-v-9051a8f2{float:left;color:#646464;margin-top:5rpx}
+.admin-button-com.data-v-78ad2a05{margin-bottom:20rpx;width:100%}.goHome.data-v-78ad2a05{width:80%;height:80rpx;color:#fff;margin-top:50rpx;background:#3385ff;border-radius:10rpx;font-size:30rpx}.title.data-v-78ad2a05{font-weight:700;margin-bottom:30rpx}.product-area.data-v-78ad2a05{width:600rpx;height:120rpx}.product-area .first-area text.data-v-78ad2a05{width:270rpx;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:inline-block}.product-area .first-area input.data-v-78ad2a05{border:1rpx solid #ccc;display:inline-block;width:150rpx;margin-left:30rpx;margin-right:10rpx}.product-area .second-area.data-v-78ad2a05{float:left;color:#646464;margin-top:10rpx}.product-area .second-area .one.data-v-78ad2a05{color:red}.product-area .second-area .two.data-v-78ad2a05{color:#ccc}

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

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

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

@@ -5,54 +5,27 @@
   },
   "setting": {
     "urlCheck": false,
-    "es6": true,
-    "enhance": true,
-    "postcss": true,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "newFeature": false,
-    "coverView": true,
-    "nodeModules": false,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "enableEngineNative": false,
-    "useIsolateContext": true,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "showES6CompileOption": false
+    "es6": true
   },
   "compileType": "miniprogram",
   "libVersion": "",
   "appid": "wxcf32b3f0684c2433",
-  "projectname": "%E4%BE%9B%E5%BA%94%E5%95%86",
+  "projectname": "供应商",
   "condition": {
     "search": {
+      "current": -1,
       "list": []
     },
     "conversation": {
+      "current": -1,
       "list": []
     },
     "game": {
+      "current": -1,
       "list": []
     },
     "miniprogram": {
+      "current": -1,
       "list": []
     }
   }

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

@@ -1,7 +0,0 @@
-{
-  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
-  "rules": [{
-  "action": "allow",
-  "page": "*"
-  }]
-}

ghsApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wx21b7c3ef12082099",
+  "extAppid": "wxcf32b3f0684c2433",
   "directCommit": false,
   "ext": {
-    "account": 12362,
-    "apiHost": "https://api.shop.hzghd.com",
-    "socketApiHost": "api.shop.hzghd.com",
-    "imgHost": "https://img.hzghd.com",
-    "name":"花掌柜"
+    "account": 12358,
+    "apiHost": "https://api.shop.wixhb.com",
+    "socketApiHost": "api.shop.wixhb.com",
+    "imgHost": "https://img.wixhb.com",
+    "name":"销花宝"
   }
 }

ghsApp/src/manifest.json

@@ -83,15 +83,21 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（销花宝） wxcf32b3f0684c2433 开发（花掌柜） wx21b7c3ef12082099 */
     "mp-weixin" : {
-        "appid" : "wx21b7c3ef12082099",
+        "appid" : "wxcf32b3f0684c2433",
         "setting" : {
             "urlCheck" : false
         },
+		"optimization" : {
+			"subPackages" : true
+		},
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "请点击确定"
             }
+        },
+        "optimization": {  
+            "subPackages": true  
         }
     },
     "mp-alipay" : {

ghsApp/src/pagesPurchase/components/pageSuccess.vue

@@ -32,33 +32,41 @@
 			display:inline-block;
 			width:150rpx;
 			margin-left:30rpx;
+			margin-right:10rpx;
 		}
 	}
 	.second-area{
 		float:left;
 		color:#646464;
-		margin-top:5rpx;
+		margin-top:10rpx;
+		.one{
+			color:red;
+		}
+		.two{
+			color:#CCCCCC;
+		}
 	}
 }
 </style>
 <template>
-  <appResult :title="title?title:'成功'">
+  <appResult title="已完成">
 	<view class="flowers-list-box">
-		<view class="flex title">已入库，建议修改售价：</view>
-<checkbox-group @change="checkboxChange">
-		<view v-for="(res,i) in flowersList" :key="i">
-			<view class="product-area">
-				<view class="first-area"><text>{{res.name}}</text><input type="digit" v-model="res.autoPrice" @focus="priceFocus(i)" @input="updatePrice(res.id,res.autoPrice)"></view>
-				<view class="second-area">
-	                <view v-if="parseFloat(res.autoPrice)!=parseFloat(Number(res.addPrice)+Number(res.cost)) && parseFloat(Number(res.autoPrice)-Number(res.cost)) > 0" class="change-add-price">
-		 <label>
-成本价{{parseFloat(res.cost)}}，建议加价改成{{parseFloat(Number(res.autoPrice)-Number(res.cost))}}元，确认请勾选<checkbox :value="res.id" style="transform:scale(0.8)" /> </label></view>
+		<view class="flex title">建议修改以下花材售价：</view>
+		<checkbox-group @change="checkboxChange">
+			<view v-for="(res,i) in flowersList" :key="i">
+				<view class="product-area">
+					<view class="first-area"><text>{{res.name}}</text><input type="digit" v-model="res.autoPrice" @focus="priceFocus(i,res)" @input="modifyPrice(res)"> 元</view>
+					<view class="second-area">
+			                <view class="one" v-if="parseFloat(res.autoPrice)!=parseFloat(Number(res.addPrice)+Number(res.cost)) && parseFloat(Number(res.autoPrice)-Number(res.cost)) > 0">
+							<label>成本 {{parseFloat(res.cost)}}，加价建议改成{{parseFloat(Number(res.autoPrice)-Number(res.cost))}}元，修改请勾选<checkbox :value="res.id" style="transform:scale(0.7)" /> </label>
+						</view>
+						<view class="two" v-else>成本 {{parseFloat(res.cost)}}，加价 {{parseFloat(res.addPrice)}}元</view>
+					</view>
 				</view>
 			</view>
-		</view>
-</checkbox-group>
+		</checkbox-group>
 	</view>
-	<button class="admin-button-com big blue" style="width:80%;margin-top:50rpx;" @click="commitChange">保存修改</button>
+	<button class="admin-button-com big blue" style="width:80%;margin-top:50rpx;" @click="commitChange">确认修改</button>
 	<navigator open-type="switchTab" class="flex-center goHome" @click="goBackHome" >返回首页</navigator>
   </appResult>
 </template>
@@ -92,12 +100,22 @@ export default {
 		uni.navigateBack({delta:2})
 	},
 	methods: {
-            checkboxChange: function (e) {
-                console.log('values',e.detail.value)
-				this.costChangeIds = e.detail.value
-            },
-		priceFocus(i){
+		checkboxChange(e) {
+			console.log('values',e.detail.value)
+			this.costChangeIds = e.detail.value
+		},
+		priceFocus(i,res){
 			this.flowersList[i].autoPrice = ''
+
+			let id = res.id
+			if(parseFloat(res.autoPrice)==parseFloat(Number(res.addPrice)+Number(res.cost)) || parseFloat(Number(res.autoPrice)-Number(res.cost)) < 0){
+				let i = this.costChangeIds.indexOf(id)
+				if(i > -1){
+					this.costChangeIds.splice(i,1)
+				}
+			}
+			console.log('this.costChangeIds',this.costChangeIds)
+
 		},
 		closeLayer() {
 			uni.navigateBack({delta: 3});
@@ -115,7 +133,18 @@ export default {
 				})
 			});
 		},
-		updatePrice(id,price){
+		modifyPrice(res){
+			let id = res.id
+			let price = res.autoPrice
+
+			if(parseFloat(res.autoPrice)==parseFloat(Number(res.addPrice)+Number(res.cost)) || parseFloat(Number(res.autoPrice)-Number(res.cost)) < 0){
+				let i = this.costChangeIds.indexOf(id)
+				if(i > -1){
+					this.costChangeIds.splice(i,1)
+				}
+			}
+			console.log('this.costChangeIds',this.costChangeIds)
+
 			let arr = this.productList.map((ele)=>{
 				if(ele.id == id){
 					return {id:id,price:price}
@@ -123,7 +152,6 @@ export default {
 				return ele
 			})
 			this.productList = arr
-			console.log(this.productList)
 		},
 		commitChange(){
 			let that = this

ghsApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {