jufubao-base 1.0.237-beta18 → 1.0.237-beta3

package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue

@@ -56,22 +56,6 @@
           :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>
@@ -123,8 +107,6 @@
         margin: {},
         padding:{},
         rowSpacing: 20, //间距
-
-        customName: '我的服务'
       }
     },
     watch: {
@@ -135,22 +117,6 @@
     },
 
     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`;
@@ -233,7 +199,6 @@
         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
@@ -263,14 +228,6 @@
             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({}); // 或者你可以插入其他默认值
-            }
-          }
         }
       },
     }
@@ -328,29 +285,6 @@
         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/JfbBaseHeader/Attr.js

@@ -300,28 +300,6 @@ 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",
@@ -378,40 +356,6 @@ 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',
@@ -485,32 +429,6 @@ 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,9 +60,6 @@
               :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'"
@@ -81,9 +78,6 @@
             @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]"
@@ -202,13 +196,6 @@
         searchBoxRadius: 30,
         bottomBorder: "",
         inputBorder: "",
-        showQrcode: "",
-        qrcodeSize: 32,
-        qrcodePath: "",
-        qrCodeColor: "",
-        showScan: "",
-        scanIconColor: "",
-        scanPath: "",
       }
     },
     watch: {
@@ -239,11 +226,7 @@
         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');
@@ -280,8 +263,6 @@
         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'];
@@ -320,16 +301,6 @@
           })
         }
       },
-      handleQrCodeClick(){
-        this.$xdUniHelper.navigateTo({
-          url: this.qrcodePath
-        })
-      },
-      handleScanClick(){
-        this.$xdUniHelper.navigateTo({
-          url: this.scanPath
-        })
-      },
 
       /***
        * @description 定位完成事件
@@ -475,20 +446,6 @@
               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;
@@ -522,9 +479,6 @@
           align-items: center;
           justify-content: center;
         }
-        .qr_code{
-          margin-left: 16rpx;
-        }
       }
     }
   }

package/src/components/JfbBaseHeaderColumn/Attr.js

@@ -312,28 +312,6 @@ 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",
@@ -390,40 +368,6 @@ 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',
@@ -497,32 +441,6 @@ 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/JfbBaseHeaderColumn/JfbBaseHeaderColumn.vue

@@ -66,9 +66,6 @@
                 :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'"
@@ -87,9 +84,6 @@
               @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]"
@@ -218,13 +212,6 @@
         searchBoxRadius: 30,
         bottomBorder: "",
         inputBorder: "",
-        showQrcode: "",
-        qrcodeSize: 32,
-        qrcodePath: "",
-        qrCodeColor: "",
-        showScan: "",
-        scanIconColor: "",
-        scanPath: "",
       }
     },
     watch: {
@@ -256,11 +243,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.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');
         this.icon = getContainerPropsValue(container, "content.icon", 'iconsousuo_mian');
@@ -298,8 +282,6 @@
         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'];
@@ -338,16 +320,6 @@
           })
         }
       },
-      handleQrCodeClick(){
-        this.$xdUniHelper.navigateTo({
-          url: this.qrcodePath
-        })
-      },
-      handleScanClick(){
-        this.$xdUniHelper.navigateTo({
-          url: this.scanPath
-        })
-      },
 
       /***
        * @description 定位完成事件
@@ -505,20 +477,6 @@
               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;
@@ -552,10 +510,6 @@
           align-items: center;
           justify-content: center;
         }
-
-        .qr_code{
-          margin-left: 16rpx;
-        }
       }
     }
   }

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -438,7 +438,6 @@ export default {
       showLogo: "Y", //是否显示logo
       customLogoUrl: {}, //自定义logo地址
       loginMenuMargin: {},
-      share_code: "",
     };
   },
   computed: {
@@ -605,14 +604,6 @@ export default {
     },
 
     onJfbLoad(options) {
-      if(options['x-common']){
-        let decodeParams = Base64.decode(options['x-common']);
-        try{
-          let commonParams = JSON.parse(decodeParams);
-          this.share_code = commonParams.share_code;
-        }catch(e){}
-      }
-
       this.$xdLog.setProject('JfbBaseLogin', 'JfbBaseLogin.onJfbLoad.start')
       this.redirect_url = options.redirect_url ? Base64.decode(options.redirect_url): '';
       this.isDebugPreview = options['x-test'] === 'jfb-tiyan';
@@ -988,7 +979,6 @@ export default {
         data: {
           raw_data,
           provider_id,
-          share_code: this.share_code,
         },
       })
         .then(() => {
@@ -1041,7 +1031,6 @@ export default {
             provider_id: this.phoneLogin.provider_id,
             phone_number,
             verification_code,
-            share_code: this.share_code,
           },
         })
           .then((res) => {

package/src/components/JfbBaseNoticeDialog/Api.js

@@ -8,7 +8,7 @@ module.exports = [
   {
     mapFnName: 'getListNoticeDialogContent', //自定义方法名字（必选）
     title: '获取内容',
-    path: '/cms/v1/ad-content',
+    path: '/cms/v1/news-content',
     isRule: false,
     params: {
       scene: ['使用场景', 'String', '选填'],

package/src/components/JfbBaseNoticeDialog/Attr.js

@@ -247,32 +247,6 @@ export default {
           { label: '弹框', value: 'pop' },
         ]
       },
-      {
-        label: '展示位置:',
-        ele: 'xd-radio',
-        valueKey: 'systemType',
-        groupKey:'content',
-        value: data['systemType'] || 'fuli',
-        placeholder: '请选择展示位置',
-        className: 'input60',
-        list: [
-          { label: '福利系统', value: 'fuli' },
-          { label: 'plus系统', value: 'plus' },
-        ]
-      },
-      data['systemType']==='plus'&&{
-        label: '展示方式:',
-        ele: 'xd-radio',
-        valueKey: 'showGroup',
-        groupKey:'content',
-        value: data['showGroup'] || 'all',
-        placeholder: '请选择展示方式',
-        className: 'input60',
-        list: [
-          { label: '全部用户', value: 'all' },
-          { label: '仅会员', value: 'vip' },
-        ]
-      },
       {
         label: '是否隐藏弹框(仅预览模式生效):',
         ele: 'xd-radio',

package/src/components/JfbBaseNoticeDialog/JfbBaseNoticeDialog.vue

@@ -84,9 +84,7 @@ export default {
       currentLinkUrl: "",
       currentIndex: 0,
       contentList: [],
-      number: '',
-      systemType: '',
-      showGroup: ''
+      number: ''
     };
   },
   watch: {
@@ -136,26 +134,19 @@ export default {
 
           //弹窗显示
           if (res.list.length > 0) {
-            this.contentList = res.list
+            this.contentList = res.list.map((item) => {
+              return JSON.parse(item.content);
+            });
             this.currentImage = getServiceUrl(
               this.contentList[0].image_url,
-              "size8"
+              "size3"
             );
             this.currentLinkUrl = this.getLinkUrl(
               this.contentList[0].redirect_data
             );
             this.currentIndex = 0;
-            if(this.systemType === 'fuli'){
-              this.handlePop();
-            } else {
-              if(this.showGroup==='all') {
-                this.handlePop();
-              }else {                
-                if(this.getTokenForKey('user_level')&&this.getTokenForKey('user_level')==='VIP') {
-                  this.handlePop();
-                }
-              }
-            }
+
+            this.handlePop();
           }
         })
         .catch((error) => {
@@ -184,16 +175,6 @@ export default {
       );
       this.type = getContainerPropsValue(container, "content.type", "pop");
       this.number = getContainerPropsValue(container, "content.number", 1);
-      this.systemType = getContainerPropsValue(
-        container,
-        "content.systemType",
-        "fuli"
-      );
-      this.showGroup = getContainerPropsValue(
-        container,
-        "content.showGroup",
-        "all"
-      );
     },
     handlePop() {
       console.warn(`this.time${this.time * 60 + "分钟"}`);
@@ -216,7 +197,7 @@ export default {
       );
       this.currentImage = getServiceUrl(
         this.contentList[this.currentIndex].image_url,
-        "size8"
+        "size3"
       );
     },
     handleToLink() {