Merge branch 'master' of http://47.114.134.244:3000/chenkainan/yandu_WeChat

subPackages/hotelHomestay/order.vue

@@ -214,7 +214,7 @@
 			},
 			
 			total () {
-				return this.skuInfo.money/100 * this.buyNum || 0
+				return this.skuInfo.money/100 * this.buyNum * this.selectDate.differDays || 0
 			},
 			
 			order () {

subPackages/notice/noticeDetail.vue

@@ -4,7 +4,7 @@
 		
 		<view class="topBox" :style="{backgroundImage: 'url('+showImg(detail.image)+')', backgroundSize: 'cover'}">
 			<view>{{detail.title}}</view>
-			<view style="font-weight: 500;font-size: 24rpx;margin-top: 22rpx;">{{detail.create_time}}</view>
+			<view style="font-weight: 500;font-size: 24rpx;margin-top: 22rpx;">{{detail.create_time.slice(0,10)}}</view>
 		</view>
 		
 		<view class="content" v-html="formateRichText(detail.content)"></view>

subPackages/notice/noticeList.vue

@@ -16,7 +16,7 @@
 				</view>
 				<view class="time">
 					<image src="https://static.ticket.sz-trip.com/yandu/images/notice/time.png" mode=""></image>
-					{{item.create_time}}
+					{{item.create_time.slice(0,10)}}
 				</view>
 			</view>
 		</navigator>

subPackages/order/detail.vue

@@ -74,7 +74,7 @@
 							class="specifications-item flex-between">
 							<view>{{item.specifications_name}}</view>
 							<view class="flex-between" style="width: 150rpx;">
-								<view>￥{{item.pay_money / 100}}</view>
+								<view>￥{{item.money / 100}}</view>
 								<view>x{{item.num}}</view>
 							</view>
 						</view>
@@ -288,7 +288,7 @@
 					<view class="hotel-skuName flex-between">
 						<view class="text-overflow">{{info.order_child[0].specifications_name}}</view>
 						<view class="flex-between">
-							<view>￥{{info.order_child[0].pay_money / 100}}</view>
+							<view>￥{{info.order_child[0].money / 100}}</view>
 							<view>x{{info.order_child[0].num}}</view>
 						</view>
 					</view>
@@ -1236,6 +1236,7 @@
 				display: inline-block;
 				width: 130rpx;
 				color: #666666;
+				white-space: nowrap;
 			}
 		}
 

subPackages/travelGuide/detail.vue

@@ -29,7 +29,7 @@
 				<view class="info-title text-overflowRows">{{info.title}}</view>
 				<view class="flex-between" style="padding: 40rpx 0 0;">
 					<view>浏览 {{info.view}}</view>
-					<view>发布时间：{{info.create_time}}</view>
+					<view>发布时间：{{info.create_time.slice(0,10)}}</view>
 				</view>
 				
 				<!-- <view class="text-overflow" v-if="info.start_time && info.end_time">时间：{{info.start_time}} - {{info.end_time}}</view> -->

subPackages/travelGuide/travelGuide.vue

@@ -59,11 +59,12 @@
 		},
 		onShow() {
 			this.showMore = true
+			this.list = []
+			this.getArticleByType()
 		},
 		onReady() {
 			this.type_id = 42
 			this.getArticleType()
-			this.getArticleByType()
 		},
 		onLoad(options) {
 			let that = this

subPackages/user/collect.vue

@@ -4,7 +4,7 @@
 			<image :src="showImg(item.arr.image)" mode="aspectFill"></image>
 			<view class="content flex-column">
 				<view class="title text-overflowRows">{{item.arr.title}}</view>
-				<view class="price">{{item.arr.low_money / 100}}</view>
+				<view class="price" v-if="item.arr.low_money">{{item.arr.low_money / 100}}</view>
 			</view>
 		</view>
 	</view>
@@ -35,7 +35,7 @@
 				let url = ''
 				switch (item.type){
 					case 1:
-						url= ''
+						url= '/subPackages/travelGuide/detail?id=' + item.arr.id
 						break;
 					case 2:
 						url= '/subPackages/ticketBooking/detail?id=' + item.arr.id
@@ -44,7 +44,7 @@
 						url= '/subPackages/food/foodDetail?id=' + item.arr.id
 						break;
 					case 4:
-						url= ''
+						url= '/subPackages/hotelHomestay/detail?id=' + item.arr.id
 						break;
 					case 5:
 						url= '/subPackages/techan/detail?id=' + item.arr.id
@@ -53,7 +53,7 @@
 						url= ''
 						break;
 					case 7:
-						url= ''
+						url= '/subPackages/eventCalendar/detail?id=' + item.arr.id
 						break;
 					default:
 						break;