jufubao-movie 1.0.29-beta6 → 1.0.30-beta1

package/package.json

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

package/src/components/JfbMovieAfterOrder/JfbMovieAfterOrder.vue

@@ -82,9 +82,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/JfbMovieAfterOrder/JfbMovieAfterOrderLess.less

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

package/src/components/JfbMovieAfterOrderDetail/JfbMovieAfterOrderDetail.vue

@@ -131,9 +131,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/JfbMovieAfterOrderDetail/JfbMovieAfterOrderDetailLess.less

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

package/src/components/JfbMovieCenter/JfbMovieCenter.vue

@@ -162,9 +162,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() {
       if (getApp().globalData.$xd && getApp().globalData.$xd['userInfo']) {

package/src/components/JfbMovieCenter/JfbMovieCenterLess.less

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

package/src/components/JfbMovieCode/JfbMovieCode.vue

@@ -71,16 +71,17 @@
       }
     },
     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);
     },
     methods: {
       onJfbLoad(options) {
-      
+
       },
       handleSubmit() {
         if (this.isEmpty(this.phone)) {
@@ -120,9 +121,9 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-      
+
       },
-      
+
       onJfbBack(options) {
         this.$xdUniHelper.navigateBack()
       },

package/src/components/JfbMovieCode/JfbMovieCodeLess.less

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

package/src/components/JfbMovieCodeChoose/Attr.js

@@ -10,12 +10,13 @@ export default {
         valueKey: 'margin',
         value: data['margin'] || null,
         disabled: false,
+        groupKey:'style',
         setting: {
           type: 'margin',
         },
         placeholder: '请设置外边距',
         inline: false,
-        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：0像素',
+        notice: '设置外边距，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span>像素',
       },
       {
         label: '间距:',
@@ -25,11 +26,16 @@ export default {
         value: data.padding || '',
         placeholder: '请输入间距',
         className: 'input80',
+        groupKey:'style',
+        inline: false,
+        notice: '设置列表之间间距，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span>像素',
       },
+
       {
         ele: 'title',
         label: '门店详情配置',
-        size: 'small', //default/mini/small
+        size: 'small',
+        groupKey:'style',
       },
       {
         label: '背景颜色:',
@@ -38,11 +44,35 @@ export default {
         value: data['backgroundColor'] || null,
         placeholder: '请选择背景颜色',
         classNmae: 'input80',
+        groupKey:'style',
       },
       {
-        ele: 'title',
-        label: '投影设置',
-        size: 'small', //default/mini/small
+        label: '文字颜色:',
+        ele: 'xd-color',
+        valueKey: 'textColor',
+        value: data['textColor'] || null,
+        placeholder: '请选择背景颜色',
+        classNmae: 'input80',
+        groupKey:'style',
+      },
+      {
+        label: '内容圆角设置:',
+        ele: 'xd-site-select-list',
+        valueKey: 'radius',
+        value: data['radius'] || '',
+        placeholder: '请选择内容圆角设置',
+        multiple: false,
+        className: 'input80',
+        groupKey:'style',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
       },
       {
         label: '是否有投影:',
@@ -52,6 +82,7 @@ export default {
         placeholder: '请选择是否投影',
         multiple: false,
         className: 'input80',
+        groupKey:'style',
         list: [
           {label: '是', value: 'Y'},
           {label: '否', value: 'N'},
@@ -64,6 +95,7 @@ export default {
         value: data['is_shadow_bg'] || '',
         placeholder: '请选择投影颜色',
         classNmae: 'input80',
+        groupKey:'style',
       },
       data['is_shadow'] === 'Y' && {
         label: '投影范围:',
@@ -71,6 +103,7 @@ export default {
         valueKey: 'is_shadow_w',
         value: data['is_shadow_w'] || '10',
         placeholder: '请选择投影范围',
+        groupKey:'style',
         multiple: false,
         className: 'input80',
         handleCustom({action, data}) {
@@ -86,11 +119,6 @@ export default {
             });
         },
       },
-      {
-        ele: 'title',
-        label: '边框设置',
-        size: 'small', //default/mini/small
-      },
       {
         label: '是否有边框:',
         ele: 'xd-radio',
@@ -98,6 +126,7 @@ export default {
         value: data['is_border'] || 'N',
         placeholder: '请选择是否有边框',
         multiple: false,
+        groupKey:'style',
         className: 'input80',
         list: [
           {label: '是', value: 'Y'},
@@ -111,24 +140,52 @@ export default {
         value: data['is_border_c'] || '',
         placeholder: '请选择边框颜色',
         classNmae: 'input80',
+        groupKey:'style',
       },
       data['is_border'] === 'Y' && {
         label: '边框大小:',
         ele: 'el-input',
         type: 'number',
+        groupKey:'style',
         valueKey: 'is_border_w',
         value: data['is_border_w'] || '',
         placeholder: '请输入边框颜色',
         className: 'input80',
       },
+
+      {
+        ele: 'title',
+        label: '商品列表配置',
+        size: 'small',
+        groupKey:'style',
+      },
+      {
+        label: '背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'listBackgroundColor',
+        value: data['listBackgroundColor'] || null,
+        placeholder: '请选择背景颜色',
+        classNmae: 'input80',
+        groupKey:'style',
+      },
+      {
+        label: '文字颜色:',
+        ele: 'xd-color',
+        valueKey: 'listTextColor',
+        value: data['listTextColor'] || null,
+        placeholder: '请选择背景颜色',
+        classNmae: 'input80',
+        groupKey:'style',
+      },
       {
         label: '内容圆角设置:',
         ele: 'xd-site-select-list',
-        valueKey: 'radius',
-        value: data['radius'] || '',
+        valueKey: 'listRadius',
+        value: data['listRadius'] || '',
         placeholder: '请选择内容圆角设置',
         multiple: false,
         className: 'input80',
+        groupKey:'style',
         handleCustom({action, data}) {
           XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
             .then(res => {
@@ -139,24 +196,6 @@ export default {
             });
         },
       },
-      {
-        ele: 'title',
-        label: '商品列表配置',
-        size: 'small', //default/mini/small
-      },
-      {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'listBackgroundColor',
-        value: data['listBackgroundColor'] || null,
-        placeholder: '请选择背景颜色',
-        classNmae: 'input80',
-      },
-      {
-        ele: 'title',
-        label: '投影设置',
-        size: 'small', //default/mini/small
-      },
       {
         label: '是否有投影:',
         ele: 'xd-radio',
@@ -164,26 +203,29 @@ export default {
         value: data['list_is_shadow'] || 'N',
         placeholder: '请选择是否投影',
         multiple: false,
+        groupKey:'style',
         className: 'input80',
         list: [
           {label: '是', value: 'Y'},
           {label: '否', value: 'N'},
         ]
       },
-      data['is_shadow'] === 'Y' && {
+      data['list_is_shadow'] === 'Y' && {
         label: '投影颜色:',
         ele: 'xd-color',
         valueKey: 'list_is_shadow_bg',
         value: data['list_is_shadow_bg'] || '',
         placeholder: '请选择投影颜色',
         classNmae: 'input80',
+        groupKey:'style',
       },
-      data['is_shadow'] === 'Y' && {
+      data['list_is_shadow'] === 'Y' && {
         label: '投影范围:',
         ele: 'xd-site-select-list',
         valueKey: 'list_is_shadow_w',
         value: data['list_is_shadow_w'] || '10',
         placeholder: '请选择投影范围',
+        groupKey:'style',
         multiple: false,
         className: 'input80',
         handleCustom({action, data}) {
@@ -199,11 +241,6 @@ export default {
             });
         },
       },
-      {
-        ele: 'title',
-        label: '边框设置',
-        size: 'small', //default/mini/small
-      },
       {
         label: '是否有边框:',
         ele: 'xd-radio',
@@ -211,63 +248,43 @@ export default {
         value: data['list_is_border'] || 'N',
         placeholder: '请选择是否有边框',
         multiple: false,
+        groupKey:'style',
         className: 'input80',
         list: [
           {label: '是', value: 'Y'},
           {label: '否', value: 'N'},
         ]
       },
-      data['is_border'] === 'Y' && {
+      data['list_is_border'] === 'Y' && {
         label: '边框颜色:',
         ele: 'xd-color',
         valueKey: 'list_is_border_c',
         value: data['list_is_border_c'] || '',
         placeholder: '请选择边框颜色',
+        groupKey:'style',
         classNmae: 'input80',
       },
-      data['is_border'] === 'Y' && {
+      data['list_is_border'] === 'Y' && {
         label: '边框大小:',
         ele: 'el-input',
+        groupKey:'style',
         type: 'number',
         valueKey: 'list_is_border_w',
         value: data['list_is_border_w'] || '',
         placeholder: '请输入边框颜色',
         className: 'input80',
       },
+
       {
-        label: '内容圆角设置:',
-        ele: 'xd-site-select-list',
-        valueKey: 'listRadius',
-        value: data['listRadius'] || '',
-        placeholder: '请选择内容圆角设置',
-        multiple: false,
-        className: 'input80',
-        handleCustom({action, data}) {
-          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
-            .then(res => {
-              data.cb(res.list)
-            })
-            .catch(error => {
-              console.error(error);
-            });
-        },
-      },
-      {
-        ele: 'title',
-        label: '其他',
-        size: 'small', //default/mini/small
-      },
-      {
-        label: '商品详情路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'detailPath', //form[valueKey]
+        label: '商品详情路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'detailPath',
         placeholder: '请选择商品详情路径',
         value: data['detailPath'] || null,
+        groupKey:'advanced',
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
-  
         },
-        inline: false,
       },
     ].filter(i=>i)
   },