jufubao-mall 2.0.44-beta3 → 2.0.44-beta4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -133,7 +133,7 @@
|
|
|
133
133
|
</view>
|
|
134
134
|
<!-- 二维码 -->
|
|
135
135
|
<view class="qrcode_box" v-if="shopInfo&&shopInfo.show_qrcode&&!is_plus_site&&showTake==='Y'">
|
|
136
|
-
<qrcode-show :show_qrcode="shopInfo.show_qrcode" :shop_id="shopInfo.shop_id" :layoutInfo="layoutInfo" :xnamespace="xnamespace" :brandLogo="brandLogo"></qrcode-show>
|
|
136
|
+
<qrcode-show :show_qrcode="shopInfo.show_qrcode" :shop_id="shopInfo.shop_id" :layoutInfo="layoutInfo" :xnamespace="xnamespace" :brandLogo="brandLogo" :successPath="successPath"></qrcode-show>
|
|
137
137
|
</view>
|
|
138
138
|
<!-- 二维码 -->
|
|
139
139
|
<view v-if="isShowCodeProduct && productList.length" class="code_product_wrap">
|
|
@@ -321,6 +321,7 @@
|
|
|
321
321
|
isTextOverflow:false,
|
|
322
322
|
showBrandDetailDialog:false,
|
|
323
323
|
brandLogo:'',
|
|
324
|
+
successPath:'',
|
|
324
325
|
}
|
|
325
326
|
},
|
|
326
327
|
watch: {
|
|
@@ -605,7 +606,7 @@
|
|
|
605
606
|
this.showDiscount = gCPVal(container, 'showDiscount', 'Y');
|
|
606
607
|
this.isAddCart = gCPVal(container, 'isAddCart', 'Y');
|
|
607
608
|
this.differ = gCPVal(container, 'differ', 1);
|
|
608
|
-
|
|
609
|
+
this.successPath = getContainerPropsValue(container, 'content.successPath', {value: ""}).value;
|
|
609
610
|
console.log("cartStyle", this.cartName, this.cartStyle);
|
|
610
611
|
|
|
611
612
|
console.log("itemBgcColoStyle", itemBgcColoStyle);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<view class="body-qrcode">
|
|
3
|
-
<show-qp v-if="show_qrcode==='QP'" :shop_id="shop_id" :layoutInfo="layoutInfo" :xnamespace="xnamespace"></show-qp>
|
|
3
|
+
<show-qp v-if="show_qrcode==='QP'" :shop_id="shop_id" :layoutInfo="layoutInfo" :xnamespace="xnamespace" :successPath="successPath"></show-qp>
|
|
4
4
|
<show-card v-if="show_qrcode==='CARD'" :shop_id="shop_id" :layoutInfo="layoutInfo" :xnamespace="xnamespace" :brandLogo="brandLogo"></show-card>
|
|
5
5
|
</view>
|
|
6
6
|
</template>
|
|
@@ -40,6 +40,10 @@
|
|
|
40
40
|
xnamespace:{
|
|
41
41
|
type: String,
|
|
42
42
|
default: ''
|
|
43
|
+
},
|
|
44
|
+
successPath: {
|
|
45
|
+
type: String,
|
|
46
|
+
default: ''
|
|
43
47
|
}
|
|
44
48
|
},
|
|
45
49
|
data(){
|
|
@@ -127,7 +127,6 @@
|
|
|
127
127
|
temp_order_id: "",
|
|
128
128
|
request_order_id: "",
|
|
129
129
|
//todo
|
|
130
|
-
successPath: '',
|
|
131
130
|
}
|
|
132
131
|
},
|
|
133
132
|
props:{
|
|
@@ -143,6 +142,10 @@
|
|
|
143
142
|
type: String,
|
|
144
143
|
default: ""
|
|
145
144
|
},
|
|
145
|
+
successPath:{
|
|
146
|
+
type:String,
|
|
147
|
+
default:""
|
|
148
|
+
}
|
|
146
149
|
},
|
|
147
150
|
computed: {
|
|
148
151
|
...mapState({
|
|
@@ -168,13 +171,13 @@
|
|
|
168
171
|
|
|
169
172
|
},
|
|
170
173
|
watch: {
|
|
171
|
-
container(value,oldValue) {
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
},
|
|
174
|
+
// container(value,oldValue) {
|
|
175
|
+
// if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
|
|
176
|
+
// if (this.$configProject['isPreview']) this.init(value)
|
|
177
|
+
// },
|
|
175
178
|
},
|
|
176
179
|
created() {
|
|
177
|
-
|
|
180
|
+
console.log(this.successPath,'successPathsuccessPath')
|
|
178
181
|
this.projectAttr = getApp().globalData.$xd.brandInfo;
|
|
179
182
|
console.log(this.projectAttr,'this.projectAttr')
|
|
180
183
|
this.isPreview = this.$configProject.isPreview;
|
|
@@ -200,10 +203,7 @@
|
|
|
200
203
|
* @description 监听事件变化
|
|
201
204
|
* @param container {object} 业务组件对象自己
|
|
202
205
|
*/
|
|
203
|
-
|
|
204
|
-
console.log(this.xnamespace,'xnamespace1111')
|
|
205
|
-
this.successPath = getContainerPropsValue(container, 'content.successPath', {value: ""}).value;
|
|
206
|
-
},
|
|
206
|
+
|
|
207
207
|
handleRefreshCode(){
|
|
208
208
|
if (this.$configProject['isPreview']) return;
|
|
209
209
|
this.onRefreshPage();
|