修复bug

common.scss

@@ -63,6 +63,7 @@
         height: 228rpx;
         border-radius: 20rpx;
         overflow: hidden;
+		flex-shrink: 0;
         image {
             width: 100%;
             height: 100%;
@@ -145,6 +146,8 @@
                 font-size: 28rpx;
                 color: #fff;
                 text-align: right;
+				margin-right: 50rpx;
+				margin-top: 10rpx;
                 text {
                     color: $uni-text-color-grey;
                     font-size: 25rpx;

components/active/active-item.vue

@@ -5,7 +5,7 @@
 		v-for="(item, index) in cardListData" :key="index">
 			<view class="content" :class="['U','S'].includes(item.state) ? 'content_border' : ''">
 				<view class="left">
-					<image :src="item.image.split(',')[0]" mode="aspectFill">
+					<image :src="item.image && item.image.split(',')[0]" mode="aspectFill">
 				</view>
 				<view class="right">
 					<view class="detailed">

components/travel/travelList.vue

@@ -4,7 +4,7 @@
 		v-for="(item, index) in cardListData" 
 		:key="index" @click="toDetail(item)">
 		    <view class="left">
-		        <image :src="item.image" alt="">
+		        <image :src="item.image && item.image.split(',')[0]" mode="aspectFill">
 		    </view>
 		    <view class="right">
 		        <view class="detailed">

pages/index/index.vue

@@ -64,7 +64,7 @@
 			<view class="hd-list">
 				
 				<uv-tabs
-					@click= "tabs"
+					@click="tabs"
 					:list="hdList" 
 					lineWidth="50rpx" 
 					:lineColor="`url(${lineBg}) 100% 100%`"
@@ -80,7 +80,7 @@
 					itemStyle="padding-left: 15px; padding-right: 15px; height: 44px;"
 				></uv-tabs>
 				
-				<uv-tabs
+				<!-- <uv-tabs
 					@click="({index}) => type = index"
 					:list="typeList" 
 					lineWidth="50rpx" 
@@ -95,10 +95,14 @@
 						transform: 'scale(1)'
 					}" 
 					itemStyle="padding-left: 15px; padding-right: 15px; height: 44px;"
-				></uv-tabs>
+				></uv-tabs> -->
+				
+				<view v-for="(item, index) in cardListData"
+				:key="item.id">
+					<active-item :cardListData="[item]" v-if="item.ntype == 0"/>
+					<travelList :cardListData="[item]" v-else/>
+				</view>
 				
-				<active-item :cardListData="cardListData" v-if="type == 0"/>
-				<travelList :cardListData="travelList" v-else/>
 				<uv-load-more :status="status" fontSize="24rpx" dashed line />
 			</view>
 		
@@ -158,10 +162,10 @@
 			return {
 				status:"loading",
 				params:{
-					title:'',
-					state:0,
-					pageNo:1,
-					pageSize:10
+					title : '',
+					state : 0,
+					pageNo : 1,
+					pageSize : 10
 				},
 				totalPage:0,
 				bgColor:'transparent',
@@ -233,40 +237,59 @@
 				this.getActivityPageList()
 			},
 			async getActivityPageList() {
-				this.$api('activityPageList', {
-					...this.params,
-					cityId : this.selectArea.id
-				}, res=>{
-					uni.stopPullDownRefresh()
-					if(res.code == 200) {
-						this.totalPage = res.result.pages
-						this.cardListData = [...this.cardListData,...res.result.records]
-						if(this.params.pageNo >= this.totalPage) {
-							this.status = "nomore"
-						}else {
-							this.status = "loadmore"
-						}
-					}
+				// this.$api('activityPageList', {
+				// 	...this.params,
+				// 	cityId : this.selectArea.id
+				// }, res=>{
+				// 	uni.stopPullDownRefresh()
+				// 	if(res.code == 200) {
+				// 		this.totalPage = res.result.pages
+				// 		this.cardListData = [...this.cardListData,...res.result.records]
+				// 		if(this.params.pageNo >= this.totalPage) {
+				// 			this.status = "nomore"
+				// 		}else {
+				// 			this.status = "loadmore"
+				// 		}
+				// 	}
+				// })
+				// this.$api('travelPageList', {
+				// 	...this.params,
+				// 	// pageNo: this.params.pageNo,
+				// 	// pageSize: this.params.pageSize,
+				// 	// title: this.params.title,
+				// 	// state: this.params.state,
+				// }, res=>{
+				// 	uni.stopPullDownRefresh()
+				// 	if(res.code == 200) {
+				// 		this.totalPage = res.result.pages
+				// 		this.travelList = [...this.travelList,...res.result.records]
+				// 	}
+				// })
+				
+				let list1 = await this.getApi('activityPageList')
+				let list2 = await this.getApi('travelPageList')
+				
+				console.log(list1, list2);
+				
+				list1.forEach(n => {
+					n.ntype = 0
 				})
-				this.$api('travelPageList', {
-					...this.params,
-					// pageNo: this.params.pageNo,
-					// pageSize: this.params.pageSize,
-					// title: this.params.title,
-					// state: this.params.state,
-				}, res=>{
-					uni.stopPullDownRefresh()
-					if(res.code == 200) {
-						this.totalPage = res.result.pages
-						this.travelList = [...this.travelList,...res.result.records]
-					}
+				
+				list2.forEach(n => {
+					n.ntype = 1
 				})
 				
-				// let list1 = await this.getApi('activityPageList')
-				// let list2 = await this.getApi('travelPageList')
+				if(this.params.pageNo >= this.totalPage) {
+					this.status = "nomore"
+				}else {
+					this.status = "loadmore"
+				}
 				
-				// console.log(list1, list2);
+				this.cardListData = [...this.cardListData, ...list1, ...list2]
 				
+				this.cardListData.sort((a, b) => {
+					return new Date(b.startTime).getTime() - new Date(a.startTime).getTime()
+				})
 			},
 			getApi(api){
 				return new Promise((success, error) => {
@@ -275,6 +298,9 @@
 						cityId : this.selectArea.id
 					}, res => {
 						if(res.code == 200) {
+							if(this.totalPage < res.result.pages){
+								this.totalPage = res.result.pages
+							}
 							success(res.result.records)
 						}
 					})
@@ -453,6 +479,9 @@
 							background: url('@/static/image/home/hd-bg.png') no-repeat;
 							background-size: 100% 100%;
 							position: relative;
+							display: flex;
+							align-items: center;
+							justify-content: space-between;
 							.left-box {
 								height: 100%;
 								display: flex;
@@ -476,9 +505,9 @@
 								}
 							}
 							.hdqd-img {
-								position: absolute;
-								right: 22rpx;
-								top: 25rpx;
+								// position: absolute;
+								// right: 22rpx;
+								// top: 25rpx;
 								width: 123rpx;
 								height: 100rpx;
 							}
@@ -492,6 +521,9 @@
 							background-size: 100% 100%;
 							position: relative;
 							margin-top: 18rpx;
+							display: flex;
+							align-items: center;
+							justify-content: space-between;
 							.left-box {
 								height: 100%;
 								display: flex;
@@ -515,9 +547,9 @@
 								}
 							}
 							.hdqd-img {
-								position: absolute;
-								right: 22rpx;
-								top: 25rpx;
+								// position: absolute;
+								// right: 22rpx;
+								// top: 25rpx;
 								width: 123rpx;
 								height: 100rpx;
 							}

pages_order/huodong-detail.vue

@@ -5,7 +5,14 @@
 		
 		<view class="content">
 			<view class="content-head">
-				<image class="image-box" :src="imageArr" mode="aspectFill"></image>
+				
+				<uv-swiper :list="imageArr"
+				keyName="image" 
+				height="406rpx" radius="30rpx" 
+				bgColor="transparent" indicator
+				indicatorMode="dot"></uv-swiper>
+				
+				<!-- <image class="image-box" :src="imageArr" mode="aspectFill"></image> -->
 				<view class="msg-box">
 					<view class="msg-box-title">{{activityDetails.title}}</view>
 					<view class="msg-box-time">开始时间：{{activityDetails.startTime}}</view>
@@ -49,7 +56,7 @@
 				<view class="title-box">注意事项</view>
 				<view class="value-box">
 					<view class="lv-msg-box">
-                        {{ activityDetails.precautions}}
+						<uv-parse :content="activityDetails.precautions"></uv-parse>
 					</view>
 				</view>
 			</view>
@@ -163,7 +170,7 @@
 		computed:{
 			imageArr() {
 				return this.activityDetails.image
-				&& this.activityDetails.image.split(',')[0]
+				&& this.activityDetails.image.split(',')
 			}
 		},
 		onShareAppMessage(res) {

pages_order/lvyou-detail.vue

@@ -5,7 +5,15 @@
 		
 		<view class="content">
 			<view class="content-head">
-				<image class="image-box" :src="travelDetails.travel.image" mode=""></image>
+				
+				<uv-swiper :list="travelDetails.travel.image
+				&& travelDetails.travel.image.split(',')"
+				keyName="image" 
+				height="406rpx" radius="30rpx" 
+				bgColor="transparent" indicator
+				indicatorMode="dot"></uv-swiper>
+				
+				<!-- <image class="image-box" :src="travelDetails.travel.image" mode="aspectFill"></image> -->
 				<view class="msg-box">
 					<view class="msg-box-title">{{travelDetails.travel.title}}</view>
 					<view class="msg-box-time">开始时间：{{travelDetails.travel.startTime}}</view>

pages_order/payOrder.vue

@@ -35,7 +35,7 @@
 					
 					<uv-cell :border="false"
 					title="购票内容"
-					:value="typeList[dataInfo.type].name"
+					:value="typeList[dataInfo.typePrice].name"
 					/>
 					
 					<uv-cell :border="false"

uni_modules/uv-datetime-picker/components/uv-datetime-picker/props.js

@@ -78,7 +78,7 @@ export default {
 		// 各列中，单个选项的高度
 		itemHeight: {
 			type: [String, Number],
-			default: 44
+			default: 88
 		},
 		// 取消按钮的文字
 		cancelText: {