Merge branch 'test' of git.echepei.com:sailun/sailun-tbr-web into test

manifest.json

@@ -2,7 +2,7 @@
     "name" : "耀灵掌上通",
     "appid" : "__UNI__0C3473D",
     "description" : "测试",
-    "versionName" : "0.0.7",
+    "versionName" : "0.1.1",
     "versionCode" : "100",
     "transformPx" : false,
     "app-plus" : {

pages/home/index.vue

@@ -132,7 +132,8 @@
 			system() {
 				uni.getSystemInfo({
 					success: res => {
-						// 
+						// let add = ''这个不要删除!
+						// console.log(res)这个不要删除!
 					},
 					complete: err => {
 						if (err.platform == 'android') {

pages/me/Reward-details/index.vue

@@ -11,7 +11,7 @@
 							 active-color="#fff" inactive-color="#ffffff" bg-color="#ffffff00"></u-tabs> -->
 				<view style="width: 340rpx;height: 80rpx;text-align: center;padding-top: 25rpx;padding-left: 20rpx;float: left;margin-top: 0;margin-left: 30rpx;">
 					<view style="float: left;">
-						<text @click="whole">全部</text>
+						<text @tap="$u.throttle(whole, 500)">全部</text>
 						<view v-if="bottoma == true" style="width: 100%;height: 1rpx;background-color: #FFFFFF;border-radius: 10rpx;"></view>
 						<view v-else></view>
 					</view>