jufubao-base 1.0.237-beta18 → 1.0.237-beta3

package/src/components/JfbBaseTfkSearch/Mock.js

@@ -28,18 +28,6 @@ module.exports = {
             sale_price: 3000,
             status: "ok",
             thumb: "/uploads/20231215/b2ce0235129aa592044f96343f25c338.jpeg",
-            show_prices: [
-              {
-                  "p": 6500,
-                  "n": "PLUS价",
-                  "t": "S"
-              },
-              {
-                  "p": 7500,
-                  "n": "原价",
-                  "t": "U"
-              }
-            ]
           },
           {
             brand_id: 30000,
@@ -55,19 +43,7 @@ module.exports = {
             sale_price: 2195,
             status: "ok",
             thumb:
-              "https://img1.winxuancdn.com/1305/10251305_9.jpg?1530683968642",
-            show_prices: [
-              {
-                  "p": 8500,
-                  "n": "PLUS价",
-                  "t": "S"
-              },
-              {
-                  "p": 7500,
-                  "n": "原价",
-                  "t": "U"
-              }
-            ]
+              "https://img1.winxuancdn.com/1305/10251305_9.jpg?1530683968642"
           },
           {
             brand_id: 30000,
@@ -83,19 +59,7 @@ module.exports = {
             sale_price: 4219,
             status: "ok",
             thumb:
-              "https://img2.winxuancdn.com/9564/10309564_9.jpg?1530754178039",
-            show_prices: [
-              {
-                  "p": 100,
-                  "n": "PLUS价",
-                  "t": "S"
-              },
-              {
-                  "p": 200,
-                  "n": "原价",
-                  "t": "U"
-              }
-            ]
+              "https://img2.winxuancdn.com/9564/10309564_9.jpg?1530754178039"
           },
           {
             brand_id: 30000,
@@ -111,19 +75,7 @@ module.exports = {
             sale_price: 4388,
             status: "ok",
             thumb:
-              "https://img3.winxuancdn.com/9416/10309416_9.jpg?1530754178039",
-            show_prices: [
-              {
-                  "p": 100,
-                  "n": "PLUS价",
-                  "t": "S"
-              },
-              {
-                  "p": 200,
-                  "n": "原价",
-                  "t": "U"
-              }
-            ]
+              "https://img3.winxuancdn.com/9416/10309416_9.jpg?1530754178039"
           }
         ]
       },

package/src/components/JfbBaseTfkSearch/listMixins.js

@@ -24,8 +24,7 @@ export default {
       let differ = getContainerPropsValue(container, 'content.differ', 1);
       let showActivityPrice = getContainerPropsValue(container, 'content.showActivityPrice', 'N');
       let isShowExchange = getContainerPropsValue(container, 'content.isShowExchange', 'N');
-      let isShowIcon = this.siteInfo && this.siteInfo.mapping.is_show_coin_icon==='Y'
-      this.productConfig = {is_show_brand, isPrice, isShowTag, isShowDiscount, isAddCart, differ, showActivityPrice, isShowExchange,is_plus_site: this.is_plus_site,isShowIcon};
+      this.productConfig = {is_show_brand, isPrice, isShowTag, isShowDiscount, isAddCart, differ, showActivityPrice, isShowExchange};
 
       //内容
       let brandColor = getContainerPropsValue(container, 'content.brandColor', '#aaa');

package/src/components/JfbBaseUserInfo/Attr.js

@@ -20,34 +20,6 @@ export default {
 
     return [
       {
-        label: '是否plus站点:',
-        ele: 'xd-radio',
-        valueKey: 'is_plus_site',
-        value: data['is_plus_site'] || 'N',
-        groupKey:'content',
-        placeholder: '请选择是否plus',
-        multiple: false,
-        className: 'input80',
-        list: [
-          {label: '否', value: 'N'},
-          {label: '是', value: 'Y'},
-        ]
-      },
-      data['is_plus_site']==='Y'&&{
-        label: '预览plus样式:',
-        ele: 'xd-radio',
-        valueKey: 'is_plus_preview',
-        value: data['is_plus_preview'] || 'Y',
-        groupKey:'content',
-        placeholder: '请选择预览plus样式',
-        multiple: false,
-        className: 'input80',
-        list: [
-          {label: 'plus用户样式', value: 'Y'},
-          {label: '普通用户样式', value: 'N'},
-        ]
-      },
-      data['is_plus']==='N'&&{
         label: '内容排版:',
         ele: 'xd-radio',
         valueKey: 'text_type',
@@ -61,7 +33,7 @@ export default {
           {label: '垂直', value: 'Y'},
         ]
       },
-      data['is_plus']==='N'&&{
+      {
         label: "头像右侧内容:",
         ele: "xd-radio-self",
         valueKey: "rightContent",
@@ -119,7 +91,7 @@ export default {
         inline: false,
         notice: '设置填充，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
-      data['is_plus_site']==='N'&&{
+      {
         label: '背景颜色:',
         ele: 'xd-color',
         valueKey: 'backgroundColor',
@@ -129,47 +101,7 @@ export default {
         placeholder: '请选择背景颜色',
         classNmae: 'input80',
       },
-      data['is_plus_site']==='Y'&&{
-        label: 'plus用户上半部分背景颜色:',
-        ele: 'el-input',
-        valueKey: 'plusTopBackgroundColor',
-        groupKey:'style',
-        value: data.plusTopBackgroundColor || '',
-        labelInline:true,
-        placeholder: '请输入背景颜色',
-        classNmae: 'input80',
-      },
-      data['is_plus_site']==='Y'&&{
-        label: 'plus用户下半部分背景颜色:',
-        ele: 'el-input',
-        valueKey: 'plusBottomBackgroundColor',
-        groupKey:'style',
-        value: data.plusBottomBackgroundColor || '',
-        labelInline:true,
-        placeholder: '请输入背景颜色',
-        classNmae: 'input80',
-      },
-      data['is_plus_site']==='Y'&&{
-        label: '普通用户上半部分背景颜色:',
-        ele: 'el-input',
-        valueKey: 'normalTopBackgroundColor',
-        groupKey:'style',
-        value: data.normalTopBackgroundColor || '',
-        labelInline:true,
-        placeholder: '请输入背景颜色',
-        classNmae: 'input80',
-      },
-      data['is_plus_site']==='Y'&&{
-        label: '普通用户下半部分背景颜色:',
-        ele: 'el-input',
-        valueKey: 'normalBottomBackgroundColor',
-        groupKey:'style',
-        value: data.normalBottomBackgroundColor || '',
-        labelInline:true,
-        placeholder: '请输入背景颜色',
-        classNmae: 'input80',
-      },
-      data['is_plus_site']==='N'&&{
+      {
         label: '内容背景图片:', //label
         ele: 'xd-upload', //package 名称
         valueKey: 'bgImage', //form[valueKey]
@@ -193,7 +125,7 @@ export default {
         label: '圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'radius',
-        value: data['radius'] || '20',
+        value: data['radius'] || '0',
         labelInline:true,
         groupKey:'style',
         placeholder: '请选择圆角设置',
@@ -244,55 +176,7 @@ export default {
           selected:defContBorder.type
         },
       },
-      data['is_plus_site']==='Y'&&{
-        label: "plus用户昵称字体样式设置",
-        ele: "xd-text-and-bgc",
-        groupKey:'style',
-        valueKey: 'plusNickStyle',
-        value: data['plusNickStyle'] || null,
-        setting: {
-          fontSize: true,
-          color: true,
-          bgColor: false,
-          weight: true,
-          selected:false
-        },
-        handleCustom({action, data}) {
-          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
-            .then(res => {
-              data.cb(res.list)
-            })
-            .catch(error => {
-              console.error(error);
-              data.cb([])
-            });
-        },
-      },
-      data['is_plus_site']==='Y'&&{
-        label: "普通用户昵称字体样式设置",
-        ele: "xd-text-and-bgc",
-        groupKey:'style',
-        valueKey: 'normalNickStyle',
-        value: data['normalNickStyle'] || null,
-        setting: {
-          fontSize: true,
-          color: true,
-          bgColor: false,
-          weight: true,
-          selected:false
-        },
-        handleCustom({action, data}) {
-          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
-            .then(res => {
-              data.cb(res.list)
-            })
-            .catch(error => {
-              console.error(error);
-              data.cb([])
-            });
-        },
-      },
-      data['is_plus_site']==='N'&&{
+      {
         label: "昵称字体样式设置",
         ele: "xd-text-and-bgc",
         groupKey:'style',
@@ -479,13 +363,13 @@ export default {
           {label: '显示', value: 'Y'},
         ]
       },
-      data['is_plus_site']==='N'&&{
+      {
         label: "头像右侧内容配置",
         ele: "title",
         size: "small",
         groupKey: "style"
       },
-      data['is_plus_site']==='N'&&{
+      {
         label: "头像右侧内容背景颜色:",
         ele: "xd-color",
         valueKey: "rightContentBgColor",
@@ -493,7 +377,7 @@ export default {
         placeholder: '请选择头像右侧内容背景颜色',
         groupKey: "style",
       },
-      data['is_plus_site']==='N'&&{
+      {
         label: "头像右侧内容文字颜色",
         ele: "xd-text-and-bgc",
         groupKey:'style',
@@ -525,7 +409,7 @@ export default {
       //   placeholder: '请选择头像右侧内容文字颜色',
       //   groupKey: "style",
       // },
-      data['is_plus_site']==='N'&&{
+      {
         label: "头像右侧内容内边距配置:",
         ele: 'xd-margin-padding',
         valueKey: 'rightContentPadding',
@@ -537,7 +421,7 @@ export default {
         inline: false,
         notice: '设置外填充，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
-      data['is_plus_site']==='N'&&{
+      {
         label: "头像右侧内容圆角:",
         ele: 'xd-site-select-list',
         valueKey: 'rightContentRadius',
@@ -556,7 +440,7 @@ export default {
             });
         },
       },
-      data['is_plus_site']==='N'&&{
+      {
         label: '编辑地址路径:',
         ele: 'xd-select-pages-path',
         valueKey: 'addressUrl',
@@ -568,54 +452,6 @@ export default {
         },
         inline: false,
       },
-      data['is_plus_site']==='Y'&&{
-        label: '开通vip路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'openVipPath',
-        groupKey:'advanced',
-        placeholder: '请选择编辑地址路径',
-        value: data['openVipPath'] || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        inline: false,
-      },
-      data['is_plus_site']==='Y'&&{
-        label: '立即查看路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'viewPath',
-        groupKey:'advanced',
-        placeholder: '请选择编辑地址路径',
-        value: data['viewPath'] || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        inline: false,
-      },
-      data['is_plus_site']==='Y'&&{
-        label: '二维码路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'codePath',
-        groupKey:'advanced',
-        placeholder: '请选择二维码路径',
-        value: data['codePath'] || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        inline: false,
-      },
-      data['is_plus_site']==='Y'&&{
-        label: '个人资料路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'profilePath',
-        groupKey:'advanced',
-        placeholder: '请选择二维码路径',
-        value: data['profilePath'] || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        inline: false,
-      },
       {
         label: '',
         ele: 'slot',