jufubao-base 1.0.237-beta9 → 1.0.238-beta1

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() {

package/src/components/JfbBasePay/Attr.js

@@ -8,58 +8,6 @@ export default {
   advanced: [],
   content: data=>{
     return [
-      {
-        label: "【仍需扣点】文案:",
-        ele: "el-input",
-        valueKey: "text1",
-        value: data.text1 || "仍需扣点",
-        groupKey: "content",
-        inline: false,
-        className: "input80",
-      },
-      {
-        label: "【（可使用多张票券点数）】是否展示",
-        ele: 'xd-radio',
-        valueKey: "showText2",
-        value: data.showText2 || 'Y',
-        groupKey: "content",
-        inline: true,
-        list: [
-          { label: "展示", value: "Y" },
-          { label: "不展示", value: "N" },
-        ],
-      },
-      data.showText2 === 'Y' && {
-        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">{{text1}}<text v-if="showText2==='Y'" class="label_sub">{{ text2 }}</text></view>
+            <view class="column_label">仍需扣点<text class="label_sub">（可使用多张票券点数）</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>{{ text3 }}</view>
-          <view v-if="showContinuePay==='Y'" class="flex align-center text-primary">
+          <view>选择以下补差方式</view>
+          <view class="flex align-center text-primary">
             <view class="margin-right">继续补差</view>
             <xd-unit
               :price="payInfo.channel_amount"
@@ -212,12 +212,7 @@ export default {
       rechargeSuccessPath: "", //充值成功
       ...styleForm.getDataItem(),
       borderColor:'rgba(0,0,0,0)',
-      options:{},
-      text1: "",
-      text2: "",
-      text3: "",
-      showText2: "Y",
-      showContinuePay: "",
+      options:{}
     };
   },
   watch: {
@@ -267,11 +262,6 @@ 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.showText2 = getContainerPropsValue(container, 'content.showText2', "Y");
-      this.showContinuePay = getContainerPropsValue(container, 'content.showContinuePay', 'Y');
       this.paySuccessPath = getContainerPropsValue(
         container,
         "content.pay_success_path",

package/src/components/JfbBasePay/Mock.js

@@ -24,6 +24,15 @@ 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/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -207,7 +207,6 @@ export default {
       callback_url: "",
       isCollectUsername: false,
       showDialog: false,
-      share_code: "",
 
       inputStyle: "linear", //输入框样式 linear:线性  face: 面性
       formBorderColor: "#F9F9F9", //
@@ -368,7 +367,6 @@ export default {
       this.auth_code = options.auth_code;
       this.provider_id = options.provider_id;
       this.callback_url = options.callback_url;
-      this.share_code = options.share_code;
     },
     /**
      * @description 监听事件变化
@@ -564,7 +562,6 @@ export default {
           auth_code,
           provider_id,
           phone_number,
-          share_code,
         }
       }).then(res => {
         this.$xdHideLoading();

package/src/components/JfbBasePoster/Attr.js

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

package/src/components/JfbBasePosterBigSmall/JfbBasePosterBigSmall.vue

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

package/src/components/JfbBaseTfkSearch/ContentProduct.vue

@@ -28,13 +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']" 
-            :isShowIcon="productConfig.isShowIcon"
-            :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'">
@@ -56,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:{
@@ -240,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

@@ -73,7 +73,6 @@
   import listMixins from "./listMixins";
   import CustomList from "./CustomList.vue";
   import AllList from "./AllList.vue";
-  import { mapState } from 'vuex';
 
   class EmitParent {
     constructor(options) {
@@ -87,7 +86,7 @@
       CustomList,
       XdFontIcon,
       AllList,
-      XdSearchHistory,
+      XdSearchHistory
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseTfkSearchMixin,listMixins
@@ -128,13 +127,9 @@
         allModuleItemContRadius: 16,
         allModuleItemContBgColor: "#FFFFFF",
         emitParent:{},
-        is_plus_site: false
       }
     },
     computed: {
-      ...mapState({
-        siteInfo: state => state.siteInfo,
-      }),
       showMenuList(){
         return [{label: "全部", value: "all"}, ...this.menuList]
       },
@@ -236,7 +231,6 @@
           return this;
         }
       })
-      this.is_plus_site = this.projectAttr.headers['X-Site-Group']==="vip";
       this.init(this.container);
       this.cusInit(this.container);
     },
@@ -252,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,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.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');