分销功能

packages/app/env/.env.development

@@ -5,7 +5,7 @@ VITE_DELETE_CONSOLE = false
 # 是否开启sourcemap
 VITE_SHOW_SOURCEMAP = true
 
-VITE_SERVER_BASEURL='https://www.zhuchaohui.com'
+VITE_SERVER_BASEURL='https://zhuchaohui.f3.ttvt.cc'
 # VITE_SERVER_BASEURL = 'http://39.106.91.179:48080'
 # VITE_SERVER_BASEURL = 'http://192.168.2.50:48080'
 # 王超

packages/app/pages.config.ts

@@ -542,6 +542,28 @@ export default defineUniPages({
             navigationBarTitleText: '修改手机号',
           },
         },
+		{
+		  path: 'mine/refferrer/index',
+		  type: 'page',
+		  style: {
+		    navigationBarTitleText: '引荐奖励',
+		  },
+		},
+		{
+		  path: 'mine/refferrer/rule',
+		  type: 'page',
+		  style: {
+		    navigationBarTitleText: '规则说明',
+		  },
+		},
+		{
+		  path: 'mine/refferrer/details',
+		  type: 'page',
+		  style: {
+		    navigationBarTitleText: '明细',
+			navigationBarBackgroundColor:'#fff'
+		  },
+		},
       ],
     },
   ],

packages/app/src/core/libs/requests.ts

@@ -1048,6 +1048,16 @@ export const fuckYou = (data: { id: number }) =>
   httpPost('/app-api/member/message-manage/isRead', data)
 export const refreshToken = (refreshToken: string) =>
   httpPost<any>('/app-api/member/auth/refresh-token', {}, { refreshToken })
+export const getDistribute = () =>
+  httpGet<string>('/app-api/member/distribute/getDistribute')  
+export const referrerCount = () =>
+  httpGet<string>('/app-api/member/distribute/referrerCount')
+export const distributePointsSum = () =>
+  httpGet<string>('/app-api/member/distribute/distributePointsSum')
+export const pageReferrerDetail = (query) =>
+  httpGet('/app-api/member/distribute/pageReferrerDetail', query)  
+export const getDistributePage = (query) =>
+  httpGet('/app-api/member/distribute/getAppDistributeParticularPage', query)    
 export const httpGetMock = <T>(data: T) =>
   new Promise<IResData<T>>((resolve) => resolve({ code: 1, msg: '', data } as IResData<T>))
 export interface Circle {

packages/app/src/pages-sub/home/activity/detail/index.vue

@@ -471,47 +471,47 @@ onShareTimeline(() => ({ title: data.value.name, imageUrl: data.value.thumbnailU
         <wd-button block :round="false" @click="handleConfirm">确认报名</wd-button>
       </view>
     </wd-action-sheet>
-    <wd-overlay :show="listShow" @click="listShow = false">
-      <view class="flex px-10 h-full items-center justify-center">
-        <div class="w-full flex flex-col gap-5 aspect-[0.71/1] relative">
-          <div class="absolute top-0 left-0 right-0 bottom-0 z--1">
-			  <div class="absolute top-0 left-0 w-full">
-			    <!-- <wd-img class="block" width="100%" height="100%" :src="signupListDialogBg"></wd-img> -->
-				<image mode="widthFix" :src="signupListDialogBg"></image>
-			  </div>
-			  <div class="h-full box-border py-5 px-7.25 flex flex-col justify-between relative z-10 pt-[40px]">
-			    <div class="flex justify-between">
-			      <div class="text-justify text-white text-2xl font-bold font-['Alimama_ShuHeiTi']">
-			        报名详情
-			      </div>
-			      <div @click="listShow = true">
-			        <wd-icon name="close" size="22px" color="#ffff"></wd-icon>
-			      </div>
-			    </div>
-			  
-			    <div class="flex flex-col justify-center aspect-[0.7/1] gap-5 px-4 relative">
-			      <PageHelper
-			        :request="isActivity ? getActivitySignups : getStudyTourSignups"
-			        :query="isActivity ? { activityId: id } : { studyId: id }"
-			        class="flex-grow flex flex-col"
-			      >
-			        <template #default="{ source }">
-			          <div class="flex flex-col gap-5 pt-[20rpx]">
-			            <template v-for="(it, i) in source.list" :key="i">
-			              <div
-			                class="text-black text-sm font-normal font-['PingFang_SC'] leading-normal"
-			              >
-			                {{ dayjs(it.createTime).format('YYYY-MM-DD') }} {{ it.name }}已报名
-			              </div>
-			            </template>
-			          </div>
-			        </template>
-			      </PageHelper>
-			    </div>
-			  </div>
+    <wd-overlay :show="listShow">
+      <view class="absolute top-[50%] left-[50%] translate-[-50%,-50%] z-1">
+		  <div class="w-[540rpx] h-[640rpx]">
+			<image mode="widthFix" :src="signupListDialogBg"></image>
 		  </div>
-        </div>
-      </view>
+		  <view class="absolute top-0 left-0 w-[100%]">
+				<div class="flex justify-between p-[40rpx]">
+				  <div class="text-justify text-white text-2xl font-bold font-['Alimama_ShuHeiTi']">
+					报名详情
+				  </div>
+				  <div @click="listShow = false">
+					<wd-icon name="close" size="22px" color="#ffff"></wd-icon>
+				  </div>
+				</div>
+				<div class="">
+				  <PageHelper
+					:request="isActivity ? getActivitySignups : getStudyTourSignups"
+					:query="isActivity ? { activityId: id } : { studyId: id }"
+					class="flex-grow flex flex-col"
+				  >
+					<template #default="{ source }">
+					  <!-- <div class="flex flex-col gap-5 pt-[20rpx] h-[500rpx] overflow-y-scroll">
+						
+					  </div> -->
+					  <scroll-view class="h-[500rpx]" scroll-y="true">
+						  <div class="flex flex-col gap-5 pt-[20rpx] ">
+							  <template v-for="(it, i) in source.list" :key="i">
+								  <div
+									class="text-black text-sm font-normal font-['PingFang_SC'] leading-normal pl-[40rpx]"
+								  >
+									{{ dayjs(it.createTime).format('YYYY-MM-DD') }} {{ it.name }}已报名
+								  </div>
+							 </template>
+						  </div>
+					  </scroll-view>
+					</template>
+				  </PageHelper>
+				</div>
+		  </view>
+	  </view>
+	  <view class="absolute top-0 left-0 w-[100%] h-[100%] z-0" @click="listShow = false"></view>
     </wd-overlay>
     <wd-overlay :show="successShow" @click="successShow = false">
       <view class="flex mx-10 h-full items-center justify-center">

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

@@ -0,0 +1,129 @@
+<route lang="json">
+{ "style": { "navigationBarTitleText": "", "navigationBarBackgroundColor": "#fff" } }
+</route>
+<script setup lang="ts">
+import { phone, right } from '../../../core/libs/svgs'
+import { pageReferrerDetail, getDistributePage } from '../../../core/libs/requests'
+import { handleCall } from '../../../core/utils/common'
+import { onLoad } from '@dcloudio/uni-app'
+import PageHelperEvo from '@/components/page-helper-evo.vue'
+
+// const { data: referrer, run: setReferrer } = useRequest(() => pageReferrerDetail())
+// const { data: distribute, run: setDistribute } = useRequest(() => getDistributePage())
+const queryReward = computed(() => ({ status: tabsReward.value[tab.value]?.value }))
+const queryRecommend = computed(() => ({ auditStatus: tabsRecommend.value[tab.value]?.value }))
+
+const type = ref("recommend")
+const tab = ref(0)
+const tabsReward = ref([
+  {
+    label: '已完成',
+    value: "1",
+  },
+  {
+    label: '待入账',
+    value: "2"
+  },
+  {
+    label: '已取消',
+    value: "3",
+  },
+])
+
+const tabsRecommend  = ref([
+  {
+    label: '已认证',
+    value: "0",
+  },
+  {
+    label: '审核中',
+    value: "1"
+  },
+  {
+    label: '未通过',
+    value: "2",
+  },
+])
+
+const handleClick = () => {
+  uni.navigateTo({ url: '/pages-sub/mine/orders/detail/index' })
+}
+
+const handleChange = async (value) => {
+  if(type.value === "recommend"){
+	  let tab1 = tabsRecommend.value[value.index]
+	  console.log(tab1)
+  }else{
+	  let tab1 = tabsReward.value[value.index]
+	  console.log(tab1)
+  }
+}
+
+onLoad((options:object)=>{
+	if(options?.type === "recommend"){
+		uni.setNavigationBarTitle({
+			title:"我的推荐"
+		})		
+	}else{
+		uni.setNavigationBarTitle({
+			title:"奖励明细"
+		})
+	}
+	type.value = options?.type
+})
+
+</script>
+<template>
+	<view class="flex flex-col">
+		<PageHelperEvo ref="pageHelperRef" class="flex-grow flex" :request="type === 'recommend'?pageReferrerDetail:getDistributePage" :query="type === 'recommend'?queryRecommend:queryReward">
+			<template #top>
+			  <wd-tabs v-model="tab" @change="handleChange">
+			    <block v-if="type === 'recommend'">
+					<block v-for="({ label }, i) in tabsRecommend" :key="i">
+					  <wd-tab :title="`${label}`" class="relative"></wd-tab>
+					</block>
+				</block>
+				<block v-else-if="type === 'reward'">
+					<block v-for="({ label }, i) in tabsReward" :key="i">
+					  <wd-tab :title="`${label}`" class="relative"></wd-tab>
+					</block>
+				</block>
+			  </wd-tabs>
+			</template>
+			<template #default="{ source }">
+				<view class="bg-white rounded-[20rpx] mx-[24rpx] mt-[30rpx] px-[20rpx] py-[30rpx]" v-if="type === 'recommend'">
+					<view class="flex items-center py-[30rpx] relative" v-for="(it, i) in source.list" :key="i" style="border-bottom: 2rpx solid #FAFAFA;">
+						<view class="rounded-full w-[88rpx] h-[88rpx] overflow-hidden mr-[20rpx]">
+							<image :src="it.avatar" mode="widthFix"></image>
+						</view>
+						<view class="flex-grow text-[32rpx]">{{ it.name }}</view>
+						<view class="text-[#586A8F] text-[28rpx]" v-if="it.auditStatus === 0">推荐人数：{{ it.referrerCount }}</view>
+						<view class="absolute bottom-0 left-[20%] text-[24rpx] text-[#EF4343]" v-if="it.auditStatus == 2">原因：{{ it.remark }}</view>
+					</view>
+				</view>
+				<view class="bg-white rounded-[20rpx] mx-[24rpx] mt-[30rpx] px-[20rpx] py-[30rpx]" v-else>
+					<view class="flex flex-col mb-[30rpx]" v-for="(it, i) in source.list" :key="i" style="border-bottom: 2rpx solid #FAFAFA;">
+						<view class="flex items-center">
+							<view class="rounded-full w-[88rpx] h-[88rpx] overflow-hidden mr-[20rpx]">
+								<image :src="it.userAvatar" mode="widthFix"></image>
+							</view>
+							<view class="flex-grow">
+								<view class="flex items-center">
+									<view class="text-[32rpx] mr-[12rpx]">{{ it.userName }}</view>
+									<view class="text-[20rpx] bg-[#F6F6F6] rounded-full text-black/40 px-[14rpx] py-[6rpx]" v-if=" it.distributeType==1 ">一级奖励</view>
+									<view class="text-[20rpx] bg-[#F6F6F6] rounded-full text-black/40 px-[14rpx] py-[6rpx]" v-else>二级奖励</view>
+								</view>
+								<view class="text-black/30">{{ it.completeTime }}</view>
+							</view>
+							<view class="text-[#EF4343] text-[32rpx]">+{{ it.onePoints }}（*{{ it.oneRatio }}）</view>
+						</view>
+						<view class="flex py-[40rpx] justify-between text-black/60 text-[24rpx]">
+							<text>{{ it.pointsName }}</text>
+							<text>消耗积分：{{ it.points }}</text>
+						</view>
+					</view>
+				</view>
+			</template>
+		</PageHelperEvo>
+	</view>
+</template>

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

@@ -0,0 +1,93 @@
+<route lang="json">
+{ "style": { "navigationBarTitleText": "引荐奖励", "navigationBarBackgroundColor": "#fff" } }
+</route>
+<script setup lang="ts">
+import Card from '@/components/card.vue'
+import { phone, right } from '../../../core/libs/svgs'
+import { referrerCount, distributePointsSum } from '../../../core/libs/requests'
+import { handleCall } from '../../../core/utils/common'
+
+const { data: count, run: setCount } = useRequest(() => referrerCount())
+const { data: pointsSum, run: setPointsSum} = useRequest(() => distributePointsSum())
+const handleClick = (path) => {
+  uni.navigateTo({ url: path })
+}
+onMounted(async () => {
+  await setCount();
+  await setPointsSum();
+})
+</script>
+<template>
+  <div class="px-[24rpx] py-[34rpx]">
+	<view class="bg-white rounded-[32rpx] px-[24rpx] pt-[34rpx] pb-[60rpx] mb-[30rpx]">
+	  <view class="flex items-center justify-between mb-[60rpx] border-b-1 pb-[20rpx]">
+		  <view class="text-[36rpx] font-bold">我的推荐</view>
+		  <view class="text-[28rpx] text-black/40" @click="handleClick('/pages-sub/mine/refferrer/details?type=recommend')">
+			  <text>查看明细</text>
+			  <wd-img :src="right" width="12" height="12"></wd-img>
+		  </view>
+	  </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-[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>
+		  </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">
+				  <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="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>
+				  <text class="text-[32rpx] text-black px-[6rpx]">{{ count.oneRejectCount }}</text>
+				  <text>人</text>
+			  </view>
+		  </view>
+	  </view>
+	</view>
+	<view class="bg-white rounded-[32rpx] px-[24rpx] pt-[34rpx] pb-[60rpx] mb-[30rpx]">
+	  <view class="flex items-center justify-between mb-[60rpx] border-b-1 pb-[20rpx]">
+		  <view class="text-[36rpx] font-bold">引荐加成奖励</view>
+		  <view class="text-[28rpx] text-black/40" @click="handleClick('/pages-sub/mine/refferrer/details?type=reward')">
+			  <text>查看明细</text>
+			  <wd-img :src="right" width="12" height="12"></wd-img>
+		  </view>
+	  </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-[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 type="info_circle" size="16" color="#999"></icon>
+		  </view>	  
+	  </view>
+	  <div class="flex">
+		<div class="w-[50%]">
+			<div class="text-[32rpx] font-bold">{{ pointsSum.onePassPoints }}</div>
+			<div class="text-[24rpx] text-black/60">一级引荐奖励积分</div>
+		</div>
+		<div class="w-[50%]">
+			<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>
+		<icon type="info_circle" size="22" color="#999"></icon>
+	</view>
+  </div>
+</template>

packages/app/src/pages-sub/mine/refferrer/rule.vue

@@ -0,0 +1,43 @@
+<route lang="json5">
+{ "style": { "navigationBarTitleText": "规则说明", "navigationBarBackgroundColor": "#fff" } }
+</route>
+<script setup lang="ts">
+import { phone, right } from '../../../core/libs/svgs'
+import { getDistribute } from '../../../core/libs/requests'
+import { handleCall } from '../../../core/utils/common'
+import { onLoad } from '@dcloudio/uni-app'
+
+const { data: distribute, run: setDistribute } = useRequest(() => getDistribute())
+const handleClick = () => {
+  uni.navigateTo({ url: '/pages-sub/mine/orders/detail/index' })
+}
+onLoad(()=>{
+	setDistribute()
+})
+
+</script>
+<template>
+	<div class="px-[24rpx] py-[34rpx]">
+		<view class="flex mb-[30rpx]">
+			<icon type="info_circle" size="22" color="#000000"></icon>
+			<text class="ml-[10rpx]">如何获得引荐加成奖励</text>
+		</view>
+		<view class="mb-[40rpx]" v-if="distribute && distribute.details">
+			<rich-text :nodes="distribute.details"></rich-text>
+		</view>
+		<view class="rounded-[30rpx] overflow-hidden" style="border: 2rpx solid #B18A57;" v-if="distribute && distribute.distributeList.length > 0">
+			<view class="flex w-full text-center py-[20rpx] bg-[#FFFCF6]">
+				<view class="w-[33%] text-[28rpx] text-[#BC8647]">会员等级</view>
+				<view class="w-[33%] text-[28rpx] text-[#BC8647]">一级奖励</view>
+				<view class="w-[33%] text-[28rpx] text-[#BC8647]">二级奖励</view>
+			</view>
+			<block v-for="(it,i) in distribute.distributeList" :key="i">
+				<view class="flex w-full text-center py-[20rpx] bg-[#FFFCF6]">
+					<view class="w-[33%] text-[28rpx] text-[#BC8647]">{{ it.levelName }}</view>
+					<view class="w-[33%] text-[28rpx] text-[#BC8647]">{{ it.oneRatio }}%</view>
+					<view class="w-[33%] text-[28rpx] text-[#BC8647]">{{ it.twoRatio }}%</view>
+				</view>
+			</block>
+		</view>
+	</div>
+</template>

packages/app/src/pages.json

@@ -565,6 +565,28 @@
           "style": {
             "navigationBarTitleText": "修改手机号"
           }
+        },
+        {
+          "path": "mine/refferrer/index",
+          "type": "page",
+          "style": {
+            "navigationBarTitleText": "引荐奖励"
+          }
+        },
+        {
+          "path": "mine/refferrer/rule",
+          "type": "page",
+          "style": {
+            "navigationBarTitleText": "规则说明"
+          }
+        },
+        {
+          "path": "mine/refferrer/details",
+          "type": "page",
+          "style": {
+            "navigationBarTitleText": "明细",
+            "navigationBarBackgroundColor": "#fff"
+          }
         }
       ]
     }

packages/app/src/pages/mine/index.vue

@@ -469,6 +469,13 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
           </div>
         </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">
+			  <div class="text-[32rpx]">引荐设计师赚积分</div>
+			  <div class="text-[24rpx] text-black/40">邀请新设计师可得积分奖励</div>
+		  </div>
+		  <div class="bg-black rounded-[8rpx] text-white text-[24rpx] w-[134rpx] h-[56rpx] text-center line-height-[56rpx]">立即查看</div>
+	  </div>
       <TasksCard
         v-if="isLogined"
         custom-class="my-6"

packages/app/src/types/uni-pages.d.ts

@@ -73,7 +73,10 @@ interface NavigateToOptions {
        "/pages-sub/mine/authentication/submit/success/index" |
        "/pages-sub/mine/homepage/consult/success/index" |
        "/pages-sub/mine/scan/pay/success/index" |
-       "/pages-sub/mine/setting/mobile/modify/index";
+       "/pages-sub/mine/setting/mobile/modify/index" |
+       "/pages-sub/mine/refferrer/index" |
+       "/pages-sub/mine/refferrer/rule" |
+       "/pages-sub/mine/refferrer/details";
 }
 interface RedirectToOptions extends NavigateToOptions {}