Browse Source

bug修改

purui 1 week ago
parent
commit
0e9f2addb4

BIN
packages/app/src/assets/pngs/referrer-1.png


BIN
packages/app/src/assets/pngs/referrer-2.png


+ 4 - 0
packages/app/src/core/libs/pngs.ts

@@ -14,6 +14,8 @@ import noEyes from '@/assets/pngs/no-eyes.png'
 import calculator from '@/assets/pngs/calculator.png'
 import linkBuckle from '@/assets/pngs/link-buckle.png'
 import memberTextV1 from '@/assets/pngs/member-text-v1.png'
+import referrerOne from '@/assets/pngs/referrer-1.png'
+import referrerTwo from '@/assets/pngs/referrer-2.png'
 
 export {
   scheduleCardBg,
@@ -32,4 +34,6 @@ export {
   calculator,
   linkBuckle,
   memberTextV1,
+  referrerOne,
+  referrerTwo
 }

+ 7 - 0
packages/app/src/pages-sub/mine/refferrer/details.vue

@@ -55,6 +55,9 @@ const handleClick = () => {
 const toSecond = (record) =>{
 	referrerId.value = record.userId
 	PageHelperEvoRef.value?.reload()
+	uni.setNavigationBarTitle({
+		title:record.name + "的推荐"
+	})
 }
 
 const handleChange = async (value) => {
@@ -68,6 +71,7 @@ const handleChange = async (value) => {
 }
 
 onLoad((options:object)=>{
+	console.log(options)
 	if(options?.type === "recommend"){
 		uni.setNavigationBarTitle({
 			title:"我的推荐"
@@ -78,6 +82,9 @@ onLoad((options:object)=>{
 		})
 	}
 	type.value = options?.type
+	if(options?.tab){
+		tab.value = Number(options?.tab)
+	}
 })
 
 </script>

+ 14 - 12
packages/app/src/pages-sub/mine/refferrer/index.vue

@@ -4,6 +4,7 @@
 <script setup lang="ts">
 import Card from '@/components/card.vue'
 import { phone, right } from '../../../core/libs/svgs'
+import { referrerOne } from '../../../core/libs/pngs'
 import { referrerCount, distributePointsSum } from '../../../core/libs/requests'
 import { handleCall } from '../../../core/utils/common'
 
@@ -12,9 +13,9 @@ const { data: pointsSum, run: setPointsSum} = useRequest(() => distributePointsS
 const handleClick = (path) => {
   uni.navigateTo({ url: path })
 }
-const tips = () =>{
+const tips = (msg) =>{
 	uni.showToast({
-		title:"推荐的设计师,有未完成的订单,订单完成后即可获得",
+		title:msg,
 		icon:"none",
 		duration:3000
 	})
@@ -36,24 +37,24 @@ onMounted(async () => {
 	  </view>
 	  <view class="flex items-start justify-between mb-[40rpx]">
 		  <view class="">
-			  <view class="text-[56rpx] font-bold mb-[12rpx]">{{ count.onePassCount }}</view>
+			  <view class="text-[56rpx] font-bold mb-[12rpx]" @click="handleClick('/pages-sub/mine/refferrer/details?type=recommend')">{{ count.onePassCount }}</view>
 			  <view class="text-[28rpx] text-black/40 ">认证设计师 (人)</view>
 		  </view>
 		  <view class="bg-[#F2F2F2] flex px-[32rpx] py-[10rpx] text-[24rpx] text-black/40 rounded-full items-center">
 			  <text class="mr-[10rpx]">二级推荐:{{ count.twoPassCount }}人</text>
-			  <icon type="info_circle" size="16" color="#999"></icon>
+			  <icon @click="tips('我的推荐设计师,推荐的新设计师加入筑巢荟,并且已经完成认证的设计师数量')" type="info_circle" size="16" color="#999"></icon>
 		  </view>
 	  </view>
 	  <view class="flex justify-between">
 		  <view class="rounded-[8rpx] shadow-[0_4rpx_10rpx_4rpx_rgba(0,0,0,0.1)] relative min-w-[260rpx] h-[60rpx] line-height-[60rpx] overflow-hidden">
 			  <view class="w-[10rpx] h-full absolute bg-[#0CBE7D] left-0 top-0"></view>
-			  <view class="w-full text-center text-[24rpx] text-black/60">
+			  <view class="w-full text-center text-[24rpx] text-black/60" @click="handleClick('/pages-sub/mine/refferrer/details?type=recommend&tab=1')">
 				  <text>审核中</text>
 				  <text class="text-[32rpx] text-black">{{ count.oneWaitCount }}</text>
 				  <text>人</text>
 			  </view>
 		  </view>
-		  <view class="rounded-[8rpx] shadow-[0_4rpx_10rpx_4rpx_rgba(0,0,0,0.1)] relative min-w-[260rpx] h-[60rpx] line-height-[60rpx] overflow-hidden">
+		  <view class="rounded-[8rpx] shadow-[0_4rpx_10rpx_4rpx_rgba(0,0,0,0.1)] relative min-w-[260rpx] h-[60rpx] line-height-[60rpx] overflow-hidden" @click="handleClick('/pages-sub/mine/refferrer/details?type=recommend&tab=2')">
 			  <view class="w-[10rpx] h-full absolute bg-[#FFCF82] left-0 top-0"></view>
 			  <view class="w-full text-center text-[24rpx] text-black/60 ">
 				  <text>未通过</text>
@@ -73,27 +74,28 @@ onMounted(async () => {
 	  </view>
 	  <view class="flex items-start justify-between mb-[40rpx]">
 		  <view class="">
-			  <view class="text-[56rpx] font-bold mb-[12rpx]">{{ pointsSum.passPoints }}</view>
+			  <view class="text-[56rpx] font-bold mb-[12rpx]" @click="handleClick('/pages-sub/mine/refferrer/details?type=reward')">{{ pointsSum.passPoints }}</view>
 			  <view class="text-[28rpx] text-black/40 ">已获得总积分</view>
 		  </view>
 		  <view class="bg-[#F2F2F2] flex px-[32rpx] py-[10rpx] text-[24rpx] text-black/40 rounded-full items-center">
 			  <text class="mr-[10rpx]">待入账:{{ pointsSum.waitPoints }}积分</text>
-			  <icon @click="tips" type="info_circle" size="16" color="#999"></icon>
+			  <icon @click="tips('推荐的设计师,有未完成的订单,订单完成后即可获得')" type="info_circle" size="16" color="#999"></icon>
 		  </view>	  
 	  </view>
 	  <div class="flex">
-		<div class="w-[50%]">
+		<div class="w-[50%]" @click="handleClick('/pages-sub/mine/refferrer/details?type=reward')">
 			<div class="text-[32rpx] font-bold">{{ pointsSum.onePassPoints }}</div>
 			<div class="text-[24rpx] text-black/60">一级引荐奖励积分</div>
 		</div>
-		<div class="w-[50%]">
+		<div class="w-[50%]" @click="handleClick('/pages-sub/mine/refferrer/details?type=reward')">
 			<div class="text-[32rpx] font-bold">{{ pointsSum.twoPassPoints }}</div>
 			<div class="text-[24rpx] text-black/60">二级引荐奖励积分</div>
 		</div>
 	  </div>
 	</view>
-	<view class="flex bg-white rounded-[32rpx] px-[24rpx] py-[34rpx]" @click="handleClick('/pages-sub/mine/refferrer/rule')">
-		<view class="text-[32rpx] flex-grow">引荐奖励规则</view>
+	<view class="flex items-center bg-white rounded-[32rpx] px-[24rpx] py-[34rpx]" @click="handleClick('/pages-sub/mine/refferrer/rule')">
+		<wd-img width="20" height="20" :src="referrerOne"></wd-img>
+		<view class="text-[32rpx] flex-grow ml-[10rpx]">引荐奖励规则</view>
 		<icon type="info_circle" size="22" color="#999"></icon>
 	</view>
   </div>

+ 3 - 2
packages/app/src/pages/mine/index.vue

@@ -6,7 +6,7 @@
 import { onMounted, ref } from 'vue'
 import CardMenu from '@/components/card-menu.vue'
 import SectionHeading from '@/components/section-heading.vue'
-import { designer, settled, treaty, vipBg, noEyes, eyes } from '../../core/libs/pngs'
+import { designer, settled, treaty, vipBg, noEyes, eyes, referrerTwo } from '../../core/libs/pngs'
 import { BannerMode } from '@/core/libs/models'
 import { integral, coupon, order, agent, setting, vip, scan, close } from '../../core/libs/svgs'
 import {
@@ -470,7 +470,8 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
         </template>
       </div>
 	  <div @click="router.push('/pages-sub/mine/refferrer/index')" class="flex items-center px-[30rpx] py-[40rpx] bg-white mb-[20rpx] rounded-[32rpx]" v-if="isLogined">
-		  <div class="flex-grow">
+		  <wd-img width="44" height="44" :src="referrerTwo"></wd-img>
+		  <div class="flex-grow ml-[20rpx]">
 			  <div class="text-[32rpx]">引荐设计师赚积分</div>
 			  <div class="text-[24rpx] text-black/40">邀请新设计师可得积分奖励</div>
 		  </div>