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

src/views/campsiteManage/index.vue

@@ -62,7 +62,7 @@
             <span>{{scope.row.crtTimeStr}}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" width="150" label="操作" fixed="right">
+        <el-table-column align="center" width="150" label="操作">
           <template scope="scope">
             <el-button size="small"  class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">{{campsiteshop_btn_update?"编辑":"查看"}}
             </el-button>

src/views/vehicleType/priceList.vue

@@ -127,7 +127,7 @@
 						<el-select
 							v-if="setForm.type ==3 && setForm.isGlobal == 1"
 							v-model="setForm.level"
-							placeholder="请选择"
+							placeholder="请选择会员等级"
 						>
 							<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.level"></el-option>
 						</el-select>
@@ -273,11 +273,25 @@ export default {
 		setPrice() {
 			let params = []
 			//全局设置
+			console.log(this.setForm.isGlobal);
+			
 			if (this.setForm.isGlobal == 1) {
 				if (this.chooseData == '') {
 					this.$message.error('请选择要设置的日期')
 					return false
-				} else {
+				} else if(this.setForm.type == 1 && this.setForm.multiple == ''){
+					this.$message.error('请输入倍数')
+					return false
+				}else if(this.setForm.type == 2 && !this.setForm.price){
+					this.$message.error('请输入绝对值')
+					return false
+				}else if(this.setForm.type == 3 && this.setForm.level == ''){
+					this.$message.error('请选择会员等级')
+					return false
+				}else if(this.setForm.freeDays == ''){
+					this.$message.error('请设置天数')
+					return false
+				}else{
 					this.chooseData.forEach(element => {
 						let defaults = {}
 						defaults.date = element
@@ -294,6 +308,8 @@ export default {
 								: Number(this.setForm.price)
 						defaults.freeDays = Number(this.setForm.freeDays)
 						defaults.level = this.setForm.level
+						console.log(defaults);
+						
 						params.push(defaults)
 					})
 				}
@@ -403,8 +419,6 @@ export default {
 		matching(val) {
 			let diploid = ''
 			this.dataList.forEach(element => {
-				console.log(element)
-
 				if (element.vehicleModelDay == val) {
 					if (element.isGlobal == false) {
 						diploid = '特殊设置'
@@ -459,8 +473,6 @@ export default {
 				this.currentMonth.toString().length == 1
 					? '0' + this.currentMonth
 					: this.currentMonth
-			console.log(month)
-
 			priceList(this.currentYear + '-' + month + '-01').then(data => {
 				if (data.status == 200) {
 					this.dataList = data.data