jufubao-mall 2.0.44-beta1 → 2.0.44-beta2

package/package.json

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

package/src/components/JfbMallShop/JfbMallShop.vue

@@ -66,17 +66,9 @@
       </view>
       <view class="shop_addr">
         <view class="addr_foot">
-          <view id="textRef">{{shopInfo.brand_about}}福司令渠道门店品牌描述内容福司令渠道门店品牌描述内容
-            福司令渠道门店品牌描述内容福司令渠道门店品牌描述内容
-            福司令渠道门店品牌描述品牌描述描述福司令渠道门店品牌描述品牌描述描述福司令渠道门店品牌描述品牌描述描述
-          
-          
+          <view id="textRef">{{shopInfo.brand_about}}
           </view>
-          <view id="textRefHidden">{{shopInfo.brand_about}}福司令渠道门店品牌描述内容福司令渠道门店品牌描述内容
-            福司令渠道门店品牌描述内容福司令渠道门店品牌描述内容
-            福司令渠道门店品牌描述品牌描述描述福司令渠道门店品牌描述品牌描述描述福司令渠道门店品牌描述品牌描述描述
-          
-          
+          <view id="textRefHidden">{{shopInfo.brand_about}}
           </view>
           <view v-if="isTextOverflow" class="addr_more" @click="handleShowBrandDetail">品牌详情<xd-font-icon style="margin-left: 4rpx;" size="22" icon="iconxiangyou_xian"></xd-font-icon> </view>
         </view>
@@ -449,11 +441,11 @@
       },
     },
     created() {
-      this.init(this.container);
       this.is_plus_site = this.projectAttr.headers['X-Site-Group']==="vip";
       this.alphaColor = Color(this.mainColor).alpha(0.1).toString();
       this.isPreview = this.$configProject.isPreview;
       console.log(this.isPreview, 'isPreview')
+      this.init(this.container);
     },
     mounted() {
       this.$nextTick(()=>{
@@ -552,7 +544,7 @@
         }else{
           this.showTake = gCPVal(container, 'showTake', 'Y');
         }
-        console.log("this.showTake", this.showTake)
+        console.log("this.showTake",this.takeBtnName,this.takeName, this.showTake)
         this.takeRemark = getContainerPropsValue(container, 'content.takeRemark', '');
         this.takePath = getContainerPropsValue(container, 'content.takePath', {value: ""}).value;
         this.showMovie = gCPVal(container, 'showMovie', ['Y',"N"], {isOld: true});

package/src/components/JfbMallShop/ShowCard.vue

@@ -43,7 +43,7 @@
       </xd-no-data>
     </view>
     <view class="qrcode_choose" @click="handleChooseCard">
-      <view class="qrcode_choose_name"><xd-font-icon style="margin-right: 4rpx;" size="30" icon="iconpiao"></xd-font-icon>{{card_name}}</view>
+      <view class="qrcode_choose_name"><xd-font-icon style="margin-right: 24rpx;" size="32" icon="iconpiao"></xd-font-icon>{{card_name}}</view>
       <view><xd-font-icon style="margin-left: 4rpx;" size="22" icon="iconxiangyou_xian"></xd-font-icon></view>
     </view>
     <xd-down-drawer
@@ -57,7 +57,7 @@
           <view v-for="(item,index) in cardTypeData" :key="index" :style="[activeIndex===index?activityType:'']" @click="handleChangeType(index)">{{item.label}}</view>
         </view>
         <view class="ticket_content">
-          <view class="ticket_list" :key="renderChecked">
+          <view class="ticket_list" :key="renderChecked" v-if="showCardList.length">
           <view
             class="ticket_item"
             v-for="ticket in showCardList"
@@ -113,6 +113,15 @@
             </view>
           </view>
         </view>
+        <view v-else>
+          <xd-no-data height="600rpx" :scaleSize=2>
+            <slot>
+              <view class="empty_txt">
+                暂无可用票券
+              </view>
+            </slot>
+          </xd-no-data>
+        </view>
         <view class="bottom_btn" v-if="showCardDialog" :style="{bottom: layoutInfo.bottom+'rpx'}">
           <xd-button
             width="670rpx"
@@ -235,16 +244,20 @@
           }
         }).then(res => {
           console.log(res,'res')
+          this.showCardList = res.list;
+          console.log(this.showCardList,'showCardList')
+          this.renderChecked = Date.now();
           if(!res.list.length){
             this.card_name = '无可用票券'
             return;
           }
-          this.showCardList = res.list;
-          this.renderChecked = Date.now();
+        
         }).catch(err => {});
       },
       handleRefresh(){
-
+        clearInterval(this.timeer);
+        this.detail();
+        this.refrush();
       },
       handleChooseCard(){
         this.showCardDialog = true;
@@ -275,6 +288,13 @@
         this.activeIndex = index;
       },
       handleChooseConfirm(){
+        this.timeStr = ""
+        if (this.timeer) {
+          clearTimeout(this.timeer);
+        }
+        if (this.refrushTimeer) {
+          clearTimeout(this.refrushTimeer);
+        }
         this.card_number = this.chooseData[0].card_number;
         if(this.$configProject.isPreview) {
           this.timeStr = "01分19秒"
@@ -487,6 +507,7 @@
       color: #666666;
       border-top: 1px solid #F8F8F8;
       &_name{
+        font-size: unit(28,rpx);
         display: flex;
         justify-content: flex-start;
       }
@@ -575,4 +596,7 @@
       }
     }
   }
+  ::v-deep .xd-up-drawer{
+    z-index: 9999!important;
+  }
 </style>

package/src/components/JfbMallShop/ShowQp.vue

@@ -89,7 +89,7 @@
   // import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import {isWechat,isWechatTools} from "@/utils/xd.base";
-  import { getContainerPropsValue, gCPVal, toProductDetail } from "@/utils/xd.base";
+  import { getContainerPropsValue , toProductDetail, gCPVal} from "@/utils/xd.base";
   import { mapState } from "vuex";
   export default {
     name: "JfbCashierEasyPay",
@@ -197,7 +197,7 @@
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
-      init(container) {
+      async init(container) {
         this.successPath = getContainerPropsValue(container, 'content.successPath', {value: ""}).value;
       },
       handleRefreshCode(){