Merge branch 'master' into NPC-lhd

src/components/Adult/preview/components/Wordcard.vue

@@ -347,6 +347,8 @@ export default {
         _this.dataDetail = res.data.result;
         if (_this.dataDetail && _this.dataDetail.length > 0) {
           _this.handleChineseDetail();
+        } else {
+          this.loading = false;
         }
       });
     },

vue.config.js

@@ -43,8 +43,8 @@ module.exports = {
       // change xxx-api/login => mock/login
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `https://gcls.utschool.cn/`,
-        //target: `https://gcls.helxsoft.cn/`,
+        // target: `https://gcls.utschool.cn/`,
+        target: `https://gcls.helxsoft.cn/`,
         // target: `https://chinesedu.blcup.com/`,
         changeOrigin: true,
         pathRewrite: {