jufubao-mall 2.0.44-beta2 → 2.0.44-beta4

package/package.json

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

package/src/components/JfbMallShop/JfbMallShop.vue

@@ -66,9 +66,9 @@
       </view>
       <view class="shop_addr">
         <view class="addr_foot">
-          <view id="textRef">{{shopInfo.brand_about}}
+          <view id="textRef" class="textRef">{{shopInfo.brand_about}}
           </view>
-          <view id="textRefHidden">{{shopInfo.brand_about}}
+          <view id="textRefHidden" class="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>
@@ -133,7 +133,7 @@
       </view>
       <!-- 二维码 -->
       <view class="qrcode_box" v-if="shopInfo&&shopInfo.show_qrcode&&!is_plus_site&&showTake==='Y'">
-        <qrcode-show :show_qrcode="shopInfo.show_qrcode" :shop_id="shopInfo.shop_id" :layoutInfo="layoutInfo"></qrcode-show>
+        <qrcode-show :show_qrcode="shopInfo.show_qrcode" :shop_id="shopInfo.shop_id" :layoutInfo="layoutInfo" :xnamespace="xnamespace" :brandLogo="brandLogo" :successPath="successPath"></qrcode-show>
       </view>
       <!-- 二维码 -->
       <view v-if="isShowCodeProduct && productList.length" class="code_product_wrap">
@@ -201,8 +201,6 @@
       <template>
         <view class="brand_detail_box">
           {{shopInfo.brand_about}}
-            福司令渠道门店品牌描述内容福司令渠道门店品牌描述内容
-            福司令渠道门店品牌描述品牌描述描述福司令渠道门店品牌描述品牌描述描述福司令渠道门店品牌描述品牌描述描述
         </view>
       </template>
     </xd-down-drawer>
@@ -227,6 +225,10 @@
   import { mapState } from 'vuex';
   import Color from 'color'
   export default {
+    // #ifdef MP-WEIXIN
+    options: { styleIsolation: 'shared' },
+    // #endif
+
     name: "JfbMallShop",
     components: {
       XdFontIcon,
@@ -318,6 +320,8 @@
         differ: "",
         isTextOverflow:false,
         showBrandDetailDialog:false,
+        brandLogo:'',
+        successPath:'',
       }
     },
     watch: {
@@ -456,6 +460,16 @@
     },
     methods: {
       onJfbLoad(options) {
+        if (options["x-params"]) {
+          try {
+            let params = JSON.parse(Base64.decode(options["x-params"]));
+            console.log(params, 'params')
+            this.brandLogo = params["qrcode_logo"];
+
+          } catch (e) {
+            console.warn(options["x-params"]);
+          }
+        }
         this.options = options;
         //设置业务请求代码
         this.setNameSpace(options);
@@ -474,6 +488,7 @@
         if(this.$configProject.isPreview)  urlParams['brand_id'] = 'test1';
 
         this.uiBaiduAk = this.baiduAk || this.$settings.baiduAk;
+        console.log(this.xnamespace,'xnamespace')
         let params = {
           ...urlParams,
           city_code: this.stateCity.city_code,
@@ -503,8 +518,8 @@
             this.shopInfo = shopInfo;
             this.mapCenter = {lng: shopInfo.longitude, lat: shopInfo.latitude}
             this.initBaidu = true;
-            this.checkTextOverflow();
             this.$nextTick(() => {
+              this.checkTextOverflow();
               if(this.isShowCodeProduct){
                 this.p_getProductList();
               }
@@ -591,7 +606,7 @@
         this.showDiscount = gCPVal(container, 'showDiscount', 'Y');
         this.isAddCart = gCPVal(container, 'isAddCart', 'Y');
         this.differ = gCPVal(container, 'differ', 1);
-
+        this.successPath = getContainerPropsValue(container, 'content.successPath', {value: ""}).value;
         console.log("cartStyle", this.cartName, this.cartStyle);
 
         console.log("itemBgcColoStyle", itemBgcColoStyle);
@@ -639,14 +654,14 @@
         
         // 获取元素位置信息
         query.select('#textRef').fields({
+          rect: true,
           size: true, 
-          scrollOffset: true 
         }, (res) => {
           if (!res) return;
             const hiddenQuery = uni.createSelectorQuery().in(this)
             hiddenQuery.select('#textRefHidden').fields({
+              rect: true,
               size: true, 
-              scrollOffset: true 
             }, (hiddenRes) => {
               if (!hiddenRes) return;
               console.log('元素尺寸：', res);
@@ -832,7 +847,7 @@
           margin-top: 20rpx;
           position: relative;
         }
-        #textRef{
+        .textRef{
           display: -webkit-box;
           -webkit-box-orient: vertical;
           -webkit-line-clamp: 3;
@@ -840,7 +855,7 @@
           line-height: 40rpx;
           width: 100%;
         }
-        #textRefHidden{
+        .textRefHidden{
           position: absolute;
           top: 0;
           left: 0;

package/src/components/JfbMallShop/QrcodeShow.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="body-qrcode">
-    <show-qp v-if="show_qrcode==='QP'" :shop_id="shop_id" :layoutInfo="layoutInfo"></show-qp>
-    <show-card v-if="show_qrcode==='CARD'" :shop_id="shop_id" :layoutInfo="layoutInfo"></show-card>
+    <show-qp v-if="show_qrcode==='QP'" :shop_id="shop_id" :layoutInfo="layoutInfo" :xnamespace="xnamespace" :successPath="successPath"></show-qp>
+    <show-card v-if="show_qrcode==='CARD'" :shop_id="shop_id" :layoutInfo="layoutInfo" :xnamespace="xnamespace" :brandLogo="brandLogo"></show-card>
   </view>
 </template>
 
@@ -21,6 +21,10 @@
         type:Boolean,
         default: false
       },
+      brandLogo: {
+        type: String,
+        default: ''
+      },
       show_qrcode: {
         type: String,
         default: ''
@@ -33,6 +37,14 @@
         type: Object,
         default: () => {}
       },
+      xnamespace:{
+        type: String,
+        default: ''
+      },
+      successPath: {
+        type: String,
+        default: ''
+      }
     },
     data(){
       return {
@@ -44,7 +56,7 @@
       }
     },
     created() {
-      console.log(this.layoutInfo,'layoutInfo')
+      console.log(this.layoutInfo,this.brandLogo,'layoutInfo')
     },
     methods:{
     

package/src/components/JfbMallShop/ShowCard.vue

@@ -12,7 +12,7 @@
         :style="{width: '280rpx', height: '280rpx'}"
         :src="info.card_qrcode"
       ></image>
-      <!-- <image v-if="isBrandLogo" class="logo-icon" :src="brandLogo"></image> -->
+      <image v-if="isBrandLogo" class="logo-icon" :src="brandLogoReal"></image>
     </view>
     <view style="display:flex;align-items: center;justify-content: center;z-index: 111;position: relative;">
       <view v-if="timeStr">{{ timeStr }}后自动刷新</view>
@@ -44,7 +44,7 @@
     </view>
     <view class="qrcode_choose" @click="handleChooseCard">
       <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 class="qrcode_choose_icon"><xd-font-icon style="margin-left: 4rpx;" size="22" icon="iconxiangyou_xian"></xd-font-icon></view>
     </view>
     <xd-down-drawer
       :show.sync="showCardDialog"
@@ -127,7 +127,15 @@
             width="670rpx"
             type="primary"
             radius="40rpx"
-            :disabled="!checkedCards.length"
+            v-if="checkedCards.length"
+            @click="handleChooseConfirm"
+          >确定</xd-button>
+          <xd-button
+            width="670rpx"
+            type="primary"
+            radius="40rpx"
+            v-else
+            :disabled="true"
             @click="handleChooseConfirm"
           >确定</xd-button>
         </view>
@@ -160,10 +168,6 @@
       XdButton,
     },
     props:{
-      isBrandLogo: {
-        type:Boolean,
-        default: false
-      },
       shop_id: {
         type: Number,
         default: null
@@ -172,6 +176,10 @@
         type: Object,
         default: () => {}
       },
+      brandLogo:{
+        type: String,
+        default: ''
+      },
     },
     computed:{
       activityType(){
@@ -190,6 +198,13 @@
         if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
         if (this.$configProject['isPreview']) this.init(value)
       },
+      showCardDialog(val){
+        if(!val){
+          this.checkedCards=[];
+          this.chooseData=[];
+          this.card_name='请选择票券';
+        }
+      }
     },
     data(){
       return {
@@ -218,6 +233,13 @@
         activeIndex:0,
         card_number:'',
         successPath:'',
+        isBrandLogo:false,
+          //#ifdef H5
+        brandLogoReal:'//img.jufubao.cn/common/jufubao_logo.png?v=1.0.0',
+        //#endif
+        //#ifdef MP-WEIXIN
+        brandLogoReal:'https://img.jufubao.cn/common/jufubao_logo.png?v=1.0.0',
+        //#endif
       }
     },
     created() {
@@ -225,6 +247,13 @@
         this.getCardList('');
       }
     },
+    mounted(){
+      console.log(this.brandLogo,'brandLogo')
+      if(this.brandLogo){
+        //品牌logo
+        this.brandLogoReal = this.brandLogo;
+      }
+    },
     beforeDestroy(){
       this.timeStr = ""
       if (this.timeer) {
@@ -317,6 +346,10 @@
           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;
@@ -511,6 +544,11 @@
         display: flex;
         justify-content: flex-start;
       }
+      &_icon{
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
     }
     .ticket_title{
       line-height: 100rpx;
@@ -595,6 +633,14 @@
         line-height: 72rpx;
       }
     }
+    .logo-icon {
+      width: unit(80, rpx) !important;
+      height: unit(80, rpx) !important;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50rpx, -50rpx);
+    }
   }
   ::v-deep .xd-up-drawer{
     z-index: 9999!important;

package/src/components/JfbMallShop/ShowQp.vue

@@ -121,14 +121,12 @@
         hasCreateOrder: false,
         payChannels: [],
         channel_provider_id: "",
-        xnamespace: "",
 
         paySortList: [],
         tempList: [],
         temp_order_id: "",
         request_order_id: "",
         //todo
-        successPath: '',
       }
     },
     props:{
@@ -140,6 +138,14 @@
         type: Object,
         default: () => {}
       },
+      xnamespace:{
+        type: String,
+        default: ""
+      },
+      successPath:{
+        type:String,
+        default:""
+      }
     },
     computed: {
       ...mapState({
@@ -165,13 +171,13 @@
 
     },
     watch: {
-      container(value,oldValue) {
-        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
-        if (this.$configProject['isPreview']) this.init(value)
-      },
+      // container(value,oldValue) {
+      //   if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      //   if (this.$configProject['isPreview']) this.init(value)
+      // },
     },
     created() {
-      this.init(this.container);
+      console.log(this.successPath,'successPathsuccessPath')
       this.projectAttr = getApp().globalData.$xd.brandInfo;
       console.log(this.projectAttr,'this.projectAttr')
       this.isPreview = this.$configProject.isPreview;
@@ -197,9 +203,7 @@
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
-      async init(container) {
-        this.successPath = getContainerPropsValue(container, 'content.successPath', {value: ""}).value;
-      },
+  
       handleRefreshCode(){
         if (this.$configProject['isPreview']) return;
         this.onRefreshPage();
@@ -715,7 +719,7 @@
         bottom: 0;
         left: 0;
         right: 0;
-        z-index: 3000;
+        z-index: 9999;
         .deduct_mask{
           position: absolute;
           top: 0;