jufubao-mall 2.0.111 → 2.0.113

package/package.json

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

package/src/components/CusShops/CusShops.vue

@@ -95,7 +95,7 @@
                       :showPrice="btn.show_prices"
                     ></cus-price>
                   </view>
-                  <view class="tags-info-desc">{{btn.desc}}</view>
+                  <view class="tags-info-desc">{{ compDescs[btn['consume_mode'].toLocaleLowerCase()] || btn.desc }}</view>
                   <view
                     class="tags-info-btn"
                     v-if="btn['consume_mode'] !== 'CODE'"
@@ -205,6 +205,13 @@ export default {
         return {}
       }
     },
+    //jhd,wb,qp,seat,code，hdself，travel 自定义描述
+    descs:{
+      type:Object,
+      default(){
+        return {}
+      }
+    },
     selectId:{
       type:String,
       default:''
@@ -264,6 +271,8 @@ export default {
         travel: false, //旅游订票
       },
 
+      defDescs:{}, //自定义描述
+
 
       dataShopList:null,
 
@@ -293,6 +302,9 @@ export default {
     compEntry(){
       return Object.assign({},this.defEntry,this.$xdUniHelper.cloneDeep(this.entry))
     },
+    compDescs(){
+      return Object.assign({},this.defDescs,this.$xdUniHelper.cloneDeep(this.descs))
+    },
 
     isBtn(){
       let flag = false;

package/src/components/JfbMallNewShopList/JfbMallNewShopList.vue

@@ -81,6 +81,7 @@
           :sub-main-color="subMainColor"
           :names="cusNames"
           :entry="cusEntry"
+          :descs="cusDescs"
           :is-auto-jump="isAutoJump"
           @on-event="handleToEvent"
         ></cus-shops>
@@ -148,6 +149,7 @@
         fastEntryStatus:false,
         cusNames:{}, //按钮名称
         cusEntry:{}, //入口状态
+        cusDescs:{}, //入口描述
         initAttr: false, //状态完成
 
         //顶部导航
@@ -380,18 +382,20 @@
 
         //入口设置
         this.fastEntryStatus = gCPVal(container, 'fastEntryStatus', 'N') === 'Y';
-        let cusNames = {},cusEntry = {};
+        let cusNames = {},cusEntry = {},cusDescs = {};
         let fastEntry = gCPVal(container, 'fastEntry', []).filter(item=>{
           return item.check === true
         });
         if(this.fastEntryStatus) {
           for(let i = 0; i< fastEntry.length ;i++) {
             if(fastEntry[i].input) cusNames[fastEntry[i].value] = fastEntry[i].input
+            if(fastEntry[i].desc) cusDescs[fastEntry[i].value] = fastEntry[i].desc
             cusEntry[fastEntry[i].value] = fastEntry[i].check;
           }
         }
         this.cusNames = cusNames;
         this.cusEntry = cusEntry;
+        this.cusDescs = cusDescs;
 
         //内容显示
         let cusContent = [];
@@ -630,7 +634,7 @@
           parmas.push(this.$xdUniHelper.jsonToParams(this.options));
         }
         if(['JHD','QP'].includes(type)){
-          parmas.push(`xnamespace=${ this.xnamespace}`);
+          // parmas.push(`xnamespace=${ this.xnamespace}`);
           parmas.push(`x-params=${Base64.encodeURI(`shop_id:${item.shop_id}`)}`);
         }
 

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

@@ -409,18 +409,19 @@ export default (data, gValue, gColor, oldData={})=>{
       setting: {
         isSort:false,
         width: 90,
+        desc: true,
       },
       labelInline:true,
       hidden: data['fastEntryStatus'] !== 'Y',
       handleCustom({action, data}) {
         data.cb([
-          {value:'jhd', label: '聚好兑', input:'',def:'聚好兑', check: false,placeholder:'服务类型为支持核销时使用'},
-          {value:'wb', label: '扫一扫',input:'',def:'扫一扫',check: false,placeholder:'服务类型为支持核销时使用'},
-          {value:'qp', label: '快捷码',input:'',def:'去提货',check: false,placeholder:'服务类型为支持核销时使用'},
-          {value:'seat', label: '在线选座',input:'',def:'去订票',check: false,placeholder:''},
-          {value:'code', label: '电子码',input:'',def:'电子码',check: false,placeholder:''},
-          {value:'hdself', label: '到店自取',input:'',def:'去下单',check: false,placeholder:'服务类型为小时达到店时使用'},
-          {value:'travel', label: '旅游门票',input:'',def:'去订票',check: false,placeholder:''}
+          {value:'jhd', label: '聚好兑', input:'',def:'聚好兑', desc:'',defDesc:'请输入描述内容', check: false,placeholder:'服务类型为支持核销时使用'},
+          {value:'wb', label: '扫一扫',input:'',def:'扫一扫', desc:'',defDesc:'请输入描述内容', check: false,placeholder:'服务类型为支持核销时使用'},
+          {value:'qp', label: '快捷码',input:'',def:'去提货', desc:'',defDesc:'请输入描述内容', check: false,placeholder:'服务类型为支持核销时使用'},
+          {value:'seat', label: '在线选座',input:'',def:'去订票', desc:'',defDesc:'请输入描述内容', check: false,placeholder:''},
+          {value:'code', label: '电子码',input:'',def:'电子码', desc:'',defDesc:'请输入描述内容', check: false,placeholder:''},
+          {value:'hdself', label: '到店自取',input:'',def:'去下单', desc:'',defDesc:'请输入描述内容', check: false,placeholder:'服务类型为小时达到店时使用'},
+          {value:'travel', label: '旅游门票',input:'',def:'去订票', desc:'',defDesc:'请输入描述内容', check: false,placeholder:''}
         ])
       },
       rules:[{

package/src/components/JfbMallResourceShop/Api.js

@@ -57,4 +57,118 @@ module.exports = [
     },
     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
+  },
+  {
+    path: "/store/v1/order/show-brand-tip",
+    title: "显示品牌提示",
+    mapFnName: "showBrandTip",
+    isRule: false,
+    params: {
+      shop_id: ['门店id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
 ];

package/src/components/JfbMallResourceShop/JfbMallResourceShop.vue

@@ -94,7 +94,15 @@
       </view>
       <!-- 展码提货 -->
       <view class="take_box" v-if="canUseQP">
-        <show-card :shop_id="shopInfo.shop_id" :layoutInfo="layoutInfo" :brandLogo="brandLogo" :successPath="successPath"></show-card>
+        <qrcode-show
+          :show_qrcode="shopInfo.show_qrcode"
+          :shop_id="shopInfo.shop_id"
+          :layoutInfo="layoutInfo"
+          :xnamespace="xnamespace"
+          :brandLogo="brandLogo"
+          :successPath="successPath"
+          :take-title-name="takeTitleName"
+        ></qrcode-show>
       </view>
       <view class="shop_map" v-if="initBaidu">
         <view class="_title">门店地图</view>
@@ -128,7 +136,7 @@
   // #ifdef H5
   import XdBaiduMap from "./XdBaiduMap"
   // #endif
-  import ShowCard from "./ShowCard"
+  import QrcodeShow from "./QrcodeShow"
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbMallResourceShopMixin from "./JfbMallResourceShopMixin";
   import { getContainerPropsValue, gCPVal } from "@/utils/xd.base";
@@ -142,7 +150,7 @@
     components: {
       XdFontIcon,
       XdButton,
-      ShowCard,
+      QrcodeShow,
       // #ifdef H5
       XdBaiduMap
       // #endif
@@ -183,6 +191,7 @@
         scanPath: "",
 
         showTake: "Y",
+        takeTitleName:'本店支持「展码」买单',
         takePath: "",
 
         showBuyTicket: "Y",
@@ -222,7 +231,8 @@
         stateLocation: state => state.cityLocation.location || {}
       }),
       canUseQP(){
-        return (this.shopInfo.consume_type || []).includes('QP') && this.showTake !== 'N';
+        return this.shopInfo && this.shopInfo.show_qrcode && this.showTake !== 'N';
+        // return (this.shopInfo.consume_type || []).includes('QP') && this.showTake !== 'N';
       },
       showSellConsumeMode(){
         let returnModes = (this.shopInfo.consume_type || []).filter(item => ['WB', 'JHD'].includes(item));
@@ -419,6 +429,7 @@
         this.scanRemark = getContainerPropsValue(container, 'content.scanRemark', '需要到门店扫码使用');
         this.scanPath = getContainerPropsValue(container, 'content.scanPath', {value: ""}).value;
         this.showTake = getContainerPropsValue(container, 'content.showTake', 'Y');
+        this.takeTitleName = gCPVal(container, 'takeTitleName', '本店支持「展码」买单');
         this.takePath = getContainerPropsValue(container, 'content.takePath', {value: ""}).value;
         this.showBuyTicket = getContainerPropsValue(container, 'content.showBuyTicket', 'Y');
         this.buyTicketBtnName = getContainerPropsValue(container, 'content.buyTicketBtnName', '去购票');

package/src/components/JfbMallResourceShop/Mock.js

@@ -21,6 +21,7 @@ module.exports = {
     latitude: "39.96182869764183",
     longitude: "116.84468316908456",
     default_consume_type: "",
+    show_qrcode: "CARD",
     consume_type: ["QP", "WB", "JHD"],
     is_support_jhd: false,
     time_slot_name: "",

package/src/components/JfbMallResourceShop/QrcodeShow.vue

@@ -0,0 +1,199 @@
+<template>
+  <view class="body-qrcode">
+    <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"
+      :take-title-name="takeTitleName"
+    ></show-card>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import ShowCard from "./ShowCard"
+  import ShowQp from "./ShowQp"
+  export default {
+    name: "QrcodeShow",
+    components:{
+      XdFontIcon,
+      ShowCard,
+      ShowQp,
+    },
+    props:{
+      isBrandLogo: {
+        type:Boolean,
+        default: false
+      },
+      brandLogo: {
+        type: String,
+        default: ''
+      },
+      show_qrcode: {
+        type: String,
+        default: ''
+      },
+      shop_id:{
+        type: Number,
+        default: null
+      },
+      layoutInfo: {
+        type: Object,
+        default: () => {}
+      },
+      xnamespace:{
+        type: String,
+        default: ''
+      },
+      successPath: {
+        type: String,
+        default: ''
+      },
+      takeTitleName: {
+        type: String,
+        default: ''
+      }
+    },
+    data(){
+      return {
+        info:{
+          barcode: "//sandbox-apis.jufubao.cn/common/v1/image/barcode?code_content=h.161.8w9ooj0et0bi7b7",
+          card_qrcode: "//sandbox-apis.jufubao.cn/common/v1/image/qrcode?code_content=h.161.8w9ooj0et0bi7b7"
+        },
+        timeStr:'',
+      }
+    },
+    created() {
+      console.log(this.layoutInfo,this.brandLogo,'layoutInfo')
+    },
+    methods:{
+
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  .body-qrcode {
+    text-align: center;
+    font-size: @xd-font-size-base;
+    line-height: unit(36, rpx);
+    background: #fff;
+    border-radius: unit(16,rpx);
+    // padding: 0 unit(70,rpx) 0 unit(70,rpx);
+    color: #000;
+    position: relative;
+    .barcode_title{
+      height: unit(104, rpx);
+      width: 100%;
+      text-align: center;
+      line-height: unit(104, rpx);
+      background: #fff;
+      font-size: unit(28,rpx);
+      font-weight: 500;
+      border-bottom: 1px solid #F8F8F8;
+    }
+    .card_bottom{
+      content: " ";
+      position: absolute;
+      left: 0;
+      bottom: -40rpx;
+      width: 100%;
+      height: 100rpx;
+      background: #FFFFFF;
+      border-radius: 100%;
+      z-index: 1;
+    }
+    // &::after{
+    //   content: " ";
+    //   position: absolute;
+    //   left: 0;
+    //   bottom: -40rpx;
+    //   width: 100%;
+    //   height: 100rpx;
+    //   background: #FFFFFF;
+    //   border-radius: 100%;
+    //   z-index: 1;
+    // }
+
+    & > view {
+      // margin-bottom: unit(20, rpx);
+
+      & > view {
+        margin-bottom: 0;
+      }
+    }
+    .refresh_wrap{
+      width: 280rpx;
+      height: 72rpx;
+      display: flex;
+      align-items: center;
+      border: 1px solid #333333;
+      color: #333333;
+      border-radius: 50rpx;
+      justify-content: center;
+      margin: 36rpx auto 0;
+      position: relative;
+      z-index: 10;
+    }
+
+    .barcode_wrap {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      box-sizing: border-box;
+      height: unit(140, rpx);
+      width: 100%;
+      padding-top: unit(32, rpx);
+
+      & > view {
+        width: 100%;
+        height: unit(200, rpx);
+        padding: 0 unit(10, rpx) unit(10, rpx) unit(10, rpx);
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        & > image {
+          max-width: 100%;
+          max-height: unit(200, rpx);
+        }
+      }
+    }
+
+    .qrcode_wrap {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      padding: unit(20, rpx);
+
+      & > view {
+        width: unit(450, rpx);
+        height: unit(450, rpx);
+        padding: unit(10, rpx);
+
+        & > image {
+          width: unit(450, rpx);
+          height: unit(450, rpx);
+        }
+      }
+    }
+    .qrcode_choose{
+      width: 100%;
+      height: unit(94,rpx);
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-top: unit(34,rpx);
+      font-size: unit(28,rpx);
+      color: #666666;
+      border-top: 1px solid #F8F8F8;
+      &_name{
+        display: flex;
+        justify-content: flex-start;
+      }
+    }
+  }
+</style>

package/src/components/JfbMallResourceShop/ShowCard.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="body-qrcode">
-    <view class="barcode_title">本店支持「展码」买单</view>
+    <view class="barcode_title">{{takeTitleName}}</view>
     <view v-if="info">
     <view class="barcode_wrap">
       <view>
@@ -180,10 +180,10 @@
         type: String,
         default: ''
       },
-      successPath:{
-        type: String,
-        default: ''
-      },
+      takeTitleName:{
+        type:String,
+        default: '本店支持「展码」买单'
+      }
     },
     computed:{
       activityType(){
@@ -229,6 +229,7 @@
         ],
         activeIndex:0,
         card_number:'',
+        successPath:'',
         isBrandLogo:false,
           //#ifdef H5
         brandLogoReal:'//img.jufubao.cn/common/jufubao_logo.png?v=1.0.0',
@@ -531,9 +532,7 @@
       margin-top: unit(34,rpx);
       font-size: unit(28,rpx);
       color: #666666;
-      box-sizing: border-box;
       border-top: 1px solid #F8F8F8;
-      padding: 0 16rpx;
       &_name{
         font-size: unit(28,rpx);
         display: flex;