jufubao-movie 1.0.55-beta3 → 1.0.55

package/package.json

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

package/src/components/JfbMovieConfirm/Api.js

@@ -156,17 +156,5 @@ 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">
-            <view>共{{order_info.seat_number}}张:</view>
+            共{{order_info.seat_number}}张
             <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> -->
-              <CusPrice :isVip="false" :showPrice="order_info.show_prices" type="order" ></CusPrice>
+              ></xd-unit>
             </template>
 
           </view>
@@ -132,32 +132,6 @@
           <xd-content-xss style="color: #999" :html="notice"></xd-content-xss>
         </view>
       </view>
-      
-      <view v-if="is_show_vip_card_list==='Y'" 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 v-if="isShowPlusSavingMoney" 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">
@@ -313,8 +287,6 @@
   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";
@@ -333,14 +305,11 @@
       XdListItem,
       XdCardPayChose,
       XdWalletChose,
-      CusCouponChose,
-      CusPrice,
-      CusVipList
+      CusCouponChose
     },
     mixins: [componentsMixins,extsMixins,JfbMovieConfirmMixin],
     data() {
       return {
-        isVip: false,
         times: null,
         timeMsg: '',
         timer: null,
@@ -359,12 +328,6 @@
         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,
 
@@ -431,11 +394,6 @@
         return true;  //都开启补差
         // return this.otherPayMethod.find(item => item.method === 'third')
       },
-      //是否展示plus立减
-      isShowPlusSavingMoney(){
-        if(this.is_show_vip_card_list === 'Y') return this.vip_card_id;
-        else return (this.isVip && this.plus_saving_money)
-      },
       //订单实际需要支付金额（减去各项已选，票券、钱包)
       orderNeedPayPrice(){
         if(!this.order_info) return 0;
@@ -461,7 +419,6 @@
     created() {
       this.init(this.container);
       this.xnamespace =this.projectAttr.business_code;
-      this.isVip = this.getTokenForKey('user_level') === 'VIP';
       // #ifdef H5
       if (!this.$configProject.isPreview){
         jfbRootExec("getH5WxAuthorize", {
@@ -504,14 +461,10 @@
         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 => {
@@ -521,9 +474,6 @@
             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;
@@ -551,17 +501,7 @@
               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();
@@ -570,10 +510,6 @@
             // }
           });
       },
-      handleChoseVipCard(vip_card_id){
-        this.vip_card_id = vip_card_id;
-        this.p_getConfirmOrder();
-      },
       //only选择卡片
       toChoseCard(){
         this.showCardPayChose = true;
@@ -588,16 +524,6 @@
       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,
@@ -832,7 +758,6 @@
             ...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){
@@ -1044,23 +969,6 @@
     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;
@@ -1145,7 +1053,6 @@
             display: flex;
             flex-direction: column;
             justify-content: space-around;
-            align-items: flex-start;
             height: unit(300, rpx);
             margin-left: unit(40, rpx);
 
@@ -1195,7 +1102,7 @@
           border-top: unit(2, rpx) solid #F6F6F6;
           display: flex;
           justify-content: space-between;
-          align-items: flex-start;
+          align-items: center;
           font-size: unit(24, rpx);
           margin-top: unit(24, rpx);
 
@@ -1221,13 +1128,10 @@
           }
 
           &-right {
-            &>view:first-child{
-              margin-right: 10rpx;
-            }
             color: #999999;
             flex: 1;
             display: flex;
-            align-items: baseline;
+            align-items: center;
             justify-content: flex-end;
             margin-top: unit(20, rpx);
           }

package/src/components/JfbMovieConfirm/Mock.js

@@ -16,7 +16,6 @@ module.exports = {
     "seat_name": "[\"5\排4\列\",\"5\排5\列\"]",
     "remark": "9.6",
     "count_down": "581",
-    "pay_methods": [],
     "request_id": "a069a3183348d7f2"
   },
   movieCardList: {
@@ -146,5 +145,4 @@ 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,7 +2,8 @@
   <view class="xd-my-list-item"
     :class="'size_'+size"
     :style="{
-      borderBottom: showBottom ? '1px solid #F6F6F6':'none',
+      borderTop: showBottom ? '1px solid #eee':'none',
+      marginTop: showBottom? paddingTB: 0,
       paddingLeft: paddingLR,
       paddingRight: paddingLR,
       paddingTop: paddingTB,

package/src/components/JfbMovieLineCinema/Attr.js

@@ -26,6 +26,25 @@ export default {
             });
         },
       },
+      {
+        label: "是否显示到店使用:",
+        ele: "xd-radio",
+        valueKey: "is_show_sell",
+        value: data['is_show_sell'] || 'N',
+        groupKey: 'content',
+        list: [
+          { label: '显示', value: "Y" },
+          { label: '不显示', value: "N" },
+        ]
+      },
+      {
+        label: "到店使用名称自定义:",
+        ele: "el-input",
+        valueKey: "sellName",
+        value: data['sellName'] || '',
+        groupKey: 'content',
+        placeholder: "不填写时默认 到店使用",
+      },
       {
         label: '选择排期路径:',
         ele: 'xd-select-pages-path',
@@ -63,6 +82,19 @@ export default {
         },
         inline: false,
       },
+      {
+        label: '到店使用路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'sellPath',
+        placeholder: '请选择到店使用路径',
+        value: data.sellPath || null,
+        className: 'input80',
+        groupKey:'advanced',
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbMovieLineCinema/JfbMovieLineCinema.vue

@@ -120,9 +120,14 @@
               <!-- seat_index code_index -->
               <view style="display: flex;">
                 <view
-                  v-if="item.code_index > -1"
+                  v-if="is_show_sell === 'Y' && item.sell_index > -1"
                   :style="{background: mainColor}"
                   class="cinema_item-btn"
+                  @click.stop="toSellPath(item)">{{ sellName }}</view>
+                <view
+                  v-if="item.code_index > -1"
+                  :style="{background: mainColor, marginLeft: '20rpx'}"
+                  class="cinema_item-btn"
                   @click.stop="toCodePath(item)">电子码</view>
                 <view
                   v-if="item.seat_index > -1"
@@ -179,6 +184,9 @@ export default {
       loadingList: true,
 
       //面板
+      is_show_sell: "",
+      sellName: "",
+      sellPath: "",
       scheduleChoosePath: "",
       codeChoosePath: "",
       choseCityPath: "",
@@ -251,7 +259,10 @@ export default {
         "content.choseCityPath",
         { value: "" }
       ).value;
+      this.sellPath = getContainerPropsValue(container, "content.sellPath", {value: ""}).value;
       this.sort_consume_mode = getContainerPropsValue(container, 'content.sort_consume_mode', '');
+      this.is_show_sell = getContainerPropsValue(container, 'content.is_show_sell', '');
+      this.sellName = getContainerPropsValue(container, 'content.sellName', '到店使用');
     },
     toChooseSchedule(item) {
       if(item.seat_index > -1) this.toSchedulePath(item);
@@ -262,6 +273,15 @@ export default {
         url: this.codeChoosePath + `?cinema_id=${item.cinema_id}`,
       });
     },
+    toSellPath(item){
+      let params = {
+        'x-params': Base64.encodeURI(`shop_id:${item.cinema_id}`),
+      }
+      let options = this.$xdUniHelper.jsonToParams(params);
+      this.$xdUniHelper.navigateTo({
+        url: this.sellPath + `?${options}`,
+      });
+    },
     toSchedulePath(item){
       this.$xdUniHelper.navigateTo({
         url: this.scheduleChoosePath + `?cinema_id=${item.cinema_id}`,
@@ -291,6 +311,7 @@ export default {
           let sell_index = item.cinema_type.findIndex(ii => ii == 'SELL'); //线下核销
           let seat_index = item.cinema_type.findIndex(ii => ii == 'SEAT');  //在线选座
           let code_index = item.cinema_type.findIndex(ii => ii == 'CODE');  //电子码
+          item['sell_index'] = sell_index;
           item['code_index'] = code_index;
           item['seat_index'] = seat_index;
           return item;
@@ -512,9 +533,9 @@ export default {
         box-shadow: 0px 16rpx 60rpx 0px #e3e3e3;
         margin-bottom: unit(24, rpx);
         &-btn {
-          font-size: unit(26, rpx);
+          font-size: unit(24, rpx);
           border-radius: unit(40, rpx);
-          padding: unit(12, rpx) unit(48, rpx);
+          padding: unit(12, rpx) unit(16, rpx);
           color: #ffffff;
           text-align: center;
           height: unit(40, rpx);

package/src/components/JfbMovieLineCinema/Mock.js

@@ -14,7 +14,7 @@ module.exports = {
         about: "",
         shop_icon: "",
         distance: "27.1km",
-        cinema_type: ["SEAT"],
+        cinema_type: ["SEAT", 'CODE', 'SELL'],
         cinema_type_name: ["在线选座"],
         status: "Y",
         is_open: "Y",

package/src/components/JfbMovieLineSchedule/JfbMovieLineSchedule.vue

@@ -160,17 +160,16 @@
                 <view class="_main">{{item.show_version}}</view>
                 <view class="_sub">{{item.hall_name}}</view>
               </view>
-              <view v-if="is_not_show_price !== 'Y'" style="flex: 2;" class="flex-sub">
+              <view v-if="is_not_show_price !== 'Y'" 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>
@@ -194,7 +193,6 @@
   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"
@@ -212,7 +210,6 @@
       XdCoins,
       XdNoticeBar,
       XdUnit,
-      CusPrice,
       //#ifdef H5
       ZSwiper,
       ZSwiperItem