助力bug

Reviewed-on: http://114.55.169.15:3000/huxiaofeng666/jwl-applet/pulls/41

src/jtools/api/activity.js

@@ -15,11 +15,7 @@ export function queryActivityDetail(data) {
     url: 'activity/applet/activity/detail',
     method: 'get',
     data,
-<<<<<<< HEAD
     noToken: true
-=======
-	noToken: true
->>>>>>> 9e24edad28eff09cb1c9d947314de6e4e3a33d19
   });
 }
 //查询抽奖次数
@@ -66,7 +62,6 @@ export function getLuckyRecord(data) {
     data,
 		noToken: true
   });
-<<<<<<< HEAD
 }
 
 //查询中奖记录
@@ -121,6 +116,3 @@ export function wxLogin(data) {
 }
 
 
-=======
-}
->>>>>>> 9e24edad28eff09cb1c9d947314de6e4e3a33d19

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

@@ -48,7 +48,9 @@
         actiNum: 0,
         total: 0,
         winningList: [],
-        activityRule: undefined
+        activityRule: undefined,
+		startTime: undefined,
+		endTime: undefined
       }
     },
     onLoad(op) {
@@ -115,6 +117,9 @@
         })
       },
       handleComplete() {
+		  if(){
+			  
+		  }
         saveWinner({
           phone: useUserStore().userInfo?.phone || '',
           detailId: this.detailId,
@@ -123,11 +128,14 @@
           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/index/index.vue

@@ -30,7 +30,6 @@
   </view>
 </template>
 <script>
-<<<<<<< HEAD
   import {
     mapState,
     mapActions
@@ -140,140 +139,6 @@
         })
         uni.navigateTo({
           url: '/pages/index/activity?detailId=' + detailId,
-=======
-	import {
-		mapState,
-		mapActions
-	} from 'pinia' //引入映射函数
-	import useQuestionStore from '@/jtools/store/question' //引入store
-	import useUserStore from '@/jtools/store/user'
-	import storage from '@/jtools/storage';
-	import {
-		querySysConfigList,
-	} from '@/jtools/api/question';
-	import Subject1 from "./components/Subject1";
-	import Subject2 from "./components/Subject2";
-	import {
-		queryActivityList,
-	} from '@/jtools/api/activity';
-	export default {
-		components: {
-			Subject1,
-			Subject2
-		},
-		data() {
-			return {
-				show:false,
-				subject: storage.get('curSubject') || '1',
-				curTab: 0,
-				searchValue: '',
-				cityName: '',
-				categoryList: [],
-				rightList: storage.get(`rightList_subject${this.subject}`) || [],
-				wrongList: storage.get(`wrongList_subject${this.subject}`) || [],
-				activityList: ['https://cdn.uviewui.com/uview/swiper/swiper1.png']
-			};
-		},
-		onShow() {
-			this.show=true
-			this.getSubjectConfig()
-			if (this.subject == '1' || this.subject == '4') {
-				this.rightList = storage.get(`rightList_subject${this.subject}`) || []
-				this.wrongList = storage.get(`wrongList_subject${this.subject}`) || []
-			}
-			if(this.subject=='2'||this.subject=='3'){
-				this.$refs.subjectRef.getDiverType()
-			}
-			this.queryActivityList();
-		},
-		onHide(){
-			this.show=false
-		},
-		computed: {
-			...mapState(useQuestionStore, ["loading_subject4", "loading_subject1","curSubject","orderQuestion_subject1","orderQuestion_subject4"]), //映射函数，取出tagslist
-			getLoading() {
-				return this.loading_subject4 && this.loading_subject1
-			}
-		},
-		watch:{
-			getLoading(newVal){
-				if(this.show){
-					if(newVal){
-							if(this.loading_subject4 && this.loading_subject1){
-								uni.hideTabBar();
-							}
-						}else{
-							uni.showTabBar()
-						}
-					}
-				}
-		},
-		methods: {
-			...mapActions(useQuestionStore, ['getOrderQuestion_sub4', 'getOrderQuestion_sub1', 'changeSubject']),
-			//获取科目配置
-			getSubjectConfig() {
-				const carTypeId = storage.get('carType') || '1001'
-				querySysConfigList(carTypeId, 'Subject').then(resp => {
-					if (resp.code === '0000') {
-						this.categoryList = resp.data.map(item => {
-							return {
-								...item,
-								name: item.configItemName
-							}
-						})
-					this.subject=storage.get('curSubject') || '1',
-					this.curTab=this.categoryList.findIndex(item=>item.configItemCode==this.subject)
-					}
-				})
-			},
-			//切换科目
-			async changeCategory(val) {
-				this.subject = val.configItemCode
-				this.changeSubject(this.subject)
-				if (this.subject == '1' || this.subject == '4') {
-					this.rightList = storage.get(`rightList_subject${this.subject}`) || []
-					this.wrongList = storage.get(`wrongList_subject${this.subject}`) || []
-				} else {
-					setTimeout(() => {
-						this.$refs.subjectRef.getDiverType()
-					}, 100)
-				}
-			},
-			//查询活动列表
-			queryActivityList(){
-				// console.log(this.user)
-				// console.log(useUserStore().userInfo)
-				// this.activityList = null;
-				// uni.request({
-				//   url: 'http://localhost:8089/applet/activity/list',
-				//   method: 'get',
-				//   data: {'schoolId': useUserStore().userInfo.schoolId}
-				// }).then(resp => {
-				// 	console.log(".....")
-				// 	console.log(resp)
-				// 	if(resp.data.code == 200) {
-				// 	  this.activityList = resp.data.data
-				// 	  console.log("*****")
-				// 	  console.log(resp.data)
-				// 	  console.log(resp.data.data)
-				// 	  console.log(this.activityList)
-				// 	}
-				// })
-				queryActivityList({schoolId: this.user.schoolId}).then(resp => {
-					this.activityList = resp.data;
-				})
-			},
-      // 去活动
-      handleToActivity(index) {
-		let detailId;
-		this.activityList.find((item, index1) => {
-			if(index === index1){
-				detailId = item.detailId;
-			}
-		})
-        uni.navigateTo({
-          url: '/pages/index/activity?detailId='+detailId,
->>>>>>> 9e24edad28eff09cb1c9d947314de6e4e3a33d19
         })
       }
     }

src/pages/me/help.vue

@@ -1,6 +1,8 @@
 <template>
   <view style="padding-bottom: 50px;background-color: #C5121B;">
-    <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>
+    <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>
     <view class="relative tip">邀请好友帮助你进行助力即可有机会领取奖品</view>
     <view class="relative help_div">
       <!--  -->
@@ -11,27 +13,28 @@
         <view v-if="winnerInfo.awards != undefined" class="relative help_tip" style="font-size: 40rpx;">
           {{winnerInfo.awards}}
         </view>
-			<view class="help_list">
+        <view class="p20">
-				<view v-for="item in helpUserList" class="help_item">
+          <u-grid :border="false" col="3">
-					<u-avatar class="help_item_avatar" :src="item.avatarUrl"></u-avatar>
+            <u-grid-item v-for="(item, index) in helpUserList" :key="index">
-					
+              <u-avatar v-if="item.id" class="p10tb border" size="120rpx" :src="item.avatarUrl"></u-avatar>
-					<!-- <view class="help_item_2_yao">
+              <view v-else class="p10tb">
-						<image :src="item.avatarUrl"></image>
+                <view class="avatar-text">
-					</view> -->
+                  <u-avatar bg-color="#fff" color="#ccc" size="120rpx" text="邀"></u-avatar>
-				</view>
-				<view v-for="item in diffNum" class="help_item_2">
-					<view class="help_item_2_yao">邀</view>
                 </view>
               </view>
-			<view class="help_btn" >
+            </u-grid-item>
+          </u-grid>
+        </view>
+        <view class="help_btn">
           <button open-type="share" class="help_btn_font"> 邀请好友助力</button>
         </view>
       </view>
 
       <view v-if="type == 2" class="relative help_card">
         <view class="relative help_list" style="top: 200rpx;">
-				<view v-if="winnerInfo.activityName  != undefined" class="help_tip" style="font-size: 40rpx; margin: 25rpx 0rpx;">
+          <view v-if="winnerInfo?.activityName" class="help_tip"
-					{{winnerInfo.activityName}}
+            style="font-size: 40rpx; margin: 25rpx 0rpx;">
+            {{winnerInfo?.activityName}}
           </view>
           <view v-if="winnerInfo.schoolName != undefined" class="help_tip">
             举办单位：{{winnerInfo.schoolName}}
@@ -41,8 +44,9 @@
           </view>
         </view>
 
-			<view class="help_btn" >
+        <view class="help_btn">
-				<button class="help_btn_font" open-type="chooseAvatar" @chooseavatar="handleHelp" :disabled="disBtn">帮好友助力</button>
+          <button class="help_btn_font" open-type="chooseAvatar" @chooseavatar="handleHelp"
+            :disabled="disBtn">帮好友助力</button>
         </view>
       </view>
     </view>
@@ -51,16 +55,18 @@
 
 <script>
   import useUserStore from '@/jtools/store/user'
-  import { queryActivityDetail,queryHelpInfo, saveHelpInfo, queryWinnerInfo } from '@/jtools/api/activity'
+  import {
+    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,
@@ -68,7 +74,6 @@
       }
     },
     onLoad(op) {
-	
       this.winnerId = op.id
       // this.type = op.type ? Number(op.type) : 1
       this.phone = useUserStore().userInfo?.phone || undefined
@@ -79,34 +84,30 @@
 
     },
     onShareAppMessage(res) {
-	    if (res.from === 'button') {// 来自页面内分享按钮
+      if (res.from === 'button') { // 来自页面内分享按钮
         console.log(res.target)
       }
       return {
         title: '我正在参与领奖活动柜，请帮我助力',
-	      path: '/pages/me/help?id='+this.winnerId + '&type=2'
+        path: '/pages/me/help?id=' + this.winnerId + '&type=2'
       }
     },
-	  
+	onPullDownRefresh() {
+		if(this.type == 1){
+			this.getWinnerInfo()
+			this.getHelpInfo()
+		}
+	}
     methods: {
       //查询中奖信息
-		getWinnerInfo(){
+      getWinnerInfo() {
-			// uni.request({
+        queryWinnerInfo({
-			//   url: 'http://192.168.1.6:8089/applet/activity/winner/info?winnerId='+this.winnerId
+          winnerId: this.winnerId
-			// }).then(resp => {
+        }).then(resp => {
-			//   if(resp.data.code == 200) {
+          if (resp.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;
-					if(this.phone && this.winnerInfo.phone == this.phone){
+            if (this.phone && this.winnerInfo.phone == this.phone) {
               this.type = 1
             } else {
               this.type = 2
@@ -116,35 +117,25 @@
 
       },
       //查询助力信息
-		getHelpInfo(){
+      getHelpInfo() {
-			// uni.request({
+        queryHelpInfo({
-			//   url: 'http://192.168.1.6:8089/applet/activity/help/info?winnerId='+this.winnerId
+          winnerId: this.winnerId
-			// }).then(resp => {
+        }).then(resp => {
-			//   if(resp.data.code == 200) {
+          if (resp.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;
-					this.helpUserList = resp.data.helpUsers.map(item => ({
+            const list = resp.data.helpUsers.map(item => ({
               ...item,
               avatarUrl: 'https://jwl.ahduima.com' + item.avatarUrl
             }));
-					this.diffNum = (this.drawNum -  this.helpUserList.length) < 0 ? 0 : (this.drawNum -  this.helpUserList.length);
+            this.diffNum = (this.drawNum - list.length) < 0 ? 0 : (this.drawNum - list.length);
+            const arr = new Array(this.diffNum).fill({})
+            this.helpUserList = [...list,...arr]
           }
         })
       },
       //点击助力
-		handleHelp(e){
+      handleHelp(e) {
         this.disBtn = false
-			console.log(e)
         uni.login({
           provider: 'weixin', //使用微信登录
           success: (loginRes) => {
@@ -163,7 +154,7 @@
                 let resp = JSON.parse(uploadFileRes.data);
                 console.log(resp);
 
-							if(resp.code == 200){
+                if (resp.code == 200) {
                   uni.showToast({
                     icon: 'none',
                     title: `助力成功`
@@ -188,9 +179,10 @@
 </script>
 
 <style scoped lang="scss">
-	.img{
+  .img {
     top: -130rpx !important;
   }
+
   .tip {
     height: 75px;
     font-family: PingFang SC;
@@ -201,17 +193,24 @@
     text-align: center;
     font-size: 35rpx;
   }
-  .help_div{
+  
+  .avatar-text {
+    border-radius: 50%;
+    border: 1px dashed #ccc;
+  }
+  
+ 
+  .help_div {
     width: 710rpx;
     height: 996rpx;
     top: -560rpx;
     margin-left: 20rpx;
     margin-right: 20rpx;
-	  background: linear-gradient(0deg, #F33D2F 100%, rgba(197,18,27,0.01) 0%);
+    background: linear-gradient(0deg, #F33D2F 100%, rgba(197, 18, 27, 0.01) 0%);
     border-radius: 40rpx;
 
 
-	  .help_card{
+    .help_card {
       width: 630rpx;
       height: 886rpx;
       margin: 0rpx 39rpx;
@@ -219,7 +218,7 @@
       background: #FFFFFF;
       border-radius: 24rpx;
 
-		  .help_tip{
+      .help_tip {
         text-align: center;
         font-size: 32rpx;
         font-family: PingFang SC;
@@ -229,58 +228,13 @@
         top: 15rpx;
       }
 
-		  .help_list{
+      .help_list {
         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{
+      .help_btn {
-				  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{
         text-align: center;
         margin: 0 75rpx;
         margin-bottom: 30rpx;
@@ -289,7 +243,7 @@
         background: linear-gradient(0deg, #DE4224 0%, #B81706 100%);
         border-radius: 43rpx;
 
-			  .help_btn_font{
+        .help_btn_font {
           font-size: 32rpx;
           font-family: PingFang SC;
           font-weight: 400;

src/pages/me/myGift.vue

@@ -16,7 +16,7 @@
             <view v-if="item.status == 0" class="btn" @tap="handleHelp(item)">助力</view>
 			 <view v-else-if="item.status == 1" class="btn" @tap="handleWriteoff(item)">核销</view>
 			 <img v-else-if="item.status == 2" src="/static/image/mine/writeoff.png" style="width: 120rpx;height: 120rpx;" />
-			<view v-else class="btn" @tap="handleWriteoff(item)">核销</view>
+			 <img v-else src="/static/image/mine/outtime.png" style="width: 120rpx;height: 120rpx;" />
           </view>
         </view>
       </u-list-item>