Merge branch 'base-modify'

src/views/baseInfo/bannerSetting.vue

@@ -36,6 +36,11 @@
         <template scope="scope">
           <span>{{scope.row.url}}</span>
         </template>
+      </el-table-column>
+       <el-table-column align="center" label="ios跳转">
+        <template scope="scope">
+          <span>{{scope.row.iosUrl}}</span>
+        </template>
       </el-table-column>
       <el-table-column align="center" width="150" label="操作">
         <template scope="scope">
@@ -91,6 +96,9 @@
         <el-form-item label="跳转链接">
           <el-input v-model="form.url" placeholder="请输入跳转链接"></el-input>
         </el-form-item>
+        <el-form-item label="ios跳转链接">
+          <el-input v-model="form.iosUrl" placeholder="请输入ios跳转链接"></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancelHandel">取 消</el-button>
@@ -152,7 +160,8 @@
           url: "",
           cover:"",
           type: "0",
-          location: "0"
+          location: "0",
+          iosUrl:''
         },
         listQuery: {
           pageNo: 1,
@@ -247,7 +256,8 @@
           cover: "",
           url:"",
           type: "0",
-          location: "0"
+          location: "0",
+          iosUrl:''
         }
       },
       showImgDialog(drivingLicensePath) {

src/views/conference/activeData/index.vue

@@ -23,15 +23,15 @@
 			<ul>
 				<li>
 					<p>{{information.attendNum}}</p>
-					<p>参与人数(次)</p>
+					<p>参与人数(人)</p>
 				</li>
 				<li>
 					<p>{{information.finishNum}}</p>
-					<p>完成任务数(个)</p>
+					<p>完成任务数(人)</p>
 				</li>
 				<li>
 					<p>{{information.amount}}</p>
-					<p>已发放现金总额(次)</p>
+					<p>已发放现金总额(元)</p>
 				</li>
 			</ul>
 		</div>
@@ -52,11 +52,11 @@
 			<el-table-column prop="positionName" label="身份" align="center"></el-table-column>
 			<el-table-column prop="status" label="状态" align="center">
 				<template scope="scope">
-					<span>{{scope.row.status == 1 ? '未完成' : '已完成'}}</span>
+					<span>{{scope.row.status == 1 ? '已完成' : '未完成'}}</span>
 				</template>
 			</el-table-column>
 			<el-table-column prop="amount" label="当前金额(元)" align="center"></el-table-column>
-			<el-table-column prop="crtTime" label="邀请人数" align="center"></el-table-column>
+			<el-table-column prop="inviteNum" label="邀请人数" align="center"></el-table-column>
 			<el-table-column prop="prizes" label="抽奖礼品" align="center"></el-table-column>
 			<el-table-column prop="attendTime" label="参加时间" align="center">
 				<template scope="scope">
@@ -155,6 +155,7 @@ export default {
 		},
 		//清空搜索
 		clearSearch() {
+			this.time = null
 			this.listQuery = {
 				page: 1,
 				limit: 10,
@@ -194,15 +195,17 @@ export default {
 		},
 		//时间筛选
 		changeTime(val) {
+			console.log(val);
+			
 			this.listQuery.page = 1
 			if (!!val) {
 				let value = val.split(' - ')
-				this.listQuery.startDate = value[0] + ' 00:00:00'
-				this.listQuery.endDate = value[1] + ' 23:59:59'
+				this.listQuery.startTime = new Date((value[0]+" 00:00:00")).getTime()
+				this.listQuery.endTime = new Date((value[1]+" 23:59:59")).getTime()
 				this.getList()
 			} else {
-				this.listQuery.startDate = null
-				this.listQuery.endDate = null
+				this.listQuery.startTime = null
+				this.listQuery.endTime = null
 				this.getList()
 			}
 		},

src/views/conference/apply/applyList.vue

@@ -89,6 +89,7 @@ export default {
 		},
 		//清空搜索
 		clearSearch() {
+			this.time = null
 			this.listQuery = {
 				page: 1,
 				limit: 10,
@@ -97,6 +98,7 @@ export default {
 				phone: null,
 				activityId: 2
 			}
+			this.getList()
 		},
 		//导出
 		downloadExcel() {
@@ -129,12 +131,12 @@ export default {
 			this.listQuery.page = 1
 			if (!!val) {
 				let value = val.split(' - ')
-				this.listQuery.startDate = value[0] + ' 00:00:00'
-				this.listQuery.endDate = value[1] + ' 23:59:59'
+				this.listQuery.startTime = value[0] + ' 00:00:00'
+				this.listQuery.endTime = value[1] + ' 23:59:59'
 				this.getList()
 			} else {
-				this.listQuery.startDate = null
-				this.listQuery.endDate = null
+				this.listQuery.startTime = null
+				this.listQuery.endTime = null
 				this.getList()
 			}
 		},

src/views/conference/award/awardSet.vue

 <template>
 	<div class="app-container calendar-list-container">
-		<div class="online">
+		<!-- <div class="online">
 			<h4>参与活动奖励抽奖</h4>
 			<table border="1">
 				<tr>
@@ -19,7 +19,7 @@
 					<td>宫格9</td>
 				</tr>
 			</table>
-		</div>
+		</div> -->
 		<div class="local">
 			<h4>发布会现场奖品抽奖</h4>
 			<table border="1">
@@ -358,15 +358,15 @@ export default {
 				} else {
 					if (data.data.localePrize != ''){
 						data.data.localePrize.forEach(element => {
-							if (!element.goodsId) {
-								element.goodsId = ''
-							}
-							if (!element.totalStock) {
-								element.totalStock = ''
-							}
-							if (!element.dayMaxUse) {
-								element.dayMaxUse = ''
-							}
+							// if (!element.goodsId) {
+							// 	element.goodsId = ''
+							// }
+							// if (!element.totalStock) {
+							// 	element.totalStock = ''
+							// }
+							// if (!element.dayMaxUse) {
+							// 	element.dayMaxUse = ''
+							// }
 						});
 					}	
 					this.table = data.data.localePrize
@@ -491,13 +491,13 @@ li p:nth-child(7) {
 .online,
 .local {
 	width: 49%;
-	display: inline-block;
+	margin: 0 auto;
 }
 .online {
 	float: left;
 }
 .local {
-	float: right;
+	/* float: right; */
 }
 h4 {
 	text-align: center;

src/views/conference/prizeList/prizeLists.vue

@@ -117,7 +117,7 @@ export default {
 				phone: null,
 				activityId: 2,
 				prizeType: null,
-				hasWinning: 2
+				hasWinning: 1
 			}
 		}
 	},
@@ -153,14 +153,16 @@ export default {
 		},
 		//清空搜索
 		clearSearch() {
+			this.time=null
 			this.listQuery = {
 				page: 1,
 				limit: 10,
 				startTime: null,
 				endTime: null,
 				phone: null,
-				activityId: 1
+				activityId: 2
 			}
+			this.getList()
 		},
 		//导出
 		downloadExcel() {
@@ -195,12 +197,12 @@ export default {
 			this.listQuery.page = 1
 			if (!!val) {
 				let value = val.split(' - ')
-				this.listQuery.startDate = value[0] + ' 00:00:00'
-				this.listQuery.endDate = value[1] + ' 23:59:59'
+				this.listQuery.startTime = value[0] + ' 00:00:00'
+				this.listQuery.endTime = value[1] + ' 23:59:59'
 				this.getList()
 			} else {
-				this.listQuery.startDate = null
-				this.listQuery.endDate = null
+				this.listQuery.startTime = null
+				this.listQuery.endTime = null
 				this.getList()
 			}
 		},

src/views/order/modal/rentOrderDetailModal.vue

@@ -60,7 +60,7 @@
 				</tr>
 				<tr>
 					<td>
-						{{orderDetailInfo.name}}  </br>  {{orderDetailInfo.vehicalNumberPlat}}
+						{{orderDetailInfo.name}}  <br/>>  {{orderDetailInfo.vehicalNumberPlat}}
 						<span v-if="orderDetailInfo.code">({{orderDetailInfo.code}})</span>
 						<span v-else></span>
 					</td>
@@ -74,20 +74,20 @@
 
 					<td>
 						<p v-if="orderDetailInfo.rentVehiclePriceVO">
-							<span v-if=" orderDetailInfo.rentVehiclePriceVO.freeDayNum && orderDetailInfo.rentVehiclePriceVO.freeDayNum > 0">会员特权{{orderDetailInfo.rentVehiclePriceVO.freeDayNum}}天</span>
+							<span v-if=" orderDetailInfo.rentVehiclePriceVO.freeDayNum && orderDetailInfo.rentVehiclePriceVO.freeDayNum > 0">会员特权{{orderDetailInfo.rentVehiclePriceVO.freeDayNum+orderDetailInfo.orderRentVehicleDetail.delayAddFreeDays}}天</span>
 							<span v-else>无</span>
 						</p>
-            <p v-else>{{orderInfo('免费天数')}}</p>
+           				 <p v-else>{{orderInfo('免费天数')}}</p>
 <!--						<p v-else>无</p>-->
 					</td>
 
 					<td>
 						<p v-if="orderDetailInfo.rentVehiclePriceVO && orderDetailInfo.rentVehiclePriceVO.dayNum > 0">
-              <span v-if="!orderDetailInfo.rentVehiclePriceVO.useAmountList">{{orderDetailInfo.rentVehiclePriceVO.modelAmount}}元/{{orderDetailInfo.rentVehiclePriceVO.dayNum}}天</span>
-              <span v-else> <div v-for="item in orderDetailInfo.rentVehiclePriceVO.useAmountList" :key="item.date" :label="item.date">{{getRentalDate(item.date)}}:{{item.price}}元/天</div></span>
-<!--              <span v-for="item in orderDetailInfo.rentVehiclePriceVO.useAmountList" :key="item"></span>-->
-            </p>
-            <p v-else>无</p>
+							<span v-if="!orderDetailInfo.rentVehiclePriceVO.useAmountList">{{orderDetailInfo.rentVehiclePriceVO.modelAmount}}元/{{orderDetailInfo.rentVehiclePriceVO.dayNum}}天</span>
+							<span v-else> <div v-for="item in orderDetailInfo.rentVehiclePriceVO.useAmountList" :key="item.date" :label="item.date">{{getRentalDate(item.date)}}<br/>{{item.price}}元/天</div></span>
+							<!-- <span v-for="item in orderDetailInfo.rentVehiclePriceVO.useAmountList" :key="item"></span>-->
+						</p>
+            			<p v-else>无</p>
 						<!-- <p v-else-if="orderDetailInfo.costDetail.children[0]">{{orderDetailInfo.costDetail.children[0].key}} : {{orderDetailInfo.costDetail.children[0].detail}}</p> -->
 					</td>
 
@@ -239,6 +239,10 @@ export default {
 		ElInput,
 		ElRow
 	},
+	created(){
+		console.log(this.orderDetailInfo);
+		
+	},
 	data() {
 		return {
 			needDamageSafe:null,