Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

src/api/admin/member/index.js

@@ -20,3 +20,10 @@ export function addMembershipGrade(obj) {
     data:obj
   });
 }
+export function update(params) {
+  return fetch({
+    url: 'api/admin/member/update',
+    method: 'PUT',
+    data:params
+  });
+}
\ No newline at end of file

src/router/index.js

@@ -433,12 +433,12 @@ export const asyncRouterMap = [{
       name: '会员订单管理',
       authority: 'memberOrderInfo'
     },
-    // {
-    //   path: 'orderStatistics',
-    //   component: _import('order/orderStatistics/index'),
-    //   name: '会员订单统计',
-    //   authority: 'orderStatistics'
-    // },
+    {
+      path: 'orderStatistics',
+      component: _import('order/orderStatistics/index'),
+      name: '会员订单统计',
+      authority: 'orderStatistics'
+    },
     {
       path: 'createOrder',
       component: _import('order/createOrder/index'),

src/views/order/createOrder/index.vue

@@ -122,6 +122,7 @@ export default {
         endCompanyId: null,
         startCompanyIds: null,
         endCompanyIds: null,
+        // time: [new Date(2019, 10, 10, 9, 0), new Date(2019, 10, 11, 18, 0)],
         time: [],
         limit: 100,
         page: 1,
@@ -243,7 +244,7 @@ export default {
         var nTime =
           this.listQuery.time[1].getTime() - this.listQuery.time[0].getTime();
         let params = {
-          dayNum: nTime / (24 * 60 * 60 * 1000), //天数
+          dayNum: (nTime / (24 * 60 * 60 * 1000)) + 1, //天数
           endAddr: this.listQuery.startEndAddr, //还车地点
           endCity: this.listQuery.startAddrCity, //还车城市编号
           endCityName: this.listQuery.startCityName, //还车城市名称
@@ -260,7 +261,7 @@ export default {
           damageSafe: this.listQuery.damageSafe == "需要" ? 1 : 0, //是否购买免赔
           rentFreeDay: this.listQuery.rentFreeDay == "使用" ? 1 : 0, //是否使用出租免费天数
           orderOrigin: 3, //订车来源
-          appUserId: 334
+          appUserId: this.appUserId
         };
         addIndent(params).then(data => {
           console.log(data);
@@ -301,7 +302,9 @@ export default {
       username(this.listQuery.tel).then(data => {
         if (data.status == 200) {
           if (!!data.data) {
-            console.log(!!data.data.rentFreeDays);
+            // console.log(!!data.data.rentFreeDays);
+            // console.log(data.data);
+            // console.log(data.data.userid);
             this.appUserId = data.data.userid;
             if (!!data.data.rentFreeDays) {
               if (data.data.rentFreeDays >= 1) {

src/views/order/orderStatistics/index.vue

@@ -31,8 +31,14 @@
           </el-col>
         </el-row>
       </el-form>
-
-      <el-table :data="list" border fit highlight-current-row style="width: 100%">
+      <el-table
+        :data="list"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%"
+        v-loading="loading"
+      >
         <el-table-column align="center" label="时间">
           <template scope="scope">
             <span>{{scope.row.timeSlot}}</span>
@@ -40,32 +46,32 @@
         </el-table-column>
         <el-table-column align="center" label="普通会员购买量">
           <template scope="scope">
-            <span v-if="scope.row.members[0].level == 1">{{scope.row.members[0].number || 0}}</span>
+            <span>{{scope.row.pNumber}}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="支付金额(普通会员)">
           <template scope="scope">
-            <span v-if="scope.row.members[0].level == 1">{{scope.row.members[0].amount || 0}}</span>
+            <span>{{scope.row.pAmount}}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="黄金会员购买量">
           <template scope="scope">
-            <span v-if="scope.row.members[0].level == 2">{{scope.row.members[0].number || 0}}</span>
+            <span>{{scope.row.goldNumber}}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="支付金额(黄金会员)">
           <template scope="scope">
-            <span v-if="scope.row.members[0].level == 2">{{scope.row.members[0].amount || 0}}</span>
+            <span>{{scope.row.goldAmount}}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="钻石会员购买量">
           <template scope="scope">
-             <span v-if="scope.row.members[0].level == 3">{{scope.row.members[0].number || 0}}</span>
+            <span>{{scope.row.hNumber}}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="支付金额(钻石会员)">
           <template scope="scope">
-             <span v-if="scope.row.members[0].level == 3">{{scope.row.members[0].amount || 0}}</span>
+            <span>{{scope.row.hAmount}}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="总支付金额">
@@ -85,6 +91,7 @@ export default {
   },
   data() {
     return {
+      loading: false,
       list: [],
       // 统计时间筛选
       listQuery: {
@@ -152,11 +159,36 @@ export default {
     },
     //列表
     getList() {
+      let params = {};
+      this.loading = true;
       orderStatistics(this.listQuery).then(data => {
         console.log(data);
         if (data.status == 200) {
+          data.data.forEach(element => {
+            for (let i in element.members) {
+              if (element.members[i].level == 1) {
+                element.pAmount = element.members[i].amount;
+                element.plevel = element.members[i].level;
+                element.pMemberName = element.members[i].memberName;
+                element.pNumber = element.members[i].number;
+              } else if (element.members[i].level == 2) {
+                element.goldAmount = element.members[i].amount;
+                element.goldlevel = element.members[i].level;
+                element.goldMemberName = element.members[i].memberName;
+                element.goldNumber = element.members[i].number;
+              } else if (element.members[i].level == 3) {
+                element.hAmount = element.members[i].amount;
+                element.hlevel = element.members[i].level;
+                element.hMemberName = element.members[i].memberName;
+                element.hNumber = element.members[i].number;
+              }
+            }
+          });
           this.list = data.data;
         }
+        setTimeout(() => {
+          this.loading = false;
+        }, 300);
       });
     }
   }