jufubao-movie 1.0.29 → 1.0.30-beta2

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() {

package/src/components/JfbMovieLineCinemaChoose/JfbMovieLineCinemaChooseLess.less

@@ -13,9 +13,7 @@
 
 //start
 .jfb-movie-line-cinema-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-line-cinema-choose {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbMovieLineFilm/Attr.js

@@ -5,50 +5,40 @@ export default {
   advanced: [],
   content: [
     {
-      label: '点击购票路径:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'cinema_choose_path', //form[valueKey]
+      label: '点击购票路径:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'cinema_choose_path',
       placeholder: '请选择点击购票路径',
+      groupKey:'advanced',
+      className: 'input80',
       value: null,
       setting: {
         router: XdBus.getParentApi('getPagesTree'),
-
       },
-      inline: false,
     },
     {
-      label: '影片详情路径:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'film_info_path', //form[valueKey]
+      label: '影片详情路径:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'film_info_path',
       placeholder: '请选择影片详情路径',
       value: null,
+      groupKey:'advanced',
+      className: 'input80',
       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: '选择城市路径路径',
+      groupKey:'advanced',
+      className: 'input80',
       value: null,
       setting: {
         router: XdBus.getParentApi('getPagesTree'),
-
       },
-      inline: false,
     },
-    // {
-    //   label: "定位地址非当前城市时",
-    //   ele: "xd-radio",
-    //   valueKey: "showSwitchCity",
-    //   value: "N",
-    //   list: [
-    //     {label: "弹框提示切换", value: "Y"},
-    //     {label: "不提示", value: "N"}
-    //   ]
-    // },
   ],
 }

package/src/components/JfbMovieLineFilm/JfbMovieLineFilm.vue

@@ -199,8 +199,9 @@
       })
     },
     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/JfbMovieLineFilm/JfbMovieLineFilmLess.less

@@ -13,9 +13,7 @@
 
 //start
 .jfb-movie-line-film {
-  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-film {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbMovieLineFilmInfo/Attr.js

@@ -5,10 +5,12 @@ export default {
   advanced: [],
   content: [
     {
-      label: '点击购票路径:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'cinema_choose_path', //form[valueKey]
+      label: '点击购票路径:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'cinema_choose_path',
       placeholder: '请选择点击购票路径',
+      groupKey:'advanced',
+      className: 'input80',
       value: null,
       setting: {
         router: XdBus.getParentApi('getPagesTree'),

package/src/components/JfbMovieLineFilmInfo/JfbMovieLineFilmInfo.vue

@@ -100,7 +100,6 @@ export default {
       trailer_list: [],
       cinemaChoosePath: "",
       film_id: "",
-      //todo
     };
   },
   computed: {
@@ -109,8 +108,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() {

package/src/components/JfbMovieLineFilmInfo/JfbMovieLineFilmInfoLess.less

@@ -13,9 +13,7 @@
 
 //start
 .jfb-movie-line-film-info {
-  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-film-info {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbMovieLineLineSeat/Attr.js

@@ -5,28 +5,29 @@ export default {
   advanced: [],
   content: [
     {
-      label: '订单确认路径:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'movie_pay_path', //form[valueKey]
+      label: '订单确认路径:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'movie_pay_path',
       placeholder: '请选择订单确认路径',
+      groupKey:'advanced',
+      className: 'input80',
       value: null,
       setting: {
         router: XdBus.getParentApi('getPagesTree'),
 
       },
-      inline: false,
     },
     {
-      label: '三方支付路径:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'payPath', //form[valueKey]
-      placeholder: '请选择支付路径',
+      label: '支付路径（补差）:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'payPath',
+      placeholder: '请选择支付路径（补差）',
+      groupKey:'advanced',
+      className: 'input80',
       value: null,
       setting: {
         router: XdBus.getParentApi('getPagesTree'),
-
       },
-      inline: false,
     },
   ],
 }