jufubao-base 1.0.131 → 1.0.132-beta2

package/src/components/JfbBaseSearch/JfbBaseSearchLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-search {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
+  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +22,21 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    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-base-search {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseSetPwd/Attr.js

@@ -1,150 +1,9 @@
 'use strict';
 
-export default [
-  //文本信息
-  {
-    label: '标题名称:', //label
-    ele: 'el-input', //package 名称
-    type: 'text',
-    valueKey: 'title', //form[valueKey]
-    value: '', //v-model
-    placeholder: '请输入标题名称',
-    classNmae: 'input40', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-    disabled: true,
-    rules: [
-      {
-        required: true,
-        type: 'url',
-        message: '请输入域名地址',
-        trigger: 'blur'
-      },
-    ]
-  },
+export default {
+  style: [],
+  advanced: [],
+  content: [
 
-  //远程获取内容选择
-  {
-    label: '跳转路径:', //label
-    ele: 'xd-select-list', //package 名称
-    valueKey: 'jumpToLink', //form[valueKey]
-    value: '', //v-model
-    placeholder: '请选择加盟商',
-    multiple: false, //多选
-    collapseTags: false,
-    remoteApi: '/api/editx/pages',
-    remote: true,
-  },
-
-  //本地固定内容选择
-  {
-    label: '选择内容:', //label
-    ele: 'xd-select-list', //package 名称
-    valueKey: 'select', //form[valueKey]
-    value: '', //v-model
-    placeholder: '请选择选择内容',
-    multiple: false, //多选
-    remote: false,
-    list: [
-      {"label": "订单详情", "value": '/main/order/order'},
-      {"label": "购物车详情", "value": '/main/cart/cart'},
-      {"label": "商品详情", "value": '/main/product/product'},
-      {"label": "商品分类", "value": '/main/producttype/producttype'},
-    ],
-  },
-
-  //本地固定单选选择
-  {
-    label: '单选列表（固定）:', //label
-    ele: 'xd-radio', //package 名称
-    valueKey: 'radio_status_list', //form[valueKey]
-    value: 6, //v-model
-    disabled: true,
-    rules: [
-      {required: true, message: '请选择', trigger: ['blur', 'change']}
-    ],
-    list: [
-      {"label": "万利达集团", "value": 4},
-      {"label": "中国联通", "value": 5},
-      {"label": "中国移动", "value": 6},
-      {"label": "味多美", "value": 7},
-    ]
-  },
-
-  //远程固定单选选择
-  {
-    label: '单选列表（固定）:', //label
-    ele: 'xd-radio', //package 名称
-    valueKey: 'radio_status_list', //form[valueKey]
-    value: 6, //v-model
-    disabled: false,
-    remoteApi: '/api/editx/pages',
-    remote: true,
-    rules: [
-      {required: true, message: '请选择', trigger: ['blur', 'change']}
-    ],
-  },
-
-  //本地固定多选选择
-  {
-    label: '多选列表（固定）:', //label
-    ele: 'xd-check', //package 名称
-    valueKey: 'xd-check_list', //form[valueKey]
-    value: 6, //v-model
-    disabled: true,
-    rules: [
-      {required: true, message: '请选择', trigger: ['blur', 'change']}
-    ],
-    list: [
-      {"label": "万利达集团", "value": 4},
-      {"label": "中国联通", "value": 5},
-      {"label": "中国移动", "value": 6},
-      {"label": "味多美", "value": 7},
-    ]
-  },
-
-  //远程多选选选择
-  {
-    label: '多选列表:', //label
-    ele: 'xd-check', //package 名称
-    valueKey: 'xd-check_remote-list', //form[valueKey]
-    value: 6, //v-model
-    disabled: false,
-    remoteApi: '/api/editx/pages',
-    remote: true,
-    rules: [
-      {required: true, message: '请选择', trigger: ['blur', 'change']}
-    ],
-  },
-
-  //状态(二选一)单选选择
-  {
-    label: '状态(二选一):', //label
-    ele: 'xd-radio-status', //package 名称
-    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=>审核
-  },
-
-  //文本信息
-  {
-    label: '标题名称:', //label
-    ele: 'el-input', //package 名称
-    type: 'text',
-    valueKey: 'title', //form[valueKey]
-    value: '', //v-model
-    placeholder: '请输入标题名称',
-    classNmae: 'input40', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-    disabled: true,
-    rules: [
-      {
-        required: true,
-        type: 'url',
-        message: '请输入域名地址',
-        trigger: 'blur'
-      },
-    ]
-  },
-]
+  ],
+}

package/src/components/JfbBaseSetPwd/JfbBaseSetPwdLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-set-pwd {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
+  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +22,21 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    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-base-set-pwd {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseSuccess/Attr.js

@@ -1,6 +1,11 @@
 'use strict';
 import StyleForm from "@/utils/StyleForm";
-let styleForm = new StyleForm({border: null, shadow: null, spacing: '',  bgColor:'',  margin: null,radius:null}, null, 'list');
+let styleForm = new StyleForm(
+  {border: null, shadow: null, spacing: '',  margin: null,radius:null},
+  null,
+  'list',
+  true
+);
 export default {
   style: [],
   content: (data)=>{
@@ -10,24 +15,16 @@ export default {
         ele: 'el-input',
         type: 'text',
         valueKey: 'custom_btn_name',
+        groupKey:'content',
         value: data['custom_btn_name'] || '',
         placeholder: '请输入自定义按钮名称',
         className: 'input80'
       },
-      {
-        "label": "自定义按钮跳转地址:",
-        "ele": "xd-select-pages-path",
-        "valueKey": "custom_btn_path",
-        "value": data['custom_btn_path'] || null,
-        "setting": {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        "inline": false,
-      },
       {
         label: '是否显示码:',
         ele: 'xd-radio',
         valueKey: 'is_show_code',
+        groupKey:'content',
         value:data['is_show_code']|| '',
         placeholder: '请选择',
         list: [
@@ -39,6 +36,7 @@ export default {
         label: '是否显示商品:',
         ele: 'xd-radio',
         valueKey: 'is_show_product',
+        groupKey:'content',
         value:data['is_show_product']|| '',
         placeholder: '请选择',
         list: [
@@ -47,8 +45,9 @@ export default {
         ],
       },
       {
-        label: '自定义内容:',
+        label: '温馨提示配置:',
         ele: 'xd-site-news',
+        groupKey:'content',
         valueKey: 'notice',
         value: data['notice'] || null,
         className: 'input70',
@@ -70,11 +69,12 @@ export default {
           }
 
           //获取返回参数(场景类型名称为必填)
-          let loading = XdBus.getParentApi('loading')({});
+          //获取返回参数(场景类型名称为必填)
+          let loading = { close(){}}
 
           //获取显示内容
           if (action === 'screen') {
-            XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_bucket_content_tip' })
+            XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_bucket_content_tip'})
               .then(res => {
                 loading.close();
                 data.cb(res['list'])
@@ -91,7 +91,7 @@ export default {
             XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
               .then(res => {
                 loading.close()
-                data.cb({ list: res.list, selectId: res.selected })
+                data.cb({list: res.list, selectId: res.selected})
               })
               .catch(error => {
                 loading.close()
@@ -114,6 +114,7 @@ export default {
 
           //使用内容分类
           if (action === 'cmsPublishEditxContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('cmsPublishEditxContent')(data.params)
               .then(res => {
                 console.log('cmsPublishEditxContent', res)
@@ -128,6 +129,7 @@ export default {
 
           //位置列表
           if (action === 'getListPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -141,6 +143,7 @@ export default {
 
           //位置创建
           if (action === 'addPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -155,6 +158,7 @@ export default {
 
           //位置编辑
           if (action === 'editPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -169,6 +173,7 @@ export default {
 
           //位置删除
           if (action === 'deleltePostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -183,6 +188,7 @@ export default {
 
           //获取广告位内容列表
           if (action === 'getListContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -196,6 +202,7 @@ export default {
 
           //广告内容创建
           if (action === 'addContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -210,6 +217,7 @@ export default {
 
           //广告内容编辑
           if (action === 'editContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -224,6 +232,7 @@ export default {
 
           //广告内容删除
           if (action === 'deleteContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -238,6 +247,7 @@ export default {
 
           //内容发布
           if (action === 'publish') {
+            loading = XdBus.getParentApi('loading')({});
             console.log('publish', data.params)
             XdBus.getParentApi('cmsPublishContent')(data.params)
               .then(res => {
@@ -252,14 +262,65 @@ export default {
 
           //通知页面进行刷新
           if (action === 'update') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
             loading.close()
           }
         },
         inline: false,
-        notice: '',
+        notice: '温馨提示内容配置选用后(组件预览将不做实时生效处理)，将根据不同业务线展示对应提示内容。',
+      },
+      {
+        label: '背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'listBgColor',
+        groupKey:'style',
+        value: data.listBgColor || '',
+        placeholder: '请选择背景颜色',
+        classNmae: 'input80',
+      },
+      ...styleForm.getForm(data, '二维码样式配置'),
+      {
+        ele: 'title',
+        label: '按钮样式设置',
+        size: 'small',
+        groupKey:'style',
+      },
+      {
+        label: '边框颜色:',
+        ele: 'xd-color',
+        valueKey: 'btnBorderColor',
+        groupKey:'style',
+        value: data['btnBorderColor'] || '',
+        classNmae: 'input80',
+      },
+      {
+        label: '背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'btnBgColor',
+        groupKey:'style',
+        value: data.btnBgColor || '',
+        classNmae: 'input80',
+      },
+      {
+        label: '文字颜色:',
+        ele: 'xd-color',
+        valueKey: 'btnTextColor',
+        groupKey:'style',
+        value: data.btnTextColor || '',
+        classNmae: 'input80',
+      },
+      {
+        "label": "自定义按钮跳转地址:",
+        "ele": "xd-select-pages-path",
+        "valueKey": "custom_btn_path",
+        "value": data['custom_btn_path'] || null,
+        "groupKey":'advanced',
+        "setting": {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        "inline": false,
       },
-      ...styleForm.getForm(data, '内容配置')
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -105,7 +105,9 @@
                     ></image>
                     <image v-if="info.codes[0].logo&&info.codes[0].show_type === 'qrcode'" class="logo-icon" :src="info.codes[0].logo"></image>
                   </view>
-                <view class="jfb-base-success__body-cashier-text">{{ info.codes[0].can_read_code }}</view>
+                <view v-if="info.codes[0].can_read_password" class="jfb-base-success__body-cashier-password" @click="showPassword = true">
+                  {{ showPassword ? info.codes[0].can_read_code : "查看密码" }}
+                </view>
                 <view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">{{info.codes[0].refund_tip_text}}</view>
                 <view
                   v-if="info.codes[0].code_end_time"
@@ -202,13 +204,14 @@
                     v-if="item.show_type === 'qrcode'"
                   >
                     <view class="jfb-base-success__body-num">
-                      <view class="jfb-base-success__body-num-info">
+                      <!-- <view class="jfb-base-success__body-num-info">
                         <view>{{ item.can_read_code }}</view>
-                      </view>
+                      </view> -->
                       <view
                         class="jfb-base-success__body-num-info-copy"
+                        style="margin-top: 0;"
                         @click="handleShowCode(item)"
-                      >查看二维码</view>
+                      >查看二维码和密码</view>
                       <view
                         v-if="item['code_end_time']"
                         class="jfb-base-success__body-cashier-code"
@@ -329,6 +332,9 @@
           </image>
         </view>
       </view>
+      <view v-if="dialogPassword" class="jfb-base-success__body-d_password">
+        {{ dialogPassword }}
+      </view>
     </xd-dailog>
   </view>
 </template>
@@ -398,6 +404,7 @@ export default {
       info: null,
       timeer: null,
       noUserLoding:null,
+      showPassword: false,
 
       //请求参数
       params: null,
@@ -405,6 +412,7 @@ export default {
       showCode: false,
       codeSrc: "",
       logo: "",
+      dialogPassword: "",
       ...styleForm.getDataItem(),
     };
   },
@@ -447,6 +455,7 @@ export default {
       this.codeSrc = item.code_url;
       this.showType = item.show_type;
       this.logo = item.logo;
+      this.dialogPassword = item.can_read_code;
       this.showCode = true;
     },
     /**
@@ -790,6 +799,14 @@ export default {
         font-size: unit(32, rpx);
         font-weight: 500;
       }
+      &-password{
+        text-align: center;
+        font-size: unit(32, rpx);
+        font-weight: 500;
+        background: #D3D3D3;
+        border-radius: unit(12, rpx);
+        padding: unit(14, rpx) unit(28, rpx);
+      }
 
       image {
         width: unit(272, rpx);
@@ -841,6 +858,14 @@ export default {
         max-width: 100%;
       }
     }
+    &-d_password{
+      text-align: center;
+      font-size: unit(32, rpx);
+      font-weight: 500;
+      background: #D3D3D3;
+      border-radius: unit(12, rpx);
+      padding: unit(14, rpx) unit(28, rpx);
+    }
 
     &-detail {
       &-html {

package/src/components/JfbBaseSuccess/JfbBaseSuccessLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-success {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
+  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +22,21 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    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-base-success {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/