jufubao-movie 1.0.29-beta6 → 1.0.30-beta1

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,
     },
   ],
 }

package/src/components/JfbMovieLineLineSeat/JfbMovieLineLineSeat.vue

@@ -87,9 +87,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)
+      },
     },
     created() {
       this.init(this.container);
@@ -107,7 +108,7 @@
           this.scheduleId = "X3185465-84B3C1F5B8FE7EFA2E884289D20F89BB";
         }
       },
-      
+
       getSeatStatus(request_seat_id) {
         this.$xdShowLoading({});
         jfbRootExec("getCinemaSeatsStatus", {
@@ -293,7 +294,7 @@
           this.$xdHideLoading()
         })
       },
-    
+
       onJfbBack(options){
         this.$xdUniHelper.navigateBack();
       },

package/src/components/JfbMovieLineLineSeat/JfbMovieLineLineSeatLess.less

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

package/src/components/JfbMovieLineLineSeat/Mock.js

@@ -3052,7 +3052,7 @@ module.exports = {
     request_id: "8bf254253bba488b"
   },
   getSeatBaseInfo: {
-    film_id: "581",
+    film_id: "200",
     cinema_id: "7",
     cinema_name: "聚福宝测试影院聚福宝测试影院聚福宝测试影院聚福宝测试影院",
     film_name: "碧血锦衣卫",
@@ -3073,4 +3073,4 @@ module.exports = {
     },
     request_id: "cc4bde105691814c"
   }
-};
+};

package/src/components/JfbMovieLineSchedule/Attr.js

@@ -5,26 +5,31 @@ export default {
   advanced: [],
   content: [
     {
-      label: '排期超时时间(秒):', //label
-      ele: 'el-input', //package 名称
+      label: '排期超时时间(秒):',
+      ele: 'el-input',
       type: 'number',
-      valueKey: 'un_show_seconds', //form[valueKey]
+      valueKey: 'un_show_seconds',
       value: 15*60,
       placeholder: '请输入排期超时时间(秒)',
-      className: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+      className: 'input80',
+      groupKey:'content',
       rules: [
         {
           required: true,
           message: '请输入排期超时时间(秒)',
           trigger: 'blur'
         },
-      ]
+      ],
+      inline: false,
+      notice:'排期超时时间'
     },
     {
-      label: '选择座位路径:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'seat_choose_path', //form[valueKey]
+      label: '选择座位路径:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'seat_choose_path',
       placeholder: '请选择购票座位路径',
+      groupKey:'advanced',
+      className: 'input80',
       value: null,
       setting: {
         router: XdBus.getParentApi('getPagesTree'),

package/src/components/JfbMovieLineSchedule/JfbMovieLineSchedule.vue

@@ -179,7 +179,7 @@
   import ZSwiperItem from "@zebra-ui/swiper/components/z-swiper-item/z-swiper-item.vue"
   const Color = require('color');
   import { mapState } from "vuex"
-  
+
   export default {
     name: "JfbMovieLineSchedule",
     components: {
@@ -255,9 +255,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)
+      },
     },
     created() {
       // console.log("layoutInfo.", this.layoutInfo, this.siteMap)
@@ -269,7 +270,7 @@
         const { cinema_id, film_id } = options;
         this.cinema_id = cinema_id;
         await this.p_getCinemaInfo();
-      
+
         //根据options.film_id选中当前的影片
         if(film_id){
           let curIndex = this.list.findIndex(item => item.film_id==film_id);
@@ -369,7 +370,7 @@
             });
             this.pop_notice = pop_notice;
             this.is_pop = is_pop;
-            
+
             this.renderSwiper = Date.now();
             resolve();
           }).catch(err=> {
@@ -391,7 +392,7 @@
 
 <style scoped lang="less">
   @import "./JfbMovieLineScheduleLess.less";
-  
+
   .schedule_notice {
     padding: unit(15, rpx) unit(20, rpx);
   }
@@ -572,7 +573,7 @@
               font-weight: 400;
               padding: 0 40rpx;
             }
-            
+
           }
         }
       }

package/src/components/JfbMovieLineSchedule/JfbMovieLineScheduleLess.less

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

package/src/components/JfbMovieOrder/JfbMovieOrder.vue

@@ -130,9 +130,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)
+      },
     },
     created() {
       this.init(this.container);

package/src/components/JfbMovieOrder/JfbMovieOrderLess.less

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