shish 9 ore fa
parent
commit
38093faa4e

+ 1 - 1
hdApp/src/admin/billing/affirmDn.vue

@@ -1112,7 +1112,7 @@ export default {
 			}
 		},
 		gobackEvent() {
-			this.$util.pageTo({url: "/pagesPurchase/ghsProduct?id="+this.options.id,type: 2})
+			this.$util.pageTo({url: "/pagesPurchase/ghsProduct?id="+this.options.id+'&ghsId='+this.options.id,type: 2})
 		}
 	}
 };

+ 1 - 1
hdApp/src/admin/billing/affirmGhs.vue

@@ -1230,7 +1230,7 @@ export default {
 			}
 		},
 		gobackEvent() {
-			this.$util.pageTo({url: "/pagesPurchase/ghsProduct?id="+this.options.id,type: 2})
+			this.$util.pageTo({url: "/pagesPurchase/ghsProduct?id="+this.options.id+'&ghsId='+this.options.id,type: 2})
 		}
 	}
 };

+ 1 - 1
hdApp/src/admin/billing/affirmSh.vue

@@ -1288,7 +1288,7 @@ export default {
 			}
 		},
 		gobackEvent() {
-			this.$util.pageTo({url: "/pagesPurchase/ghsProduct?id="+this.options.id,type: 2})
+			this.$util.pageTo({url: "/pagesPurchase/ghsProduct?id="+this.options.id+'&ghsId='+this.options.id,type: 2})
 		}
 	}
 };

+ 1 - 1
hdApp/src/admin/coupon/couponList.vue

@@ -125,7 +125,7 @@ export default {
 		},
 		// 去使用
 		useHb(item) {
-			this.$util.pageTo({url: '/pagesPurchase/ghsProduct?id='+item.ghsId, type: 2})
+			this.$util.pageTo({url: '/pagesPurchase/ghsProduct?id='+item.ghsId+'&ghsId='+item.ghsId, type: 2})
 		}
 	}
 }

+ 1 - 1
hdApp/src/admin/ghsProduct/detail.vue

@@ -197,7 +197,7 @@ export default {
       }
     },
     goShopIndex() {
-      this.$util.pageTo({ url: `/pagesPurchase/ghsProduct?id=${this.option.ghsId}`, type: 2 })
+      this.$util.pageTo({ url: `/pagesPurchase/ghsProduct?id=${this.option.ghsId}&ghsId=${this.option.ghsId}`, type: 2 })
     },
     goCartPage() {
       if (!this.checkLogin()) {

+ 4 - 0
hdApp/src/mixins/cgProduct.js

@@ -228,6 +228,10 @@ export default {
 			if (opt.ghsId && Number(opt.ghsId) > 0) {
 				return Number(opt.ghsId);
 			}
+			//这条有用,不能删除。ghsProduct.vue里使用到。这个还是去不成,很多地方有用到,包括affirmSh等
+			if (opt.id && Number(opt.id) > 0) {
+				return Number(opt.id);
+			}
 			return 0;
 		},
 		/**

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

@@ -508,7 +508,7 @@ export default {
 			// #endif
 			// #ifdef MP-WEIXIN
 			if(Number(this.ghsId)>0){
-				uni.reLaunch({url: '/pagesPurchase/ghsProduct?id='+this.ghsId})
+				uni.reLaunch({url: '/pagesPurchase/ghsProduct?id='+this.ghsId+'&ghsId='+this.ghsId})
 			}else{
 				this.$util.confirmModal({content:'没有登录,请先登录'},() => {
 					this.pageTo({url: '/admin/home/login'})
@@ -798,12 +798,12 @@ export default {
 		goNext(){
 			let id = this.options.id||0
 			if(this.ghsInfo && this.ghsInfo.pfLevel == 1){
-				this.pageTo({url: '/admin/billing/affirmDn?id='+id,type: 2})
+				this.pageTo({url: '/admin/billing/affirmDn?id='+id+'&ghsId='+id,type: 2})
 			}else{
 				if(this.ghsInfo && this.ghsInfo.useNewShMethod == 1){
-					this.pageTo({url: '/admin/billing/affirmSh?id='+id,type: 2})
+					this.pageTo({url: '/admin/billing/affirmSh?id='+id+'&ghsId='+id,type: 2})
 				}else{
-					this.pageTo({url: '/admin/billing/affirmGhs?id='+id,type: 2})
+					this.pageTo({url: '/admin/billing/affirmGhs?id='+id+'&ghsId='+id,type: 2})
 				}
 			}
 		}