jufubao-base 1.0.241 → 1.0.242-beta10

package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCodeLess.less

@@ -0,0 +1,79 @@
+/**
+* @desc 获取绝对路径完整地址
+* @param @path
+**/
+//例如：https://image.jufubao.cn/20220501010108/image/bg/default_gonghui_bg.png
+@basePath: 'business/';
+@doMain: '//sandbox-img.jufubao.cn/';
+
+.getBusinessImageUrl(@path, @size: 'size8') {
+  @url: "@{doMain}@{basePath}@{path}?x-oss-process=style/@{size}";
+  background-image: url(@url);
+}
+
+//start
+.jfb-base-consump-code {
+  box-sizing: border-box;
+
+  &__body{
+      position: relative;
+      overflow: hidden;
+      z-index: 2
+  }
+
+  &.editx,&.editx:hover {
+    position: relative;
+    min-height: unit(100, rpx);
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
+
+  }
+
+
+  &__edit {
+    cursor: pointer;
+    position: absolute;
+    right: unit(0, rpx);
+    top: unit(-52, rpx);
+    height: unit(50, rpx);
+    line-height: unit(50, rpx);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: rgba(0, 0, 0, .6);
+    border-radius: unit(10, rpx);
+    box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
+    color: #fff;
+    font-size: unit(22, rpx);
+
+    &-icon{
+      padding: 0 unit(20, rpx);
+    }
+
+    &.editx {
+      box-sizing: border-box;
+
+    }
+  }
+}
+//end
+
+
+/**notPreview**/
+.jfb-base-consump-code {
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
+}
+/**endNotPreview**/

package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCodeMixin.js

@@ -0,0 +1,30 @@
+'use strict';
+
+
+//@AttrImport
+import Attr from "./Attr";
+//@EndAttrImport
+
+
+export default {
+  data() {
+    return {
+      //#ifdef H5
+      
+      //@AttrData
+      Attr:{}, //对外开发编辑属性
+      //@EndAttrData
+      
+      // #endif
+      cssRoot: 'jfb-base-consump-code'
+    }
+  },
+  created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
+  },
+}

package/src/components/JfbBaseConsumpCode/Mock.js

@@ -0,0 +1,22 @@
+'use strict';
+
+module.exports = {
+
+  getConsumpCode: { "payment_code": "h.161.v71913434717194", "expiration_time": 1744971193, "expiration_sec": 60, "temp_order_id": "quickpay-5000358-DBeMnvrvInuINYeTqbCXw", "confirm_notice": false, "notice": "", "cash_order_id": "", "code_url": "\/common\/v1\/image\/qrcode?code_content=h.161.v71913434717194&size=240", "plus_discount": 0, "is_st_flow": "张三", "barcode_url": "\/common\/v1\/image\/barcode?code_content=h.161.v71913434717194", "shop_name": "六九豆浆饺子(石门市场店)", "request_id": "52ebf80c255ebcb5" },
+
+  getConsumpCodeScanStatus: { "status": "P", "message": "", "order_data": "{\"total_amount\":\"0\",\"pay_expire_time\":\"0\",\"message\":\"\",\"status\":\"P\",\"cash_order_id\":\"\",\"user_id\":\"5000358\",\"channel_order_id\":\"\",\"cart_order_id\":\"\"}", "seconds": 0, "request_id": "a54ac53ad31312d6" },
+
+  getConsumpListUserPayChannel: { "list": [{ "channel_provider_id": "1rRq74ACKJj5nIx5CgLpb", "channel_provider_name": "微信", "channel_code": "wxpay", "channel_logo": "https:\/\/jfb-public-images.oss-cn-qingdao.aliyuncs.com\/system-paychannel-logo-wxpay.png?x-oss-process=style\/200_200" }], "request_id": "e142d26c3d24c060" },
+
+  batchConsumpUseCardCreated: { "request_order_id": "quickpay-5000358-DBeMnvrvInuINYeTqbCXw", "request_id": "e17499843ece44b1" },
+
+  getConsumpAsyncSubmitStatus: { "hand_status": "U", "hand_status_msg": "异步下单中", "order_id": "", "pay_order_id": "", "need_pay_price": "0", "request_id": "fddff0af4216825d" },
+
+  getConsumpShopList: { "namespaces": [{ "label": "蛋糕(勿改)", "value": "cake" }], "brands": [{ "label": "测试1111", "value": 14, "icon": "\/uploads\/20230324\/3265afeb6a1f2a94f25c968a09275574.png" }, { "label": "品牌jls0519", "value": 100003, "icon": "\/uploads\/20230710\/44f645b06fe4da358f7b0ee06259afcd.jpg" }], "list": [{ "brand_id": 14, "brand_name": "测试1111", "brand_type": "MA", "business_status": "CLOSED", "consume_mode": ["SELL"], "consume_mode_name": "", "distance": "42km", "distance_conversion": "41.9km", "default_consume_type": "CV", "consume_type": ["CV"], "is_support_jhd": true, "address": "顺义区东六环与顺于路交叉口东150米", "province_name": "", "city_name": "", "area_name": "", "street_name": "", "phone": "(010)89430806", "resource_shop_id": 8003489, "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAzNDg5LCJzaG9wX2lkIjoxMTUzNTIwLCJ2ZXJzaW9uIjoyfQ", "resource_shop_name": "六九豆浆饺子(石门市场店)", "shop_icon": "\/uploads\/20230324\/3265afeb6a1f2a94f25c968a09275574.png", "shop_id": 1153520, "shop_tags": [], "stars": 0, "time_slot_name": "-", "business_code": "", "longitude": "116.630756", "latitude": "40.134773" }, { "brand_id": 100003, "brand_name": "品牌jls0519", "brand_type": "MA", "business_status": "OPEN_BUSINESS", "consume_mode": ["SELL"], "consume_mode_name": "", "distance": "55km", "distance_conversion": "54.8km", "default_consume_type": "", "consume_type": [""], "is_support_jhd": false, "address": "东城区东直门街道东城区东直门内南大街4号（东直门内第一个十字路口东南角）", "province_name": "", "city_name": "", "area_name": "", "street_name": "", "phone": "64034959", "resource_shop_id": 8000077, "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAwMDc3LCJzaG9wX2lkIjoxMDIzNTMwLCJ2ZXJzaW9uIjoyfQ", "resource_shop_name": "东直门[2]", "shop_icon": "\/uploads\/20230710\/44f645b06fe4da358f7b0ee06259afcd.jpg", "shop_id": 1023530, "shop_tags": [], "stars": 0, "time_slot_name": "09:00-18:00", "business_code": "", "longitude": "116.44373384708321", "latitude": "39.94636369444035" }, { "brand_id": 100003, "brand_name": "品牌jls0519", "brand_type": "MA", "business_status": "OPEN_BUSINESS", "consume_mode": ["SELL"], "consume_mode_name": "", "distance": "56km", "distance_conversion": "55.5km", "default_consume_type": "JHD", "consume_type": ["JHD"], "is_support_jhd": true, "address": "东城区建国门街道北京inn", "province_name": "", "city_name": "", "area_name": "", "street_name": "", "phone": "18843854566", "resource_shop_id": 8000078, "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAwMDc4LCJzaG9wX2lkIjoxMDM3MjY2LCJ2ZXJzaW9uIjoyfQ", "resource_shop_name": "a加盟商-185", "shop_icon": "\/uploads\/20230710\/44f645b06fe4da358f7b0ee06259afcd.jpg", "shop_id": 1037266, "shop_tags": [], "stars": 0, "time_slot_name": "-", "business_code": "", "longitude": "116.43814998003319", "latitude": "39.9280800962547" }], "total_size": 3, "next_page_token": "", "request_id": "fa91f05cff4b280b" },
+
+  getConsumpSettleMainInfo: { "shop_id": 1037266, "shop_logo": "\/uploads\/20230710\/44f645b06fe4da358f7b0ee06259afcd.jpg", "shop_name": "a加盟商-185", "shop_brand": 100003, "shop_partner_name": "A加盟商-余额测试", "settle_tag_list": [{ "label": "幸福西饼、goodlike品牌", "value": 262, "price": 0, "price_yuan": "0.00", "is_static_price": false, "icon_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230728\/70f4dd90cdf2681e71ccf41d332d71a0.jpeg" }], "request_id": "a4a6cfe9db905597" },
+
+  getConsumpBaseUserInfo: { "user_name": "", "user_code": "WuE5Wotf08", "nickname": "张三", "real_name": "", "head_url": "https:\/\/thirdwx.qlogo.cn\/mmopen\/vi_32\/AOqEDeiaxss8GR4jD1GicIgyqWSOZV8xN23Iw3DOzFjVBzTFbdv21X7u9ZASQJYsTNm07XSq6ebzp4K4qu1JT26qGZ0qYFMe1nHdQjFZib83Fg\/132", "province_code": "", "city_code": "", "province_name": "", "city_name": "", "sex": "1", "sex_name": "男", "birthday_date": "2025-04-16", "phone_number": "177****7945", "show_user_name": "张三", "user_level": "VIP", "vip_expire_time": 1776157293, "request_id": "f1dbb1c0bb8da893" },
+
+  addConsumpCashierTempOrderData: { "cart_order_id": "c08f38347ec8bc5b", "request_id": "779bf62e988587ce" }
+}

package/src/components/JfbBaseFastLink/Attr.js

@@ -24,7 +24,8 @@ export default {
         multiple: false,
         className: 'input80',
         list: [
-          {label: '平铺', value: 'noraml'},
+          {label: '垂直', value: 'noraml'},
+          {label: '水平', value: 'horizontal'},
           {label: '悬浮', value: 'fixed'},
         ],
         inline: false,
@@ -53,6 +54,16 @@ export default {
         placeholder: '请输入自定义名称',
         className: 'input80',
       },
+      {
+        label: '自定义服务名称:',
+        ele: 'el-input',
+        type: 'text',
+        groupKey:'content',
+        valueKey: 'customName',
+        value: data['customName']? data['customName']: '我的服务',
+        placeholder: '请输入自定义服务名称',
+        className: 'input80',
+      },
       {
         label: '背景颜色:',
         ele: 'xd-color',

package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue

@@ -56,6 +56,22 @@
           :layoutInfo="layoutInfo"
         ></xd-fast-nav>
       </template>
+      <template v-if="is_layout === 'horizontal'">
+        <view :style="[horizontalStyle]">
+          <view class="x-line"></view>
+          <view class="fast-link__horizontal-title">{{customName}}</view>
+          <view class="fast-link__horizontal" v-if="list.length > 0">
+            <view :style="[horizontalItemStyle]" class="fast-link__horizontal-item" v-for="item in list" :key="item.key"  @click="handleClick(item)">
+              <view class="fast-link__horizontal-item-icon" v-if="item.icon">
+                <xd-font-icon :color="iconColor" :size="item.size" :icon="item.icon"></xd-font-icon>
+              </view>
+              <view class="fast-link__horizontal-item-text" :style="{color: color, fontSize: fontSize + 'rpx'}">
+                <view>{{item.name}}</view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </template>
     </view>
   </view>
 </template>
@@ -107,6 +123,8 @@
         margin: {},
         padding:{},
         rowSpacing: 20, //间距
+
+        customName: '我的服务'
       }
     },
     watch: {
@@ -117,6 +135,22 @@
     },
 
     computed: {
+      horizontalStyle(){
+        let border = 0;
+        if (this.is_border === 'Y') border = `${this.is_border_w}rpx solid ${this.is_border_c}`;
+        return {
+          margin: this.getMarginAndPadding(this.margin, 20),
+          padding:this.getMarginAndPadding(this.padding, 20),
+          border,
+          background: this.backgroundColor,
+          borderRadius: this.radius + 'rpx',
+        }
+      },
+      horizontalItemStyle(){
+        return {
+          marginBottom: this.rowSpacing + 'rpx',
+        }
+      },
       bodyStyle(){
         let margin = `${this.checkValue(this.margin.top, 20)}rpx`;
         margin = `${margin} ${this.checkValue(this.margin.right, 20)}rpx`;
@@ -199,6 +233,7 @@
         this.subColor = getContainerPropsValue(container, 'content.textSubColor', '#000');
         this.fontSubSize = getContainerPropsValue(container, 'content.fontSubSize', 24);
         this.isNotExpand = getContainerPropsValue(container, 'content.isNotExpand', 'Y');
+        this.customName = getContainerPropsValue(container, 'content.customName', '我的服务');
         if(this.is_layout === 'fixed') {
           this.listNave = this.list.map(item=>{
             let {appValue,path} = item.path
@@ -228,6 +263,14 @@
             return index < 3
           });
 
+        } else if(this.is_layout === 'horizontal'){
+          const remainder = this.list.length % 4;
+          if (remainder !== 0) {
+            const needed = 4 - remainder;
+            for (let i = 0; i < needed; i++) {
+              this.list.push({}); // 或者你可以插入其他默认值
+            }
+          }
         }
       },
     }
@@ -285,6 +328,29 @@
         align-items: center;
       }
     }
+    &__horizontal {
+      display: flex;
+      justify-content: space-around;
+      flex-wrap: wrap;
+      &-title {
+        color: #000000;
+        font-size: 26rpx;
+        font-weight: 500;
+        margin-bottom: 43rpx;
+        padding-left: 36rpx;
+      }
+      &-item {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        box-sizing: border-box;
+        width: 25%;
+        &-icon {
+          margin-bottom: 22rpx;
+        }
+      }
+    }
   }
 
 </style>

package/src/components/JfbBaseFooter/Attr.js

@@ -56,6 +56,18 @@ export default {
         },
         classNmae: 'input80',
       },
+      {
+        label: '边框颜色:',
+        ele: 'xd-color',
+        valueKey: 'borderColor',
+        groupKey:'content',
+        value: data['borderColor'] || '',
+        placeholder: '请选择边框颜色',
+        setting: {
+          isAlpha: false
+        },
+        classNmae: 'input80',
+      },
       {
         label: '菜单文字颜色:',
         ele: 'xd-color',

package/src/components/JfbBaseFooter/JfbBaseFooter.vue

@@ -19,6 +19,7 @@
     <view class="jfb-base-footer__body">
       <view :style="[bodyStyle]">
         <xd-footer-bar
+          class="footer-bar-deep"
           style="height:100%"
           v-if="list !== null"
           :height="height"
@@ -48,6 +49,9 @@
   import getServiceUrl from "@/common/getServiceUrl";
 
   export default {
+    //#ifdef MP-WEIXIN
+    options: { styleIsolation: 'shared' },
+    //#endif
     name: "JfbBaseFooter",
     components: {
       XdFontIcon,
@@ -61,6 +65,7 @@
           backgroundSize: '100% 100%',
           backgroundRepeat: 'no-repeat',
           backgroundPosition: 'top center',
+          '--border-color': this.borderColor
         }
 
         if(this.backgroundImage && this.backgroundImage.url) {
@@ -78,6 +83,7 @@
         footerBarKey: 'footerBarKey', //刷新
         baseUrl: '',
         backgroundImage: '',
+        borderColor: ''
       }
     },
     watch: {
@@ -197,6 +203,7 @@
         let bar = getContainerPropsValue(value, 'content.footer-setting', []);
         let imageIcons = getContainerPropsValue(value, 'content.footerSettingImage', []);
         this.backgroundImage = getContainerPropsValue(value, 'content.backgroundImage', '');
+        this.borderColor = getContainerPropsValue(value, 'content.borderColor', '#eee');
         this.list = {
           bgColor: getContainerPropsValue(value, 'content.bgColor', '#fff'),
           bodyStyle: this.bodyStyle,
@@ -222,6 +229,12 @@
 
 <style scoped lang="less">
   @import "./JfbBaseFooterLess.less";
+  .footer-bar-deep {
+    ::v-deep .xd-footer-tabbar__border {
+      border-color: var(--border-color);
+    }
+  }
+  
 
   .jfb-base-footer {
 

package/src/components/JfbBaseHeader/Attr.js

@@ -300,6 +300,28 @@ export default {
         groupKey:'style',
         hidden: true,
       },
+      {
+        label: "是否展示二维码",
+        ele: "xd-radio",
+        valueKey: "showQrcode",
+        value: data.showQrcode || "N",
+        list: [
+          {label: "不显示", value: "N"},
+          {label: "显示", value: "Y"}
+        ],
+        groupKey:'content',
+      },
+      {
+        label: "是否展示扫一扫",
+        ele: "xd-radio",
+        valueKey: "showScan",
+        value: data.showScan || "N",
+        list: [
+          {label: "不显示", value: "N"},
+          {label: "显示", value: "Y"}
+        ],
+        groupKey:'content',
+      },
       {
         label: "是否展示快捷入口",
         ele: "xd-radio",
@@ -356,6 +378,40 @@ export default {
         placeholder: '请选择快捷入口背景颜色',
         classNmae: 'input80',
       },
+      data.showQrcode === 'Y' && {
+        ele: 'title',
+        label: '二维码样式设置',
+        size: 'small',
+        groupKey:'style',
+      },
+      data.showQrcode === 'Y' && {
+        label: "二维码大小:",
+        ele: "el-input",
+        valueKey: "qrcodeSize",
+        value: data.qrcodeSize || 32,
+        type: "number",
+        groupKey: "style",
+      },
+      data.showQrcode === 'Y' && {
+        label: "二维码图标颜色:",
+        ele: 'xd-color',
+        valueKey: "qrCodeColor",
+        groupKey:'style',
+        value: data.qrCodeColor || '',
+      },
+      data.showScan === 'Y' && {
+        ele: "title",
+        label: "扫一扫样式设置",
+        size: "small",
+        groupKey: "style",
+      },
+      data.showScan === 'Y' && {
+        label: "扫一扫图标颜色:",
+        ele: 'xd-color',
+        valueKey: "scanIconColor",
+        value: data.scanIconColor || '',
+        groupKey:'style',
+      },
       {
         label: '是否有边框:',
         ele: 'xd-radio',
@@ -429,6 +485,32 @@ export default {
         notice:'<div><span style="color:red">客服类型</span>不需要配置</div>',
         inline: false,
       },
+      {
+        label: '二维码跳转链接:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'qrcodePath',
+        groupKey:'advanced',
+        placeholder: '选择二维码跳转链接',
+        value: data['qrcodePath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+        hidden: data.showQrcode === 'N'
+      },
+      {
+        label: "扫一扫跳转链接:",
+        ele: 'xd-select-pages-path',
+        valueKey: "scanPath",
+        groupKey:'advanced',
+        placeholder: '选择扫一扫跳转链接',
+        value: data['scanPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+        hidden: data.showScan === 'N'
+      },
       {
         label: '',
         ele: 'slot',

package/src/components/JfbBaseHeader/JfbBaseHeader.vue

@@ -60,6 +60,9 @@
               :key="showLocationKey"
             ></xd-city-show-api>
           </view>
+          <view v-if="showScan==='Y'" class="scan_in" @click.stop="handleScanClick">
+            <xd-font-icon :size="32" :color="scanIconColor" icon="iconsaoma1"></xd-font-icon>
+          </view>
           <xd-font-icon v-if="searchIconPosition==='left'" :icon="icon" :color="iconColor" size="32"/>
           <input
             v-if="useSearch==='Y'"
@@ -78,6 +81,9 @@
             @click.stop="doSearch"
           >{{searchBtnText || '搜索'}}</view>
         </view>
+        <view v-if="showQrcode==='Y'" class="qr_code" @click.stop="handleQrCodeClick">
+          <xd-font-icon :size="qrcodeSize" icon="iconerweima" :color="qrCodeColor"></xd-font-icon>
+        </view>
         <view v-if="showSearchBtn==='Y' && searchBtnPosition==='out'"
           class="search_btn_out"
           :style="[searchBtnStyle]"
@@ -196,6 +202,13 @@
         searchBoxRadius: 30,
         bottomBorder: "",
         inputBorder: "",
+        showQrcode: "",
+        qrcodeSize: 32,
+        qrcodePath: "",
+        qrCodeColor: "",
+        showScan: "",
+        scanIconColor: "",
+        scanPath: "",
       }
     },
     watch: {
@@ -226,7 +239,11 @@
         this.useSearch = getContainerPropsValue(container, "content.useSearch", "Y");
         this.searchPagePath = getContainerPropsValue(container, "content.searchPagePath", {value:""}).value;
         this.choseCityPath = getContainerPropsValue(container, "content.choseCityPath", {value:""}).value;
-
+        this.showQrcode = getContainerPropsValue(container, "content.showQrcode", "");
+        this.qrcodeSize = getContainerPropsValue(container, "content.qrcodeSize", 32);
+        this.qrCodeColor = getContainerPropsValue(container, "content.qrCodeColor", "#333");
+        this.showScan = getContainerPropsValue(container, "content.showScan", "");
+        this.scanIconColor = getContainerPropsValue(container, "content.scanIconColor", "#333");
 
         //基础
         this.backgroundColor = getContainerPropsValue(container, "content.backgroundColor", '#fff');
@@ -263,6 +280,8 @@
         this.showQuickEntry = getContainerPropsValue(container, 'content.showQuickEntry', "N");
         this.quickEntryType = getContainerPropsValue(container, 'content.quickEntryType', "");
         this.quickEntryPath = getContainerPropsValue(container, 'content.quickEntryPath', {value:""}).value;
+        this.qrcodePath = getContainerPropsValue(container, 'content.qrcodePath', {value:""}).value;
+        this.scanPath = getContainerPropsValue(container, 'content.scanPath', {value:""}).value;
 
         let name , logo, platform_logo;
         if (this.projectAttr['site_name']) name = this.projectAttr['site_name'];
@@ -301,6 +320,16 @@
           })
         }
       },
+      handleQrCodeClick(){
+        this.$xdUniHelper.navigateTo({
+          url: this.qrcodePath
+        })
+      },
+      handleScanClick(){
+        this.$xdUniHelper.navigateTo({
+          url: this.scanPath
+        })
+      },
 
       /***
        * @description 定位完成事件
@@ -446,6 +475,20 @@
               padding: 0;
             }
           }
+          .scan_in{
+            position: relative;
+            padding-right: 28rpx;
+            margin-right: 20rpx;
+            &::before{
+              content: " ";
+              position: absolute;
+              width: 2rpx;
+              height: 100%;
+              background-color: #CCCCCC;
+              right: -0rpx;
+              top: 0rpx;
+            }
+          }
           .search_input{
             flex: 1;
             text-align: left;
@@ -479,6 +522,9 @@
           align-items: center;
           justify-content: center;
         }
+        .qr_code{
+          margin-left: 16rpx;
+        }
       }
     }
   }

package/src/components/JfbBaseHeaderColumn/Attr.js

@@ -312,6 +312,28 @@ export default {
         groupKey:'style',
         hidden: true,
       },
+      {
+        label: "是否展示二维码",
+        ele: "xd-radio",
+        valueKey: "showQrcode",
+        value: data.showQrcode || "N",
+        list: [
+          {label: "不显示", value: "N"},
+          {label: "显示", value: "Y"}
+        ],
+        groupKey:'content',
+      },
+      {
+        label: "是否展示扫一扫",
+        ele: "xd-radio",
+        valueKey: "showScan",
+        value: data.showScan || "N",
+        list: [
+          {label: "不显示", value: "N"},
+          {label: "显示", value: "Y"}
+        ],
+        groupKey:'content',
+      },
       {
         label: "是否展示快捷入口",
         ele: "xd-radio",
@@ -368,6 +390,40 @@ export default {
         placeholder: '请选择快捷入口背景颜色',
         classNmae: 'input80',
       },
+      data.showQrcode === 'Y' && {
+        ele: 'title',
+        label: '二维码样式设置',
+        size: 'small',
+        groupKey:'style',
+      },
+      data.showQrcode === 'Y' && {
+        label: "二维码大小:",
+        ele: "el-input",
+        valueKey: "qrcodeSize",
+        value: data.qrcodeSize || 32,
+        type: "number",
+        groupKey: "style",
+      },
+      data.showQrcode === 'Y' && {
+        label: "二维码图标颜色:",
+        ele: 'xd-color',
+        valueKey: "qrCodeColor",
+        groupKey:'style',
+        value: data.qrCodeColor || '',
+      },
+      data.showScan === 'Y' && {
+        ele: "title",
+        label: "扫一扫样式设置",
+        size: "small",
+        groupKey: "style",
+      },
+      data.showScan === 'Y' && {
+        label: "扫一扫图标颜色:",
+        ele: 'xd-color',
+        valueKey: "scanIconColor",
+        value: data.scanIconColor || '',
+        groupKey:'style',
+      },
       {
         label: '是否有边框:',
         ele: 'xd-radio',
@@ -441,6 +497,32 @@ export default {
         notice:'<div><span style="color:red">客服类型</span>不需要配置</div>',
         inline: false,
       },
+      {
+        label: '二维码跳转链接:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'qrcodePath',
+        groupKey:'advanced',
+        placeholder: '选择二维码跳转链接',
+        value: data['qrcodePath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+        hidden: data.showQrcode === 'N'
+      },
+      {
+        label: "扫一扫跳转链接:",
+        ele: 'xd-select-pages-path',
+        valueKey: "scanPath",
+        groupKey:'advanced',
+        placeholder: '选择扫一扫跳转链接',
+        value: data['scanPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+        hidden: data.showScan === 'N'
+      },
       {
         label: '',
         ele: 'slot',