jufubao-base 1.0.162-beta10 → 1.0.162-beta12
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
|
@@ -41,7 +41,6 @@
|
|
|
41
41
|
<view class="jfb-base-sweep__body-other" v-if="show">
|
|
42
42
|
<view>
|
|
43
43
|
<image style="width: 500rpx;height:500rpx" src="https://img0.jufubao.cn/common/qrcode-dome.png?ver=1"></image>
|
|
44
|
-
<view style="color:#000000;font-size:48rpx" class="jfb-base-sweep__body-other-text">重新扫码</view>
|
|
45
44
|
</view>
|
|
46
45
|
<view class="jfb-base-sweep__body-footer" :style="prod_bottom">
|
|
47
46
|
<XdButton @click="scan" type="primary" radius="50rpx" width="50%"
|
|
@@ -77,7 +76,7 @@ export default {
|
|
|
77
76
|
isPreview: false,
|
|
78
77
|
backgroundColor: "",
|
|
79
78
|
other: false,
|
|
80
|
-
show:
|
|
79
|
+
show: false
|
|
81
80
|
};
|
|
82
81
|
},
|
|
83
82
|
computed: {
|
|
@@ -198,9 +197,9 @@ export default {
|
|
|
198
197
|
},
|
|
199
198
|
// 扫描失败后的回调函数
|
|
200
199
|
fail: (error) => {
|
|
201
|
-
console.log(44444);
|
|
202
|
-
this.other =
|
|
203
|
-
this.show =
|
|
200
|
+
// console.log(44444);
|
|
201
|
+
this.other = false;
|
|
202
|
+
this.show = true;
|
|
204
203
|
// 如果error是字符串类型,则将其转换为对象类型
|
|
205
204
|
if (typeof error === "string") error = { error: error };
|
|
206
205
|
// 如果window["jwxJfbSDKParams"]存在,则将error对象与window["jwxJfbSDKParams"]合并
|
|
@@ -209,10 +208,10 @@ export default {
|
|
|
209
208
|
// 调用$xdLog的setARMSError方法,记录错误信息
|
|
210
209
|
this.$xdLog.setARMSError(error);
|
|
211
210
|
},
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
this.other =
|
|
215
|
-
this.show =
|
|
211
|
+
cancel: ()=>{
|
|
212
|
+
console.log(44444);
|
|
213
|
+
this.other = false;
|
|
214
|
+
this.show = true;
|
|
216
215
|
}
|
|
217
216
|
});
|
|
218
217
|
}
|
|
@@ -275,10 +274,10 @@ export default {
|
|
|
275
274
|
},
|
|
276
275
|
fail: (error) => {
|
|
277
276
|
// 如果扫描失败,则调用$xdLog.setARMSError方法记录错误信息
|
|
278
|
-
this.other =
|
|
279
|
-
this.show =
|
|
277
|
+
this.other = false;
|
|
278
|
+
this.show = true;
|
|
280
279
|
this.$xdLog.setARMSError(error);
|
|
281
|
-
}
|
|
280
|
+
}
|
|
282
281
|
});
|
|
283
282
|
},
|
|
284
283
|
scan() {
|
|
@@ -308,6 +307,8 @@ export default {
|
|
|
308
307
|
}).value;
|
|
309
308
|
},
|
|
310
309
|
onJfbShow(options) {
|
|
310
|
+
this.other = false;
|
|
311
|
+
this.show = true;
|
|
311
312
|
console.log("event.onJfbShow", options);
|
|
312
313
|
},
|
|
313
314
|
},
|
|
@@ -326,7 +327,6 @@ export default {
|
|
|
326
327
|
padding-top: 300rpx;
|
|
327
328
|
align-items: center;
|
|
328
329
|
flex-direction: column;
|
|
329
|
-
height: 100%;
|
|
330
330
|
&-text {
|
|
331
331
|
margin-top: 40rpx;
|
|
332
332
|
color: #666;
|