jufubao-base 1.0.238-beta71 → 1.0.239-beta1

package/src/components/JfbBaseShare/JfbBaseShareLess.less

@@ -0,0 +1,79 @@
+/**
+* @desc 获取绝对路径完整地址
+* @param @path
+**/
+//例如：https://image.jufubao.cn/20220501010108/image/bg/default_gonghui_bg.png
+@basePath: 'business/';
+@doMain: '//sandbox-img.jufubao.cn/';
+
+.getBusinessImageUrl(@path, @size: 'size8') {
+  @url: "@{doMain}@{basePath}@{path}?x-oss-process=style/@{size}";
+  background-image: url(@url);
+}
+
+//start
+.jfb-base-share {
+  box-sizing: border-box;
+
+  &__body{
+      position: relative;
+      overflow: hidden;
+      z-index: 2
+  }
+
+  &.editx,&.editx:hover {
+    position: relative;
+    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;
+    }
+
+  }
+
+
+  &__edit {
+    cursor: pointer;
+    position: absolute;
+    right: unit(0, rpx);
+    top: unit(-52, rpx);
+    height: unit(50, rpx);
+    line-height: unit(50, rpx);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: rgba(0, 0, 0, .6);
+    border-radius: unit(10, rpx);
+    box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
+    color: #fff;
+    font-size: unit(22, rpx);
+
+    &-icon{
+      padding: 0 unit(20, rpx);
+    }
+
+    &.editx {
+      box-sizing: border-box;
+
+    }
+  }
+}
+//end
+
+
+/**notPreview**/
+.jfb-base-share {
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
+}
+/**endNotPreview**/

package/src/components/JfbBaseShare/JfbBaseShareMixin.js

@@ -0,0 +1,30 @@
+'use strict';
+
+
+//@AttrImport
+import Attr from "./Attr";
+//@EndAttrImport
+
+
+export default {
+  data() {
+    return {
+      //#ifdef H5
+      
+      //@AttrData
+      Attr:{}, //对外开发编辑属性
+      //@EndAttrData
+      
+      // #endif
+      cssRoot: 'jfb-base-share'
+    }
+  },
+  created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
+  },
+}

package/src/components/JfbBaseShare/Mock.js

@@ -0,0 +1,16 @@
+"use strict";
+
+module.exports = {
+  getInviteCardList: {
+    total_size: 1,
+    next_page_token: "",
+    list: [
+      {
+        jump_url: "111111?x-common=eyJzaGFyZV9jb2RlIjogVWY0eng2RVBmVn0",
+        share_image_url:
+          "https://sandbox-img.jufubao.cn/uploads/20250410/34559f90dd5a01e7368c02bf33f1b484.png?x-oss-process=style/size8"
+      }
+    ],
+    request_id: "e081f3a16f40bfbe"
+  }
+};

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -63,7 +63,11 @@
             <view class="settle-item" v-for="(settle,index) in info.settleInfo" :key="index">
               <view>{{settle.label}}：</view>
               <view v-if="settle.type === 'price'">
-                <xd-unit :price="settle.value" :is-old="false"></xd-unit>
+                <xd-unit
+                  :largeZero="false"
+                  :isShowIcon="isShowIcon"
+                  :colorNew="is_plus_site ? '#999':''"
+                  :price="settle.value" :is-old="false"></xd-unit>
               </view>
               <view v-else v-html="settle.value"></view>
             </view>
@@ -429,6 +433,7 @@ export default {
       payBgColor:'',
       bgColor:'',
       ticket_method_msg:'', //取票提示文案
+      is_plus_site: false,
 
       //按钮
       btnTextColor:'',
@@ -456,14 +461,19 @@ export default {
     },
   },
   computed: {
-    ...mapState(["brandInfo"]),
+    ...mapState(["brandInfo", "siteInfo"]),
     ...styleForm.getComputedItem(),
+    isShowIcon() {
+      if(this.$configProject['isPreview']) return true;
+      return this.siteInfo.mapping.is_show_coin_icon==='Y'
+    },
   },
   created() {
     this.isPreview = this.$configProject.isPreview;
     this.noUserLoding = !this.$root['isLogined']; //判断是否需要已登录
     if(this.isPreview) this.noUserLoding = false;
     this.init(this.container);
+    this.is_plus_site = this.projectAttr.headers['X-Site-Group']==="vip";
   },
   destroyed() {
     if (this.timeer) {

package/src/components/JfbBaseTfkSearch/ContentProduct.vue

@@ -28,25 +28,13 @@
       </view>
       <view class="prodcut-content-btn" v-if="isBtn">
         <view :class="{onePrice: cell === 1}">
-          <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>
+          <CusPrice 
+            v-if="productConfig.isPrice === 'Y'" 
+            type="two"
+            :showPrice="item['show_prices']" 
+            :isShowIcon="productConfig.isShowIcon"
+            :isPlus="productConfig.is_plus_site">
+          </CusPrice>
         </view>
         <view>
           <view @click.stop="handleDetail()" v-if="productConfig.isAddCart === 'Y'">
@@ -68,13 +56,15 @@ 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
+    XdProductStatus,
+    CusPrice
   },
   props:{
     keyword:{
@@ -250,10 +240,10 @@ export default {
         & > view:first-child {
           flex: 1;
           & > view:first-child {
-            height: 40rpx;
             display: flex;
+            flex-direction: column;
             justify-content: flex-start;
-            align-items: center;
+            align-items: flex-start;
             overflow: hidden;
           }
           & > view:nth-child(2) {

package/src/components/JfbBaseTfkSearch/JfbBaseTfkSearch.vue

@@ -73,6 +73,7 @@
   import listMixins from "./listMixins";
   import CustomList from "./CustomList.vue";
   import AllList from "./AllList.vue";
+  import { mapState } from 'vuex';
 
   class EmitParent {
     constructor(options) {
@@ -86,7 +87,7 @@
       CustomList,
       XdFontIcon,
       AllList,
-      XdSearchHistory
+      XdSearchHistory,
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseTfkSearchMixin,listMixins
@@ -127,9 +128,13 @@
         allModuleItemContRadius: 16,
         allModuleItemContBgColor: "#FFFFFF",
         emitParent:{},
+        is_plus_site: false
       }
     },
     computed: {
+      ...mapState({
+        siteInfo: state => state.siteInfo,
+      }),
       showMenuList(){
         return [{label: "全部", value: "all"}, ...this.menuList]
       },
@@ -231,6 +236,7 @@
           return this;
         }
       })
+      this.is_plus_site = this.projectAttr.headers['X-Site-Group']==="vip";
       this.init(this.container);
       this.cusInit(this.container);
     },
@@ -246,6 +252,11 @@
         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,6 +28,18 @@ 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,
@@ -43,7 +55,19 @@ module.exports = {
             sale_price: 2195,
             status: "ok",
             thumb:
-              "https://img1.winxuancdn.com/1305/10251305_9.jpg?1530683968642"
+              "https://img1.winxuancdn.com/1305/10251305_9.jpg?1530683968642",
+            show_prices: [
+              {
+                  "p": 8500,
+                  "n": "PLUS价",
+                  "t": "S"
+              },
+              {
+                  "p": 7500,
+                  "n": "原价",
+                  "t": "U"
+              }
+            ]
           },
           {
             brand_id: 30000,
@@ -59,7 +83,19 @@ module.exports = {
             sale_price: 4219,
             status: "ok",
             thumb:
-              "https://img2.winxuancdn.com/9564/10309564_9.jpg?1530754178039"
+              "https://img2.winxuancdn.com/9564/10309564_9.jpg?1530754178039",
+            show_prices: [
+              {
+                  "p": 100,
+                  "n": "PLUS价",
+                  "t": "S"
+              },
+              {
+                  "p": 200,
+                  "n": "原价",
+                  "t": "U"
+              }
+            ]
           },
           {
             brand_id: 30000,
@@ -75,7 +111,19 @@ module.exports = {
             sale_price: 4388,
             status: "ok",
             thumb:
-              "https://img3.winxuancdn.com/9416/10309416_9.jpg?1530754178039"
+              "https://img3.winxuancdn.com/9416/10309416_9.jpg?1530754178039",
+            show_prices: [
+              {
+                  "p": 100,
+                  "n": "PLUS价",
+                  "t": "S"
+              },
+              {
+                  "p": 200,
+                  "n": "原价",
+                  "t": "U"
+              }
+            ]
           }
         ]
       },

package/src/components/JfbBaseTfkSearch/listMixins.js

@@ -24,7 +24,8 @@ 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};
+      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};
 
       //内容
       let brandColor = getContainerPropsValue(container, 'content.brandColor', '#aaa');

package/src/components/JfbBaseUserInfo/Attr.js

@@ -20,6 +20,34 @@ 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',
@@ -33,7 +61,7 @@ export default {
           {label: '垂直', value: 'Y'},
         ]
       },
-      {
+      data['is_plus']==='N'&&{
         label: "头像右侧内容:",
         ele: "xd-radio-self",
         valueKey: "rightContent",
@@ -91,7 +119,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',
@@ -101,7 +129,47 @@ 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]
@@ -125,7 +193,7 @@ export default {
         label: '圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'radius',
-        value: data['radius'] || '0',
+        value: data['radius'] || '20',
         labelInline:true,
         groupKey:'style',
         placeholder: '请选择圆角设置',
@@ -176,7 +244,55 @@ 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',
@@ -363,13 +479,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",
@@ -377,7 +493,7 @@ export default {
         placeholder: '请选择头像右侧内容背景颜色',
         groupKey: "style",
       },
-      {
+      data['is_plus_site']==='N'&&{
         label: "头像右侧内容文字颜色",
         ele: "xd-text-and-bgc",
         groupKey:'style',
@@ -409,7 +525,7 @@ export default {
       //   placeholder: '请选择头像右侧内容文字颜色',
       //   groupKey: "style",
       // },
-      {
+      data['is_plus_site']==='N'&&{
         label: "头像右侧内容内边距配置:",
         ele: 'xd-margin-padding',
         valueKey: 'rightContentPadding',
@@ -421,7 +537,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',
@@ -440,7 +556,7 @@ export default {
             });
         },
       },
-      {
+      data['is_plus_site']==='N'&&{
         label: '编辑地址路径:',
         ele: 'xd-select-pages-path',
         valueKey: 'addressUrl',
@@ -452,6 +568,54 @@ 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',