Commit b70e36e4b6e0318f6dd1a660dec4cdba1f336d11

Authored by zhiyangdu
1 parent 28e9cac5

优惠券兑换兼容app内订单回选优惠券

src/pages/goodDetails/goodDetails.vue
@@ -549,7 +549,7 @@ export default { @@ -549,7 +549,7 @@ export default {
549 message: tipMessage, 549 message: tipMessage,
550 messageAlign: "center", 550 messageAlign: "center",
551 confirmButtonText: "我知道了", 551 confirmButtonText: "我知道了",
552 - confirmButtonCallback: "" 552 + confirmButtonCallback: (this.$route.query.AppJump?this.$parent.destroy:"")
553 // confirmButtonCallback: this.addAddressCallback, 553 // confirmButtonCallback: this.addAddressCallback,
554 // params: { shopType: datas.shop_type, id: datas.id } 554 // params: { shopType: datas.shop_type, id: datas.id }
555 }; 555 };
src/pages/morePoints/morePoints.vue
@@ -173,26 +173,27 @@ export default { @@ -173,26 +173,27 @@ export default {
173 */ 173 */
174 toDetail (item) { 174 toDetail (item) {
175 if (this.isCNLive.value) { 175 if (this.isCNLive.value) {
176 - // this.$router.push({  
177 - // path: "/goodDetails",  
178 - // query: {  
179 - // goodsId: item.id,  
180 - // uid: this.getStore("uid")  
181 - // }  
182 - // }) 176 + this.$router.push({
  177 + path: "/goodDetails",
  178 + query: {
  179 + goodsId: item.id,
  180 + uid: this.getStore("uid"),
  181 + AppJump: this.$route.query.AppJump || false // 判断是否是APP跳转过来的
  182 + }
  183 + })
183 // 通用跳转跳转到商品详情页新打开webview 184 // 通用跳转跳转到商品详情页新打开webview
184 - if (typeof this.$parent.gotoDetail === 'function') { 185 + // if (typeof this.$parent.gotoDetail === 'function') {
185 186
186 - // 设置跳转参数  
187 - let params = {  
188 - type: '5',  
189 - to: window.location.origin + '/html/select_good/1/#/goodDetails?goodsId=' + item.id,  
190 - shop_type: ''  
191 - }; 187 + // // 设置跳转参数
  188 + // let params = {
  189 + // type: '5',
  190 + // to: window.location.origin + '/html/select_good/1/#/goodDetails?goodsId=' + item.id,
  191 + // shop_type: ''
  192 + // };
192 193
193 - // 页面跳转  
194 - this.$parent.gotoDetail(params);  
195 - } 194 + // // 页面跳转
  195 + // this.$parent.gotoDetail(params);
  196 + // }
196 } else { 197 } else {
197 this.$parent.callApp(); 198 this.$parent.callApp();
198 } 199 }