jufubao-base 1.0.132 → 1.0.134-beta1

package/src/components/JfbBaseLogin/Attr.js

@@ -4,97 +4,12 @@ export default {
   style: [],
   advanced: [],
   content: [
-    {
-      label: 'LOGO文字颜色:',
-      ele: 'xd-color',
-      valueKey: 'logoTextColor',
-      value: '',
-      placeholder: '请输入LOGO文字颜色',
-      classNmae: 'input80',
-    },
-    {
-      label: '是否使用体验码功能:',
-      ele: 'xd-radio',
-      valueKey: 'isPreview',
-      value: 'N',
-      placeholder: '请选择是否使用体验码功能',
-      multiple: false,
-      className: 'input80',
-      list: [
-        {label: '是', value: 'Y'},
-        {label: '否', value: 'N'},
-      ]
-    },
-    {
-      ele: 'title',
-      label: '页面连接设置',
-      size: 'small',
-    },
-    {
-      label: '快速授权失败访问地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'error_url', //form[valueKey]
-      placeholder: '请选择快速授权失败访问地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
-    {
-      label: '登录成功跳转地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'callback_url', //form[valueKey]
-      placeholder: '请选择登录成功跳转地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
-    {
-      label: '手机号登录地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'phone_number_login_url', //form[valueKey]
-      placeholder: '请选择手机号登录地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
-    {
-      label: '收集手机号地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'phone_number_collect_url', //form[valueKey]
-      placeholder: '请选择收集手机号地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
-    {
-      label: '忘记密码跳转地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'forget_pwd_url', //form[valueKey]
-      placeholder: '请选择跳转地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
-    {
-      ele: 'title',
-      label: '服务设置',
-      size: 'small',
-    },
     {
       label: '隐私政策:',
       ele: 'xd-site-news',
       valueKey: 'notice',
       value: {type: 'privacy'},
+      groupKey:'content',
       className: 'input70',
       setting: {
         type: 'privacy',
@@ -115,7 +30,8 @@ export default {
         }
 
         //获取返回参数(场景类型名称为必填)
-        let loading = XdBus.getParentApi('loading')({});
+        //获取返回参数(场景类型名称为必填)
+        let loading = { close(){}}
 
         //获取显示内容
         if (action === 'screen') {
@@ -159,6 +75,7 @@ export default {
 
         //使用内容分类
         if (action === 'cmsPublishEditxContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('cmsPublishEditxContent')(data.params)
             .then(res => {
               console.log('cmsPublishEditxContent', res)
@@ -173,6 +90,7 @@ export default {
 
         //位置列表
         if (action === 'getListPostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getListNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -186,6 +104,7 @@ export default {
 
         //位置创建
         if (action === 'addPostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('addNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -200,6 +119,7 @@ export default {
 
         //位置编辑
         if (action === 'editPostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('updateNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -214,6 +134,7 @@ export default {
 
         //位置删除
         if (action === 'deleltePostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('deleteNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -228,6 +149,7 @@ export default {
 
         //获取广告位内容列表
         if (action === 'getListContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getListNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -241,6 +163,7 @@ export default {
 
         //广告内容创建
         if (action === 'addContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('addNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -255,6 +178,7 @@ export default {
 
         //广告内容编辑
         if (action === 'editContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('updateNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -269,6 +193,7 @@ export default {
 
         //广告内容删除
         if (action === 'deleteContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('deleteNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -283,6 +208,7 @@ export default {
 
         //内容发布
         if (action === 'publish') {
+          loading = XdBus.getParentApi('loading')({});
           console.log('publish', data.params)
           XdBus.getParentApi('cmsPublishContent')(data.params)
             .then(res => {
@@ -297,6 +223,7 @@ export default {
 
         //通知页面进行刷新
         if (action === 'update') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
           loading.close()
         }
@@ -308,6 +235,7 @@ export default {
       label: '用户服务协议:',
       ele: 'xd-site-news',
       valueKey: 'notices',
+      groupKey:'content',
       value: {type: 'privacy'},
       className: 'input70',
       setting: {
@@ -328,7 +256,7 @@ export default {
         }
 
         //获取返回参数(场景类型名称为必填)
-        let loading = XdBus.getParentApi('loading')({});
+        let loading = { close(){}}
 
         //获取显示内容
         if (action === 'screen') {
@@ -372,6 +300,7 @@ export default {
 
         //使用内容分类
         if (action === 'cmsPublishEditxContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('cmsPublishEditxContent')(data.params)
             .then(res => {
               console.log('cmsPublishEditxContent', res)
@@ -386,6 +315,7 @@ export default {
 
         //位置列表
         if (action === 'getListPostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getListNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -399,6 +329,7 @@ export default {
 
         //位置创建
         if (action === 'addPostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('addNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -413,6 +344,7 @@ export default {
 
         //位置编辑
         if (action === 'editPostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('updateNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -427,6 +359,7 @@ export default {
 
         //位置删除
         if (action === 'deleltePostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('deleteNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -441,6 +374,7 @@ export default {
 
         //获取广告位内容列表
         if (action === 'getListContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getListNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -454,6 +388,7 @@ export default {
 
         //广告内容创建
         if (action === 'addContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('addNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -468,6 +403,7 @@ export default {
 
         //广告内容编辑
         if (action === 'editContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('updateNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -482,6 +418,7 @@ export default {
 
         //广告内容删除
         if (action === 'deleteContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('deleteNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -496,6 +433,7 @@ export default {
 
         //内容发布
         if (action === 'publish') {
+          loading = XdBus.getParentApi('loading')({});
           console.log('publish', data.params)
           XdBus.getParentApi('cmsPublishContent')(data.params)
             .then(res => {
@@ -510,6 +448,7 @@ export default {
 
         //通知页面进行刷新
         if (action === 'update') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
           loading.close()
         }
@@ -517,5 +456,89 @@ export default {
       inline: false,
       notice: '',
     },
+    {
+      label: '是否使用体验码功能:',
+      ele: 'xd-radio',
+      valueKey: 'isPreview',
+      groupKey:'content',
+      value: 'N',
+      placeholder: '请选择是否使用体验码功能',
+      multiple: false,
+      className: 'input80',
+      list: [
+        {label: '是', value: 'Y'},
+        {label: '否', value: 'N'},
+      ]
+    },
+    {
+      label: '站点名称颜色:',
+      ele: 'xd-color',
+      valueKey: 'logoTextColor',
+      groupKey:'style',
+      value: '',
+      placeholder: '请选择站点名称颜色',
+      classNmae: 'input60',
+    },
+    {
+      label: '快速授权失败访问地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'error_url', //form[valueKey]
+      groupKey:'advanced',
+      placeholder: '请选择快速授权失败访问地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
+    {
+      label: '登录成功跳转地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'callback_url', //form[valueKey]
+      groupKey:'advanced',
+      placeholder: '请选择登录成功跳转地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
+    {
+      label: '手机号登录地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'phone_number_login_url', //form[valueKey]
+      groupKey:'advanced',
+      placeholder: '请选择手机号登录地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
+    {
+      label: '收集手机号地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'phone_number_collect_url', //form[valueKey]
+      groupKey:'advanced',
+      placeholder: '请选择收集手机号地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
+    {
+      label: '忘记密码跳转地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'forget_pwd_url', //form[valueKey]
+      groupKey:'advanced',
+      placeholder: '请选择跳转地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
+
   ]
 }

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -417,7 +417,7 @@ export default {
     },
 
     /**
-     * @description 获取到登陆方式之后处理
+     * @description 获取到登录方式之后处理
      */
     handleAuthResult(res) {
       if (res.quick_enabled) {
@@ -438,7 +438,7 @@ export default {
     },
 
     /**
-     * @description 微信获取登陆方式
+     * @description 微信获取登录方式
      */
     authWxMpListProviders() {
       let providers = this.projectAttr["login_providers"] || [
@@ -492,7 +492,7 @@ export default {
                   url: `/system/login/wxauthorize?auth_code=${res.auth_code}&provider_id=${this.quickLogin.provider_id}&url=${url}`,
                 });
               }
-              //无需授权直接进行登陆
+              //无需授权直接进行登录
               else {
                 if (this.jfbAuthorize !== null) {
                   this.jfbAuthorize.setAllToken(res["login_info"], () => {
@@ -515,7 +515,7 @@ export default {
     },
 
     /**
-     * @description h5获取登陆方式
+     * @description h5获取登录方式
      */
     authH5ListProviders() {
       this.$xdLog.setProject('JfbBaseLogin', 'JfbBaseLogin.onJfbLoad.loading.')
@@ -736,7 +736,6 @@ export default {
 @import "./JfbBaseLoginLess.less";
 
 .jfb-base-login {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
 
   &__body {

package/src/components/JfbBaseLogin/JfbBaseLoginLess.less

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

package/src/components/JfbBaseLoginForgetPwd/Attr.js

@@ -3,52 +3,59 @@
 export default {
   style: [],
   advanced: [],
-  content: [
-    {
-      label: '客服热线:', //label
-      ele: 'el-input', //package 名称
-      type: 'text',
-      valueKey: 'tell_hot', //form[valueKey]
-      value: '', //v-model
-      placeholder: '请输入客服电话号码',
-      classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-      rules: [
-        {
-          required: true,
-          message: '请输入客服电话号码',
-          trigger: 'blur'
-        },
-        {
-          validator: (rule, value, callback) => {
-            value = value.trim();
-            if (value.length > 15) callback('请输入正确的联系方式');
-            else callback()
+  content(data){
+    let showHotLine = 'N';
+    if(data.showHotLine) showHotLine = data.showHotLine;
+    return [
+      {
+        label: "是否弹出客服热线提示:",
+        ele: "xd-radio",
+        valueKey: "showHotLine",
+        groupKey: 'content',
+        value: showHotLine,
+        list: [
+          {label: "是", value: "Y"},
+          {label: "否", value: "N"}
+        ]
+      },
+      showHotLine === 'Y' && {
+        label: '客服热线:',
+        ele: 'el-input',
+        type: 'text',
+        groupKey: 'content',
+        valueKey: 'tell_hot',
+        value: data['tell_hot'],
+        placeholder: '请输入客服电话号码',
+        classNmae: 'input80',
+        rules: [
+          {
+            required: true,
+            message: '请输入客服电话号码',
+            trigger: 'blur'
           },
-          trigger: 'blur'
-        }
+          {
+            validator: (rule, value, callback) => {
+              value = value.trim();
+              if (value.length > 15) callback('请输入正确的联系方式');
+              else callback()
+            },
+            trigger: 'blur'
+          }
 
-      ]
-    },
-    {
-      label: '重新设置密码地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'reset_pwd_url', //form[valueKey]
-      placeholder: '请选择跳转地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
+        ]
+      },
+      {
+        label: '重新设置密码地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'reset_pwd_url',
+        groupKey: 'advanced',
+        placeholder: '请选择跳转地址',
+        value: data.reset_pwd_url || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
       },
-      inline: false,
-    },
-    {
-      label: "是否弹出客服热线提示:",
-      ele: "xd-radio",
-      valueKey: "showHotLine",
-      value: "N",
-      list: [
-        {label: "是", value: "Y"},
-        {label: "否", value: "N"}
-      ]
-    }
-  ],
+    ].filter(i=>i);
+  }
 }

package/src/components/JfbBaseLoginForgetPwd/JfbBaseLoginForgetPwd.vue

@@ -62,14 +62,16 @@
           >
         </view>
         <xd-dailog :show.sync="showHotLine" :cancel="false" :confirm="false"  :showClose="false" title="温馨提示">
-          <view>亲爱的用户，为了您的账户安全请联系管理员，或拨打客服热线</view>
-            <view class="contact_phone">{{ tell_hot }}</view>
+          <view class="phone">
+            <view>亲爱的用户，为了您的账户安全请联系管理员，或拨打客服热线</view>
+            <view class="contact_phone" :style="{color:mainColor}">{{ tell_hot }}</view>
             <xd-button
               type="primary"
               :bgColor="mainColor"
               style="width: 360rpx;margin-top: 30rpx;"
               @click="showHotLine=false"
             >知道了</xd-button>
+          </view>
         </xd-dailog>
       </view>
     </view>
@@ -203,18 +205,6 @@ export default {
         });
       });
     },
-    // onJfbScroll(options) {
-    //   console.log('event.onJfbScroll', options)
-    // },
-    // onJfbReachBottom(options) {
-    //   console.log('event.onJfbReachBottom', options)
-    // },
-    // onJfbShow(options) {
-    //   console.log('event.onJfbShow', options)
-    // },
-    // onJfbHide(options) {
-    //   console.log('event.onJfbHide', options)
-    // },
     onJfbBack(options) {
       this.$xdUniHelper.navigateBack();
     },
@@ -255,7 +245,17 @@ export default {
       }
 
     }
+    .phone {
+      .contact_phone {
+        padding-top: 20rpx;
+        font-size: 36rpx;
+        font-weight: 500;
+      }
+    }
   }
+
+
+
 }
 .flex {
   display: flex;