修改

packages/app/src/components/drag-img/drag-img.vue

@@ -0,0 +1,570 @@
+<template>
+	<view class="drag-img">
+		<template v-if="viewWidth">
+			<movable-area class="drag-img-area" :style="{ height: areaHeight }" @mouseenter="mouseenter"
+				@mouseleave="mouseleave">
+				<movable-view v-for="(item, index) in imageList" :key="item.id" class="drag-img-area-view" direction="all" :y="item.y"
+					:x="item.x" 
+					:damping="40" 
+					:disabled="item.disable" 
+					@change="onChange($event, item)"
+					@touchstart="touchstart(item)" 
+					@mousedown="touchstart(item)" 
+					@touchend="touchend(item)"
+					@mouseup="touchend(item)" 
+					:style="{
+					  width: viewWidth + 'px', 
+					  height: viewWidth + 'px', 
+					  'z-index': item.zIndex, 
+					  opacity: item.opacity 
+					}">
+					<view class="drag-img-area-view-image" 
+					:style="{
+						width: childWidth, 
+						height: childWidth, 
+						borderRadius: borderRadius + 'rpx',
+						transform: 'scale(' + item.scale + ')' 
+					  }">
+						<image class="drag-img-area-view-image-img" :src="item.src" mode="aspectFill"></image>
+						<view class="drag-img-area-view-image-del" @click="delImages(item, index)" @touchstart.stop="delImageMp(item, index)"
+							@touchend.stop="nothing()" @mousedown.stop="nothing()" @mouseup.stop="nothing()">
+							<view class="del-view">
+								<image class="del-img" src="./icon_del.png">
+								</image>
+							</view>
+						</view>
+					</view>
+				</movable-view>
+				<view class="drag-img-area-view-add" v-if="imageList.length < number"
+					:style="{ top: add.y, left: add.x, width: viewWidth + 'px', height: viewWidth + 'px' }"
+					@click="addImages">
+					<view class="add-view"
+						:style="{ width: childWidth, height: childWidth, borderRadius: borderRadius + 'rpx' }">
+						<image :style="{ width: childWidth, height: childWidth, borderRadius: borderRadius + 'rpx' }"
+							src="./icon_add.png">
+						</image>
+					</view>
+				</view>
+			</movable-area>
+
+		</template>
+	</view>
+</template>
+
+<script>
+	export default {
+		emits: ['input', 'update:modelValue'],
+		props: {
+			// 排序图片
+			value: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			},
+			// 排序图片
+			modelValue: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			},
+			// 从 list 元素对象中读取的键名
+			keyName: {
+				type: String,
+				default: null
+			},
+			// 选择图片数量限制
+			number: {
+				type: Number,
+				default: 9
+			},
+			// 图片父容器宽度（实际显示的图片宽度为 imageWidth / 1.1 ），单位 rpx
+			// imageWidth > 0 则 cols 无效
+			imageWidth: {
+				type: Number,
+				default: 0
+			},
+			// 图片列数
+			cols: {
+				type: Number,
+				default: 3
+			},
+			// 图片圆角，单位 rpx
+			borderRadius: {
+				type: Number,
+				default: 25
+			},
+			// 图片周围空白填充，单位 rpx
+			padding: {
+				type: Number,
+				default: 10
+			},
+			// 拖动图片时放大倍数 [0, ∞)
+			scale: {
+				type: Number,
+				default: 1.1
+			},
+			// 拖动图片时不透明度
+			opacity: {
+				type: Number,
+				default: 0.7
+			},
+			// 自定义添加
+			addImage: {
+				type: Function,
+				default: null
+			},
+			// 删除确认
+			delImage: {
+				type: Function,
+				default: null
+			}
+		},
+		data() {
+			return {
+				imageList: [],
+				width: 0,
+				add: {
+					x: 0,
+					y: 0
+				},
+				colsValue: 0,
+				viewWidth: 0,
+				tempItem: null,
+				timer: null,
+				changeStatus: true,
+				preStatus: true,
+				first: true,
+			}
+		},
+		computed: {
+			areaHeight() {
+				let height = ''
+				// return '355px'
+				if (this.imageList.length < this.number) {
+					height = (Math.ceil((this.imageList.length + 1) / this.colsValue) * this.viewWidth).toFixed() + 'px'
+				} else {
+					height = (Math.ceil(this.imageList.length / this.colsValue) * this.viewWidth).toFixed() + 'px'
+				}
+				console.log('areaHeight', height)
+				return height
+			},
+			childWidth() {
+				return this.viewWidth - this.rpx2px(this.padding) + 'px'
+			},
+		},
+		watch: {
+			value: {
+				handler(n) {
+					if (!this.first && this.changeStatus) {
+						let flag = false
+						for (let i = 0; i < n.length; i++) {
+							if (flag) {
+								this.addProperties(this.getSrc(n[i]))
+								continue
+							}
+							if (this.imageList.length === i || this.imageList[i].src !== this.getSrc(n[i])) {
+								flag = true
+								this.imageList.splice(i)
+								this.addProperties(this.getSrc(n[i]))
+							}
+						}
+						this.$emit('uploadFile', n);
+					}
+				},
+				deep: true
+			},
+			modelValue: {
+				handler(n) {
+					if (!this.first && this.changeStatus) {
+						console.log('watch', n)
+						let flag = false
+						for (let i = 0; i < n.length; i++) {
+							if (flag) {
+								this.addProperties(this.getSrc(n[i]))
+								continue
+							}
+							if (this.imageList.length === i || this.imageList[i].src !== this.getSrc(n[i])) {
+								flag = true
+								this.imageList.splice(i)
+								this.addProperties(this.getSrc(n[i]))
+							}
+						}
+					}
+				},
+				deep: true
+			},
+		},
+		created() {
+			this.width = uni.getSystemInfoSync().windowWidth
+		},
+		mounted() {
+			const query = uni.createSelectorQuery().in(this)
+			query.select('.drag-img').boundingClientRect(data => {
+				this.colsValue = this.cols
+				this.viewWidth = data.width / this.cols
+				if (this.imageWidth > 0) {
+					this.viewWidth = this.rpx2px(this.imageWidth)
+					this.colsValue = Math.floor(data.width / this.viewWidth)
+				}
+				let list = this.value
+				// #ifdef VUE3
+				list = this.modelValue
+				// #endif
+				for (let item of list) {
+					this.addProperties(this.getSrc(item))
+				}
+				this.first = false
+
+			})
+			query.exec()
+		},
+		methods: {
+			getSrc(item) {
+				if (this.keyName !== null) {
+					return item[this.keyName]
+				}
+				return item
+			},
+			onChange(e, item) {
+				if (!item) return
+				item.oldX = e.detail.x
+				item.oldY = e.detail.y
+				if (e.detail.source === 'touch') {
+					if (item.moveEnd) {
+						item.offset = Math.sqrt(Math.pow(item.oldX - item.absX * this.viewWidth, 2) + Math.pow(item.oldY -
+							item
+							.absY * this.viewWidth, 2))
+					}
+					let x = Math.floor((e.detail.x + this.viewWidth / 2) / this.viewWidth)
+					if (x >= this.colsValue) return
+					let y = Math.floor((e.detail.y + this.viewWidth / 2) / this.viewWidth)
+					let index = this.colsValue * y + x
+					if (item.index != index && index < this.imageList.length) {
+						this.changeStatus = false
+						for (let obj of this.imageList) {
+							if (item.index > index && obj.index >= index && obj.index < item.index) {
+								this.change(obj, 1)
+							} else if (item.index < index && obj.index <= index && obj.index > item.index) {
+								this.change(obj, -1)
+							} else if (obj.id != item.id) {
+								obj.offset = 0
+								obj.x = obj.oldX
+								obj.y = obj.oldY
+								setTimeout(() => {
+									this.$nextTick(() => {
+										obj.x = obj.absX * this.viewWidth
+										obj.y = obj.absY * this.viewWidth
+									})
+								}, 0)
+							}
+						}
+						item.index = index
+						item.absX = x
+						item.absY = y
+						if (!item.moveEnd) {
+							setTimeout(() => {
+								this.$nextTick(() => {
+									item.x = item.absX * this.viewWidth
+									item.y = item.absY * this.viewWidth
+								})
+							}, 0)
+						}
+						// console.log('bbb', JSON.parse(JSON.stringify(item)));
+						this.sortList()
+					}
+				}
+			},
+			change(obj, i) {
+				obj.index += i
+				obj.offset = 0
+				obj.x = obj.oldX
+				obj.y = obj.oldY
+				obj.absX = obj.index % this.colsValue
+				obj.absY = Math.floor(obj.index / this.colsValue)
+				setTimeout(() => {
+					this.$nextTick(() => {
+						obj.x = obj.absX * this.viewWidth
+						obj.y = obj.absY * this.viewWidth
+					})
+				}, 0)
+			},
+			touchstart(item) {
+				this.imageList.forEach(v => {
+					v.zIndex = v.index + 9
+				})
+				item.zIndex = 99
+				item.moveEnd = true
+				this.tempItem = item
+				this.timer = setTimeout(() => {
+					item.scale = this.scale
+					item.opacity = this.opacity
+					clearTimeout(this.timer)
+					this.timer = null
+				}, 200)
+			},
+			touchend(item) {
+				this.previewImage(item)
+				item.scale = 1
+				item.opacity = 1
+				item.x = item.oldX
+				item.y = item.oldY
+				item.offset = 0
+				item.moveEnd = false
+				setTimeout(() => {
+					this.$nextTick(() => {
+						item.x = item.absX * this.viewWidth
+						item.y = item.absY * this.viewWidth
+						this.tempItem = null
+						this.changeStatus = true
+					})
+					// console.log('ccc', JSON.parse(JSON.stringify(item)));
+				}, 0)
+				// console.log('ddd', JSON.parse(JSON.stringify(item)));
+			},
+			previewImage(item) {
+				if (this.timer && this.preStatus && this.changeStatus && item.offset < 28.28) {
+					clearTimeout(this.timer)
+					this.timer = null
+					const list = this.value || this.modelValue
+					let srcList = list.map(v => this.getSrc(v))
+					console.log(list, srcList);
+					uni.previewImage({
+						urls: srcList,
+						current: item.src,
+						success: () => {
+							this.preStatus = false
+							setTimeout(() => {
+								this.preStatus = true
+							}, 600)
+						},
+						fail: (e) => {
+							console.log(e);
+						}
+					})
+				} else if (this.timer) {
+					clearTimeout(this.timer)
+					this.timer = null
+				}
+			},
+			mouseenter() {
+				//#ifdef H5
+				this.imageList.forEach(v => {
+					v.disable = false
+				})
+				//#endif
+
+			},
+			mouseleave() {
+				//#ifdef H5
+				if (this.tempItem) {
+					this.imageList.forEach(v => {
+						v.disable = true
+						v.zIndex = v.index + 9
+						v.offset = 0
+						v.moveEnd = false
+						if (v.id == this.tempItem.id) {
+							if (this.timer) {
+								clearTimeout(this.timer)
+								this.timer = null
+							}
+							v.scale = 1
+							v.opacity = 1
+							v.x = v.oldX
+							v.y = v.oldY
+							this.$nextTick(() => {
+								v.x = v.absX * this.viewWidth
+								v.y = v.absY * this.viewWidth
+								this.tempItem = null
+							})
+						}
+					})
+					this.changeStatus = true
+				}
+				//#endif
+			},
+			addImages() {
+				if (typeof this.addImage === 'function') {
+					this.addImage.bind(this.$parent)()
+				} else {
+					let checkNumber = this.number - this.imageList.length
+					uni.chooseImage({
+						count: checkNumber,
+						sourceType: ['album', 'camera'],
+						success: res => {
+							let count = checkNumber <= res.tempFilePaths.length ? checkNumber : res
+								.tempFilePaths.length
+							for (let i = 0; i < count; i++) {
+								this.addProperties(res.tempFilePaths[i])
+							}
+							this.sortList()
+						}
+					})
+				}
+			},
+			delImages(item, index) {
+				if (typeof this.delImage === 'function') {
+					this.delImage.bind(this.$parent)(() => {
+						this.delImageHandle(item, index)
+					})
+				} else {
+					this.delImageHandle(item, index)
+				}
+			},
+			delImageHandle(item, index) {
+				this.imageList.splice(index, 1)
+				for (let obj of this.imageList) {
+					if (obj.index > item.index) {
+						obj.index -= 1
+						obj.x = obj.oldX
+						obj.y = obj.oldY
+						obj.absX = obj.index % this.colsValue
+						obj.absY = Math.floor(obj.index / this.colsValue)
+						this.$nextTick(() => {
+							obj.x = obj.absX * this.viewWidth
+							obj.y = obj.absY * this.viewWidth
+						})
+					}
+				}
+				this.add.x = (this.imageList.length % this.colsValue) * this.viewWidth + 'px'
+				this.add.y = Math.floor(this.imageList.length / this.colsValue) * this.viewWidth + 'px'
+				this.sortList()
+			},
+			delImageMp(item, index) {
+				//#ifdef MP
+				this.delImages(item, index)
+				//#endif
+			},
+			sortList() {
+				console.log('sortList');
+				const result = []
+				let source = this.value
+				// #ifdef VUE3
+				source = this.modelValue
+				// #endif
+
+				let list = this.imageList.slice()
+				list.sort((a, b) => {
+					return a.index - b.index
+				})
+				for (let s of list) {
+					let item = source.find(d => this.getSrc(d) == s.src)
+					if (item) {
+						result.push(item)
+					} else {
+						if (this.keyName !== null) {
+							result.push({
+								[this.keyName]: s.src
+							})
+						} else {
+							result.push(s.src)
+						}
+					}
+				}
+
+				this.$emit("input", result);
+				this.$emit("update:modelValue", result);
+			},
+			addProperties(item) {
+				console.log(item);
+				let absX = this.imageList.length % this.colsValue
+				let absY = Math.floor(this.imageList.length / this.colsValue)
+				let x = absX * this.viewWidth
+				let y = absY * this.viewWidth
+				this.imageList.push({
+					src: item,
+					x,
+					y,
+					oldX: x,
+					oldY: y,
+					absX,
+					absY,
+					scale: 1,
+					zIndex: 9,
+					opacity: 1,
+					index: this.imageList.length,
+					id: this.guid(16),
+					disable: false,
+					offset: 0,
+					moveEnd: false
+				})
+				this.add.x = (this.imageList.length % this.colsValue) * this.viewWidth + 'px'
+				this.add.y = Math.floor(this.imageList.length / this.colsValue) * this.viewWidth + 'px'
+			},
+			nothing() {},
+			rpx2px(v) {
+				return this.width * v / 750
+			},
+			guid(len = 32) {
+				const chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('')
+				const uuid = []
+				const radix = chars.length
+				for (let i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix]
+				uuid.shift()
+				return `u${uuid.join('')}`
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.drag-img {
+		.drag-img-area {
+			width: 100%;
+
+			.drag-img-area-view {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				.drag-img-area-view-image {
+					position: relative;
+					overflow: hidden;
+
+					.drag-img-area-view-image-img {
+						width: 100%;
+						height: 100%;
+					}
+
+					.drag-img-area-view-image-del {
+						position: absolute;
+						top: 0rpx;
+						right: 0rpx;
+						padding: 0 0 20rpx 20rpx;
+
+						&>.del-view {
+							width: 36rpx;
+							height: 36rpx;
+							// background-color: rgba(0, 0, 0, 0.4);
+							border-radius: 0 0 0 10rpx;
+							display: flex;
+							justify-content: center;
+							align-items: center;
+
+							&>.del-img {
+								z-index: 9000;
+								width: 30rpx;
+								height: 30rpx;
+							}
+						}
+					}
+				}
+			}
+
+			.drag-img-area-view-add {
+				position: absolute;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				&>.add-view {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					background-color: #eeeeee;
+				}
+			}
+		}
+	}
+</style>

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

@@ -1050,8 +1050,8 @@ 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 referrerCount = (query) =>
+  httpGet<string>('/app-api/member/distribute/referrerCount', query)
 export const distributePointsSum = () =>
   httpGet<string>('/app-api/member/distribute/distributePointsSum')
 export const pageReferrerDetail = (query) =>

packages/app/src/package.json

@@ -0,0 +1,16 @@
+{
+    "id": "drag-img",
+    "name": "图片上传拖动",
+    "displayName": "图片上传拖动",
+    "version": "1.0.1",
+    "description": "图片上传拖动排序",
+    "keywords": [
+        "图片上传，图片拖动，图片排序"
+    ],
+    "dcloudext": {
+        "category": [
+            "前端组件",
+            "通用组件"
+        ]
+    }
+}

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

@@ -3,7 +3,7 @@
 </route>
 <script setup lang="ts">
 import { phone, right } from '../../../core/libs/svgs'
-import { pageReferrerDetail, getDistributePage } from '../../../core/libs/requests'
+import { pageReferrerDetail, getDistributePage, referrerCount } from '../../../core/libs/requests'
 import { handleCall } from '../../../core/utils/common'
 import { onLoad } from '@dcloudio/uni-app'
 import PageHelperEvo from '@/components/page-helper-evo.vue'
@@ -12,8 +12,7 @@ import { domainToUnicode } from 'url'
 
 const PageHelperEvoRef = ref<ComponentExposed<typeof PageHelperEvo>>()
 const referrerId = ref<number | string>('')
-// const { data: referrer, run: setReferrer } = useRequest(() => pageReferrerDetail())
-// const { data: distribute, run: setDistribute } = useRequest(() => getDistributePage())
+const { data: count, run: setCount } = useRequest(() => referrerCount({}))
 const queryReward = computed(() => ({ status: tabsReward.value[tab.value]?.value }))
 const queryRecommend = computed(() => (referrerId.value?{ auditStatus: tabsRecommend.value[tab.value]?.value, referrerId:referrerId.value }:{auditStatus: tabsRecommend.value[tab.value]?.value}))
 
@@ -22,11 +21,11 @@ const tab = ref(0)
 const tabsReward = ref([
   {
     label: '已完成',
-    value: "1",
+    value: "2",
   },
   {
     label: '待入账',
-    value: "2"
+    value: "1"
   },
   {
     label: '已取消',
@@ -72,12 +71,16 @@ const handleChange = async (value) => {
   }
 }
 
-onLoad((options:object)=>{
+onLoad(async (options:object)=>{
 	console.log(options)
 	if(options?.type === "recommend"){
 		uni.setNavigationBarTitle({
 			title:"我的推荐"
-		})		
+		})
+		let res = await setCount();
+		tabsRecommend.value[0].label = tabsRecommend.value[0].label + "(" +res.onePassCount+ ")"
+		tabsRecommend.value[1].label = tabsRecommend.value[1].label + "(" +res.oneWaitCount+ ")"
+		tabsRecommend.value[2].label = tabsRecommend.value[2].label + "(" +res.oneRejectCount+ ")"
 	}else{
 		uni.setNavigationBarTitle({
 			title:"奖励明细"

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

@@ -3,7 +3,7 @@
 </route>
 <script setup lang="ts">
 import { phone, right } from '../../../core/libs/svgs'
-import { pageReferrerDetail, getDistributePage } from '../../../core/libs/requests'
+import { pageReferrerDetail, getDistributePage, referrerCount } from '../../../core/libs/requests'
 import { handleCall } from '../../../core/utils/common'
 import { onLoad } from '@dcloudio/uni-app'
 import PageHelperEvo from '@/components/page-helper-evo.vue'
@@ -11,10 +11,8 @@ import { ComponentExposed } from 'vue-component-type-helpers'
 
 const PageHelperEvoRef = ref<ComponentExposed<typeof PageHelperEvo>>()
 const referrerId = ref<number | string>('')
-// 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(() => (referrerId.value?{ auditStatus: tabsRecommend.value[tab.value]?.value, referrerId:referrerId.value }:{auditStatus: tabsRecommend.value[tab.value]?.value}))
+const { data: count, run: setCount } = useRequest(() => referrerCount({ referrerId:referrerId.value }))
+const queryRecommend = computed(() => ({ auditStatus: tabsRecommend.value[tab.value]?.value, referrerId:referrerId.value }))
 
 const type = ref("recommend")
 const tab = ref(0)
@@ -64,10 +62,14 @@ const handleChange = async (value) => {
   console.log(value)
 }
 
-onLoad((options:object)=>{
+onLoad(async (options:object)=>{
 	console.log(decodeURIComponent(options.str))
 	let ob = JSON.parse(decodeURIComponent(options.str))
 	referrerId.value = ob.userId
+	let res = await setCount();
+	tabsRecommend.value[0].label = tabsRecommend.value[0].label + "(" +res.onePassCount+ ")"
+	tabsRecommend.value[1].label = tabsRecommend.value[1].label + "(" +res.oneWaitCount+ ")"
+	tabsRecommend.value[2].label = tabsRecommend.value[2].label + "(" +res.oneRejectCount+ ")"
 	uni.setNavigationBarTitle({
 		title:ob.name + "的推荐"
 	})	
@@ -76,7 +78,7 @@ onLoad((options:object)=>{
 </script>
 <template>
 	<view class="flex flex-col">
-		<PageHelperEvo ref="pageHelperRef" class="flex-grow flex" :request="pageReferrerDetail" :query="type === queryRecommend">
+		<PageHelperEvo ref="pageHelperRef" class="flex-grow flex" :request="pageReferrerDetail" :query="queryRecommend">
 			<template #top>
 			  <wd-tabs v-model="tab" @change="handleChange">
 			    <block v-for="({ label }, i) in tabsRecommend" :key="i">

packages/app/src/pages-sub/publish/moment/index.vue

@@ -17,11 +17,13 @@ import DataForm from '@/components/data-form.vue'
 import { zipToObject } from 'radash'
 import { useRouter } from '../../../core/utils/router'
 import BottomAppBar from '@/components/bottom-app-bar.vue'
+import dragImg from '@/components/drag-img/drag-img.vue'
 import { requestToast, toast } from '../../../core/utils/common'
 import { messages } from '../../../core/libs/messages'
 import { DataFormSchema } from '../../../components/data-form'
 import { ComponentExposed } from 'vue-component-type-helpers'
 import { AnalysisEventType, useAnalysis } from '@/composables/analysis'
+import { resolve } from 'dns'
 
 const { report } = useAnalysis(false)
 const router = useRouter()
@@ -86,11 +88,25 @@ const formData = ref({})
 const formInited = ref(false)
 const tagName = ref('')
 const tagIds = ref([])
+const imgList = ref([])
 const publishing = ref(false)
 const handleChange = ({ fileList: files }) => {
   fileList.value = files
   console.log(fileList.value)
 }
+const uploadImg = async (img) =>{
+	 return new Promise((resolve)=>{
+		 uni.uploadFile({
+		 	url:action.value,
+		 	filePath: img,
+		 	name:img,
+		 	success: (res) => {
+		 		console.log(res)
+		 		resolve(res)
+		 	}
+		 })
+	 })
+}
 const handleSubmit = async () => {
   if (circleType.value === CircleType.case) {
     const { valid, errors } = await dataFormRef.value.validate()
@@ -99,6 +115,19 @@ const handleSubmit = async () => {
       return false
     }
   }
+  // if (!imgList.value.length) {
+  //   toast(messages.moment.imageNotExist)
+  //   return false
+  // }
+  // console.log(imgList.value)
+  // let imgUrl = [];
+  // for(let i in imgList.value){
+	 //  let res = await uploadImg(imgList.value[i])
+	 //  console.log(res)
+	 //  imgUrl.push()
+  // }
+  // console.log(imgUrl)
+  // return false
   if (!fileList.value.length) {
     toast(messages.moment.imageNotExist)
     return false
@@ -195,6 +224,7 @@ onLoad(async (query: { circleType: '1' | '2' }) => {
         custom-class="my-5"
       ></SectionHeading>
     </div>
+	<!-- <dragImg v-model="imgList" :number="String(circleType) === '2' ? 30 : 9"></dragImg> -->
     <wd-upload
       :file-list="fileList"
       image-mode="aspectFill"

packages/merchant/src/pages/mine/refferrer/details.vue

@@ -3,7 +3,7 @@
 </route>
 <script setup lang="ts">
 import { phone, right } from '../../../core/libs/svgs'
-import { pageReferrerDetail, getDistributePage } from '../../../core/libs/requests'
+import { pageReferrerDetail, getDistributePage, referrerCount } from '../../../core/libs/requests'
 import { handleCall } from '../../../core/utils/common'
 import { onLoad } from '@dcloudio/uni-app'
 import PageHelperEvo from '@/components/page-helper-evo.vue'
@@ -11,8 +11,7 @@ import { ComponentExposed } from 'vue-component-type-helpers'
 
 const PageHelperEvoRef = ref<ComponentExposed<typeof PageHelperEvo>>()
 const referrerId = ref<number | string>('')
-// const { data: referrer, run: setReferrer } = useRequest(() => pageReferrerDetail())
-// const { data: distribute, run: setDistribute } = useRequest(() => getDistributePage())
+const { data: count, run: setCount } = useRequest(() => referrerCount({ userId:id.value }))
 const queryReward = computed(() => ({ status: tabsReward.value[tab.value]?.value,userId:id.value }))
 const queryRecommend = computed(() => (referrerId.value?{ auditStatus: tabsRecommend.value[tab.value]?.value, referrerId:referrerId.value,userId:id.value }:{auditStatus: tabsRecommend.value[tab.value]?.value,userId:id.value}))
 
@@ -22,11 +21,11 @@ const tab = ref(0)
 const tabsReward = ref([
   {
     label: '已完成',
-    value: "1",
+    value: "2",
   },
   {
     label: '待入账',
-    value: "2"
+    value: "1"
   },
   {
     label: '已取消',
@@ -70,7 +69,7 @@ const handleChange = async (value) => {
   }
 }
 
-onLoad((options:object)=>{
+onLoad(async(options)=>{
 	if(options?.type === "recommend"){
 		uni.setNavigationBarTitle({
 			title:"我的推荐"
@@ -82,6 +81,10 @@ onLoad((options:object)=>{
 	}
 	id.value = options?.id
 	type.value = options?.type
+	let res = await setCount();
+	tabsRecommend.value[0].label = tabsRecommend.value[0].label + "(" +res.onePassCount+ ")"
+	tabsRecommend.value[1].label = tabsRecommend.value[1].label + "(" +res.oneWaitCount+ ")"
+	tabsRecommend.value[2].label = tabsRecommend.value[2].label + "(" +res.oneRejectCount+ ")"
 })
 
 </script>

packages/merchant/src/pages/mine/refferrer/twoDetails.vue

@@ -3,7 +3,7 @@
 </route>
 <script setup lang="ts">
 import { phone, right } from '../../../core/libs/svgs'
-import { pageReferrerDetail, getDistributePage } from '../../../core/libs/requests'
+import { pageReferrerDetail, getDistributePage, referrerCount } from '../../../core/libs/requests'
 import { handleCall } from '../../../core/utils/common'
 import { onLoad } from '@dcloudio/uni-app'
 import PageHelperEvo from '@/components/page-helper-evo.vue'
@@ -11,8 +11,7 @@ import { ComponentExposed } from 'vue-component-type-helpers'
 
 const PageHelperEvoRef = ref<ComponentExposed<typeof PageHelperEvo>>()
 const referrerId = ref<number | string>('')
-// const { data: referrer, run: setReferrer } = useRequest(() => pageReferrerDetail())
-// const { data: distribute, run: setDistribute } = useRequest(() => getDistributePage())
+const { data: count, run: setCount } = useRequest(() => referrerCount({ referrerId:referrerId.value }))
 const queryReward = computed(() => ({ status: tabsReward.value[tab.value]?.value }))
 const queryRecommend = computed(() => (referrerId.value?{ auditStatus: tabsRecommend.value[tab.value]?.value, referrerId:referrerId.value }:{auditStatus: tabsRecommend.value[tab.value]?.value}))
 
@@ -64,10 +63,14 @@ const handleChange = async (value) => {
  console.log(value)
 }
 
-onLoad((options:object)=>{
+onLoad(async (options)=>{
 	console.log(decodeURIComponent(options.str))
 	let ob = JSON.parse(decodeURIComponent(options.str))
 	referrerId.value = ob.userId
+	let res = await setCount();
+	tabsRecommend.value[0].label = tabsRecommend.value[0].label + "(" +res.onePassCount+ ")"
+	tabsRecommend.value[1].label = tabsRecommend.value[1].label + "(" +res.oneWaitCount+ ")"
+	tabsRecommend.value[2].label = tabsRecommend.value[2].label + "(" +res.oneRejectCount+ ")"
 	uni.setNavigationBarTitle({
 		title:ob.name + "的推荐"
 	})