jufubao-base 1.0.31 → 1.0.32-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.31",
+  "version": "1.0.32-beta2",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -345,61 +345,60 @@ export default {
     handleScan() {
       console.log(getApp().globalData, "pageAtrr");
       this.$xdShowLoading({});
-      //#ifdef H5
-      jfbRootExec("getH5WxAuthorize", {
-        vm: this,
-        data: { partner_id: 161, site_id: "wx_pub" },
-      })
-        .then((res) => {
-          this.$xdHideLoading();
-          if (this.jwxSDK !== null) {
-            setTimeout(() => {
-              // #ifdef H5
-              this.jwxSDK.scanQRCode({
-                needResult: 1,
-                scanType: ["qrCode"],
-                success: (res) => {
-                  this.$xdUniHelper.navigateTo({
-                    url: `${this.confirmUrl}?qrcode=${encodeURIComponent(
-                      res.resultStr
-                    )}`,
-                  });
-                },
-              });
-              // #endif
-              // #ifdef MP
-              uni.scanCode({
-                success: (res) => {
-                  console.log("scanCode", res);
-                  this.$xdUniHelper.navigateTo({
-                    url: `${this.confirmUrl}?qrcode=${encodeURIComponent(
-                      res.resultStr
-                    )}`,
-                  });
-                },
-              });
-              // #endif
-            }, 100);
-          }
+      try {
+        //#ifdef H5
+        jfbRootExec("getH5WxAuthorize", {
+          vm: this,
+          data: {site_id: "wx_pub" },
         })
-        .catch((err) => {
-          this.$xdHideLoading();
-          this.$xdAlert({
-            content: err,
+          .then((res) => {
+            this.$xdHideLoading();
+            if (this.jwxSDK !== null) {
+              setTimeout(() => {
+                this.jwxSDK.scanQRCode({
+                  needResult: 1,
+                  scanType: ["qrCode"],
+                  success: (res) => {
+                    this.$xdUniHelper.navigateTo({
+                      url: `${this.confirmUrl}?qrcode=${encodeURIComponent(
+                        res.resultStr
+                      )}`,
+                    });
+                  },
+                  fail:(error)=>{
+                    this.setARMSError(error)
+                  }
+                });
+              }, 100);
+            }
+          })
+          .catch((err) => {
+            this.$xdHideLoading();
+            this.$xdAlert({
+              content: err,
+            });
+            this.setARMSError(err)
           });
+        //#endif
+        //#ifdef MP-WEIXIN
+        uni.scanCode({
+          scanType: ["qrCode"],
+          success: (res) => {
+            this.$xdHideLoading();
+            this.$xdUniHelper.navigateTo({
+              url: `${this.confirmUrl}?qrcode=${encodeURIComponent(res.result)}`,
+            });
+          },
+          fail: (error) => {
+            this.setARMSError(error)
+            this.$xdHideLoading();
+          },
         });
-      //#endif
-      //#ifdef MP-WEIXIN
-      uni.scanCode({
-        scanType: ["qrCode"],
-        success: (res) => {
-          this.$xdUniHelper.navigateTo({
-            url: `${this.confirmUrl}?qrcode=${encodeURIComponent(res.result)}`,
-          });
-        },
-        fail: () => {},
-      });
-      //#endif
+        //#endif
+      } catch (err) {
+        this.$xdHideLoading();
+        this.setARMSError(err)
+      }
     },
 
     handleToDisabled() {
@@ -526,10 +525,7 @@ export default {
             return false;
           });
           this.changeList = this.cardList.filter((item) => {
-            if (item["is_exchange"] === "Y") {
-              return true;
-            }
-            return false;
+            return item["is_exchange"] === "Y";
           });
           this.showList = this.cardList;
           this.$xdHideLoading();

package/src/components/JfbBaseHeader/Attr.js

@@ -28,6 +28,16 @@ export default {
           {label: "不显示", value: "N"}
         ]
       },
+      {
+        label: "定位地址非当前城市时",
+        ele: "xd-radio",
+        valueKey: "showSwitchCity",
+        value: data.showSwitchCity || "N",
+        list: [
+          {label: "弹框提示切换", value: "Y"},
+          {label: "不提示", value: "N"}
+        ]
+      },
       data.showLocation==='Y' && {
         label: '选择城市路径:', //label
         ele: 'xd-select-pages-path', //package 名称

package/src/components/JfbBaseHeader/JfbBaseHeader.vue

@@ -37,6 +37,7 @@
             :getCityInfoByLocation="getCityInfoByLocation"
             @done="handleCityDone"
             @onChange="handleCityChange"
+            @alertChange="handleAlertChange"
             :color="textColor"
             :icon="locationIcon"
             :bgColor="locationBackgroundColor"
@@ -77,7 +78,7 @@
   import { getContainerPropsValue } from "@/utils/xd.base";
   import getServiceUrl from "@/common/getServiceUrl";
   import storage from "@/common/storage";
-  import {mapState} from 'vuex';
+  import {mapState, mapMutations } from 'vuex';
   export default {
     name: "JfbBaseHeader",
     components: {
@@ -154,6 +155,7 @@
       this.init(this.container);
     },
     methods: {
+      ...mapMutations(['setShowSwitchCity', 'setCityInfo']),
       onJfbLoad(options) {
         this.loaded = true;
       },
@@ -170,6 +172,8 @@
         this.useSearch = getContainerPropsValue(container, "content.useSearch", "Y");
         this.searchPagePath = getContainerPropsValue(container, "content.searchPagePath", {value:""}).value;
         this.choseCityPath = getContainerPropsValue(container, "content.choseCityPath", {value:""}).value;
+        this.showSwitchCity = getContainerPropsValue(container, "content.showSwitchCity", "N");
+        this.setShowSwitchCity(this.showSwitchCity=="Y")
 
         
         //基础
@@ -236,6 +240,20 @@
         storage.set(this.saveKey, city);
         jfbRootFnExec(this, 'onCustomEvent')("baseHeader@city", city);
       },
+      handleAlertChange(cityInfo){
+        this.$xdConfirm({
+          $vm: this,
+          width: '90%',
+          content: `当前显示您在${cityInfo.city_name}，是否切换到该城市？`,
+          success: (res) => {
+            if (res.confirm) {
+             this.setCityInfo(cityInfo);
+            }else{
+             
+            }
+          }
+        })
+      },
 
       handleCityChange() {
         console.log('handleCityChange');

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -349,20 +349,12 @@ export default {
               },
             })
               .then((res) => {
-                if (this.type === "recharge") {
-                  this.$xdUniHelper.redirectTo({
-                    url:
-                      this.rechargeSuccessPath +
-                      `?order_id=${this.main_order_id}`,
-                  });
-                } else {
-                  this.$xdUniHelper.redirectTo({
-                    url:
-                      this.paySuccessPath + `?order_id=${this.main_order_id}`,
-                  });
-                }
+                if (this.type === "recharge") this.$xdUniHelper.redirectTo({url: this.rechargeSuccessPath + `?order_id=${this.main_order_id}`,});
+                this.$xdUniHelper.redirectTo({url: this.paySuccessPath + `?order_id=${this.main_order_id}`});
               })
-              .catch((err) => {});
+              .catch(error=>{
+                this.$xdLog.setARMSCustomError('update_loading_fail', {options: this.options, error});
+							});
           });
         })
         .catch((err) => this.$xdHideLoading());

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue

@@ -169,9 +169,9 @@ export default {
      * @description 监听事件变化
      * @param container {object} 业务组件对象自己
      */
-    init(value) {
-      //this.bgcolor = getContainerPropsValue(value, 'content.bgcolor', '#fff');
-      //this.height = getContainerPropsValue(value, 'content.height', 10);
+    init(container) {
+      //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
+      //this.height = getContainerPropsValue(container, 'content.height', 10);
     },
     reGetCode() {
       if (this.time > 0) return;