jufubao-base 1.0.237-beta8 → 1.0.237-beta9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.237-beta8",
+  "version": "1.0.237-beta9",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

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/JfbBaseHeaderColumn.vue

@@ -66,7 +66,7 @@
                 :key="showLocationKey"
               ></xd-city-show-api>
             </view>
-            <view v-if="showScan==='Y'" class="scan_in" @click="handleScanClick">
+            <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"/>
@@ -87,7 +87,7 @@
               @click.stop="doSearch"
             >{{searchBtnText || '搜索'}}</view>
           </view>
-          <view v-if="showQrcode==='Y'" class="qr_code" @click="handleQrCodeClick">
+          <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'"