jufubao-movie 1.0.68-beta1 → 1.0.68-beta2

package/package.json

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

package/src/components/JfbMovieLineCinema/Attr.js

@@ -10,25 +10,6 @@ export default {
       ...Content(data, gValue, gColor, oldData),
       ...Style(data, gValue, gColor, oldData),
       ...Advanced(data, gValue, gColor, oldData),
-      // {
-      //   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: "不填写时默认 到店使用",
-      // },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbMovieLineCinema/JfbMovieLineCinema.vue

@@ -120,6 +120,11 @@
             @on-event="handleToEvent"
           ></cus-shops>
         </view>
+        <xd-more
+          v-if="($configProject['isPreview'] || !hasNext) && (filterCinemaList && filterCinemaList.length > 0)"
+          :color="footerColor"
+          :background="footerColor"
+        ><text>我是有底线的</text></xd-more>
       </template>
     </view>
   </view>
@@ -134,6 +139,7 @@ import JfbMovieLineCinemaMixin from "./JfbMovieLineCinemaMixin";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
 import XdCityShow from "@/components/XdCityShowApi/XdCityShowApi";
+import XdMore from "@/components/XdMore/XdMore";
 import { getContainerPropsValue, gCPVal } from "@/utils/xd.base";
 import { mapState } from "vuex";
 import CusShops from "@/components/CusShops/CusShops.vue";
@@ -145,6 +151,7 @@ export default {
     XdSwiper,
     XdCityShow,
     CusShops,
+    XdMore
   },
   mixins: [componentsMixins, extsMixins, JfbMovieLineCinemaMixin],
   data() {
@@ -193,6 +200,7 @@ export default {
       contentBgColor: "rgba(0,0,0,0)",
       cusStyle: {}, //门店样式设置
       initAttr: false, //状态完成
+      footerColor:'#ddd',
     };
   },
   computed: {
@@ -369,64 +377,20 @@ export default {
       this.qpPath = gCPVal(container, "qpPath", { value: "" }).value;
       this.initAttr = true;
     },
-    toChooseSchedule(item) {
-      if (item.seat_index > -1) this.toSchedulePath(item);
-      else if (item.code_index > -1) this.toCodePath(item);
-    },
-    toCodePath(item) {
-      this.$xdUniHelper.navigateTo({
-        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}`,
-      });
-    },
     //==evnet===
     handleToEvent({ item, type }) {
       let url = "";
       let parmas = [];
-
       //扫一扫
       if (type === "WB") url = this.scanPath;
       //聚好兑
       if (type === "JHD") url = this.jhdPath;
       //快捷码
       if (type === "QP") url = this.qpPath;
+      //电子码
+      if (type === "CODE") url = this.codeChoosePath;
       //在线选择
-      if (type === "SEAT") {
-        if (this.seatPath) url = this.seatPath;
-        else {
-          type = "DL";
-          url = this.shopInfoPath;
-        }
-      }
-      //小时达
-      if (type === "HDSELF") {
-        if (this.hdSelfPath) url = this.hdSelfPath;
-        else {
-          type = "DL";
-          url = this.shopInfoPath;
-        }
-      }
-      //旅游购票
-      if (type === "TRAVEL") {
-        if (this.travelfPath) url = this.travelfPath;
-        else {
-          type = "DL";
-          url = this.shopInfoPath;
-        }
-      }
+      if (type === "SEAT") url = this.scheduleChoosePath;
 
       if (item.resource_shop_id)
         parmas.push(`resource_shop_id=${item.resource_shop_id}`);
@@ -453,16 +417,14 @@ export default {
       //在线选择,电子码传惨处理
       if (["SEAT", "CODE"].includes(type))
         parmas = [`cinema_id=${item.resource_shop_id}`];
-      if (["TRAVEL"].includes(type))
-        parmas = [`shop_id=${item.resource_shop_id}`];
       if (["WB"].includes(type))
         parmas = [`x-params=${Base64.encodeURI(`shop_id:${item.shop_id}`)}`];
       if (["JHD"].includes(type)) {
         parmas.push(`x-jfb-os=jhd`);
         parmas.push(this.$xdUniHelper.jsonToParams(this.options));
       }
-      if (["JHD", "QP"].includes(type)) {
-        parmas.push(`xnamespace=${this.xnamespace}`);
+      if (["JHD","QP"].includes(type)) {
+        parmas.push(`xnamespace=movie`);
         parmas.push(`x-params=${Base64.encodeURI(`shop_id:${item.shop_id}`)}`);
       }
 
@@ -500,8 +462,12 @@ export default {
         this.$xdHideLoading();
         const { list, next_page_token, area_list } = res;
 
-        this.cinemaList = list;
+        this.cinemaList = list.map(item => {
+          item.resource_shop_id = item.cinema_id
+          return item
+        });
         this.page_token = next_page_token;
+        this.hasNext = res.next_page_token !== "";
         let citySubs = area_list.map((item) => {
           return {
             label: item.area_name,
@@ -568,7 +534,7 @@ export default {
       this.subIndex = i;
     },
 
-    handleCityChange() {
+    handleCityChange() {      
       this.$xdUniHelper.navigateTo(
         {
           url: this.choseCityPath,

package/src/components/JfbMovieLineCinema/cusAttr/advanced.js

@@ -27,7 +27,7 @@ export default (data, gValue, gColor, oldData = {}) => {
       ele: 'xd-select-pages-path',
       labelInline: true,
       valueKey: 'schedule_choose_path',
-      placeholder: '请选择在线选座跳转路径',
+      placeholder: '请选择在线选座跳转页面',
       className: 'input100',
       value: dataVal({ data, key: 'schedule_choose_path', dValue: null, gValue }),
       groupKey: 'advanced',
@@ -43,7 +43,7 @@ export default (data, gValue, gColor, oldData = {}) => {
       ele: 'xd-select-pages-path',
       labelInline: true,
       valueKey: 'choseCityPath',
-      placeholder: '选择切换城市跳转路径',
+      placeholder: '选择切换城市跳转页面',
       value: dataVal({ data, key: 'choseCityPath', dValue: null, gValue }),
       className: 'input100',
       groupKey: 'advanced',
@@ -57,7 +57,7 @@ export default (data, gValue, gColor, oldData = {}) => {
       ele: 'xd-select-pages-path',
       labelInline: true,
       valueKey: 'codeChoosePath',
-      placeholder: '请选择电子码跳转路径',
+      placeholder: '请选择电子码跳转页面',
       value: dataVal({ data, key: 'codeChoosePath', dValue: null, gValue }),
       className: 'input100',
       groupKey: 'advanced',
@@ -67,10 +67,10 @@ export default (data, gValue, gColor, oldData = {}) => {
       },
     },
     {
-      label: '扫一扫',
+      label: '扫码提货',
       ele: 'xd-select-pages-path',
       valueKey: 'scanPath',
-      placeholder: '请选扫一扫跳转地址',
+      placeholder: '请选择扫码提货跳转页面',
       groupKey: 'advanced',
       className: 'input100',
       labelInline: true,
@@ -86,7 +86,7 @@ export default (data, gValue, gColor, oldData = {}) => {
       label: '聚好兑',
       ele: 'xd-select-pages-path',
       valueKey: 'jhdPath',
-      placeholder: '请选择聚好兑跳转地址',
+      placeholder: '请选择聚好兑跳转页面',
       labelInline: true,
       groupKey: 'advanced',
       className: 'input100',
@@ -99,10 +99,10 @@ export default (data, gValue, gColor, oldData = {}) => {
       notice: '服务类型为支持 核销时使用'
     },
     {
-      label: '快捷码',
+      label: '展码提货',
       ele: 'xd-select-pages-path',
       valueKey: 'qpPath',
-      placeholder: '请选择快捷码跳转地址',
+      placeholder: '请选择展码提货跳转页面',
       groupKey: 'advanced',
       labelInline: true,
       className: 'input100',
@@ -114,23 +114,6 @@ export default (data, gValue, gColor, oldData = {}) => {
       inline: false,
       notice: '服务类型为支持 核销时使用'
     },
-    {
-      label: '线下核销',
-      ele: 'xd-select-pages-path',
-      valueKey: 'sellPath',
-      labelInline: true,
-      placeholder: '请选择线下核销路径',
-      value: dataVal({ data, key: 'sellPath', dValue: null, gValue }),
-      className: 'input100',
-      hidden: true,
-      groupKey: 'advanced',
-      notice: '线下核销跳转地址',
-      setting: {
-        mode: 'new',
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
   ].filter(i => i)
 }
 

package/src/components/JfbMovieLineCinema/cusAttr/shops.js

@@ -63,7 +63,7 @@ export default function (data, gValue, gColor, oldData) {
     },
     {ele: 'group_start'},
     {
-      label: '颜色',
+      label: '',
       ele: 'xd-color',
       groupKey:'style',
       valueKey: 'cardItemBgColor',
@@ -124,7 +124,7 @@ export default function (data, gValue, gColor, oldData) {
     },
     {ele: 'group_start'},
     {
-      label: '大小',
+      label: '',
       ele: 'xd-site-select-list',
       labelInline: true,
       valueKey: 'cardItemRadius',
@@ -222,7 +222,7 @@ export default function (data, gValue, gColor, oldData) {
     },
     {ele: 'group_start'},
     {
-      label: '文字颜色',
+      label: '',
       ele: 'xd-color',
       groupKey:'style',
       valueKey: 'distanceColor',

package/src/components/JfbMovieLineCinema/cusAttr/style.js

@@ -59,7 +59,7 @@ export default function (data, gValue, gColor, oldData) {
     },
     { ele: 'group_start' },
     {
-      label: '颜色',
+      label: '',
       ele: 'xd-color',
       groupKey: 'style',
       valueKey: 'contentBgColor',