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

src/api/vehicleType.js

@@ -191,10 +191,13 @@ export function dayList(day) {
 }
 
 // 日历价格设置
-export function add_edit(params) {
+export function add_edit(params, date) {
   return fetch({
-    url: '/vehicle/admin/vehicle_model/calendar_price/add_edit',
+    url: '/vehicle/admin/vehicle_model/calendar_price/add_edit/' + date,
     method: 'post',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    },
     data: params
   });
 }

src/views/purseManage/commissionRecord.vue

@@ -36,7 +36,7 @@
 				</el-table-column>
 				<el-table-column align="center" label="来源">
 					<template scope="scope">
-						<span>{{scope.row.sourceName}}</span>
+						<span>{{scope.row.sourceName == '' ? scope.row.phone : scope.row.sourceName}}</span>
 					</template>
 				</el-table-column>
 				<el-table-column align="center" label="订单金额">

src/views/vehicleType/priceList.vue

@@ -366,12 +366,18 @@ export default {
 					}
 				})
 			}
-
 			if (params == '') {
-				this.$message.error('请设置不同车型不同价格4')
-				return false
+				add_edit('',this.activeTime).then(data => {
+					if (data.status == 200) {
+						this.$message.success('设置成功')
+						this.chooseData = []
+						this.getList()
+					} else {
+						this.$message.error(data.message)
+					}
+				})
 			} else {
-				add_edit(params).then(data => {
+				add_edit(params,this.activeTime).then(data => {
 					if (data.status == 200) {
 						this.$message.success('设置成功')
 						this.chooseData = []
@@ -398,8 +404,8 @@ export default {
 						data.data.forEach(element => {
 							element.multiple = element.multiple || ''
 							element.price = element.price || ''
-							element.level = element.level||''
-							element.freeDays = element.freeDays||''
+							element.level = element.level || ''
+							element.freeDays = element.freeDays || ''
 						})
 						this.dayListData = data.data
 						this.setMultiplePop = true