jufubao-movie 1.0.40 → 1.0.41-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-movie",
-  "version": "1.0.40",
+  "version": "1.0.41-beta2",
   "private": false,
   "description": "聚福宝在线选座业务组件插件包",
   "main": "index.js",

package/src/components/JfbMovieConfirm/Attr.js

@@ -252,6 +252,104 @@ export default {
           }
         },
       },
+      {
+        ele: "title",
+        label: "我的优惠券样式配置",
+        size: "small",
+        groupKey: "style",
+      },
+      {
+        label: "优惠券左侧背景色设置:",
+        ele: "xd-gradient-color",
+        valueKey: "couponLeftBgColor",
+        value: data.couponLeftBgColor || 'linear-gradient(180deg, #FFA852 0%, #FF5733 100%)',
+        groupKey:'style',
+      },
+      {
+        label: "圆角设置",
+        ele: 'xd-site-select-list',
+        valueKey: 'couponRadius',
+        value: data['couponRadius'] || 16,
+        groupKey:'style',
+        placeholder: '请选择内容圆角设置',
+        multiple: false,
+        className: 'input80',
+        handleCustom({ action, data }) {
+          XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
+      {
+        label: "优惠券标题背景颜色设置:",
+        ele: "xd-color",
+        valueKey: "couponTitleBgColor",
+        value: data.couponTitleBgColor || null,
+        groupKey:'style',
+        setting: {
+          showAlpha: true,
+          isAlpha: true
+        },
+      },
+      {
+        label: "去使用按钮文字背景色设置: ",
+        ele: "xd-text-and-bgc",
+        groupKey:'style',
+        valueKey: "couponBtnTextStyle",
+        value: data.couponBtnTextStyle || null,
+        setting: {
+          fontSize: true, //字体大小选择
+          color: true, //文字颜色选项
+          bgColor: true, //背景选项
+          weight: true, //文字粗细
+        },
+        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([])
+            });
+        },
+      },
+      {
+        label: "按钮内边距设置:",
+        groupKey:'style',
+        ele: 'xd-margin-padding',
+        valueKey: 'couponUseBtnPadding',
+        value: data.couponUseBtnPadding || null,
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请设置边距',
+        inline: false,
+        notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+      },
+      {
+        label: "按钮圆角设置",
+        ele: 'xd-site-select-list',
+        valueKey: 'couponBtnRadius',
+        value: data['couponBtnRadius'] || 16,
+        groupKey:'style',
+        placeholder: '请选择内容圆角设置',
+        multiple: false,
+        className: 'input80',
+        handleCustom({ action, data }) {
+          XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
     ]
   }
 }

package/src/components/JfbMovieConfirm/JfbMovieConfirm.vue

@@ -133,19 +133,37 @@
 
       <view v-if="otherPayMethod.length" class="jfb-movie-confirm__body-card">
         <template v-for="item in otherPayMethod">
-          <xd-list-item v-if="item.method === 'card'" :key="item.method" :label="item.show_name" paddingLR="0rpx" size="small" showRight @click="toChoseCard">
-            <view v-if="choseCard && choseCard.cardPayPrice" slot="label">{{item.show_name}} <text style="color:red;margin-left: 4px;">(已选{{ choseCard.selectedCardList.length }}张)</text></view>
-            <template v-if="choseCard && choseCard.cardPayPrice">
+           <xd-list-item v-if="item.method === 'card'" :key="item.method" :label="item.show_name" paddingLR="60rpx" size="small" :showRight="!(choseCoupon && choseCoupon.cardPayPrice)" @click="toChoseCard">
+              <view v-if="(choseCoupon && choseCoupon.cardPayPrice)">
+                <view style="color:#CCCCCC;font-size: 20rpx">已使用其他票券，不可用</view>
+              </view>
+              <view v-else>
+                <view v-if="choseCard && choseCard.cardPayPrice" slot="label">{{item.show_name}} <text style="color:red;margin-left: 4px;">(已选{{ choseCard.selectedCardList.length }}张)</text></view>
+                <template v-if="choseCard && choseCard.cardPayPrice">
               <xd-unit v-if="choseCard.unit == '次'" :price="choseCard.cardPayPoint" :isOld="false" :fontSize="24" :iconSize="0.3" :unit="choseCard.unit"></xd-unit>
               <xd-unit v-else :price="choseCard.cardPayPrice" :isOld="false" :fontSize="24" :iconSize="0.3" :unit="choseCard.unit || ''"></xd-unit>
-            </template>
-            
-            <view v-else>请选择</view>
-          </xd-list-item>
-          <xd-list-item v-if="item.method === 'wallet'" :key="item.method" :label="item.show_name" paddingLR="0rpx" size="small" showRight @click="toChoseWallet">
-            <xd-unit v-if="choseWallet && choseWallet.walletPayPrice" :price='choseWallet.walletPayPrice' :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
-            <view v-else>请选择</view>
-          </xd-list-item>
+                </template>                
+              <view v-else>请选择</view>
+              </view>
+            </xd-list-item>
+           <xd-list-item v-if="item.method === 'wallet'" :key="item.method" :label="item.show_name" paddingLR="60rpx" size="small" :showRight="!(choseCoupon && choseCoupon.cardPayPrice)" @click="toChoseWallet">
+              <view v-if="(choseCoupon && choseCoupon.cardPayPrice)">
+                <view style="color:#CCCCCC;font-size: 20rpx">已使用其他票券，不可用</view>
+              </view>
+              <view v-else>
+                <xd-unit v-if="choseWallet && choseWallet.walletPayPrice" :price='choseWallet.walletPayPrice' :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
+                <view v-else>请选择</view>
+              </view>
+            </xd-list-item>
+            <xd-list-item v-if="item.method === 'coupon'" :key="item.method" :label="item.show_name" paddingLR="60rpx" size="small" :showRight="!(choseCard && choseCard.cardPayPrice)" @click="toChoseCoupon">
+              <view v-if="(choseCoupon && choseCoupon.cardPayPrice)||(choseWallet && choseWallet.walletPayPrice)" slot="label">
+                {{item.show_name}} <text style="color:red;margin-left: 4px;">(已选{{ choseCoupon.selectedCardList.length }}张)</text>
+              </view>
+              <view v-else>
+                <view style="color:#CCCCCC;font-size: 20rpx" v-if="choseCard && choseCard.cardPayPrice">已使用其他票券，不可用</view>
+                <view v-else>请选择</view>
+              </view>
+            </xd-list-item>
         </template>
       </view>
       <view class="jfb-movie-confirm__body-btn-height" :style="bottomFixedStylePlaceholder"></view>
@@ -222,7 +240,30 @@
         @onChose="handleWalletChose"
         @onAlert="() => hasAlertCardChose = true"
       ></xd-wallet-chose>
-
+       <xd-coupon-chose 
+          :couponRadius="couponRadius"
+          :couponImageUrl="couponImageUrl"
+          :couponTitleBgColor="couponTitleBgColor"
+          :couponUseBtnPadding="couponUseBtnPadding"
+          :couponBtnRadius="couponBtnRadius"
+          :couponBtnTextStyle="couponBtnTextStyle"
+          :couponLeftBgColor="couponLeftBgColor"
+          :mainColor="mainColor"
+          v-if="payCoupon"
+          ref="xdCouponChose"
+          :hadChoseCoupon="choseCoupon && choseCoupon.selectedCouponList"
+          :layoutInfo="layoutInfo"
+          :show.sync="showCouponChose"
+          :jwxSDK="jwxSDK"
+          :validImageAPIUrl="validImageAPIUrl"
+          :addSettleCoupon="addSettleCoupon"
+          @onChose="handleCouponChose"
+          @onAlert="() => hasAlertCardChose = true"
+          :orderTotalPrice="order_info.total_price/100"
+          :orderNeedPayPrice="orderNeedPayPrice"
+          :getSettleListCoupons="getSettleListCoupons"
+          :setSettleSelectCoupon="setSettleSelectCoupon"
+        ></xd-coupon-chose>
     </view>
   </view>
 </template>
@@ -235,6 +276,7 @@
   import XdButton from "@/components/XdButton/XdButton";
   import XdCardPay from "@/components/XdCardPay/XdCardPay";
   import XdCardPayChose from "@/components/XdCardPayChose/XdCardPayChose"
+  import XdCouponChose from '@/components/XdCouponChose/XdCouponChose'
   import XdWalletChose from "@/components/XdWalletChose/XdWalletChose"
   import XdContentXss from "@/components/XdContentXss/XdContentXss";
   import {jfbRootExec} from "@/utils/xd.event";
@@ -255,7 +297,8 @@
       XdContentXss,
       XdListItem,
       XdCardPayChose,
-      XdWalletChose
+      XdWalletChose,
+      XdCouponChose
     },
     mixins: [componentsMixins,extsMixins,JfbMovieConfirmMixin],
     data() {
@@ -291,6 +334,10 @@
         showWalletChose: false,
         choseWallet: null,
 
+        //优惠券
+        choseCoupon: null,
+        showCouponChose: false,
+
         xnamespace: "",
         is_not_show_price: "",
 
@@ -301,7 +348,13 @@
         bgColor: '',
 
         bindCard: '1',
-        cardKey: "cardKey"
+        cardKey: "cardKey",
+        couponBtnRadius: 16,
+        couponLeftBgColor: "",
+        couponTitleBgColor: "",
+        couponBtnTextStyle: {}, //优惠券包登录按钮文字背景色设置
+        couponUseBtnPadding: {},
+        couponImageUrl: "",
       }
     },
     watch: {
@@ -326,6 +379,9 @@
       payCard(){
         return this.otherPayMethod.find(item => item.method === 'card')
       },
+      payCoupon(){
+        return this.otherPayMethod.find(item => item.method === 'coupon')
+      },
       //是否支持三方支付、补差
       payThird(){
         return true;  //都开启补差
@@ -336,7 +392,13 @@
         if(!this.order_info) return 0;
         let choseCardPay = this.choseCard ? this.choseCard.cardPayPrice : 0;
         let choseWalletPay = this.choseWallet ? this.choseWallet.walletPayPrice : 0;
-        let total = this.$xdUniHelper.addFloatNumber(choseCardPay, choseWalletPay);
+        let choseCouponPay = this.choseCoupon ? this.choseCoupon.cardPayPrice : 0
+        let total = 0
+        if(choseCouponPay) {
+          total = choseCouponPay
+        } else {
+          total = this.$xdUniHelper.addFloatNumber(choseCardPay, choseWalletPay);
+        }
         let total_amount = this.order_info.total_price ? this.order_info.total_price : 0;
         let result = this.$xdUniHelper.cutFloatNumber(total_amount, total);
         return result;
@@ -429,6 +491,7 @@
             //支付方式跟用户相关，与订单无关。
             //只获取一次。
             if(!this.otherPayLoaded){
+              res.pay_methods.push('coupon')
               this.p_getPayMethod(res.pay_methods);
             }
 
@@ -463,7 +526,17 @@
         console.log(this.choseWallet)
         this.showWalletChose = false;
       },
-
+      //only选择满减券
+      toChoseCoupon(){
+        if(this.choseCard && this.choseCard.cardPayPrice) return
+        this.showCouponChose = true;
+      },
+      //only选择满减券结果
+      handleCutChose(data){
+        console.log(data)
+        this.choseCoupon = data;
+        this.showCouponChose = false;
+      },
       p_getPayMethod(support_methods){
         jfbRootExec("getPayMethod", {
           vm: this,
@@ -507,6 +580,12 @@
           cb(res);
         })
       },
+
+      handleCouponChose(data) {
+        console.log(data)
+        this.choseCoupon = data;
+        this.showCouponChose = false;
+      },
       
       addSettleCard(options, successCb, errCb) {
         console.log(options, 'ioioioioi')
@@ -516,6 +595,7 @@
           data: {
             ...options,
             cart_order_id: this.tempOrderId,
+            show_type: 'normal'
           }
         }).then(res => {
           this.$xdHideLoading()
@@ -542,7 +622,9 @@
       getSettleListCards(cb) {
         jfbRootExec("movieCardList", {
           vm: this,
-          data: {}
+          data: {
+            show_type: 'normal'
+          }
         }).then(res => {
           cb(res.list)
           this.cardList = res.list
@@ -583,8 +665,13 @@
               /**
                * 有任一新版支付都用新版支付， 仅卡支付也用新版选卡支付
                */
-              if(this.payWallet || this.payCard){  //已选卡
-                let selected_card_list = this.choseCard ? this.choseCard.selectedCardList : [];
+              if(this.payWallet || this.payCard || this.payCoupon){  //已选卡
+                let selected_card_list
+                if(this.choseCard) {
+                  selected_card_list = this.choseCard ? this.choseCard.selectedCardList : [];
+                } else if(this.choseCoupon) {
+                  selected_card_list = this.choseCoupon ? this.choseCoupon.selectedCardList : [];
+                }
                 let selected_wallet_list = this.choseWallet ? this.choseWallet.selectedWalletList : []
                 //票券跟钱包都未选择，给用户提示
                 if(selected_card_list.length == 0 && selected_wallet_list.length == 0){
@@ -741,6 +828,18 @@
         this.payPath = getContainerPropsValue(container, 'content.payPath', {value: ''}).value;
         this.paySuccessPath = getContainerPropsValue(container, 'content.paySuccessPath', {value: "/pages/order/success"}).value;
         this.bindCard = getContainerPropsValue(container,"content.bindCard","1");
+        this.couponBtnRadius = getContainerPropsValue(container, "content.couponBtnRadius", 16);
+        this.couponUseBtnPadding = getContainerPropsValue(container, "content.couponUseBtnPadding", {top: 20, left: 20, right: 20, bottom: 20});
+        this.couponBtnTextStyle = getContainerPropsValue(container, "content.couponBtnTextStyle", {
+          color: '#fff',
+          bgColor: '#ff5722',
+          fontSize: '30rpx',
+          fontWeight: 'normal'
+        });
+        this.couponTitleBgColor = getContainerPropsValue(container, "content.couponTitleBgColor", 'rgba(255, 87, 51, 0.1)');
+        this.couponRadius = getContainerPropsValue(container, "content.couponRadius", 16);
+        this.couponLeftBgColor = getContainerPropsValue(container, "content.couponLeftBgColor", "linear-gradient(180deg, #FFA852 0%, #FF5733 100%)");
+        this.couponImageUrl = getContainerPropsValue(container, "content.couponImageUrl", "");
         this.getContent();
       },
       handleCreateSuccess(val) {
@@ -766,6 +865,63 @@
         }
       },
 
+      addSettleCoupon(options, successCb, errCb) {
+
+      this.$xdShowLoading({})
+      jfbRootExec('movieAddCard', {
+        vm: this,
+        data: {
+          ...options,
+          cart_order_id: this.tempOrderId,
+          show_type: 'coupon'
+        }
+      }).then(res => {
+        this.$xdHideLoading();
+        uni.showToast({
+          title: "添加成功",
+          icon: "none"
+        });
+        successCb(res);
+      }).catch(err => {
+        console.log(err, 'err')
+        this.$xdHideLoading();
+        if(errCb) errCb();
+        this.$xdLog.catch(err);
+      })
+    },
+    getSettleListCoupons(cb) {
+
+      jfbRootExec('movieCardList', {
+        vm: this,
+        data: {
+          show_type: 'coupon'
+        }
+      }).then(res => {
+        cb(res.list)
+        this.cardList = res.list
+      }).catch(this.$xdLog.catch)
+    },
+    setSettleSelectCoupon(options, successCb, errCb) {
+
+      this.$xdShowLoading({})
+      let cart_order_id = this.tempOrderId;
+      jfbRootExec('movieSelectCard', {
+        vm: this,
+        data: {
+          cart_order_id: cart_order_id,
+          select_content: 1,
+          ...options,
+        }
+      }).then(res => {
+        successCb(res)
+        this.$xdHideLoading()
+      }).catch(err => {
+        if(errCb) errCb(err)
+        this.$xdHideLoading()
+        this.$xdLog.catch(err);
+      })
+    },
+
       onJfbBack(options) {
         this.$xdUniHelper.navigateBack()
       },