更新代码

jack
1 parent c9033522
Showing 11 changed files with 30 additions and 104 deletions
.env.development
.env.production
package.json
src/api/user.js
src/main.js
src/utils/request.js
src/views/account/index.vue
src/views/home/index.vue
src/views/login/index.vue
src/views/testpaper/page/creatpaper.vue
vue.config.js
@@ -2,7 +2,7 @@
 ENV = 'development'
  
 # base api
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = '/api'
  
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
@@ -2,5 +2,5 @@
 ENV = 'production'
  
 # base api
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = '/'
  
@@ -12,7 +12,9 @@
     "lint": "eslint --ext .js,.vue src",
     "test:unit": "jest --clearCache && vue-cli-service test:unit",
     "test:ci": "npm run lint && npm run test:unit",
-    "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml"
+    "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml",
+    "start": "node index.js",
+    "server": "nodemon index.js --ignore client"
   },
   "dependencies": {
     "axios": "0.18.1",
@@ -2,7 +2,7 @@ import request from &#39;@/utils/request&#39;
  
 export function login(data) {
   return request({
-    url: '/vue-admin-template/user/login',
+    url: '/login',
     method: 'post',
     data
   })
@@ -33,10 +33,10 @@ Vue.component(CollapseTransition.name, CollapseTransition)
  * Currently MockJs will be used in the production environment,
  * please remove it before going online ! ! !
  */
-if (process.env.NODE_ENV === 'production') {
-  const { mockXHR } = require('../mock')
-  mockXHR()
-}
+// if (process.env.NODE_ENV === 'production') {
+//   const { mockXHR } = require('../mock')
+//   mockXHR()
+// }
  
 // set ElementUI lang to EN
 Vue.use(ElementUI, { locale })
@@ -7,7 +7,7 @@ import { getToken } from &#39;@/utils/auth&#39;
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 5000 // request timeout
+  timeout: 15000 // request timeout
 })
  
 // request interceptor
@@ -227,7 +227,8 @@ export default {
 </script>
 <style scoped>
   .app-container{
-    max-width: 1100px;
+    max-width: 1700px;
+    min-width: 1100px;
     background: #fff;
     margin:0 auto;
     margin-top:15px;
@@ -198,7 +198,8 @@ export default {
 <style lang="scss" scoped>
 .dashboard {
   &-container {
-    max-width: 1100px;
+    max-width: 1700px;
+    min-width: 1100px;
     margin: 0 auto;
     background: #fff;
     margin-top: 15px;
@@ -56,11 +56,11 @@
           <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
         </span>
       </el-form-item>
-
+      <el-checkbox v-model="auto">自动登录</el-checkbox>
       <el-button
         :loading="loading"
         type="primary"
-        style="width:80%;display:block;margin:0 auto; margin-bottom:30px;"
+        style="width:80%;display:block;margin:0 auto; margin-bottom:30px;margin-top:10px;"
         round
         @click.native.prevent="handleLogin"
       >登录</el-button>
@@ -108,7 +108,9 @@ export default {
       },
       loading: false,
       passwordType: 'password',
-      redirect: undefined
+      redirect: undefined,
+      auto: false
+
     }
   },
   watch: {
@@ -249,95 +249,6 @@ export default {
         testtime: ''
       },
       paperdata: [
-        {
-          title: '一、单选题',
-          type: 1,
-          total: 4,
-          info: [
-            {
-              rank: 1,
-              score: 1,
-              num: 4,
-              right: 'A'
-            },
-            {
-              rank: 2,
-              score: 1,
-              num: 4,
-              right: 'B'
-            }
-          ]
-        },
-        {
-          title: '二、多选题',
-          type: 2,
-          total: 4,
-          info: [
-            {
-              rank: 1,
-              score: 1,
-              num: 4,
-              right: 'AB'
-            },
-            {
-              rank: 2,
-              score: 1,
-              num: 4,
-              right: 'BD'
-            }
-          ]
-        },
-        {
-          title: '三、判断题',
-          type: 3,
-          total: 4,
-          info: [
-            {
-              rank: 1,
-              score: 1,
-              right: '✔'
-            },
-            {
-              rank: 2,
-              score: 1,
-              right: '✘'
-            }
-          ]
-        },
-        {
-          title: '四、数字题',
-          type: 4,
-          total: 4,
-          info: [
-            {
-              rank: 1,
-              score: 1,
-              right: '2.75'
-            },
-            {
-              rank: 2,
-              score: 1,
-              right: '12.3'
-            }
-          ]
-        },
-        {
-          title: '五、排序题',
-          type: 5,
-          total: 4,
-          info: [
-            {
-              rank: 1,
-              score: 1,
-              right: '12345'
-            },
-            {
-              rank: 2,
-              score: 1,
-              right: '54312'
-            }
-          ]
-        }
       ]
     }
   },
@@ -36,7 +36,16 @@ module.exports = {
       warnings: false,
       errors: true
     },
-    before: require('./mock/mock-server.js')
+    proxy: {
+      '/api': {
+        target: 'http://localhost:8080', // 这个链接是要代理到的api地址
+        changeOrigin: false,
+        pathRewrite: {
+          '^/api': ''
+        }
+      }
+    }
+    // before: require('./mock/mock-server.js')
   },
   configureWebpack: {
     // provide the app's title in webpack's name field, so that