shish 5 лет назад
Родитель
Сommit
ec92ec0239

+ 1 - 1
ghsApp/src/pagesClient/member/detail.vue

@@ -53,7 +53,7 @@
             <tui-list-cell class="line-cell" :hover="false">
             <tui-list-cell class="line-cell" :hover="false">
               <div class="tui-title">允许欠款</div>
               <div class="tui-title">允许欠款</div>
               <div class="switch_bx">
               <div class="switch_bx">
-                <text>已关闭</text>
+                <text></text>
                 <switch :checked="form.debt == 0 ? false : true" @change="remindChangeFn" />
                 <switch :checked="form.debt == 0 ? false : true" @change="remindChangeFn" />
               </div>
               </div>
             </tui-list-cell>
             </tui-list-cell>

+ 15 - 4
hdApp/src/pagesPurchase/ghsProduct.vue

@@ -147,7 +147,6 @@ export default {
 	data() {
 	data() {
 		return {
 		return {
 			COMMODITY_TYPE,
 			COMMODITY_TYPE,
-			// offVerifyRepertory:true,//关闭库存验证
 			isGhsProduct:true,//采购进店开单
 			isGhsProduct:true,//采购进店开单
 			isModel: false,
 			isModel: false,
 			isSmallCount: false,
 			isSmallCount: false,
@@ -165,7 +164,8 @@ export default {
 				expendAmount:'0.00',
 				expendAmount:'0.00',
 				debtAmount:'0.00'
 				debtAmount:'0.00'
 			},
 			},
-			myClass: 'fadeIn'
+			myClass: 'fadeIn',
+			shopId:0
 		};
 		};
 	},
 	},
 	computed: {
 	computed: {
@@ -189,13 +189,23 @@ export default {
 		this.resetSelectInfoByType(this.pageType)
 		this.resetSelectInfoByType(this.pageType)
 	},
 	},
 	onShareAppMessage(res) {
 	onShareAppMessage(res) {
+
+		let ghsShopAdminId = this.option.ghsShopAdminId ? this.option.ghsShopAdminId : 0
+		
+		if(this.option.shopId){
+			this.shopId = this.option.shopId
+		}
+
+		//查看分享的路径,不要删除 shish 20210517
+		console.log('share',`pagesPurchase/ghsProduct?hdShopAdminId=${this.loginInfo.shopAdminId}&ghsShopAdminId=${ghsShopAdminId}&shopId=${this.shopId}&id=0`)
+
 		return {
 		return {
 			title: this.pageInfo.shopName,
 			title: this.pageInfo.shopName,
 			desc: "",
 			desc: "",
-			path: `pagesPurchase/gshProudct?hdShopAdminId=${this.loginInfo.shopAdminId}&ghsShopAdminId=${this.option.ghsShopAdminId}&shopId=${this.option.shopId}`
+			path: `pagesPurchase/ghsProduct?hdShopAdminId=${this.loginInfo.shopAdminId}&ghsShopAdminId=${ghsShopAdminId}&shopId=${this.shopId}&id=0`
 		}
 		}
-	},
 
 
+	},
 	methods: {
 	methods: {
 		init(){
 		init(){
 			const { shopId,id} = this.options;
 			const { shopId,id} = this.options;
@@ -210,6 +220,7 @@ export default {
 			} else {
 			} else {
 				getGhsDataApi({id: this.option.id}).then(res => {
 				getGhsDataApi({id: this.option.id}).then(res => {
 					this.pageInfo = res.data
 					this.pageInfo = res.data
+					this.shopId = res.data.shopId
 					uni.setNavigationBarTitle({
 					uni.setNavigationBarTitle({
 						title: this.pageInfo.name
 						title: this.pageInfo.name
 					})
 					})

+ 2 - 2
mallApp/src/pages/pay/index.vue

@@ -286,8 +286,8 @@
 					type: 2,
 					type: 2,
 					query: {
 					query: {
 						pageStatus: 3,
 						pageStatus: 3,
-            orderSn:this.payCallData.orderSn,
-            totalPrice:this.payCallData.totalPrice,
+						orderSn:this.payCallData.orderSn,
+						totalPrice:this.payCallData.totalPrice,
 						id: this.payCallData.orderId,
 						id: this.payCallData.orderId,
 						...this.params
 						...this.params
 					}
 					}