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

ghsApp/src/components/app-uploader.vue

@@ -18,14 +18,14 @@
             <view class="iconfont icondelete" @click="delImg(index)"></view>
             <img
               :src="item"
-              @click="viewImg(item)"
+              @click="viewImg(index)"
               :style="{ width: size + 'rpx', height: size + 'rpx' }"
               :mode="imgMode"
               v-if="!prefixShow"
             />
             <img
               :src="`${constant.imgUrl}/${item}`"
-              @click="viewImg(item)"
+              @click="viewImg(index)"
               :style="{ width: size + 'rpx', height: size + 'rpx' }"
               :mode="imgMode"
               v-if="prefixShow"
@@ -419,10 +419,18 @@ export default {
       await this.postMsg();
     },
     // 预览
-    viewImg(path) {
+    viewImg(index) {
+			let previewImg = this.showImgList.map(item => {
+				  if(this.prefixShow == true){
+            return this.$constant.imgUrl+'/'+item
+          }else{
+            return item;
+          }
+			});
+      console.log('previewImg',previewImg,index)
       uni.previewImage({
-        urls: this.showImgList,
-        current: path
+        urls: previewImg,
+        current: index
       });
     },
     // 获取图片信息

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/pagesStorehouse/allot/addExDetails.vue

@@ -71,20 +71,15 @@
 					</t-table>
 				</block>
 				<view class="btn-bar">
-					<button class="admin-button-com big blue" @click="gotoSelectPage">
-						选择花材
-					</button>
+					<button class="admin-button-com big blue" @click="gotoSelectPage">选择花材</button>
+					<button v-if="!$util.isEmpty(selectList)" class="admin-button-com big blue" @click="removeSelectProduct" style="margin-left:10rpx;">删除已选</button>
 				</view>
 			</view>
 		</view>
 		<view class="bar-view" v-if="!$util.isEmpty(selectList)">
 			<view class="btn-view">
-				<button class="admin-button-com middle" @click="confirmStockOutOrder">
-					保存草稿
-				</button>
-				<button class="admin-button-com middle" @click="createStockOutOrder">
-					直接出库
-				</button>
+				<!-- <button class="admin-button-com middle" @click="confirmStockOutOrder">保存</button> -->
+				<button class="admin-button-com middle" @click="createStockOutOrder">出库</button>
 			</view>
 		</view>
 	</view>
@@ -165,17 +160,19 @@ export default {
 				complete: () => {}
 			});
 		},
-
+		removeSelectProduct(){
+			this.removeMemory()
+		},
 		selectSussess(val) {
-      if(this.getLoginInfo.shopId == val.selectItem.id) {
-        this.$msg('本店不可选')
-        this.isShowTit = false
-        this.shopPlaceholder = '请选择门店'
-        this.form.inShopId = ''
-        return
-      }
-      this.isShowTit = true
-      this.shopPlaceholder = ''
+			if(this.getLoginInfo.shopId == val.selectItem.id) {
+				this.$msg('本店不可选')
+				this.isShowTit = false
+				this.shopPlaceholder = '请选择门店'
+				this.form.inShopId = ''
+				return
+			}
+			this.isShowTit = true
+			this.shopPlaceholder = ''
 			this.form.inShopId = val.selectItem.id;
 		},
 		createStockOutOrder() {
@@ -212,13 +209,6 @@ export default {
 							}
 						}
 					});
-					// await createStockOutOrderApi(formData);
-					// self.$msg("出库成功");
-					// self.clearSelectList();
-					// uni.navigateBack({
-					// 	delta: 1
-					// });
-
 				} else {
 					this.$msg(checkRes);
 				}
@@ -249,7 +239,7 @@ export default {
 				// 验证通过!
 				if (!checkRes) {
 					let self = this;
-								self.confirmStockOut(formData)
+					self.confirmStockOut(formData)
 				} else {
 					this.$msg(checkRes);
 				}
@@ -258,9 +248,8 @@ export default {
 		async confirmStockOut(formData){
 			let { data } = await createStockOutOrderApi(formData);
 			this.$msg("确认成功");
-			this.clearSelectList();
+			this.removeMemory()
 			this.pageTo({url:'/pagesStorehouse/allot/exDetails?orderSn=' + data.orderSn, type: 2});
-			// uni.navigateBack({delta: 1});
 		},
 	}
 };

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 {

hdApp/src/plugins/luch-request_0.0.7/request.js

@@ -156,7 +156,8 @@ class Request {
 								uni.showToast({
 									title: response.data.msg,
 									icon: 'none',
-									mask: true
+									mask: true,
+									duration: 2000
 								})
 							}
 							reject(response.data)