jufubao-base 1.0.237-beta2 → 1.0.237-beta3

package/src/components/JfbBaseNoticeDialog/JfbBaseNoticeDialog.vue

@@ -84,9 +84,7 @@ export default {
       currentLinkUrl: "",
       currentIndex: 0,
       contentList: [],
-      number: '',
-      systemType: '',
-      showGroup: ''
+      number: ''
     };
   },
   watch: {
@@ -136,7 +134,9 @@ 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,
               "size3"
@@ -145,17 +145,8 @@ export default {
               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 + "分钟"}`);

package/src/components/JfbBaseTfkSearch/ContentProduct.vue

@@ -28,12 +28,25 @@
       </view>
       <view class="prodcut-content-btn" v-if="isBtn">
         <view :class="{onePrice: cell === 1}">
-          <CusPrice 
-            v-if="productConfig.isPrice === 'Y'" 
-            type="two"
-            :showPrice="item['show_prices']" 
-            :isPlus="productConfig.is_plus_site">
-          </CusPrice>
+          <view v-if="productConfig.isPrice === 'Y'">
+            <xd-unit
+              :price="(item['promo_price'] || item['sale_price'])"
+              :isOld="false"
+              :iconSize="0.3"
+              :fontSize="36"
+            />
+          </view>
+          <view
+            v-if="productConfig.isShowDiscount==='Y' && checkDiscountPrice"
+            :style="{color:oldPriceColor}" class="oldPrice">
+            <xd-unit
+              :price="dividePrice"
+              :iconSize="0.21"
+              :fontSize="24"
+              delete-line
+              is-gray
+            />
+          </view>
         </view>
         <view>
           <view @click.stop="handleDetail()" v-if="productConfig.isAddCart === 'Y'">
@@ -55,15 +68,13 @@ import getServiceUrl from "@/common/getServiceUrl";
 import XdFontIcon from "@/components/XdFontIcon/XdFontIcon.vue";
 import XdProductStatus from "@/components/XdProductStatus/XdProductStatus";
 import XdUnit from "@/components/XdUnit/XdUnit.vue";
-import CusPrice from "@/components/CusPrice/CusPrice";
 
 export default {
   name: "ContentProduct",
   components:{
     XdFontIcon,
     XdUnit,
-    XdProductStatus,
-    CusPrice
+    XdProductStatus
   },
   props:{
     keyword:{
@@ -239,10 +250,10 @@ export default {
         & > view:first-child {
           flex: 1;
           & > view:first-child {
+            height: 40rpx;
             display: flex;
-            flex-direction: column;
             justify-content: flex-start;
-            align-items: flex-start;
+            align-items: center;
             overflow: hidden;
           }
           & > view:nth-child(2) {

package/src/components/JfbBaseTfkSearch/JfbBaseTfkSearch.vue

@@ -86,7 +86,7 @@
       CustomList,
       XdFontIcon,
       AllList,
-      XdSearchHistory,
+      XdSearchHistory
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseTfkSearchMixin,listMixins
@@ -127,7 +127,6 @@
         allModuleItemContRadius: 16,
         allModuleItemContBgColor: "#FFFFFF",
         emitParent:{},
-        is_plus_site: false
       }
     },
     computed: {
@@ -232,7 +231,6 @@
           return this;
         }
       })
-      this.is_plus_site = this.projectAttr.headers['X-Site-Group']==="vip";
       this.init(this.container);
       this.cusInit(this.container);
     },
@@ -248,11 +246,6 @@
         if(this.tabId === 'all'){
           data['search_range'] = this.searchScope.map(item => item.value.split("@")[0]).join(',');
         }
-        if(this.productConfig.isShowDiscount==='Y'){
-          data.is_show_uprice=this.$xdUniHelper.multiplyFloatNumber(this.productConfig.differ,100)
-        } else {
-          data.is_show_uprice=-1
-        }
 
         jfbRootExec("getTfkSearchList", {
           vm: this,

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,7 +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');
-      this.productConfig = {is_show_brand, isPrice, isShowTag, isShowDiscount, isAddCart, differ, showActivityPrice, isShowExchange,is_plus_site: this.is_plus_site};
+      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: '请选择圆角设置',
@@ -431,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",
@@ -445,7 +377,7 @@ export default {
         placeholder: '请选择头像右侧内容背景颜色',
         groupKey: "style",
       },
-      data['is_plus_site']==='N'&&{
+      {
         label: "头像右侧内容文字颜色",
         ele: "xd-text-and-bgc",
         groupKey:'style',
@@ -477,7 +409,7 @@ export default {
       //   placeholder: '请选择头像右侧内容文字颜色',
       //   groupKey: "style",
       // },
-      data['is_plus_site']==='N'&&{
+      {
         label: "头像右侧内容内边距配置:",
         ele: 'xd-margin-padding',
         valueKey: 'rightContentPadding',
@@ -489,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',
@@ -508,7 +440,7 @@ export default {
             });
         },
       },
-      data['is_plus_site']==='N'&&{
+      {
         label: '编辑地址路径:',
         ele: 'xd-select-pages-path',
         valueKey: 'addressUrl',
@@ -520,30 +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,
-      },
       {
         label: '',
         ele: 'slot',