first init

.prettierrc.cjs

@@ -2,7 +2,7 @@ module.exports = {
   // 一行的字符数，如果超过会进行换行，默认为80
   printWidth: 80,
   // 一个tab代表几个空格数，默认为80
-  tabWidth: 2,
+  tabWidth: 4,
   // 是否使用tab进行缩进，默认为false，表示用空格进行缩减
   useTabs: false,
   // 字符串是否使用单引号，默认为false，使用双引号
@@ -15,7 +15,7 @@ module.exports = {
   bracketSpacing: true,
   // 代码的解析引擎，默认为babylon，与babel相同
   // "parser": "babylon",
-
+  arrowParens: 'avoid',
   // 开启 eslint 支持
   eslintIntegration: true
 }

components.d.ts

@@ -11,6 +11,9 @@ declare module '@vue/runtime-core' {
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     VanButton: typeof import('vant/es')['Button']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanField: typeof import('vant/es')['Field']
+    VanForm: typeof import('vant/es')['Form']
     VanIcon: typeof import('vant/es')['Icon']
     VanTabbar: typeof import('vant/es')['Tabbar']
     VanTabbarItem: typeof import('vant/es')['TabbarItem']

package.json

@@ -15,6 +15,7 @@
     "eslint-plugin-prettier": "^4.2.1",
     "js-base64": "^3.7.3",
     "js-cookie": "^3.0.1",
+    "js-md5": "^0.7.3",
     "nprogress": "^0.2.0",
     "path": "^0.12.7",
     "pinia": "^2.0.28",

src/App.vue

@@ -19,7 +19,7 @@ export default {
 #app {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  background-color: red;
   font-size: 15px;
+  display: block;
 }
 </style>

src/api/axios.js

@@ -65,7 +65,7 @@ axios.interceptors.response.use(
     if (statusWhiteList.includes(status)) return Promise.reject(res)
     // 如果是401则跳转到登录页面
     if (status === 401) {
-      router.push('/login')
+      router.push(`/login?redirect=${encodeURIComponent(window.location.href)}`)
     }
     // 如果请求为非200否者默认统一处理
     if (status !== 200) {

src/api/common.js

@@ -1,13 +1,16 @@
 import fetch from '../api/fetch.js'
 
 export default {
-  dicList (params) {
-    return fetch('/blade-system/dict-biz/dictionary', params)
+  dicList() {
+    return fetch(
+      '/blade-project-manage/projectstage/v1/getProjectStageList?projectId=636e468f1b02b2323a45205f'
+    )
   },
-  submit (params) { // 保存上传文件素材
+  submit(params) {
+    // 保存上传文件素材
     return fetch('/wutong-library/library/save', params, 'post', 'json')
   },
-  basicFormRequest (url) {
+  basicFormRequest(url) {
     return fetch(url)
   }
 }

src/api/fetch.js

@@ -1,94 +1,108 @@
-/**
- * Created by ebi on 2017/5/11.
- */
-import axios from './axios.js'
-import router from '../router'
-import { getToken, removeToken } from '../utils/auth'
-import { ElMessage } from 'element-plus'
-
-axios.defaults.baseURL = ''
-
-axios.interceptors.request.use(config => {
-  config.headers.token = getToken()
-  // 小程序里用m的页面
-  config.headers.Platform = 'pc'
-  config.headers.type = 'web'
-  if (getToken() === null || getToken() === undefined) {
-    delete config.headers.token
-  }
-  return config
-}, err => {
-  return Promise.reject(err)
-})
-
-// insurance 保险 502 503 504时兜底的
-function fetch (url = '', params = {}, method = 'get', contentType = 'form', header = {}, insurance, timeout = 15000) {
-  contentType === 'form' && (contentType = 'application/x-www-form-urlencoded')
-  contentType === 'json' && (contentType = 'application/json')
-  contentType === 'file' && (contentType = 'multipart/form-data')
-  const query = []
-  for (const k in params) {
-    query.push(k + '=' + params[k])
-  }
-  let qs = query.join('&')
-  if (contentType === 'application/x-www-form-urlencoded' && query.length > 0 && method === 'get') {
-    url += (url.indexOf('?') < 0 ? '?' : '&') + qs
-  }
-  if (contentType !== 'application/x-www-form-urlencoded' && method !== 'get') {
-    qs = params
-  }
-  return new Promise((resolve, reject) => {
-    const requestParams = {
-      timeout,
-      method,
-      url: '/api' + url,
-      data: qs,
-      headers: {
-        'Content-Type': contentType,
-        ...header
-      }
-    }
-    const success = (response) => {
-      const {
-        status,
-        data = {},
-        statusText
-      } = response
-      if (status >= 200 && status <= 401) {
-        if (data.code === 401 || data.code === 400) { // 未登录
-          console.log(data)
-          removeToken()
-          router.push(`/?redirect=${encodeURIComponent(window.location.href)}`)
-          reject(new Error('需要登录'))
-          ElMessage.error('登录过期，请重新登录')
-          return
-        }
-        resolve(data)
-      } else if (status === 500) {
-        resolve(data)
-        router.push('/500')
-      } else {
-        resolve(data)
-        ElMessage.success(status + '-' + statusText)
-      }
-    }
-    axios(requestParams).then(success).catch((err) => {
-      if (/502|503|504/.test(err.message) || (err + '').indexOf('timeout') > -1) {
-        if (insurance) {
-          resolve(insurance)
-          return
-        }
-        let msg = '系统繁忙，正在为您排队中，请稍后再试'
-        if (window.location.href.indexOf('/zu') > -1) {
-          msg += ` ${err.message}`
-        }
-        ElMessage.error(msg)
-      } else {
-        resolve(err.data)
-        // ElMessage.error(err.data.error_description ? err.data.error_description : '网络异常，请点击重试')
-      }
-    })
-  })
-}
-
-export default fetch
+/**
+ * Created by ebi on 2017/5/11.
+ */
+import axios from './axios.js'
+import router from '../router'
+import { getToken, removeToken } from '../utils/auth'
+
+axios.defaults.baseURL = ''
+
+axios.interceptors.request.use(
+  (config) => {
+    config.headers.token = getToken()
+    // 小程序里用m的页面
+    config.headers.Platform = 'pc'
+    config.headers.type = 'web'
+    if (getToken() === null || getToken() === undefined) {
+      delete config.headers.token
+    }
+    return config
+  },
+  (err) => {
+    return Promise.reject(err)
+  }
+)
+
+// insurance 保险 502 503 504时兜底的
+function fetch(
+  url = '',
+  params = {},
+  method = 'get',
+  contentType = 'form',
+  header = {},
+  insurance,
+  timeout = 15000
+) {
+  contentType === 'form' && (contentType = 'application/x-www-form-urlencoded')
+  contentType === 'json' && (contentType = 'application/json')
+  contentType === 'file' && (contentType = 'multipart/form-data')
+  const query = []
+  for (const k in params) {
+    query.push(k + '=' + params[k])
+  }
+  let qs = query.join('&')
+  if (
+    contentType === 'application/x-www-form-urlencoded' &&
+    query.length > 0 &&
+    method === 'get'
+  ) {
+    url += (url.indexOf('?') < 0 ? '?' : '&') + qs
+  }
+  if (contentType !== 'application/x-www-form-urlencoded' && method !== 'get') {
+    qs = params
+  }
+  return new Promise((resolve, reject) => {
+    const requestParams = {
+      timeout,
+      method,
+      url: '/api' + url,
+      data: qs,
+      headers: {
+        'Content-Type': contentType,
+        ...header
+      }
+    }
+    const success = (response) => {
+      const { status, data = {}, statusText } = response
+      console.log(status)
+      if (status >= 200 && status <= 401) {
+        if (data.code === 401 || data.code === 400) {
+          // 未登录
+          console.log(data)
+          removeToken()
+          router.push(`/?redirect=${encodeURIComponent(window.location.href)}`)
+          reject(new Error('需要登录'))
+          return
+        }
+        console.log('fffff')
+        resolve(data)
+      } else if (status === 500) {
+        resolve(data)
+        router.push('/500')
+      } else {
+        resolve(data)
+      }
+    }
+    axios(requestParams)
+      .then(success)
+      .catch((err) => {
+        if (
+          /502|503|504/.test(err.message) ||
+          (err + '').indexOf('timeout') > -1
+        ) {
+          if (insurance) {
+            resolve(insurance)
+            return
+          }
+          let msg = '系统繁忙，正在为您排队中，请稍后再试'
+          if (window.location.href.indexOf('/zu') > -1) {
+            msg += ` ${err.message}`
+          }
+        } else {
+          resolve(err.data)
+        }
+      })
+  })
+}
+
+export default fetch

src/api/index.js

@@ -1,21 +1,7 @@
-import login from './login/index.js'
-import system from './system/index.js'
-import project from './project/index.js'
-import common from './common.js'
-import recycle from './recycle/index.js'
-import database from './database/index.js'
-import task from './task/index.js'
-import company from './company/index.js'
-
-export default {
-  offices: ['pdf', 'doc', 'docx', 'ppt', 'pptx', 'xls', 'xlsx'],
-  uploadPath: '/api/wutong-file/minio/file/upload', // 上传
-  login,
-  system,
-  project,
-  common,
-  recycle,
-  database,
-  task,
-  company
-}
+import common from './common.js'
+import login from './login/index.js'
+export default {
+  uploadPath: '/api/wutong-file/minio/file/upload', // 上传
+  common,
+  login
+}

src/api/login/index.js

@@ -0,0 +1,9 @@
+import fetch from '@/api/fetch.js'
+
+export default {
+  login(param) {
+    return fetch('/blade-auth/oauth/token', param, 'post', 'form', {
+      'Tenant-Id': '000000'
+    })
+  }
+}

src/main.js

@@ -5,9 +5,10 @@ import App from './App.vue'
 import router from './router/index.js'
 import { createPinia } from 'pinia'
 import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
-
+import api from '@/api/index.js'
 const pinia = createPinia()
 pinia.use(piniaPluginPersistedstate)
 
 const myApp = createApp(App)
+myApp.config.globalProperties.$api = api
 myApp.use(pinia).use(router).mount('#app')

src/store/user.js

@@ -0,0 +1,13 @@
+import { defineStore } from 'pinia'
+
+export const userStore = defineStore('userStore', {
+  persist: true, // 持久化
+  state: () => ({
+    info: {}
+  }),
+  actions: {
+    setUserInfo(info) {
+      this.info = info
+    }
+  }
+})

src/views/home/components/home.vue

@@ -0,0 +1,13 @@
+<template>
+  <div>
+    <van-button>首页</van-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'home'
+}
+</script>
+
+<style scoped></style>

src/views/home/components/user.vue

@@ -0,0 +1,13 @@
+<template>
+  <div>
+    <span>个人中心</span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'user'
+}
+</script>
+
+<style scoped></style>

src/views/home/index.vue

@@ -1,11 +1,12 @@
 <template>
-  <van-button type="primary" @click="login">首页</van-button>
-  <van-tabbar v-model="active">
-    <van-tabbar-item icon="home-o">标签</van-tabbar-item>
-    <van-tabbar-item icon="search">标签</van-tabbar-item>
-    <van-tabbar-item icon="friends-o">标签</van-tabbar-item>
-    <van-tabbar-item icon="setting-o">标签</van-tabbar-item>
-  </van-tabbar>
+  <div>
+    <home v-if="active === 0"></home>
+    <user v-else-if="active === 1"></user>
+    <van-tabbar v-model="active">
+      <van-tabbar-item icon="home-o">首页</van-tabbar-item>
+      <van-tabbar-item icon="search">个人中心</van-tabbar-item>
+    </van-tabbar>
+  </div>
 </template>
 
 <route>
@@ -15,19 +16,44 @@ name: '首页',
 }
 </route>
 <script>
+import { userStore } from '@/store/user.js'
+import Home from '@/views/home/components/home.vue'
+import User from '@/views/home/components/user.vue'
+
 export default {
   name: 'index',
+  components: { User, Home },
   data() {
     return {
       active: 0
     }
   },
+  setup() {
+    const user = userStore()
+    return { user }
+  },
+  created() {
+    this.init()
+  },
   methods: {
     login() {
       this.$router.push('/login')
+    },
+    init() {
+      this.$api.common.dicList().then((res) => {
+        if (res.code === 200) {
+          console.log(res)
+        } else {
+          console.log(res.msg)
+        }
+      })
     }
   }
 }
 </script>
 
-<style scoped></style>
+<style scoped>
+.bg {
+  background-color: #c72525;
+}
+</style>

src/views/login/index.vue

@@ -1,7 +1,29 @@
 <template>
   <div class="full-width flex flex-center flex-col">
-    <span class="font-20">登录页面</span>
-    <holle />
+    <van-form>
+      <van-cell-group inset>
+        <van-field
+          v-model="username"
+          name="用户名"
+          label="用户名"
+          placeholder="用户名"
+          :rules="[{ required: true, message: '请填写用户名' }]"
+        />
+        <van-field
+          v-model="password"
+          type="password"
+          name="密码"
+          label="密码"
+          placeholder="密码"
+          :rules="[{ required: true, message: '请填写密码' }]"
+        />
+      </van-cell-group>
+    </van-form>
+    <div style="margin: 16px">
+      <van-button round block type="primary" @click="submint">
+        提交
+      </van-button>
+    </div>
   </div>
 </template>
 <route>
@@ -11,8 +33,50 @@ name: 'login',
 }
 </route>
 <script>
+import md5 from 'js-md5'
+import { setToken } from '@/utils/auth.js'
+import { userStore } from '@/store/user.js'
 export default {
-  name: 'login'
+  name: 'login',
+  data() {
+    return {
+      redirect: '/',
+      username: '',
+      password: ''
+    }
+  },
+  setup() {
+    const user = userStore()
+    return { user }
+  },
+  created() {
+    const tmp = this.$route.query.redirect
+    if (tmp) {
+      this.redirect = tmp
+    }
+  },
+  methods: {
+    submint() {
+      const params = {
+        tenantId: '000000',
+        username: this.username,
+        password: md5(this.password),
+        grant_type: 'password',
+        scope: 'all',
+        type: 'account'
+      }
+      this.$api.login.login(params).then((res) => {
+        console.log(res)
+        if (res.error_description) {
+          console.log(res.error_description)
+        } else {
+          setToken(res.access_token)
+          this.user.setUserInfo(res)
+          this.$router.push(this.redirect)
+        }
+      })
+    }
+  }
 }
 </script>
 

vite.config.js

@@ -40,5 +40,18 @@ export default defineConfig({
         })
       ]
     }
+  },
+  server: {
+    open: true,
+    proxy: {
+      '/api': {
+        // 正式环境地址
+        // target: 'https://dev.wutongresearch.club/api',
+        // target: 'https://prod.wutongshucloud.com/api',
+        target: 'http://192.168.31.181:8110',
+        changeOrigin: true,
+        rewrite: (path) => path.replace(/^\/api/, '')
+      }
+    }
   }
 })

yarn.lock

@@ -1578,6 +1578,11 @@ js-cookie@^3.0.1:
   resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.1.tgz#9e39b4c6c2f56563708d7d31f6f5f21873a92414"
   integrity sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==
 
+js-md5@^0.7.3:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/js-md5/-/js-md5-0.7.3.tgz#b4f2fbb0b327455f598d6727e38ec272cd09c3f2"
+  integrity sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==
+
 js-sdsl@^4.1.4:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.2.0.tgz#278e98b7bea589b8baaf048c20aeb19eb7ad09d0"