Merge branch 'v2.0.0' into 'dev'

V2.0.0

See merge request quanshu/mp-ui-user!20

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

packageOther/about/index.vue

@@ -4,7 +4,7 @@
 		<view class="about">
 			<view class="flex about-logo">
 				<image src="../../static/public/logo.png" mode=""></image>
-				<view class="edition">v 2.0.0</view>
+				<view class="edition">v 2.0.1</view>
 			</view>
 			<view class="about-action">
 				<u-cell-group :border="false">

pages/index/index.vue

@@ -254,9 +254,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>