jufubao-movie 1.0.29 → 1.0.30-beta1

package/src/components/JfbMovieCodeChoose/JfbMovieCodeChoose.vue

@@ -31,31 +31,23 @@
           borderRadius: radius + 'rpx',
           boxShadow: shadowBox,
           marginBottom: padding + 'rpx',
+          padding: outMargin
         }"
       >
         <view class="jfb-movie-code-choose__body-info-name">
           <image :src="cinemaInfo.cinema_logo"></image>
           <view>
-            <view class="jfb-movie-code-choose__body-info-name-name">{{
-              cinemaInfo.cinema_name
-            }}</view>
-            <view class="jfb-movie-code-choose__body-info-name-distance">{{
-              cinemaInfo.distance
-            }}</view>
+            <view class="jfb-movie-code-choose__body-info-name-name" :style="{color: textColor}">{{cinemaInfo.cinema_name }}</view>
+            <view class="jfb-movie-code-choose__body-info-name-distance" :style="{color:subTextColor}">{{cinemaInfo.distance }}</view>
           </view>
         </view>
-        <view
-          class="jfb-movie-code-choose__body-info-detail"
-          v-html="cinemaInfo.about"
-        >
+        <view class="jfb-movie-code-choose__body-info-detail" v-html="cinemaInfo.about">
         </view>
-        <view style="border: 0.5px solid #eee; margin-top: 40rpx"></view>
+        <view :style="{margin:(padding + 'rpx 0'),height: '1px', backgroundColor: textLineColor}"></view>
         <view class="jfb-movie-code-choose__body-info-shop">
           <view style="align-items: center;" class="jfb-movie-code-choose__body-info-shop-item">
-            <view>门店电话</view>
-            <view>
-              {{ cinemaInfo.phone }}
-            </view>
+            <view :style="{color:subTextColor}">门店电话</view>
+            <view :style="{color: textColor}">{{ cinemaInfo.phone }}</view>
             <xd-font-icon
               @click="handleCall"
               width="48"
@@ -65,10 +57,8 @@
             ></xd-font-icon>
           </view>
           <view style="padding: 24rpx 0 0 0;" class="jfb-movie-code-choose__body-info-shop-item">
-            <view>门店地址</view>
-            <view>
-              {{ cinemaInfo.address }}
-            </view>
+            <view :style="{color:subTextColor}">门店地址</view>
+            <view :style="{color: textColor}">{{ cinemaInfo.address }}</view>
           </view>
         </view>
       </view>
@@ -77,6 +67,7 @@
           border: listBorderBox,
           borderRadius: listRadius + 'rpx',
           boxShadow: listShadowBox,
+          padding: outMargin
         }">
         <view class="jfb-movie-code-choose__body-product-title">
           <xd-font-icon
@@ -85,8 +76,9 @@
             height="44"
             :color="mainColor"
           ></xd-font-icon>
-          <view>商品名</view>
+          <view :style="{color:listTextColor}">商品名</view>
         </view>
+        <view :style="{margin:(padding + 'rpx 0'),height: '1px', backgroundColor: subListTextColor}"></view>
         <view class="jfb-movie-code-choose__body-product-list">
           <view
             class="jfb-movie-code-choose__body-product-list-item"
@@ -96,8 +88,7 @@
           >
             <image :src="item.thumb"></image>
             <view class="jfb-movie-code-choose__body-product-list-item-info">
-              <view>{{ item.list_title }}</view>
-              <!--              <view>商品信息补充要求说明</view>-->
+              <view :style="{color:listTextColor}">{{ item.list_title }}</view>
               <xd-unit :price="item.sale_price"></xd-unit>
             </view>
             <view class="btn">
@@ -121,6 +112,7 @@ import extsMixins from "@/mixins/extsMixins";
 import { getContainerPropsValue } from "@/utils/xd.base";
 import { mapState } from "vuex";
 import getServiceUrl from "@/common/getServiceUrl";
+import Color from "color";
 
 export default {
   name: "JfbMovieCodeChoose",
@@ -137,18 +129,19 @@ export default {
       productList: [],
       detailPath: "",
       //其他
-      margin: {
-        top: 0,
-        left: 0,
-        right: 0,
-        bottom: 0,
-      },
+      margin: {top: 0, left: 0, right: 0, bottom: 0,},
       //基础
       radius: 0,
       backgroundColor: "",
       padding: 0,
       listRadius: 0,
       listBackgroundColor: "",
+      textColor:'',
+      subTextColor:'',
+      textLineColor:'',
+      listTextColor:'',
+      subListTextColor:'',
+      listTextLineColor:'',
 
       //投影
       is_shadow: "Y",
@@ -168,8 +161,9 @@ export default {
     };
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
   },
   computed: {
@@ -215,93 +209,33 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {
-      this.detailPath = getContainerPropsValue(
-        container,
-        "content.detailPath",
-        { value: "" }
-      ).value;
-      this.margin = getContainerPropsValue(container, "content.margin", {
-        top: 0,
-        left: 0,
-        right: 0,
-        bottom: 0,
-      });
+      this.detailPath = getContainerPropsValue(container, "content.detailPath", { value: "" }).value;
+      this.margin = getContainerPropsValue(container, "content.margin", {top: 0, left: 0, right: 0, bottom: 0,});
       this.padding = getContainerPropsValue(container, "content.padding", 20);
-      this.radius = getContainerPropsValue(container, "content.radius", 0);
-      this.backgroundColor = getContainerPropsValue(
-        container,
-        "content.backgroundColor",
-        "#f8f8f8"
-      );
-      this.is_shadow = getContainerPropsValue(
-        container,
-        "content.is_shadow",
-        "N"
-      );
-      this.is_shadow_bg = getContainerPropsValue(
-        container,
-        "content.is_shadow_bg",
-        "#fff"
-      );
-      this.is_shadow_w = getContainerPropsValue(
-        container,
-        "content.is_shadow_w",
-        "10"
-      );
 
-      this.is_border = getContainerPropsValue(
-        container,
-        "content.is_border",
-        "N"
-      );
-      this.is_border_c = getContainerPropsValue(
-        container,
-        "content.is_border_c",
-        "#fff"
-      );
-      this.is_border_w = getContainerPropsValue(
-        container,
-        "content.is_border_w",
-        2
-      );
+      this.radius = getContainerPropsValue(container, "content.radius", 0);
+      this.backgroundColor = getContainerPropsValue(container, "content.backgroundColor", "#f8f8f8");
+      this.is_shadow = getContainerPropsValue(container, "content.is_shadow", "N");
+      this.is_shadow_bg = getContainerPropsValue(container, "content.is_shadow_bg", "#fff");
+      this.is_shadow_w = getContainerPropsValue(container, "content.is_shadow_w", "10");
+      this.is_border = getContainerPropsValue(container, "content.is_border", "N");
+      this.is_border_c = getContainerPropsValue(container, "content.is_border_c", "#fff");
+      this.is_border_w = getContainerPropsValue(container, "content.is_border_w", 2);
+      this.textColor = getContainerPropsValue(container, "content.textColor", '#333');
+      this.textLineColor =  Color(this.backgroundColor).lighten(0.2).toString();
+      this.subTextColor = Color(this.textColor).alpha(.6).toString();
 
       this.listRadius = getContainerPropsValue(container, "content.listRadius", 0);
-      this.listBackgroundColor = getContainerPropsValue(
-        container,
-        "content.listBackgroundColor",
-        "#f8f8f8"
-      );
-      this.list_is_shadow = getContainerPropsValue(
-        container,
-        "content.list_is_shadow",
-        "N"
-      );
-      this.list_is_shadow_bg = getContainerPropsValue(
-        container,
-        "content.list_is_shadow_bg",
-        "#fff"
-      );
-      this.list_is_shadow_w = getContainerPropsValue(
-        container,
-        "content.list_is_shadow_w",
-        "10"
-      );
-
-      this.list_is_border = getContainerPropsValue(
-        container,
-        "content.list_is_border",
-        "N"
-      );
-      this.list_is_border_c = getContainerPropsValue(
-        container,
-        "content.list_is_border_c",
-        "#fff"
-      );
-      this.list_is_border_w = getContainerPropsValue(
-        container,
-        "content.list_is_border_w",
-        2
-      );
+      this.listTextColor = getContainerPropsValue(container, "content.listTextColor", '#333');
+      this.subListTextColor = Color(this.listTextColor).alpha(.6).toString();
+      this.listBackgroundColor = getContainerPropsValue(container, "content.listBackgroundColor", "#f8f8f8");
+      this.subListTextColor =  Color(this.listBackgroundColor).lighten(0.2).toString();
+      this.list_is_shadow = getContainerPropsValue(container, "content.list_is_shadow", "N");
+      this.list_is_shadow_bg = getContainerPropsValue(container, "content.list_is_shadow_bg", "#fff");
+      this.list_is_shadow_w = getContainerPropsValue(container, "content.list_is_shadow_w", "10");
+      this.list_is_border = getContainerPropsValue(container, "content.list_is_border", "N");
+      this.list_is_border_c = getContainerPropsValue(container, "content.list_is_border_c", "#fff");
+      this.list_is_border_w = getContainerPropsValue(container, "content.list_is_border_w", 2);
     },
 
     p_getCinemaInfo() {
@@ -317,7 +251,7 @@ export default {
         })
           .then((res) => {
             const { cinema_data } = res;
-            
+
             cinema_data['cinema_logo'] = getServiceUrl(cinema_data.cinema_logo);
             this.cinemaInfo = cinema_data;
             resolve();
@@ -384,7 +318,6 @@ export default {
 .jfb-movie-code-choose {
   &__body {
     &-info {
-      padding: unit(40,rpx);
       &-name {
         display: flex;
         align-items: center;
@@ -441,7 +374,6 @@ export default {
     &-product {
       border-radius: unit(20, rpx);
       background: #ffffff;
-      padding: unit(40, rpx);
 
       &-title {
         display: flex;
@@ -460,7 +392,9 @@ export default {
           display: flex;
           justify-content: space-between;
           margin-bottom: unit(40, rpx);
-          
+          &:last-child {
+            margin-bottom: 0;
+          }
 
           image {
             width: unit(144, rpx);
@@ -486,7 +420,7 @@ export default {
               font-size: unit(24, rpx);
             }
           }
-          
+
           & .btn {
             height: unit(144, rpx);
             flex-shrink: 0;

package/src/components/JfbMovieCodeChoose/JfbMovieCodeChooseLess.less

@@ -13,9 +13,7 @@
 
 //start
 .jfb-movie-code-choose {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +21,22 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&.editx:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    min-height: unit(100, rpx);
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-movie-code-choose {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbMovieConfirm/Attr.js

@@ -6,26 +6,28 @@ export default {
   content: (data)=>{
     return [
       {
-        label: '去支付路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'payPath', //form[valueKey]
+        label: '去支付路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'payPath',
         placeholder: '请选择支付路径',
         value: data['payPath'],
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
-        inline: false,
+        groupKey:'advanced',
+        className: 'input80',
       },
       {
-        label: '支付成功路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'paySuccessPath', //form[valueKey]
+        label: '支付成功路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'paySuccessPath',
         placeholder: '请选择支付成功路径',
         value: data['paySuccessPath'],
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
-        inline: false,
+        groupKey:'advanced',
+        className: 'input80',
       },
       {
         label: '购票须知:',
@@ -44,6 +46,7 @@ export default {
             type: ['jpg', 'png', 'jpeg']
           },
         },
+        groupKey:'content',
         handleCustom({action, data}) {
           if (data && data.params) {
             //当一个插件中出现使用内容分类时候需要设置code值，在页面引用时候容器id + code进行拼接
@@ -237,8 +240,6 @@ export default {
             loading.close()
           }
         },
-        inline: false,
-        notice: '',
       },
     ]
   }

package/src/components/JfbMovieConfirm/JfbMovieConfirm.vue

@@ -209,7 +209,7 @@
         @onChose="handleWalletChose"
         @onAlert="() => hasAlertCardChose = true"
       ></xd-wallet-chose>
-      
+
     </view>
   </view>
 </template>
@@ -288,9 +288,10 @@
       }
     },
     watch: {
-      container(value) {
-        this.init(value)
-      }
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
+      },
     },
     computed: {
       ...mapState({

package/src/components/JfbMovieConfirm/JfbMovieConfirmLess.less

@@ -13,9 +13,7 @@
 
 //start
 .jfb-movie-confirm {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +21,22 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&.editx:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    min-height: unit(100, rpx);
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-movie-confirm {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbMovieLineCinema/Attr.js

@@ -9,6 +9,7 @@ export default {
         ele: 'xd-site-select-list',
         valueKey: 'sort_consume_mode',
         value: data['sort_consume_mode'] || '',
+        groupKey:'content',
         placeholder: '请选择排序方式',
         multiple: false,
         className: 'input80',
@@ -26,35 +27,37 @@ export default {
         },
       },
       {
-        label: '选择排期路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'schedule_choose_path', //form[valueKey]
+        label: '选择排期路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'schedule_choose_path',
         placeholder: '请选择排期路径',
-        value: data.schedule_choose_path || null,
+        className: 'input80',
+        value: data['schedule_choose_path'] || null,
+        groupKey:'advanced',
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
-  
         },
-        inline: false,
       },
       {
-        label: '选择城市路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'choseCityPath', //form[valueKey]
+        label: '选择城市路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'choseCityPath',
         placeholder: '选择城市路径路径',
         value: data.choseCityPath || null,
+        className: 'input80',
+        groupKey:'advanced',
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
-  
         },
-        inline: false,
       },
       {
-        label: '电子码兑换:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'codeChoosePath', //form[valueKey]
+        label: '电子码兑换:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'codeChoosePath',
         placeholder: '请选择电子码兑换路径',
         value: data.codeChoosePath || null,
+        className: 'input80',
+        groupKey:'advanced',
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },

package/src/components/JfbMovieLineCinema/JfbMovieLineCinema.vue

@@ -209,8 +209,9 @@ export default {
     },
   },
   watch: {
-    container(value) {
-      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)) {

package/src/components/JfbMovieLineCinema/JfbMovieLineCinemaLess.less

@@ -13,9 +13,7 @@
 
 //start
 .jfb-movie-line-cinema {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +21,22 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&.editx:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    min-height: unit(100, rpx);
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-movie-line-cinema {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbMovieLineCinemaChoose/Attr.js

@@ -11,7 +11,7 @@ export default {
         valueKey: 'sort_consume_mode',
         value: data['sort_consume_mode'] || '',
         placeholder: '请选择排序方式',
-        multiple: false,
+        groupKey:'content',
         className: 'input80',
         handleCustom({ action, data }) {
           XdBus.getParentApi('getOptionsSettingList')({
@@ -27,16 +27,16 @@ export default {
         },
       },
       {
-        label: '选择排期路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'schedule_choose_path', //form[valueKey]
+        label: '选择排期路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'schedule_choose_path',
         placeholder: '请选择排期路径',
-        value: data.schedule_choose_path || null,
+        value: data['schedule_choose_path'] || null,
+        groupKey:'advanced',
+        className: 'input80',
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
-  
         },
-        inline: false,
       },
     ].filter(i=>i)
   },

package/src/components/JfbMovieLineCinemaChoose/JfbMovieLineCinemaChoose.vue

@@ -164,8 +164,9 @@ export default {
     },
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
   },
   created() {