Merge branch 'master' of http://gitlab.corp.qinqinxiaobao.com:9880/hrs_app_h5/bill

src/api/More/index.js

+import { AjaxRequest } from "../index";
+import urls from "./urls";
+
+export default {
+
+    // get数据
+    async getData(comid, id, name) {
+        const url = `${urls.host}/${comid}/${urls.getData}/departments`
+        const params = { 'param1': id, 'param2': name };
+        return AjaxRequest.get(url, params);
+    },
+    async getMonth(comid, deptid, name) {
+        const url = `${urls.host}/${comid}/${urls.getMonth}/departments`
+        const params = { 'param1': deptid, 'param2': name };
+        return AjaxRequest.get(url, params);
+    },
+    async getCycle(comid, deptid, name) {
+        const url = `${urls.host}/${comid}/${urls.getCycle}/departments`
+        const params = { 'param1': deptid, 'param2': name };
+        return AjaxRequest.get(url, params);
+    },
+};

src/api/More/urls.js

+export default {
+    host: "/host",
+    getData: '/getdata',
+    getMonth: '/getmonth',
+    getCycle: '/getcycle'
+  };
\ No newline at end of file

src/views/More/detail.vue

@@ -6,12 +6,22 @@
     <div class="container">
       <div class="list">
         <div class="title">
-          <div class="title_info">吴天逸工商代理工本费</div>
-          <i>400.00</i>
+          <div class="title_info">{{data.base.service_type}}</div>
+          <i>{{data.base.base_fee}}</i>
         </div>
         <p>
-          <span>截止扣费日期2019-12-20</span>
-          <i>已扣费</i>
+          <span>截止扣费日期{{data.base.pay_time_date}}</span>
+          <i>{{data.base.status}}</i>
+        </p>
+      </div>
+      <div class="list">
+        <div class="title">
+          <div class="title_info">{{data.service.service_type}}</div>
+          <i>{{data.service.base_fee}}</i>
+        </div>
+        <p>
+          <span>截止扣费日期{{data.service.pay_time_date}}</span>
+          <i>{{data.service.status}}</i>
         </p>
       </div>
     </div>
@@ -27,13 +37,33 @@ export default {
   },
   data() {
     return {
-      title: "详情"
+      title: "详情",
+      data: {
+        base: {
+          service_type: "吴医生工商代理工本费",
+          base_fee: 400.0,
+          pay_time_date: "2019-12-20",
+          status: "已扣费"
+        },
+        service:{
+          service_type: "吴医生工商代理服务费",
+          base_fee: 200.0,
+          pay_time_date: "2019-12-20",
+          status: "未扣费"
+        }
+      }
     };
   },
   methods: {
     onClickLeft() {
       console.log(1);
+    },
+    navLeftArrowClick() {
+      this.$router.go(-1);
     }
+  },
+  mounted() {
+    this.globalNavLeftArrowClick(this.navLeftArrowClick);
   }
 };
 </script>
@@ -43,9 +73,9 @@ export default {
   padding: 0 16px;
   .list {
     padding: 16px 0;
-    border-bottom: 1px solid #ECECEE;
-    &:last-child{
-        border: 0;
+    border-bottom: 1px solid #ececee;
+    &:last-child {
+      border: 0;
     }
     .title {
       display: flex;

src/views/More/index.vue

@@ -31,8 +31,8 @@
       </div>
       <div class="box">
         <div class="list">
-          <div class="list_title">
-            <div class="title">吴天逸工商代理</div>
+          <div class="list_title" @click="toPage(3)">
+            <div class="title">{{data.detail.service_type}}</div>
             <van-icon name="arrow" class="arrow_right" />
           </div>
           <p>
@@ -52,6 +52,7 @@
 <script>
 import { NavBar, Icon } from "vant";
 import { TabHeader } from "@/components";
+
 export default {
   components: {
     [Icon.name]: Icon,
@@ -64,6 +65,7 @@ export default {
         balance:0,
         toBePayAmount:0,
         detail:{
+          service_type:"吴医生工商代理",
           toPayAmount:0,
           toBePayAmount:0
         }
@@ -75,9 +77,13 @@ export default {
       console.log(1);
     },
     toPage(flag) {
-      if (flag === 2) {
-        this.$router.push({ name: "morerecord" });
+      if(flag === 2){
+        this.$router.push({ name: "morerecord"});
+      }
+      if (flag === 3) {
+        this.$router.push({ name: "moredetail"});
       }
+      
     },
     getData() {
       const res = null;

src/views/More/record.vue

@@ -6,11 +6,20 @@
     <div class="container-wrap">
       <div class="list">
         <div class="title">
-          <div class="title_info">吴天逸工商代理工本费</div>
-          <i>-160.00</i>
+          <div class="title_info">{{data.fee_name}}</div>
+          <i>{{data.fee}}</i>
         </div>
         <p>
-          <span>11-20 12:20</span>
+          <span>{{data.fee_date}}</span>
+        </p>
+      </div>
+      <div class="list">
+        <div class="title">
+          <div class="title_info">{{data.fee_name}}</div>
+          <i class="add_color">{{data.fee}}</i>
+        </div>
+        <p>
+          <span>{{data.fee_date}}</span>
         </p>
       </div>
     </div>
@@ -27,7 +36,12 @@ export default {
   },
   data() {
     return {
-      title: "资金记录"
+      title: "资金记录",
+      data:{
+        fee_name:"吴天逸工商代理工本费",
+        fee:"-160.00",
+        fee_date:"11-20 12:20"
+      }
     };
   },
   methods: {
@@ -49,6 +63,7 @@ export default {
   padding: 0 16px;
   .list {
     border-bottom: 1px solid #ececee;
+    padding: 16px 0;
     &:last-child {
       border: 0;
     }
@@ -64,6 +79,9 @@ export default {
         margin-left: auto;
       }
     }
+    .add_color{
+      color: #ff9100;
+    }
     p {
       display: flex;
       align-items: center;