Merge remote-tracking branch 'origin/base-modify' into base-modify

src/api/appManagement/pushManagement.js

+import fetch from 'utils/fetch';
+
+/**
+ * 获取列表
+ * @param query
+ */
+export function getPushList(query) {
+  return fetch({
+    url: '/api/universal/jpush/list',
+    method: 'Get',
+    params: query
+  });
+}
+
+/**
+ * 获取弹窗管理列表某一条数据
+ * @param query
+ */
+export function getObj(id) {
+  return fetch({
+    url: '/api/universal/jpush/getOne/'+id,
+    method: 'Get'
+  })
+}
+
+/**
+ * 弹窗管理--添加
+ * @param query
+ */
+export function addObj(obj) {
+    return fetch({
+      url: '/api/universal/jpush/addMessagePush',
+      method: 'post',
+      data: obj
+    });
+  }
+
+/**
+ * 编辑某一条数据,上下架
+ * @param query
+ */
+export function editObj(data) {
+  return fetch({
+    url: '/api/universal/jpush/udpMessagePush',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 删除数据
+ * @param query
+ */
+export function delObj(id) {
+  return fetch({
+    url: '/api/universal/jpush/del/' + id,
+    method: 'delete',
+  })
+}
+
+/**
+ * 立即推送
+ * @param query
+ */
+export function pushStype(query) {
+  return fetch({
+    url: '/api/universal/jpush/stype',
+    method: 'Get',
+    params: query
+  });
+}
+
+

src/router/index.js

@@ -519,6 +519,12 @@ export const asyncRouterMap = [{
       component: _import('appManagement/selectedActivities/index'),
       name: '首页精选活动',
       authority: 'selectedActivities'
+    },
+	{
+      path: 'pushManagement',
+      component: _import('appManagement/pushManagement/index'),
+      name: '消息推送',
+      authority: 'pushManagement'
     }
   ]
 },

src/views/vehicle/bookRecord/index.vue

@@ -57,15 +57,9 @@
         </template>
       </el-table-column>
 
-      <!-- <el-table-column align="center" label="停靠公司" width="120">
-        <template scope="scope">
-          <span>{{scope.row.liftCompanyName}}</span>
-        </template>
-      </el-table-column> -->
-
       <el-table-column align="center" label="申请状态">
         <template scope="scope">
-          <span>{{getBookRecordStatus(scope.row.status)}}</span>
+          <span>{{getBookRecordStatus(scope.row)}}</span>
         </template>
       </el-table-column>
 
@@ -233,11 +227,11 @@
             <el-form-item label="申请状态">
               <span v-if="detailItem.status==1">申请中</span>
               <span v-if="detailItem.status==2">已通过</span>
-              <span v-if="detailItem.status==3">已归还</span>
-              <span v-if="detailItem.status==4">拒绝</span>
-              <span v-if="detailItem.status==5">逾期归还</span>
+              <span v-if="detailItem.status==3">待出行</span>
+              <span v-if="detailItem.status==4">驳回</span>
+              <span v-if="detailItem.status==5">出行中</span>
               <span v-if="detailItem.status==6">取消预订</span>
-              <span v-if="detailItem.status==7">已提车</span>
+              <span v-if="detailItem.status==7">已完成</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -720,7 +714,6 @@
             trigger: 'blur'
           }
         },
-        departurePicList:[],
         statusList:[
           {
             code:'1',
@@ -732,15 +725,15 @@
           },
           {
             code:'3',
-            val:'已归还'
+            val:'待出行'
           },
           {
             code:'4',
-            val:'拒绝'
+            val:'驳回'
           },
           {
             code:'5',
-            val:'逾期归还'
+            val:'出行中'
           },
           {
             code:'6',
@@ -748,7 +741,7 @@
           },
           {
             code:'7',
-            val:'已提车'
+            val:'已完成'
           },
         ],
         bookTypeList:[
@@ -1262,13 +1255,31 @@
             this.listLoading = false;
           })
       },
-      getBookRecordStatus: function (code) {
-        if (!this.$utils.isInteger(code)) {
-          return '未知';
-        }
-        return this.bookRecordStatus[code + ''].val;
+      getBookRecordStatus: function (data) {
+				this.bookRecordStatus['3'].val = '待出行'
+				this.bookRecordStatus['4'].val = '驳回'
+				this.bookRecordStatus['5'].val = '出行中'
+				this.bookRecordStatus['7'].val = '已完成'
+        if(data) {
+					if (!this.$utils.isInteger(data.status)) {
+					  return '未知';
+					}
+					if(data.status == 2 && (data.vehicleDepartureLogVo == undefined || data.vehicleDepartureLogVo == null)) {
+						return this.bookRecordStatus['3'].val;
+					}
+					if(data.status == 2 && data.vehicleDepartureLogVo != undefined && data.vehicleDepartureLogVo != null && data.vehicleDepartureLogVo.state == 0) {
+						return this.bookRecordStatus['5'].val;
+					}
+					if(data.status == 2 && data.vehicleDepartureLogVo != undefined && data.vehicleDepartureLogVo != null && data.vehicleDepartureLogVo.state == 1) {
+						return this.bookRecordStatus['7'].val;
+					}
+					return this.bookRecordStatus[data.status + ''].val;
+				}
+				return '';
       },
       getAllBookRecordStatus: function () {
+								console.log(this.bookRecordStatus)
+			
         return this.bookRecordStatus;
       },
       getDatePeriodStr([startDate, endDate]) {

src/views/xxOfficialWebsite/seoList.vue

@@ -15,7 +15,7 @@
       </el-table-column>
       <el-table-column align="center" label="标题">
         <template scope="scope">
-          <span>{{scope.row.title}}</span>
+          <span>{{scope.row.header}}</span>
         </template>
       </el-table-column>
       <el-table-column align="center" width="100" label="操作" fixed="right">