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

src/api/admin/userManagement/index.js

@@ -4,6 +4,7 @@ export function appPage(obj) {
   return fetch({
     url: '/api/admin/appUsersManage/findAll',
     method: 'post',
+    timeout: '30000',
     data: obj
   });
 }

src/api/discoveryModule.js

+import fetch from 'utils/fetch';
+
+/**
+ * 获取消息列表
+ * @param query
+ */
+export function page(query) {
+  return fetch({
+    url: '/api/im/msg/bg/app/unauth/list',
+    method: 'post',
+    data: query
+  });
+}
+
+/**
+ * 获取更新
+ * @param query
+ */
+export function updateMsg(params) {
+  return fetch({
+    url: '/api/im/msg/bg/app/unauth/update',
+    method: 'post',
+    data: params
+  });
+}
+
+/**
+ * 删除消息
+ */
+export function delMsg(query) {
+  return fetch({
+    url: '/api/im/msg/bg/app/unauth/delete',
+    method: 'get',
+    params: query
+  });
+}
+
+/**
+ * 获取问答列表
+ */
+export function geImQuestionList(query) {
+  return fetch({
+    url: '/api/im/imQuestion/list',
+    method: 'get',
+    params: query
+  });
+}
+
+/**
+ * 更新问答
+ * @param query
+ */
+export function updateImQuestion(params) {
+  return fetch({
+    url: '/api/im/imQuestion/bg/app/unauth/update',
+    method: 'post',
+    data: params
+  });
+}
+
+
+/**
+ * 删除消息
+ */
+export function delQuestion(query) {
+  return fetch({
+    url: '/api/im/imQuestion/bg/app/unauth/delete',
+    method: 'get',
+    params: query
+  });
+}
+
+
+

src/api/tourManage.js

@@ -31,7 +31,6 @@ export function getOneGoodsById(query) {
 }
 /**
  * 获取bannerList
- // url: '/api/tour/admin/tourBanner/page',
  */
 export function getBannerList(query) {
   return fetch({
@@ -41,7 +40,7 @@ export function getBannerList(query) {
   });
 }
 /**
- * 添加banner  '/api/tour/admin/tourBanner',
+ * 添加banner
  */
 export function addBanner(params) {
   return fetch({

src/router/index.js

@@ -309,6 +309,33 @@ export const asyncRouterMap = [{
     }
   ]
 },
+{
+  path: '/discoveryModule',
+  component: Layout,
+  name: '发现模块',
+  icon: 'setting',
+  authority: 'discoveryModule',
+  children: [
+    {
+      path: 'clapIndex',
+      component: _import('discoveryModule/clapIndex'),
+      name: '拍拍',
+      authority: 'clapIndex'
+    },
+    {
+      path: 'shortVideo',
+      component: _import('discoveryModule/shortVideo'),
+      name: '短视频',
+      authority: 'shortVideo'
+    },
+    {
+      path: 'questionsAndAnswers',
+      component: _import('discoveryModule/questionsAndAnswers'),
+      name: '问答',
+      authority: 'questionsAndAnswers'
+    }
+  ]
+},
 {
   path: '/campsiteManage',
   component: Layout,

src/utils/index.js

@@ -268,3 +268,15 @@
    }
    return targetObj;
  }
+
+
+/**
+ * 深拷贝
+ */
+ export function objDeepCopy(source) {
+   const sourceCopy = source instanceof Array ? [] : {};
+   for (const item in source) {
+     sourceCopy[item] = typeof source[item] === 'object' ? objDeepCopy(source[item]) : source[item];
+   }
+   return sourceCopy;
+ }

src/views/order/modal/rentOrderDetailModal.vue

@@ -27,12 +27,14 @@
 				</el-col>
 				<el-col :span="8">
 					<el-form-item label="姓名/手机号:">
-						<span>{{form.realName}}/{{form.telephone}}</span>
+						<span v-if="form.realName">{{form.realName}}/{{form.telephone}}</span>
+						<span v-else>无</span>
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
 					<el-form-item label="会员等级/身份:">
-						<span>{{form.memberName}}/{{form. jobTitle}}</span>
+						<span v-if='form.memberName'>{{form.memberName}}/{{form. jobTitle}}</span>
+						<span v-else>无</span>
 					</el-form-item>
 				</el-col>
 				<!-- <el-col :span="8">
@@ -97,43 +99,84 @@
 					<th>取/还时间</th>
 					<th>交车公司</th>
 					<th>还车公司</th>
+
 					<th>免费天数</th>
 					<th>车辆租赁费</th>
 					<th>优惠券</th>
 					<th>不计免赔</th>
 					<th>租房车押金</th>
+					<th>专职司机服务费</th>
 				</tr>
 				<tr>
-					<td>{{form.name}}</td>
+					<td>{{form.name}}{{form.vehicleNumberPlat}}<span v-if="form.vehicleCode">({{form.vehicleCode}})</span><span v-else></span></td>
 					<td>
 						<p>取:{{form.orderRentVehicleDetail.startTime}}</p>
 						<p>还:{{form.orderRentVehicleDetail.endTime}}</p>
+						<p v-show="form.orderRentVehicleDetail.dayNum">租借天数{{form.orderRentVehicleDetail.dayNum}}天</p>
 					</td>
 					<td>{{form.startCompanyName}}</td>
 					<td>{{form.endCompanyName}}</td>
-					<td></td>
-					<td></td>
+
+					
+
+					<td>
+						<p v-if="form.rentVehiclePriceVO">
+							<span v-if="form.rentVehiclePriceVO.freeDayNum == 0">
+								无
+							</span>
+							<span v-else>
+								会员特权{{form.rentVehiclePriceVO.freeDayNum}}天
+							</span>
+							
+						</p>
+						<p v-else>
+							{{orderInfo('免费天数')}}
+						</p>
+					</td>
+
+
+					<td>
+						<p v-if="form.rentVehiclePriceVO && form.rentVehiclePriceVO.vehicleDayNum > 0">
+							¥{{form.rentVehiclePriceVO.modelAmount}}*{{form.rentVehiclePriceVO.vehicleNum}}/{{form.rentVehiclePriceVO.vehicleDayNum}}天
+						</p>
+						<p v-else>
+							{{orderInfo('车辆租赁费')}}
+						</p>
+					</td>
+
 					<td>
 						<p v-if="form.couponList">
-							优惠券:
 							<span
 								v-for="(item,index) in form.couponList"
 								:key="index"
 							>{{item.title}}-{{item.usedAmount}}元</span>
 						</p>
-						<p v-else>优惠券:无</p>
+						<p v-else>无</p>
 					</td>
-					<td></td>
 					<td>
-						<!-- {{form.orderRentVehicleDetail.costDetail.children}} -->
-						<!-- <div v-show="form.orderRentVehicleDetail.costDetail">
-							<p
-								v-for="(item,index) in JSON.parse(form.orderRentVehicleDetail.costDetail).children"
-								:key="index"
-							>{{item.key}}:{{item.detail || '无'}}</p>
-						</div> -->
+						<p v-if="form.rentVehiclePriceVO && form.damageSafeAmount > 0">
+							¥{{form.rentVehiclePriceVO.damageSafePrice}}/{{form.rentVehiclePriceVO.dayNum}}天
+						</p>
+						<p v-else>
+							{{orderInfo('不计免赔')}}
+						</p>
+					</td>
+					<td>
+						<p v-if='form.rentVehiclePriceVO'>
+							{{form.rentVehiclePriceVO.deposit}}
+						</p>
+						<p v-else>
+							{{orderInfo('租房车押金')}}
+						</p>
+					</td>
+					<td>
+						<p v-if='form.rentVehiclePriceVO && form.driverAmount > 0'>
+							¥{{form.rentVehiclePriceVO.driverPrice}}*{{form.rentVehiclePriceVO.driverNum}}/{{form.rentVehiclePriceVO.dayNum}}天
+						</p>
+						<p v-else>
+							{{orderInfo('专职司机服务费')}}
+						</p>
 					</td>
-					
 				</tr>
 				<tr>
 					<td>
@@ -149,7 +192,7 @@
 							@click="resetReturn = true"
 						>更换</el-button>
 					</td>
-					<td colspan="5">{{form.payWay == 1 ? '微信公众号支付' : form.payWay == 2 ? '支付宝即时支付' : form.payWay == 3 ? '银联支付' : ''}} 共计:￥{{form.realAmount}}</td>
+					<td colspan="6">{{form.payWay == 1 ? '微信支付' : form.payWay == 2 ? '支付宝支付' : form.payWay == 3 ? '银联支付' : '微信支付'}} 共计:￥{{form.realAmount}}</td>
 				</tr>
 			</table>
 
@@ -298,6 +341,14 @@ export default {
 		this.getAllFn()
 	},
 	methods: {
+		orderInfo(val){
+			let info = this.form.detailsOfExpenses.filter(item=>item.key == val) 
+			if (info == '' || info < 0) {
+				return '无'
+			}else{
+				return info[0].detail || info[0].val
+			}
+		},
 		timestamp(now) {
 			var year = now.getFullYear()
 			var month = now.getMonth() + 1
@@ -444,6 +495,9 @@ export default {
 	width: 50px;
 	height: 50px;
 }
+.order-details .el-dialog--small{
+	width: 1100px !important;
+}
 .order-details .el-form-item {
 	margin-bottom: 10px !important;
 }

src/views/order/rentVehicleInfo/illegalModal.vue

@@ -55,7 +55,7 @@
 						</span>
 					</el-form-item>
 				</el-col>
-			</el-row> -->
+			</el-row>-->
 			<el-row>
 				<el-col>
 					<el-form-item label="违章截图" :style="{display:'block'}">
@@ -87,7 +87,8 @@
 			</el-row>
 			<el-row>
 				<el-form-item label="违章罚款" style="display: inline-block;width:100%">
-					<el-input style="width:300px" v-model="price" type="number" placeholder="请输入违章罚款金额"></el-input><span style="margin-left:10px">元</span>
+					<el-input style="width:300px" v-model="price" type="number" placeholder="请输入违章罚款金额"></el-input>
+					<span style="margin-left:10px">元</span>
 				</el-form-item>
 			</el-row>
 		</el-form>
@@ -157,18 +158,20 @@ export default {
 			let t = this
 			getOneIllegalRow(id).then(response => {
 				if (response.status == 200) {
-					let arr = response.data.picture.split(',')
-					let fileList2 = []
-					let p = {}
-					arr.map(function(item) {
-						p = {
-							url: item
-						}
-						fileList2.push(p)
-					})
-					t.price = parseFloat(response.data.price)
-					t.fileList2 = fileList2
-					t.id = response.data.id ? response.data.id : undefined
+					if (response.data) {
+						let arr = response.data.picture.split(',')
+						let fileList2 = []
+						let p = {}
+						arr.map(function(item) {
+							p = {
+								url: item
+							}
+							fileList2.push(p)
+						})
+						t.price = parseFloat(response.data.price)
+						t.fileList2 = fileList2
+						t.id = response.data.id ? response.data.id : undefined
+					}
 				} else {
 					this.$notify({
 						title: '失败',

src/views/vehicleType/priceList.vue

@@ -273,25 +273,26 @@ export default {
 		setPrice() {
 			let params = []
 			//全局设置
-			console.log(this.setForm.isGlobal);
-			
 			if (this.setForm.isGlobal == 1) {
 				if (this.chooseData == '') {
 					this.$message.error('请选择要设置的日期')
 					return false
-				} else if(this.setForm.type == 1 && this.setForm.multiple == ''){
+				} else if (
+					this.setForm.type == 1 &&
+					this.setForm.multiple == ''
+				) {
 					this.$message.error('请输入倍数')
 					return false
-				}else if(this.setForm.type == 2 && !this.setForm.price){
+				} else if (this.setForm.type == 2 && !this.setForm.price) {
 					this.$message.error('请输入绝对值')
 					return false
-				}else if(this.setForm.type == 3 && this.setForm.level == ''){
+				} else if (this.setForm.type == 3 && this.setForm.level == '') {
 					this.$message.error('请选择会员等级')
 					return false
-				}else if(this.setForm.freeDays == ''){
+				} else if (this.setForm.freeDays == '') {
 					this.$message.error('请设置天数')
 					return false
-				}else{
+				} else {
 					this.chooseData.forEach(element => {
 						let defaults = {}
 						defaults.date = element
@@ -312,6 +313,7 @@ export default {
 					})
 				}
 			} else {
+				//特殊设置
 				this.dayListData.forEach(element => {
 					if (this.setForm.type == 1) {
 						if (!!element.multiple || !!element.freeDays) {
@@ -324,10 +326,11 @@ export default {
 								vehicleModelId: element.vehicleModelId,
 								type: this.setForm.type
 							})
-						} else {
-							this.$message.error('请设置不同车型不同价格')
-							return false
 						}
+						//  else {
+						// 	this.$message.error('请设置不同车型不同价格1')
+						// 	return false
+						// }
 					} else if (this.setForm.type == 2) {
 						if (!!element.price || !!element.freeDays) {
 							params.push({
@@ -339,10 +342,11 @@ export default {
 								vehicleModelId: element.vehicleModelId,
 								type: this.setForm.type
 							})
-						} else {
-							this.$message.error('请设置不同车型不同价格')
-							return false
 						}
+						//  else {
+						// 	this.$message.error('请设置不同车型不同价格2')
+						// 	return false
+						// }
 					} else {
 						if (!!element.level || !!element.freeDays) {
 							params.push({
@@ -354,20 +358,23 @@ export default {
 								vehicleModelId: element.vehicleModelId,
 								type: this.setForm.type
 							})
-						} else {
-							this.$message.error('请设置不同车型不同价格')
-							return false
 						}
+						//  else {
+						// 	this.$message.error('请设置不同车型不同价格3')
+						// 	return false
+						// }
 					}
 				})
 			}
+
 			if (params == '') {
-				this.$message.error('请设置不同车型不同价格')
+				this.$message.error('请设置不同车型不同价格4')
 				return false
 			} else {
 				add_edit(params).then(data => {
 					if (data.status == 200) {
 						this.$message.success('设置成功')
+						this. this.chooseData = []
 						this.getList()
 					} else {
 						this.$message.error(data.message)
@@ -389,10 +396,10 @@ export default {
 				if (this.calendarStatus == 1 && this.setForm.isGlobal == 0) {
 					dayList(val).then(data => {
 						data.data.forEach(element => {
-							element.multiple = ''
-							element.price = ''
-							element.level = ''
-							element.freeDays = ''
+							element.multiple = element.multiple || ''
+							element.price = element.price || ''
+							element.level = element.level||''
+							element.freeDays = element.freeDays||''
 						})
 						this.dayListData = data.data
 						this.setMultiplePop = true