jufubao-movie 1.0.25 → 1.0.27-beta10

package/package.json

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

package/src/components/JfbMovieConfirm/Api.js

@@ -120,4 +120,41 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
+  {
+    mapFnName: "getPayMethod",
+    title: "订单支付-获取支付列表",
+    path: "/pay/v1/wallet/list-user-available-pay-method",
+    isRule: false,
+    params: {
+      support_methods: ['元宝：wallet 积分: score 补差:third 卡券:card', 'Array', true],
+    },
+    isConsole: true,
+    disabled: true
+  },
+  {
+    mapFnName: "getUserWallet",
+    title: "订单支付-可用钱包列表",
+    path: "/pay/v1/wallet/list-user-movie-available-wallet",
+    isRule: false,
+    params: {
+      support_method: ['元宝：wallet 积分: score', 'string', true],
+      business_code: ['业务线', 'string', true],
+      sub_business_codes: ['子业务线', 'string', true],
+    },
+    isConsole: true,
+    disabled: true
+  },
+  {
+    mapFnName: "useBindedWallet",
+    title: "使用已绑钱包",
+    path: "/movie/v1/order/use-wallet",
+    isRule: false,
+    data: {
+      selected_card_list_json: ['卡', 'string', true],
+      selected_wallet_list_json: ['钱包', 'string', true],
+      total_price: ['总金额', 'string', true],
+    },
+    isConsole: true,
+    disabled: true
+  }
 ];

package/src/components/JfbMovieConfirm/JfbMovieConfirm.vue

@@ -93,6 +93,7 @@
             共{{order_info.seat_number}}张：
             <xd-unit
               :color="mainColor"
+              :isOld="false"
               :iocnSize="0.32"
               :fontSize="24"
               :price="order_info.total_price"
@@ -125,12 +126,26 @@
           <xd-content-xss style="color: #999" :html="notice"></xd-content-xss>
         </view>
       </view>
+      <view 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>
+            <xd-unit v-if="choseCard && choseCard.cardPayPrice" :price="choseCard.cardPayPrice" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
+            <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>
       <view class="jfb-movie-confirm__body-btn-height" :style="bottomFixedStylePlaceholder"></view>
       <view class="jfb-movie-confirm__body-btn" :style="bottomFixedStyle">
         <view style="display: flex;align-items:center;">
           <view style="margin-right: 8rpx;">应付:</view>
           <xd-unit
-            :price="order_info.total_price"
+            :price="orderNeedPayPrice"
+            :isOld="false"
             :font-size="36"
             :iocn-size=".45"
           ></xd-unit>
@@ -145,31 +160,66 @@
           >确认支付</xd-button>
         </view>
       </view>
-      <xd-card-pay
+      <template v-if="otherPayLoaded">
+        <xd-card-pay
+          v-if="!payCard"
+          :layoutInfo="layoutInfo"
+          :show.sync="showCardPay"
+          :payChannels="payChannels"
+          :jwxSDK="jwxSDK"
+          :validImageAPIUrl="validImageAPIUrl"
+          :price="order_info.total_price/100"
+          :getSettleListCards="getSettleListCards"
+          :setSettleSelectCard="setSettleSelectCard"
+          :createSettleOrder="createSettleOrder"
+          :addSettleCard="addSettleCard"
+          :setThirdPlace="setThirdPlace"
+          ref="cardPay"
+          @onCreateOrder="handleCreateSuccess"
+        ></xd-card-pay>
+        <xd-card-pay-chose
+          v-else
+          ref="xdCardPayChose"
+          :layoutInfo="layoutInfo"
+          :show.sync="showCardPayChose"
+          :hadChoseCard="choseCard && choseCard.selectedCardList"
+          :jwxSDK="jwxSDK"
+          :selected_wallet_list="choseWallet ? choseWallet.selectedWalletList : []"
+          :validImageAPIUrl="validImageAPIUrl"
+          :orderTotalPrice="order_info.total_price/100"
+          :orderNeedPayPrice="orderNeedPayPrice"
+          :getSettleListCards="getSettleListCards"
+          :setSettleSelectCard="setSettleSelectCard"
+          :addSettleCard="addSettleCard"
+          @onChose="handleCardChose"
+          @onAlert="() => hasAlertCardChose = true"
+        >
+        </xd-card-pay-chose>
+      </template>
+      <xd-wallet-chose
+        v-if="payWallet"
+        ref="xdWalletChose"
         :layoutInfo="layoutInfo"
-        :show.sync="showCardPay"
-        :payChannels="payChannels"
-        :jwxSDK="jwxSDK"
-        :validImageAPIUrl="validImageAPIUrl"
-        :price="order_info.total_price"
-        :getSettleListCards="getSettleListCards"
-        :setSettleSelectCard="setSettleSelectCard"
-        :createSettleOrder="createSettleOrder"
-        :addSettleCard="addSettleCard"
-        :setThirdPlace="setThirdPlace"
-        ref="cardPay"
-        @onCreateOrder="handleCreateSuccess"
-      ></xd-card-pay>
+        :show.sync="showWalletChose"
+        :hadChoseWallet="choseWallet && choseWallet.selectedWalletList"
+        :getUserWalletList="getUserWalletList"
+        :useBindedWallet="p_useBindedWallet"
+        @onChose="handleWalletChose"
+      ></xd-wallet-chose>
+      
     </view>
   </view>
 </template>
 
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import XdListItem from "./XdListItem.vue"
   import XdUnit from "@/components/XdUnit/XdUnit";
   import XdTag from "@/components/XdTag/XdTag";
   import XdButton from "@/components/XdButton/XdButton";
   import XdCardPay from "@/components/XdCardPay/XdCardPay";
+  import XdCardPayChose from "@/components/XdCardPayChose/XdCardPayChose"
+  import XdWalletChose from "@/components/XdWalletChose/XdWalletChose"
   import XdContentXss from "@/components/XdContentXss/XdContentXss";
   import {jfbRootExec} from "@/utils/xd.event";
   import JfbMovieConfirmMixin from "./JfbMovieConfirmMixin";
@@ -186,7 +236,10 @@
       XdTag,
       XdButton,
       XdCardPay,
-      XdContentXss
+      XdContentXss,
+      XdListItem,
+      XdCardPayChose,
+      XdWalletChose
     },
     mixins: [componentsMixins,extsMixins,JfbMovieConfirmMixin],
     data() {
@@ -212,6 +265,18 @@
 
         cardShow: false,
 
+        otherPayMethod: [],
+        otherPayLoaded: false,
+
+        showCardPayChose: false,
+        choseCard: null,
+        hasAlertCardChose: false,
+
+        showWalletChose: false,
+        choseWallet: null,
+
+        xnamespace: "",
+
         //提示
         notice: '',
         title: '',
@@ -233,10 +298,26 @@
       },
       bottomFixedStylePlaceholder(){
         return this.fixedStyle({paddingBottom: 24, zIndex: 110}, 'bottom', false);
+      },
+      payWallet(){
+        return this.otherPayMethod.find(item => item.method === 'wallet')
+      },
+      payCard(){
+        return this.otherPayMethod.find(item => item.method === 'card')
+      },
+      //订单实际需要支付金额（减去各项已选，票券、钱包)
+      orderNeedPayPrice(){
+        let choseCardPay = this.choseCard ? this.choseCard.cardPayPrice : 0;
+        let choseWalletPay = this.choseWallet ? this.choseWallet.walletPayPrice : 0;
+        let 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;
       }
     },
     created() {
       this.init(this.container);
+      this.xnamespace =this.projectAttr.business_code;
       // #ifdef H5
       if (!this.$configProject.isPreview){
         jfbRootExec("getH5WxAuthorize", {
@@ -295,7 +376,8 @@
             res.show_time = baseJsDateToTime(res.show_time)
             res.seat_number = JSON.parse(res.seat_name).length;
             res.seat_name = JSON.parse(res.seat_name).join(' | ')
-            res.total_price = this.$xdUniHelper.divisionFloatNumber(res.total_price, 100)
+            // res.total_price = this.$xdUniHelper.divisionFloatNumber(res.total_price, 100)
+            res.total_price = res.total_price;
             this.order_info = res
             this.times = Number(this.order_info['count_down']);
             let minutes = Math.floor(this.times / 60);
@@ -311,6 +393,12 @@
             this.times--
             this.getCountDown();
 
+            //支付方式跟用户相关，与订单无关。
+            //只获取一次。
+            if(!this.otherPayLoaded){
+              this.p_getPayMethod(res.pay_methods);
+            }
+
           })
           .catch(err => {
             this.$xdHideLoading();
@@ -319,6 +407,94 @@
             // }
           });
       },
+      //only选择卡片
+      toChoseCard(){
+        this.showCardPayChose = true;
+      },
+      //only选卡结果
+      handleCardChose(data){
+        console.log(data)
+        this.choseCard = data;
+        this.showCardPayChose = false;
+      },
+      //选择元宝
+      toChoseWallet(){
+        this.showWalletChose = true;
+      },
+      handleWalletChose({walletPayPrice, needPayPrice, selectedWalletList}){
+        this.choseWallet = {
+          walletPayPrice,
+          needPayPrice,
+          selectedWalletList
+        }
+        console.log(this.choseWallet)
+        this.showWalletChose = false;
+      },
+
+      p_getPayMethod(support_methods){
+        jfbRootExec("getPayMethod", {
+          vm: this,
+          data: {
+            support_methods: JSON.stringify(support_methods)
+          }
+        }).then(res => {
+          this.otherPayMethod = res.list;
+          this.otherPayLoaded = true;
+        })
+      },
+      p_useBindedWallet(options, successCb, errCb){
+        console.log("this.choseCard", this.choseCard)
+        const { choseCard } = this;
+        let selected_card_list = choseCard ?  choseCard.selectedCardList : [];
+        this.$xdShowLoading({})
+        jfbRootExec("useBindedWallet", {
+          vm: this,
+          data: {
+            ...options,
+            total_price: this.order_info.total_price,
+            selected_card_list_json: JSON.stringify(selected_card_list),
+            namespace: this.xnamespace,
+            cart_order_id: this.tempOrderId
+          }
+        }).then(res => {
+          successCb(res)
+          this.$xdHideLoading()
+        }).catch(err => {
+          if(errCb) errCb(err)
+        })
+      },
+      getUserWalletList(cb){
+        jfbRootExec("getUserWallet", {
+          vm: this,
+          data: {
+            support_method: "wallet",
+            business_code: this.xnamespace
+          }
+        }).then(res => {
+          cb(res);
+        })
+      },
+      p_useBindedWallet(options, successCb, errCb){
+        console.log("this.choseCard", this.choseCard)
+        const { choseCard } = this;
+        let selected_card_list = choseCard ?  choseCard.selectedCardList : [];
+        this.$xdShowLoading({})
+        jfbRootExec("useBindedWallet", {
+          vm: this,
+          data: {
+            ...options,
+            total_price: this.order_info.total_price,
+            selected_card_list_json: JSON.stringify(selected_card_list),
+            namespace: this.xnamespace,
+            cart_order_id: this.tempOrderId
+          }
+        }).then(res => {
+          successCb(res)
+          this.$xdHideLoading()
+        }).catch(err => {
+          if(errCb) errCb(err)
+        })
+      },
       addSettleCard(options, successCb, errCb) {
         console.log(options, 'ioioioioi')
         this.$xdShowLoading({})
@@ -389,9 +565,27 @@
           isTitle: true,
           $vm: this,
           content: '<span style="color:red;font-size: 16px">提示:影票一旦售出，将不支持退换!购票成功不再发送短信通知，部分影院不提供3D眼镜，儿童身高免购票以影院实际情况为准。</span>',
-          success: (res) => {
+          success: async (res) => {
             if(this.is_use_jfb_pay === "Y" && this.is_first_use_card === "Y"){
-              this.showCardPay = true;
+              /**
+               * 有任一新版支付都用新版支付， 仅卡支付也用新版选卡支付
+               */
+              if(this.payWallet || this.payCard){  //已选卡
+                let selected_card_list = this.choseCard ? this.choseCard.selectedCardList : [];
+                let selected_wallet_list = this.choseWallet ? this.choseWallet.selectedWalletList : []
+                //票券跟钱包都未选择，给用户提示
+                if(selected_card_list.length == 0 && selected_wallet_list.length == 0){
+                  if(!this.hasAlertCardChose){
+                    this.showCardPayChose = true;
+                    return false;
+                  }else{
+                    await this.handleConfirmAllWxPay();
+                  }
+                }
+                this.useTickAndWalletPay(selected_card_list, selected_wallet_list);
+              }else{
+                this.showCardPay = true;
+              }
             }else{
               this.createSettleOrder({
                 need_pay_price: this.res_total_price,
@@ -407,6 +601,39 @@
         });
 
       },
+      handleConfirmAllWxPay(){
+        return new Promise((resolve, reject) => {
+          uni.showModal({
+            title: '提示',
+            content: `您当前未使用票券，您将全部用微信支付`,
+            confirmText: "我知道了",
+            success: function (res) {
+              if (res.confirm) {
+                resolve();
+              } else if (res.cancel) {
+                reject("取消支付");
+              }
+            }
+          });
+        })
+      },
+      //使用钱包跟票券一同支付
+      useTickAndWalletPay(selected_card_list, selected_wallet_list){
+        this.createSettleOrder({
+          total_price: this.order_info.total_price,
+          selected_card_list_json: JSON.stringify(selected_card_list),
+          selected_wallet_list_json: JSON.stringify(selected_wallet_list),
+          need_pay_price: this.orderNeedPayPrice
+        }, (res) => {
+          console.warn("创建订单成功");
+          console.warn(res);
+          this.handleCreateSuccess({
+            need_pay_price: this.orderNeedPayPrice,
+            order_id: res.order_id,
+            pay_order_id: res.pay_order_id
+          })
+        })
+      },
       createSettleOrder(options, successCb, errCb) {
         this.$xdShowLoading({})
         jfbRootExec("movieCreateOrder", {

package/src/components/JfbMovieConfirm/Mock.js

@@ -142,5 +142,7 @@ module.exports = {
     "order_id": "478270984734121984",
     "pay_order_id": "478270986643316736",
     "request_id": "c0feda27f5679197"
-  }
+  },
+  getPayMethod: {"list":[{"method":"card","show_name":"使用票券1","icon":"icon_4"},{"method":"wallet","show_name":"使用我的元宝","icon":"icon_1"},{"method":"score","show_name":"使用积分","icon":"icon_3"}],"request_id":"3746368129d64b96"},
+  getUserWallet: {"show_name":"我的元宝","icon":"icon_1","total_amount":179989,"list":[{"wallet_type":"UB","wallet_name":"账户3","wallet_virtual_number":"1000000000000244","amount":79789,"business_codes":"cake,v-RcA8Mv-Gpd96_Y_mjIf","business_codes_name":"蛋糕(勿改),商城","wallet_rule":"<p>UB使用规则说明<\/p>\n<p>123456<\/p>"},{"wallet_type":"UC","wallet_name":"账户1","wallet_virtual_number":"1000000000000245","amount":100200,"business_codes":"mall,movie,v-RcA8Mv-Gpd96_Y_mjIf,cake","business_codes_name":"商城,电影(勿改),商城,蛋糕(勿改)","wallet_rule":"<p>UC使用规则说明<\/p>\n<p>123<\/p>\n<p>阿达我娃的啊我啊我啊我啊我<\/p>\n<p><span style=\"color: #ff0000;\">阿我打我爱我的啊我啊我<\/span><\/p>"}],"request_id":"823e7aa78fa32fa9"},
 }

package/src/components/JfbMovieConfirm/XdListItem.vue

@@ -0,0 +1,137 @@
+<template>
+  <view class="xd-my-list-item"
+    :class="'size_'+size"
+    :style="{
+      borderTop: showBottom ? '1px solid #eee':'none',
+      marginTop: showBottom? paddingTB: 0,
+      paddingLeft: paddingLR,
+      paddingRight: paddingLR,
+      paddingTop: paddingTB,
+      paddingBottom: paddingTB,
+    }"
+    @click="$emit('click')">
+    <view v-if="listIcon" class="my-list_icon">
+      <image mode="widthFix" :src="listIcon" />
+    </view>
+    <view class="my-list_label">
+      <slot name="label">
+        <view v-html="label"></view>
+      </slot>
+    </view>
+    <view class="my-list_value">
+      <slot></slot>
+      <xd-font-icon
+        v-if="showRight"
+        :style="{
+          marginLeft: '10rpx',
+          color: '#B1B1B1'
+        }"
+        size="24"
+        icon="iconxiangyou_xian"
+      ></xd-font-icon>
+    </view>
+
+  </view>
+</template>
+
+<script>
+import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+export default {
+  components: {
+    XdFontIcon
+  },
+  data(){
+    return {
+    
+    }
+  },
+  props: {
+    size: {
+      type: String,
+      default: "default"
+    },
+    paddingTB:{
+      type: String,
+      default: "24rpx"
+    },
+    paddingLR: {
+      type: String,
+      default: "0rpx"
+    },
+    //是否显示border-bottom
+    showBottom: {
+      type: Boolean,
+      default: false
+    },
+    //是否显示右箭头
+    showRight: {
+      type: Boolean,
+      default: false
+    },
+    //是否显示图标
+    listIcon: {
+      type: String,
+      default: ''
+    },
+    //label
+    label: {
+      type: String,
+      default: ''
+    }
+  }
+
+}
+</script>
+
+<style lang="less" scoped>
+.xd-my-list-item{
+  display: flex;
+  align-items: center;
+  padding: 30rpx 0;
+  font-size: 28rpx;
+
+  &.size_large{
+    .my-list_value,
+    .my-list_label{
+      font-size: 28rpx;
+      font-weight: 400;
+    }
+  }
+  &.size_default{
+    .my-list_value,
+    .my-list_label{
+      font-size: 28rpx;
+      font-weight: 400;
+    }
+  }
+  &.size_small{
+    .my-list_value,
+    .my-list_label{
+      font-size: 24rpx;
+      font-weight: 400;
+    }
+  }
+
+  .my-list_icon{
+    width: 32rpx;
+    margin-right: 24rpx;
+
+    image{
+      width: 32rpx;
+    }
+  }
+
+  .my-list_label{
+    // flex: 1;
+  }
+  .my-list_value{
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+  }
+  .arrow_right{
+    width: 44rpx;
+  }
+}
+</style>

package/src/components/JfbMovieLineLineSeat/JfbMovieLineLineSeat.vue

@@ -36,6 +36,7 @@
       </view>
       <xd-online-seat
         v-if="filmId"
+        ref="xdOnlineSeat"
         :key="cinemaSeatKey"
         :is-old="false"
         :film-id="filmId"
@@ -73,6 +74,10 @@
         cinemaSeatKey: 'cinemaSeatKey',
         loadingList: true,
         request_ident: '',
+        seatTimer: null,
+        seatTime: 0,
+        isPop: false,
+        paiQiData: [],
 
         //面板
         payPath: "", //三方支付路径
@@ -121,9 +126,11 @@
           } else if (res.seat_status === 'N') {
             clearTimeout(this.timer)
             this.$xdHideLoading();
-            uni.showToast({
-              title: res.seat_message,
-              icon: "none"
+            this.$xdAlert({
+              content: res.seat_message,
+              time: 2500,
+              isClose: false,
+              zIndex: 5000
             })
             return
           }else{
@@ -155,20 +162,21 @@
         ]).then(([res, res1]) => {
           this.loadingList = false;
           this.$xdHideLoading();
-          let paiqi_data = res.schedule_data;
+          let paiqi_data = res.schedule_data.map(item => {
+            item['name'] = item['date_name'];
+            item['paiqi_data'] = item['paiqi'].map(pp => {
+              pp['price'] = pp['sale_price'];
+              pp['jfb_film_id'] = pp['film_id'];
+              pp['jfb_cinema_id'] = pp['cinema_id'];
+              pp['data_id'] = pp['schedule_id'];
+              return pp;
+            });
+            return item;
+          });
+          this.paiQiData = paiqi_data;
           // const {cinema_data, film_data} = res1;
           resolve({
-            paiqi_data: paiqi_data.map(item => {
-              item['name'] = item['date_name'];
-              item['paiqi_data'] = item['paiqi'].map(pp => {
-                pp['price'] = pp['sale_price'];
-                pp['jfb_film_id'] = pp['film_id'];
-                pp['jfb_cinema_id'] = pp['cinema_id'];
-                pp['data_id'] = pp['schedule_id'];
-                return pp;
-              });
-              return item;
-            }),
+            paiqi_data: paiqi_data,
             film_data: [{
               ...res1,
               id: res1.film_id,
@@ -176,12 +184,14 @@
             cinema_data: res1
           })
           if(res1.temp_order_id || res1.oms_order_id){
+            this.isPop = true;
             this.handleToPay(res1);
           }
         })
       },
 
       handleGetSeatList(item, resolve) {
+        if(this.isPop) return;
         this.$xdShowLoading({});
         const {cinemaId} = this;
         this.scheduleId = item.data_id;
@@ -197,9 +207,10 @@
           if(res.status === "P"){
             if(!this.$root.$isShow) return;
             this.request_ident = res.request_ident;
-            setTimeout(() => {
+            if(this.seatTimer) clearTimeout(this.seatTimer);
+            this.seatTimer = setTimeout(() => {
               this.handleGetSeatList(item, resolve);
-            }, 2000)
+            },  ++this.seatTime > 5 ? (Math.pow(2, (this.seatTime - 4)) * 1000) : 2000)
             return;
           }
           if(res.status === "E"){
@@ -217,7 +228,6 @@
           })
           resolve(seatData);
           this.$xdHideLoading();
-          
         })
       },
       //去支付未完成订单
@@ -247,7 +257,11 @@
                 data: {
                   order_id: temp_order_id || oms_order_id
                 }
-              }).then(suc => {})
+              }).then(suc => {
+                this.isPop = false;
+                // this.cinemaSeatKey = Date.now()
+                this.$refs.xdOnlineSeat.getScheduleList(this.paiQiData)
+              })
             }
           }
         })
@@ -287,6 +301,16 @@
         console.log('onJfbShow', options)
         this.onJfbLoad(options);
         this.cinemaSeatKey = Date.now()
+      },
+      onJfbUnload(){
+        this.unmount();
+      },
+      onJfbHide(){
+        this.unmount();
+      },
+      unmount(){
+        if(this.seatTimer) clearTimeout(this.seatTimer);
+        if(this.timer) clearTimeout(this.timer);
       }
     }
   }