From f5d0dc8f87febf2a6f42fd46408bf9f72b6c7ede Mon Sep 17 00:00:00 2001
From: zhao_lei <zhao_lei@murongtech.com>
Date: Wed, 19 Jun 2019 11:37:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/vue/bill/.eslintrc.js             |   6 ++
 src/main/vue/bill/public/favicon.ico       | Bin 4286 -> 7811 bytes
 src/main/vue/bill/src/App.vue              |  85 +++++++++++++---
 src/main/vue/bill/src/axios/api.request.js |   2 +-
 src/main/vue/bill/src/axios/index.js       |   3 +-
 src/main/vue/bill/src/main.js              |  49 ++++++++-
 src/main/vue/bill/src/views/Bill.vue       |   4 +-
 src/main/vue/bill/src/views/Gird.vue       |  17 ++--
 src/main/vue/bill/src/views/Login.vue      | 111 +++++++++++----------
 9 files changed, 200 insertions(+), 77 deletions(-)
 create mode 100644 src/main/vue/bill/.eslintrc.js

diff --git a/src/main/vue/bill/.eslintrc.js b/src/main/vue/bill/.eslintrc.js
new file mode 100644
index 0000000..cf17c49
--- /dev/null
+++ b/src/main/vue/bill/.eslintrc.js
@@ -0,0 +1,6 @@
+module.exports = {
+  extends: 'eslint:recommended',
+  rules: {
+    'no-console': 'off',
+  },
+};
diff --git a/src/main/vue/bill/public/favicon.ico b/src/main/vue/bill/public/favicon.ico
index df36fcfb72584e00488330b560ebcf34a41c64c2..2ea8edf75cb82f85e9439d561e883c790718d6b3 100644
GIT binary patch
literal 7811
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
Umlm|}mN<q}kWrOxkTe7TKcDIhZ2$lO

literal 4286
zcmds*O-Phc6o&64GDVCEQHxsW(p4>LW*W<827=Unuo8sGpRux(DN@jWP-e29Wl%wj
zY84_aq9}^Am9-cWTD5GGEo#+5Fi2wX_P*bo+xO!)p*7B;iKlbFd(U~_d(U?#hLj56
zPhFkj-|A6~Qk#@g^#D^U0XT1cu=c-vu1+SElX9NR;kzAUV(q0|dl0|%h|dI$%VICy
zJnu2^L*Te9JrJMGh%-P79CL0}dq92RGU6gI{v2~|)p}sG5x0U*z<8U;Ij*hB9z?ei
z@g6Xq-pDoPl=MANPiR7%172VA%r)kev<ISBgE$F{SFy+(=9Z)f)De0Se}ZDZW}Z3B
zElCeVrw;K0Fdl_Cg=gZOFXXc3pL)Q05CAuT+XucQ<8g~3dteP~|7s7c6QYP;fy;mF
zMN;>tV-_5H*QJKFmd;8yA$98zCxBZYXTNZ#QFk2(TX0;Y2dt&WitL#$96|gJY=3xX
zpCoi|YNzgO3R`f@IiEeSmKrPSf#h#Qd<$%Ej^RIeeYfsxhPMOG`S`Pz8q``=511zm
zAm)MX5AV^5xIWPyEu7u>qYs?pn$I4nL9J!=K=SGlKLXpE<5x+2cDTXq?brj?n6sp=
zphe9;_JHf40^9~}9i08r{XM$7HB!`{Ys~TK0kx<}ZQng`UPvH*11|q7&l9?@FQz;8
zx!=3<4seY*%=OlbCbcae?<QnEgvj4i?s}Yk=qA2z`-^*<eK3c)MS4JOdbsTQEOa0)
z0NWqlna2rzs>5^V_}*K>Uo6ZWV8mTyE^B=DKy7-sdLYkR5Z?paTgK-zyIkKjIcpyO
z{+uIt&YSa_$QnN_@t~L014dyK(fOOo+W*MIxbA6Ndgr=Y!f#Tokqv}n<7-9qfHkc3
z=>a|HWqcX8fzQCT=dqVbogRq!-S>H%yA{1w#2Pn;=e>JiEj7Hl;zdt-2f+j2%DeVD
zsW0Ab)ZK@0cIW%W7<X*Er!BfRbvU93$DH%#v6dRt^6HBxz1xBNHx=$&_Gv<&J}Ljk
zJN<Fzx(`Oe@KgQ0F$<14=XV#WK`o#6Ku>z}H{&~yGhn~D;aiP4=;m-HCo`BEI+Kd6
z={Xwx{T<?%b6i9IjI)Ls)S{-*mq<@~R{?$}ZKjf;^k75i_}(2MXt}^SEBVg7AI@28
zo_uPg2V)_e-`2Ois=PYoe%9u*n9({PFR)OnHJPi{dNx>Kx<YG`4QQ>D#iCLfl2<BD
h7L=-;Q>vQGDitKtN>z|-AdCN|$jTFDg0m3O`WLD4_s#$S

diff --git a/src/main/vue/bill/src/App.vue b/src/main/vue/bill/src/App.vue
index 9942bda..bdc587d 100644
--- a/src/main/vue/bill/src/App.vue
+++ b/src/main/vue/bill/src/App.vue
@@ -1,34 +1,93 @@
 <template>
   <div id="app">
     <!-- <img alt="logo" src="https://fairy8-1258530674.picsh.myqcloud.com/img/20190611100737.png" width="400px"> -->
-    <span style="color:#0081FF;font-size:22px"><b>Bills Assistant</b></span>
-    <!-- <HR align=center width=300 color=#987cb9 SIZE=1> -->
-    <!-- <hr style="border:1 dashed #987cb9" width="50%" color=#ACACAC size=1/> -->
-    <br/>
-    <!-- <router-link to="/login">登录页</router-link> -->
-    <p/>
-    <router-view/>
+    <!-- <el-row  :gutter="10"> -->
+    <div
+      style="width:800px;text-align:center;align-self: center;margin: auto;top: 0;left: 0;right: 0;bottom: 0;"
+    >
+      <!-- <div> -->
+      <el-row>
+        <!-- <el-col :span="4"><div class="grid-content bg-purple">b</div></el-col> -->
+        <el-col :span="16" :offset="4">
+          <div class="grid-content bg-purple" style="color:#0081FF;font-size:22px">Bill Assistant</div>
+        </el-col>
+        <el-col  :span="4" style="text-align:right;">
+          <el-button v-if="showLogout()" type="text" @click="logout()">登出</el-button>
+        </el-col>
+        <!-- <el-col :span="16">
+            <div>
+                <span style="color:#0081FF;font-size:22px">Bills Assistant</span>
+            </div>
+        </el-col>
+        <el-col :span="4">
+            <el-button type="text">logout</el-button>
+        </el-col>-->
+      </el-row>
+      <!-- <HR align=center width=300 color=#987cb9 SIZE=1> -->
+      <!-- <hr style="border:1 dashed #987cb9" width="50%" color=#ACACAC size=1/> -->
+      <!-- <br/> -->
+      <!-- <router-link to="/login">登录页</router-link> -->
+      <p/>
+      <router-view v-if="isRouterAlive"/>
+    </div>
     <!-- <HelloWorld msg="Welcome to Your Vue.js App"/> -->
     <p/>
-    
-    <img alt="footer" src="https://fairy8-1258530674.picsh.myqcloud.com/img/20190611100310.png" width="150px">
+    <img
+      alt="footer"
+      src="https://fairy8-1258530674.picsh.myqcloud.com/img/20190611100310.png"
+      width="150px"
+    >
   </div>
 </template>
 
 <script>
 // import HelloWorld from './components/HelloWorld.vue'
-
 export default {
-  name: 'app',
+  name: "app",
+  provide () {
+    return {
+      reload: this.reload
+    }
+  },
+  data(){
+    return {
+      isRouterAlive: true,
+    }
+  },
+  methods: {
+    logout() {
+      console.log("logout!");
+      window.localStorage.removeItem("token");
+    //   console.log("window.localStorage:" + window.localStorage);
+      this.reload();
+    },
+    reload () {
+      this.isRouterAlive = false
+      this.$nextTick(function () {
+        this.isRouterAlive = true
+      })
+    },
+    showLogout () {
+        console.info("showLogout");
+        if (localStorage.token) {
+            console.info("showLogout:true");
+            return true;
+        }
+        else {
+            console.info("showLogout:false");
+            return false;
+        }
+    }
+  }
   /*components: {
     HelloWorld
   }*/
-}
+};
 </script>
 
 <style>
 #app {
-  font-family: 'Avenir', Helvetica, Arial, sans-serif;
+  font-family: "Avenir", Helvetica, Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   text-align: center;
diff --git a/src/main/vue/bill/src/axios/api.request.js b/src/main/vue/bill/src/axios/api.request.js
index 4bf444e..e278326 100644
--- a/src/main/vue/bill/src/axios/api.request.js
+++ b/src/main/vue/bill/src/axios/api.request.js
@@ -8,4 +8,4 @@ const HttpRequest = axios.create({
   // 请求超时时间
   timeout: 10000
 })
-export default HttpRequest
+export default HttpRequest
\ No newline at end of file
diff --git a/src/main/vue/bill/src/axios/index.js b/src/main/vue/bill/src/axios/index.js
index c6f8e79..938e9f2 100644
--- a/src/main/vue/bill/src/axios/index.js
+++ b/src/main/vue/bill/src/axios/index.js
@@ -4,6 +4,7 @@ export default {
      */
     baseUrl: {
         dev: 'http://localhost:30000',
-        pro: 'https://bill.fairy8.cn/api'
+        pro: 'https://fairy8.cn:30443'
+        // pro: 'https://bill.fairy8.cn/api'
     }
 };
diff --git a/src/main/vue/bill/src/main.js b/src/main/vue/bill/src/main.js
index 7821625..16fd3d3 100644
--- a/src/main/vue/bill/src/main.js
+++ b/src/main/vue/bill/src/main.js
@@ -1,7 +1,6 @@
 import Vue from 'vue'
 import App from './App.vue'
 import router from '@/router/index.js'
-
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 import HttpRequest from '@/axios/api.request'
@@ -14,6 +13,48 @@ Vue.use(ElementUI)
 Vue.prototype.$moment = moment;
 
 
+
+
+/** 
+ * Loading实现 
+ * */
+
+
+
+let loading        //定义loading变量
+
+function startLoading() {    //使用Element loading-start 方法
+    loading = ElementUI.Loading.service({
+        lock: true,
+        text: '加载中……',
+        background: 'rgba(0, 0, 0, 0.7)'
+    })
+}
+function endLoading() {    //使用Element loading-close 方法
+    loading.close()
+}
+
+let needLoadingRequestCount = 0
+export function showFullScreenLoading() {
+    if (needLoadingRequestCount === 0) {
+        startLoading()
+    }
+    needLoadingRequestCount++
+}
+
+export function tryHideFullScreenLoading() {
+    if (needLoadingRequestCount <= 0) return
+    needLoadingRequestCount--
+    if (needLoadingRequestCount === 0) {
+        endLoading()
+    }
+}
+
+
+/**
+ * Axios 拦截器
+ */
+
 HttpRequest.interceptors.request.use(
   config => {
     // 判断token是否存在
@@ -22,6 +63,7 @@ HttpRequest.interceptors.request.use(
       config.headers.Authorization = localStorage.token
     }
     // config.headers.Authorization = "Bearer eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhbGF3biIsImNyZWF0ZWQiOjE1NTg2ODY4MTk0NjcsImlhdCI6MTU1ODY4NjgxOSwiZXhwIjoxNTU5MjkxNjE5fQ.N9ZSMrStIaUyngSpvmup_akXQaueLSIX5-h4Q_fixdM"  //将token设置成请求头
+    // showFullScreenLoading()
     return config
   }, function(err) {
     return Promise.reject(err)
@@ -32,9 +74,11 @@ HttpRequest.interceptors.request.use(
 // http response 拦截器
 HttpRequest.interceptors.response.use(
     response => {
+        // tryHideFullScreenLoading()
         return response;
     },
     error => {
+        // tryHideFullScreenLoading()
         if (error.response) {
             switch (error.response.status) {
                 case 401:
@@ -49,7 +93,8 @@ HttpRequest.interceptors.response.use(
             }
         }
         return Promise.reject(error.response.data)   // 返回接口返回的错误信息
-    });
+    }
+);
 
 
 
diff --git a/src/main/vue/bill/src/views/Bill.vue b/src/main/vue/bill/src/views/Bill.vue
index 6852d04..4ffc2ff 100644
--- a/src/main/vue/bill/src/views/Bill.vue
+++ b/src/main/vue/bill/src/views/Bill.vue
@@ -509,8 +509,8 @@ export default {
                                 _this.$message.error('未知错误');
                             } else {
                                 // Something happened in setting up the request that triggered an Error
-                                console.log("Error", error.message);
-                                _this.$message.error(error.response.message);
+                                console.log("Error", error);
+                                _this.$message.error(error.error);
                             }
                             console.log(error.config);
                         });
diff --git a/src/main/vue/bill/src/views/Gird.vue b/src/main/vue/bill/src/views/Gird.vue
index c2f23e9..94b017a 100644
--- a/src/main/vue/bill/src/views/Gird.vue
+++ b/src/main/vue/bill/src/views/Gird.vue
@@ -2,16 +2,16 @@
   <div class="main">
     <div class="group">
       <el-table
+        v-loading="isGirdLoading"  
         :data="book"
         height="600px"
         style="width: 100%"
-        @cell-mouse-enter="handleMouseEnter"
-      >
+        @cell-mouse-enter="handleMouseEnter">
         <!-- highlight-current-row -->
         <!-- @current-change="handleCurrentChange" -->
         <el-table-column prop="applyDate" label="申请日期" width="150" :formatter="dateFormat"></el-table-column>
         <el-table-column prop="totalAmount" label="总金额" width="100"></el-table-column>
-        <el-table-column prop="fee" label="税费" width="100"></el-table-column>
+        <el-table-column prop="fee" label="税金（8%）" width="100"></el-table-column>
         <el-table-column prop="post.contact" label="快递地址" width="100">
           <template slot-scope="scope">
             <el-popover trigger="hover" placement="right">
@@ -102,6 +102,7 @@ export default {
   name: "Gird",
   data() {
     return {
+      isGirdLoading:true,
       isAddShow: false,
       isEditShow: false,
       isDetailShow: false,
@@ -194,10 +195,12 @@ export default {
       this.$router.push({ path: "Bill" });
     },
     refresh() {
-      fetchBooks().then(res => {
-        // console.info("res.data:" + res.data);
-        this.book = res.data;
-      });
+        fetchBooks().then(res => {
+            // console.info("res.data:" + res.data);
+            this.isGirdLoading = true;
+            this.book = res.data;
+            this.isGirdLoading = false;
+        });
     },
     handleCurrentChange(val) {
       this.focusRow = val;
diff --git a/src/main/vue/bill/src/views/Login.vue b/src/main/vue/bill/src/views/Login.vue
index 7977fbd..f23b15e 100644
--- a/src/main/vue/bill/src/views/Login.vue
+++ b/src/main/vue/bill/src/views/Login.vue
@@ -1,27 +1,34 @@
 <template>
   <div class="login">
     <div class="group">
-      <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="80px">
+      <el-form v-loading="disabled"  ref="ruleForm" :model="ruleForm" :rules="rules" label-width="80px">
         <el-form-item label="用户名" prop="username">
           <el-input v-model="ruleForm.username" clearable placeholder="请输入用户名"></el-input>
         </el-form-item>
         <el-form-item label="密码" prop="password">
-          <el-input v-model="ruleForm.password" @keyup.enter.native="onSubmit('ruleForm')" show-password placeholder="请输入密码"></el-input>
+          <el-input
+            v-model="ruleForm.password"
+            @keyup.enter.native="onSubmit('ruleForm')"
+            show-password
+            placeholder="请输入密码"
+          ></el-input>
         </el-form-item>
 
         <!-- <el-row :gutter="20"> -->
         <el-row>
-            <el-col :span="18">
-                <el-form-item>
-                    <el-button type="primary" @click="onSubmit('ruleForm')" :disabled="disabled">登录</el-button>
-                    <el-button @click="reset('ruleForm')">重置</el-button>
-                </el-form-item>
-            </el-col>
-            <el-col :span="6">
-                <el-form-item label-width="50px">
-                    <span align="right"><el-link type="primary" :underline="false" href="/#/Register">注册</el-link></span>
-                </el-form-item>
-            </el-col>
+          <el-col :span="18">
+            <el-form-item>
+              <el-button type="primary" @click="onSubmit('ruleForm')" :disabled="disabled">登录</el-button>
+              <el-button @click="reset('ruleForm')">重置</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label-width="50px">
+              <span align="right">
+                <el-link type="primary" :underline="false" href="/#/Register">注册</el-link>
+              </span>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
     </div>
@@ -29,25 +36,25 @@
 </template>
 
 <script>
-import { login } from '../api/user.js';
-import { encrypt,decrypt } from "../utils/encoder.js";
+import { login } from "../api/user.js";
+import { encrypt, decrypt } from "../utils/encoder.js";
 export default {
-  name: 'Login',
+  name: "Login",
   data() {
     return {
       disabled: false,
       ruleForm: {
-        username: '',
-        password: ''
+        username: "",
+        password: ""
       },
       rules: {
         username: [
-          { required: true, message: '请输入户名', trigger: 'blur' },
-          { min: 3, max: 15, message: '长度在 3 到 30 个字符', trigger: 'blur' }
+          { required: true, message: "请输入户名", trigger: "blur" },
+          { min: 3, max: 15, message: "长度在 3 到 30 个字符", trigger: "blur" }
         ],
         password: [
-          { required: true, message: '请输入密码', trigger: 'change' },
-          { min: 3, max: 15, message: '长度在 3 到 30 个字符', trigger: 'blur' }
+          { required: true, message: "请输入密码", trigger: "change" },
+          { min: 3, max: 15, message: "长度在 3 到 30 个字符", trigger: "blur" }
         ]
       }
     };
@@ -57,21 +64,21 @@ export default {
       this.$refs[formName].validate(valid => {
         var _this = this;
         if (valid) {
-            this.disabled = true;
-            /** 加密处理 */
-            var encoderStr = encrypt(this.ruleForm.password);
-            console.log('密文:' + encoderStr);
-            console.log('解密:' + decrypt(encoderStr));
-            this.ruleForm.password = encoderStr;
-            
-            /** 访问登录服务 */
-            login(this.ruleForm)
+          this.disabled = true;
+          /** 加密处理 */
+          var encoderStr = encrypt(this.ruleForm.password);
+          console.log("密文:" + encoderStr);
+          console.log("解密:" + decrypt(encoderStr));
+          this.ruleForm.password = encoderStr;
+
+          /** 访问登录服务 */
+          login(this.ruleForm)
             .then(res => {
-              var token = 'Bearer ' + res.data.token;
-              console.log('token:' + token);
-              window.localStorage.setItem('token', token);
-              this.$message({ message: '登录成功', type: 'success' });
-              this.$router.push({ path: 'Gird' }) 
+              var token = "Bearer " + res.data.token;
+              console.log("token:" + token);
+              window.localStorage.setItem("token", token);
+              this.$message({ message: "登录成功", type: "success" });
+              this.$router.push({ path: "Gird" });
             })
             .catch(function(error) {
               // _this.$message({ message: error.response.statusText, type: 'error' });
@@ -81,7 +88,10 @@ export default {
               if (error.response) {
                 // The request was made and the server responded with a status code
                 // that falls out of the range of 2xx
-                _this.$message({ message: error.response.data.message, type: 'error' });
+                _this.$message({
+                  message: error.response.data.message,
+                  type: "error"
+                });
                 console.log(error.response.data);
                 console.log(error.response.status);
                 console.log(error.response.headers);
@@ -91,35 +101,34 @@ export default {
                 // http.ClientRequest in node.js
                 // _this.$message.error(error.request);
                 console.log(error.request);
-                _this.$message.error('未知错误');
+                _this.$message.error("未知错误");
               } else {
                 // Something happened in setting up the request that triggered an Error
                 // console.log('Error', error.message);
-                console.log('Error', error.status);
-                if(error.status == 401  ){
-                     _this.$message.error('用户名或密码有误');
-                     _this.reset('ruleForm');
-                    //  _this.ruleForm.password = '';
-                }
-                else {
-                    //  _this.ruleForm.password = '';
-                     _this.$message.error(error.status.toString() + error.message);
-                     _this.reset('ruleForm');
+                console.log("Error", error.status);
+                if (error.status == 401) {
+                  _this.$message.error("用户名或密码有误");
+                  _this.reset("ruleForm");
+                  //  _this.ruleForm.password = '';
+                } else {
+                  //  _this.ruleForm.password = '';
+                  _this.$message.error(error.status + ':' + error.message);
+                  _this.reset("ruleForm");
                 }
               }
               console.log(error.config);
               // _this.$message.error(error.response.statusText);
             });
         } else {
-          console.log('error submit!!');
+          console.log("error submit!!");
           return false;
         }
       });
     },
     reset(formName) {
-      console.log('reset')
+      console.log("reset");
       this.$refs[formName].resetFields();
-      this.$refs[formName].focus();
+    //   this.$refs[formName].focus();
       this.disabled = false;
     }
   }