From 5058d7d35c0cec6a5d28eac7ab19b52a59f786e8 Mon Sep 17 00:00:00 2001
From: zsk <710162063@qq.com>
Date: Mon, 11 Mar 2024 11:22:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/common.js          |  4 ++--
 src/utils/request.js         | 11 +----------
 src/views/homePage/index.vue |  3 ++-
 src/views/login.vue          | 13 ++++++-------
 4 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/utils/common.js b/src/utils/common.js
index 54c57ed..606736e 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -997,9 +997,9 @@ let data = {
         console.log(window.location.href);
       } else {
         if (window.location.origin.indexOf('www') > -1) {
-          window.location.href = 'http://www.ibocai.cn/#/' + url;
+          window.location.href = 'https://a.matripe.com.cn/stock/index.html#/' + url;
         } else {
-          window.location.href = 'http://ibocai.cn/#/' + url
+          window.location.href = 'https://a.matripe.com.cn/stock/index.html#/' + url
         }
       };
     } else if (url == "boundtel") {// 前台特殊处理
diff --git a/src/utils/request.js b/src/utils/request.js
index 0c96b56..420fc7c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -91,16 +91,7 @@ service.interceptors.response.use(
       if (response.data.code === 200) {
         return response.data;
       } else {
-        if (response.config.url == "/yishoudan/agency/getCreatorTel") {
-          return {
-            data: {
-              tel: 1,
-              telEncrypt: 1
-            }
-          };
-        } else {
-          message.error(response.data.msg);
-        }
+        message.error(response.data.message);
         return Promise.reject(new Error(msg));
       }
     } else {
diff --git a/src/views/homePage/index.vue b/src/views/homePage/index.vue
index 3b32f23..dca2d95 100644
--- a/src/views/homePage/index.vue
+++ b/src/views/homePage/index.vue
@@ -8,7 +8,7 @@
 				</div>
 			</div>
 			<div>
-				<a-button type="primary" @click="openAdd" :icon="h(PlusOutlined)">导入用户</a-button>
+				<a-button type="primary" @click="openAdd" :icon="h(PlusOutlined)">新增用户</a-button>
 				<!-- <a-button type="" class="g_border_d g_ml_16" @click="handleToForm('add', { id: 0 })" :icon="h(DownloadOutlined)">导出模版</a-button> -->
 				<!-- 
         <a-dropdown :trigger="['click']">
@@ -212,6 +212,7 @@ const submitForm = ()=>{
 
 
   if(modalInfo.value.id){
+      delete params.password;
       updateUserApi(params).then((res)=>{
       showAdd.value = false;
       message.success("修改成功");
diff --git a/src/views/login.vue b/src/views/login.vue
index 2298e0b..6b39b5c 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -9,8 +9,8 @@
 						<img src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/ibocai/loginLogo.svg" style="width: 74px; text-align: center" alt />
 					</div>
 					<ul class="loginchange centerall g_flex_row_center g_mt_30 g_mb_24">
-						<li class="g_pb_4 g_fs_14 g_fw_600 g_mr_52" :class="{ loginactive: loginType === 1 }" @click="loginType = 1">密码登录</li>
-						<li class="g_pb_4 g_fs_14 g_fw_600" :class="{ loginactive: loginType === 2 }" @click="loginType = 2">验证码登录</li>
+						<!-- <li class="g_pb_4 g_fs_14 g_fw_600 g_mr_52" :class="{ loginactive: loginType === 1 }" @click="loginType = 1">密码登录</li>
+						<li class="g_pb_4 g_fs_14 g_fw_600" :class="{ loginactive: loginType === 2 }" @click="loginType = 2">验证码登录</li> -->
 					</ul>
 					<a-form :model="loginInfo" @finish="submitInfo" @validate="watchValidate" hideRequiredMark :colon="false" @finishFailed="onFinishFailed" :label-col="{ span: 2 }" :wrapper-col="{ span: 20 }" autocomplete="off" ref="loginInfoForm" style>
 						<div v-if="loginType == 1">
@@ -111,14 +111,13 @@ const loginInfo = ref({
 });
 const loginInfoForm = ref();
 const watchValidate = (e1) => {
-	console.log(e1);
-	setTimeout(() => {
-		loginInfoForm.value.clearValidate();
-	}, 3000);
+
+	// setTimeout(() => {
+	// 	loginInfoForm.value.clearValidate();
+	// }, 3000);
 };
 
 const submitInfo = (e) => {
-	console.log(loginInfo.value.password);
 	let obj = e;
 	// if (loginType.value == 2) {
 	// 	obj.loginType = 1;