ezhizao_zx 1 yıl önce
ebeveyn
işleme
e4c89a1879
6 değiştirilmiş dosya ile 40 ekleme ve 29 silme
  1. 20 20
      nginx.conf
  2. 11 0
      src/api/login.js
  3. 3 3
      src/store/modules/user.js
  4. 2 2
      src/utils/auth.js
  5. 3 3
      src/views/login.vue
  6. 1 1
      vite.config.js

+ 20 - 20
nginx.conf

@@ -29,34 +29,34 @@ http {
     }
 
     location /ezhizao-dms-sys/{
-	proxy_set_header Host $http_host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header REMOTE-HOST $remote_addr;
-	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-	proxy_pass http://120.46.159.163:7001/;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header REMOTE-HOST $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_pass http://120.46.159.163:7001/;
     }
 
     location /ezhizao-dms-p2/{
-	proxy_set_header Host $http_host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header REMOTE-HOST $remote_addr;
-	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-	proxy_pass http://120.46.159.163:7002/;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header REMOTE-HOST $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_pass http://120.46.159.163:7002/;
     }
 
     location /ezhizao-dms-production/{
-	proxy_set_header Host $http_host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header REMOTE-HOST $remote_addr;
-	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-	proxy_pass http://120.46.159.163:7003/;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header REMOTE-HOST $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_pass http://120.46.159.163:7003/;
     }
     location /ezhizao-dms-app/{
-	proxy_set_header Host $http_host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header REMOTE-HOST $remote_addr;
-	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-	proxy_pass http://120.46.159.163:7004/;
+	    proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header REMOTE-HOST $remote_addr;
+	    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+	    proxy_pass http://120.46.159.163:7004/;
     }
     location /ezhizao-dms-supplier-api/{
         proxy_set_header Host $http_host;

+ 11 - 0
src/api/login.js

@@ -14,6 +14,17 @@ export function getSupplierByMnemonicCode(code) {
   })
 }
 
+// 根据供应商编码获取外协商
+export function getSupplierByCode(code) {
+  return request({
+    url: baseUrl + '/getSupplierByCode',
+    headers: {
+      isToken: false
+    },
+    method: 'post',
+    data: { mnemonicCode: code }
+  })
+}
 // 登录方法
 export function login(username, password, code, uuid) {
   const data = {

+ 3 - 3
src/store/modules/user.js

@@ -1,4 +1,4 @@
-import { getSupplierByMnemonicCode, login, logout, getSuppliers, getInfo } from '@/api/login'
+import { getSupplierByCode, login, logout, getSuppliers, getInfo } from '@/api/login'
 import { getToken, setToken, removeToken, setTenant } from '@/utils/auth'
 import defAva from '@/assets/images/profile.jpg'
 
@@ -13,9 +13,9 @@ const useUserStore = defineStore('user', {
   }),
   actions: {
     // 根据助记码,获取外协商
-    getSupplierByMnemonicCode(code) {
+    getSupplierByCode(code) {
       return new Promise((resolve, reject) => {
-        getSupplierByMnemonicCode(code)
+        getSupplierByCode(code)
           .then((res) => {
             resolve(res)
           })

+ 2 - 2
src/utils/auth.js

@@ -1,6 +1,6 @@
 import Cookies from 'js-cookie'
 
-const TokenKey = 'Admin-Token'
+const TokenKey = 'Dms-Supplier-Admin-Token'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -15,7 +15,7 @@ export function removeToken() {
 }
 
 /** tentant 缓存 */
-const TenantKey = 'Tenant-Key'
+const TenantKey = 'Dms-Supplier-Tenant-Key'
 
 export function getTenant() {
   const cookieTenant = Cookies.get(TenantKey)

+ 3 - 3
src/views/login.vue

@@ -23,7 +23,7 @@
             <el-option v-for="item in supplierOptions" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           -->
-          <el-input v-model.trim="loginForm.mnemonicCode" type="text" size="large" placeholder="公司助记码" @blur="handleGetSupplierByMnemonicCode" />
+          <el-input v-model.trim="loginForm.mnemonicCode" type="text" size="large" placeholder="公司编码" @blur="handleGetSupplierByCode" />
         </el-form-item>
         <el-form-item prop="username">
           <el-input v-model.trim="loginForm.username" type="text" size="large" auto-complete="off" placeholder="账号">
@@ -148,10 +148,10 @@ function handleSupplierChange(val) {
   }
 }
 
-function handleGetSupplierByMnemonicCode() {
+function handleGetSupplierByCode() {
   const mnemonicCode = loginForm.value.mnemonicCode
   if (mnemonicCode) {
-    userStore.getSupplierByMnemonicCode(mnemonicCode).then((res) => {
+    userStore.getSupplierByCode(mnemonicCode).then((res) => {
       console.log(res)
       if (res.code === 200) {
         loginForm.value.supplierId = res.data.id

+ 1 - 1
vite.config.js

@@ -25,7 +25,7 @@ export default defineConfig(({ mode, command }) => {
 		},
 		// vite 相关配置
 		server: {
-			port: 81,
+			port: 82,
 			host: true,
 			open: true,
 			proxy: {