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

# Conflicts:
#	config/dev.env.js
#	src/views/summit/model/reviewPopup.vue
#	src/views/vehicle/vehicleInfo/index.vue

config/dev.env.js

 module.exports = {
   NODE_ENV: '"development"',
     BASE_API:'"https://xxtest.upyuns.com"',//'"https://dev.dfangche.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
+    APP_ORIGIN: '"https://wallstreetcn.com"'
 }

src/views/summit/model/summitPopup.vue

@@ -105,16 +105,7 @@
 								<el-form-item label="活动id:">
 									<!-- <el-input v-model="form.rid" placeholder="请输入签到/抽奖活动的id"></el-input> -->
 									<el-select v-model="form.rid" placeholder="请选择签到/抽奖活动id">
-<<<<<<< HEAD
-										<el-option
-											v-for="(item,index) in optionsId"
-											:key="index"
-											:label="item"
-											:value="item"
-										></el-option>
-=======
 										<el-option v-for="(item,index) in optionsId" :key="index" :label="item" :value="item"></el-option>
->>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
 									</el-select>
 								</el-form-item>
 							</el-col>
@@ -155,11 +146,7 @@
 					<div>
 						<el-row>
 							<el-col>
-<<<<<<< HEAD
-								<el-form-item label="房车介绍:">
-=======
 								<el-form-item label="房车介绍:" style="margin-top:20px">
->>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
 									<el-upload
 											:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
 											list-type="picture-card"
@@ -221,16 +208,16 @@
 </template>
 
 <script>
-import ElRow from 'element-ui/packages/row/src/row'
-import ElInput from '../../../../node_modules/element-ui/packages/input/src/input.vue'
-import ElCol from 'element-ui/packages/col/src/col'
-import ElFormItem from '../../../../node_modules/element-ui/packages/form/src/form-item.vue'
-import { getOne, update, add, activityIds } from 'src/api/summit/activity'
-import { getToken } from 'src/utils/auth'
-import { mapGetters } from 'vuex'
-import UE from '../../modal/Ueditor' // 百度ue富文本
-import { formatDate } from 'utils/dateFormattor'
-export default {
+	import ElRow from 'element-ui/packages/row/src/row'
+	import ElInput from '../../../../node_modules/element-ui/packages/input/src/input.vue'
+	import ElCol from 'element-ui/packages/col/src/col'
+	import ElFormItem from '../../../../node_modules/element-ui/packages/form/src/form-item.vue'
+	import { getOne, update, add, activityIds } from 'src/api/summit/activity'
+	import { getToken } from 'src/utils/auth'
+	import { mapGetters } from 'vuex'
+	import UE from '../../modal/Ueditor' // 百度ue富文本
+	import { formatDate } from 'utils/dateFormattor'
+	export default {
 		props: ['popupShow', 'popupRow', 'titleNme'],
 		name: 'summitPopup',
 		components: {
@@ -291,11 +278,7 @@ export default {
 		created() {
 			activityIds().then(data => {
 				if (data.status == 200) {
-<<<<<<< HEAD
-				this.optionsId = data.data;
-=======
 					this.optionsId = data.data
->>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
 				}
 			})
 		},
@@ -395,11 +378,7 @@ export default {
 			},
 			getState(status) {
 				if (this.$utils.isInteger(status)) {
-<<<<<<< HEAD
-				console.log(status);
-=======
 					console.log(status)
->>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
 					if (status == 0) {
 						return '默认'
 					} else {
@@ -465,12 +444,6 @@ export default {
 							? (this.form.bmCloseTime = this.form.bmCloseTime)
 							: (this.form.bmCloseTime = this.form.bmCloseTime.getTime())
 					let pic = []
-<<<<<<< HEAD
-				if (!!this.form.vehicleImgs) {
-					this.form.vehicleImgs.forEach(element => {
-						pic.push(element.url)
-					})
-=======
 					if (this.fileList2 != '') {
 						console.log(this.fileList2);
 						this.fileList2.forEach(element => {
@@ -482,7 +455,6 @@ export default {
 						});
 						console.log(pic);
 
->>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
 						this.form.vehicleImgs = pic.join(',')
 					}
 
@@ -530,14 +502,6 @@ export default {
 					this.form.startTime = this.form.startTime.getTime()
 					this.form.bmCloseTime = this.form.bmCloseTime.getTime()
 					let pic = []
-<<<<<<< HEAD
-				if (!!this.form.vehicleImgs) {
-					this.form.vehicleImgs.forEach(element => {
-						pic.push(element.url)
-					})
-					this.form.vehicleImgs = pic.join(',')
-				}
-=======
 					if (this.fileList2 != '') {
 						this.fileList2.forEach(element => {
 							pic.push(element.response.data);
@@ -550,7 +514,6 @@ export default {
 					// 	})
 					// 	this.form.vehicleImgs = pic.join(',')
 					// }
->>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
 					this.dataProcessing()
 					add(this.form).then(res => {
 						this.responseResult(res)
@@ -560,11 +523,7 @@ export default {
 			dataProcessing() {
 				if (this.form.state === '默认') {
 					this.form.status = '0'
-<<<<<<< HEAD
-			}else{
-=======
 				} else {
->>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
 					this.form.status = this.statusRadio
 				}
 				this.form.processJson = JSON.stringify(this.processJson)
@@ -625,72 +584,72 @@ export default {
 				}
 			}
 		}
-}
+	}
 </script>
 <style>
-.label-text {
+	.label-text {
 		margin-left: 10px;
 		margin-right: 20px;
-}
+	}
 
-.label-title {
+	.label-title {
 		margin-top: 10px;
-}
+	}
 
-.orderDetail tr th {
+	.orderDetail tr th {
 		background: #eef1f6;
-}
+	}
 
-.orderDetail tr td,
-.orderDetail tr th {
+	.orderDetail tr td,
+	.orderDetail tr th {
 		width: 500px;
 		text-align: center;
 		border: 1px solid #dfe6ec;
 		margin-left: 100px;
 		margin-right: 100px;
 		padding: 10px;
-}
+	}
 
-.label-value {
+	.label-value {
 		margin-left: 80px;
 		margin-right: 100px;
-}
+	}
 
-#license-img {
+	#license-img {
 		width: 50px;
 		height: 50px;
-}
+	}
 
-.order-details .el-form-item {
+	.order-details .el-form-item {
 		margin-bottom: 10px !important;
-}
+	}
 
-.el-dialog__footer .dialog-footer1 {
+	.el-dialog__footer .dialog-footer1 {
 		position: relative;
 		text-align: center;
-}
+	}
 
-.fhjj {
+	.fhjj {
 		width: 500px;
-}
+	}
 
-.content {
+	.content {
 		margin-left: 4%;
-}
+	}
 
-.height {
+	.height {
 		margin-bottom: 2%;
-}
+	}
 
-/* . el-form-item__content {
+	/* . el-form-item__content {
       margin-left: 5% !important;
-} */
+    } */
 
-.status {
+	.status {
 		margin-top: 4%;
-}
-.steLine .el-row {
+	}
+	.steLine .el-row {
 		margin-bottom: 10px;
-}
+	}
 </style>
 

src/views/vehicle/bookRecord/index.vue

@@ -131,13 +131,6 @@
 					<span v-if="scope.row.bookType==10">其他</span>
 				</template>
 			</el-table-column>
-<<<<<<< HEAD
-			<el-table-column align="center" label="预定时间" width="220">
-				<template scope="scope">
-					<span>{{scope.row.bookStartDate}} 至 {{scope.row.bookEndDate}}</span>
-				</template>
-			</el-table-column>
-=======
 			<el-table-column align="center" label="预定取/还时间" width="200">
 				<template scope="scope">
 					<span>{{scope.row.bookStartDate}}</span> <br/><span>{{scope.row.bookEndDate}}</span>
@@ -148,7 +141,6 @@
 					<span>{{scope.row.actualStartDate}}</span> <br/><span>{{scope.row.actualEndDate}}</span>
 				</template>
 			</el-table-column>
->>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
 			<!-- <el-table-column align="center" label="预定时间" width="220">
         <template scope="scope">
         <span
@@ -337,11 +329,7 @@
 					</el-col>
 					<el-col :span="12">
 						<el-form-item label="车辆编号">
-<<<<<<< HEAD
-							<span>{{detailItem.vehicleId}}</span>
-=======
 							<span>{{detailItem.code}}</span>
->>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
 						</el-form-item>
 					</el-col>
 					<!-- <el-col :span="7">
@@ -722,7 +710,7 @@
 </template>
 
 <script>
-import {
+	import {
 		page,
 		prove,
 		reject,
@@ -734,33 +722,33 @@ import {
 		saveOrderViolation,
 		departureVehicle,
 		arrivalVehicle
-} from 'api/vehicle/bookRecord'
+	} from 'api/vehicle/bookRecord'
 
-import {
+	import {
 		getAllCompany,
 		getAll,
 		updateById
-} from 'api/base_info/branch_company/'
-import { getAllZone } from 'api/base_info/constant/'
-import { getAllBranchCompanyByZoneId } from 'api/order/rentVehicle'
-import { formatDate } from 'utils/dateFormattor'
+	} from 'api/base_info/branch_company/'
+	import { getAllZone } from 'api/base_info/constant/'
+	import { getAllBranchCompanyByZoneId } from 'api/order/rentVehicle'
+	import { formatDate } from 'utils/dateFormattor'
 
-import rsCode from '../../../utils/rsCode'
+	import rsCode from '../../../utils/rsCode'
 
-import { mapGetters } from 'vuex'
+	import { mapGetters } from 'vuex'
 
-import { toEast8Date, deepCopyDate, newEast8Date } from 'utils/dateUtils'
-import { getToken } from '../../../utils/auth'
-import {
+	import { toEast8Date, deepCopyDate, newEast8Date } from 'utils/dateUtils'
+	import { getToken } from '../../../utils/auth'
+	import {
 		BOOK_RECORD_STATUS_APPLY,
 		BOOK_RECORD_STATUS_PROVED,
 		BOOK_RECORD_STATUS_LIFT
-} from '../../../store/modules/baseInfo'
+	} from '../../../store/modules/baseInfo'
 
-import bookInfoViewer from '../bookInfoViewer'
-import accItemSelector from '../accompanyingItem/accItemSelector.vue'
+	import bookInfoViewer from '../bookInfoViewer'
+	import accItemSelector from '../accompanyingItem/accItemSelector.vue'
 
-export default {
+	export default {
 		name: 'bookRecord',
 		components: {
 			bookInfoViewer,
@@ -1911,30 +1899,30 @@ export default {
 				})
 			}
 		}
-}
+	}
 </script>
 
 <style scoped>
-.order-details .el-form-item {
+	.order-details .el-form-item {
 		margin-bottom: 0px !important;
-}
-.order-details hr {
+	}
+	.order-details hr {
 		height: 1px;
 		background-color: #ccc;
 		border: none;
-}
-.image {
+	}
+	.image {
 		width: 100%;
 		height: 110px;
 		display: block;
-}
-.el-card__body,
-.el-card {
+	}
+	.el-card__body,
+	.el-card {
 		padding: 0px !important;
 		width: 150px;
 		text-align: center;
-}
-.modal_modal {
+	}
+	.modal_modal {
 		position: fixed;
 		left: 0;
 		top: 0;
@@ -1943,5 +1931,5 @@ export default {
 		opacity: 0.5;
 		background: #000;
 		z-index: 2001;
-}
+	}
 </style>