jufubao-movie 1.0.27-beta2 → 1.0.27-beta9

package/package.json

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

package/src/components/JfbMovieConfirm/Api.js

@@ -134,7 +134,7 @@ module.exports = [
   {
     mapFnName: "getUserWallet",
     title: "订单支付-可用钱包列表",
-    path: "/pay/v1/wallet/list-user-available-wallet",
+    path: "/pay/v1/wallet/list-user-movie-available-wallet",
     isRule: false,
     params: {
       support_method: ['元宝：wallet 积分: score', 'string', true],

package/src/components/JfbMovieConfirm/JfbMovieConfirm.vue

@@ -182,6 +182,7 @@
           ref="xdCardPayChose"
           :layoutInfo="layoutInfo"
           :show.sync="showCardPayChose"
+          :hadChoseCard="choseCard && choseCard.selectedCardList"
           :jwxSDK="jwxSDK"
           :selected_wallet_list="choseWallet ? choseWallet.selectedWalletList : []"
           :validImageAPIUrl="validImageAPIUrl"
@@ -200,6 +201,7 @@
         ref="xdWalletChose"
         :layoutInfo="layoutInfo"
         :show.sync="showWalletChose"
+        :hadChoseWallet="choseWallet && choseWallet.selectedWalletList"
         :getUserWalletList="getUserWalletList"
         :useBindedWallet="p_useBindedWallet"
         @onChose="handleWalletChose"
@@ -563,17 +565,19 @@
           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"){
               if(this.payWallet){  //已选卡
               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){
-                // await this.handleConfirmAllWxPay();
+                // 
                 if(!this.hasAlertCardChose){
                   this.showCardPayChose = true;
                   return false;
+                }else{
+                  await this.handleConfirmAllWxPay();
                 }
               }
               this.useTickAndWalletPay(selected_card_list, selected_wallet_list);
@@ -596,6 +600,22 @@
         });
 
       },
+      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({