jufubao-mall 2.0.44-beta2 → 2.0.44

package/package.json

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

package/src/components/JfbMallCart/JfbMallCart.vue

@@ -814,8 +814,12 @@ export default {
           }),
         },
       }).then((res) => {
+        const hasValue = (v) => v !== undefined && v !== null && `${v}` !== "";
+        let url = this.orderConfirmPath + `?order_id=${res.cart_order_id}`;
+        if (hasValue(this.gift_scene)) url += `&scene=${encodeURIComponent(this.gift_scene)}`;
+        if (hasValue(gift_id)) url += `&gift_partner=${encodeURIComponent(gift_id)}`;
         this.$xdUniHelper.navigateTo({
-          url: this.orderConfirmPath + `?order_id=${res.cart_order_id}&scene=${this.gift_scene}&gift_partner=${gift_id}`,
+          url,
         });
       });
     },

package/src/components/JfbMallShop/Api.js

@@ -46,142 +46,6 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
-  {
-    mapFnName: "getQuickPayQRCode",
-    title: "门店核销 - 获取快速支付二维码",
-    path: "/store/v1/order/get-quick-pay-code",
-    isRule: false,
-    params: {
-      shop_id: ['门店id', 'Number', '必选'],
-      temp_order_id: ['临时订单号第一次获取为空，再次获取需要传上次获取到数据', 'String', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: "getQRCodeStatus",
-    title: "获取快捷支付码扫码状态",
-    path: "/store/v1/order/get-quick-pay-scan-status",
-    isRule: false,
-    params: {
-      shop_id: ['门店id', 'Number', '必选'],
-      temp_order_id: ['临时订单号第一次获取为空，再次获取需要传上次获取到数据', 'String', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    path: "/pay/v1/quickpay/list-my-config",
-    title: "快捷支付-获取我的支付顺序",
-    mapFnName: "getMyPayOrderConfig",
-    isRule: false,
-    params: {},
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    path: "/pay/v1/quickpay/save-my-config",
-    title: "订单支付-选座可用钱包列表",
-    mapFnName: "saveMyPayOrderConfig",
-    isRule: false,
-    data: {
-      configs: ['支付顺序配置', 'String', '必选'],
-        pay_method: ['支付方式 card=卡,coupon=优惠券,wallet=钱包', 'String', '必选'],
-        priority_rules: ['优先级规则', 'array[string]', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    path: "/store/v1/order/batch-use-card-created",
-    title: "批量使用卡券下单",
-    mapFnName: "batchUseCardCreated",
-    isRule: false,
-    data: {
-      temp_order_id: ['temp_order_id', 'Number', '必选'],
-      business_code: ['业务类型', 'String', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    path: '/store/v1/order/async-submit-status',
-    title: "获取异步下单的状态",
-    mapFnName: "getAsyncSubmitStatus",
-    isRule: false,
-    params: {
-      request_order_id: ['temp_order_id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: "getListUserPayChannel",
-    title: "获取用户可用支付渠道",
-    path: "/pay/v1/pay-channel/list-user-pay-channel",
-    isRule: false,
-    params: {
-      providers: ['支付方式id 多个用逗号分隔', "String", '必选']
-    },
-    isConsole: true,
-    disabled: true
-  },
-  {
-    mapFnName: "setThirdPlace",
-    title: "第三方渠道下单",
-    path: "/pay/v1/order/third-place",
-    isRule: false,
-    data: {
-      order_id: ['订单号', "String", "必填"],
-      channel_provider_id: ['支付渠道id', "String", '必选']
-    },
-    isConsole: true,
-    disabled: true
-  },
-  {
-    mapFnName: "updatePay",
-    title: "修改订单为支付中",
-    path: "/order/v1/order/update-to-paying",
-    isRule: false,
-    data: {
-      main_order_id: ['订单号', "String", "必填"],
-    },
-    isConsole: true,
-    disabled: true
-  },
-  {
-    mapFnName: "getListBindedCards",
-    title: "门店可选卡列表",
-    path: "/store/v1/shop/list-binded-cards",
-    isRule: false,
-    params: {
-      shop_id: ['shop_id ', "Number", "必填"],
-      show_type: ['show_type ', "String", "非必填"],
-      sort_method : ['sort_method', "String", "非必填"],
-    },
-    isConsole: true,
-    disabled: true
-  },
-  {
-    mapFnName: 'getBaseByIdCardDetail',
-    isRule: false,
-    title: '获得绑定的卡详情',
-    prefix: 'detal',
-    path: '/card/v1/card-bind/get-bind-card',
-    params: {
-      card_number: ['卡号', 'String', '必选'],
-    },
-    disabled: true,
-  },
-  {
-    mapFnName: 'getCardYue',
-    isRule: false,
-    title: '获得绑定的卡剩余点数',
-    prefix: 'yue',
-    path: '/card/v1/card-bind/get-bind-card-points',
-    params: {
-      card_number: ['卡号', 'String', '必选'],
-    },
-    disabled: true,
-  },
+
+
 ];

package/src/components/JfbMallShop/Attr.js

@@ -2,6 +2,7 @@
 import style from "./cusAttr/style";
 import advanced from "./cusAttr/advanced";
 import content from "./cusAttr/content";
+
 /**
  * @description 当表单组件中有联动操作时候，使用方法进行返回
  */

package/src/components/JfbMallShop/JfbMallShop.vue

@@ -38,39 +38,31 @@
                 <view class="distance_t" v-if="shopInfo.distance">{{shopInfo.distance}}</view>
               </view>
             </view>
-            <view>
-              <view class="shop_sub" v-if="shopInfo.business_time_name">
-                营业时间：<text>{{ shopInfo.business_time_name }}</text>
-              </view>
-            </view>
             <view>
               <view class="shop_sub">
-                <view>{{getAddress(shopInfo)}}</view>
-              </view>
-            </view>
-            <view>
-              <view class="shop_sub contact_box">
-                <view v-if="shopInfo.distance">{{shopInfo.distance}}</view>
-                <view class="p_n_box">
-                  <view v-if="isNavigation" class="p_n" @click="toNavigationApp(shopInfo)">
-                    <xd-font-icon size="30" icon="iconwodedizhi" style="margin-right: 4rpx;"></xd-font-icon>导航
-                  </view>
-                  <view v-if="shopInfo.phone" class="p_n" @click="toCallPhone">
-                    <xd-font-icon size="30" icon="icondianhuatubiao" style="margin-right: 4rpx;"></xd-font-icon>电话
-                  </view>
-                </view>
+                <view>{{shopInfo.brand_about}}</view>
               </view>
             </view>
           </view>
         </view>
       </view>
       <view class="shop_addr">
+        <view class="addr_title">门店地址</view>
+        <view class="addr_detail">{{getAddress(shopInfo)}}</view>
         <view class="addr_foot">
-          <view id="textRef">{{shopInfo.brand_about}}
+          <view>
+            <template v-if="shopInfo.business_time_name">
+              营业时间：<text>{{ shopInfo.business_time_name }}</text>
+            </template>
           </view>
-          <view id="textRefHidden">{{shopInfo.brand_about}}
+          <view class="p_n_box">
+            <view v-if="isNavigation" class="p_n" @click="toNavigationApp(shopInfo)">
+              <xd-font-icon size="30" icon="iconwodedizhi" style="margin-right: 4rpx;"></xd-font-icon>导航
+            </view>
+            <view v-if="shopInfo.phone" class="p_n" @click="toCallPhone">
+              <xd-font-icon size="30" icon="icondianhuatubiao" style="margin-right: 4rpx;"></xd-font-icon>电话
+            </view>
           </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>
       </view>
       <view class="shop_exchange_box">
@@ -93,7 +85,7 @@
               <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{exchangeBtnName}}</xd-button>
             </view>
           </view>
-          <view v-if="item.consume_mode === 'QP' && showTake === 'Y'&&is_plus_site" class="shop_wrap-exchange" :key="item.consume_mode">
+          <view v-if="item.consume_mode === 'QP' && showTake === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
             <view class="shop_wrap-exchange_txt">
               <view class="exchange_name">{{takeName}}</view>
               <view class="exchange_desc">{{item.desc}}</view>
@@ -131,11 +123,6 @@
           </view>
         </template>
       </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>
-      </view>
-      <!-- 二维码 -->
       <view v-if="isShowCodeProduct && productList.length" class="code_product_wrap">
         <view class="code_title">电子码商品</view>
         <view class="product_list">
@@ -194,18 +181,6 @@
         </view>
       </view>
     </view>
-    <xd-down-drawer
-      :show.sync="showBrandDetailDialog"
-      height="50vh"
-    >
-      <template>
-        <view class="brand_detail_box">
-          {{shopInfo.brand_about}}
-            福司令渠道门店品牌描述内容福司令渠道门店品牌描述内容
-            福司令渠道门店品牌描述品牌描述描述福司令渠道门店品牌描述品牌描述描述福司令渠道门店品牌描述品牌描述描述
-        </view>
-      </template>
-    </xd-down-drawer>
   </view>
 </template>
 
@@ -216,14 +191,12 @@
   // #ifdef H5
   import XdBaiduMap from "./XdBaiduMap"
   // #endif
-  import QrcodeShow from "./QrcodeShow"
   import { jfbRootExec } from "@/utils/xd.event";
   import { getContainerPropsValue, gCPVal, toProductDetail } from "@/utils/xd.base";
   import JfbMallShopMixin from "./JfbMallShopMixin";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins"
   import getServiceUrl from "@/common/getServiceUrl";
-  import XdDownDrawer from "@/components/XdDownDrawer/XdDownDrawer"
   import { mapState } from 'vuex';
   import Color from 'color'
   export default {
@@ -233,10 +206,8 @@
       CusPrice,
       XdButton,
       // #ifdef H5
-      XdBaiduMap,
+      XdBaiduMap
       // #endif
-      XdDownDrawer,
-      QrcodeShow,
     },
     mixins: [componentsMixins,extsMixins,JfbMallShopMixin],
     data() {
@@ -316,8 +287,6 @@
         showDiscount: "",
         isAddCart: "",
         differ: "",
-        isTextOverflow:false,
-        showBrandDetailDialog:false,
       }
     },
     watch: {
@@ -441,18 +410,10 @@
       },
     },
     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(()=>{
-        setTimeout(()=>{
-          this.checkTextOverflow();
-        }, 3000)
-      })
     },
     methods: {
       onJfbLoad(options) {
@@ -503,7 +464,6 @@
             this.shopInfo = shopInfo;
             this.mapCenter = {lng: shopInfo.longitude, lat: shopInfo.latitude}
             this.initBaidu = true;
-            this.checkTextOverflow();
             this.$nextTick(() => {
               if(this.isShowCodeProduct){
                 this.p_getProductList();
@@ -537,14 +497,9 @@
         this.scanBtnName = gCPVal(container, 'scanBtnName', '扫一扫')
         this.scanRemark = getContainerPropsValue(container, 'content.scanRemark', '');
         this.scanPath = getContainerPropsValue(container, 'content.scanPath', {value: ""}).value;
-        if(this.is_plus_site){
-          this.showTake = oldShowCashier || gCPVal(container, 'showTake', 'Y');
-          this.takeBtnName = gCPVal(container, 'takeBtnName', '去提货');
-          this.takeName = getContainerPropsValue(container, 'content.takeName', '快捷提货');
-        }else{
-          this.showTake = gCPVal(container, 'showTake', 'Y');
-        }
-        console.log("this.showTake",this.takeBtnName,this.takeName, this.showTake)
+        this.showTake = oldShowCashier || gCPVal(container, 'showTake', 'Y');
+        this.takeBtnName = gCPVal(container, 'takeBtnName', '去提货');
+        this.takeName = getContainerPropsValue(container, 'content.takeName', '快捷提货');
         this.takeRemark = getContainerPropsValue(container, 'content.takeRemark', '');
         this.takePath = getContainerPropsValue(container, 'content.takePath', {value: ""}).value;
         this.showMovie = gCPVal(container, 'showMovie', ['Y',"N"], {isOld: true});
@@ -633,34 +588,6 @@
           this.hasNext = !!this.next_page_token;
         })
       },
-      checkTextOverflow() {
-        // 创建选择器查询
-        const query = uni.createSelectorQuery().in(this)
-        
-        // 获取元素位置信息
-        query.select('#textRef').fields({
-          size: true, 
-          scrollOffset: true 
-        }, (res) => {
-          if (!res) return;
-            const hiddenQuery = uni.createSelectorQuery().in(this)
-            hiddenQuery.select('#textRefHidden').fields({
-              size: true, 
-              scrollOffset: true 
-            }, (hiddenRes) => {
-              if (!hiddenRes) return;
-              console.log('元素尺寸：', res);
-          
-              this.isTextOverflow = hiddenRes.height > res.height;
-              console.log('文字是否超出3行：', this.isTextOverflow);
-              console.log('展示容器高度：', res.height);
-              console.log('文本实际高度：', hiddenRes.height);
-            })
-            .exec(); 
-        })
-        .exec(); 
-    
-      },
       handleError(){
         this.errorStatus = true;
       },
@@ -785,9 +712,6 @@
       onJfbBack(options) {
         this.$xdUniHelper.navigateBack();
       },
-      handleShowBrandDetail(){
-        this.showBrandDetailDialog = true;
-      },
     }
   }
 
@@ -811,8 +735,8 @@
       }
       .shop_addr{
         background: #FFFFFF;
-        padding: 24rpx 32rpx 32rpx 32rpx;
-        border-top: 2rpx solid #F8F8F8;
+        margin-top: 24rpx;
+        padding: 32rpx;
         .addr_title{
           font-size: 32rpx;
           color: #333333;
@@ -830,43 +754,26 @@
           font-size: 24rpx;
           color: #666666;
           margin-top: 20rpx;
-          position: relative;
-        }
-        #textRef{
-          display: -webkit-box;
-          -webkit-box-orient: vertical;
-          -webkit-line-clamp: 3;
-          overflow: hidden;
-          line-height: 40rpx;
-          width: 100%;
         }
-        #textRefHidden{
-          position: absolute;
-          top: 0;
-          left: 0;
-          width: 100%;
-          z-index: -1;
-          opacity: 0;
-          line-height: 40rpx;
+        .p_n_box{
+          display: flex;
+          align-items: center;
+
         }
-        .addr_more{
+
+        .p_n{
           display: flex;
-          position: absolute;
-          background-color: #FFFFFF;
-          right: 0;
-          bottom: 4rpx;
+          align-items: center;
+          background: var(--alpha-color);
           color: var(--main-color);
-          box-shadow: -20rpx 0 20rpx rgba(255,255,255,1);
-          cursor: pointer;
+          padding: 8rpx 20rpx;
+          border-radius: 30rpx;
+
+          & + .p_n{
+            margin-left: 24rpx;
+          }
         }
       }
-      .qrcode_box{
-        border-radius: unit(16, rpx);
-        background: #FFFFFF;
-        font-size: unit(28, rpx);
-        padding: 0 unit(32, rpx);
-        margin-top: unit(16, rpx);
-      }
       .code_product_wrap{
         .code_title{
           font-size: 28rpx;
@@ -937,7 +844,7 @@
         background: #FFFFFF;
         font-size: unit(28, rpx);
         padding: 24rpx;
-        margin-top: 16rpx;
+        margin-top: 24rpx;
         .mpa_wrap{
           height: unit(600, rpx);
           background: #fff;
@@ -956,7 +863,7 @@
         }
       }
       .shop_wrap{
-        // border-radius: unit(16, rpx);
+        border-radius: unit(16, rpx);
         background: #FFFFFF;
 
         &-exchange {
@@ -994,7 +901,7 @@
           display: flex;
           justify-content: flex-start;
           align-items: flex-start;
-          padding: 32rpx 32rpx 24rpx 32rpx;
+          padding: 32rpx;
 
 
           .shop_image {
@@ -1085,32 +992,5 @@
 
       }
     }
-    .contact_box{
-      display: flex;
-      justify-content: space-between;
-      align-items: center!important;
-      .p_n_box{
-        display: flex;
-        align-items: center;
-        width: auto !important;
-        .p_n{
-          display: flex;
-          align-items: center;
-          background: var(--alpha-color);
-          color: var(--main-color);
-          padding: 8rpx 20rpx;
-          border-radius: 30rpx;
-
-          & + .p_n{
-            margin-left: 24rpx;
-          }
-        }
-      }
-    }
-    .brand_detail_box{
-      padding: 60rpx 32rpx 32rpx 32rpx;
-      font-size: 28rpx;
-      color: #666666;
-    }
   }
 </style>

package/src/components/JfbMallShop/Mock.js

@@ -46,7 +46,7 @@ module.exports = {
     business_time_json:
       '{"type":"","custom":{"end":"","start":"","weeks":[],"method":""}}',
     resource_shop_id: "3185468",
-    shop_id: 52648,
+    shop_id: "52648",
     shop_icon:
       "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20220629/dda58a5983eeae3cfdea8bccc7cea714.jpg",
     distance: "20.7km",
@@ -70,8 +70,7 @@ module.exports = {
       resource_shop:
         "eyJyZXNvdXJjZV9zaG9wX2lkIjoiMzE4NTQ2OCIsInNob3BfaWQiOiI1MjY0OCJ9"
     },
-    request_id: "8f0a57d7a475f96b",
-    show_qrcode:'CARD',
+    request_id: "8f0a57d7a475f96b"
   },
   getShopProductList: {
     total_size: 106,

package/src/components/JfbMallShop/cusAttr/advanced.js

@@ -104,20 +104,6 @@ export default (data)=>{
       },
       inline: false,
     },
-    {
-      label: '支付成功:',
-      ele: 'xd-select-pages-path',
-      valueKey: 'successPath',
-      placeholder: '请选择支付成功跳转路径',
-      groupKey:'advanced',
-      value: data['successPath'] || null,
-      labelInline:true,
-      className: "input100",
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
     // {
     //   label: '商品详情:',
     //   ele: 'xd-select-pages-path',

package/src/components/JfbMallShop/cusAttr/content.js

@@ -7,10 +7,8 @@ import {
   cusDisabled ,
   getCustomAttr,
 } from "@/utils/AttrTools";
+
 export default function (data, gValue,gColor,oldData){
-  console.log(gValue,'gValue')
-  let is_plus_site = gValue.projectAttr.headers['X-Site-Group']==="vip";
-  console.log(is_plus_site,'is_plus_site')
   let isShowCashier = data.isShowCashier || "";
   let isShowExchange = data.isShowExchange || "";
   let oldShowCashier = (isShowCashier || isShowExchange) ? "N" : "Y";
@@ -194,7 +192,7 @@ export default function (data, gValue,gColor,oldData){
       valueKey: 'takeBtnName',
       labelInline: true,
       value: dataVal({ data, key: 'takeBtnName', dValue: '', gValue }),
-      hidden: data.showTake !== 'Y'||!is_plus_site,
+      hidden: data.showTake !== 'Y',
       groupKey: 'content',
       className: 'input80',
       placeholder: "去提货",
@@ -207,7 +205,7 @@ export default function (data, gValue,gColor,oldData){
       valueKey: 'takeName',
       labelInline: true,
       value: dataVal({ data, key: 'takeName', dValue: '', gValue }),
-      hidden: data.showTake !== 'Y'||!is_plus_site,
+      hidden: data.showTake !== 'Y',
       groupKey: 'content',
       className: 'input80',
       inline: false,

package/src/components/JfbMallShopList/JfbMallShopList.vue

@@ -410,8 +410,7 @@
         Object.assign(params,item.params||{}, {
           brand_id: item.brand_id,
           shop_id: item.resource_shop_id,
-          xnamespace: this.xnamespace,
-          consume_mode:item.consume_mode.join(',')
+          xnamespace: this.xnamespace
         })
         params = this.$xdUniHelper.jsonToParams(params)
         this.$xdUniHelper.navigateTo({