src/pages/index/components/ggl/index.vue

@@ -48,9 +48,7 @@
         actiNum: 0,
         total: 0,
         winningList: [],
-        activityRule: undefined,
+        activityRule: undefined
-		startTime: undefined,
-		endTime: undefined
       }
     },
     onLoad(op) {
@@ -117,9 +115,6 @@
         })
       },
       handleComplete() {
-		  if(){
-			  
-		  }
         saveWinner({
           phone: useUserStore().userInfo?.phone || '',
           detailId: this.detailId,
@@ -128,14 +123,11 @@
           this.btnText = '再刮一次！'
           if(resp.code == 200) {
             this.getActivityNum()
-			if(this.result != '谢谢惠顾'){
 			let help = "，完成助力即可领取奖品！"
             uni.showToast({
               icon: 'none',
               title: `恭喜获得${this.result}` + help
             })
-			}
-			
             this.showBtn = true
           }
         })

src/pages/me/help.vue

@@ -1,8 +1,6 @@
 <template>
   <view style="padding-bottom: 50px;background-color: #C5121B;">
-    <image class="wp100 img" mode="widthFix"
+    <image class="wp100 img" mode="widthFix" src="https://oss-bq.ahduima.com/%E5%B0%8F%E7%A8%8B%E5%BA%8F/%E5%9B%BE%E7%89%87/%E5%8A%A9%E5%8A%9B%E4%B8%BB%E5%9B%BE.jpg"></image>
-      src="https://oss-bq.ahduima.com/%E5%B0%8F%E7%A8%8B%E5%BA%8F/%E5%9B%BE%E7%89%87/%E5%8A%A9%E5%8A%9B%E4%B8%BB%E5%9B%BE.jpg">
-    </image>
     <view class="relative tip">邀请好友帮助你进行助力即可有机会领取奖品</view>
     <view class="relative help_div">
 		<!--  -->
@@ -13,17 +11,17 @@
 			<view v-if="winnerInfo.awards != undefined" class="relative help_tip" style="font-size: 40rpx;">
 				{{winnerInfo.awards}}
 			</view>
-        <view class="p20">
+			<view class="help_list">
-          <u-grid :border="false" col="3">
+				<view v-for="item in helpUserList" class="help_item">
-            <u-grid-item v-for="(item, index) in helpUserList" :key="index">
+					<u-avatar class="help_item_avatar" :src="item.avatarUrl"></u-avatar>
-              <u-avatar v-if="item.id" class="p10tb border" size="120rpx" :src="item.avatarUrl"></u-avatar>
+					
-              <view v-else class="p10tb">
+					<!-- <view class="help_item_2_yao">
-                <view class="avatar-text">
+						<image :src="item.avatarUrl"></image>
-                  <u-avatar bg-color="#fff" color="#ccc" size="120rpx" text="邀"></u-avatar>
+					</view> -->
 				</view>
+				<view v-for="item in diffNum" class="help_item_2">
+					<view class="help_item_2_yao">邀</view>
 				</view>
-            </u-grid-item>
-          </u-grid>
 			</view>
 			<view class="help_btn" >
 				<button open-type="share"  class="help_btn_font"> 邀请好友助力</button>
@@ -32,9 +30,8 @@
 		
 		<view v-if="type == 2" class="relative help_card">
 			<view class="relative help_list" style="top: 200rpx;">
-          <view v-if="winnerInfo?.activityName" class="help_tip"
+				<view v-if="winnerInfo.activityName  != undefined" class="help_tip" style="font-size: 40rpx; margin: 25rpx 0rpx;">
-            style="font-size: 40rpx; margin: 25rpx 0rpx;">
+					{{winnerInfo.activityName}}
-            {{winnerInfo?.activityName}}
 				</view>
 				<view v-if="winnerInfo.schoolName != undefined" class="help_tip">
 					举办单位：{{winnerInfo.schoolName}}
@@ -45,8 +42,7 @@
 			</view>
 		
 			<view class="help_btn" >
-          <button class="help_btn_font" open-type="chooseAvatar" @chooseavatar="handleHelp"
+				<button class="help_btn_font" open-type="chooseAvatar" @chooseavatar="handleHelp" :disabled="disBtn">帮好友助力</button>
-            :disabled="disBtn">帮好友助力</button>
 			</view>
 		</view>
      </view>
@@ -55,18 +51,16 @@
 
 <script>
   import useUserStore from '@/jtools/store/user'
-  import {
+  import { queryActivityDetail,queryHelpInfo, saveHelpInfo, queryWinnerInfo } from '@/jtools/api/activity'
-    queryActivityDetail,
-    queryHelpInfo,
-    saveHelpInfo,
-    queryWinnerInfo
-  } from '@/jtools/api/activity'
   export default {
     data() {
       return {
 		winnerId: undefined,
+        btnText: '点我刮奖',
+        showBtn: true,
 		helpUserList: [],
 		drawNum: 0,
+		diffNum: 3,
 		phone: undefined,
 		type: 2,
 		winnerInfo: undefined,
@@ -74,6 +68,7 @@
       }
     },
     onLoad(op) {
+	
 	  this.winnerId = op.id
       // this.type = op.type ? Number(op.type) : 1
 	  this.phone = useUserStore().userInfo?.phone || undefined
@@ -92,18 +87,22 @@
 	      path: '/pages/me/help?id='+this.winnerId + '&type=2'
 	    }
 	  },
-	onPullDownRefresh() {
+	  
-		if(this.type == 1){
-			this.getWinnerInfo()
-			this.getHelpInfo()
-		}
-	}
     methods: {
 		//查询中奖信息
 		getWinnerInfo(){
-        queryWinnerInfo({
+			// uni.request({
-          winnerId: this.winnerId
+			//   url: 'http://192.168.1.6:8089/applet/activity/winner/info?winnerId='+this.winnerId
-        }).then(resp => {
+			// }).then(resp => {
+			//   if(resp.data.code == 200) {
+			//    console.log(resp)
+			//    this.winnerInfo = resp.data.data;
+			//    if(this.phone && this.winnerInfo.phone == this.phone){
+			// 	   this.type == 1
+			//    }
+			//   }
+			// })
+			queryWinnerInfo({winnerId : this.winnerId}).then(resp => {
 				if(resp.code == 200){
 					console.log(resp)
 					this.winnerInfo = resp.data;
@@ -118,24 +117,34 @@
 		},
 		//查询助力信息
 		getHelpInfo(){
-        queryHelpInfo({
+			// uni.request({
-          winnerId: this.winnerId
+			//   url: 'http://192.168.1.6:8089/applet/activity/help/info?winnerId='+this.winnerId
-        }).then(resp => {
+			// }).then(resp => {
+			//   if(resp.data.code == 200) {
+			//    console.log(resp)
+			//    this.drawNum = resp.data.data.helpNum;
+			//    this.helpUserList = resp.data.data.helpUsers
+			//    this.diffNum = (this.drawNum -  this.helpUserList.length) < 0 ? 0 : (this.drawNum -  this.helpUserList.length);
+			//    console.log(this.drawNum)
+			//    console.log(this.diffNum)
+			//   }
+			// })
+			queryHelpInfo({winnerId : this.winnerId}).then(resp => {
 				if(resp.code == 200){
+					console.log(resp)
 					this.drawNum = resp.data.helpNum;
-            const list = resp.data.helpUsers.map(item => ({
+					this.helpUserList = resp.data.helpUsers.map(item => ({
 					  ...item,
 					  avatarUrl: 'https://jwl.ahduima.com' + item.avatarUrl
 					}));
-            this.diffNum = (this.drawNum - list.length) < 0 ? 0 : (this.drawNum - list.length);
+					this.diffNum = (this.drawNum -  this.helpUserList.length) < 0 ? 0 : (this.drawNum -  this.helpUserList.length);
-            const arr = new Array(this.diffNum).fill({})
-            this.helpUserList = [...list,...arr]
 				}
 			})
 		},
 		//点击助力
 		handleHelp(e){
 			this.disBtn = false
+			console.log(e)
 			uni.login({
 			  provider: 'weixin', //使用微信登录
 			  success:  (loginRes) => {
@@ -182,7 +191,6 @@
 	.img{
 		  top: -130rpx !important;
 	}
-
   .tip {
     height: 75px;
     font-family: PingFang SC;
@@ -193,13 +201,6 @@
 	text-align: center;
 	font-size: 35rpx;
   }
-  
-  .avatar-text {
-    border-radius: 50%;
-    border: 1px dashed #ccc;
-  }
-  
- 
   .help_div{
 	  width: 710rpx;
 	  height: 996rpx;
@@ -232,6 +233,51 @@
 			  margin: 68rpx 25rpx 25rpx 20rpx;
 			  height: 580rpx;
 			  
+			  .help_item{
+				  display: inline-block;
+				  padding: 35rpx;
+				  width: 194rpx;
+				  height: 194rpx;
+				 
+				  border-radius: 50%;
+				  
+				  .help_item_avatar{
+					  margin: auto;
+					  width: 56rpx;
+					  height: 56rpx;
+					  color: #CCCCCC;
+					  background: #C42E13;
+					  border: 4px solid #C42E13;
+					  
+					  image{
+						  height: 45px;
+						  width: 45px;
+					  }
+				  }
+			  }
+			  
+			  .help_item_2{
+				  display: inline-block;
+				  margin: 35rpx;
+				  width: 124rpx;
+				  height: 124rpx;
+				  border: 2px dotted #CCCCCC;
+				  border-radius: 50%;
+				  
+				  .help_item_2_yao{
+					  margin: 34rpx 33rpx;
+					  width: 56rpx;
+					  height: 56rpx;
+					  font-size: 60rpx;
+					  font-family: PingFang SC;
+					  font-weight: 400;
+					  color: #CCCCCC;
+					  line-height: 48rpx;
+				  }
+				 
+			  }
+			  
+			  
 		  }
 		  
 		  .help_btn{