Home Explore Help
Register Sign In
xiaodai2022
/
accout-vue3-ui
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'sit' into v3.0

snow 1 year ago
parent
c18d127949 ee8d4e8f9e
commit
2e060d582d
9 changed files with 116 additions and 15 deletions
Split View Show Diff Stats
  1. 29 0
      .env.v2_pro
  2. 29 0
      .env.v3_pro
  3. 28 0
      .env.v3_sit
  4. 1 1
      dist/index.html
  5. 1 1
      dist/serverConfig.json
  6. 13 0
      index.html
  7. 11 12
      src/layout/components/help-modal.vue
  8. 3 0
      src/views/login/index.vue
  9. 1 1
      src/views/welcome/index.vue

+ 29 - 0
.env.v2_pro
View File 

@@ -0,0 +1,29 @@
 
+# 项目本地运行端口号
 
+VITE_PORT = 8848
 
+
 
+# 开发环境读取配置文件路径
 
+VITE_PUBLIC_PATH = /
 
+
 
+# 开发环境代理
 
+VITE_PROXY_DOMAIN = /api
 
+
 
+# 开发环境路由历史模式
 
+VITE_ROUTER_HISTORY = "hash"
 
+# 钉钉企业id
 
+VITE_CORP_ID = "dingc78fa4301e1a424a35c2f4657eb6378f"
 
+# 企业微信appid
 
+VITE_APP_ID = "ww6076e6fd4268ee31"
 
+# 微信开发环境基础重定向url
 
+REDIRECT_BASE_URL = "http://cxinv.caixiao.wanyuhengtong.cn"
 
+# 开发环境后端用户地址
 
+VITE_PROXY_USER_REAL = "http://cxinv.caixiao.wanyuhengtong.cn"
 
+# 开发环境后端业务地址
 
+VITE_PROXY_DOMAIN_REAL = "http://cxinv.caixiao.wanyuhengtong.cn"
 
+
 
+VITE_IS_PROD = true
 
+
 
+# 跳转结算地址
 
+VITE_PURCHASE_URL = 'http://webstock3.test241.wanyuhengtong.com'
 
+
 
+# token密钥
 
+VITE_SECRET_KEY = 'key123'

+ 29 - 0
.env.v3_pro
View File 

@@ -0,0 +1,29 @@
 
+# 项目本地运行端口号
 
+VITE_PORT = 8848
 
+
 
+# 开发环境读取配置文件路径
 
+VITE_PUBLIC_PATH = /
 
+
 
+# 开发环境代理
 
+VITE_PROXY_DOMAIN = /api
 
+
 
+# 开发环境路由历史模式
 
+VITE_ROUTER_HISTORY = "hash"
 
+# 钉钉企业id
 
+VITE_CORP_ID = "dingc78fa4301e1a424a35c2f4657eb6378f"
 
+# 企业微信appid
 
+VITE_APP_ID = "ww6076e6fd4268ee31"
 
+# 微信开发环境基础重定向url
 
+REDIRECT_BASE_URL = "http://cxinv.api.caixiao365.com"
 
+# 开发环境后端用户地址
 
+VITE_PROXY_USER_REAL = "http://cxinv.api.caixiao365.com"
 
+# 开发环境后端业务地址
 
+VITE_PROXY_DOMAIN_REAL = "http://cxinv.api.caixiao365.com"
 
+
 
+VITE_IS_PROD = true
 
+
 
+# 跳转采销地址
 
+VITE_PURCHASE_URL = 'http://pin.caixiao365.com/'
 
+
 
+# token密钥
 
+VITE_SECRET_KEY = 'key123'

+ 28 - 0
.env.v3_sit
View File 

@@ -0,0 +1,28 @@
 
+VITE_PORT = 8848
 
+
 
+# 开发环境读取配置文件路径
 
+VITE_PUBLIC_PATH = /
 
+
 
+# 开发环境代理
 
+VITE_PROXY_DOMAIN = /api
 
+
 
+# 开发环境路由历史模式
 
+VITE_ROUTER_HISTORY = "hash"
 
+# 钉钉企业id
 
+VITE_CORP_ID = "dingc78fa4301e1a424a35c2f4657eb6378f"
 
+# 企业微信appid
 
+VITE_APP_ID = "ww6076e6fd4268ee31"
 
+# 微信开发环境基础重定向url
 
+REDIRECT_BASE_URL = "http://webcx.test241.wanyuhengtong.com/"
 
+# 开发环境后端用户地址
 
+VITE_PROXY_USER_REAL = "http://stockinv.test241.wanyuhengtong.com"
 
+# 开发环境后端业务地址
 
+VITE_PROXY_DOMAIN_REAL = "http://cxinv.test241.wanyuhengtong.com"
 
+
 
+VITE_IS_PROD = false
 
+
 
+# 跳转结算地址
 
+VITE_PURCHASE_URL = 'http://webstock3.test241.wanyuhengtong.com'
 
+
 
+# token密钥
 
+VITE_SECRET_KEY = 'key123'

+ 1 - 1
dist/index.html
View File 

@@ -4,7 +4,7 @@
 
     <meta charset="UTF-8" />
 
     <link rel="icon" href="/logo_1.png" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-    <title>采销bate3.0公测版结算平台</title>
 
+    <title>采销365结算</title>
 
     <script src="/sortable.min.js"></script>
 
     <script>
 
       window.process = {};

+ 1 - 1
dist/serverConfig.json
View File 

@@ -1,6 +1,6 @@
 
 {
 
   "Version": "3.3.0",
 
-  "Title": "采销bate3.0公测版结算平台",
 
+  "Title": "采销365结算",
 
   "FixedHeader": true,
 
   "HiddenSideBar": false,
 
   "MultiTagsCache": true,

+ 13 - 0
index.html
View File 

@@ -1,5 +1,18 @@
 
 <!DOCTYPE html>
 
 <html lang="en">
 
+<<<<<<< HEAD
 
+=======
 
+  <head>
 
+    <meta charset="UTF-8" />
 
+    <link rel="icon" href="/logo_1.png" />
 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
+    <title>采销365结算</title>
 
+    <script src="/sortable.min.js"></script>
 
+    <script>
 
+      window.process = {};
 
+    </script>
 
+  </head>
 
+>>>>>>> sit
 
 
 <head>
 
   <meta charset="UTF-8" />

+ 11 - 12
src/layout/components/help-modal.vue
View File 

@@ -89,13 +89,13 @@ const config_1 = {
 
 
 const config_2 = {
 
   columns: [
 
-    {
 
-      prop: "on_out_month",
 
-      label: "未跨月"
 
-    },
 
+    // {
 
+    //   prop: "on_out_month",
 
+    //   label: "未跨月"
 
+    // },
 
     {
 
       prop: "out_month",
 
-      label: "已跨月"
 
+      label: "是否有信息表"
 
     }
 
   ],
 
   data: [
 
@@ -124,13 +124,13 @@ const config_2 = {
 
 
 const config_3 = {
 
   columns: [
 
-    {
 
-      prop: "on_out_month",
 
-      label: "未跨月"
 
-    },
 
+    // {
 
+    //   prop: "on_out_month",
 
+    //   label: "未跨月"
 
+    // },
 
     {
 
       prop: "out_month",
 
-      label: "已跨月"
 
+      label: "作废or红冲"
 
     }
 
   ],
 
   data: [
 
@@ -222,7 +222,6 @@ defineExpose({
 
 
 <template>
 
   <ElDialog
 
-    :close-on-click-modal="false"
 
     v-model="visible"
 
     title="使用说明"
 
     center
 
@@ -313,7 +312,7 @@ defineExpose({
 
               v-for="col in config_2.columns"
 
               :key="col.prop"
 
               :prop="col.prop"
 
-              :label="col.label"
 
+              label="作废or红冲"
 
             >
 
               <template #="{ row }">
 
                 <span v-if="typeof row[col.prop] === 'string'">--</span>

+ 3 - 0
src/views/login/index.vue
View File 

@@ -118,7 +118,10 @@ watch(ruleForm, () => {
 
         <Motion>
 
           <!-- <h2>{{ title }}</h2> -->
 
           <h2>采销365结算</h2>
 
+<<<<<<< HEAD
 
           <!-- <h2>结算平台</h2> -->
 
+=======
 
+>>>>>>> sit
 
         </Motion>
 
 
         <el-form

+ 1 - 1
src/views/welcome/index.vue
View File 

@@ -35,7 +35,7 @@ import emptyGif from "/@/assets/welcome.jpg?component";
 
 
 <template>
 
   <div class="welcome">
 
-    <!-- <div class="welcome-title">欢迎登录，采销平台结算平台</div> -->
 
+    <!-- <div class="welcome-title">欢迎登录，采销365结算</div> -->
 
     <img :src="emptyGif" />
 
   </div>
 
 </template>