jufubao-movie 1.0.29 → 1.0.30-beta2

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**/

package/src/components/JfbMovieOrderDetail/Attr.js

@@ -13,7 +13,6 @@ export default {
       value: '', //v-model
       placeholder: '请输入标题名称',
       classNmae: 'input40', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-      disabled: true,
       rules: [
         {
           required: true,
@@ -60,7 +59,6 @@ export default {
       ele: 'xd-radio', //package 名称
       valueKey: 'radio_status_list', //form[valueKey]
       value: 6, //v-model
-      disabled: true,
       rules: [
         {required: true, message: '请选择', trigger: ['blur', 'change']}
       ],
@@ -78,7 +76,6 @@ export default {
       ele: 'xd-radio', //package 名称
       valueKey: 'radio_status_list', //form[valueKey]
       value: 6, //v-model
-      disabled: false,
       remoteApi: '/api/editx/pages',
       remote: true,
       rules: [
@@ -92,7 +89,6 @@ export default {
       ele: 'xd-check', //package 名称
       valueKey: 'xd-check_list', //form[valueKey]
       value: 6, //v-model
-      disabled: true,
       rules: [
         {required: true, message: '请选择', trigger: ['blur', 'change']}
       ],
@@ -110,7 +106,6 @@ export default {
       ele: 'xd-check', //package 名称
       valueKey: 'xd-check_remote-list', //form[valueKey]
       value: 6, //v-model
-      disabled: false,
       remoteApi: '/api/editx/pages',
       remote: true,
       rules: [
@@ -125,7 +120,6 @@ export default {
       valueKey: 'radio_status', //form[valueKey]
       value: 'Y', //v-model
       isall: true,
-      disabled: true,
       backValueType: '', //返回值类型 1=>返回（Y,N）2=> [true|false] 3=>[1,0] 4=>[1,2]
       placeholder: '请选择',
       list: 'status', //status=>状态  best=>推荐  associate=>关联 yes=>是否 open=> 是否开启  check=>审核
@@ -140,7 +134,6 @@ export default {
       value: '', //v-model
       placeholder: '请输入标题名称',
       classNmae: 'input40', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-      disabled: true,
       rules: [
         {
           required: true,

package/src/components/JfbMovieOrderDetail/JfbMovieOrderDetail.vue

@@ -278,9 +278,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/JfbMovieOrderDetail/JfbMovieOrderDetailLess.less

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

package/src/components/JfbMoviePay/Attr.js

@@ -13,7 +13,6 @@ export default {
       value: '', //v-model
       placeholder: '请输入标题名称',
       classNmae: 'input40', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-      disabled: true,
       rules: [
         {
           required: true,
@@ -60,7 +59,6 @@ export default {
       ele: 'xd-radio', //package 名称
       valueKey: 'radio_status_list', //form[valueKey]
       value: 6, //v-model
-      disabled: true,
       rules: [
         {required: true, message: '请选择', trigger: ['blur', 'change']}
       ],
@@ -78,7 +76,6 @@ export default {
       ele: 'xd-radio', //package 名称
       valueKey: 'radio_status_list', //form[valueKey]
       value: 6, //v-model
-      disabled: false,
       remoteApi: '/api/editx/pages',
       remote: true,
       rules: [
@@ -92,7 +89,7 @@ export default {
       ele: 'xd-check', //package 名称
       valueKey: 'xd-check_list', //form[valueKey]
       value: 6, //v-model
-      disabled: true,
+
       rules: [
         {required: true, message: '请选择', trigger: ['blur', 'change']}
       ],
@@ -110,7 +107,7 @@ export default {
       ele: 'xd-check', //package 名称
       valueKey: 'xd-check_remote-list', //form[valueKey]
       value: 6, //v-model
-      disabled: false,
+
       remoteApi: '/api/editx/pages',
       remote: true,
       rules: [
@@ -125,7 +122,7 @@ export default {
       valueKey: 'radio_status', //form[valueKey]
       value: 'Y', //v-model
       isall: true,
-      disabled: true,
+
       backValueType: '', //返回值类型 1=>返回（Y,N）2=> [true|false] 3=>[1,0] 4=>[1,2]
       placeholder: '请选择',
       list: 'status', //status=>状态  best=>推荐  associate=>关联 yes=>是否 open=> 是否开启  check=>审核
@@ -140,7 +137,7 @@ export default {
       value: '', //v-model
       placeholder: '请输入标题名称',
       classNmae: 'input40', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-      disabled: true,
+
       rules: [
         {
           required: true,

package/src/components/JfbMoviePay/JfbMoviePay.vue

@@ -118,9 +118,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/JfbMoviePay/JfbMoviePayLess.less

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

package/src/components/JfbMovieTestApi/Api.js

@@ -1,57 +0,0 @@
-'use strict';
-
-/**
- * @description API模型
- * 建议：Ffff=>模块  Xxxx=>自定义名字
- * 获取单记录(getByIdFfffXxxx)
- * 获取列表记录(getByListFfffXxxx)
- * 添加列表记录(addFfffXxxxx)
- * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
- * 更新列表记录(updateFfffXxxxx)
- * @type {*[]}
- */
-module.exports = [
-  {
-    mapFnName: 'getByIdTestSquate', //自定义方法名字（必选）
-    isRule: false,
-    title: '获得绑定卡',
-    prefix: 'list',
-    path: '/card/v1/card-bind/list-bind-card',
-    params: {},
-    disabled: true,
-  },
-  {
-    mapFnName: 'updateFilmPaiqiDate', //自定义方法名字（必选）
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: 'removeFilmAddress', //自定义方法名字（必选）
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: 'addFilmcart',  //自定义方法名字（必选）
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-];