jufubao-mall 2.0.65 → 2.0.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "2.0.65",
+  "version": "2.0.66",
   "private": false,
   "description": "聚福宝商城业务组件插件包",
   "main": "index.js",

package/src/components/JfbMallShop/ShowCard.vue

@@ -70,7 +70,7 @@
                   style="margin-right: 8rpx;"
                   icon="iconkaquan"
                   color="#ffc65d"
-                  size="32" 
+                  size="32"
                 ></xd-font-icon>
                 {{ticket.card_type_name}}
               </view>
@@ -198,12 +198,6 @@
         if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
         if (this.$configProject['isPreview']) this.init(value)
       },
-      showCardDialog(val){
-        if(!val){
-          this.checkedCards=[];
-          this.chooseData=[];
-        }
-      }
     },
     data(){
       return {
@@ -243,7 +237,7 @@
     },
     created() {
       if(!this.$configProject.isPreview){
-        this.getCardList('');
+        this.getCardList('card',true);
       }
     },
     mounted(){
@@ -271,15 +265,24 @@
             show_type:type
           }
         }).then(res => {
-          console.log(res,'res')
           this.showCardList = res.list;
-          console.log(this.showCardList,'showCardList')
+
+          //自动选择逻辑
+          let useCard = this.showCardList.filter(item => item.is_auto_use === 'Y');
+          if(useCard.length>0 && this.chooseData.length ===0) {
+            let ticket = useCard[0];
+            this.handlerTicketSelect(!this.checkedCards.includes(ticket.card_number), ticket);
+            setTimeout(() => {
+              this.handleChooseConfirm()
+            }, 500);
+          }
+
           this.renderChecked = Date.now();
           if(!res.list.length){
             this.card_name = '无可用票券'
             return;
           }
-        
+
         }).catch(err => {});
       },
       handleRefresh(){
@@ -293,24 +296,13 @@
         this.getCardList(type);
       },
       handlerTicketSelect(flat, ticket){
-        console.log(flat, ticket,this.chooseData,this.checkedCards)
         if(flat){
-          if(this.chooseData.length){
-            this.$xdAlert({
-              content: '只能选择一张票券!',
-              isClose: false,
-              iconShow: false
-            });
-            // this.renderChecked = Date.now();
-            return
-          }
-          this.chooseData.push(ticket);
-        }else{
+          this.chooseData = [ticket];
+        }
+        else{
           this.chooseData = [];
-          this.renderChecked = Date.now();
         }
         this.checkedCards = this.chooseData.map(item => item.card_number);
-        console.log(this.chooseData, this.checkedCards,'1231231')
       },
       handleChangeType(index){
         this.activeIndex = index;
@@ -329,96 +321,97 @@
         }
         this.detail();
         this.refrush();
+        this.showCardDialog = false;
       },
       /**
-     * @description 获取卡详情
-     */
-    detail() {
-      jfbRootExec("getBaseByIdCardDetail", {
-        vm: this,
-        data: {card_number: this.card_number,},
-      })
-        .then((res) => {
-          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);
-          }
-          //显示按钮
-          if (res["is_show_qrcode_logo"] === "Y") {
-            this.isBrandLogo = true;
-          }
-          this.info = res;
-          this.card_name = '已选卡号'+res.card_number;
-          this.showCardDialog = false;
-          if(!this.$configProject.isPreview) {
-            this.setInval(this.info.card_qrcode_expire);
-          }
-        })
-        .catch((err) => {
-          // this.$refs["pwPay"].clearPwd();
-        });
-    },
-    setInval(time) {
-      console.log("pppppp", time);
-      this.timeer = setInterval(() => {
-        if (time === 0) {
-          this.timeStr = "00分00秒";
-          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);
-    },
-    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;
-      this.refrushTimeer = setTimeout(() => {
-        jfbRootExec("getCardYue", {
+       * @description 获取卡详情
+       */
+      detail() {
+        jfbRootExec("getBaseByIdCardDetail", {
           vm: this,
-          data: {
-            card_number: this.card_number,
-          },
+          data: {card_number: this.card_number,},
         })
           .then((res) => {
-            //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.other_card_point) {
-                refrushInfo.other_card_point =
-                  this.$xdUniHelper.divisionFloatNumber(
-                    res.other_card_point,
+            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);
+            }
+            //显示按钮
+            if (res["is_show_qrcode_logo"] === "Y") {
+              this.isBrandLogo = true;
+            }
+            this.info = res;
+            this.card_name = '已选卡号'+res.card_number;
+            this.showCardDialog = false;
+            if(!this.$configProject.isPreview) {
+              this.setInval(this.info.card_qrcode_expire);
+            }
+          })
+          .catch((err) => {
+            // this.$refs["pwPay"].clearPwd();
+          });
+      },
+      setInval(time) {
+        console.log("pppppp", time);
+        this.timeer = setInterval(() => {
+          if (time === 0) {
+            this.timeStr = "00分00秒";
+            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);
+      },
+      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;
+        this.refrushTimeer = setTimeout(() => {
+          jfbRootExec("getCardYue", {
+            vm: this,
+            data: {
+              card_number: this.card_number,
+            },
+          })
+            .then((res) => {
+              //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.other_card_point) {
+                  refrushInfo.other_card_point =
+                    this.$xdUniHelper.divisionFloatNumber(
+                      res.other_card_point,
+                      100
+                    );
+                }
               }
-            }
 
-            this.info = refrushInfo;
-            this.refrush();
-          })
-          .catch();
-      }, time);
-    },
+              this.info = refrushInfo;
+              this.refrush();
+            })
+            .catch();
+        }, time);
+      },
     }
   }
 </script>