jufubao-movie 1.0.54 → 1.0.55-beta2

package/package.json

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

package/src/components/JfbMovieConfirm/Api.js

@@ -156,5 +156,17 @@ module.exports = [
     },
     isConsole: true,
     disabled: true
+  },
+  {
+    mapFnName: "getVipList",
+    title: "会员中心 - 会员卡列表",
+    path: "/member/v1/:namespace/vip-card",
+    isRule: false,
+    params: {
+      namespace: ['业务线', 'String', true],
+      is_show_exchange_code: ['是否展示 兑换码 ', 'Y/N，默认N', false],
+    },
+    isConsole: true,
+    disabled: true
   }
 ];

package/src/components/JfbMovieConfirm/JfbMovieConfirm.vue

@@ -92,16 +92,16 @@
             </view>
           </view>
           <view class="jfb-movie-confirm__body-movie-total-right">
-            共{{order_info.seat_number}}张
+            <view>共{{order_info.seat_number}}张:</view>
             <template v-if="is_not_show_price !== 'Y'">
-              :
-              <xd-unit
+              <!-- <xd-unit
                 :color="mainColor"
                 :isOld="false"
                 :iocnSize="0.32"
                 :fontSize="24"
                 :price="order_info.total_price"
-              ></xd-unit>
+              ></xd-unit> -->
+              <CusPrice :isVip="false" :showPrice="order_info.show_prices" type="order" ></CusPrice>
             </template>
 
           </view>
@@ -132,6 +132,32 @@
           <xd-content-xss style="color: #999" :html="notice"></xd-content-xss>
         </view>
       </view>
+      
+      <view class="vip_list_wrap">
+        <cus-vip-list :list="vipCardList"
+          :vip_card_id="vip_card_id"
+          :plus_saving_money="plus_saving_money"
+          @choseVipCard="handleChoseVipCard"></cus-vip-list>
+      </view>
+
+      <view class="vip_pay_info">
+        <view class="good_vip_price">
+          <xd-list-item label="商品价格" paddingLR="40rpx" size="small" showBottom>
+            <!-- <view style="color: #999999;">145.00</view> -->
+            <xd-unit :price="origin_total_price" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
+          </xd-list-item>
+          <xd-list-item label="PLUS专项立减" size="small" paddingLR="40rpx" >
+            <view slot="label" style="color: #86541E;">PLUS专项立减</view>
+            <!-- <view style="color: #FF7070;">-5.00</view> -->
+            <xd-unit :price="plus_saving_money" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
+          </xd-list-item>
+        </view>
+        <!-- <view class="vip_remain">
+          <xd-list-item label="账户余额" size="small" paddingLR="40rpx" showRight>
+            <view style="color: #999999;">30.00</view>
+          </xd-list-item>
+        </view> -->
+      </view>
 
       <view v-if="otherPayMethod.length" class="jfb-movie-confirm__body-card">
         <template v-for="item in otherPayMethod">
@@ -287,6 +313,8 @@
   import extsMixins from "@/mixins/extsMixins"
   import {getContainerPropsValue, baseJsDateToTime,getParentsStyle} from "@/utils/xd.base";
   import {mapState} from 'vuex';
+  import CusPrice from '@/components/CusPrice/CusPrice'
+  import CusVipList from "@/components/CusVipList/CusVipList"
 
   // #ifdef H5
   import cookie from "@/common/cookie";
@@ -305,7 +333,9 @@
       XdListItem,
       XdCardPayChose,
       XdWalletChose,
-      CusCouponChose
+      CusCouponChose,
+      CusPrice,
+      CusVipList
     },
     mixins: [componentsMixins,extsMixins,JfbMovieConfirmMixin],
     data() {
@@ -328,6 +358,12 @@
         is_first_use_card: "",  //是否优先使用卡券
         is_use_jfb_pay: "",   //是否使用聚福宝支付
         res_total_price: 0,
+        origin_total_price: 0,
+
+        is_show_vip_card_list: "",
+        vipCardList: [],
+        vip_card_id: 0,
+        plus_saving_money: 0,
 
         cardShow: false,
 
@@ -461,10 +497,14 @@
         this.tempOrderId = options.order_id;
         this.validImageAPIUrl = this.brandInfo['api_host'] + '/common/v1/valid_code/image/show'
         console.log(this, 'confirm this');
+        this.p_getConfirmOrder();
+      },
+      p_getConfirmOrder(){
         jfbRootExec("movieConfirmOrder", {
           vm: this,
           data: {
             temp_order_id: this.tempOrderId,
+            vip_card_id: this.vip_card_id
           }
         })
           .then(res => {
@@ -474,6 +514,9 @@
             this.is_first_use_card = res.is_first_use_card;
             this.is_use_jfb_pay = res.is_use_jfb_pay;
             this.res_total_price = res.total_price;
+            this.is_show_vip_card_list = res.is_show_vip_card_list;
+            this.plus_saving_money = res.plus_saving_money;
+            this.origin_total_price = res.origin_total_price;
 
             res.show_time = baseJsDateToTime(res.show_time)
             res.seat_number = JSON.parse(res.seat_name).length;
@@ -501,7 +544,17 @@
               res.pay_methods.push('coupon')
               this.p_getPayMethod(res.pay_methods);
             }
-
+            if(res.vip_card_item){
+              if(res.vip_card_item.is_can_buy === 'Y'){
+                this.vip_card_id = res.vip_card_item.vip_card_id;
+              }else if(res.vip_card_item.is_can_buy === 'N'){
+                this.vip_card_id = '';
+                this.$xdAlert({content: res.vip_card_item.error_message});
+              }
+            }
+            if(this.is_show_vip_card_list === 'Y' && !this.vipCardList.length){
+              this.p_getVipList();
+            }
           })
           .catch(err => {
             this.$xdHideLoading();
@@ -510,6 +563,10 @@
             // }
           });
       },
+      handleChoseVipCard(vip_card_id){
+        this.vip_card_id = vip_card_id;
+        this.p_getConfirmOrder();
+      },
       //only选择卡片
       toChoseCard(){
         this.showCardPayChose = true;
@@ -524,6 +581,16 @@
       toChoseWallet(){
         this.showWalletChose = true;
       },
+      p_getVipList(){
+        jfbRootExec("getVipList", {
+          vm: this,
+          data: {
+            namespace: 'movie',
+          }
+        }).then(res => {
+          this.vipCardList = res.list;
+        })
+      },
       handleWalletChose({walletPayPrice, needPayPrice, selectedWalletList}){
         this.choseWallet = {
           walletPayPrice,
@@ -758,6 +825,7 @@
             ...options,
             notify_provider_id: this.projectAttr.notify_provider_id,
             buy_product: {cart_order_id: this.tempOrderId},
+            vip_card_id: this.vip_card_id
           }
         }).then(res => {
           if(res.pay_url){
@@ -969,6 +1037,23 @@
     position: relative;
     z-index: 110;
     &__body {
+      .vip_list_wrap{
+        margin: 0 24rpx 24rpx;
+        border-radius: 20rpx;
+        overflow: hidden;
+      }
+      .vip_pay_info{
+        margin: 0 24rpx 24rpx;
+        .good_vip_price{
+          background-color: #FFFFFF;
+          border-radius: 20rpx;
+        }
+        .vip_remain{
+          background-color: #FFFFFF;
+          border-radius: 20rpx;
+          margin-top: 24rpx;
+        }
+      }
       &-title {
         display: flex;
         justify-content: flex-start;
@@ -1053,6 +1138,7 @@
             display: flex;
             flex-direction: column;
             justify-content: space-around;
+            align-items: flex-start;
             height: unit(300, rpx);
             margin-left: unit(40, rpx);
 
@@ -1102,7 +1188,7 @@
           border-top: unit(2, rpx) solid #F6F6F6;
           display: flex;
           justify-content: space-between;
-          align-items: center;
+          align-items: flex-start;
           font-size: unit(24, rpx);
           margin-top: unit(24, rpx);
 
@@ -1128,10 +1214,13 @@
           }
 
           &-right {
+            &>view:first-child{
+              margin-right: 10rpx;
+            }
             color: #999999;
             flex: 1;
             display: flex;
-            align-items: center;
+            align-items: baseline;
             justify-content: flex-end;
             margin-top: unit(20, rpx);
           }

package/src/components/JfbMovieConfirm/Mock.js

@@ -16,6 +16,7 @@ module.exports = {
     "seat_name": "[\"5\排4\列\",\"5\排5\列\"]",
     "remark": "9.6",
     "count_down": "581",
+    "pay_methods": [],
     "request_id": "a069a3183348d7f2"
   },
   movieCardList: {
@@ -145,4 +146,5 @@ module.exports = {
   },
   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"},
+  getVipList:{"total_size":3,"next_page_token":"","list":[{"vip_card_id":3,"product_id":60038520,"product_name":"体验卡","sale_price":10000000,"vip_card_icon":""},{"vip_card_id":2,"product_id":60038519,"product_name":"月卡","sale_price":10000000,"vip_card_icon":""},{"vip_card_id":1,"product_id":60038515,"product_name":"测1","sale_price":10000000,"vip_card_icon":""}],"request_id":"c5cf58415cffdc30"},
 }

package/src/components/JfbMovieConfirm/XdListItem.vue

@@ -2,8 +2,7 @@
   <view class="xd-my-list-item"
     :class="'size_'+size"
     :style="{
-      borderTop: showBottom ? '1px solid #eee':'none',
-      marginTop: showBottom? paddingTB: 0,
+      borderBottom: showBottom ? '1px solid #F6F6F6':'none',
       paddingLeft: paddingLR,
       paddingRight: paddingLR,
       paddingTop: paddingTB,

package/src/components/JfbMovieLineSchedule/JfbMovieLineSchedule.vue

@@ -160,16 +160,17 @@
                 <view class="_main">{{item.show_version}}</view>
                 <view class="_sub">{{item.hall_name}}</view>
               </view>
-              <view v-if="is_not_show_price !== 'Y'" class="flex-sub">
+              <view v-if="is_not_show_price !== 'Y'" style="flex: 2;" class="flex-sub">
                 <view class="_main" style="color: red;">
-                  <xd-unit class="xd-unit"
+                  <!-- <xd-unit class="xd-unit"
                     :price="item.sale_price"
                     :isOld="false"
                     :isShowIcon="false"
-                    :font-size="24"/>
+                    :font-size="24"/> -->
                   <!-- {{item.sale_price}} -->
+                   <CusPrice :isVip="true" range="起" type="schedule"></CusPrice>
                 </view>
-                <view class="_sub"> <xd-coins class="xd-coins" :size="0.2"></xd-coins> 起</view>
+                <!-- <view class="_sub"> <xd-coins class="xd-coins" :size="0.2"></xd-coins> 起</view> -->
               </view>
               <xd-button type="primary" size="small" @click="toChooseSeat(item.schedule_id)">购买</xd-button>
             </view>
@@ -193,6 +194,7 @@
   import extsMixins from "@/mixins/extsMixins"
   import { getContainerPropsValue } from "@/utils/xd.base";
   import XdTab from "@/components/XdTab/XdTab";
+  import CusPrice from '@/components/CusPrice/CusPrice'
   //#ifdef H5
   import ZSwiper from "@zebra-ui/swiper/components/z-swiper/z-swiper.vue"
   import ZSwiperItem from "@zebra-ui/swiper/components/z-swiper-item/z-swiper-item.vue"
@@ -210,6 +212,7 @@
       XdCoins,
       XdNoticeBar,
       XdUnit,
+      CusPrice,
       //#ifdef H5
       ZSwiper,
       ZSwiperItem