jufubao-base 1.0.237-beta4 → 1.0.237-beta6

package/src/components/JfbBaseOpenVipDetail/JfbBaseOpenVipDetail.vue

@@ -20,12 +20,13 @@
         <xd-list-item label="套餐期限" paddingLR="40rpx">{{ vipInfo.life_cycle_label }}</xd-list-item>
       </view>
 
-      <view class="combo_section">
+      <!-- #13418 开通plus会员：此版本没有平台优惠 -->
+      <view v-if="0" class="combo_section">
         <xd-list-item label="套餐金额" paddingLR="40rpx">¥{{ $xdUniHelper.divisionFloatNumber(vipInfo.user_pay_amount, 100) }}</xd-list-item>
         <xd-list-item label="平台优惠" paddingLR="40rpx">-¥{{ $xdUniHelper.divisionFloatNumber(vipInfo.platform_discount_amount, 100) }}</xd-list-item>
       </view>
       
-      <view class="fixed_bottom" :style="[fixed_bottom]">
+      <view class="fixed_bottom" :style="fixed_bottom">
         <view class="pay_btn" @click="p_createVipOrder">
           立即支付
           <xd-unit style="margin-left: 16rpx;"
@@ -66,6 +67,7 @@
         closeMask: true,
         xnamespace: "",
         notify_provider_id: "",
+        hasClick: false,
 
         vip_card_id: "",
         vipInfo: {},
@@ -82,7 +84,7 @@
         }
       },
       fixed_bottom() {
-        return this.fixedStyle({paddingBottom: 36, zIndex: 111})
+        return this.fixedStyle({height: 36, zIndex: 111})
       },
     },
     watch: {
@@ -120,6 +122,9 @@
         })
       },
       p_createVipOrder(){
+        if(this.hasClick) return;
+        this.hasClick = true;
+        this.$xdShowLoading({});
         jfbRootExec("createVipOrder", {
           vm: this,
           data: {
@@ -129,6 +134,8 @@
             need_pay_price: this.vipInfo.user_pay_amount
           }
         }).then(res => {
+          this.hasClick = false;
+          this.$xdHideLoading();
           if(res.need_pay_price > 0){
             this.$xdUniHelper.redirectTo({
               url: this.payPath + `?order_id=${res.pay_order_id}&main_order_id=${res.main_order_id}`
@@ -138,7 +145,9 @@
               url: this.paySuccessPath + '?order_id=' + res.main_order_id
             })
           }
-
+        }).catch(err => {
+          this.hasClick = false;
+          this.$xdHideLoading();
         })
       },
       onJfbScroll(options) {

package/src/components/JfbBaseOpenVipDetail/Mock.js

@@ -1,13 +1,15 @@
-'use strict';
+"use strict";
 
 module.exports = {
-  
-  getOpenByIdFilmSquate:{},
-  
-  updateOpenFilmPaiqiDate:{},
-  
-  removeOpenFilmAddress:{},
-  
-  addOpenFilmcart:{},
-  
-}
+  getVipConfirm: {
+    vip_card_id: 1,
+    product_id: 60038515,
+    product_name: "年卡会员",
+    sale_price: 20000,
+    platform_discount_amount: 120,
+    user_pay_amount: 20000,
+    life_cycle_label: "1年",
+    request_id: "cc61b6e3a8e0931f"
+  },
+  createVipOrder: {}
+};

package/src/components/JfbBasePay/Attr.js

@@ -8,6 +8,46 @@ export default {
   advanced: [],
   content: data=>{
     return [
+      {
+        label: "【仍需扣点】文案:",
+        ele: "el-input",
+        valueKey: "text1",
+        value: data.text1 || "仍需扣点",
+        groupKey: "content",
+        inline: false,
+        className: "input80",
+      },
+      {
+        label: "【（可使用多张票券点数）】文案:",
+        ele: "el-input",
+        valueKey: "text2",
+        value: data.text2 || '',
+        placeholder: '（可使用多张票券点数）',
+        groupKey: "content",
+        inline: false,
+        className: "input80",
+      },
+      {
+        label: "【选择以下补差方式】文案:",
+        ele: "el-input",
+        valueKey: "text3",
+        value: data.text3 || '选择以下补差方式',
+        groupKey: "content",
+        inline: false,
+        className: "input80",
+      },
+      {
+        label: "是否展示继续补差",
+        ele: "xd-radio",
+        valueKey: "showContinuePay",
+        value: data.showContinuePay || 'Y',
+        groupKey: "content",
+        inline: true,
+        list: [
+          { label: "展示", value: "Y" },
+          { label: "不展示", value: "N" },
+        ],
+      },
       ...styleForm.getForm(data),
       {
         label: '支付成功跳转路径:', //label

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -100,7 +100,7 @@
       <view class="remain_pay" v-if="payInfo.channel_amount > 0">
         <view style="border-bottom: 2rpx solid #eee;" class="column-group">
           <view class="column-item" style="padding: 30rpx 60rpx">
-            <view class="column_label">仍需扣点<text class="label_sub">（可使用多张票券点数）</text></view>
+            <view class="column_label">{{text1}}<text class="label_sub">{{ text2 }}</text></view>
             <view class="column_value text-primary">
               <xd-unit
                 :price="payInfo.channel_amount"
@@ -112,8 +112,8 @@
           </view>
         </view>
         <view class="remain_header">
-          <view>选择以下补差方式</view>
-          <view class="flex align-center text-primary">
+          <view>{{ text3 }}</view>
+          <view v-if="showContinuePay==='Y'" class="flex align-center text-primary">
             <view class="margin-right">继续补差</view>
             <xd-unit
               :price="payInfo.channel_amount"
@@ -212,7 +212,11 @@ export default {
       rechargeSuccessPath: "", //充值成功
       ...styleForm.getDataItem(),
       borderColor:'rgba(0,0,0,0)',
-      options:{}
+      options:{},
+      text1: "",
+      text2: "",
+      text3: "",
+      showContinuePay: "",
     };
   },
   watch: {
@@ -262,6 +266,10 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {
+      this.text1 = getContainerPropsValue(container, 'content.text1', "");
+      this.text2 = getContainerPropsValue(container, 'content.text2', "");
+      this.text3 = getContainerPropsValue(container, 'content.text3', "");
+      this.showContinuePay = getContainerPropsValue(container, 'content.showContinuePay', 'Y');
       this.paySuccessPath = getContainerPropsValue(
         container,
         "content.pay_success_path",

package/src/components/JfbBasePay/Mock.js

@@ -24,15 +24,6 @@ module.exports = {
         "card_use_price": 10000,
         "use_card_point": "5000"
       },
-      {
-        "card_number": "101001000005195",
-        "card_type_name": "聚福宝福卡测试蛋糕",
-        "end_time": 1679034403,
-        "card_point": 5000,
-        "is_bind_card": true,
-        "card_use_price": 10000,
-        "use_card_point": "5000"
-      },
     ],
   },
   getBaseOrderStatus:{},

package/src/components/JfbBasePersonalData/JfbBasePersonalData.vue

@@ -125,7 +125,7 @@
           vm: this,
           data: {
             nickname: this.info.nickname,
-            sex: this.info.sex.value,
+            sex: this.info.sex,
             birthday_date: this.info.birthday_date
           },
         }).then(res => {

package/src/components/JfbBasePointsCard/JfbBasePointsCard.vue

@@ -87,14 +87,7 @@
     },
     methods: {
       onJfbLoad(options) {
-        jfbRootExec("getPointsPropertyList", {
-          vm: this,
-          data: {},
-        }).then(res => {
-          this.typeList = res.list
-        }).catch(err => {
-          console.log(err, "err");
-        })
+        this.getList()
       },
       /**
        * @description 监听事件变化
@@ -114,6 +107,16 @@
         this.withdrawPath = getContainerPropsValue(container, 'content.withdrawPath', { value: "" }).value;
         this.couponPath = getContainerPropsValue(container, 'content.couponPath', { value: "" }).value;
       },
+      getList(){
+        jfbRootExec("getPointsPropertyList", {
+          vm: this,
+          data: {},
+        }).then(res => {
+          this.typeList = res.list
+        }).catch(err => {
+          console.log(err, "err");
+        })
+      },
       getAmout(amount) {
         return this.$xdUniHelper.divisionFloatNumber(amount, 100)
       },
@@ -136,6 +139,7 @@
       },
       onJfbShow(options) {
         console.log('event.onJfbShow', options)
+        this.getList()
       },
       onJfbHide(options) {
         console.log('event.onJfbHide', options)

package/src/components/JfbBasePoster/Attr.js

@@ -264,7 +264,7 @@ export default {
         size: 'small',
         groupKey:'content',
       },
-      showBg && params.poster && params.poster['type']&& params.poster['type'] !== '1' && {
+      showBg && params.poster && params.poster['type'] && {
         label: '广告背景图:',
         ele: 'xd-upload',
         valueKey: 'background',

package/src/components/JfbBasePosterBigSmall/JfbBasePosterBigSmall.vue

@@ -112,7 +112,7 @@
             }"
           >
             <view
-              v-if="topIsCarousel === 1 && topList.lenght > 0"
+              v-if="topIsCarousel === 1 "
               :style="{
                 width: bigWidth + 'rpx',
                 height: smallHeight + 'rpx',
@@ -190,7 +190,7 @@
             }"
           >
             <view
-              v-if="bottomIsCarousel === 1 &&  bottomList.lenght > 0"
+              v-if="bottomIsCarousel === 1 "
               :style="{
                 width: bigWidth + 'rpx',
                 height: smallHeight + 'rpx',

package/src/components/JfbBasePosterGroup/Attr.js

@@ -56,6 +56,13 @@ export default {
             });
         },
       },
+      {
+        label: "背景颜色:",
+        ele: "xd-color",
+        valueKey: "bgColor",
+        value: data.bgColor || null,
+        groupKey: "style",
+      },
       {
         label: '背景图:',
         ele: 'xd-upload',
@@ -82,6 +89,7 @@ export default {
         valueKey: "title",
         value: data.title || '',
         groupKey: 'content',
+        height:200,
         imageConfig: {
           sort: true,
           maxlen: 100,

package/src/components/JfbBasePosterGroup/JfbBasePosterGroup.vue

@@ -44,6 +44,7 @@
   import { getContainerPropsValue } from "@/utils/xd.base";
   import getServiceUrl from "@/common/getServiceUrl";
   import componentsMixins from "@/mixins/componentsMixins";
+  import posterMixins from "@/mixins/posterMixins";
   import extsMixins from "@/mixins/extsMixins";
   export default {
     name: "JfbBasePosterGroup",
@@ -52,7 +53,7 @@
       XdContentXss
     },
     mixins: [
-      componentsMixins, extsMixins, JfbBasePosterGroupMixin
+      componentsMixins, extsMixins, JfbBasePosterGroupMixin, posterMixins
     ],
     data() {
       return {
@@ -67,6 +68,7 @@
         radius: 0,
         margin: {},
         padding: {},
+        bgColor: ''
       }
     },
     watch: {
@@ -78,6 +80,7 @@
     computed: {
       bodyStyleComp() {
         return {
+          backgroundColor: this.bgColor,
           backgroundImage: `url(${this.backgroundImage})`,
           backgroundSize: '100% 100%',
           backgroundPosition: 'center',
@@ -122,7 +125,6 @@
       },
       getPosterGroup(item) {
         this.tab = item.random;
-        this.imageGroup = [];
         jfbRootExec('getListPosterGroupContent', {
           vm: this,
           data: {
@@ -148,6 +150,7 @@
         this.morePath = getContainerPropsValue(container, 'content.morePath', { value: "" }).value;
         this.is_show_more = getContainerPropsValue(container, 'content.is_show_more', 'Y');
         this.backgroundImage = getServiceUrl(getContainerPropsValue(container, 'content.backgroundImage', { url: "" }).url);
+        this.bgColor = getContainerPropsValue(value, "content.bgColor", "#FFFFFF");
         this.title = getContainerPropsValue(container, 'content.title', '<p style="font-weight:bold;font-size:16px"><span style="color: #FFF">全球大牌，会员低至</span><span style="color: #F2D894">8折</span></p>');
         this.subtitle = getContainerPropsValue(container, 'content.subtitle', '超300+品牌商品');
         this.radius = getContainerPropsValue(container, 'content.radius', 20);

package/src/components/JfbBaseShare/JfbBaseShare.vue

@@ -115,7 +115,9 @@
           }
         }).then(res => {
           this.shareList = res.list.map(item => {
-            item.share_image_url = getServiceUrl(item.share_image_url);
+            let urlSearch = item.share_image_url.split('?')[1];
+            let newImgUrl = getServiceUrl(item.share_image_url);
+            item.share_image_url = newImgUrl.split('?')[0] + '?' + urlSearch;
             return item;
           });
         })

package/src/components/JfbBaseTfkSearch/ContentProduct.vue

@@ -32,6 +32,7 @@
             v-if="productConfig.isPrice === 'Y'" 
             type="two"
             :showPrice="item['show_prices']" 
+            :isShowIcon="productConfig.isShowIcon"
             :isPlus="productConfig.is_plus_site">
           </CusPrice>
         </view>

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) {
@@ -131,6 +132,9 @@
       }
     },
     computed: {
+      ...mapState({
+        siteInfo: state => state.siteInfo,
+      }),
       showMenuList(){
         return [{label: "全部", value: "all"}, ...this.menuList]
       },

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,is_plus_site: this.is_plus_site};
+      let isShowIcon = 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

@@ -244,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',
@@ -556,6 +604,18 @@ export default {
         },
         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',

package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue

@@ -13,18 +13,18 @@
             class="jfb-base-user-info__body-plus-header-top">
             <view class="jfb-base-user-info__body-plus-header-top-left">
               <template v-if="logined">
-                <image :style="{border: `1px solid ${imageColor}`, borderRadius:imageRadius}"
+                <image @click="handleToPersonal" :style="{border: `1px solid ${imageColor}`, borderRadius:imageRadius}"
                   v-if="userInfo['head_url']" :src="userInfo['head_url']"></image>
                 <view :style="{borderColor: imageColor, borderRadius:imageRadius}" class="no-image" v-else>
                   <xd-font-icon :color="imageColor" icon="iconwode_mian" size="100"></xd-font-icon>
                 </view>
               </template>
-              <view :style="{borderColor: imageColor, borderRadius:imageRadius}" v-else class="no-image">
+              <view @click="handleToPersonal" :style="{borderColor: imageColor, borderRadius:imageRadius}" v-else class="no-image">
                 <xd-font-icon :color="imageColor" icon="iconwode_mian" size="90"></xd-font-icon>
               </view>
               <view class="jfb-base-user-info__body-plus-header-top-left-info">
                 <view class="jfb-base-user-info__body-plus-header-top-left-info-name" v-if="logined">
-                  <view :style="[nickNameStyle]">{{userInfo|getName}} </view>
+                  <view :style="is_vip==='Y'?[plusNickNameStyle]:[normalNickNameStyle]">{{userInfo|getName}} </view>
                   <view v-if="is_vip==='Y'"><text>PLUS</text>会员</view>
                   <view v-else>普通用户</view>
                 </view>
@@ -190,7 +190,20 @@
         if (this.is_border === 'Y') return `${this.is_border_w}rpx ${this.is_border_s} ${this.is_border_c}`;
         else return '0';
       },
-
+      plusNickNameStyle() {
+        return {
+          fontSize: this.plusNickStyle.fontSize || '32rpx',
+          color: `${this.plusNickStyle.color ||'#333'}`,
+          fontWeight: `${this.plusNickStyle.fontWeight || 'normal'}`,
+        }
+      },
+      normalNickNameStyle() {
+        return {
+          fontSize: this.normalNickStyle.fontSize || '32rpx',
+          color: `${this.normalNickStyle.color ||'#333'}`,
+          fontWeight: `${this.normalNickStyle.fontWeight || 'normal'}`,
+        }
+      },
       nickNameStyle() {
         return {
           fontSize: this.nickStyle.fontSize || '32rpx',
@@ -253,6 +266,8 @@
         margin: {},
         padding: {},
         nickStyle: {},
+        normalNickStyle: {},
+        plusNickStyle: {},
         logoutStyle: {},
         rightContent: null,
         addressUrl: '',
@@ -270,7 +285,8 @@
         plusBottomBackgroundColor: '',
         normalTopBackgroundColor: '',
         normalBottomBackgroundColor: '',
-        codePath: ''
+        codePath: '',
+        profilePath: ''
       }
     },
     watch: {
@@ -399,6 +415,14 @@
         this.openVipPath = getContainerPropsValue(container, 'content.openVipPath', { value: "" }).value;
         this.viewPath = getContainerPropsValue(container, 'content.viewPath', { value: "" }).value;
         this.codePath = getContainerPropsValue(container, 'content.codePath', { value: "" }).value;
+        this.profilePath = getContainerPropsValue(container, 'content.profilePath', { value: "" }).value;
+        this.plusNickStyle = getContainerPropsValue(container, 'content.plusNickStyle', {});
+        this.normalNickStyle = getContainerPropsValue(container, 'content.normalNickStyle', {});
+      },
+      handleToPersonal(){
+        this.$xdUniHelper.navigateTo({
+          url: this.profilePath
+        })
       },
       handleAddress() {
         this.$xdUniHelper.navigateTo({

package/src/components/JfbBaseUserOrder/Attr.js

@@ -21,6 +21,21 @@ export default {
         groupKey:'advanced',
       },
       {
+        label: '是否展示我的订单:',
+        ele: 'xd-radio',
+        valueKey: 'isShowMyOrder',
+        value: data['isShowMyOrder'] || 'Y',
+        placeholder: '请选择是否展示我的订单',
+        groupKey:'content',
+        multiple: false,
+        labelInline:true,
+        className: 'input80',
+        list: [
+          {label: '展示', value: 'Y'},
+          {label: '隐藏', value: 'N'},
+        ]
+      },
+      data['isShowMyOrder']==='Y'&&{
         label: '我的订单自定义名称:',
         ele: 'el-input',
         type: 'text',
@@ -101,6 +116,7 @@ export default {
               {"label": "待收货", "value": 'unreceived'},
               {"label": "已取消", "value": 'cancel'},
               {"label": "已完成", "value": 'com'},
+              {"label": "售后", "value": 'afterSale'},
             ])
           }
         },

package/src/components/JfbBaseUserOrder/JfbBaseUserOrder.vue

@@ -16,8 +16,9 @@
     <view class="jfb-base-user-order__body">
       <view class="x-line"></view>
       <view :style="[bodyStyleComp]" v-if="list.length > 0">
-        <view class="my-order__add" :style="[titleMarginComp]">
-          <view :style="[titleStyleComp]">{{myOrderName}}</view>
+        <view v-if="isShowMyOrder==='Y'||isShowBtn === 'Y'" class="my-order__add" :style="[titleMarginComp]">
+          <view v-if="isShowMyOrder==='Y'" :style="[titleStyleComp]">{{myOrderName}}</view>
+          <view v-else></view>
           <view
             v-if="isShowBtn === 'Y'"
             @click="handleToLink(afterUrl)"
@@ -179,6 +180,7 @@
         cardNameColor: '#333',
         titleStyle: {},
         titleMargin:{},
+        isShowMyOrder: '',
 
         //售后订单
         isShowBtn:'Y',
@@ -274,6 +276,7 @@
 
 
         //标题
+        this.isShowMyOrder = getContainerPropsValue(container, 'content.isShowMyOrder', 'Y');
         this.myOrderName = getContainerPropsValue(container, 'content.myOrderName', '我的订单')
         this.titleStyle = getContainerPropsValue(container, 'content.titleStyle', {});
         this.titleMargin = getContainerPropsValue(container,'content.titleMargin', {})
@@ -333,6 +336,12 @@
 
       handleToLink(path, type) {
         if (this.$configProject['isPreview']) return;
+        if(type==='afterSale'){
+          this.$xdUniHelper.navigateTo({
+            url: this.afterUrl
+          })
+          return
+        }
         this.$xdUniHelper.navigateTo({
           url: type ? `${path}?type=${type}` : path
         })