jufubao-base 1.0.169 → 1.0.170

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -16,58 +16,88 @@
       <view class="jfb-base-login__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-login__body">
+    <view class="jfb-base-login__body" :style="{
+      '--agreement-align': agreementAlign
+    }">
       <view v-if="showStep === 1" class="panel-login-auth">
-        <view class="logo-wrap">
-          <image mode="aspectFit" :src="logo" @click="openDebugger()" />
-          <view :style="{ color: logoTextColor,  }" >{{ partnerName }}</view>
+        <view class="logo-wrap" :style="{
+          height: logoWrapHeight + 'rpx',
+        }">
+          <image :style="logoStyle" mode="heightFix" :src="logo" @click="openDebugger()" />
+          <view v-if="isShowSiteName === 'Y'" :style="{ color: logoTextColor,  }" >{{ partnerName }}</view>
         </view>
-        <view class="login_types">
+        <view class="login_types" :style="authBtnBoxStyle">
           <!--#ifdef H5-->
           <xd-button
             v-if="hasAuthLogin"
             :disabled="!panelIsChecked"
             type="primary"
-            radius="20rpx"
+            :radius="btnRadius + 'rpx'"
             @click="doLoginAuth"
-            >{{h5FastLoginName}}</xd-button>
+            >
+              <!-- 快捷登录 -->
+              <xd-font-icon v-if="authLoginBtnIcon"
+                style="display: inline-flex;margin-right: 12rpx;"
+                :icon="authLoginBtnIcon"
+              ></xd-font-icon>{{h5FastLoginName}}
+            </xd-button>
           <!-- #endif -->
           <!--#ifdef MP-->
           <xd-button
             v-if="hasAuthLogin"
             :disabled="!panelIsChecked"
             type="primary"
-            radius="20rpx"
+            :radius="btnRadius + 'rpx'"
             @click="doWxMpLogin"
-            >快捷登录</xd-button>
+            >
+              <!-- 快捷登录 -->
+              <xd-font-icon v-if="authLoginBtnIcon"
+                style="display: inline-flex;margin-right: 12rpx;"
+                :icon="authLoginBtnIcon"
+              ></xd-font-icon>
+              {{ authLoginBtnText }}
+            </xd-button>
           <!-- #endif -->
           <view class="login-pub">
             <xd-button
               v-if="hasAccountLogin"
               :disabled="!panelIsChecked"
               type="primary"
-              radius="20rpx"
+              :radius="btnRadius + 'rpx'"
               @click="doLoginAccount"
-              >账号登录</xd-button>
-          </view>
-          <view class="protocol">
-            <xd-form-checkbox
-              class="xd-form-checkbox"
-              v-model="panel_1_checked"
-              mode="default"
-              multiple
-              :localdata="[{ value: 1, text: '请阅读并同意《隐私政策》《用户服务协议》' },]"
-            >
-              <template slot="a1">
-                <view class="text-content">
-                  <text>请阅读并同意</text>
-                  <text @click.stop="handlePrivacy('privacy_privacy')" :style="{color: mainColor}">《隐私政策》</text>
-                  <text @click.stop="handlePrivacy('privacy_service')" :style="{color: mainColor}">《用户服务协议》</text>
-                </view>
-              </template>
-            </xd-form-checkbox>
+              >
+                <!-- 账号登录 -->
+                <xd-font-icon v-if="accountLoginBtnIcon"
+                  style="display: inline-flex;margin-right: 12rpx;"
+                  :icon="accountLoginBtnIcon"
+                ></xd-font-icon>
+                {{ accountLoginBtnText }}
+              </xd-button>
           </view>
         </view>
+        <view class="protocol" :style="authAgreementBoxStyle">
+          <xd-form-checkbox
+            class="xd-form-checkbox"
+            v-model="panel_1_checked"
+            mode="default"
+            multiple
+            :localdata="[{ value: 1, text: '请阅读并同意《隐私政策》《用户服务协议》' },]"
+          >
+            <template slot="a1">
+              <view class="text-content" :style="agreeFont">
+                <template v-for="item in agreementTextElement">
+                  <text v-if="item === 'privacy'"
+                    @click.stop="handlePrivacy('privacy_privacy')"
+                    :style="privacyFont">《隐私政策》</text>
+                  <text v-else-if="item === 'service'"
+                    @click.stop="handlePrivacy('privacy_service')"
+                    :style="privacyFont">《用户服务协议》</text>
+                  <text v-else>{{ item }}</text>
+                </template>
+              </view>
+            </template>
+          </xd-form-checkbox>
+        </view>
       </view>
       <view v-if="showStep === 2" class="panel-login-password">
         <view class="phone-login-type">
@@ -86,43 +116,67 @@
             >密码登录<text :style="{ background: mainColor }"></text
           ></view>
         </view>
-        <view style="margin-top: 40rpx">
+        <view style="margin-top: 40rpx" :style="loginFormStyle">
           <xd-form
-            label-width="150"
-            label-align="right"
-            content-align="left"
+            :label-align="labelAlign"
+            :labelPosition="labelPosition"
             :border="true"
-            paddingBetween="40"
+            :key="formRenderKey"
+            paddingBetween="0"
+            :style="{
+              '--form-border-color': formBorderColor,
+              '--form-border-width': formBorderWidth + 'px',
+              '--label-font-size': ($rpxNum * parseInt(labelFont.fontSize)) + 'px',
+              '--label-font-color': labelFont.color,
+              '--label-font-weight': labelFont.fontWeight,
+              '--content-font-size': ($rpxNum * parseInt(contentFont.fontSize)) + 'px',
+              '--content-font-color': contentFont.color,
+              '--content-font-weight': contentFont.fontWeight,
+              '--placeholder-font-size': ($rpxNum * parseInt(placeholderFont.fontSize)) + 'px',
+              '--placeholder-font-color': placeholderFont.color,
+              '--placeholder-font-weight': placeholderFont.fontWeight,
+            }"
           >
-            <xd-form-item class="form-item" label="手机号" :labelWidth="160" content-align="left">
+            <xd-form-item class="form-item"
+              :class="[inputStyle]"
+              label="手机号"
+              :leftIcon="phoneIcon"
+              :labelWidth="labelWidth"
+              content-align="left">
               <xd-form-input
                 v-model="accountForm.phone_number"
-                placeholder="请输入11位手机号"
+                :placeholder="phonePlaceholder"
               />
             </xd-form-item>
             <xd-form-item
               v-if="accountLoginType === 'phone'"
+              class="form-item"
+              :class="[inputStyle]"
               label="验证码"
-              :labelWidth="160"
+              :leftIcon="codeIcon"
+              :labelWidth="labelWidth"
               content-align="left"
             >
               <view class="flex align-center">
                 <xd-form-input
                   v-model="accountForm.verification_code"
-                  placeholder="请输入验证码"
+                  :placeholder="codePlaceholder"
                 />
                 <view
                   class="get_code"
                   @click="reGetCode"
-                  :style="{ color: mainColor }"
+                  :style="getCodeStyle"
                   >{{ time ? time + "秒后获取" : "获取验证码" }}
                 </view>
               </view>
             </xd-form-item>
             <xd-form-item
               v-if="accountLoginType === 'pwd'"
+              class="form-item"
+              :class="[inputStyle]"
               label="密码"
-              :labelWidth="160"
+              :leftIcon="passwordIcon"
+              :labelWidth="labelWidth"
               content-align="left"
             >
               <xd-form-input
@@ -134,7 +188,7 @@
           </xd-form>
         </view>
 
-        <view class="form-group" style="padding-bottom:0">
+        <view class="form-group" :style="agreementBoxStyle">
           <xd-form-checkbox
             class="xd-form-checkbox"
             v-model="panel_2_checked"
@@ -143,22 +197,35 @@
             :localdata="[{ value: 1, text: '登录即同意《隐私政策》《用户服务协议》' },]"
           >
             <template slot="a1">
-              <view class="text-content">
-                <text>请阅读并同意</text>
-                <text @click.stop="handlePrivacy('privacy_privacy')" :style="{color: mainColor}">《隐私政策》</text>
-                <text @click.stop="handlePrivacy('privacy_service')" :style="{color: mainColor}">《用户服务协议》</text>
+              <view class="text-content" :style="agreeFont">
+                <template v-for="item in agreementTextElement">
+                  <text v-if="item === 'privacy'"
+                    @click.stop="handlePrivacy('privacy_privacy')"
+                    :style="privacyFont">《隐私政策》</text>
+                  <text v-else-if="item === 'service'"
+                    @click.stop="handlePrivacy('privacy_service')"
+                    :style="privacyFont">《用户服务协议》</text>
+                  <text v-else>{{ item }}</text>
+                </template>
               </view>
             </template>
           </xd-form-checkbox>
         </view>
-        <view class="form-group">
+        <view class="form-group" :style="btnWrapStyle">
           <xd-button
             style="flex: 1"
             type="primary"
-            radius="10rpx"
+            :radius="btnRadius + 'rpx'"
+            :bg-color="btnColor"
             :disabled="!panelTwoIsChecked"
             @click="doLoginForm"
-            >登录</xd-button
+            >
+              <xd-font-icon v-if="phoneLoginBtnIcon"
+                style="display: inline-flex;margin-right: 12rpx;"
+                :icon="phoneLoginBtnIcon"
+              ></xd-font-icon>
+              {{ phoneLoginBtnText }}
+            </xd-button
           >
         </view>
         <view
@@ -291,6 +358,82 @@ export default {
 
       isFastLoginStatus: false,
       mpAuthPhoneUrl: "",
+
+      previewCurrent: 'auth', //当前预览调试模块，auth:授权登录  account:账号登录
+
+      //logo样式设置
+      logoWrapHeight: 480,
+      logoHeight: 180,
+      logoRadius: 0,
+      isShowSiteName: "Y",
+
+      //协议
+      agreementText: "",
+
+      //按钮
+      authLoginBtnText: "快捷登录",  //授权登录按钮文案
+      authLoginBtnIcon: "", //授权登录按钮图标
+      accountLoginBtnText: "账号登录", //账号登录按钮文案
+      accountLoginBtnIcon: "", //账号登录按钮图标
+      phoneLoginBtnText: "登录", //手机号登录按钮文案
+      phoneLoginBtnIcon: "", //手机号登录按钮图标
+      btnColor: "", //按钮颜色
+      btnRadius: 0, //按钮圆角
+      btnMargin: {},
+
+      phonePlaceholder: "", //手机号登录输入框占位符
+      codePlaceholder: "", //验证码登录输入框占位符
+      getCodeShowType: "text", //获取验证码展示方式
+
+      //表单样式
+      formRenderKey: "formRenderKey",
+      formBgColor: "", //表单背景颜色
+      labelAlign: "left", //表单label对齐方式
+      labelWidth: 160, //表单label宽度
+      labelPosition: "left", //表单label位置
+      formPadding: {
+        top: 0,
+        left: 0,
+        right: 0,
+        bottom: 0
+      },
+      phoneIcon: "", //手机号登录输入框图标
+      codeIcon: "", //验证码登录输入框图标
+      passwordIcon: "", //密码登录输入框图标
+      inputStyle: "linear", //输入框样式 linear:线性  face: 面性
+      formBorderColor: "#F9F9F9", //
+      formBorderWidth: 1, //表单边框宽度
+      labelFont: {  //表单label字体
+        color: "#333",
+        fontSize: "24rpx",
+        fontWeight: "normal",
+      },
+      contentFont: {  //表单内容字体
+        color: "#333",
+        fontSize: "24rpx",
+        fontWeight: "normal",
+      },
+      placeholderFont: {
+        color: "#d4d4d4",
+        fontSize: "24rpx",
+        fontWeight: "normal",
+      },
+      getCodeFont: {
+        color: "#ff5a39",
+        fontSize: "24rpx",
+        fontWeight: "normal",
+      },
+      agreeFont: {},  //条款字体
+      privacyFont: {}, //隐私字体
+      agreementAlign: "center", //条款对齐方式
+      agreePadding: {
+        top: 0,
+        left: 0,
+        right: 0,
+        bottom: 0
+      }, //条款内边距
+      authAgreePadding: {}, //授权登录条款内边距
+      authBtnPadding: {}, //授权登录按钮内边距
     };
   },
   computed: {
@@ -304,6 +447,81 @@ export default {
     prod_bottom() {
       return this.fixedStyle({ height: 0, zIndex: 111 });
     },
+    logoStyle(){
+      return this.styleObjectToString({
+        height: this.logoHeight + 'rpx',
+        borderRadius: this.logoRadius + 'rpx',
+      })
+    },
+    loginFormStyle(){
+      let padding = `${this.checkValue(this.formPadding.top, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.formPadding.right, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.formPadding.bottom, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.formPadding.left, 20)}rpx`;
+
+      return this.styleObjectToString({
+        background: this.formBgColor,
+        padding: padding,
+      })
+    },
+    agreementBoxStyle(){
+      let padding = `${this.checkValue(this.agreePadding.top, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.agreePadding.right, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.agreePadding.bottom, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.agreePadding.left, 20)}rpx`;
+      return this.styleObjectToString({
+        padding: padding,
+      })
+    },
+    authAgreementBoxStyle(){
+      let padding = `${this.checkValue(this.authAgreePadding.top, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.authAgreePadding.right, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.authAgreePadding.bottom, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.authAgreePadding.left, 20)}rpx`;
+      return this.styleObjectToString({
+        padding: padding,
+      })
+    },
+    authBtnBoxStyle(){
+      let padding = `${this.checkValue(this.authBtnPadding.top, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.authBtnPadding.right, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.authBtnPadding.bottom, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.authBtnPadding.left, 20)}rpx`;
+      return this.styleObjectToString({
+        padding: padding,
+      })
+    },
+    btnWrapStyle(){
+      let padding = `${this.checkValue(this.btnMargin.top, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.btnMargin.right, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.btnMargin.bottom, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.btnMargin.left, 20)}rpx`;
+      return this.styleObjectToString({
+        padding: padding,
+      })
+    },
+    getCodeStyle(){
+      return this.styleObjectToString({
+        color: this.getCodeFont.color,
+        borderColor: this.getCodeShowType === 'button' ? this.getCodeFont.color : 'transparent',
+        fontSize: this.getCodeFont.fontSize,
+        fontWeight: this.getCodeFont.fontWeight,
+      })
+    },
+    agreementTextElement(){
+      let agree = this.agreementText;
+      console.log(agree, 'agreementTextElement')
+      if(!agree) return [];
+      let matches = agree.match(/\{\{(\w+)\}\}/g) || [];
+      const keys = matches.map(match => match.slice(2, -2));
+      let eleArr2 = agree.split(/{{\w+}}/);
+      let ele = [];
+      for(let i = 0;i<eleArr2.length;i++){
+        ele.push(eleArr2[i])
+        if(keys[i]) ele.push(keys[i])
+      }
+      return ele.filter(i => i);
+    }
   },
   watch: {
     container(value,oldValue) {
@@ -413,8 +631,57 @@ export default {
       this.error_callback_url = getContainerPropsValue(value, "content.error_url", {value: ''}).value;
       this.mpAuthPhoneUrl = getContainerPropsValue(value, "content.mpAuthPhoneUrl", {value: '/system/login/wxauthorize'}).value;
       this.isPreview = getContainerPropsValue(value, "content.isPreview", 'N');
+      this.logoHeight = getContainerPropsValue(value, "content.logoHeight", '180');
+      this.logoRadius = getContainerPropsValue(value, "content.logoRadius", '0');
+      this.logoWrapHeight = getContainerPropsValue(value, "content.logoWrapHeight", '480');
+      this.isShowSiteName = getContainerPropsValue(value, "content.isShowSiteName", 'Y');
+      this.agreementText = getContainerPropsValue(value, "content.agreementText", '请阅读并同意{{privacy}}{{service}}');
+      this.authLoginBtnText = getContainerPropsValue(value, "content.authLoginBtnText", '快捷登录');
+      this.h5FastLoginName = this.authLoginBtnText;
+      this.authLoginBtnIcon = getContainerPropsValue(value, "content.authLoginBtnIcon", '');
+      this.accountLoginBtnText = getContainerPropsValue(value, "content.accountLoginBtnText", '账号登录');
+      this.accountLoginBtnIcon = getContainerPropsValue(value, "content.accountLoginBtnIcon", '');
+      this.phoneLoginBtnText = getContainerPropsValue(value, "content.phoneLoginBtnText", '登录');
+      this.phoneLoginBtnIcon = getContainerPropsValue(value, "content.phoneLoginBtnIcon", '');
+      this.btnColor = getContainerPropsValue(value, "content.btnColor", '');
+      this.btnRadius = getContainerPropsValue(value, "content.btnRadius", '0');
+      this.btnMargin = getContainerPropsValue(value, "content.btnMargin", {});
+      this.previewCurrent = getContainerPropsValue(value, "content.previewCurrent", 'auth');
+      this.phonePlaceholder = getContainerPropsValue(value, "content.phonePlaceholder", '请输入手机号');
+      this.codePlaceholder = getContainerPropsValue(value, "content.codePlaceholder", '请输入验证码');
+      this.getCodeShowType = getContainerPropsValue(value, "content.getCodeShowType", 'text');
+      this.formBgColor = getContainerPropsValue(value, "content.formBgColor", '#FFFFFF');
+      this.labelAlign = getContainerPropsValue(value, "content.labelAlign", 'left');
+      this.labelWidth = getContainerPropsValue(value, "content.labelWidth", '180');
+      this.labelPosition = getContainerPropsValue(value, "content.labelPosition", 'left');
+      this.formPadding = getContainerPropsValue(value, "content.formPadding", {top: 20, left: 20, right: 20, bottom: 20});
+      this.agreePadding = getContainerPropsValue(value, "content.agreePadding", {});
+      this.authAgreePadding = getContainerPropsValue(value, "content.authAgreePadding", {top: 20, left: 20, right: 20, bottom: 20});
+      this.authBtnPadding = getContainerPropsValue(value, "content.authBtnPadding", {top: 20, left: 20, right: 20, bottom: 20});
+      this.phoneIcon = getContainerPropsValue(value, "content.phoneIcon", '');
+      this.codeIcon = getContainerPropsValue(value, "content.codeIcon", '');
+      this.passwordIcon = getContainerPropsValue(value, "content.passwordIcon", '');
+      this.inputStyle = getContainerPropsValue(value, "content.inputStyle", 'linear');
+      this.formBorderColor = getContainerPropsValue(value, "content.formBorderColor", '#F9F9F9');
+      this.formBorderWidth = getContainerPropsValue(value, "content.formBorderWidth", '1');
+      this.labelFont = getContainerPropsValue(value, "content.labelFont", {});
+      this.contentFont = getContainerPropsValue(value, "content.contentFont", {});
+      this.placeholderFont = getContainerPropsValue(value, "content.placeholderFont", {});
+      this.getCodeFont = getContainerPropsValue(value, "content.getCodeFont", {});
+      this.agreeFont = getContainerPropsValue(value, "content.agreeFont", {});
+      this.privacyFont = getContainerPropsValue(value, "content.privacyFont", {});
+      this.agreementAlign = getContainerPropsValue(value, "content.agreementAlign", 'center');
+      console.log(this.agreePadding, 'this.agreePadding');
+      if(this.inputStyle === 'face'){
+        this.labelPosition = 'top';
+        this.labelAlign = 'left';
+      }
+      if(this.$configProject.isPreview){
+        if(this.previewCurrent === 'account') this.showStep = 2;
+        else this.showStep = 1;
+        this.formRenderKey = Date.now();
+      }
     },
-
     /**
      * @description 获取到登录方式之后处理
      */
@@ -535,6 +802,8 @@ export default {
 
       let { redirect_url, callback_url } = this;
 
+      redirect_url = redirect_url || callback_url || this.$settings.index;
+
       //不同项目直接域名替换
       if (/^(@site_domain@).+$/.test(redirect_url)) {
         redirect_url = redirect_url.replace(/@site_domain@/, location.origin)
@@ -798,22 +1067,23 @@ export default {
 
   &__body {
     .xd-form-checkbox {
-      /deep/ .checklist-content .checklist-text {
+      ::v-deep .checklist-content .checklist-text {
         font-size: 26rpx !important;
       }
     }
     .xd-form-checkbox {
-      /deep/ .checklist-box {
+      ::v-deep .checklist-box {
         margin: 0;
+        align-items: var(--agreement-align);
       }
     }
     .xd-form-checkbox {
-      /deep/ .checklist-group {
+      ::v-deep .checklist-group {
         justify-content: center;
       }
     }
     .xd-form-checkbox {
-      /deep/ .checklist-text {
+      ::v-deep .checklist-text {
         margin-left: unit(20,rpx) !important;
       }
     }
@@ -822,25 +1092,61 @@ export default {
       padding: 40rpx 70rpx;
     }
     .form-item {
-      ::v-deep .uni-forms-item {
+      ::v-deep &.uni-forms-item {
         padding-left: unit(30rpx) !important;
+        .uni-input-input{
+          font-size: var(--content-font-size);
+          color: var(--content-font-color);
+          font-weight: var(--content-font-weight);
+        }
+        .label-text {
+          font-size: var(--label-font-size);
+          color: var(--label-font-color);
+          font-weight: var(--label-font-weight);
+        }
+        .uni-easyinput__placeholder-class{
+          font-size: var(--placeholder-font-size);
+          color: var(--placeholder-font-color);
+          font-weight: var(--placeholder-font-weight);
+        }
+      }
+      &.linear{
+        ::v-deep &.uni-forms-item--border{
+          border-color: var(--form-border-color) !important;
+          border-width: var(--form-border-width) !important;
+        }
+      }
+      &.face{
+        ::v-deep .uni-forms-item__content{
+          background: #F7F7F7;
+          border-radius: 16rpx;
+        }
+        ::v-deep &.uni-forms-item--border{
+          border: none;
+        }
+        
       }
     }
     .get_code {
       color: @xd-base-color;
       font-size: 24rpx;
       margin-right: unit(20,rpx);
+      padding: 10rpx 24rpx;
+      border: 1px solid @xd-base-color;
+      border-radius: 40rpx;
     }
     .panel-login-auth {
-      /deep/ .uni-forms-item__label {
+      ::v-deep .uni-forms-item__label {
         .label-text {
           font-size: 26rpx;
           color: #a6a6a6;
         }
       }
       .logo-wrap {
-        text-align: center;
-        margin: unit(165,rpx) 0;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex-direction: column;
         image {
           width: 180rpx;
           height: 180rpx;
@@ -861,13 +1167,13 @@ export default {
       }
     }
     .panel-login-password {
-      /deep/ .uni-forms-item__label {
+      ::v-deep .uni-forms-item__label {
         .label-text {
           font-size: 26rpx;
           color: #a6a6a6;
         }
       }
-      /deep/ .uni-easyinput__placeholder-class {
+      ::v-deep .uni-easyinput__placeholder-class {
         font-size: 26rpx;
         color: #d4d4d4;
       }
@@ -918,13 +1224,13 @@ export default {
       }
     }
     .panel-forget-password {
-      /deep/ .uni-forms-item__label {
+      ::v-deep .uni-forms-item__label {
         .label-text {
           font-size: 26rpx;
           color: #a6a6a6;
         }
       }
-      /deep/ .uni-easyinput__placeholder-class {
+      ::v-deep .uni-easyinput__placeholder-class {
         font-size: 26rpx;
         color: #d4d4d4;
       }
@@ -945,14 +1251,14 @@ export default {
       }
     }
     .panel-reset-password {
-      /deep/ .uni-forms-item__label {
+      ::v-deep .uni-forms-item__label {
         width: 185rpx !important;
         .label-text {
           font-size: 26rpx;
           color: #a6a6a6;
         }
       }
-      /deep/ .uni-easyinput__placeholder-class {
+      ::v-deep .uni-easyinput__placeholder-class {
         font-size: 26rpx;
         color: #d4d4d4;
       }
@@ -1014,7 +1320,7 @@ export default {
 }
 
 /* #ifdef MP-WEIXIN */
-/deep/ .xd-form-checkbox .checklist-group {
+::v-deep .xd-form-checkbox .checklist-group {
   justify-content: center;
   display: flex;
   align-items: center;

package/src/components/JfbBaseMapSearch/MapSearchMp.vue

@@ -46,7 +46,7 @@
 			this.BMap = new bmap.BMapWX({
 				ak: this.ak
 			})
-			uni.getLocation({
+			wx.getFuzzyLocation({
 				type: "gcj08",
 				success: res => {
 					console.log("getLocation", res);

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -14,7 +14,7 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-notice__body">
-      <view class="jfb-base-notice__body-line"></view>
+      <view class="jfb-base-notice__body-line" v-if="contentList.length > 0"></view>
       <view>
         <template v-if="style === '3' && isPreview">
           <view class="jfb-base-notice__body-pop" :style="{backgroundColor:backgroundColor, color:warningColor}">弹窗模式方便编辑(占位)，在线上此模块不显</view>
@@ -23,7 +23,7 @@
           <template v-if="contentList.length === 0 && isPreview">
             <view class="jfb-base-notice__body-pop" :style="{backgroundColor:backgroundColor, color:warningColor}">接口无数返回，请检查是否配置成功!</view>
           </template>
-          <view v-else class="jfb-base-notice__body-scroll">
+          <view v-if="contentList.length > 0" class="jfb-base-notice__body-scroll">
             <view
               class="upAndDown"
               :style="{