jufubao-base 1.0.239-beta2 → 1.0.239

package/src/components/JfbBaseNoticeDialog/JfbBaseNoticeDialog.vue

@@ -73,7 +73,7 @@ export default {
   mixins: [componentsMixins, extsMixins, JfbBaseNoticeDialogMixin],
   data() {
     return {
-      isShow: false,
+      isShow: true,
       backgroundColor: "",
       isPreview: false, //是否预览
       is_hide_dailog: "N",
@@ -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/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -120,46 +120,27 @@
                 </view>
               </view>
             </view>
-            <view v-if="info.film_show.part&&info.film_show.part.length>0" class="jfb-base-order-detail__body-no-delivery-supplement">
-              <view @click="handleViewSupplement(item)" class="jfb-base-order-detail__body-no-delivery-supplement-item" v-for="(item,index) in info.film_show.part" :key="index">
-                <view class="jfb-base-order-detail__body-no-delivery-supplement-item-info">
-                  <view v-if="item.tag_name" :style="{color: mainColor, borderColor: mainColor}" class="jfb-base-order-detail__body-no-delivery-supplement-item-info-tag">{{item.tag_name}}</view>
-                  <view class="jfb-base-order-detail__body-no-delivery-supplement-item-info-title">{{item.show_title}}</view>
+            <view
+              class="jfb-base-order-detail__body-delivery-bottom"
+              v-if="info.film_show.detail && info.film_show.detail !== null"
+            >
+              <view class="jfb-base-order-detail__body-delivery-bottom-title">{{info.film_show.detail.title }}</view>
+              <view
+                v-for="(Ditem, Dindex) in info.film_show.detail.items"
+                :key="Dindex"
+                class="jfb-base-order-detail__body-delivery-bottom-item"
+                :style="{
+                  marginBottom: lineHeight + 'rpx'
+                }"
+              >
+                <view style="width: 130rpx"
+                  >{{ Ditem.label }} <span v-if="Ditem.label">:</span>
                 </view>
-                <xd-font-icon size="24" color="#B1B1B1" icon="iconxiangyou_xian"></xd-font-icon>
+                <view>{{ Ditem.value }}</view>
               </view>
             </view>
           </view>
         </view>
-        <view
-        class="jfb-base-order-detail__body-card jfb-base-order-detail__body-delivery-info"
-        :style="{
-          background: backgroundColor,
-          border: borderBox,
-          borderRadius: radius + 'rpx',
-          boxShadow: shadowBox,
-          marginBottom: padding + 'rpx',
-        }"
-        v-if="info.film_show&&info.film_show.detail && info.film_show.detail !== null"
-      >
-        <view class="jfb-base-order-detail__body-delivery-info-title">
-          <view :style="{background:mainColor}" class="line"></view>
-          {{info.film_show.detail.title }}
-        </view>
-        <view
-          v-for="(Ditem, Dindex) in info.film_show.detail.items"
-          :key="Dindex"
-          class="jfb-base-order-detail__body-delivery-info-item"
-          :style="{
-            marginBottom: lineHeight + 'rpx'
-          }"
-        >
-          <view style="width: 130rpx"
-            >{{ Ditem.label }} <span v-if="Ditem.label">:</span>
-          </view>
-          <view>{{ Ditem.value }}</view>
-        </view>
-      </view>
         <view v-if="info.sub_orders && info.sub_orders.length > 0">
           <view
             :style="{
@@ -590,8 +571,6 @@
             >
               <view :style="{ fontWeight: item.style }">{{ item.label }}</view>
               <xd-unit
-                :colorNew="isPlusSite ? '#999':''"
-                :largeZero="false"
                 :fontSize="28"
                 :iconSize="0.28"
                 :fontWeight="item.style"
@@ -825,20 +804,6 @@
       <view v-if="dialogCode && dialogCode.tips" class="dialog_password"> {{ dialogCode.tips}}</view>
       <view v-if="dialogPassword" class="dialog_password">{{ dialogPassword }}</view>
     </xd-dailog>
-    <XdDownDrawer :isClose="false" height="auto" :show.sync="showSupplement">
-      <view class="supplement">
-        <view class="supplement-title">
-          <xd-font-icon @click="showSupplement=false" color="#666" size="30" icon="iconxiangzuo_xian"></xd-font-icon>
-          <view style="margin: 0 auto">{{supplementTitle}}</view>
-        </view>
-        <view style="color: #333333;margin-top: 58rpx;font-size: 28rpx;font-weight: 500">已购</view>
-        <view class="supplement-item" v-for="(item, index) in supplementList" :key="index">
-          <view>{{item.product_name}}</view>
-          <view>{{getAmount(item.sale_price)}}元 x {{item.product_num}}</view>
-        </view>
-        <xd-button type="primary" @click="showSupplement=false">关闭</xd-button>
-      </view>
-    </XdDownDrawer>
   </view>
 </template>
 
@@ -849,7 +814,6 @@ import XdTag from "@/components/XdTag/XdTag";
 import XdUnit from "@/components/XdUnit/XdUnit";
 import XdButton from "@/components/XdButton/XdButton";
 import XdDailog from "@/components/XdDailog/XdDailog";
-import XdDownDrawer from "@/components/XdDownDrawer/XdDownDrawer";
 import { jfbRootExec } from "@/utils/xd.event";
 import JfbBaseOrderDetailMixin from "./JfbBaseOrderDetailMixin";
 import componentsMixins from "@/mixins/componentsMixins";
@@ -870,7 +834,6 @@ export default {
     XdButton,
     XdDailog,
     XdJfbImage,
-    XdDownDrawer
   },
   mixins: [componentsMixins, extsMixins, JfbBaseOrderDetailMixin],
   data() {
@@ -938,10 +901,6 @@ export default {
       showPreviewCode: true,
       is_show_product: "",
       btnTextSize: 20,
-
-      showSupplement: false,
-      supplementList: [],
-      supplementTitle: "",
     };
   },
   watch: {
@@ -994,10 +953,7 @@ export default {
         padding: padding,
         backgroundColor: this.bottomBgColor,
       }
-    },
-    isPlusSite(){
-      return this.projectAttr.headers['X-Site-Group']==="vip";
-    },
+    }
   },
   created() {
     this.noticeBgc = Color(this.warningColor).alpha(0.2).toString();
@@ -1013,10 +969,6 @@ export default {
       this.getOrderDetail();
     },
 
-    getAmount(price) {
-      return this.$xdUniHelper.divisionFloatNumber(price,100)
-    },
-
     timeDown() {
       if (this.info.status.loading_timeout != "-1") {
         this.times = this.info.status.loading_timeout;
@@ -1347,11 +1299,6 @@ export default {
       });
       // #endif
     },
-    handleViewSupplement(item){
-      this.showSupplement=true;
-      this.supplementList = item.items
-      this.supplementTitle = item.show_title
-    },
     handleToLink(id, info) {
       this.$xdUniHelper.navigateTo({
         url: `${this.brandPath}?id=${id}&region_limit_tpl_id=${info.support_shops.region_limit_tpl_id}&xnamespace=${info.biz_code}`,
@@ -1470,12 +1417,6 @@ export default {
 
 <style scoped lang="less">
 @import "./JfbBaseOrderDetailLess.less";
-.line {
-  border-radius: 2px;
-  width: 6rpx;
-  height: 24rpx;
-  margin-right: 20rpx;
-}
 
 .code-url {
   display: flex;
@@ -1614,32 +1555,6 @@ export default {
           }
         }
       }
-      &-supplement {
-        border-top: 1px dashed #CCCCCC;
-        margin-top: 32rpx;
-        &-item {
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          margin-top: 32rpx;
-          margin-bottom: 32rpx;
-          &-info {
-            display: flex;
-            align-items: center;
-            &-tag {
-              border: 1px solid;
-              font-size: 20rpx;
-              padding: 8rpx 16rpx;
-              border-radius: 8rpx;
-              margin-right: 20rpx;
-            }
-            &-title {
-              color: #666666;
-              font-size: 24rpx;
-            }
-          }
-        }
-      }
     }
 
     &-delivery {
@@ -1663,28 +1578,6 @@ export default {
           border-radius: unit(8, rpx);
         }
 
-         &-bottom {
-        margin-top: unit(32, rpx);
-
-        &-title {
-          color: #333333;
-          font-size: unit(28, rpx);
-          font-weight: 500;
-          margin-bottom: unit(20, rpx);
-        }
-
-        &-item {
-          color: #666666;
-          font-size: unit(28, rpx);
-          display: flex;
-          margin-bottom: unit(16, rpx);
-
-          & > view:nth-child(2) {
-            width: 80%;
-          }
-        }
-      }
-
         &-info {
           flex: 1;
           display: flex;
@@ -1727,35 +1620,6 @@ export default {
         }
       }
 
-      &-info {
-        margin-top: unit(32, rpx);
-
-        &-title {
-          color: #333333;
-          font-size: unit(28, rpx);
-          margin-bottom: unit(20, rpx);
-          display: flex;
-          align-items: center;
-        }
-
-        &-item {
-          color: #333333;
-          font-size: unit(24, rpx);
-          display: flex;
-          margin-bottom: unit(16, rpx);
-          & > view:first-child{
-            color: #999;
-          }
-
-          & > view:nth-child(2) {
-            width: 80%;
-          }
-        }
-        &-item:last-child{
-          margin-bottom: 0 !important;
-        }
-      }
-
       &-bottom {
         margin-top: unit(32, rpx);
 
@@ -1777,10 +1641,8 @@ export default {
           }
         }
       }
-      
     }
 
-
     &-num {
       &-info {
         display: flex;
@@ -1903,7 +1765,7 @@ export default {
         color: #737373;
       }
     }
- 
+
     &-order {
       display: flex;
       align-items: center;
@@ -2099,23 +1961,5 @@ export default {
     }
 
   }
-
-  .supplement {
-    padding: 48rpx;
-    &-title {
-      display: flex;
-      align-items: center;
-      color: #666666;
-      font-size: 28rpx;
-    }
-    &-item {
-      margin: 34rpx 0;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      color: #666;
-      font-size: 28rpx;
-    }
-  }
 }
 </style>

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

@@ -24,7 +24,6 @@
             <view class="column_value text-gray">
               <xd-unit
                 :price="payInfo.total_amount"
-                :isShowIcon="isShowIcon"
                 :isOld="false"
                 :font-size="28"
                 :icon-size="0.28"
@@ -40,7 +39,6 @@
               <!-- <xd-button width="220rpx" radius="60rpx" type="primary" size="small" @click="xdDownDrawer=true">使用新票券</xd-button> -->
               <xd-unit
                 :price="payInfo.card_amount"
-                :isShowIcon="isShowIcon"
                 :isOld="false"
                 :font-size="28"
                 :icon-size="0.28"
@@ -102,11 +100,10 @@
       <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"
-                :isShowIcon="isShowIcon"
                 :isOld="false"
                 :font-size="28"
                 :icon-size="0.28"
@@ -115,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"
@@ -149,14 +146,11 @@
       <view class="bottom_btn-mask"></view>
       <view v-if="is_can_pay==='Y'" class="bottom_btn" :style="prod_bottom">
         <xd-button
-          width="480rpx"
+          width="360rpx"
           type="primary"
           radius="50rpx"
           @click="doThirdPay"
-        >
-          确认支付 
-          ￥{{ $xdUniHelper.divisionFloatNumber(payInfo.channel_amount, 100) }}
-        </xd-button>
+        >确认</xd-button>
       </view>
     </view>
   </view>
@@ -180,7 +174,6 @@ import {isWechat,isWechatTools} from "@/utils/xd.base";
 import color from "color";
 const Color = require('color');
 let styleForm = new StyleForm({bgColor: '#fafafa'}, getContainerPropsValue, 'pay', true);
-import { mapState } from "vuex";
 
 export default {
   name: "JfbBasePay",
@@ -219,12 +212,7 @@ export default {
       rechargeSuccessPath: "", //充值成功
       ...styleForm.getDataItem(),
       borderColor:'rgba(0,0,0,0)',
-      options:{},
-      text1: "",
-      text2: "",
-      text3: "",
-      showText2: "Y",
-      showContinuePay: "",
+      options:{}
     };
   },
   watch: {
@@ -234,9 +222,6 @@ export default {
     },
   },
   computed: {
-    ...mapState({
-      siteInfo: state => state.siteInfo,
-    }),
     prod_bottom() { 
       return this.fixedStyle({ height: 0, zIndex: 111 });
     },
@@ -247,10 +232,6 @@ export default {
       }
       return url
     },
-    isShowIcon() {
-      if(this.$configProject['isPreview']) return true;
-      return this.siteInfo.mapping.is_show_coin_icon==='Y'
-    },
     ...styleForm.getComputedItem(),
   },
   created() {
@@ -281,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/JfbBasePhoneCollect/JfbBasePhoneCollect.vue

@@ -447,9 +447,10 @@ export default {
           user_name,
         },
       }).then((res) => {
-        this.$xdHideLoading()
+        this.$xdHideLoading();
         let { callback_url } = this;
         if (callback_url) callback_url = decodeURIComponent(callback_url);
+
         this.$xdUniHelper.redirectTo({
           url: callback_url || this.settings.index,
         });

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -176,6 +176,8 @@ import XdDialog from "@/components/XdDailog/XdDailog";
 //#ifdef H5
 import cookie from "@/common/cookie";
 //#endif
+import {mapState} from "vuex";
+
 
 export default {
   // #ifdef MP-WEIXIN
@@ -207,7 +209,6 @@ export default {
       callback_url: "",
       isCollectUsername: false,
       showDialog: false,
-      share_code: "",
 
       inputStyle: "linear", //输入框样式 linear:线性  face: 面性
       formBorderColor: "#F9F9F9", //
@@ -276,6 +277,7 @@ export default {
     };
   },
   computed: {
+    ...mapState(["jfbAuthorize","siteInfo",'loginParams']),
     panelIsChecked() {
       return this.panel_1_checked.includes(1);
     },
@@ -368,13 +370,6 @@ export default {
       this.auth_code = options.auth_code;
       this.provider_id = options.provider_id;
       this.callback_url = options.callback_url;
-      if(options['x-common']){
-        let decodeParams = Base64.decode(options['x-common']);
-        try{
-          let commonParams = JSON.parse(decodeParams);
-          this.share_code = commonParams.share_code;
-        }catch(e){}
-      }
     },
     /**
      * @description 监听事件变化
@@ -563,6 +558,7 @@ export default {
     p_loginJumpPhone(){
       const { auth_code, provider_id } = this;
       const { phone_number } = this.accountForm;
+
       this.$xdShowLoading({});
       jfbRootExec("loginJumpPhone", {
         vm: this,
@@ -570,7 +566,6 @@ export default {
           auth_code,
           provider_id,
           phone_number,
-          share_code,
         }
       }).then(res => {
         this.$xdHideLoading();
@@ -601,17 +596,30 @@ export default {
           provider_id,
           phone_number,
           verification_code,
-          user_name,
-          share_code: this.share_code
+          user_name
         },
       })
         .then((res) => {
           this.$xdHideLoading();
           let { callback_url } = this;
           if (callback_url) callback_url = decodeURIComponent(callback_url);
+          // #ifdef MP-WEIXIN
+          if (this.jfbAuthorize !== null) {
+            this.jfbAuthorize.setAllToken(res, () => {
+              this.$xdUniHelper.redirectTo({
+                url: callback_url || this.settings.index,
+              });
+            });
+          }
+          // #endif
+
+          // #ifdef H5
           this.$xdUniHelper.redirectTo({
             url: callback_url || this.settings.index,
           });
+          // #endif
+
+
         })
         .catch((error) => {
           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',