jufubao-base 1.0.30-beta2 → 1.0.30-beta4

package/get.package.path.js

@@ -8,11 +8,11 @@
  */
 const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
   if(packname === 'gxd-commands-bussiness') {
-    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-commands-bussiness/${threePackagePath}`;
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
   }
 
   if (packname === 'gxd-uni-library-editx') {
-    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-uni-library-editx/${threePackagePath}`;
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
   }
 
 };

package/package.json

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

package/src/components/JfbBaseAddress/JfbBaseAddress.vue

@@ -308,6 +308,18 @@ export default {
       if (this.isCheck(address)) {
         return;
       }
+      if(!address.latitude||!address.longitude) {
+        this.$xdConfirm({
+          content: "因版本升级，为了确保您能正常收货，请重新选取所在地区!",
+          zIndex: 3200,
+          isClose: false,
+          cancel: false,
+          showClose: false,
+          confirmText: "我知道了",
+          $vm: this
+        });
+        return
+      }
       let params = this.getParams(address);
       console.log(params, "321321321");
       params["tag"] = 0;

package/src/components/JfbBaseAddress/XdAddress.vue

@@ -319,6 +319,10 @@ export default {
   },
 
   watch: {
+    receipt_phone(n,o) {
+      this.receipt_phone = n.replace(/[-_\s]/g, "");
+      console.log(n,'plplplplp');
+    },
     defaultValue() {
       this.setValue();
     },

package/src/components/JfbBaseCardDetail/JfbBaseCardDetail.vue

@@ -40,33 +40,33 @@
         </view>
       </view>
       <view class="jfb-base-card-detail__body-residue">
-            <view class="jfb-base-card-detail__body-residue-wrap">
-              <view class="jfb-base-card-detail__body-residue-label">
-                <view :style="{ color: '#242424', fontSize: '28rpx' }"
-                  >剩余元宝</view
-                >
-              </view>
-              <view class="jfb-base-card-detail__body-residue-value">
-                <xd-unit
-                  iconSize="0.32"
-                  :fontSize="28"
-                  :price="info.card_point"
-                  :is-old="true"
-                ></xd-unit>
-              </view>
-              <view
-                v-if="info.other_card_point && info.card_point_type !== 1"
-                class="jfb-base-card-detail__body-residue-reach"
-                >购买其他物品可抵：{{ info.other_card_point }}</view
-              >
-            </view>
-            <view
-              class="jfb-base-card-detail__body-residue-business"
-              v-if="info.card_point_type !== 1"
+        <view class="jfb-base-card-detail__body-residue-wrap">
+          <view class="jfb-base-card-detail__body-residue-label">
+            <view :style="{ color: '#242424', fontSize: '28rpx' }"
+              >剩余元宝</view
             >
-              所属业务线：{{ info.main_business_code_name }}
-            </view>
           </view>
+          <view class="jfb-base-card-detail__body-residue-value">
+            <xd-unit
+              iconSize="0.32"
+              :fontSize="28"
+              :price="info.card_point"
+              :is-old="true"
+            ></xd-unit>
+          </view>
+          <view
+            v-if="info.other_card_point && info.card_point_type !== 1"
+            class="jfb-base-card-detail__body-residue-reach"
+            >购买其他物品可抵：{{ info.other_card_point }}</view
+          >
+        </view>
+        <view
+          class="jfb-base-card-detail__body-residue-business"
+          v-if="info.card_point_type !== 1"
+        >
+          所属业务线：{{ info.main_business_code_name }}
+        </view>
+      </view>
       <view class="jfb-base-card-detail__body-qrcode">
         <view>
           <view>
@@ -168,6 +168,7 @@ export default {
       textList: [],
       password: "",
       card_number: "",
+      stopTimer: false, //停止轮询
 
       userInfo: null, //用户信息
       brandInfo: null, //brand
@@ -258,6 +259,14 @@ export default {
         }
       }
     },
+    onJfbUnload() {
+      if (this.timeer) {
+        clearTimeout(this.timeer);
+      }
+      if (this.refrushTimeer) {
+        clearTimeout(this.refrushTimeer);
+      }
+    },
     onJfbBack(options) {
       if (this.timeer) {
         clearTimeout(this.timeer);
@@ -268,24 +277,21 @@ export default {
       this.$xdUniHelper.navigateBack();
     },
     setInval(time) {
-      if (time === 0) {
-        this.timeStr = "00分00秒";
-      } else {
-        this.timeer = setInterval(() => {
-          if (time === 0) {
-            this.timeStr = "";
-            clearInterval(this.timeer);
-            this.detail();
-          } else {
-            time--;
-            let f = Math.floor(time / 60);
-            f = f < 10 ? "0" + f : f;
-            let m = time % 60;
-            m = m < 10 ? "0" + m : m;
-            this.timeStr = `${f}分${m}秒`;
-          }
-        }, 1000);
-      }
+      console.log("pppppp", time);
+      this.timeer = setInterval(() => {
+        if (time === 0) {
+          this.timeStr = "00分00秒";
+          clearInterval(this.timeer);
+          if (!this.stopTimer) this.detail();
+        } else {
+          time--;
+          let f = Math.floor(time / 60);
+          f = f < 10 ? "0" + f : f;
+          let m = time % 60;
+          m = m < 10 ? "0" + m : m;
+          this.timeStr = `${f}分${m}秒`;
+        }
+      }, 1000);
     },
     handleUnBindCard() {
       this.$xdConfirm({
@@ -298,6 +304,9 @@ export default {
         vm: this,
         success: (res) => {
           if (res.confirm) {
+            clearTimeout(this.timeer);
+            clearTimeout(this.refrushTimeer);
+            this.stopTimer = true;
             jfbRootExec("deleteCardUnbind", {
               vm: this,
               data: {
@@ -308,28 +317,27 @@ export default {
                 this.$xdAlert({
                   content: "解绑成功",
                   close: () => {
-                    clearTimeout(this.timeer);
-                    clearTimeout(this.refrushTimeer);
-                    this.$xdUniHelper.navigateTo({
-                      url: this.backUrl,
+                    this.$xdUniHelper.redirectTo({
+                      url: this.backUrl || this.settings.index,
                     });
                   },
                 });
               })
               .catch((err) => {
                 console.log(err, "err");
+                this.stopTimer = false;
               });
           }
         },
       });
     },
     refrush() {
+      if (this.stopTimer) return;
       if (this.time >= this.maxTime) {
         clearTimeout(this.refrushTimeer);
         console.log("refrushTimeer.end");
         return;
       }
-
       this.time++;
       let time =
         this.time >= 5 ? 32 * 1000 : Math.pow(this.date, this.time) * 1000;
@@ -344,17 +352,23 @@ export default {
             //res[4]['value'] = this.$xdUniHelper.random(20,30);
             let refrushInfo = this.$xdUniHelper.cloneDeep(this.info);
             if (res && res !== null && Object.keys(res).length > 0) {
-              if(res.card_point) {
-                refrushInfo.card_point = this.$xdUniHelper.divisionFloatNumber(res.card_point, 100);
+              if (res.card_point) {
+                refrushInfo.card_point = this.$xdUniHelper.divisionFloatNumber(
+                  res.card_point,
+                  100
+                );
               }
               if (res.other_card_point) {
-                refrushInfo.other_card_point = this.$xdUniHelper.divisionFloatNumber(res.other_card_point, 100);
+                refrushInfo.other_card_point =
+                  this.$xdUniHelper.divisionFloatNumber(
+                    res.other_card_point,
+                    100
+                  );
               }
             }
-           
+
             this.info = refrushInfo;
             this.refrush();
-
             this.show = false;
           })
           .catch();
@@ -366,9 +380,8 @@ export default {
       this.backUrl = getContainerPropsValue(
         this.container,
         "content.back_url",
-        { value: "system/card/card" }
+        { value: "" }
       ).value;
-      console.log(this.backUrl, "this.backUrl");
     },
     /**
      * @description 获取卡详情
@@ -381,14 +394,21 @@ export default {
         },
       })
         .then((res) => {
-          if(res && res.card_point) {
-            res['card_point'] = this.$xdUniHelper.divisionFloatNumber(res.card_point, 100);
+          if (res && res.card_point) {
+            res["card_point"] = this.$xdUniHelper.divisionFloatNumber(
+              res.card_point,
+              100
+            );
           }
           if (res && res.card_point) {
-            res['other_card_point'] = this.$xdUniHelper.divisionFloatNumber(res.other_card_point, 100);
+            res["other_card_point"] = this.$xdUniHelper.divisionFloatNumber(
+              res.other_card_point,
+              100
+            );
           }
           this.info = res;
-          this.setInval(Number(this.info["card_qrcode_expire"]));
+          console.log(this.info.card_qrcode_expire, "lllll");
+          this.setInval(this.info.card_qrcode_expire);
           this.show = false;
 
           //显示按钮
@@ -498,9 +518,9 @@ export default {
       &-business {
         padding-top: unit(20, rpx);
         border-radius: unit(10, rpx);
-        color: #BA9968;
+        color: #ba9968;
         font-size: unit(20, rpx);
-        line-height: unit(30,rpx);
+        line-height: unit(30, rpx);
       }
 
       &-label {

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -1072,8 +1072,8 @@ export default {
         });
         return;
       }
-      this.$xdUniHelper.navigateTo({
-        url: `${this.payPath}?order_id=${this.info.pay_info.pay_order_id}`,
+      this.$xdUniHelper.redirectTo({
+        url: `${this.payPath}?order_id=${this.info.pay_info.pay_order_id}&main_order_id=${this.main_order_id}`,
       });
     },
     handleAction(item) {

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -377,7 +377,7 @@ export default {
           });
           return;
         }
-        this.$xdUniHelper.navigateTo({
+        this.$xdUniHelper.redirectTo({
           url: `${this.payPath}?order_id=${item.pay_order_id}&main_order_id=${item.main_order_id}`,
         });
       }