Merge remote-tracking branch 'origin/master'

k94314517

2024-12-06 3ac695aaee5aab01d8cb39a56388c2740913dbec

 h5/pages/staffLogin/login.vue

@@ -1,20 +1,20 @@
<template>
  <view class="login">
    <image class="login_bg" src="@/static/login_bg@2x.png" />
    <image class="login_bg" src="@/static/login_bg@2x.png" mode="widthFix" />
    <image class="login_logo" src="@/static/logo@2x.png" mode="widthFix" />
    <view class="login_title">安泰物流智慧园区</view>
    <view class="login_list">
      <view class="login_list_item">
        <image src="@/static/login_ic_phone@2x.png" mode="widthFix" />
        <input v-model="form.username" maxlength="18" placeholder="账号" />
        <input v-model="form.username" maxlength="18" @focus="showKeyboard = true" @blur="showKeyboard = false" placeholder="账号" />
      </view>
      <view class="login_list_item">
        <image src="@/static/login_ic_password@2x.png" mode="widthFix" />
        <input v-model="form.password" type="password" placeholder="密码" />
        <input v-model="form.password" @focus="showKeyboard = true" @blur="showKeyboard = false" type="password" placeholder="密码" />
      </view>
      <view class="login_list_item">
        <image src="@/static/ic_captcha.png" mode="widthFix"></image>
        <input v-model="form.code" placeholder="验证码" type="text" />
        <input v-model="form.code" @focus="showKeyboard = true" @blur="showKeyboard = false" placeholder="验证码" type="text" />
        <image
          @click="initCaptcha"
          :src="captcha.image"
@@ -30,7 +30,7 @@
      >
    </view>

    <view class="deal_wrap">
    <view class="deal_wrap" v-show="!showKeyboard">
      <image
        @click="changeFalg"
        v-if="ProtocolFlag"
@@ -56,7 +56,8 @@
      mode="center"
    >
      <view class="modal">
        <view v-html="htmlText"></view>
        <!-- <view v-html="htmlText"></view> -->
            <mp-html :content="htmlText" />
      </view>
    </u-popup>
  </view>
@@ -76,6 +77,7 @@
        password: '',
            code: ''
      },
         showKeyboard: false,
      isShowProtocol: false,
      ProtocolFlag: false,
      captcha: {},
@@ -136,7 +138,7 @@
      loginPost({
        ...form,
        uuid: this.captcha.uuid,
        openId: this.$store.state.openId
        openid: this.$store.state.openId
      }).then(res => {
        if (res.code === 200) {
          this.setToken(res.data)
@@ -156,7 +158,6 @@
<style lang="scss" scoped>
.login {
  width: 100%;
  height: 100vh;
  display: flex;
  padding-top: 130rpx;
  box-sizing: border-box;
@@ -172,9 +173,11 @@
    height: 180rpx;
  }
  .login_bg {
    position: absolute;
    top: 0;
    width: 750rpx;
     position: absolute;
     top: 0;
     left: 0;
     width: 100%;
     z-index: -1;
  }
  .login_title {
    font-size: 44rpx;
@@ -244,11 +247,11 @@
    }
  }
  .deal_wrap {
    position: absolute;
    position: fixed;
    width: 100%;
    left: 0;
    text-align: center;
    bottom: 88rpx;
    bottom: 48rpx;
    display: flex;
    justify-content: center;
    align-items: center;
@@ -263,9 +266,10 @@
}
.modal {
  width: 690rpx;
  min-height: 920rpx;
  min-height: 820rpx;
  max-height: 720px;
  border-radius: 24rpx;
  padding: 32rpx;
   overflow: auto;
}
</style>