Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary

YM

2024-07-26 fe85e4208e502c78e3494a460617ae8753f51341

 src/pages/Register/Register.vue

@@ -5,8 +5,8 @@
        class="Ttop flex flex-center flex-wrap"
        style="flex-direction: column"
      >
        <view ></view>
        <view  ref="Rtop">
        <view></view>
        <view ref="Rtop">
          <text class="login"></text>
          <text
            style="
@@ -16,7 +16,7 @@
              font-family: cursive;
              font-weight: bold;
            "
            >中国医学人物知识库</text
            >中国历代医学人物知识库</text
          >
        </view>
        <view></view>
@@ -35,7 +35,6 @@
          <!-- <view  style="color: #244A7B;padding-bottom: .47rem;font-size: .3rem;font-weight: bold;">用户注册</view> -->
          <view class="LoginBg"></view>
          <view
            
            @click="BacktoLogin"
            style="
              cursor: pointer;
@@ -74,10 +73,10 @@
              placeholder="必须与密码一致"
            ></el-input>
          </el-form-item>
          <el-form-item label="手机号" prop="cellphoneORmailbox">
          <el-form-item label="手机号/邮箱" prop="cellphoneORmailbox">
            <el-input
              v-model="registerData.cellphoneORmailbox"
              placeholder="请填写正确的手机"
              placeholder="请填写手机号/邮箱"
            ></el-input>
          </el-form-item>
          <el-form-item label="验证码" prop="verifyCode">
@@ -132,11 +131,18 @@
              margin-bottom: 0.19rem;
            "
          >
            <el-checkbox v-model="checked" style="margin-right: 0.06rem;"></el-checkbox>
            用户注册即代表同意
            <span class="cursor" @click="termOfServiceClick(1)"
            <span
              class="cursor"
              style="color: #244a7b"
              @click="termOfServiceClick(1)"
              >《服务条款》</span
            >
            和<span class="cursor" @click="termOfServiceClick(2)"
            和<span
              class="cursor"
              style="color: #244a7b"
              @click="termOfServiceClick(2)"
              >《用户隐私保护和个人信息条款》</span
            >
          </view>
@@ -236,7 +242,7 @@
        cellphoneORmailbox: [
          {
            required: true,
            message: "请输入手机",
            message: "请输入手机号/邮箱",
            trigger: "blur"
          },
          {
@@ -287,26 +293,31 @@
      // 书籍数据
      listData: [
        {
          name: "中医人物数据库",
          name: "历代人物",
          id: 1
        },
        {
          name: "世医医家数据库",
          name: "家学传承",
          id: 2
        },
        {
          name: "中医学术流派",
          name: "学术图谱",
          id: 6
        },
        {
          name: "学术流派",
          id: 3
        },
        {
          name: "中医地域医谱",
          name: "地域图谱",
          id: 4
        },
        {
          name: "中医医事制度",
          id: 5
        }
      ]
        // {
        //   name: "中医医事制度",
        //   id: 5
        // }
      ],
      checked: false
    };
  },
  onLoad() {
@@ -324,9 +335,9 @@
    // 服务条款
    termOfServiceClick(number) {
      if (number == 1) {
        window.open(`#/pages/userAgreement/userAgreement`);
        window.open(`#/pages/userAgreement/userAgreement?type=1`);
      } else if (number == 2) {
        window.open(`#/pages/userAgreement/userAgreement`);
        window.open(`#/pages/userAgreement/userAgreement?type=2`);
      }
    },
    // 已有账号？返回登录
@@ -379,6 +390,13 @@
    },
    // 用户注册
    async Login(formName) {
      if(!this.checked) {
        this.$message({
          message: '请勾选同意服务条款、用户隐私保护和个人信息条款',
          type: 'warning'
        });
        return false;
      }
      let Obj = {
        username: this.registerData.loginID,
        password: encryptAES(this.registerData.pass),
@@ -810,12 +828,12 @@
}

::v-deep .el-form-item__label {
  min-width: 0.6rem;
  min-width: 0.8rem;
  padding: 0;
  color: #244a7b;
  font-size: 0.14rem;
  font-weight: 500;
  margin-right: 0.29rem;
  margin-right: 0.1rem;
  display: flex;
  align-items: center;
  text-align: right;