jufubao-movie 1.0.67 → 1.0.68-beta2

package/get.package.path.js

@@ -8,11 +8,11 @@
  */
 const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
   if(packname === 'gxd-commands-bussiness') {
-    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-commands-bussiness/${threePackagePath}`;
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
   }
 
   if (packname === 'gxd-uni-library-editx') {
-    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-uni-library-editx/${threePackagePath}`;
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
   }
 
 };

package/package.json

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

package/src/components/JfbMovieLineCinema/Attr.js

@@ -1,100 +1,15 @@
 'use strict';
+import Style from './cusAttr/style'
+import Advanced from './cusAttr/advanced'
+import Content from './cusAttr/content'
 
 export default {
   style: [],
-  content: (data)=>{
+  content: (data, gValue, gColor, oldData) => {    
     return [
-      {
-        label: '排序方式:',
-        ele: 'xd-site-select-list',
-        valueKey: 'sort_consume_mode',
-        value: data['sort_consume_mode'] || '',
-        groupKey:'content',
-        placeholder: '请选择排序方式',
-        multiple: false,
-        className: 'input80',
-        handleCustom({ action, data }) {
-          XdBus.getParentApi('getOptionsSettingList')({
-            setting_id: 'sort_consume_mode',
-            key: Date.now()
-          })
-            .then(res => {
-              data.cb(res.list)
-            })
-            .catch(error => {
-              console.error(error);
-            });
-        },
-      },
-      {
-        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',
-        valueKey: 'schedule_choose_path',
-        placeholder: '请选择排期路径',
-        className: 'input80',
-        value: data['schedule_choose_path'] || null,
-        groupKey:'advanced',
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-      },
-      {
-        label: '选择城市路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'choseCityPath',
-        placeholder: '选择城市路径路径',
-        value: data.choseCityPath || null,
-        className: 'input80',
-        groupKey:'advanced',
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-      },
-      {
-        label: '电子码兑换:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'codeChoosePath',
-        placeholder: '请选择电子码兑换路径',
-        value: data.codeChoosePath || null,
-        className: 'input80',
-        groupKey:'advanced',
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        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,
-      },
+      ...Content(data, gValue, gColor, oldData),
+      ...Style(data, gValue, gColor, oldData),
+      ...Advanced(data, gValue, gColor, oldData),
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbMovieLineCinema/JfbMovieLineCinema.vue

@@ -13,17 +13,21 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active && !noBorder"
     >
-      <view class="jfb-movie-line-cinema__edit-icon"@click.stop="delEdit">
-        <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
+      <view class="jfb-movie-line-cinema__edit-icon" @click.stop="delEdit">
+        <xd-font-icon
+          icon="iconshanchu-01"
+          color="#fff"
+          size="30"
+        ></xd-font-icon>
       </view>
     </view>
     <!-- #endif -->
     <view
       class="jfb-movie-line-cinema__body"
-      :style="{minHeight: layoutInfo.bodyMinHeight}"
+      :style="{ minHeight: layoutInfo.bodyMinHeight }"
       v-if="loading"
     >
-      <view class="cinema_header" :style="{top: layoutInfo.top + 'rpx'}">
+      <view class="cinema_header" :style="{ top: layoutInfo.top + 'rpx' }">
         <view class="addr_point">
           <xd-city-show
             city-location-type="baidu"
@@ -83,66 +87,45 @@
           <view>
             <view class="item_addr"></view>
           </view>
-          <view style="display: flex;justify-content: space-between; align-items: center; margin-top: 24rpx;">
+          <view
+            style="
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+              margin-top: 24rpx;
+            "
+          >
             <view class="item_dist"></view>
-            <view style="display: flex;">
+            <view style="display: flex">
               <view class="cinema_item-btn"></view>
             </view>
           </view>
         </view>
       </view>
       <template v-else>
-        <view v-if="filterCinemaList.length" class="cinema_list">
-          <view
-            class="cinema_item"
-            v-for="item in filterCinemaList"
-            :key="item.cinema_id"
-            @click="toChooseSchedule(item)"
-          >
-            <view class="item_main">
-              <view class="item_name">{{ item.cinema_name }}</view>
-            </view>
-            <view>
-              <view class="item_addr">{{ item.address }}</view>
-            </view>
-            <view
-              style="
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-                margin-top: 24rpx;
-              "
-            >
-              <view class="item_dist">
-                <xd-font-icon icon="icondizhi" size="32" style="margin-right: 30rpx;"></xd-font-icon>
-                {{ item.distance }}</view
-              >
-              <!-- 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, marginLeft: '20rpx'}"
-                  class="cinema_item-btn"
-                  @click.stop="toCodePath(item)">电子码</view>
-                <view
-                  v-if="item.seat_index > -1"
-                  :style="{background: mainColor, marginLeft: '20rpx'}"
-                  class="cinema_item-btn"
-                  @click.stop="toSchedulePath(item)">在线选座</view>
-              </view>
-            </view>
-          </view>
-        </view>
-        <view v-else class="cinema_list">
-          <view class="empty_cinema">暂无影院数据</view>
+        <view v-if="initAttr" :style="[contStyleComp]">
+          <cus-shops
+            :layout="shopListStyle"
+            :select-id="selectIds"
+            :is-show-btn="fastEntryStatus"
+            :content="cusContent"
+            :cus-style="cusStyle"
+            :list="filterCinemaList"
+            :main-color="mainColor"
+            :sub-main-color="subMainColor"
+            :names="cusNames"
+            :entry="cusEntry"
+            :is-auto-jump="isAutoJump"
+            :mapKeys="mapKeys"
+            @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>
 </template>
@@ -156,8 +139,10 @@ import JfbMovieLineCinemaMixin from "./JfbMovieLineCinemaMixin";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
 import XdCityShow from "@/components/XdCityShowApi/XdCityShowApi";
-import { getContainerPropsValue } from "@/utils/xd.base";
+import XdMore from "@/components/XdMore/XdMore";
+import { getContainerPropsValue, gCPVal } from "@/utils/xd.base";
 import { mapState } from "vuex";
+import CusShops from "@/components/CusShops/CusShops.vue";
 export default {
   name: "JfbMovieLineCinema",
   components: {
@@ -165,6 +150,8 @@ export default {
     XdFormInput,
     XdSwiper,
     XdCityShow,
+    CusShops,
+    XdMore
   },
   mixins: [componentsMixins, extsMixins, JfbMovieLineCinemaMixin],
   data() {
@@ -184,14 +171,36 @@ export default {
       loadingList: true,
 
       //面板
-      is_show_sell: "",
-      sellName: "",
-      sellPath: "",
-      scheduleChoosePath: "",
+      scanPath: "", //扫一扫
+      jhdPath: "", //聚好兑
+      qpPath: "", //快捷码      scheduleChoosePath: "",
       codeChoosePath: "",
       choseCityPath: "",
-      sort_consume_mode: '',
+      sort_consume_mode: "",
       loading: false, //是否已经加载完成
+
+      shopListStyle: "v3", //门店风格
+      cusContent: [], //显示内容
+      fastEntryStatus: false,
+      cusNames: {}, //按钮名称
+      cusEntry: {}, //入口状态
+      isAutoJump: [],
+      mapKeys: {
+        id: "cinema_id",
+        brand_id: "brand_id", //品牌ID
+        shop_id: "cinema_id", //整理前的门店ID
+        name: "cinema_name", //店铺名字
+        distance: "distance", //距离
+        address: "address", //店铺地址
+        image: "shop_icon", //店铺图片
+        mode: "cinema_type", //标签类型[]
+      },
+      //style
+      bodyPadding: {},
+      contentBgColor: "rgba(0,0,0,0)",
+      cusStyle: {}, //门店样式设置
+      initAttr: false, //状态完成
+      footerColor:'#ddd',
     };
   },
   computed: {
@@ -199,27 +208,50 @@ export default {
       stateCity: (state) => state.cityLocation.city,
       stateLocation: (state) => state.cityLocation.location || {},
     }),
-    filterCinemaList(){
-      let keywordFilterList = this.cinema_name ? this.cinemaList.filter(item => item.cinema_name.indexOf(this.cinema_name) > -1) : this.cinemaList;
-      if(this.subIndex == 0){
+    filterCinemaList() {
+      let keywordFilterList = this.cinema_name
+        ? this.cinemaList.filter(
+            (item) => item.cinema_name.indexOf(this.cinema_name) > -1
+          )
+        : this.cinemaList;
+      if (this.subIndex == 0) {
         return keywordFilterList;
-      }else{
+      } else {
         let area_code = this.citySubs[this.subIndex].value;
-        return keywordFilterList.filter(item => item.area_code == area_code)
+        return keywordFilterList.filter((item) => item.area_code == area_code);
       }
       // return this.cinemaList.filter(item => item.cinema_name.indexOf(this.cinema_name) > -1 || item.address.indexOf(this.cinema_name) > -1)
     },
     listMarginTop() {
       return {
         // marginTop: (this.layoutInfo.top + 20) + "rpx"
-        marginTop: '100rpx'
-      }
+        marginTop: "100rpx",
+      };
+    },
+    selectIds() {
+      let id = "";
+      if (!id && this.resource_shop_id) id = this.cinema_id;
+      if (!id && this.brand_id) id = this.brand_id;
+      if (!id && this.shop_id) id = this.cinema_id;
+      return id;
+    },
+    contStyleComp() {
+      let height = this.layoutInfo.bodyMinHeightRpx - 80;
+      //大于一个标签显示标签
+      //if(this.titleList.length > 1) height = height - 100;
+      //if(this.mapIsExtend) height = height - 400;
+      height = height - this.getPMValue(this.bodyPadding, "TB", 0);
+      return {
+        minHeight: height + "rpx",
+        padding: this.getMarginAndPadding(this.bodyPadding, 0),
+        backgroundColor: this.contentBgColor,
+      };
     },
   },
   watch: {
-    container(value,oldValue) {
-      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
-      if (this.$configProject['isPreview']) this.init(value)
+    container(value, oldValue) {
+      if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject["isPreview"]) this.init(value);
     },
     stateCity(n, o) {
       if (n && JSON.stringify(n) != JSON.stringify(o)) {
@@ -228,8 +260,7 @@ export default {
         this.getList();
       }
     },
-    cinemaList(n){
-    }
+    cinemaList(n) {},
   },
   created() {
     this.init(this.container);
@@ -244,49 +275,173 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {
-      this.scheduleChoosePath = getContainerPropsValue(
-        container,
-        "content.schedule_choose_path",
-        { value: "" }
-      ).value;
-      this.codeChoosePath = getContainerPropsValue(
+      //content
+      this.sort_consume_mode = gCPVal(container, "sort_consume_mode", "");
+      //内容显示
+      let cusContent = [];
+      if (gCPVal(container, "showStoreAddress", "Y") === "Y")
+        cusContent.push("address"); //门店地址
+      if (gCPVal(container, "showStoreDistance", "Y") === "Y")
+        cusContent.push("distance"); //地址
+      this.cusContent = cusContent;
+      this.fastEntryStatus = gCPVal(container, "fastEntryStatus", "N") === "Y";
+      let cusNames = {},
+        cusEntry = {};
+      let fastEntry = gCPVal(container, "fastEntry", []).filter((item) => {
+        return item.check === true;
+      });
+      if (this.fastEntryStatus) {
+        for (let i = 0; i < fastEntry.length; i++) {
+          if (fastEntry[i].input)
+            cusNames[fastEntry[i].value] = fastEntry[i].input;
+          cusEntry[fastEntry[i].value] = fastEntry[i].check;
+        }
+      }
+      this.cusNames = cusNames;
+      this.cusEntry = cusEntry;
+      //style
+      this.shopListStyle = gCPVal(container, "shopListStyle", "v3");
+      let sValue = `{"cardItemSpace":16,"margin":{"bottom":16,"left":0,"right":0,"top":16},"backgroundColor":"rgba(245, 245, 245, 1)"}`;
+      let shopStyle = this.getRelationStatus(container,'shopStyle', {  cardItemSpaceStatus:['cardItemSpace'],bodyPaddingStatus:['bodyPadding']}, sValue);
+      this.bodyPadding = gCPVal(container,'bodyPadding', [{ bottom:0,left:16, right:16,top:16}], {sKey:'bodyPaddingStatus',fields:['bodyPadding'],cusFields: ['shopStyle','margin',shopStyle],isPMR: true});
+      this.contentBgColor = gCPVal(container, "contentBgColor", "#f8f8f8", {
+        sKey: "contentBgColorStatus",
+        fields: ["contentBgColor"],
+      });
+      let cardItemSpace = gCPVal(container, "cardItemSpace", [16, 20], {
+        sKey: "cardItemSpaceStatus",
+        fields: ["cardItemSpace"],
+        cusFields: ["shopStyle", "cardItemSpace", shopStyle],
+      });
+      let cardItemRadius =
+        gCPVal(
+          container,
+          "cardItemRadius",
+          [sValue === shopStyle ? 0 : this.gStyleValue.radius, 0],
+          { sKey: "cardItemRadiusStatus", fields: ["listItemRadius"] }
+        ) || 0;
+      let cardItemShadow = gCPVal(
         container,
-        "content.codeChoosePath",
-        { value: "" }
-      ).value;
-      this.choseCityPath = getContainerPropsValue(
+        "cardItemShadow",
+        [this.gStyleValue.shadow, { color: "", width: "0" }],
+        { isShadow: true }
+      );
+      let cardItemBorder = gCPVal(
         container,
-        "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);
-      else if(item.code_index > -1) this.toCodePath(item);
-    },
-    toCodePath(item){
-      this.$xdUniHelper.navigateTo({
-        url: this.codeChoosePath + `?cinema_id=${item.cinema_id}`,
+        "cardItemBorder",
+        [
+          { color: "#f8f8f8", width: 0, style: "solid" },
+          { color: "#f8f8f8", width: 0, style: "solid" },
+        ],
+        { isBorder: true }
+      );
+      let distanceColor = gCPVal(container, "distanceColor", "#999", {
+        sKey: "distanceColorStatus",
+        fields: ["distanceColor"],
       });
-    },
-    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}`,
+      let cardItemBgColor = gCPVal(container, "cardItemBgColor", "", {
+        sKey: "cardItemBgColorStatus",
+        fields: ["cardItemBgColor"],
       });
+      let itemPadding = gCPVal(
+        container,
+        "itemPadding",
+        [{ top: 16, left: 16, right: 16, bottom: 16 }, 20],
+        { sKey: "itemPaddingStatus", fields: ["itemPadding"], isPMR: true }
+      );
+      this.cusStyle = {
+        item: {
+          "margin-bottom": `${cardItemSpace}rpx`,
+          "border-radius": cardItemRadius + "rpx",
+          "box-shadow": cardItemShadow,
+          border: cardItemBorder,
+          backgroundColor: cardItemBgColor,
+          padding: this.getMarginAndPadding(itemPadding, 0),
+        },
+        distance: {
+          color: distanceColor,
+        },
+      };
+
+      this.scheduleChoosePath = gCPVal(container, "scheduleChoosePath", {
+        value: "",
+      }).value;
+      this.codeChoosePath = gCPVal(container, "codeChoosePath", {
+        value: "",
+      }).value;
+      this.choseCityPath = gCPVal(container, "choseCityPath", {
+        value: "",
+      }).value;
+      this.scanPath = gCPVal(container, "cscanPath", { value: "" }).value;
+      this.jhdPath = gCPVal(container, "jhdPath", { value: "" }).value;
+      this.qpPath = gCPVal(container, "qpPath", { value: "" }).value;
+      this.initAttr = true;
     },
-    toSchedulePath(item){
+    //==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") url = this.scheduleChoosePath;
+
+      if (item.resource_shop_id)
+        parmas.push(`resource_shop_id=${item.resource_shop_id}`);
+      if (item.brand_id) parmas.push(`brand_id=${item.brand_id}`);
+      if (item.consume_mode)
+        parmas.push(`consume_mode=${item.consume_mode.join(",")}`);
+      if (item.shop_id) parmas.push(`shop_id=${item.shop_id}`);
+
+      //详情增加扩张参数
+      if (item.exts_params) parmas.push(`exts_params=${item.exts_params}`);
+
+      //详情增加扩张参数
+      if (["DL", "JHD", "QP"].includes(type)) {
+        parmas.push(
+          `resource_shop=${Base64.encodeURI(
+            JSON.stringify({
+              shop_id: item.shop_id,
+              resource_shop_id: item.resource_shop_id,
+            })
+          )}`
+        );
+      }
+
+      //在线选择,电子码传惨处理
+      if (["SEAT", "CODE"].includes(type))
+        parmas = [`cinema_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=movie`);
+        parmas.push(`x-params=${Base64.encodeURI(`shop_id:${item.shop_id}`)}`);
+      }
+
+      //预览模式
+      if (this.$configProject["isPreview"]) {
+        console.warn(`uri=>${url}?${parmas.join("&")}`);
+        return;
+      }
+
+      if (!url) throw new Error(`${type} => 未设置访问地址`);
+
+      //普通跳转
       this.$xdUniHelper.navigateTo({
-        url: this.scheduleChoosePath + `?cinema_id=${item.cinema_id}`,
+        url: `${url}?${parmas.join("&")}`,
       });
     },
+    //==evnet===
 
     getList() {
       const { city, location, citySubs, subIndex, cinema_name } = this;
@@ -308,23 +463,21 @@ export default {
         const { list, next_page_token, area_list } = res;
 
         this.cinemaList = list.map(item => {
-          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;
+          item.resource_shop_id = item.cinema_id
+          return item
         });
         this.page_token = next_page_token;
-        let citySubs = area_list.map(item => {
+        this.hasNext = res.next_page_token !== "";
+        let citySubs = area_list.map((item) => {
           return {
             label: item.area_name,
             value: item.area_code,
-            count: item.cinema_count
-          }
-        })
-        this.citySubs = [{ label: "全城", value: "", count: "" }].concat(citySubs);
+            count: item.cinema_count,
+          };
+        });
+        this.citySubs = [{ label: "全城", value: "", count: "" }].concat(
+          citySubs
+        );
       });
     },
     /**城市定位**********************/
@@ -381,11 +534,13 @@ export default {
       this.subIndex = i;
     },
 
-
-    handleCityChange() {
-      this.$xdUniHelper.navigateTo({
-        url: this.choseCityPath,
-      }, true);
+    handleCityChange() {      
+      this.$xdUniHelper.navigateTo(
+        {
+          url: this.choseCityPath,
+        },
+        true
+      );
     },
 
     handleGetCitySub(city_code) {
@@ -423,7 +578,7 @@ export default {
     flex-direction: column;
     .cinema_header {
       &-mask {
-        height: unit(108, rpx)
+        height: unit(108, rpx);
       }
       display: flex;
       align-items: center;
@@ -504,18 +659,18 @@ export default {
       padding: unit(24, rpx);
       flex: 1;
       overflow: auto;
-      &.skeleton-wrap{
-        .cinema_item{
-          .item_name{
+      &.skeleton-wrap {
+        .cinema_item {
+          .item_name {
             .skeleton-item(100%, 62rpx);
           }
-          .item_addr{
+          .item_addr {
             .skeleton-item(300rpx);
           }
-          .item_dist{
+          .item_dist {
             .skeleton-item(100rpx);
           }
-          .cinema_item-btn{
+          .cinema_item-btn {
             .skeleton-item(160rpx, 50rpx, 50rpx);
           }
         }

package/src/components/JfbMovieLineCinema/Mock.js

@@ -22,7 +22,20 @@ module.exports = {
         show_cinema_type_name: "在线选座",
         brand_name: "",
         area_code: "2809",
-        area_name: "通州区"
+        area_name: "通州区",
+        "consume_options": [{
+          "consume_mode": "CODE",
+          "desc": "电子码",
+          "icon": "iconduihuan"
+        }, {
+          "consume_mode": "SEAT",
+          "desc": "在线选座",
+          "icon": "iconxuanze"
+        }, {
+          "consume_mode": "SELL",
+          "desc": "线下核销",
+          "icon": "iconduihuan"
+        }]
       },
       {
         cinema_id: 6785091,
@@ -43,7 +56,20 @@ module.exports = {
         show_cinema_type_name: "在线选座",
         brand_name: "",
         area_code: "2810",
-        area_name: "大兴区"
+        area_name: "大兴区",
+        "consume_options": [{
+          "consume_mode": "CODE",
+          "desc": "电子码",
+          "icon": "iconduihuan"
+        }, {
+          "consume_mode": "SEAT",
+          "desc": "在线选座",
+          "icon": "iconxuanze"
+        }, {
+          "consume_mode": "SELL",
+          "desc": "线下核销",
+          "icon": "iconduihuan"
+        }]
       },
       {
         cinema_id: 6771491,

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

@@ -0,0 +1,119 @@
+'use strict';
+import {
+  dataVal,
+  statusDataVal,
+  statusShow
+} from "@/utils/AttrTools";
+export default (data, gValue, gColor, oldData = {}) => {
+  let scanPath = null, jhdPath = null, qpPath = null
+  if (data['scanPath'] !== undefined) {
+    scanPath = data['scanPath'];
+  } else {
+    scanPath = data['sellPath']
+  }
+  if (data['jhdPath'] !== undefined) {
+    jhdPath = data['jhdPath'];
+  } else {
+    jhdPath = data['sellPath']
+  }
+  if (data['qpPath'] !== undefined) {
+    qpPath = data['qpPath'];
+  } else {
+    qpPath = data['sellPath']
+  }
+  return [
+    {
+      label: '在线选座',
+      ele: 'xd-select-pages-path',
+      labelInline: true,
+      valueKey: 'schedule_choose_path',
+      placeholder: '请选择在线选座跳转页面',
+      className: 'input100',
+      value: dataVal({ data, key: 'schedule_choose_path', dValue: null, gValue }),
+      groupKey: 'advanced',
+      notice: '点击影院也会跳转到这个地址',
+      inline: false,
+      setting: {
+        mode: 'new',
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+    },
+    {
+      label: '切换城市',
+      ele: 'xd-select-pages-path',
+      labelInline: true,
+      valueKey: 'choseCityPath',
+      placeholder: '选择切换城市跳转页面',
+      value: dataVal({ data, key: 'choseCityPath', dValue: null, gValue }),
+      className: 'input100',
+      groupKey: 'advanced',
+      setting: {
+        mode: 'new',
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+    },
+    {
+      label: '电子码',
+      ele: 'xd-select-pages-path',
+      labelInline: true,
+      valueKey: 'codeChoosePath',
+      placeholder: '请选择电子码跳转页面',
+      value: dataVal({ data, key: 'codeChoosePath', dValue: null, gValue }),
+      className: 'input100',
+      groupKey: 'advanced',
+      setting: {
+        mode: 'new',
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+    },
+    {
+      label: '扫码提货',
+      ele: 'xd-select-pages-path',
+      valueKey: 'scanPath',
+      placeholder: '请选择扫码提货跳转页面',
+      groupKey: 'advanced',
+      className: 'input100',
+      labelInline: true,
+      value: scanPath,
+      setting: {
+        mode: 'new',
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+      notice: '服务类型为支持 核销时使用'
+    },
+    {
+      label: '聚好兑',
+      ele: 'xd-select-pages-path',
+      valueKey: 'jhdPath',
+      placeholder: '请选择聚好兑跳转页面',
+      labelInline: true,
+      groupKey: 'advanced',
+      className: 'input100',
+      value: jhdPath,
+      setting: {
+        mode: 'new',
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+      notice: '服务类型为支持 核销时使用'
+    },
+    {
+      label: '展码提货',
+      ele: 'xd-select-pages-path',
+      valueKey: 'qpPath',
+      placeholder: '请选择展码提货跳转页面',
+      groupKey: 'advanced',
+      labelInline: true,
+      className: 'input100',
+      value: qpPath,
+      setting: {
+        mode: 'new',
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+      notice: '服务类型为支持 核销时使用'
+    },
+  ].filter(i => i)
+}
+

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

@@ -0,0 +1,203 @@
+'use strict';
+
+import { customVal, dataVal } from "@/utils/AttrTools";
+
+export default (data, gValue, gColor, oldData = {}) => {
+  let checkFieldsBg = {
+    bodyPaddingStatus: ['bodyPadding'],
+    cardItemSpaceStatus: ['cardItemSpace']
+  }
+  let checkJHD = false;
+  let checkWB = false;
+  let checkQP = false
+  if (data['fastEntryStatus']===undefined) {
+    if (data['is_show_sell'] === 'Y') {
+      checkJHD = true;
+      checkWB = true;
+      checkQP = true;
+    }
+  }
+  return [
+    {
+      ele: 'title',
+      label: '基础',
+      size: 'small',
+      groupKey: 'content',
+    },
+    {
+      label: '排序方式',
+      ele: 'xd-site-select-list',
+      labelInline: true,
+      valueKey: 'sort_consume_mode',
+      value: dataVal({ data, key: 'sort_consume_mode', dValue: '', gValue }),
+      groupKey: 'content',
+      placeholder: '请选择排序方式',
+      multiple: false,
+      className: 'input80',
+      handleCustom({ action, data }) {
+        XdBus.getParentApi('getOptionsSettingList')({
+          setting_id: 'sort_consume_mode',
+          key: Date.now()
+        })
+          .then(res => {
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
+    {
+      ele: 'title',
+      label: '组件样式',
+      size: 'small',
+      groupKey: 'content',
+    },
+    {
+      label: "门店布局",
+      ele: "xd-style-image",
+      groupKey: 'content',
+      valueKey: "shopListStyle",
+      value: dataVal({ data, key: 'shopListStyle', dValue: 'v3', gValue }),
+      labelInline: true,
+      className: 'input100',
+      handleCustom(cusRes) {
+        XdBus.getParentApi('getCompStylesOptions')({
+          layout_ids: '67gEK19OLvv1pnomF15oJ',
+          key: Date.now()
+        })
+          .then(res => {
+            res.list = res.list.filter(item => item.value !== 'v2')
+            cusRes.data.cb(res)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
+    {
+      label: "门店样式",
+      ele: "xd-style-image",
+      groupKey: 'content',
+      valueKey: "shopStyle",
+      cusStyle: { marginBottom: '5px' },
+      value: customVal({
+        data,
+        key: 'shopStyle',
+        fields: checkFieldsBg,
+        gValue,
+        sValue: `{"cardItemSpace":16,"margin":{"bottom":16,"left":16,"right":16,"top":16},"backgroundColor":"rgba(245, 245, 245, 1)"}`,
+      }),
+      labelInline: true,
+      className: 'input100',
+      handleCustom(cusRes) {
+        XdBus.getParentApi('getCompStylesOptions')({
+          layout_ids: 'KwoIQ5lXgRFd4LQMYWJIY',
+          key: Date.now()
+        })
+          .then(res => {
+            cusRes.data.cb(res)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
+    {
+      ele: 'title',
+      label: '展示内容',
+      size: 'small',
+      groupKey: 'content',
+    },
+    {
+      ele: 'xd-line',
+      groupKey: 'content'
+    },
+    {
+      label: "是否显示到店使用:",
+      ele: "xd-radio",
+      valueKey: "is_show_sell",
+      value: data['is_show_sell'] || 'N',
+      groupKey: 'content',
+      hidden: true,
+      list: [
+        { label: '显示', value: "Y" },
+        { label: '不显示', value: "N" },
+      ]
+    },
+    {
+      label: '门店地址',
+      ele: 'xd-cus-switch',
+      valueKey: 'showStoreAddress',
+      value: dataVal({ data, key: 'showStoreAddress', dValue: 'Y', gValue }),
+      isRefresh: true,
+      className: 'input100',
+      groupKey: 'content',
+      labelInline: true,
+      cusStyle: { marginBottom: '10px' },
+      setting: {
+        isBackType: 'string'
+      },
+    },
+    {
+      ele: 'xd-line',
+      groupKey: 'content'
+    },
+    {
+      label: '距离',
+      ele: 'xd-cus-switch',
+      valueKey: 'showStoreDistance',
+      value: dataVal({ data, key: 'showStoreDistance', dValue: "Y", gValue }),
+      className: 'input100',
+      groupKey: 'content',
+      labelInline: true,
+      cusStyle: { marginBottom: '10px' },
+      setting: {
+        isBackType: 'string'
+      },
+    },
+    {
+      ele: 'xd-line',
+      groupKey: 'content'
+    },
+    {
+      label: '快捷入口',
+      ele: 'xd-cus-switch',
+      valueKey: 'fastEntryStatus',
+      value: dataVal({ data, key: 'fastEntryStatus', dValue: "N", gValue }),
+      className: 'input100',
+      groupKey: 'content',
+      labelInline: true,
+      cusStyle: { marginBottom: '10px' },
+      setting: {
+        isBackType: 'string'
+      },
+    },
+    { ele: 'group_start' },
+    {
+      label: '',
+      ele: 'xd-name-check',
+      valueKey: 'fastEntry',
+      groupKey: 'content',
+      value: dataVal({ data, key: 'fastEntry', dValue: [], gValue }),
+      className: 'input100',
+      setting: {
+        isSort: false,
+        width: 90,
+      },
+      labelInline: true,
+      hidden: data['fastEntryStatus'] !== 'Y',
+      handleCustom({ action, data }) {
+        data.cb([
+          { value: 'jhd', label: '聚好兑', input: '', def: '聚好兑', check: checkJHD, placeholder: '服务类型为支持核销时使用' },
+          { value: 'wb', label: '扫一扫', input: '', def: '扫一扫', check: checkWB, placeholder: '服务类型为支持核销时使用' },
+          { value: 'qp', label: '快捷码', input: '', def: '去提货', check: checkQP, placeholder: '服务类型为支持核销时使用' },
+          { value: 'seat', label: '在线选座', input: '', def: '去订票', check: false, placeholder: '去订票' },
+          { value: 'code', label: '电子码', input: '', def: '电子码', check: false, placeholder: '电子码' },
+        ])
+      },
+    },
+    { ele: 'group_end' },
+  ].filter(i => i)
+}
+

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

@@ -0,0 +1,242 @@
+'use strict';
+import {
+  dataVal ,
+  statusShow,
+  statusDataVal,
+  getCustomAttr,
+  cRaBorShadow
+} from "@/utils/AttrTools";
+export default function (data, gValue, gColor, oldData) {
+  console.log('data', data, gValue, gColor, oldData);
+  let defCardItemBorder = cRaBorShadow( data, 'cardItemBorder', {dValue:'N'},gValue);
+  let defCardItemShadow = cRaBorShadow( data, 'cardItemShadow', {dValue:'N'},gValue);
+  let defCardImageBorder = cRaBorShadow( data, 'cardImageBorder', {dValue:'N'},gValue);
+  return [
+    {
+      label: "影院列表样式",
+      ele: "title",
+      groupKey: "style",
+      size: "small",
+    },
+    {
+      label: '内边距',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'itemPaddingStatus',
+      value: statusDataVal({data, key:'itemPaddingStatus', fields:['itemPadding'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-margin-padding',
+      groupKey:'style',
+      valueKey: 'itemPadding',
+      hidden:!statusShow({data, key: 'itemPaddingStatus', fields:['itemPadding'], gValue}),
+      value: dataVal({
+        data,
+        key:'itemPadding',
+        dValue:[gValue.isAdd && gValue.isFirst ?{top:16,left:16, right:16, bottom:16}:20],
+        gValue,
+        isPM: true,
+      }),
+      setting: {
+        type: 'padding',
+      },
+    },
+    {ele: 'group_end'},
+    {
+      label: '背景色',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'cardItemBgColorStatus',
+      value: statusDataVal({data, key: 'cardItemBgColorStatus', fields:['cardItemBgColor'], gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-color',
+      groupKey:'style',
+      valueKey: 'cardItemBgColor',
+      labelInline:true,
+      value: dataVal({data, key:'cardItemBgColor', dValue:'#FFF', gValue}),
+      hidden: !statusShow({data, key: 'cardItemBgColorStatus', fields:['cardItemBgColor'], gValue}),
+      placeholder: '请选择背景颜色',
+      classNmae: 'input80',
+      setting: {
+        showAlpha: true
+      },
+      inline: false,
+    },
+    {ele: 'group_end'},
+    {
+      label: '间距设置',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'cardItemSpaceStatus',
+      value: statusDataVal({data, key:'cardItemSpaceStatus', fields:['cardItemSpace'],gValue,cusField:['shopStyle']}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: "",
+      groupKey: 'style',
+      ele: 'xd-slider',
+      valueKey: "cardItemSpace",
+      value: dataVal({data, key:'cardItemSpace', dValue:[gValue.isAdd && gValue.isFirst ?16:20], gValue}),
+      hidden: !statusShow({data, key: 'cardItemSpaceStatus', fields:['cardItemSpace'], gValue}),
+      className: "input100",
+      labelInline: true,
+      setting:{
+        min: 0,
+        max: 100,
+        step:1,
+        showStops:false,
+        showInput:false,
+      }
+    },
+    {ele: 'group_end'},
+    {
+      label: '圆角',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'cardItemRadiusStatus',
+      value: statusDataVal({data, key:'cardItemRadiusStatus', fields:['cardItemRadius'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '无圆角', value: 'N'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-site-select-list',
+      labelInline: true,
+      valueKey: 'cardItemRadius',
+      value: dataVal({data, key:'cardItemRadius', dValue:['10'], gValue}),
+      hidden: !statusShow({data, key: 'cardItemRadiusStatus', fields:['cardItemRadius'], gValue}),
+      placeholder: '请选择圆角',
+      multiple: false,
+      className: 'input40',
+      groupKey:'style',
+      handleCustom({action, data}) {
+        XdBus.getParentApi('getOptionsSettingList')({
+          setting_id: 'edtix_style_radius',
+          key: Date.now()
+        })
+          .then(res => {
+            res.list = res.list.filter(item=>{
+              return item.label !== '无';
+            });
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
+    {ele: 'group_end'},
+    {
+      label: '描边',
+      ele: 'xd-border',
+      labelInline: true,
+      groupKey:'style',
+      valueKey: 'cardItemBorder',
+      value: defCardItemBorder,
+      setting: {
+        selected:defCardItemBorder.type,
+        isRadio: true,//启用editx默认
+        isDef: true, //启动默认选项
+        //==设置默认值==
+        color: '#f8f8f8',
+        width: '2',
+        style: 'solid'
+        //==设置默认值==
+      },
+    },
+    {
+      label: '投影',
+      ele: 'xd-shadow',
+      labelInline: true,
+      groupKey:'style',
+      valueKey: 'cardItemShadow',
+      value: defCardItemShadow,
+      className: 'input100',
+      setting: {
+        selected: defCardItemShadow.type,
+        isRadio:true,
+        isDef: true,
+        default: {
+          color:'rgba(0,0,0,0.1)',
+          width:'10',
+        }
+      },
+      handleCustom({action, data}) {
+        XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+          .then(res => {
+            res.list = res.list.filter(item=>{
+              return item.label !== '无';
+            });
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+            data.cb([])
+          });
+      },
+    },
+    {
+      label: "背景颜色:",
+      ele: "xd-color",
+      valueKey: "bodyBgColor",
+      value: data.bodyBgColor || "",
+      groupKey: "style",
+      hidden:true,
+    },
+    {
+      label: '距离样式',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'distanceColorStatus',
+      value: statusDataVal({data, key: 'distanceColorStatus', fields:['distanceColor'], gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-color',
+      groupKey:'style',
+      valueKey: 'distanceColor',
+      labelInline:true,
+      value: dataVal({data, key:'distanceColor', dValue:'#999999', gValue}),
+      hidden: !statusShow({data, key: 'distanceColorStatus', fields:['distanceColor'], gValue}),
+      placeholder: '请选择背景颜色',
+      classNmae: 'input80',
+      setting: {
+        showAlpha: true
+      },
+      inline: false,
+    },
+    {ele: 'group_end'},
+  ].filter(i=>i)
+}
+

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

@@ -0,0 +1,80 @@
+'use strict';
+import {
+  dataVal,
+  statusShow,
+  statusDataVal,
+} from "@/utils/AttrTools";
+import shops from "./shops";
+
+export default function (data, gValue, gColor, oldData) {
+  return [
+    {
+      label: "内容区",
+      ele: "title",
+      groupKey: "style",
+      size: "small",
+    },
+    {
+      label: '内容区边距',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'bodyPaddingStatus',
+      value: statusDataVal({ data, key: 'bodyPaddingStatus', fields: ['bodyPadding'], gValue, cusField: ['shopStyle'] }),
+      labelInline: true,
+      list: [
+        { label: '默认', value: 'D' },
+        { label: '自定义', value: 'C' },
+      ]
+    },
+    { ele: 'group_start' },
+    {
+      label: '',
+      ele: 'xd-margin-padding',
+      groupKey: 'style',
+      valueKey: 'bodyPadding',
+      hidden: !statusShow({ data, key: 'bodyPaddingStatus', fields: ['bodyPadding'], gValue }),
+      value: dataVal({
+        data,
+        key: 'bodyPadding',
+        dValue: [gValue.isAdd && gValue.isFirst ? { bottom: 0, left: 16, right: 16, top: 16 } : 20],
+        gValue,
+        isPM: true,
+      }),
+      setting: {
+        type: 'margin',
+      },
+    },
+    { ele: 'group_end' },
+    {
+      label: '内容区背景',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'contentBgColorStatus',
+      value: statusDataVal({ data, key: 'contentBgColorStatus', fields: ['contentBgColor'], gValue }),
+      labelInline: true,
+      list: [
+        { label: '默认', value: 'D' },
+        { label: '自定义', value: 'C' },
+      ]
+    },
+    { ele: 'group_start' },
+    {
+      label: '',
+      ele: 'xd-color',
+      groupKey: 'style',
+      valueKey: 'contentBgColor',
+      labelInline: true,
+      value: dataVal({ data, key: 'contentBgColor', dValue: '#f8f8f8', gValue }),
+      hidden: !statusShow({ data, key: 'contentBgColorStatus', fields: ['contentBgColor'], gValue }),
+      placeholder: '请选择背景颜色',
+      classNmae: 'input80',
+      setting: {
+        showAlpha: true
+      },
+      inline: false,
+    },
+    { ele: 'group_end' },
+    ...shops(data, gValue, gColor, oldData),
+  ].filter(i => i)
+}
+