Browse Source

bug 修复

lilei 4 years ago
parent
commit
0268338bcc
3 changed files with 25 additions and 17 deletions
  1. 19 9
      pages/index/index.vue
  2. 5 7
      pagesA/luckDraw/luckDraw.vue
  3. 1 1
      pagesA/luckDraw/myJp.vue

+ 19 - 9
pages/index/index.vue

@@ -102,7 +102,8 @@
 				hasLogin: false,
 				userData: null,
 				showLottery: false, // 是否显示抽奖弹框
-				showFixedLottery: false
+				showFixedLottery: false,
+				hasShowHd: false
 			}
 		},
 		onLoad() {
@@ -204,7 +205,10 @@
 									reTimes = res.data.timesSurplus || 0
 								}
 								this.$u.vuex('vuex_LuckDrawTimes',reTimes)
-								this.showLottery = reTimes > 0
+								if(!this.hasShowHd){
+									this.showLottery = reTimes > 0
+									this.hasShowHd = true
+								}
 							})
 						}else{
 							this.showFixedLottery = false
@@ -274,14 +278,20 @@
 				if(row.jumpType !== 'NONE'){
 					// 如果是大转盘
 					if(row.jumpUrl.indexOf('pagesA/luckDraw') >= 0){
-						if(this.showFixedLottery){
-							uni.navigateTo({
-								url:this.hasLogin ? row.jumpUrl :"/pages/login/login"
-							})
+						if(this.hasLogin){
+							if(this.showFixedLottery){
+								uni.navigateTo({
+									url:row.jumpUrl
+								})
+							}else{
+								uni.showToast({
+									icon: 'none',
+									title: '活动已结束'
+								})
+							}
 						}else{
-							uni.showToast({
-								icon: 'none',
-								title: '活动已结束'
+							uni.navigateTo({
+								url:"/pages/login/login"
 							})
 						}
 						

+ 5 - 7
pagesA/luckDraw/luckDraw.vue

@@ -227,7 +227,7 @@ export default {
 		getDrawList(){
 			queryWinRecord({
 				pageNo: 1,
-				pageSize: 1000
+				pageSize: 100
 			}).then(res => {
 				if(res.status == 200){
 					this.hjList = res.data.list
@@ -444,12 +444,10 @@ export default {
 		},
 	},
 	onShow() {
-		if(this.hasLogin){
-			// 查询免费抽奖次数
-			this.getCustomerTimes()
-			// 查询亦获奖列表
-			this.getDrawList()
-		}
+		// 查询免费抽奖次数
+		this.getCustomerTimes()
+		// 查询亦获奖列表
+		this.getDrawList()
 	},
 	onLoad() {
 		this.luckDraw = this.$store.state.vuex_LuckDraw

+ 1 - 1
pagesA/luckDraw/myJp.vue

@@ -28,7 +28,7 @@
 					</view>
 					<view>
 						<view class="labes">收货地址</view>
-						<view>{{curRevice.receiveAddress}}</view>
+						<view style="word-break: break-all;">{{curRevice.receiveAddress}}</view>
 					</view>
 					<view>
 						<view class="labes">物流单号</view>