up

manifest.json

@@ -60,7 +60,10 @@
 			"scope.userLocation": {
 				"desc": "提供您最近的活动地址"
 			}
-        }
+		},
+		"requiredPrivateInfos": [
+			"getLocation"
+		]
 	},
 	"mp-alipay": {
 		"usingComponents": true

pages/activity/book.vue

@@ -9,13 +9,13 @@
 					<view class="activityBox-row flex-row justify-between">
 						<text class="activityBox-title">{{list.name}}</text>
 						<view class="tag tag_green activityBox_btn">
-							<text>{{list.target_name}}</text>
+							<text>{{list.type_name}}</text>
 						</view>
 					</view>
 
 					<view class="activityBox-row">
 						<text class="icon-shijian iconfont"></text>
-						<text>活动时间：{{list.start_time}}-{{list.end_time}}</text>
+						<text>活动时间：{{getHm(list.start_time)}}-{{getHm(list.end_time)}}</text>
 
 					</view>
 					<!-- <view class="activityBox-row">
@@ -350,6 +350,11 @@
 			clearTimeout(this.timer)
 		},
 		methods: {
+			getHm(val) {
+				if (val) {
+					return this.$moment(val).format("HH:mm:ss")
+				} else return "";
+			},
 			confirmCards(e){
 				this.card_type_names = e.value[0].label
 				this.form.card_type =  e.value[0].value

pages/activity/index.vue

@@ -19,7 +19,7 @@
 					</view>
 					<view class="activityBox-row flex-row justify-between">
 						<view class="tag tag_green activityBox_btn">
-							<text>{{isUnde(item.target_name)}}</text>
+							<text>{{isUnde(item.type_name)}}</text>
 						</view>
 						<view class="tag" :class="{activityBox_btn:item.isCanBook}">
 							<text>{{item.isCanBook?"立即报名":"不可报名"}}</text>
@@ -28,7 +28,7 @@
 
 					<view class="activityBox-row">
 						<text class="icon-shijian iconfont"></text>
-						<text>活动时间：{{isUnde(item.start_time)}}-{{getHm(item.end_time)}}</text>
+						<text>活动时间：{{getHm(item.start_time)}}-{{getHm(item.end_time)}}</text>
 
 					</view>
 					<!-- <view class="activityBox-row">
@@ -68,7 +68,7 @@
 				list: [],
 				latitude: "",
 				longitude: "",
-				isloading: false
+				isloading: true
 			}
 		},
 		onLoad() {
@@ -112,11 +112,11 @@
 						page_size: 100
 					},
 					utilSuccess: function(res) {
-						that.isloading = false;
 						for (var mod of res.data) {
 							mod.isCanBook = that.$moment(nt).isBefore(mod.end_plan);
 						}
 						that.list = res.data;
+						that.isloading = false;
 					},
 					utilFail: function(res) {
 
@@ -132,7 +132,7 @@
 			},
 			getHm(val) {
 				if (val) {
-					return this.$moment(val).format("HH:mm")
+					return this.$moment(val).format("HH:mm:ss")
 				} else return "";
 			}
 		}

pages/activity/info.vue

@@ -18,13 +18,13 @@
 					<view class="activityBox-row flex-row justify-between">
 						<text class="activityBox-title">{{isUnde(list.name)}}</text>
 						<view class="tag tag_green activityBox_btn">
-							<text>{{isUnde(list.target_name)}}</text>
+							<text>{{isUnde(list.type_name)}}</text>
 						</view>
 					</view>
 
 					<view class="activityBox-row">
 						<text class="icon-shijian iconfont"></text>
-						<text>活动时间：{{isUnde(list.start_time)}}-{{isUnde(list.end_time)}}</text>
+						<text>活动时间：{{getHm(list.start_time)}}-{{getHm(list.end_time)}}</text>
 
 					</view>
 					<!-- <view class="activityBox-row">
@@ -60,7 +60,7 @@
 					<text class="infoBox-titletxt">活动详情</text>
 				</view>
 				<view class="infoBox-content">
-					<rich-text :nodes="list.content"></rich-text>
+					<rich-text  style="text-indent: 2em;font-size: 28rpx;" :nodes="list.content"></rich-text>
 				</view>
 			</view>
 			<view class="infofooter flex-row" v-if="list.isCanBook">
@@ -127,7 +127,6 @@
 					utilSuccess: function(res) {
 						res.isCanBook = that.$moment(nt).isBefore(res.end_plan);
 						that.list = res;
-						that.list.end_time = that.$moment(res.end_time).format("HH:mm");
 						wx.setStorage({
 							key: 'activityinfo',
 							data: res,
@@ -151,6 +150,11 @@
 				} else {
 					return ""
 				}
+			},
+			getHm(val) {
+				if (val) {
+					return this.$moment(val).format("HH:mm:ss")
+				} else return "";
 			}
 		}
 	}
@@ -167,6 +171,7 @@
 		box-sizing: border-box;
 		padding: 40rpx 0rpx;
 		background: #FFFFFF;
+		margin-bottom: 40rpx;
 	}
 
 	.infoBox-title {
@@ -174,7 +179,7 @@
 	}
 
 	.infoBox-titletxt {
-		font-size: 26rpx;
+		font-size: 30rpx;
 		color: #4E4E4E;
 		margin-left: 21rpx;
 	}
@@ -184,6 +189,7 @@
 		box-sizing: border-box;
 		font-size: 24rpx;
 		color: #828282;
+		margin-bottom: 100rpx;
 	}
 
 	.infofooter {

pages/order/activityorderinfo.vue

@@ -8,13 +8,17 @@
 
 				<view class="orderBoxInfo flex-col">
 					<view class="orderBoxInfoRow flex-row" >
+						<text class="iconfont icon-youkexuzhi"></text>
+						<text class="orderBoxInfoRowTxt">活动名称：{{info.activity.name||"加载中..."}}</text>
+					</view>
+					<view class="orderBoxInfoRow flex-row" style="margin-top: 20rpx;">
 						<text class="iconfont icon-shijian"></text>
 						<text
-							class="orderBoxInfoRowTxt">活动时间：{{timeFormat(info.activity.start_time, 'MM月DD日')}}{{getHm(info.activity.start_time)}}-{{getHm(info.activity.end_time)}}</text>
+							class="orderBoxInfoRowTxt">活动时间：{{timeFormat(tstart_time, 'MM月DD日')}}{{timeFormat(tstart_time,"HH:mm")}}-{{timeFormat(tend_time,"HH:mm")}}</text>
 					</view>
 					<view class="orderBoxInfoRow flex-row" style="margin-top: 20rpx;">
 						<text class="iconfont icon-renshu"></text>
-						<text class="orderBoxInfoRowTxt">活动人数：{{info.total}}</text>
+						<text class="orderBoxInfoRowTxt">活动人数：{{info.total||""}}</text>
 					</view>
 
 				</view>
@@ -43,7 +47,8 @@
 					</view>
 					<!-- <text class="ewminfo">{{isuse?'已使用':'请前往现场核销订单二维码'}}</text> -->
 				</view>
-				<view v-if="info.type==2" class="orderBoxInfo flex-col ewmcode" :key='index' v-for="(item,index) in detailsinfo">
+				<view v-if="info.type==2" class="orderBoxInfo flex-col ewmcode" :key='index'
+					v-for="(item,index) in detailsinfo">
 					<text>入场码：{{info.code}}-{{item.code}}</text>
 					<view>
 						<view class="imgs">
@@ -124,6 +129,8 @@
 				optionid: "",
 				timers: "",
 				isused: false,
+				tstart_time:"",
+				tend_time:""
 			}
 		},
 		onLoad(options) {
@@ -174,9 +181,12 @@
 					data: {
 						id: id
 					},
+					customLoading: true,
 					utilSuccess: function(res) {
 						that.info = res;
 						that.detailsinfo = res.details;
+						that.tstart_time=that.info.activity.start_time;
+						that.tend_time=that.info.activity.end_time;
 						if (res.status != 1) {
 							clearInterval(that.timers)
 						}
@@ -208,13 +218,10 @@
 					}
 				})
 			},
-			getHm(val) {
-				if (val) {
-					return this.$moment(val).format("hh:MM")
-				} else return "";
-			},
 			timeFormat(time, format) {
+				if (time) {
 					return this.$moment(time).format(format)
+				} else return "";
 			}
 		}
 	}
@@ -344,6 +351,7 @@
 		display: inline-block;
 		margin-bottom: 20rpx;
 	}
+
 	.imgs cover-image {
 		position: absolute;
 		width: 200rpx;
@@ -353,19 +361,23 @@
 		right: 0rpx;
 		bottom: 0rpx;
 	}
+
 	.imgs canvas {
 		display: inline-block;
 		vertical-align: middle;
 	}
+
 	.imgsname {
 		display: inline-block;
 		text-align: center;
 		margin-left: 15rpx;
 	}
+
 	.imgs text {
 		display: block;
 		/* margin-left: 40rpx; */
 	}
+
 	.imgs .isuse cover-view {
 		/* opacity: .4; */
 		background-color: rgba(255, 255, 255, 0.6);

utils/util.js

@@ -358,7 +358,7 @@ const isValidCardID = cardID => {
 };
 
 const shareInfo = {
-	title:"苏州的红色摇篮",
+	title:"",
 	imageUrl:"/static/share.jpg"
 }
 /**