up

pages/exhibit/detail.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class='contop'>
 			<view class='title'>{{info.name?info.name:''}}</view>
-			<view class='time'><span>时间：{{info.created_at?info.created_at:''}}</span><span>来源：苏州革命博物馆</span></view>
+			<view class='time'><span>时间：{{info.release_time?info.release_time:''}}</span><span>来源：{{info.source?info.source:''}}</span></view>
 			<view class='head'>
 				<img :src="info.head_upload.url" alt="">
 				<view class='head_unit'>

pages/exhibit/index.vue

@@ -18,7 +18,7 @@
 					<img :src="item.head_upload.url" alt="">
 					<view>
 						<view>{{item.name}}</view>
-						<view>时间：{{item.start_time}}起</view>
+						<view>时间：{{cancelTime(item.start_time)}}起</view>
 					</view>
 				</view>
 			</view>
@@ -66,6 +66,9 @@
 			this.getRelic()
 		},
 		methods:{
+			cancelTime(str){
+				return str?str.substring(0,10):''
+			},
 			toExhibitList(){
 				uni.navigateTo({
 					url: "/pages/exhibit/list"
@@ -93,7 +96,9 @@
 					data:{
 						page:1,
 						page_size:6,
-						state:1
+						// state:1
+						sort_name:'state',
+						sort_type:'DESC'
 					},
 					utilSuccess: function(res) {
 						that.exhibitList = res.data

pages/exhibit/list.vue

@@ -84,7 +84,9 @@
 					data: {
 						page: page,
 						page_size: 6,
-						state:this.tablist[this.current].idx
+						state:this.tablist[this.current].idx,
+						sort_name:'state',
+						sort_type:'DESC'
 					},
 					utilSuccess: function(r) {
 						var res = r.data;

pages/guide/index.vue

@@ -41,7 +41,7 @@
 					</view>
 				</view>
 			</block>
-			<!-- <view class="content_box">
+			<view class="content_box">
 				<view class="content_title" @click="showwhat('showform')">
 
 					<view class="infoicon">
@@ -63,7 +63,7 @@
 					</u-form>
 					<u-button type="primary" @click="tosubmit">确认提交</u-button>
 				</view>
-			</view> -->
+			</view>
 		</view>
 
 		<tabbar :current-page="1"></tabbar>

pages/order/visitorder.vue

@@ -16,23 +16,26 @@
 
 					<view class="orderBoxInfo flex-col">
 						<view class="orderBoxInfoRow flex-row" >
-							<text class="iconfont icon-youkexuzhi"></text>
+							<!-- <text class="iconfont icon-youkexuzhi"></text> -->
-							<text class="orderBoxInfoRowTxt">
+							<!-- <text class="orderBoxInfoRowTxt">
-								订单信息：{{timeFormat(item.date, 'MM月DD日')}}{{item.time}}丨{{item.details_count}} 位观众</text>
+								订单信息：{{timeFormat(item.date, 'MM月DD日')}}{{item.time}}丨{{item.details_count}} 位观众</text> -->
-
+							<text class="orderBoxInfoRowTxt">预约时间：{{timeFormat(item.date, 'MM月DD日')}}{{item.time}}</text>
+						</view>
+						<view class="orderBoxInfoRow flex-row" style="margin-top: 20rpx;">
+							<text class="orderBoxInfoRowTxt">入馆人数：{{item.details_count}} 位观众</text>
 						</view>
-						<view class="orderBoxInfoRow flex-row" v-if="item.type==1" style="margin-top: 20rpx;">
+						<!-- <view class="orderBoxInfoRow flex-row" v-if="item.type==1" style="margin-top: 20rpx;">
 							<text class="iconfont icon-iconfontgerenzhongxin"></text>
 							<text class="orderBoxInfoRowTxt">联系人：{{item.leader}}丨 {{item.mobile}}</text>
 						</view>
 						<view class="orderBoxInfoRow flex-row" v-if="item.type==1" >
 							<text class="iconfont icon-danwei"></text>
 							<text class="orderBoxInfoRowTxt">单位名称：{{item.unit}}</text>
-						</view>
+						</view> -->
 					</view>
-					<view class="orderBoxTime">
+					<!-- <view class="orderBoxTime">
 						<text>下单时间：{{item.created_at}}</text>
-					</view>
+					</view> -->
 
 					<view class="orderBoxFooter  flex-row flex_end">
 						<view class="fbtn cancel" v-if="item.status==1" style="margin-right: 23rpx;"
@@ -172,8 +175,8 @@
 		box-shadow: 2rpx 3rpx 10rpx 0px rgba(107, 94, 77, 0.3);
 	}
 
-	page {
+	page {
-		background-color: #f7f6f4;
+		background: #fbf3ea;
 	}
 
 	.orderBoxList {
@@ -182,13 +185,13 @@
 	}
 
 	.orderBox {
-		min-height: 393rpx;
+		/* min-height: 393rpx; */
 		background: #FFFFFF;
 		border-radius: 16rpx;
 		box-sizing: border-box;
 		padding: 29rpx 18rpx;
 		position: relative;
-		margin-bottom: 17rpx;
+		margin-bottom: 30rpx;
 	}
 
 	.orderBoxTitle {

pages/relic/detail.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class='contop'>
 			<view class='title'>{{info.name?info.name:''}}</view>
-			<view class='time'><span>时间：{{info.created_at?info.created_at:''}}</span><span>来源：苏州革命博物馆</span></view>
+			<view class='time'><span>时间：{{info.release_time?info.release_time:''}}</span><span>来源：{{info.source?info.source:''}}</span></view>
 			<view class='head'>
 				<img :src="info.head_upload.url" alt="">
 			</view>