jufubao-movie 1.0.52 → 1.0.54-beta1

package/package.json

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

package/src/components/JfbMovieConfirm/JfbMovieConfirm.vue

@@ -288,6 +288,11 @@
   import {getContainerPropsValue, baseJsDateToTime,getParentsStyle} from "@/utils/xd.base";
   import {mapState} from 'vuex';
 
+  // #ifdef H5
+  import cookie from "@/common/cookie";
+  //#endif
+  import {Base64} from "js-base64";
+
   export default {
     name: "JfbMovieConfirm",
     components: {
@@ -702,9 +707,10 @@
                 total_price: this.res_total_price,
                 selected_card_list_json: "[]"
               }, (res1) => {
-                this.$xdUniHelper.redirectTo({
-                  url: this.payPath + `?order_id=${res1['pay_order_id']}&main_order_id=${res1['order_id']}`
-                }, false, true)
+                this.handleToPay(res1);
+                // this.$xdUniHelper.redirectTo({
+                //   url: this.payPath + `?order_id=${res1['pay_order_id']}&main_order_id=${res1['order_id']}`
+                // }, false, true)
               })
             }
           }
@@ -841,6 +847,27 @@
         this.couponImageUrl = getContainerPropsValue(container, "content.couponImageUrl", "");
         this.getContent();
       },
+
+      handleToPay(res){
+        let payPath = '';
+        let isMp = false;
+        // #ifdef H5
+        payPath = cookie.get(`jfb-pay-path-${this.brandInfo.site_id}`);
+        if(navigator.userAgent.match(/miniprogram/i)) isMp = true;
+        //#endif
+        if(payPath && isMp) {
+          payPath = Base64.encodeURI(`${this.payPath}?order_id=${res['pay_order_id']}&main_order_id=${res['order_id']}`);
+          this['$xdUniHelper'].redirectTo({
+            url: `/pages/jumptomp/jumptomp?callback=${payPath}`
+          });
+        }
+        else {
+          this.$xdUniHelper.redirectTo({
+            url: this.payPath + `?order_id=${res['pay_order_id']}&main_order_id=${res['order_id']}`
+          }, false, true)
+        }
+      },
+
       handleCreateSuccess(val) {
         if (val.need_pay_price == 0) {
           this.$xdUniHelper.redirectTo({
@@ -850,9 +877,10 @@
         else {
           //支持补差， 跳转补差页
           if(this.payThird){
-            this.$xdUniHelper.redirectTo({
-              url: this.payPath + `?order_id=${val['pay_order_id']}&main_order_id=${val['order_id']}`
-            })
+            this.handleToPay(val)
+            // this.$xdUniHelper.redirectTo({
+            //   url: this.payPath + `?order_id=${val['pay_order_id']}&main_order_id=${val['order_id']}`
+            // })
           }else{
             this.$xdAlert({
               content: '余额不足，请选择其他票券',

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

@@ -119,6 +119,11 @@
               >
               <!-- seat_index code_index -->
               <view style="display: flex;">
+                <view
+                  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}"
@@ -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.sell_name', '到店使用');
     },
     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;

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",