jufubao-base 1.0.32-beta2 → 1.0.32-beta4

package/package.json

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

package/src/components/JfbBaseHeader/Attr.js

@@ -28,16 +28,16 @@ export default {
           {label: "不显示", value: "N"}
         ]
       },
-      {
-        label: "定位地址非当前城市时",
-        ele: "xd-radio",
-        valueKey: "showSwitchCity",
-        value: data.showSwitchCity || "N",
-        list: [
-          {label: "弹框提示切换", value: "Y"},
-          {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

@@ -172,8 +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")
+        // this.showSwitchCity = getContainerPropsValue(container, "content.showSwitchCity", "N");
+        this.setShowSwitchCity(true);
 
         
         //基础

package/src/components/JfbBaseRechargeSuccess/JfbBaseRechargeSuccess.vue

@@ -148,6 +148,7 @@ export default {
         if (this.timeer) {
           clearTimeout(this.timeer);
         }
+        this.$xdLog.setARMSInfo({message: '订单完成',}, `recharge_success`);
         return;
       }
 
@@ -156,30 +157,19 @@ export default {
         if (this.timeer) {
           clearTimeout(this.timeer);
         }
+        this.$xdLog.setARMSInfo({message: '订单失败',}, `recharge_fail`);
         return;
-      };
+      }
       if (this.$xdUniHelper.checkVarType(this.info) === "object") {
         this.time++;
         this.timeer = setTimeout(() => {
           this.getStatus();
+          if (this.time > 5) this.$xdLog.setARMSInfo({message: '进行中',}, 'recharge_loading');
         }, Math.pow(this.date, this.time > this.maxTime ? this.maxTime : this.time) * 1000);
       }
     },
-    destroyed() {
-      if (this.timeer) {
-        clearTimeout(this.timeer)
-      }
-    },
-    onJfbScroll(options) {
-      console.log("event.onJfbScroll", options);
-    },
-    onJfbReachBottom(options) {
-      console.log("event.onJfbReachBottom", options);
-    },
-    onJfbShow(options) {
-      console.log("event.onJfbShow", options);
-    },
-    onJfbHide() {
+    
+    onJfbUnload() {
       if (this.timeer) {
         clearTimeout(this.timeer);
       }
@@ -188,15 +178,8 @@ export default {
       if (this.timeer) {
         clearTimeout(this.timeer);
       }
-    },
-    onJfbBack(options) {
-      console.log("event.onJfbBack", options);
-    },
-    onJfbUpdate(...data) {
-      console.log("event.onJfbUpdate", data);
-    },
-    onJfbCustomEvent(options) {
-      console.log("event.onJfbReachBottom", options);
+      this.time = 0;
+      this.getStatus();
     },
   },
 };

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -433,6 +433,7 @@ export default {
         if (this.timeer) {
           clearTimeout(this.timeer);
         }
+        this.$xdLog.setARMSInfo({message: '订单完成',}, `pay_${this.info.status.status_type}`);
         return;
       }
 
@@ -441,6 +442,7 @@ export default {
         if (this.timeer) {
           clearTimeout(this.timeer);
         }
+        this.$xdLog.setARMSInfo({message: '订单失败',}, `pay_${this.info.status.status_type}`);
         return;
       }
 
@@ -448,6 +450,7 @@ export default {
         this.time++;
         this.timeer = setTimeout(() => {
           this.intval();
+          if(this.time > 5) this.$xdLog.setARMSInfo({message: '进行中',}, `pay_${this.info.status.status_type}`);
         }, Math.pow(this.date, this.time > this.maxTime ? this.maxTime : this.time) * 1000);
       }
     },
@@ -479,6 +482,8 @@ export default {
       if (this.timeer) {
         clearTimeout(this.timeer);
       }
+      this.time = 0;
+      this.getStatus();
     },
 
     onJfbUnload() {