添加authcode验证

src/api/Bill/urls.js

@@ -33,6 +33,8 @@ export default {
     return url;
     return url;
   },
   },
   getReceiptDetail(accountId, usermemberId, type) {
   getReceiptDetail(accountId, usermemberId, type) {
+    usermemberId=1822782;
+    accountId=2320271;
     let url = VUE_APP_API_BASEURL + 'bill/account/{usermemberId}/period/{accountId}/receipt/{type}/detail'
     let url = VUE_APP_API_BASEURL + 'bill/account/{usermemberId}/period/{accountId}/receipt/{type}/detail'
     url = url.replace('{usermemberId}', usermemberId);
     url = url.replace('{usermemberId}', usermemberId);
     url = url.replace('{accountId}', accountId);
     url = url.replace('{accountId}', accountId);

src/api/api.http

+@hostname=106.120.107.150
+@port=5000
+@host={{hostname}}:{{port}}
+@contentType=application/x-www-form-urlencoded
+@createdAt={{$datetime iso8601}}
+@group=connect
+###
+
+@name=token
+
+POST http://106.120.107.150:5000/connect/token HTTP/1.1
+Content-Type: "application/x-www-form-urlencoded"
+
+{
+    "client_id": "service-message-center-backend",
+    "client_secret": 123456,
+    "grant_type": "client_credentials",
+    "scope": "api.backend.internal",
+}
+
+###
+

src/router/index.js

@@ -28,7 +28,30 @@ const router = new VueRouter({
   }
   }
 })
 })
 
 
-router.beforeEach(vuexOidcCreateRouterMiddleware(store));
+//router.beforeEach(vuexOidcCreateRouterMiddleware(store));
+
+
+
+router.beforeEach((to, from, next) => {
+  store.dispatch("getOidcUser").then(user => {
+    if (user) {
+      console.log('3');
+      console.log('user=', user);
+      next();
+    }
+    else {
+      console.log('4');
+      const authCode = "8f933f0af8d541188a5161218a4650db";//to.query.authcode;
+      let args = { options: { extraQueryParams: { authcode: authCode } } };
+      store.dispatch('authenticateOidc', args);
+    }
+  }).catch(err => {
+    console.log(err);
+    const authCode = "8f933f0af8d541188a5161218a4650db";
+    let args = { options: { extraQueryParams: { authcode: authCode } } };
+    store.dispatch('authenticateOidc', args);
+  });
+})
 
 
 //TODO: 把callBack中的app_register_id逻辑替换到这里
 //TODO: 把callBack中的app_register_id逻辑替换到这里
 
 

src/utils/filter.js

@@ -19,6 +19,15 @@ Vue.filter('y-m-d', (e) => {
     }
     }
 })
 })
 
 
+Vue.filter('MM-DD HH:mm', (e) => {
+    if (e) {
+        return moment(e).format('MM-DD HH:mm')
+    }
+    else {
+        return '';
+    }
+})
+
 Vue.filter('moneyNum', (e) => {
 Vue.filter('moneyNum', (e) => {
     e = parseFloat(e);
     e = parseFloat(e);
     if (e === 0) {
     if (e === 0) {

src/views/Bill/record.vue

@@ -9,10 +9,10 @@
         <div class="list" v-for="(item, index) in dataList" :key="index">
         <div class="list" v-for="(item, index) in dataList" :key="index">
           <div class="title">
           <div class="title">
             <div class="title_info">{{ item.feeType }}</div>
             <div class="title_info">{{ item.feeType }}</div>
-            <i>{{ item.amount |moneyNum}}</i>
+            <i :class="item.amount>0?'orangeColor':''">{{ item.amount |moneyNum}}</i>
           </div>
           </div>
           <p>
           <p>
-            <span>{{ item.dateTime }}</span>
+            <span>{{ item.dateTime|MM-DD HH:mm }}</span>
           </p>
           </p>
         </div>
         </div>
       </div>
       </div>
@@ -105,6 +105,9 @@ export default {
 </script>
 </script>
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
+.orangeColor{
+  color: #FF8A05;
+}
 .container-wrap {
 .container-wrap {
   padding: 0 16px;
   padding: 0 16px;
   .list {
   .list {

src/views/OidcCallback.vue

@@ -60,16 +60,16 @@ export default {
   mounted() {
   mounted() {
     this.oidcSignInCallback()
     this.oidcSignInCallback()
       .then(redirectPath => {
       .then(redirectPath => {
-        this.getOidcUser()
-          .then(user => {
-            let urlsearch = redirectPath.split("?")[1];
-            let appid = this.getQueryString(urlsearch, "appid");
-            this.getToken(user.access_token, appid, redirectPath);
-          })
-          .catch(err => {
-            console.log("err=", err);
-          });
-        //this.$router.push(redirectPath);
+        // this.getOidcUser()
+        //   .then(user => {
+        //     let urlsearch = redirectPath.split("?")[1];
+        //     let appid = this.getQueryString(urlsearch, "appid");
+        //     this.getToken(user.access_token, appid, redirectPath);
+        //   })
+        //   .catch(err => {
+        //     console.log("err=", err);
+        //   });
+        this.$router.push(redirectPath);
       })
       })
       .catch(err => {
       .catch(err => {
         console.error(err);
         console.error(err);

src/views/ServiceFee/detail.vue

@@ -14,9 +14,11 @@
           <div class="title_money">{{data.waitPayment|moneyNum}}</div>
           <div class="title_money">{{data.waitPayment|moneyNum}}</div>
         </div>
         </div>
       </div>
       </div>
-      <div class="box mt0" v-for="(item,index) in data.list" :key="index">
+
+
+      <div class="box mt0" v-for="(item,index) in data.list" :key="index" >
         <label class="label_time">截止扣费日期 {{item.dueDate|transDate}}</label>
         <label class="label_time">截止扣费日期 {{item.dueDate|transDate}}</label>
-        <div class="list" v-for="(ele,index) in item.list" :key="index">
+        <div class="list" v-for="(ele,index) in item.list.filter(e=>{return e.cityName!=null})" :key="index" >
           <div class="list_title">
           <div class="list_title">
             <div class="title">{{ele.employeeName}}</div>
             <div class="title">{{ele.employeeName}}</div>
             <div class="list_title_money">{{ele.dueAmount|moneyNum}}</div>
             <div class="list_title_money">{{ele.dueAmount|moneyNum}}</div>
@@ -26,7 +28,20 @@
             <i class="no_bill">{{ele.statusDesc}}</i>
             <i class="no_bill">{{ele.statusDesc}}</i>
           </p>
           </p>
         </div>
         </div>
+
+        <div class="list" v-for="(ele,index) in item.list.filter(e=>{return e.cityName==null})" :key="index+'p'" >
+          <div class="list_title">
+            <div class="title">{{ele.employeeName}}</div>
+            <div class="list_title_money">{{ele.dueAmount|moneyNum}}</div>
+          </div>
+          <p>
+            <span>{{ele.bizName}}</span>
+            <i class="no_bill">{{ele.statusDesc}}</i>
+          </p>
+        </div>
       </div>
       </div>
+
+
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>

src/views/test.vue

@@ -37,9 +37,11 @@ export default {
     // }
     // }
   },
   },
   mounted() {
   mounted() {
-    this.oidcCheckAccess(this.$route).then(res => {
-      console.log("res=", res);
-    });
+    // const authCode = "authCode";
+    // let args = { extraQueryParams: { authcode: authCode } };
+    // this.oidcCheckAccess(this.$route).then(hasAccess => {
+    //   console.log("hasAccess=", hasAccess);
+    // });
   },
   },
   methods: {
   methods: {
     ...mapActions([
     ...mapActions([

vue.config.js

@@ -6,6 +6,8 @@ const CompressionWebpackPlugin = require("compression-webpack-plugin")
 const productionGzipExtensions = ["js", "css"]; // 需要gzip压缩的文件后缀
 const productionGzipExtensions = ["js", "css"]; // 需要gzip压缩的文件后缀
 
 
 module.exports = {
 module.exports = {
+
+    title:'业务账单',
     // 部署应用时的基本 URL
     // 部署应用时的基本 URL
     // baseUrl: process.env.NODE_ENV === "production" ? "192.168.60.110:8080" : "192.168.60.110:8080",
     // baseUrl: process.env.NODE_ENV === "production" ? "192.168.60.110:8080" : "192.168.60.110:8080",
     publicPath: process.env.VUE_APP_PUBLIC_DIR,
     publicPath: process.env.VUE_APP_PUBLIC_DIR,