From dfc7d661e1b253a2aed677d9f2967cd39cf41342 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Tue, 3 Dec 2024 10:24:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=90=8C=E7=8E=AF=E5=A2=83=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E4=B8=8D=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development       |  4 +--
 package.json           |  2 +-
 src/router/index.js    |  4 +--
 src/views/login.vue    |  1 +
 src/views/login_v1.vue | 62 +++++++++++++++++++++++++++++++-----------
 5 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/.env.development b/.env.development
index d09a93b..b821981 100644
--- a/.env.development
+++ b/.env.development
@@ -5,9 +5,9 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
 ENV = 'development'
 
 # 金鸡湖现代服务业品牌管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.0.116:9040'
+# VUE_APP_BASE_API = 'http://192.168.0.116:9040'
 # 测试环境数据库
-# VUE_APP_BASE_API = 'http://39.101.188.84:9040'
+VUE_APP_BASE_API = 'http://39.101.188.84:9040'
 # 脱敏三方测试用数据库
 # VUE_APP_BASE_API = 'http://39.101.188.84:9031'
 # 正式环境数据库
diff --git a/package.json b/package.json
index 2f9e73e..f930bad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "1.0.202411221033",
+  "version": "1.0.202411290932",
   "description": "金鸡湖现代服务业品牌管理系统",
   "author": "若依",
   "license": "MIT",
diff --git a/src/router/index.js b/src/router/index.js
index 775f72e..3c5c191 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,8 +43,8 @@ export const constantRoutes = [
   },
   {
     path: "/login",
-    component: () => import("@/views/login"),
-    // component: () => import("@/views/login_v1"),    // 三方测试脱敏登录页
+    // component: () => import("@/views/login"),          // 测试环境登录页
+    component: () => import("@/views/login_v1"),    // 正式环境登录页
     hidden: true,
   },
   {
diff --git a/src/views/login.vue b/src/views/login.vue
index 739696b..4574e76 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -294,6 +294,7 @@ export default {
   border-radius: 6px;
   background: #ffffff;
   width: 400px;
+  // height: 200px;
   height: 420px;
   padding: 25px 25px 5px 25px;
   box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.15);
diff --git a/src/views/login_v1.vue b/src/views/login_v1.vue
index f7718ea..2c024ac 100644
--- a/src/views/login_v1.vue
+++ b/src/views/login_v1.vue
@@ -11,7 +11,8 @@
         <el-tab-pane label="企业用户登录" name="01"></el-tab-pane>
         <el-tab-pane label="政务用户登录" name="02"></el-tab-pane>
       </el-tabs>
-      <el-form-item prop="username">
+      <!--  v-show="userType == '02'" -->
+      <!-- <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
           type="text"
@@ -40,7 +41,7 @@
           />
         </el-input>
       </el-form-item>
-      <el-form-item prop="code" v-if="false">
+      <el-form-item prop="code" v-if="captchaEnabled">
         <el-input
           v-model="loginForm.code"
           auto-complete="off"
@@ -57,14 +58,14 @@
         <div class="login-code">
           <img :src="codeUrl" @click="getCode" class="login-code-img" />
         </div>
-      </el-form-item>
-      <el-checkbox
+      </el-form-item> -->
+      <!-- <el-checkbox
         v-model="loginForm.rememberMe"
         style="margin: 0px 0px 25px 0px"
         >记住密码</el-checkbox
-      >
+      > -->
       <el-form-item style="width: 100%">
-        <el-button
+        <!-- <el-button
           :loading="loading"
           size="medium"
           type="primary"
@@ -73,21 +74,45 @@
         >
           <span v-if="!loading">登 录</span>
           <span v-else>登 录 中...</span>
-        </el-button>
-        <!-- <el-button
+        </el-button> -->
+        <el-button
           size="medium"
           type="primary"
+          v-if="userType == '02'"
           style="width: 100%;margin-left: 0;margin-top: 20px;"
           @click.native.prevent="changeHttp"
         >
           <span>政务通统一身份认证登录</span>
-        </el-button> -->
+        </el-button>
+        <el-button
+          size="medium"
+          type="primary"
+          v-if="userType == '01'"
+          style="width: 100%;margin-left: 0;margin-top: 20px;"
+          @click.native.prevent="changeHttp"
+        >
+          <span>企业统一身份认证登录</span>
+        </el-button>
         <div style="float: right" v-if="register">
           <router-link class="link-type" :to="'/register'"
             >立即注册</router-link
           >
         </div>
       </el-form-item>
+      <!-- <el-form-item style="width: 100%" class="enterBtnLogin">
+        <div class="wai-box">
+          <el-button
+            :loading="loading"
+            size="medium"
+            type="primary"
+            style="width: 100%"
+            @click.native.prevent="handleLogin"
+          >
+            <span v-if="!loading">企业登录</span>
+            <span v-else>登 录 中...</span>
+          </el-button>
+        </div>
+      </el-form-item> -->
     </el-form>
     <!--  底部  -->
     <!-- <div class="el-login-footer">
@@ -213,24 +238,28 @@ export default {
           });
           // 将加密后的字节数组转换为 Base64 编码的字符串
           var encryptedBase64 = forge.util.encode64(encryptedBytes);
-          // console.log("加密后数据", encryptedBase64);
           this.$store
             .dispatch("Login", {...this.loginForm,userType:this.userType, password: encryptedBase64})
             .then(() => {
-              Cookies.set("newSysLogininfor", 1);
               this.$router.push({ path: this.redirect || "/" }).catch(() => {});
             })
             .catch(() => {
               this.loading = false;
-              // if (this.captchaEnabled) {
-              //   this.getCode();
-              // }
+              if (this.captchaEnabled) {
+                // if(this.userType == "02") {
+                  this.getCode();
+                // }
+              }
             });
         }
       });
     },
     changeHttp(){
-      location.href = "https://qyt.sipac.gov.cn/sipsg-enterprise-mobile-manage/#/login"
+      if(this.userType == '01') {
+        location.href = process.env.VUE_APP_BASE_API + "/system/singlelogin/login"
+      } else {
+        location.href = "https://qyt.sipac.gov.cn/sipsg-enterprise-mobile-manage/#/login"
+      }
     },
   },
 };
@@ -265,7 +294,8 @@ export default {
   border-radius: 6px;
   background: #ffffff;
   width: 400px;
-  height: 330px;
+  height: 200px;
+  // height: 420px;
   padding: 25px 25px 5px 25px;
   box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.15);
   .el-input {