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

ghsApp/src/admin/shop/add.vue

@@ -205,7 +205,7 @@
 						msg: ['请填写详细地址']
 					}
 				]
-				// 进行表单检查
+				// 进行npm表单检查
 				let formData = e.detail.value
 				let checkRes = form.validation(formData, rules)
 				// 验证通过!

ghsApp/src/pagesClient/member/detail.vue

@@ -128,7 +128,7 @@ export default {
             debt: this.form.debt,
             customId: this.userInfo.id
           })
-          let msg = e.detail.value?'开启延期付款':'关闭延期付款'
+          let msg = e.detail.value?'已开启':'已禁止'
           this.$msg(msg);
         } catch (err) {
           console.log(err)

hdApp/src/mixins/globalMixins.js

@@ -16,7 +16,8 @@ export default {
 		}
 	},
 	computed: {
-		...mapGetters({ loginInfo: "getLoginInfo" })
+		...mapGetters({ loginInfo: "getLoginInfo" }),
+		...mapGetters(["getLoginInfo"])
 	},
 	// 页面生命周期才触发
 	onLoad: function (option) {

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -198,7 +198,7 @@ export default {
 					this.pageInfo = res.data
 					uni.setNavigationBarTitle({title: this.pageInfo.name})
 					this.option.id = res.data.id;
-					this.initGhsData(res.data.id);//采购-进店下单
+					this.initGhsData(res.data.id,shopId);//采购-进店下单
 				}).catch(err => {})
 			} else {
 				getGhsDataApi({id: this.option.id}).then(res => {