Merge branch 'dev' into 'v2.0.0'

# Conflicts:
#   packageOther/about/index.vue

components/pay-popup/pay-popup.vue

@@ -93,12 +93,10 @@
 			},
 
 			close() {
-				this.checked = false
 				this.$emit('close')
 			},
 
 			success(id) {
-				this.checked = false
 				this.$emit('success', id)
 			},
 

manifest.json

@@ -65,19 +65,26 @@
             "minified" : true,
             "postcss" : false
         },
-		"optimization" : {
-			"subPackages" : true
-		},
+        "optimization" : {
+            "subPackages" : true
+        },
         "usingComponents" : true
     },
     "mp-alipay" : {
-        "usingComponents" : true
+        "usingComponents" : true,
+        "appid" : "2021003127607930",
+        "component2" : true
     },
     "mp-baidu" : {
         "usingComponents" : true
     },
     "mp-toutiao" : {
-        "usingComponents" : true
+        "usingComponents" : true,
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true
+        }
     },
     "uniStatistics" : {
         "enable" : false

packagePrize/choice/index.vue

@@ -116,8 +116,6 @@
 			const res = uni.getMenuButtonBoundingClientRect()
 			this.statusHeight = res.top //胶囊距离顶部
 			// #endif
-		},
-		onShow() {
 			this.getPrizeList()
 		},
 		methods: {

packagePrize/rolling/index.vue

@@ -173,7 +173,13 @@
 								_this.btnShow = true
 								_this.running()
 							},500)
-						}
+						} else if (res.code == 401 || res.code == 500) {
+							uni.hideLoading();
+							clearInterval(time)
+							uni.navigateBack({
+								delta: 2
+							})
+						} 
 						
 						if (num == 10) {
 							uni.hideLoading();

pages/index/index.vue

@@ -29,7 +29,7 @@
 				
 				<!-- 盲票轮播 -->
 				<view class="ticket">
-					<swiper class="ticket-swiper" :current="ticketIndex" :autoplay="false" :circular="true" @change="changeTicket">
+					<swiper class="ticket-swiper" :current="ticketIndex" :autoplay="false" :circular="true" :duration="200" @change="changeTicket">
 						<swiper-item v-for="(item, index) in ticketList" :key="index" @click="toTicketBox(item)">
 							<view class="ticket-swiper-item flex">
 								<image class="ticket-swiper-item-box" :src="item.picUrl[2]" mode="scaleToFill"></image>
@@ -70,7 +70,7 @@
 				
 				<!-- 盲票名称轮播 -->
 				<view class="ticket-title" flex>
-					<swiper class="ticket-title-swiper flex" :current="ticketTitleIndex" previous-margin="110px" next-margin="110px" :autoplay="false" :circular="true" @change="changeTicketTitle">
+					<swiper class="ticket-title-swiper flex" :duration="0" :current="ticketTitleIndex" previous-margin="110px" next-margin="110px" :autoplay="false" :circular="true" @change="changeTicketTitle">
 						<swiper-item v-for="(item, index) in ticketList" :key="index" @click="clickTicketTitle(index)">
 							<view class="ticket-title-swiper-item flex" :class="{ 'action': ticketTitleIndex == index }">
 								<text>{{ item.title }}</text>
@@ -196,7 +196,7 @@
 					this.setNum(detail.current)
 					setTimeout(()=> {
 						this.clickLoading = true
-					}, 500)
+					}, 200)
 				}
 			},
 			
@@ -210,22 +210,16 @@
 					this.setNum(detail.current)
 					setTimeout(()=> {
 						this.clickLoading = true
-					}, 500)
+					}, 200)
 				}
 			},
 			
 			// 点击名称
 			clickTicketTitle(index) {
-				if(this.clickLoading) {
-					this.clickLoading = false
-					this.ticketIndex = index
-					this.ticketTitleIndex = index
-					this.getTicketDetail(this.ticketList[index].boxId)
-					this.setNum(index)
-					setTimeout(()=> {
-						this.clickLoading = true
-					}, 1000)
-				}
+				this.ticketIndex = index
+				this.ticketTitleIndex = index
+				this.getTicketDetail(this.ticketList[index].boxId)
+				this.setNum(index)
 			},
 			
 			setNum(index) {
@@ -254,9 +248,11 @@
 			// 活动
 			getActivityList() {
 				$http.post(`/api/v1/mp/user/marketing/recent`, {}).then(res => {
-					let data = res && res.data
-					let timestamp = parseInt(new Date().getTime())
-					this.activityTime = data.endTime - timestamp
+					if(res && res.data) {
+						let data = res && res.data
+						let timestamp = parseInt(new Date().getTime())
+						this.activityTime = data.endTime - timestamp
+					}
 				})
 			},
 			

pages/ticketBox/detail.vue

@@ -23,7 +23,7 @@
 			
 			<!-- 奖品 -->
 			<swiper class="prize-swiper" previous-margin="100px" next-margin="100px" :interval="4000" :autoplay="true" :circular="true" @change="changePrizeSwiper">
-				<swiper-item :class="prizeIndex == index ? 'swiper-item' : 'swiper-item-side'" v-for="(item, index) in prizeList.slice(0, 10)" :key="index">
+				<swiper-item :class="prizeIndex == index ? 'swiper-item' : 'swiper-item-side'" v-for="(item, index) in prizeList.slice(0, 10)" :key="index" @click="toPrizeGoods(item)">
 					<view class="prize-swiper-item flex">
 						<image :class="prizeIndex == index ? 'img' : 'img-side'" :src="item.picUrl" mode="aspectFit"></image>
 					</view>
@@ -102,7 +102,7 @@
 		</view>
 		
 		<!-- 支付弹层 -->
-		<pay-popup :pay-show="payShow" :pay-info="payInfo" @close="close" @success="toProcess" />
+		<pay-popup :pay-show="payShow" :pay-info="payInfo" @close="close" @success="toProcess" v-if="payShow" />
 	</view>
 </template>