jufubao-base 1.0.135 → 1.0.136

package/src/components/JfbBaseHeader/Attr.js

@@ -6,12 +6,29 @@
 export default {
   style: [],
   content: (data) => {
-    console.log("aaa11",data)
     return [
+      {
+        label: '',
+        ele: 'slot',
+        slot: 'is_reference_title',
+        groupKey:'advanced',
+      },
+      {
+        label: "搜索框是否可用于搜索",
+        ele: "xd-radio",
+        valueKey: "useSearch",
+        value: data.useSearch || "Y",
+        groupKey:'content',
+        list: [
+          {label: "用于搜索", value: "Y"},
+          {label: "用于跳转搜索页", value: "N"}
+        ]
+      },
       {
         label: "是否显示返回箭头",
         ele: "xd-radio",
         valueKey: "showBack",
+        groupKey:'content',
         value: data.showBack || "Y",
         list: [
           {label: "显示", value: "Y"},
@@ -23,144 +40,98 @@ export default {
         ele: "xd-radio",
         valueKey: "showLocation",
         value: data.showLocation || "N",
+        groupKey:'content',
         list: [
           {label: "显示", value: "Y"},
           {label: "不显示", value: "N"}
         ]
       },
-      // {
-      //   label: "定位地址非当前城市时",
-      //   ele: "xd-radio",
-      //   valueKey: "showSwitchCity",
-      //   value: data.showSwitchCity || "N",
-      //   list: [
-      //     {label: "弹框提示切换", value: "Y"},
-      //     {label: "不提示", value: "N"}
-      //   ]
-      // },
-      data.showLocation==='Y' && {
-        label: '选择城市路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'choseCityPath', //form[valueKey]
-        placeholder: '选择城市路径路径',
-        value: data['choseCityPath'] || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        inline: false,
-      },
       {
-        label: "是否LOGO",
+        label: "是否显示站点信息",
         ele: "xd-radio",
         valueKey: "showPartner",
         value: data.showPartner || "N",
+        groupKey:'content',
         list: [
           {label: "显示", value: "Y"},
           {label: "不显示", value: "N"}
         ],
       },
-      data.showPartner==="Y" && 0 && {
-        label: '加盟商Logo:',
-        ele: 'xd-upload',
-        valueKey: 'logo',
-        value: data.logo || {},
-        defaultValue: data.logo || null,
-        slot: true,
-        oneWidth: 100,
-        oneHeight: 100,
-        elinputClassName: 'input40',
-        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
-        type: ['jpg', 'png', 'jpeg'],
-        styleType: 'one',
-        uploadType: 'aliyun',
-        size: 5,
-        action: 'action',
-        sort: true,
-        maxlen: 100,
-        rules: [
-          { required: true, message: '请上传图片', trigger: ['blur', 'change'] },
-        ]
-      },
-      {
-        label: "显示标题",
+      data.showPartner === 'Y' && {
+        label: "是否显示站点名称",
         ele: "xd-radio",
         valueKey: "showPartnerName",
+        groupKey:'content',
         value: data.showPartnerName || "N",
         list: [
           {label: "显示", value: "Y"},
           {label: "不显示", value: "N"}
         ],
       },
-      data.showPartner==="Y" && 0 && {
-        label: "加盟商名称:",
-        ele: "el-input",
-        valueKey: "partnerName",
-        value: data.partnerName || "",
-        className: "input80"
-      },
       {
         label: "搜索框提示文案",
         ele: "el-input",
         placeholder: '请输入搜索框提示文案',
         valueKey: "placeholder",
+        groupKey:'content',
         value: data.placeholder || '',
         className: "input80"
       },
       {
-        label: "搜索框是否可用于搜索",
-        ele: "xd-radio",
-        valueKey: "useSearch",
-        value: data.useSearch || "Y",
-        list: [
-          {label: "用于搜索", value: "Y"},
-          {label: "用于跳转搜索页", value: "N"}
-        ]
-      },
-      data.useSearch === 'N' && {
-        label: '搜索页选中路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'searchPagePath', //form[valueKey]
-        value: data['searchPagePath'] || {},
-        setting: {
-          router: XdBus.getParentApi('getPagesTree')
-        },
-        inline: false,
+        label: '背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'backgroundColor',
+        value: data.backgroundColor || '',
+        placeholder: '请选择背景颜色',
+        classNmae: 'input80',
+        groupKey:'style',
       },
       {
         ele: 'title',
-        label: '背景设置',
-        size: 'small', //default/mini/small
+        label: '定位功能样式设置',
+        size: 'small',
+        groupKey:'style',
       },
       {
         label: '文字颜色:',
         ele: 'xd-color',
         valueKey: 'textColor',
         value: data.textColor || '',
-        placeholder: '请选择背景颜色',
+        placeholder: '请选择文字颜色',
         classNmae: 'input80',
+        groupKey:'style',
       },
       data.showLocation==='Y'&&{
-        label: '定位ICON:',
+        label: 'ICON:',
         ele: 'el-input',
         type: 'text',
+        groupKey:'style',
         valueKey: 'locationIcon',
         value: data['locationIcon'] || '',
         placeholder: '请输入定位ICON',
         className: 'input80',
       },
       data.showLocation==='Y'&&{
-        label: '定位背景颜色:',
+        label: '背景颜色:',
         ele: 'xd-color',
+        groupKey:'style',
         valueKey: 'locationBackgroundColor',
         value: data.locationBackgroundColor || '',
         placeholder: '请选择定位背景颜色',
         classNmae: 'input80',
       },
+      {
+        ele: 'title',
+        label: '搜索框样式设置',
+        size: 'small',
+        groupKey:'style',
+      },
       {
         label: 'ICON:',
         ele: 'el-input',
         type: 'text',
         valueKey: 'icon',
+        groupKey:'style',
         value: data['icon'] || '',
         placeholder: '请输入ICON',
         className: 'input80',
@@ -170,22 +141,16 @@ export default {
         ele: 'xd-color',
         valueKey: 'iconColor',
         value: data.iconColor || '',
+        groupKey:'style',
         placeholder: '请选择ICON颜色',
         classNmae: 'input80',
       },
       {
         label: '背景颜色:',
         ele: 'xd-color',
-        valueKey: 'backgroundColor',
-        value: data.backgroundColor || '',
-        placeholder: '请选择背景颜色',
-        classNmae: 'input80',
-      },
-      {
-        label: '输入框背景颜色:',
-        ele: 'xd-color',
         valueKey: 'inputBackgroundColor',
         value: data['inputBackgroundColor'] || '',
+        groupKey:'style',
         placeholder: '请选择背景颜色',
         classNmae: 'input80',
       },
@@ -193,6 +158,7 @@ export default {
         label: '输入框文字颜色:',
         ele: 'xd-color',
         valueKey: 'inputTextColor',
+        groupKey:'style',
         value: data['inputTextColor'] || '',
         placeholder: '请选择输入框文字颜色',
         classNmae: 'input80',
@@ -200,7 +166,8 @@ export default {
       {
         ele: 'title',
         label: '投影设置',
-        size: 'small', //default/mini/small
+        size: 'small',
+        groupKey:'style',
       },
       {
         label: '是否有投影:',
@@ -208,6 +175,7 @@ export default {
         valueKey: 'is_shadow',
         value: data['is_shadow'] || 'N',
         placeholder: '请选择是否投影',
+        groupKey:'style',
         multiple: false,
         className: 'input80',
         list: [
@@ -220,12 +188,14 @@ export default {
         ele: 'xd-color',
         valueKey: 'is_shadow_bg',
         value: data['is_shadow_bg'] || '',
+        groupKey:'style',
         placeholder: '请选择投影颜色',
         classNmae: 'input80',
       },
       data['is_shadow'] === 'Y' && {
         label: '投影范围:',
         ele: 'xd-site-select-list',
+        groupKey:'style',
         valueKey: 'is_shadow_w',
         value: data['is_shadow_w'] || '10',
         placeholder: '请选择投影范围',
@@ -247,12 +217,14 @@ export default {
       {
         ele: 'title',
         label: '边框设置',
-        size: 'small', //default/mini/small
+        size: 'small',
+        groupKey:'style',
       },
       {
         label: '是否有边框:',
         ele: 'xd-radio',
         valueKey: 'is_border',
+        groupKey:'style',
         value: data['is_border'] || 'N',
         placeholder: '请选择是否有边框',
         multiple: false,
@@ -266,6 +238,7 @@ export default {
         label: '边框颜色:',
         ele: 'xd-color',
         valueKey: 'is_border_c',
+        groupKey:'style',
         value: data['is_border_c'] || '',
         placeholder: '请选择边框颜色',
         classNmae: 'input80',
@@ -274,18 +247,43 @@ export default {
         label: '边框大小:',
         ele: 'el-input',
         type: 'number',
+        groupKey:'style',
         valueKey: 'is_border_w',
         value: data['is_border_w'] || '',
         placeholder: '请输入边框颜色',
         className: 'input80',
       },
       {
-        label: '', //label
-        ele: 'slot', //package 名称
+        label: '搜索页面链接:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'searchPagePath',
+        value: data['searchPagePath'] || {},
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
+        groupKey:'advanced',
+        inline:false,
+        notice:'搜索框“<span style="color:red">用于跳转搜索页</span>”时候生效',
+      },
+      {
+        label: '城市选择链接:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'choseCityPath',
+        groupKey:'advanced',
+        placeholder: '选择城城市选择链接',
+        value: data['choseCityPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      {
+        label: '',
+        ele: 'slot',
         slot: 'is_reference',
+        groupKey:'advanced',
       },
     ].filter(i=>i)
   },
-  advanced: [
-  ],
+  advanced: [],
 };

package/src/components/JfbBaseHeader/JfbBaseHeader.vue

@@ -23,7 +23,7 @@
         }"
       >
         <view class="header_wrap-back" @click="onJfbBack" v-if="showBack==='Y'">
-          <xd-font-icon :size="30" :color="iconColor" icon="iconxiangzuo_xian"/>
+          <xd-font-icon :size="30" :color="textColor" icon="iconxiangzuo_xian"/>
         </view>
         <view v-if="showPartner==='Y'" class="name_logo">
           <view v-if="logo" class="logo">
@@ -85,7 +85,7 @@
     mixins: [componentsMixins,extsMixins,JfbBaseHeaderMixin],
     computed:{
       ...mapState(['siteInfo']),
-  
+
       boxShadow() {
         if (this.is_shadow === 'Y') return `0 0 ${this.is_shadow_w}rpx ${this.is_shadow_bg}`;
         else return '0 0 0 rgba(0,0,0,0)';
@@ -112,25 +112,25 @@
         searchPagePath: "",
         placeholder: "搜索商品名称",
         choseCityPath: "",  //选择城市i
-        
-        
+
+
         //基础
         textColor: '',
         backgroundColor: '',
         inputBackgroundColor: '',
         inputTextColor: '',
-       
-        
+
+
         //ICON
         icon: '',
         iconColor: '',
-  
+
         //投影
         is_shadow: 'Y',
         is_shadow_bg: 0,
         is_shadow_w: 0,
-  
-  
+
+
         //边框
         is_border: 'Y',
         is_border_w: 0,
@@ -139,7 +139,7 @@
         //定位ICON
         locationIcon: "",
         locationBackgroundColor: ""
-        
+
         //
       }
     },
@@ -169,9 +169,8 @@
         this.useSearch = getContainerPropsValue(container, "content.useSearch", "Y");
         this.searchPagePath = getContainerPropsValue(container, "content.searchPagePath", {value:""}).value;
         this.choseCityPath = getContainerPropsValue(container, "content.choseCityPath", {value:""}).value;
-        // this.showSwitchCity = getContainerPropsValue(container, "content.showSwitchCity", "N");
 
-        
+
         //基础
         this.backgroundColor = getContainerPropsValue(container, "content.backgroundColor", '#fff');
         this.icon = getContainerPropsValue(container, "content.icon", 'iconsousuo_mian');
@@ -185,23 +184,23 @@
         this.is_shadow = getContainerPropsValue(container, 'content.is_shadow', 'N');
         this.is_shadow_bg = getContainerPropsValue(container, 'content.is_shadow_bg', '#fff');
         this.is_shadow_w = getContainerPropsValue(container, 'content.is_shadow_w', '10');
-  
+
         this.is_border = getContainerPropsValue(container, 'content.is_border', 'N');
         this.is_border_c = getContainerPropsValue(container, 'content.is_border_c', '#fff');
         this.is_border_w = getContainerPropsValue(container, 'content.is_border_w', '2');
-        
-        
-        
-        let name,logo, platform_logo;
-        if (this.projectAttr['site_name'])name = this.projectAttr['site_name'];
+
+
+
+        let name , logo, platform_logo;
+        if (this.projectAttr['site_name']) name = this.projectAttr['site_name'];
         if (this['siteInfo'] && this['siteInfo']['mapping'] && this['siteInfo']['mapping']['site_name'])  name = this['siteInfo']['mapping']['site_name'];
         if (this.projectAttr['site_logo']) logo = getServiceUrl(this.projectAttr['site_logo'], 'size3');
         if (this.projectAttr['platform_logo']) platform_logo = getServiceUrl(this.projectAttr['platform_logo'], 'size3');
         this.logo = platform_logo || logo || '//dummyimage.com/100x100';
         this.partnerName  = name || '聚福宝福利';
-        
-        
-        
+
+
+
       },
       handleInput(e){
         if(this.timer) clearTimeout(this.timer);
@@ -216,7 +215,7 @@
           })
         }
       },
-      
+
       /***
        * @description 定位完成事件
        * @param city
@@ -226,13 +225,13 @@
         this.city = city;
         jfbRootFnExec(this, 'onCustomEvent')("baseHeader@city", city);
       },
-      
+
       handleCityChange() {
         this.$xdUniHelper.navigateTo({
           url: this.choseCityPath
         },true)
       },
-      
+
       onJfbBack(options) {
         if(getCurrentPages().length === 1 ) {
           this.$xdUniHelper.redirectTo({
@@ -262,7 +261,7 @@
         display: flex;
         justify-content: space-between;
         align-items: center;
-        
+
         &-back {
           padding-left: unit(20, rpx);
           height: unit(110, rpx);
@@ -271,7 +270,7 @@
           align-items: center;
           flex-shrink: 0;
         }
-  
+
         &-city {
           height: unit(110, rpx);
           padding-left: unit(20, rpx);
@@ -280,14 +279,14 @@
           align-items: center;
           flex-shrink: 0;
         }
-  
+
         .name_logo{
           display: flex;
           align-items: center;
           flex-shrink: 0;
           height: unit(60, rpx);
           padding-left: unit(20, rpx);
-          
+
           .logo{
             margin-right: unit(20, rpx);
             height: 100%;
@@ -304,7 +303,7 @@
             font-size: unit(28, rpx);
           }
         }
-        
+
         .search_wrap{
           margin-left: unit(20, rpx);
           flex: 1;

package/src/components/JfbBaseHeader/JfbBaseHeaderLess.less

@@ -13,9 +13,7 @@
 
 //start
 .jfb-base-header {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +21,22 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&.editx:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    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;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-base-header {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseLogin/Api.js

@@ -128,7 +128,7 @@ module.exports = [
     isRule: false,
     params: {
       third_auth_code: ['第三方code', 'String', '必选'],
-      provider_id: ['登陆提供者id', 'String', '必选']
+      provider_id: ['登录提供者id', 'String', '必选']
     }
   },
   {