From c423765d8a5ff0c58d23bb0a31af7df6c1fad95c Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期五, 26 七月 2024 16:10:25 +0800
Subject: [PATCH] 1

---
 src/pages/Register/Register.vue |  129 ++++++++++++++++++++++++------------------
 1 files changed, 74 insertions(+), 55 deletions(-)

diff --git a/src/pages/Register/Register.vue b/src/pages/Register/Register.vue
index 532fc67..0c54605 100644
--- a/src/pages/Register/Register.vue
+++ b/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,21 @@
               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 +245,7 @@
         cellphoneORmailbox: [
           {
             required: true,
-            message: "璇疯緭鍏ユ墜鏈�",
+            message: "璇疯緭鍏ユ墜鏈哄彿/閭",
             trigger: "blur"
           },
           {
@@ -287,26 +296,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 +338,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 +393,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 +831,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;
@@ -852,26 +873,24 @@
   height: 100vh;
 
   color: #fff;
+}
+.container .repository {
+  width: 100% !important;
+  /* margin-top: 19px; */
+  /* height: 68%; */
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+  align-items: center;
+}
+.container .repository .Ttop {
+  margin-top: 0.38rem;
+  margin-bottom: 1.22rem;
+}
 
-  .repository {
-    width: 100% !important;
-    /* margin-top: 19px; */
-    /* height: 68%; */
-    display: flex;
-    flex-direction: column;
-    justify-content: space-around;
-    align-items: center;
-
-    .Ttop {
-      margin-top: 0.38rem;
-      margin-bottom: 1.22rem;
-    }
-
-    .r-top {
-      font-size: 40rpx !important;
-      margin: 10rpx 0;
-    }
-  }
+.container .repository .r-top {
+  font-size: 40rpx !important;
+  margin: 10rpx 0;
 }
 
 .login {
@@ -928,20 +947,20 @@
   padding: 0 20px;
   text-align: center;
 
-  li {
-    background-color: #fff;
-    color: black;
-    height: 600rpx;
-    display: flex;
-    justify-content: space-between;
-    flex-direction: column;
-    align-items: center;
-    border: 1rpx solid #fff;
-    padding: 50rpx 65rpx;
-    /* 			padding: 58rpx 128rpx 88rpx; */
-    text-align: center;
-    background: #ebf4ff;
-  }
+}
+.secretary li {
+  background-color: #fff;
+  color: black;
+  height: 600rpx;
+  display: flex;
+  justify-content: space-between;
+  flex-direction: column;
+  align-items: center;
+  border: 1rpx solid #fff;
+  padding: 50rpx 65rpx;
+  /* 			padding: 58rpx 128rpx 88rpx; */
+  text-align: center;
+  background: #ebf4ff;
 }
 
 .Bbottom {

--
Gitblit v1.9.1