更名、修复测试部署时的报错和bug

.env.development

@@ -2,6 +2,6 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = 'http://localhost:7600'
+VUE_APP_BASE_API = 'http://localhost:7600/thli/jyjc/api'
 
 port = 6100

.env.production

@@ -2,5 +2,6 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = 'api'
+#VUE_APP_BASE_API = 'test.soul2.cn/thli/jyjc/api'
 

src/layout/components/Navbar.vue

@@ -5,28 +5,28 @@
     <breadcrumb class="breadcrumb-container"/>
 
     <div class="right-menu">
-      <el-dropdown class="avatar-container" trigger="click">
+      <!--      <el-dropdown class="avatar-container" trigger="click">-->
-        <div class="avatar-wrapper">
+      <!--        <div class="avatar-wrapper">-->
-          <img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">
+      <!--          <img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
-          <i class="el-icon-caret-bottom"/>
+      <!--          <i class="el-icon-caret-bottom"/>-->
-        </div>
+      <!--        </div>-->
-        <el-dropdown-menu slot="dropdown" class="user-dropdown">
+      <!--        <el-dropdown-menu slot="dropdown" class="user-dropdown">-->
-          <router-link to="/">
+      <!--          <router-link to="/">-->
-            <el-dropdown-item>
+      <!--            <el-dropdown-item>-->
-              Home
+      <!--              Home-->
-            </el-dropdown-item>
+      <!--            </el-dropdown-item>-->
-          </router-link>
+      <!--          </router-link>-->
-          <a target="_blank" href="https://github.com/PanJiaChen/vue-admin-template/">
+      <!--          <a target="_blank" href="https://github.com/PanJiaChen/vue-admin-template/">-->
-            <el-dropdown-item>Github</el-dropdown-item>
+      <!--            <el-dropdown-item>Github</el-dropdown-item>-->
-          </a>
+      <!--          </a>-->
-          <a target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/#/">
+      <!--          <a target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/#/">-->
-            <el-dropdown-item>Docs</el-dropdown-item>
+      <!--            <el-dropdown-item>Docs</el-dropdown-item>-->
-          </a>
+      <!--          </a>-->
-          <el-dropdown-item divided @click.native="logout">
+      <!--          <el-dropdown-item divided @click.native="logout">-->
-            <span style="display:block;">Log Out</span>
+      <!--            <span style="display:block;">Log Out</span>-->
-          </el-dropdown-item>
+      <!--          </el-dropdown-item>-->
-        </el-dropdown-menu>
+      <!--        </el-dropdown-menu>-->
-      </el-dropdown>
+      <!--      </el-dropdown>-->
     </div>
   </div>
 </template>

src/router/index.js

@@ -112,6 +112,7 @@ export const constantRoutes = [
 
 const createRouter = () => new Router({
   mode: 'history', // require service support
+  base: '/thli/jyjc/',
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRoutes
 })

src/settings.js

@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: 'Vue Demo For Soul2',
+  title: 'jyjc-admin',
 
   /**
    * @type {boolean} true | false

src/views/dashboard/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="dashboard-container">
-    <div class="dashboard-text">name: {{ name }}</div>
+    <div class="dashboard-text">欢迎使用</div>
   </div>
 </template>
 

src/views/qr/edit.vue

@@ -74,7 +74,7 @@ export default {
       // 关闭
     },
     beforeSave() {
-      if (this.row.qrUrl != null && this.row.qrUrl !== this.edit.qrUrl) {
+      if (this.row && this.row.qrUrl != null && this.row.qrUrl !== this.edit.qrUrl) {
         this.$confirm('你更改了二维码Url,这可能带来一些意外的结果, 是否继续?', '警告', {
           confirmButtonText: '确定',
           cancelButtonText: '取消(维持原值)',

src/views/qr/index.vue

@@ -191,6 +191,7 @@ export default {
           .catch(() => {
             loading.close()
           })
+      }).catch(r => {
       })
     },
     /* Base */

src/views/subject/edit.vue

@@ -123,11 +123,11 @@ export default {
     if (this.row !== null) {
       this.edit = JSON.parse(JSON.stringify(this.row))
       // console.log(this.edit)
+      items({ id: this.row.id }).then(r => {
+        this.edit.items = r.data.items
+        // console.log('edit.items -> ', this.edit.items)
+      })
     }
-    items({ id: this.row.id }).then(r => {
-      this.edit.items = r.data.items
-      console.log('edit.items -> ', this.edit.items)
-    })
   },
   methods: {
     handleRemoveItem(i) {
@@ -147,13 +147,14 @@ export default {
             background: this.$elementGlobal.loadingBackground
           })
           // 避免保存到空的选项
-          this.edit.items = this.edit.items.filter(e => {
+          if (this.edit.items != null) {
-            let empty = true
+            this.edit.items = this.edit.items.filter(e => {
-            for (let key in e) {
+              return e.content != null || e.points != null || e.weights != null
-              if (key !== 'isRight' && e[key] != null) empty = false
+            })
-            }
+          } else {
-            return empty
+            this.edit.items = []
-          })
+          }
+          // console.log('edit -> ', this.edit)
           saveOrUpdate(this.edit)
             .then(r => {
               loading.close()

vue.config.js

@@ -24,7 +24,7 @@ module.exports = {
    * In most cases please use '/' !!!
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
-  publicPath: '/',
+  publicPath: '/thli/jyjc/',
   outputDir: 'dist',
   assetsDir: 'static',
   lintOnSave: process.env.NODE_ENV === 'development',
@@ -36,7 +36,7 @@ module.exports = {
       warnings: false,
       errors: true
     },
-    before: require('./mock/mock-server.js')
+    // before: require('./mock/mock-server.js')
   },
   configureWebpack: {
     // provide the app's title in webpack's name field, so that