app

config/baseUrl.js

@@ -5,8 +5,8 @@ if (process.env.NODE_ENV === 'development') {
 	// 开发环境
 	// baseUrl = "http://192.168.0.106:8080"; //屈晨
 	// baseUrl = "http://192.168.0.55:8080"; //蔡雅茹
-	// baseUrl = "http://192.168.0.52:8080"; //贺礼霄
-	baseUrl = "https://test.baoxianzhanggui.com/web-api"; //测试
+	baseUrl = "http://192.168.0.52:8080"; //贺礼霄
+	// baseUrl = "https://test.baoxianzhanggui.com/web-api"; //测试
 	h5BaseUrl = "https://test.baoxianzhanggui.com/copartnerH5";
 	// baseUrl = "https://pre.baoxianzhanggui.com/web-api"; //预生产
 	// h5BaseUrl = "https://pre.baoxianzhanggui.com/h5";
@@ -15,12 +15,12 @@ if (process.env.NODE_ENV === 'development') {
 	socketUrl = "";
 } else if (process.env.NODE_ENV === 'production') {
 	// 生产环境
-	// baseUrl = "https://test.baoxianzhanggui.com/web-api"; //测试
-	// h5BaseUrl = "https://test.baoxianzhanggui.com/copartnerH5";
+	baseUrl = "https://test.baoxianzhanggui.com/web-api"; //测试
+	h5BaseUrl = "https://test.baoxianzhanggui.com/copartnerH5";
 	// baseUrl = "https://pre.baoxianzhanggui.com/web-api"; //预生产
 	// h5BaseUrl = "https://pre.baoxian8zhanggui.com/copartnerH5";
-	baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //生产
-	h5BaseUrl = "https://sxzgkj.baoxianzhanggui.com/copartnerH5";
+	// baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //生产
+	// h5BaseUrl = "https://sxzgkj.baoxianzhanggui.com/copartnerH5";
 	socketUrl = "";
 }
 const courtConfig = {

main.js

@@ -1,6 +1,10 @@
 import Vue from 'vue'
 import uView from "uview-ui";
 Vue.use(uView);
+import uiEcharts from '@/uni_modules/ui-echarts'
+Vue.use(uiEcharts)
+// import uPopup from '@/uni_modules/uni-popup'
+// Vue.use(uPopup)
 import App from './App'
 
 //数据管理中心

manifest.json

@@ -9,8 +9,8 @@
             "src" : "图片路径"
         }
     ],
-    "versionName" : "1.0.2",
-    "versionCode" : 102,
+    "versionName" : "1.0.9",
+    "versionCode" : 109,
     "app-plus" : {
         "error" : {
             "url" : "hybrid/html/error.html"

pages.json

@@ -321,6 +321,8 @@
 				"enablePullDownRefresh": false, //开启下拉刷新
 				"navigationStyle": "custom",
 				"app-plus": {
+					"scrollIndicator": "none",
+					"bounce": "none",
 					"titleNView": false
 				}
 			}

pages/components/card.vue

@@ -17,13 +17,13 @@
 			<image style="display: inline-block; width: 9px;height:9px;vertical-align: -1px;" src="/static/icon/right.png" mode=""></image></text>
 		</view>
 		<view class="card-con dis j-c a-c">
-			<view >
+			<view v-if="!isStudio">
 				<text>{{item.suggestName || '无'}}</text>
 				<text>推荐人</text>
 			</view>
 			<view >
 				<text>{{item.teamManNum}}</text>
-				<text>总人数</text>
+				<text>会员总人数</text>
 			</view>
 			<view> 
 				<text>{{item.sumPremium}}</text>

pages/components/date-picker.vue

@@ -8,8 +8,8 @@
    		</view>
    		<view style="padding: 15px">
    			<view class="popup-data dis j-s">
-   				<text :class="startShow? 'active' :''" @click="visible=true;startShow = true;endShow = false">{{ interviewStartTime||'开始时间' }}</text>至
-   				<text :class="endShow? 'active' :''" @click="visible=true;endShow = true;startShow = false">{{ interviewEndTime || '结束时间' }}</text>
+   				<text :class="startShow? 'active' :''" @click="startClick()">{{ interviewStartTime||'开始时间' }}</text>至
+   				<text :class="endShow? 'active' :''" @click="endClick()">{{ interviewEndTime || '结束时间' }}</text>
    			</view>
    			<picker-view v-show="visible" :indicator-style="indicatorStyle" :value="value" @change="bindChange"
    			  class="picker-view">
@@ -132,11 +132,9 @@
         let isDay = 30;
         if (month == 2) {
           if((year%4==0 && year%100!=0)||(year%400==0)){
-            console.log('闰年')
             isDay = 29;
           }else {
             isDay = 28;
-             console.log('平年')
           }
         } else if ([1,3,5,7,8,10,12].includes(month)) {
           isDay = 31;
@@ -144,7 +142,7 @@
           isDay = 30;
         }
       
-        for (let i = date.getFullYear(); i <= date.getFullYear()+12; i++) {
+        for (let i = date.getFullYear();  i >= 1900; i--) {
           years.push(i)
         }
         for (let i = 1; i <= 12; i++) {
@@ -174,8 +172,22 @@
       },
 	  reset(){
         this.$emit('update:visible', false);
-		this.interviewStartTime=''
-		this.interviewEndTime =''
+        this.interviewStartTime=''
+        this.interviewEndTime =''
+      },
+      startClick(){
+        // this.interviewStartTime=''
+        console.log(this.year ,this.month );
+        this.interviewStartTime = this.year+'-'+this.month+'-'+this.day
+        this.visible=true
+        this.startShow = true
+        this.endShow = false
+      },
+      endClick(){
+        this.interviewEndTime= this.year+'-'+this.month+'-'+this.day
+        this.visible=true
+        this.startShow = false
+        this.endShow = true
       },
       confirm() {
         // let monthStr = this.padZeroStr(this.month)
@@ -184,8 +196,7 @@
         // let minuteStr = this.padZeroStr(this.minute)
         // this.timeValue = `${this.year}/${monthStr}/${dayStr} ${hourStr}:${minuteStr}:00`;
         this.$emit('confirmPickDate', this.interviewStartTime,this.interviewEndTime);
-		this.$refs.popup.close()
-        // this.$emit('update:visible', false);
+		    this.$refs.popup.close()
       },
     },
   }

pages/components/leverStaff.vue

@@ -0,0 +1,82 @@
+<template>
+    <view>
+        <view class="partner-type dis">
+				<view style="width: 650px;overflow-x: auto;">
+					<text :class="typeStatistics == val.value ? 'selected' : ''" v-for="val in partnerTypeOption"
+						:key="val.value" @click="getPartnerType(val.value)">{{ val.lable }}</text>
+				</view>
+			</view> 
+    </view>
+</template>
+<script>
+import {
+	mapState,
+} from "vuex"
+export default {
+    data(){
+        return{
+			typeStatistics: 1,
+            partnerTypeOption: [
+				{
+					lable: '一级合伙人',
+					value: '1'
+				}, {
+					lable: '二级合伙人',
+					value: '2'
+				}, {
+					lable: '三级合伙人',
+					value: '3'
+				}, {
+					lable: '四级合伙人',
+					value: '4'
+				},
+			],
+        }
+    },
+    computed: {
+		...mapState(['userInfo']),
+	},
+    onLoad() {
+		this.level = this.userInfo.sysUser.level
+		if (this.level == 2) {
+			this.partnerTypeOption = this.partnerTypeOption.slice(0, -1);
+		}
+		if (this.level == 3) {
+			this.partnerTypeOption = this.partnerTypeOption.slice(0, -2);
+		}
+		if (this.level == 4) {
+			this.partnerTypeOption = this.partnerTypeOption.slice(0, 1);
+		}
+	},
+    methods:{
+        getPartnerType(type) {
+			this.typeStatistics = type
+            this.$emit('getPartnerType',type)
+		},
+    }
+}
+</script>
+<style lang="scss" scoped>
+
+.partner-type {
+	margin: 10px;
+	width: 97%;
+	overflow: hidden;
+	white-space: nowrap;
+
+	text {
+		display: inline-block;
+		border-radius: 14px 14px 14px 14px;
+		font-size: 14px;
+		color: #666666;
+		padding: 1px 10px;
+		background: #F4F4F4;
+		margin-right: 8px;
+	}
+
+	.selected {
+		color: #FFFFFF;
+		background: linear-gradient(132deg, #2DD9FF 0%, #2D6DFF 100%);
+	}
+}
+</style>

pages/components/seach.vue

@@ -12,7 +12,7 @@
 				@confirm="dictionaryConfirm($event)"></u-select> -->
 				</view>
 			<view class="search-data" >
-				<text v-for="(val,index) in year" :key="index" :class="val.startShow? 'active' :''" @click="onSeachYear(index)">{{val.lable}}</text>
+				<text v-for="(val,index) in year" :key="index" :class="val.startShow? 'active' :''" @click="onSeachYear(val,index)">{{val.lable}}</text>
 			</view>
 		</view>
 		<view class="sum-insurance dis j-c a-c" v-if="!partnerHierarchy">
@@ -22,7 +22,7 @@
 			</view>
 			<view>
 				<text>{{directLsit.teamManNum}}</text>
-				<text>成员总人数</text>
+				<text>会员总人数</text>
 			</view>
 			<view style="border-right:none">
 				<text>{{directLsit.extractFee}}</text>
@@ -121,21 +121,20 @@ import myDatePicker from './date-picker.vue';
 				this.industryData=e[0].label
 				this.$emit('queryData',{industrySector:e[0].value==0?null:e[0].value})
 			},
-			onSeachYear(index){
-				this.year.map(i=>i.startShow=false)
-				this.year[index].startShow=true
+			onSeachYear(val,index){
+				this.year.map((value, i) => i === index ? value.startShow=!value.startShow : value.startShow=false);
 				let now = new Date();
 				let year = now.getFullYear();
 				let month = now.getMonth() + 1; // 月份是从0开始的，所以需要加1
 				let day = now.getDate();
-				if(index==0){
+				if(index==0 && val.startShow){
 					let theDay=`${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
 					this.$emit('queryData',{beginTime:theDay+' 00:00:01' ,endTime:theDay+ ' 23:59:59'})
 				}
-				if(index==1){
+				else if(index==1 && val.startShow){
 					this.$emit('queryData',{beginTime:this.getCurrentMonthFirst()+' 00:00:01' ,endTime:this.getCurrentMonthLast()+ ' 23:59:59'})
 				}
-				if(index==2){
+				else if(index==2 && val.startShow){
 					let months = [];
 					// 获取当前季度的第一个月
 					let startMonth = month - (month % 3) + 1;
@@ -145,47 +144,16 @@ import myDatePicker from './date-picker.vue';
 					}
 					this.$emit('queryData',{beginTime: year +'-'+ months[0]+'-01 00:00:01' ,endTime: year+'-'+ months[2] + '-31 23:59:59'})
 				}
-				if(index==3){
+				else if(index==3 && val.startShow){
 					this.$emit('queryData',{beginTime:year+'-01-01 00:00:01' ,endTime:year+ '-12-31 23:59:59'})
 				}
-				if(index==4){
+				else if(index==4 && val.startShow){
 					this.$refs.datePicker.open()
 				}
-				// switch (index) {
-				// 	case 0:
-					
-				// 	console.log(month,111111111)
-				// 		let theDay=`${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
-				// 		this.$emit('queryData',{beginTime:theDay+' 00:00:01' ,endTime:theDay+ ' 23:59:59'})
-				// 		break;
-				// 	case 1:
-				// 		this.$emit('queryData',this.getCurrentMonthFirst()+' 00:00:01' ,this.getCurrentMonthLast()+ ' 23:59:59')
-				// 		break;
-				// 	case 2:
-				// 		// let months = [];
-				// 		// // 获取当前季度的第一个月
-				// 		// let startMonth = month - (month % 3) + 1;
-				// 		// // 获取当前季度的下三个月
-				// 		// for (let i = 0; i < 3; i++) {
-				// 		//   months.push(startMonth + i);
-				// 		// }
-				// 		const month = now.getMonth();
-				// 		 const quarter = Math.floor(month / 3) + 1;
-				// 		  const firstMonthDay = new Date(year, quarter - 1 * 3, 1);
-				// 		  const lastMonthDay = new Date(year, quarter * 3, 0);
-					 
-				// 		//  const firstMonthFirstDay = firstMonthDay.toISOString().split('T')[0];
-				// 		//  const lastMonthLastDay = lastMonthDay.toISOString().split('T')[0];
-				// 		console.log(firstMonthDay,lastMonthDay,1111111)
-				// 		break;
-				// 	case 3:
-				// 		this.$emit('queryData',year+'-01-01 00:00:01' ,year+ '-12-31 23:59:59')
-				// 		break;
-				// 	case 4:
-				// 		this.$refs.datePicker.open()
-				// 		break;
-				// 	default:
-				// 	}
+				else{
+					this.$emit('queryData',{beginTime:'' ,endTime:''})
+				}
+				
 			},
 			 getCurrentMonthFirst() {
 				 // 获取当月第一天数据
@@ -213,8 +181,7 @@ import myDatePicker from './date-picker.vue';
 				if(dateStr1){
 					dateStr1+=' 23:59:59'
 				}
-				console.log(dateStr ,dateStr1,1111)
-				this.$emit('queryData', {dateStr ,dateStr1})
+				this.$emit('queryData', {beginTime:dateStr ,endTime:dateStr1})
 			},
 		}
 	}

pages/index/index.vue

@@ -17,12 +17,12 @@
 		</view>
 		<view class="insurance dis j-s" >
 			<view style="text-align: center;">
-				<view class="insurance-cash" >{{totalList.sumPremium || 0}}</view>
-				<text class="insurance-text">总保费	</text>
+				<view class="insurance-cash">{{totalList.teamManNum || 0}}</view>
+				<text class="insurance-text">会员总人数	</text>
 			</view>
 			<view style="text-align: center;">
-				<view class="insurance-cash">{{totalList.teamManNum || 0}}</view>
-				<text class="insurance-text">总人数	</text>
+				<view class="insurance-cash" >{{totalList.sumPremium || 0}}</view>
+				<text class="insurance-text">总保费	</text>
 			</view>
 			<view style="text-align: center;">
 				<view class="insurance-cash">{{totalList.extractFee || 0}}</view>
@@ -32,21 +32,21 @@
 		<view >
 			<view class="institutional-data  dis j-s" v-if="type == 2 ||userInfo.sysUser.level==5">
 				<view class="inst-con" @click="userInfo.sysUser.level==5 ?closeInstitution():closeStudion()">
-					<view>工作室</view>
+					<view>我的工作室</view>
 					<text >{{userInfo.sysUser.level==5 ?totalList.workroomNum :totalList.workroomTeamNum}}</text>
 				</view>
 				<view class="inst-con"  @click="userInfo.sysUser.level==5 ?recruitmentWorkCode() :recruitmentCode()">
-					<view>招募码</view>
+					<view>我的招募码</view>
 					<text >扫码加入</text>
 				</view>
 			</view>
 			<view class="inst-data dis j-s" v-if="type == 1 && userInfo.sysUser.level!==5" >
 				<view class="inst-con" @click="closePartner()">
-					<view >合伙人</view>
+					<view >我的合伙人</view>
 					<text >{{totalList.partnerNum}}</text>
 				</view>
 				<view class="inst-con" @click="closeInstitution()">
-					<view>工作室</view>
+					<view>我的工作室</view>
 					<text >{{totalList.workroomNum}}</text>
 				</view>
 			</view>
@@ -183,7 +183,7 @@ export default {
 			// if(this.totalList.workroomNum>0){
 				
 			// }
-			this.totalList.type=1
+			// this.totalList.type=1
 			uni.navigateTo({
 				url: "/pages/institutional/institutionalTeam?key="+encodeURIComponent(JSON.stringify(this.totalList))
 			})
@@ -340,10 +340,10 @@ export default {
 
 .inst-con {
 	width: 47%;
-	padding: 13px 18px;
+	padding: 13px 16px;
 	}	
 .inst-con>view:nth-child(1) {
-	font-size: 19px;
+	font-size: 14px;
 	font-weight: 700;
 }
 

pages/institutional/institutional.vue

@@ -4,7 +4,7 @@
 		 <view class="headers " :style="headerStyle">
 			<view class="dis a-c j-start " style="padding: 0 15px;">
 				<u-icon name="arrow-left"  size="40" @tap="back"></u-icon>
-				<text style="margin: auto;">{{parentData.userName || '工作室'}}</text>
+				<text style="margin: auto;">{{parentData.deptName || '我的工作室'}}</text>
 			</view>
 		</view>
 		

pages/institutional/institutionalTeam.vue

@@ -1,286 +1,601 @@
 <template>
-	<view class="" >
+	<view class="">
 		<public-module></public-module>
-		 <view class="headers " :style="headerStyle">
+		<view class="headers " :style="headerStyle">
 			<view class="dis a-c j-start " style="padding: 0 15px;">
-				<u-icon name="arrow-left"  size="40" @tap="back"></u-icon>
-				<text style="margin: auto;">工作室</text>
+				<u-icon name="arrow-left" size="40" @tap="back"></u-icon>
+				<text
+					style="margin: auto;">{{ parentData.level ? `工作室(${chineseNumbers[parentData.level - 1]}级合伙人)` : '我的工作室' }}</text>
 			</view>
 		</view>
-		
-        <view class="body"   style="background: #F8FAFE;margin-top: 85px;">
+
+		<view class="body" style="background: #F8FAFE;margin-top: 85px;">
 			<view class="partner-head">
-				<seach  @queryData="queryData" :directLsit='parentData' />
+				<seach @queryData="queryData" :directLsit='parentData' />
 			</view>
 			<!-- <card :cardData='directLsit'></card> -->
-			<block v-for="(item,index) in directLsit" :key="index">
-				<view class="card" >
+			<block v-for="(item, index) in directLsit" :key="index">
+				<view class="card">
 					<view style="padding: 10px 15px 0 10px">
-					<view class="dis j-s card-title">
-						<view>
-							<text style="font-size: 16px;">{{item.userName}}</text>
-							<image v-if="parentData.partnerType==1 " style="display: inline-block; width: 45px;height:18px;vertical-align: sub;" src="/static/icon/jibie1.png" mode=""></image>
+						<view class="dis j-s card-title">
+							<view>
+								<text style="font-size: 16px;">{{ item.deptName }}({{ item.userName }})</text>
+								<!-- <image v-if="parentData.partnerType==1 " style="display: inline-block; width: 45px;height:18px;vertical-align: sub;" src="/static/icon/jibie1.png" mode=""></image>
 							<image v-if="parentData.partnerType==2 "  style="display: inline-block; width: 45px;height:18px;vertical-align: sub;" src="/static/icon/jibie.png" mode=""></image>
 							<image v-if="parentData.partnerType==3"  style="display: inline-block; width: 45px;height:18px;vertical-align: sub;" src="/static/icon/jibie3.png" mode=""></image>
-							<image v-if="parentData.partnerType==4"  style="display: inline-block; width: 45px;height:18px;vertical-align: sub;" src="/static/icon/jibie4.png" mode=""></image>
+							<image v-if="parentData.partnerType==4"  style="display: inline-block; width: 45px;height:18px;vertical-align: sub;" src="/static/icon/jibie4.png" mode=""></image> -->
+							</view>
+							<text v-if="item.teamManNum > 0" @click="detail(item)">详情
+								<image style="display: inline-block; width: 9px;height:9px;vertical-align: -1px;"
+									src="/static/icon/right.png" mode=""></image>
+							</text>
 						</view>
-						<text v-if="item.teamManNum>0"  @click="detail(item)">详情
-						<image style="display: inline-block; width: 9px;height:9px;vertical-align: -1px;" src="/static/icon/right.png" mode=""></image></text>
-					</view>
-					<view style="padding:0 15px;font-size: 10px;
+						<view style="padding:0 15px;font-size: 10px;
 					color: #666666;font-weight: 600;">下级团队共计
-					<text style="font-size: 12px;color: #333333;font-weight: 600;">{{item.deptNum}}</text>
-					个</view>
-					<view class="card-con dis j-c a-c">
-						<view >
-							<text>{{item.suggestName || '未设置'}}</text>
-							<text>推荐人</text>
-						</view>
-						<view >
-							<text>{{item.teamManNum}}</text>
-							<text>总人数</text>
-						</view>
-						<view>
-							<text>{{item.sumPremium}}</text>
-							<text>总保费</text>
+							<text style="font-size: 12px;color: #333333;font-weight: 600;">{{ item.deptNum }}</text>
+							个
 						</view>
-						<view style="border-right:none">
-							<text>{{item.extractFee}}</text>
-							<text>总佣金</text>
+						<view class="card-con dis j-c a-c">
+							<view>
+								<text>{{ item.suggestName || '未设置' }}</text>
+								<text>推荐人</text>
+							</view>
+							<view>
+								<text>{{ item.teamManNum }}</text>
+								<text>会员总人数</text>
+							</view>
+							<view>
+								<text>{{ item.sumPremium }}</text>
+								<text>总保费</text>
+							</view>
+							<view style="border-right:none">
+								<text>{{ item.extractFee }}</text>
+								<text>总佣金</text>
+							</view>
 						</view>
 					</view>
-					</view>
 				</view>
-				
+
 			</block>
 			<!-- <u-loadmore style="margin-top: 5px;" v-if="directLsit.length!=0" :status="status" />
 			<o-empty v-if="directLsit.length==0" /> -->
-		
-    </view>
-		
+
+		</view>
+		<view id="_drag_button" class="drag" :style="'left: ' + left + 'px; top:' + top + 'px;'"
+		@touchmove.stop.prevent="touchmove" @touchend="touchend">
+			<image src="/static/code.png" mode="" @click.stop.prevent="btnClick"></image>
+			<text>招募码</text>
+		</view>
+		<u-popup v-model="ShowModalCodebusiness" mode="bottom" border-radius="15">
+			<view>
+				<text class=" ShowModalCode-business">工作室业务</text>
+				<view>
+					<radio-group class="uni-list" @change="styleChange">
+						<view v-for="(item, index) in styles" :key="index" class="uni-list-item">
+							<view class="uni-list-item__container">
+								<view class="uni-list-item__content">
+									<text class="uni-list-item__content-title">{{ item.text }}</text>
+								</view>
+								<view class="uni-list-item__extra">
+									<radio :value="item.value" :checked="item.checked" />
+								</view>
+							</view>
+							<view class="uni-list-item__notestext">{{ item.notestext }}</view>
+						</view>
+					</radio-group>
+				</view>
+				<view class="ShowModalCode-sumbit" @click="ShowModalCodeSumbit()">确定</view>
+			</view>
+		</u-popup>
+		<u-popup v-model="ShowModalCode1" mode="bottom" border-radius="15">
+			<view class="ShowModalCode-style ">
+				<text>{{deptSource==1?'渠道':'个代'}}工作室招募码</text>
+				<view class=" ShowModalCode-con">
+					<view>扫码加入</view>
+					<image :src="workImg" mode="widthFix" lazy-load style="width: 150px;"></image>
+				</view>
+			</view>
+		</u-popup>
 	</view>
 </template>
 <script>
-	import myDatePicker from '../components/date-picker.vue';
-	import seach from '../components/seach.vue';
-	// import card from '../components/card.vue'
-	export default{
-		components:{myDatePicker,seach},
-		data(){
-			return{
-				startShow:false,
-				year:[{
-					lable:'日',
-					startShow:false
-				},{
-					lable:'月',
-					startShow:false
-				},{
-					lable:'季',
-					startShow:false
-				},{
-					lable:'年',
-					startShow:false
-				},{
-					lable:'自定义',
-					startShow:false
-				}],
-				chineseNumbers:[ '一', '二', '三', '四', '五', '六', '七', '八', '九'],
-				headerStyle: {
-					backgroundColor: 'transparent',
-					backgroundImage: 'url("/static/beijing (2).png")',
-					backgroundSize: 'cover',
-					backgroundPosition: '',
-					boxShadow: ''
-					// 其他样式属性...
-				},
-				teamTabIndex: 0,
-				directLsit: [],
-                source:0,
-				totalPages:0,
-                totalSize:0,
-				status: 'loadmore',
-				pageRequest: { //查询的默认条件
-					pageNum: 1,
-					pageSize: 20,
-                    userName:''
-				},
-				parentData:{}
+import myDatePicker from '../components/date-picker.vue';
+import seach from '../components/seach.vue';
+import QR from "@/common/wxqrcode.js"
+import {
+	mapState,
+	mapMutations
+} from "vuex"
+// import card from '../components/card.vue'
+export default {
+	components: { myDatePicker, seach },
+	data() {
+		return {
+			ShowModalCodebusiness:false,
+			ShowModalCode1:false,
+			styles: [{
+				value: '1',
+				text: '渠道',
+				notestext: '团队长加出单员模式，无分销模式，结费都在团队长处。',
+				checked: true
+			},
+			{
+				value: '2',
+				notestext: '团队长加代理人模式，三级分销模式，结费方式为个人，有佣金。',
+				text: '个代'
+			}
+			],
+			deptSource: 1,
+			workImg:'',
+			top: 0,
+			left: 0,
+			width: 0,
+			height: 0,
+			offsetWidth: 0,
+			offsetHeight: 0,
+			windowWidth: 0,
+			windowHeight: 0,
+			isMove: true,
+			edge: 10,
+			startShow: false,
+			year: [{
+				lable: '日',
+				startShow: false
+			}, {
+				lable: '月',
+				startShow: false
+			}, {
+				lable: '季',
+				startShow: false
+			}, {
+				lable: '年',
+				startShow: false
+			}, {
+				lable: '自定义',
+				startShow: false
+			}],
+			chineseNumbers: ['一', '二', '三', '四', '五', '六', '七', '八', '九'],
+			headerStyle: {
+				backgroundColor: 'transparent',
+				backgroundImage: 'url("/static/beijing (2).png")',
+				backgroundSize: 'cover',
+				backgroundPosition: '',
+				boxShadow: ''
+				// 其他样式属性...
+			},
+			teamTabIndex: 0,
+			directLsit: [],
+			source: 0,
+			totalPages: 0,
+			totalSize: 0,
+			status: 'loadmore',
+			pageRequest: { //查询的默认条件
+				pageNum: 1,
+				pageSize: 20,
+				userName: ''
+			},
+			parentData: {}
+		}
+	},
+	computed: {
+		...mapState(['userInfo', "userCheckInfo",]),
+	},
+	async onLoad(e) {
+		this.parentData = JSON.parse(decodeURIComponent(e.key));
+		// this.parentData.partnerType=this.parentData.level+1
+		console.log(this.parentData)
+		this.queryData()
+
+	},
+	mounted() {
+		const sys = uni.getSystemInfoSync();
+
+		this.windowWidth = sys.windowWidth;
+		this.windowHeight = sys.windowHeight;
+
+		// #ifdef APP-PLUS
+		this.existTabBar && (this.windowHeight -= 50);
+		// #endif
+		if (sys.windowTop) {
+			this.windowHeight += sys.windowTop;
+		}
+		const query = uni.createSelectorQuery().in(this);
+		query.select('#_drag_button').boundingClientRect(data => {
+			this.width = data.width;
+			this.height = data.height;
+			this.offsetWidth = data.width / 2;
+			this.offsetHeight = data.height / 2;
+			this.left = this.windowWidth - this.width - this.edge;
+			if (this.bottomPx * 1 > 0) {
+				this.top = this.windowHeight - this.height - this.bottomPx;
+			} else {
+				this.top = this.windowHeight - this.height - this.edge;
 			}
-		},
-		async onLoad(e) {
-			this.parentData = JSON.parse(decodeURIComponent(e.key));
-			this.parentData.partnerType=this.parentData.level+1
-			console.log(this.parentData)
-			this.queryData()
 
+		}).exec();
+		//避免部分情况下图片加载延迟导致高度渲染出错
+		setTimeout(() => {
+			const query = uni.createSelectorQuery().in(this);
+			query.select('#_drag_button').boundingClientRect(data => {
+				this.width = data.width;
+				this.height = data.height;
+				this.offsetWidth = data.width / 2;
+				this.offsetHeight = data.height / 2;
+				this.left = this.windowWidth - this.width - this.edge;
+				if (this.bottomPx * 1 > 0) {
+					this.top = this.windowHeight - this.height - this.bottomPx;
+				} else {
+					this.top = this.windowHeight - this.height - this.edge;
+				}
+			}).exec();
+		}, 200);
+	},
+	methods: {
+		styleChange(e) {
+			this.deptSource = e.detail.value
 		},
-		methods:{
-			back() {
-				uni.navigateBack({
-					delta: 1, // 返回的页面数，如果是1表示返回上一页
-					success: function() {}
-				});
-				
-			},
-			detail(item){
-				uni.navigateTo({
-					url: "/pages/institutional/institutional?key="+encodeURIComponent(JSON.stringify(item))
-				})
+		btnClick() {
+			this.ShowModalCodebusiness = true
+			this.deptSource = 1
+		},
+		ShowModalCodeSumbit(){
+			this. ShowModalCode1 = true
+			this.workImg = QR.createQrCodeImg(this.$base.h5BaseUrl + "/#/pages/index/applystudio?deptSource=" + this.deptSource + '&userId=' + this.userInfo.sysUser.userId, {
+				size: parseInt(200) //二维码大小  
+			})
+		},
+		touchmove(e) {
+				// 单指触摸
+				if (e.touches.length !== 1) {
+					return false;
+				}
+				if (!this.isMove) {
+				}
+				this.isMove = true;
+
+				this.left = e.touches[0].clientX - this.offsetWidth;
+
+				let clientY = e.touches[0].clientY - this.offsetHeight;
+				// #ifdef H5
+				clientY += this.height;
+				// #endif
+				let edgeBottom = this.windowHeight - this.height - this.edge;
+
+				// 上下触及边界
+				if (clientY < this.edge) {
+					this.top = this.edge;
+				} else if (clientY > edgeBottom) {
+					this.top = edgeBottom;
+				} else {
+					this.top = clientY
+				}
+
 			},
-			onReachBottom() {
-				if (this.pageRequest.pageNum >= this.totalPages) return;
-				this.status = 'loading';
-				this.pageRequest.pageNum = ++this.pageRequest.pageNum;
-				setTimeout(async () => {
-					let res = await this.$http.post('/sysPartner/querySysPartnerAPPPage', {
-						...this.pageRequest,
-                        source:this.source
-				});
-					if (res.code == '200') {
-					this.totalSize = res.data.totalSize;
-						this.directLsit = [...this.directLsit, ...res.data.content];
+			touchend(e) {
+				if (this.isDock) {
+					let edgeRigth = this.windowWidth - this.width - this.edge;
+
+					if (this.left < this.windowWidth / 2 - this.offsetWidth) {
+						this.left = this.edge;
+					} else {
+						this.left = edgeRigth;
 					}
-					if (this.pageRequest.pageNum >= this.totalPages) this.status = 'nomore';
-					else this.status = 'loading';
-				}, 1000)
-			},
-			
-			async queryData(data) {
-				let params = {
-					beginTime:data&& data.beginTime || '',
-					endTime:data&& data.endTime  || '',
-					leaderIds:this.parentData.leaderIds,
-					level: this.parentData.partnerType+1 || this.parentData.level+1 ,
-					industrySector:data&& data.industrySector  ||'',
-					// ...this.pageRequest
+
+				}
+				if (this.isMove) {
+					this.isMove = false;
+
 				}
-				let res = await this.$http.post('/APPPartner/partnerLeaderInfo', params);
+
+			},
+		back() {
+			uni.navigateBack({
+				delta: 1, // 返回的页面数，如果是1表示返回上一页
+				success: function () { }
+			});
+
+		},
+		detail(item) {
+			uni.navigateTo({
+				url: "/pages/institutional/institutional?key=" + encodeURIComponent(JSON.stringify(item))
+			})
+		},
+		onReachBottom() {
+			if (this.pageRequest.pageNum >= this.totalPages) return;
+			this.status = 'loading';
+			this.pageRequest.pageNum = ++this.pageRequest.pageNum;
+			setTimeout(async () => {
+				let res = await this.$http.post('/sysPartner/querySysPartnerAPPPage', {
+					...this.pageRequest,
+					source: this.source
+				});
 				if (res.code == '200') {
-					this.directLsit=res.data.partnerInfoVoList
-					this.parentData= {...this.parentData,...res.data}
-					this.totalPages = res.data.totalPages;
 					this.totalSize = res.data.totalSize;
-					if (this.pageRequest.pageNum >= res.data.totalPages) this.status = 'nomore';
-					else this.status = 'loadmore';
-                    
+					this.directLsit = [...this.directLsit, ...res.data.content];
 				}
-			},
-			onShowDatePicker() { //显示
-				this.showDatePicker = true;
-			},
-		}
-		
+				if (this.pageRequest.pageNum >= this.totalPages) this.status = 'nomore';
+				else this.status = 'loading';
+			}, 1000)
+		},
+
+		async queryData(data) {
+			let params = {
+				beginTime: data && data.beginTime || '',
+				endTime: data && data.endTime || '',
+				leaderIds: this.parentData.leaderIds,
+				level: this.parentData.partnerType + 1 || this.parentData.level + 1,
+				industrySector: data && data.industrySector || '',
+				// ...this.pageRequest
+			}
+			let res = await this.$http.post('/APPPartner/partnerLeaderInfo', params);
+			if (res.code == '200') {
+				this.directLsit = res.data.partnerInfoVoList
+				this.parentData = { ...this.parentData, ...res.data }
+				this.totalPages = res.data.totalPages;
+				this.totalSize = res.data.totalSize;
+				if (this.pageRequest.pageNum >= res.data.totalPages) this.status = 'nomore';
+				else this.status = 'loadmore';
+
+			}
+		},
+		onShowDatePicker() { //显示
+			this.showDatePicker = true;
+		},
 	}
+
+}
 </script>
 
 <style lang="scss" scoped>
-	
-	.headers {
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		z-index: 999999;
-		padding-top: 40px;
-		    height: 85px;
+.headers {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	z-index: 999999;
+	padding-top: 40px;
+	height: 85px;
+
+	text {
+		font-size: 18px;
+		font-weight: bold;
+	}
+}
+
+.partner-head {
+	background: #FFFFFF;
+	color: #333333;
+	font-size: 14px;
+
+	i {
+		margin-left: 2px;
+		display: inline-block;
+		width: 0;
+		height: 0;
+		border: 4px solid;
+		border-color: #666666;
+		border-bottom: 4px solid transparent;
+		border-right: 4px solid transparent;
+		border-left: 4px solid transparent;
+	}
+
+	.search-data {
+		color: #666666;
+
+		.active {
+			color: #FFFFFF;
+			background: linear-gradient(132deg, #2DD9FF 0%, #2D6DFF 100%);
+		}
+
+		text {
+			// width: 25px;
+			// height: 25px;
+			// text-align: center;
+			padding: 5px 8px;
+			border: 1px solid #EEEEEE;
+		}
+	}
+}
+
+.sum-insurance {
+	padding: 10px 0;
+
+	view {
+		text-align: center;
+		width: 33.33%;
+		border-right: 1px solid #EEEEEE;
+
 		text {
+			display: block;
+		}
+
+		text:first-child {
+			font-weight: 600;
 			font-size: 18px;
-			font-weight: bold;
+			color: #333333;
+		}
+
+		text:last-child {
+			font-size: 10px;
+			color: #999999;
 		}
 	}
-	.partner-head{
-		background: #FFFFFF;
-		color: #333333;
-		font-size: 14px;
-		i{
-			margin-left: 2px;
-			display:inline-block;
-			width: 0;
-			height: 0;
-			border: 4px solid;
-			border-color: #666666;
-			border-bottom: 4px solid transparent; 
-			border-right: 4px solid transparent;
-			border-left: 4px solid transparent;
+}
+
+.card {
+	background: #FFFFFF;
+	border-radius: 5px 5px 5px 5px;
+	margin: 10px;
+	background-image: url("/static/card.png");
+	background-size: 100% 100%;
+	border-top: 1px solid;
+	border-image: linear-gradient(270deg, rgba(45, 217, 255, 0), rgba(45, 217, 255, 1), rgba(45, 217, 255, 0)) 1 1;
+
+	.card-title {
+		padding: 10px 15px;
+
+		text:first-child {
+			font-weight: 600;
+			font-size: 16px;
+			color: #333333;
 		}
-		.search-data{
+
+		text:last-child {
+			font-size: 12px;
 			color: #666666;
-			.active{
-				color: #FFFFFF;
-				background: linear-gradient( 132deg, #2DD9FF 0%, #2D6DFF 100%);
-			}
-			text{
-				// width: 25px;
-				// height: 25px;
-				// text-align: center;
-				padding: 5px 8px;
-				border: 1px solid #EEEEEE;
-			}
 		}
 	}
-	.sum-insurance{
+
+	.card-con {
 		padding: 10px 0;
-		view{
+
+		view {
 			text-align: center;
 			width: 33.33%;
 			border-right: 1px solid #EEEEEE;
-				text{
-					display: block;
-				}
-				text:first-child{
-					font-weight: 600;
-					font-size: 18px;
-					color: #333333;
-				}
-				text:last-child{
-					font-size: 10px;
-					color: #999999;
-				}
+
+			text {
+				display: block;
 			}
-	}
-	.card{
-		background: #FFFFFF;
-		border-radius: 5px 5px 5px 5px;
-		margin: 10px;
-		background-image: url("/static/card.png");
-		background-size: 100% 100%;
-		border-top: 1px solid;
-		border-image: linear-gradient(270deg, rgba(45, 217, 255, 0), rgba(45, 217, 255, 1), rgba(45, 217, 255, 0)) 1 1;
-		
-		.card-title{
-			padding:10px 15px;
-			text:first-child{
+
+			text:first-child {
 				font-weight: 600;
 				font-size: 16px;
 				color: #333333;
+				line-height: 18px;
 			}
-			text:last-child{
-				font-size: 12px;
-				color: #666666;
+
+			text:last-child {
+				font-size: 10px;
+				color: #999999;
 			}
 		}
-		.card-con{
-			padding: 10px 0;
-			view{
-				text-align: center;
-				width: 33.33%;
-				border-right: 1px solid #EEEEEE;
-					text{
-						display: block;
-					}
-					text:first-child{
-						font-weight: 600;
-						font-size: 16px;
-						color: #333333;
-						line-height: 18px;
-					}
-					text:last-child{
-						font-size: 10px;
-						color: #999999;
-					}
-				}
-		}
-		
 	}
+
+}
+
+.drag {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	min-height: 80rpx;
+	position: fixed;
+	z-index: 999999;
+	font-size: 12px;
+	color: #FFFFFF;
+	width: 50px;
+	height: 50px;
+	padding-top: 2px;
+	background: linear-gradient(132deg, #2DD9FF 0%, #2D6DFF 100%);
+	border-radius: 3px 3px 3px 3px;
+
+	image {
+		display: inline-block;
+		width: 23px;
+		height: 23px;
+	}
+
+	&.transition {
+		transition: left .3s ease, top .3s ease;
+	}
+
+}
+.ShowModalCode-business {
+	display: block;
+	font-weight: 600;
+	font-size: 16px;
+	color: #333333;
+	// border: 1px solid #EEEEEE;
+	padding: 15px;
+	text-align: center;
+}
+
+.ShowModalCode-con {
+	padding: 30px;
+	text-align: center;
+
+	image {
+		margin: 0 auto;
+		margin-top: 15px;
+	}
+}
+
+.uni-list {
+	flex: 1;
+}
+
+.uni-list-item:first-child {
+	/* #ifndef APP-NVUE */
+	// display: flex;
+	/* #endif */
+	flex: 1;
+	flex-direction: row;
+	background-color: #FFFFFF;
+	border-bottom-style: solid;
+	border-bottom-width: 1px;
+	border-bottom-color: #eee;
+}
+
+
+.uni-list-item__container {
+	padding: 12px 15px;
+	width: 100%;
+	flex: 1;
+
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	box-sizing: border-box;
+	/* #endif */
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+
+}
+
+.uni-list-item__notestext {
+	padding: 0 15px 15px 15px;
+	font-size: 15px;
+	color: #666666;
+}
+
+.uni-list-item__content-title {
+	font-size: 17px;
+	color: #333333;
+}
+
+.ShowModalCode-sumbit {
+	background: linear-gradient(132deg, #2DD9FF 0%, #2D6DFF 100%);
+	border-radius: 5px 5px 5px 5px;
+	height: 40px;
+	line-height: 40px;
+	font-size: 16px;
+	color: #FFFFFF;
+	margin: 15px;
+	text-align: center;
+}
+.ShowModalCode-style {
+	text:first-of-type {
+		display: block;
+		font-weight: 600;
+		font-size: 16px;
+		color: #333333;
+		border: 1px solid #EEEEEE;
+		padding: 15px;
+		text-align: center;
+	}
+}
+.popup-code {
+	text {
+		display: block;
+		border-bottom: 1px solid #EEEEEE;
+		height: 50px;
+		line-height: 50px;
+		text-align: center;
+		font-size: 16px;
+		color: #666666;
+	}
+}
+
 </style>

pages/institutional/partner.vue

@@ -4,7 +4,7 @@
 		<view class="headers " :style="headerStyle">
 			<view class="dis a-c j-start " style="padding: 0 15px;">
 				<u-icon name="arrow-left" size="40" @tap="back"></u-icon>
-				<text style="margin: auto;">合伙人</text>
+				<text style="margin: auto;">我的合伙人</text>
 			</view>
 		</view>
 
@@ -14,7 +14,7 @@
 			</view>
 			<!-- <card :cardData='directLsit'></card> -->
 			<block>
-				<!-- 一级 -->
+				<!-- 一级合伙人 -->
 				<view v-if="userLevel == 1">
 					<view class="card">
 						<view style="padding: 10px 15px 0 10px">
@@ -24,7 +24,7 @@
 									<image style="display: inline-block; width: 45px;height:18px;vertical-align: sub;"
 										src="/static/icon/jibie1.png" mode=""></image>
 								</view>
-								<view @click="partnersAndStudios(2)">
+								<view @click="ShowModalCodeFun(2,1)">
 									<image style="display: inline-block; width: 13px;height:13px;vertical-align: -1px;"
 										src="/static/icon/code2.png" mode=""></image>
 									<text>招募码</text>
@@ -33,7 +33,7 @@
 							<view class="card-con dis j-c a-c">
 								<view>
 									<text>{{ directLsitOne.teamManNum || 0 }}</text>
-									<text>总人数</text>
+									<text>会员总人数</text>
 								</view>
 								<view>
 									<text>{{ directLsitOne.sumPremium || 0 }}</text>
@@ -46,11 +46,11 @@
 							</view>
 						</view>
 						<view class="card-footer dis">
-							<text style="border-right: 1px solid #EEEEEE;" @click="partnerDetail(directLsitOne)">
+							<text style="border-right: 1px solid #EEEEEE;" @click="partnerDetail(directLsitOne,1)">
 								<image src="/static/icon/hehuoren.png" mode=""></image>
 								合伙人（{{ directLsitOne.partnerNumber || 0 }}）
 							</text>
-							<text @click="closeInstitution(directLsitOne)">
+							<text @click="closeInstitution(directLsitOne,1)">
 								<image src="/static/icon/gongzuoshi.png" mode=""></image>
 								工作室（{{ directLsitOne.workNumber || 0 }}）
 							</text>
@@ -64,7 +64,7 @@
 									<image style="display: inline-block; width: 45px;height:18px;vertical-align: sub;"
 										src="/static/icon/jibie.png" mode=""></image>
 								</view>
-								<view @click="recruitment(3)">
+								<view @click="ShowModalCodeFun(3,2)">
 									<image style="display: inline-block; width: 13px;height:13px;vertical-align: -1px;"
 										src="/static/icon/code2.png" mode=""></image>
 									<text>招募码</text>
@@ -73,7 +73,7 @@
 							<view class="card-con dis j-c a-c">
 								<view>
 									<text>{{ directLsitTwo.teamManNum || 0 }}</text>
-									<text>总人数</text>
+									<text>会员总人数</text>
 								</view>
 								<view>
 									<text>{{ directLsitTwo.sumPremium || 0 }}</text>
@@ -86,11 +86,11 @@
 							</view>
 						</view>
 						<view class="card-footer dis">
-							<text style="border-right: 1px solid #EEEEEE;" @click="partnerDetail(directLsitTwo)">
+							<text style="border-right: 1px solid #EEEEEE;" @click="partnerDetail(directLsitTwo,2)">
 								<image src="/static/icon/hehuoren.png" mode=""></image>
 								合伙人（{{ directLsitTwo.partnerNumber || 0 }}）
 							</text>
-							<text @click="closeInstitution(directLsitTwo)">
+							<text @click="closeInstitution(directLsitTwo,2)">
 								<image src="/static/icon/gongzuoshi.png" mode=""></image>
 								工作室（{{ directLsitTwo.workNumber || 0 }}）
 							</text>
@@ -105,7 +105,7 @@
 									<image style="display: inline-block; width: 45px;height:18px;vertical-align: sub;"
 										src="/static/icon/jibie3.png" mode=""></image>
 								</view>
-								<view @click="recruitment(4)">
+								<view @click="ShowModalCodeFun(4,3)">
 									<image style="display: inline-block; width: 13px;height:13px;vertical-align: -1px;"
 										src="/static/icon/code2.png" mode=""></image>
 									<text>招募码</text>
@@ -114,7 +114,7 @@
 							<view class="card-con dis j-c a-c">
 								<view>
 									<text>{{ directLsitThree.teamManNum || 0 }}</text>
-									<text>总人数</text>
+									<text>会员总人数</text>
 								</view>
 								<view>
 									<text>{{ directLsitThree.sumPremium || 0 }}</text>
@@ -127,11 +127,11 @@
 							</view>
 						</view>
 						<view class="card-footer dis">
-							<text style="border-right: 1px solid #EEEEEE;" @click="partnerDetail(directLsitThree)">
+							<text style="border-right: 1px solid #EEEEEE;" @click="partnerDetail(directLsitThree,3)">
 								<image src="/static/icon/hehuoren.png" mode=""></image>
 								合伙人（{{ directLsitThree.partnerNumber || 0 }}）
 							</text>
-							<text @click="closeInstitution(directLsitThree)">
+							<text @click="closeInstitution(directLsitThree,3)">
 								<image src="/static/icon/gongzuoshi.png" mode=""></image>
 								工作室（{{ directLsitThree.workNumber || 0 }}）
 							</text>
@@ -145,7 +145,7 @@
 									<image style="display: inline-block; width: 45px;height:18px;vertical-align: sub;"
 										src="/static/icon/jibie4.png" mode=""></image>
 								</view>
-								<view @click="ShowModalCodeFun(5)">
+								<view @click="ShowModalCodeFun(5,4)">
 									<image style="display: inline-block; width: 13px;height:13px;vertical-align: -1px;"
 										src="/static/icon/code2.png" mode=""></image>
 									<text>招募码</text>
@@ -158,7 +158,7 @@
 							<view class="card-con dis j-c a-c">
 								<view>
 									<text>{{ directLsitFour.teamManNum || 0 }}</text>
-									<text>总人数</text>
+									<text>会员总人数</text>
 								</view>
 								<view>
 									<text>{{ directLsitFour.sumPremium || 0 }}</text>
@@ -171,18 +171,18 @@
 							</view>
 						</view>
 						<view class="card-footer dis">
-							<text style="border-right: 1px solid #EEEEEE;" @click="partnerDetail(directLsitFour)">
+							<text style="border-right: 1px solid #EEEEEE;" @click="partnerDetail(directLsitFour,4)">
 								<image src="/static/icon/hehuoren.png" mode=""></image>
 								合伙人（{{ directLsitFour.partnerNumber || 0 }}）
 							</text>
-							<text @click="closeInstitution(directLsitFour)">
+							<text @click="closeInstitution(directLsitFour,4)">
 								<image src="/static/icon/gongzuoshi.png" mode=""></image>
 								工作室（{{ directLsitFour.workNumber || 0 }}）
 							</text>
 						</view>
 					</view>
 				</view>
-				<!-- 二级 -->
+				<!-- 二级合伙人 -->
 				<view v-if="userLevel == 2">
 					<view class="card" >
 						<view style="padding: 10px 15px 0 10px">
@@ -192,7 +192,7 @@
 									<image style="display: inline-block; width: 45px;height:18px;vertical-align: sub;"
 										src="/static/icon/jibie.png" mode=""></image>
 								</view>
-								<view @click="partnersAndStudios(3)">
+								<view @click="ShowModalCodeFun(3,1)">
 									<image style="display: inline-block; width: 13px;height:13px;vertical-align: -1px;"
 										src="/static/icon/code2.png" mode=""></image>
 									<text>招募码</text>
@@ -201,7 +201,7 @@
 							<view class="card-con dis j-c a-c">
 								<view>
 									<text>{{ directLsitTwo.teamManNum || 0 }}</text>
-									<text>总人数</text>
+									<text>会员总人数</text>
 								</view>
 								<view>
 									<text>{{ directLsitTwo.sumPremium || 0 }}</text>
@@ -214,11 +214,11 @@
 							</view>
 						</view>
 						<view class="card-footer dis">
-							<text style="border-right: 1px solid #EEEEEE;" @click="partnerDetail(directLsitTwo)">
+							<text style="border-right: 1px solid #EEEEEE;" @click="partnerDetail(directLsitTwo,1)">
 								<image src="/static/icon/hehuoren.png" mode=""></image>
 								合伙人（{{ directLsitTwo.partnerNumber || 0 }}）
 							</text>
-							<text @click="closeInstitution(directLsitTwo)">
+							<text @click="closeInstitution(directLsitTwo,1)">
 								<image src="/static/icon/gongzuoshi.png" mode=""></image>
 								工作室（{{ directLsitTwo.workNumber || 0 }}）
 							</text>
@@ -232,7 +232,7 @@
 									<image style="display: inline-block; width: 45px;height:18px;vertical-align: sub;"
 										src="/static/icon/jibie3.png" mode=""></image>
 								</view>
-								<view @click="recruitment(4)">
+								<view @click="ShowModalCodeFun(4,2)">
 									<image style="display: inline-block; width: 13px;height:13px;vertical-align: -1px;"
 										src="/static/icon/code2.png" mode=""></image>
 									<text>招募码</text>
@@ -241,7 +241,7 @@
 							<view class="card-con dis j-c a-c">
 								<view>
 									<text>{{ directLsitThree.teamManNum || 0 }}</text>
-									<text>总人数</text>
+									<text>会员总人数</text>
 								</view>
 								<view>
 									<text>{{ directLsitThree.sumPremium || 0 }}</text>
@@ -254,11 +254,11 @@
 							</view>
 						</view>
 						<view class="card-footer dis">
-							<text style="border-right: 1px solid #EEEEEE;" @click="partnerDetail(directLsitThree)">
+							<text style="border-right: 1px solid #EEEEEE;" @click="partnerDetail(directLsitThree,2)">
 								<image src="/static/icon/hehuoren.png" mode=""></image>
 								合伙人（{{ directLsitThree.partnerNumber || 0 }}）
 							</text>
-							<text @click="closeInstitution(directLsitThree)">
+							<text @click="closeInstitution(directLsitThree,2)">
 								<image src="/static/icon/gongzuoshi.png" mode=""></image>
 								工作室（{{ directLsitThree.workNumber || 0 }}）
 							</text>
@@ -272,7 +272,7 @@
 									<image style="display: inline-block; width: 45px;height:18px;vertical-align: sub;"
 										src="/static/icon/jibie4.png" mode=""></image>
 								</view>
-								<view @click="ShowModalCodeFun(5)" >
+								<view @click="ShowModalCodeFun(5,3)" >
 									<image style="display: inline-block; width: 13px;height:13px;vertical-align: -1px;" src="/static/icon/code2.png" mode=""></image>
 									<text>招募码</text>
 								</view>
@@ -280,7 +280,7 @@
 							<view class="card-con dis j-c a-c">
 								<view>
 									<text>{{ directLsitFour.teamManNum || 0 }}</text>
-									<text>总人数</text>
+									<text>会员总人数</text>
 								</view>
 								<view>
 									<text>{{ directLsitFour.sumPremium || 0 }}</text>
@@ -293,17 +293,18 @@
 							</view>
 						</view>
 						<view class="card-footer dis">
-							<text style="border-right: 1px solid #EEEEEE;" @click="partnerDetail(directLsitFour)">
+							<text style="border-right: 1px solid #EEEEEE;" @click="partnerDetail(directLsitFour,3)">
 								<image src="/static/icon/hehuoren.png" mode=""></image>
 								合伙人（{{ directLsitFour.partnerNumber || 0 }}）
 							</text>
-							<text @click="closeInstitution(directLsitFour)">
+							<text @click="closeInstitution(directLsitFour,3)">
 								<image src="/static/icon/gongzuoshi.png" mode=""></image>
 								工作室（{{ directLsitFour.workNumber || 0 }}）
 							</text>
 						</view>
 					</view>
 				</view>
+				<!-- 三级合伙人 -->
 				<view v-if="userLevel == 3">
 					<view class="card" >
 						<view style="padding: 10px 15px 0 10px">
@@ -313,7 +314,7 @@
 									<image style="display: inline-block; width: 45px;height:18px;vertical-align: sub;"
 										src="/static/icon/jibie3.png" mode=""></image>
 								</view>
-								<view @click="partnersAndStudios(4)">
+								<view @click="ShowModalCodeFun(4,1)">
 									<image style="display: inline-block; width: 13px;height:13px;vertical-align: -1px;"
 										src="/static/icon/code2.png" mode=""></image>
 									<text>招募码</text>
@@ -322,7 +323,7 @@
 							<view class="card-con dis j-c a-c">
 								<view>
 									<text>{{ directLsitThree.teamManNum || 0 }}</text>
-									<text>总人数</text>
+									<text>会员总人数</text>
 								</view>
 								<view>
 									<text>{{ directLsitThree.sumPremium || 0 }}</text>
@@ -335,11 +336,11 @@
 							</view>
 						</view>
 						<view class="card-footer dis">
-							<text style="border-right: 1px solid #EEEEEE;" @click="partnerDetail(directLsitThree)">
+							<text style="border-right: 1px solid #EEEEEE;" @click="partnerDetail(directLsitThree,1)">
 								<image src="/static/icon/hehuoren.png" mode=""></image>
 								合伙人（{{ directLsitThree.partnerNumber || 0 }}）
 							</text>
-							<text @click="closeInstitution(directLsitThree)">
+							<text @click="closeInstitution(directLsitThree,1)">
 								<image src="/static/icon/gongzuoshi.png" mode=""></image>
 								工作室（{{ directLsitThree.workNumber || 0 }}）
 							</text>
@@ -353,7 +354,7 @@
 									<image style="display: inline-block; width: 45px;height:18px;vertical-align: sub;"
 										src="/static/icon/jibie4.png" mode=""></image>
 								</view>
-								<view @click="ShowModalCodeFun(5)" >
+								<view @click="ShowModalCodeFun(5,2)" >
 									<image style="display: inline-block; width: 13px;height:13px;vertical-align: -1px;" src="/static/icon/code2.png" mode=""></image>
 									<text>招募码</text>
 								</view>
@@ -361,7 +362,7 @@
 							<view class="card-con dis j-c a-c">
 								<view>
 									<text>{{ directLsitFour.teamManNum || 0 }}</text>
-									<text>总人数</text>
+									<text>会员总人数</text>
 								</view>
 								<view>
 									<text>{{ directLsitFour.sumPremium || 0 }}</text>
@@ -374,17 +375,18 @@
 							</view>
 						</view>
 						<view class="card-footer dis">
-							<text style="border-right: 1px solid #EEEEEE;" @click="partnerDetail(directLsitFour)">
+							<text style="border-right: 1px solid #EEEEEE;" @click="partnerDetail(directLsitFour,2)">
 								<image src="/static/icon/hehuoren.png" mode=""></image>
 								合伙人（{{ directLsitFour.partnerNumber || 0 }}）
 							</text>
-							<text @click="closeInstitution(directLsitFour)">
+							<text @click="closeInstitution(directLsitFour,2)">
 								<image src="/static/icon/gongzuoshi.png" mode=""></image>
 								工作室（{{ directLsitFour.workNumber || 0 }}）
 							</text>
 						</view>
 					</view>
 				</view>
+				<!-- 四级合伙人 -->
 				<view v-if="userLevel == 4">
 					<view class="card" >
 						<view style="padding: 10px 15px 0 10px">
@@ -394,7 +396,7 @@
 									<image style="display: inline-block; width: 45px;height:18px;vertical-align: sub;"
 										src="/static/icon/jibie4.png" mode=""></image>
 								</view>
-								<view @click="ShowModalCodeFun(5)" >
+								<view @click="ShowModalCodeFun(5,1)" >
 									<image style="display: inline-block; width: 13px;height:13px;vertical-align: -1px;" src="/static/icon/code2.png" mode=""></image>
 									<text>招募码</text>
 								</view>
@@ -402,7 +404,7 @@
 							<view class="card-con dis j-c a-c">
 								<view>
 									<text>{{ directLsitFour.teamManNum || 0 }}</text>
-									<text>总人数</text>
+									<text>会员总人数</text>
 								</view>
 								<view>
 									<text>{{ directLsitFour.sumPremium || 0 }}</text>
@@ -415,11 +417,11 @@
 							</view>
 						</view>
 						<view class="card-footer dis">
-							<text style="border-right: 1px solid #EEEEEE;" @click="partnerDetail(directLsitFour)">
+							<text style="border-right: 1px solid #EEEEEE;" @click="partnerDetail(directLsitFour,1)">
 								<image src="/static/icon/hehuoren.png" mode=""></image>
 								合伙人（{{ directLsitFour.partnerNumber || 0 }}）
 							</text>
-							<text @click="closeInstitution(directLsitFour)">
+							<text @click="closeInstitution(directLsitFour,1)">
 								<image src="/static/icon/gongzuoshi.png" mode=""></image>
 								工作室（{{ directLsitFour.workNumber || 0 }}）
 							</text>
@@ -439,7 +441,7 @@
 		</u-popup>
 		<u-popup v-model="ShowModalCode" mode="bottom" border-radius="15">
 			<view class="ShowModalCode-style ">
-				<text>合伙人招募码</text>
+				<text>{{chineseNumbers[relativeLeavl]}}级合伙人招募码</text>
 				<view class=" ShowModalCode-con">
 					<view>扫码加入</view>
 					<image :src="partnerImg" mode="widthFix" lazy-load style="width: 150px;"></image>
@@ -477,6 +479,10 @@
 				</view>
 			</view>
 		</u-popup>
+		<u-popup  mode="center" ref="alertDialog" type="dialog">
+				<uni-popup-dialog type="warn" cancelText="取消" confirmText="确定" title=" " :content="dialogContent" @confirm="dialogConfirm"
+					@close="dialogClose"></uni-popup-dialog>
+			</u-popup>
 	</view>
 </template>
 <script>
@@ -488,6 +494,8 @@ import {
 	mapState,
 	mapMutations
 } from "vuex"
+// import uniPopup from 'x../../../components/';
+
 // import card from '../components/card.vue'
 export default {
 	components: { myDatePicker, seach },
@@ -496,11 +504,14 @@ export default {
 	},
 	data() {
 		return {
+			dialogContent:'',
+			ShowalertDialog:false,
+			relativeLeavl:null,
 			ShowModal: false,
 			ShowModalCode: false,
 			ShowModalCode1: false,
 			ShowModalCodebusiness: false,
-			// chineseNumbers:[ '一', '二', '三', '四', '五', '六', '七', '八', '九'],
+			chineseNumbers:[ '零', '一', '二', '三', '四', '五', '六', '七', '八', '九'],
 			headerStyle: {
 				backgroundColor: 'transparent',
 				backgroundImage: 'url("/static/beijing (2).png")',
@@ -554,19 +565,28 @@ export default {
 		this.userLevel = this.userInfo.sysUser.level
 	},
 	methods: {
+		dialogClose(){
+			this.$refs.alertDialog.close()
+		},
 		styleChange(e) {
 			this.deptSource = e.detail.value
 		},
-		ShowModalCodeFun(level) {
-			this.level=level 
-			console.log(this.level,222222);
+		dialogConfirm (){
 			this.ShowModalCode = true
+			this.$refs.alertDialog.close()
 			this.partnerImg = QR.createQrCodeImg(this.$base.h5BaseUrl + "/#/pages/index/applypartner?level=" + this.level + '&userId=' + this.userInfo.sysUser.userId, {
 				size: parseInt(200) //二维码大小  
 			})
 		},
+		ShowModalCodeFun(level,relativeLeavl) {
+			// 绝对等级：level  相对等级：relativeLeavl
+			this.level=level 
+			this.relativeLeavl=relativeLeavl
+			// this.ShowalertDialog=true
+			this.dialogContent=`是否招募${this.chineseNumbers[relativeLeavl]}级合伙人?`
+			this.$refs.alertDialog.open()
+		},
 		ShowModalCodeSumbit(){
-			console.log(this.deptSource,9999222222);
 			this. ShowModalCode1 = true
 			this.workImg = QR.createQrCodeImg(this.$base.h5BaseUrl + "/#/pages/index/applystudio?deptSource=" + this.deptSource + '&userId=' + this.userInfo.sysUser.userId, {
 				size: parseInt(200) //二维码大小  
@@ -576,14 +596,14 @@ export default {
 			this.ShowModalCodebusiness = true
 			this.deptSource = 1
 		},
-		partnersAndStudios(level){
-			this.level=level
-			this.ShowModal = true
-		},
-		recruitment(level) {
-			this.level = level
-			this.ShowModalCodeFun(level)
-		},
+		// partnersAndStudios(level){
+		// 	this.level=level
+		// 	this.ShowModal = true
+		// },
+		// recruitment(level) {
+		// 	this.level = level
+		// 	this.ShowModalCodeFun(level)
+		// },
 		back() {
 			uni.navigateBack({
 				delta: 1, // 返回的页面数，如果是1表示返回上一页
@@ -591,16 +611,17 @@ export default {
 			});
 
 		},
-		partnerDetail(item) {
+		partnerDetail(item,level) {
 			if (item.partnerNumber) {
+				item.partnerType=level
 				uni.navigateTo({
 					url: "/pages/institutional/partnerDetail?key=" + encodeURIComponent(JSON.stringify(item))
 				})
 			}
 		},
-		closeInstitution(item) {
+		closeInstitution(item,level) {
 			if (item.leaderIds.length > 0) {
-				item.type = 1
+				item.level=level
 				uni.navigateTo({
 					url: "/pages/institutional/institutionalTeam?key=" + encodeURIComponent(JSON.stringify(item))
 				})
@@ -818,17 +839,17 @@ export default {
 		text-align: center;
 	}
 }
-
-.ShowModalCode-business {
-	display: block;
-	font-weight: 600;
-	font-size: 16px;
-	color: #333333;
-	// border: 1px solid #EEEEEE;
-	padding: 15px;
-	text-align: center;
+.popup-code {
+	text {
+		display: block;
+		border-bottom: 1px solid #EEEEEE;
+		height: 50px;
+		line-height: 50px;
+		text-align: center;
+		font-size: 16px;
+		color: #666666;
+	}
 }
-
 .ShowModalCode-con {
 	padding: 30px;
 	text-align: center;
@@ -838,58 +859,4 @@ export default {
 		margin-top: 15px;
 	}
 }
-
-.uni-list {
-	flex: 1;
-}
-
-.uni-list-item:first-child {
-	/* #ifndef APP-NVUE */
-	// display: flex;
-	/* #endif */
-	flex: 1;
-	flex-direction: row;
-	background-color: #FFFFFF;
-	border-bottom-style: solid;
-	border-bottom-width: 1px;
-	border-bottom-color: #eee;
-}
-
-
-.uni-list-item__container {
-	padding: 12px 15px;
-	width: 100%;
-	flex: 1;
-
-	position: relative;
-	/* #ifndef APP-NVUE */
-	display: flex;
-	box-sizing: border-box;
-	/* #endif */
-	flex-direction: row;
-	justify-content: space-between;
-	align-items: center;
-
-}
-
-.uni-list-item__notestext {
-	padding: 0 15px 15px 15px;
-	font-size: 15px;
-	color: #666666;
-}
-
-.uni-list-item__content-title {
-	font-size: 17px;
-	color: #333333;
-}
-
-.ShowModalCode-sumbit {
-	background: linear-gradient(132deg, #2DD9FF 0%, #2D6DFF 100%);
-	border-radius: 5px 5px 5px 5px;
-	height: 40px;
-	line-height: 40px;
-	font-size: 16px;
-	color: #FFFFFF;
-	margin: 15px;
-	text-align: center;
-}</style>
+</style>

pages/institutional/partnerDetail.vue

@@ -133,7 +133,7 @@
 						industrySector:data&& data.industrySector  ||'',
 						type:1,
 						partnerIds:this.parentData.partnerIds,
-						level: this.parentData.partnerType-1 ||this.parentData.level ,
+						level: this.parentData.partnerType ||this.parentData.level+1 ,
 						// ...this.pageRequest
 					}
 				let res = await this.$http.post('/APPPartner/queryPartnerInfo', params);

pages/login/login.vue

@@ -11,7 +11,7 @@
 			</image>
 		</view>
 		<view class="" style="margin-top: -120px;">
-			<u-tabs :list="list" :is-scroll="true" :current="current" @change="change"
+			<u-tabs :list="list" :is-scroll="true" :current="current" @change="change" 	active-color="#FF852D" 
 				style="background: transparent;margin-bottom: 30px;"></u-tabs>
 			<!-- 登录区域Start -->
 			<view class="mx-3">
@@ -90,7 +90,7 @@
 					:class="{'bg-hover-color':disabled}" type="primary" @tap="submit" :disabled="disabled"
 					style="letter-spacing: 20rpx;">登录</button>
 				<view class=" left-0 right-0 dis a-c j-start  text-light-muted" style="bottom:30rpx">
-					<u-checkbox v-model="checked"></u-checkbox>
+					<u-checkbox v-model="checked"  active-color="#FF852D "></u-checkbox>
 					我已确认并同意<view> <text @tap="nav('/pages/login/xieyi')" class="text-color">平台协议</text>及<text
 							class="text-color" @tap="nav('/pages/login/mimi')">隐私协议</text>政策</view>
 				</view>
@@ -738,7 +738,7 @@
 <style lang="scss" scoped>
 	/deep/ {
 		.u-tab-bar {
-			background: linear-gradient(90deg, #0052FF 0%, rgba(0, 82, 255, 0) 100%) !important;
+			background: linear-gradient(90deg, #FF9E2D 0%, rgba(0, 82, 255, 0) 100%) !important;
 			border-radius: 4px 4px 4px 4px;
 		}
 	}
@@ -766,7 +766,7 @@
 
 	.shili_btn>view:nth-child(2) {
 		color: #FFFFFF;
-		background-color: #007BFF;
+		background-color: #FF9E2D;
 	}
 
 	.shili>text:nth-child(1) {
@@ -849,17 +849,21 @@
 	}
 
 	.bg-color {
-		background-color: #0052FF;
+		background-color: #FF9E2D;
 		border-radius: 20px;
 	}
 
 	.bg-hover-color {
-		background-color: #0052FF;
+		background-color: #FF9E2D !important;
 		opacity: 0.65;
 		border-radius: 20px;
 	}
 
 	.text-color {
-		color: #0052FF;
+		color: #FF9E2D;
 	}
+	// .u-checkbox>.u-checkbox__icon-wrap--checked{
+	// 	background-color: #FF9E2D !important;
+    // border-color: #FF9E2D !important;
+	// }
 </style>

pages/my/my.vue

@@ -7,11 +7,11 @@
 			<view class="dis a-c j-c">
 				<text>我的</text>
 				<view class="headers-right">
-					<view>
+					<!-- <view>
 						<image  @click="weChatService" src="/static/image/my/kefu.png" mode="">
 						</image>
 						<text>客服</text>
-					</view>
+					</view> -->
 					<view style="margin-left:15px">
 						<image @tap="logout" src="/static/image/my/tichu.png" mode="">
 						</image>

pages/statistics/statistics.vue

@@ -1,27 +1,187 @@
 <template>
-    <view>
-        <!-- 公共组件-每个页面必须引入 -->
+	<view>
+		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-        <!-- 头部信息Start -->
+		<!-- 头部信息Start -->
 		<view class="headers " :style="headerStyle">
 			<view class="dis a-c j-c">
 				<text>统计</text>
-				<view class="headers-right">
-                    <image  @click="weChatService" src="/static/image/my/kefu.png" mode="">
-                    </image>
-                    <text>客服</text>
+				<!-- <view class="headers-right">
+					<image @click="weChatService" src="/static/image/my/kefu.png" mode="">
+					</image>
+					<text>客服</text>
+				</view> -->
+			</view>
+		</view>
+		<view class="body-box" style="margin-top: 100px" v-if="type == 1">
+			<view class=" dis j-s a-c" style="padding: 10px 10px 0 0;">
+				<view class="statistics-title">新增人员汇总统计</view>
+				<view class="search-data">
+					<text v-for="(val, index) in year" :key="index" :class="val.startShow ? 'active' : ''"
+						@click="onSeachYear(val, index, 1)">{{ val.lable }}</text>
+				</view>
+			</view>
+			<view class="statistics-number ">
+				<view v-if="level <= 4">
+					<text>{{ echartsList.onePartnerNum || 0 }}</text>
+					<text>一级合伙人</text>
+				</view>
+				<view v-if="level <= 3">
+					<text>{{ echartsList.twoPartnerNum || 0 }}</text>
+					<text>二级合伙人</text>
+				</view>
+				<view v-if="level <= 2">
+					<text>{{ echartsList.threePartnerNum || 0 }}</text>
+					<text>三级合伙人</text>
+				</view>
+				<view v-if="level == 1">
+					<text>{{ echartsList.fourPartnerNum || 0 }}</text>
+					<text>四级合伙人</text>
+				</view>
+				<!-- <view v-if="level==1">
+						<text>{{ echartsList.onePartnerNum || 0 }}</text>
+						<text>一级合伙人</text>
+					</view>
+					<view v-if="level<=2">
+						<text>{{ echartsList.twoPartnerNum || 0 }}</text>
+						<text>{{level==2?'一级合伙人':'二级合伙人'}}</text>
+					</view>
+					<view v-if="level<=3">
+						<text>{{ echartsList.threePartnerNum || 0 }}</text>
+						<text>{{level==3?'一级合伙人':level==2?'二级合伙人':'三级合伙人'}}</text>
+					</view>
+					<view v-if="level<=4">
+						<text>{{ echartsList.fourPartnerNum || 0 }}</text>
+						<text>{{level==4?'一级合伙人':level==3?'二级合伙人':level==2?'三级合伙人':'四级合伙人'}}</text>
+					</view> -->
+				<view>
+					<text>{{ echartsList.workSum || 0 }}</text>
+					<text>工作室</text>
+				</view>
+				<view>
+					<text>{{ echartsList.deptSum || 0 }}</text>
+					<text>团队</text>
+				</view>
+				<view>
+					<text>{{ echartsList.deptManSum || 0 }}</text>
+					<text>代理人</text>
+				</view>
+			</view>
+			<view class="partner-type dis">
+				<view style="width: 650px;overflow-x: auto;">
+					<text :class="typeStatistics == val.value ? 'selected' : ''" v-for="val in partnerTypeOption"
+						:key="val.value" @click="getPartnerType(val.value)">{{ val.lable }}</text>
+				</view>
+			</view>
+			<o-empty v-if="echartsList.countUserNumVoList && echartsList.countUserNumVoList.length == 0" height="20vh" />
+			<qiun-data-charts  v-else type="area" :opts="opts1" :chartData="chartData1"  />
+
+		</view>
+		<view class="body-box" v-if="type == 1">
+			<view class=" dis j-s a-c" style="padding: 10px 10px 0 0;">
+				<view class="statistics-title">新增人员占比分析</view>
+				<view class="search-data">
+					<text v-for="(val, index) in year" :key="index" :class="val.startShow ? 'active' : ''"
+						@click="onSeachYear(val, index, 2)">{{ val.lable }}</text>
+				</view>
+			</view>
+			<leverStaff @getPartnerType="getPartnerType2"></leverStaff>
+			<!-- <o-empty v-if="echartsList.countUserNumVoList && echartsList.countUserNumVoList.length==0" height="20vh" /> -->
+			<view class="charts-box">
+			<qiun-data-charts type="ring" :opts="{ legend: { position: 'bottom' } }" :eopts="ringOpts" :chartData="chartsDataPie2"
+                :echartsH5="true" :echartsApp="true" />
+			</view>
+		</view>
+		<view class="body-box" style="padding-bottom: 10px;" v-if="type == 1">
+			<view class=" dis j-s a-c" style="padding: 10px 10px 0 0;">
+				<view class="statistics-title">排名</view>
+			</view>
+			<leverStaff @getPartnerType="getPartnerType3"></leverStaff>
+			<view class="teamStatistics ">
+				<view class="statisticsTitle">
+					<view>排名</view>
+					<view>姓名</view>
+					<view>人数</view>
+					<view>详情</view>
+				</view>
+				<block v-for="(item, index) in directLsit" :key="index">
+					<view>
+						<view class="statisticsContent ">
+							<view>
+								<image v-if="index == 0" src="/static/icon/paiming1.png" mode=""></image>
+								<image v-else-if="index == 1" src="/static/icon/paiming2.png" mode=""></image>
+								<image v-else-if="index == 2" src="/static/icon/paiming3.png" mode=""></image>
+								<text v-else>{{ index + 1 }}</text>
+							</view>
+							<view>{{ item.userName }}</view>
+							<view>{{ item.deptManNum }}</view>
+							<view style="color:#739EFF ">查看</view>
+						</view>
+					</view>
+				</block>
+				<!-- <o-empty v-if="directLsit.length==0"  /> -->
+
+			</view>
+		</view>
+		<view class="body-box" style="margin-top: 100px;" v-if="type == 2">
+			<view class=" dis j-s a-c" style="padding: 10px 10px 0 0;">
+				<view class="statistics-title">新增人员汇总统计</view>
+				<view class="search-data">
+					<text v-for="(val, index) in year" :key="index" :class="val.startShow ? 'active' : ''"
+						@click="onSeachYear(val, index, 1)">{{ val.lable }}</text>
+				</view>
+			</view>
+			<view class="statistics-number ">
+				<view>
+					<text>{{ echartsList.countSum || 0 }}</text>
+					<text>新增人员</text>
+				</view>
+				<view>
+					<text>{{ echartsList.deptSum || 0 }}</text>
+					<text>团队</text>
+				</view>
+				<view>
+					<text>{{ echartsList.deptManSum || 0 }}</text>
+					<text>代理人</text>
 				</view>
-				
 			</view>
+			<view class="statistics-type">
+				<text :class="typeStatistics == 1 ? 'selected' : ''" @click="getStatistics(1)">团队</text>
+				<text :class="typeStatistics == 2 ? 'selected' : ''" @click="getStatistics(2)">代理人</text>
+			</view>
+			<o-empty v-if="echartsList.countUserNumVoList && echartsList.countUserNumVoList.length == 0" height="20vh" />
+			<qiun-data-charts  v-else type="area" :opts="opts1" :chartData="chartData1"  />
 		</view>
-    </view>
+
+	</view>
 </template>
 <script>
+import {
+	mapState,
+} from "vuex"
+import leverStaff from "../components/leverStaff.vue"
 export default {
-    data() {
+	components: {
+		leverStaff
+	},
+	data() {
 		return {
-            supportStaffUrl:'',
-            headerStyle: {
+			beginTime:'',
+			endTime:'',
+			ringOpts: {
+                color: [ '#02CDFF','#2D97FF '],
+                legend: { show: false },
+				dataLabel: true,
+            },
+			chartsDataPie2 :{},
+			level: '',
+			type: null,
+			typeStatistics: 1,
+			typeStatistics2: 1,
+			typeStatistics3: 1,
+			option: {},
+			supportStaffUrl: '',
+			headerStyle: {
 				backgroundColor: 'transparent',
 				backgroundImage: 'url("/static/beijing (2).png")',
 				backgroundSize: 'cover',
@@ -29,26 +189,270 @@ export default {
 				boxShadow: ''
 				// 其他样式属性...
 			},
-        }
-    },
-    mounted() {
+			year: [{
+				lable: '日',
+				startShow: false
+			}, {
+				lable: '周',
+				startShow: false
+			}, {
+				lable: '月',
+				startShow: false
+			}],
+			echartsList: {},
+			analysisEchartsList: {},
+			partnerTypeOption: [
+				{
+					lable: '一级合伙人',
+					value: '1'
+				}, {
+					lable: '二级合伙人',
+					value: '2'
+				}, {
+					lable: '三级合伙人',
+					value: '3'
+				}, {
+					lable: '四级合伙人',
+					value: '4'
+				},
+			],
+			// optsMax:10,
+			opts1: {
+				legend: {
+				show: false // 设置图例不显示
+				},
+				yAxis: {
+				gridType: "dash",
+				dashLength: 2,
+				data: [
+					{
+					min: 0,
+					max: 10
+					}
+				]
+				},
+				extra: {
+					area: {
+						type: "curve",
+						opacity: 0.2,
+						addLine: true,
+						width: 2,
+						gradient: true,
+						activeType: "hollow"
+					}
+					// line: {
+					// 	type: "curve",
+					// 	width: 2,
+					// 	activeType: "hollow",
+					// 	linearType: "custom"
+					// }
+				}
+			},
+			
+			chartData1: {},
+			directLsit: []
+		}
+	},
+	computed: {
+		...mapState(['userInfo']),
+	},
+	onLoad() {
+		this.level = this.userInfo.sysUser.level
+		if (this.level == 2) {
+			this.partnerTypeOption = this.partnerTypeOption.slice(0, -1);
+		}
+		if (this.level == 3) {
+			this.partnerTypeOption = this.partnerTypeOption.slice(0, -2);
+		}
+		if (this.level == 4) {
+			this.partnerTypeOption = this.partnerTypeOption.slice(0, 1);
+		}
 		this.$http.get('/sys/qy/wechat/find/picture').then(res => {
 			this.supportStaffUrl = res.data.supportStaffUrl
 		})
 	},
-	methods: {
-        //点击跳转企业微信客服
-	weChatService() {
-		uni.share({
-			provider: "weixin",
-			openCustomerServiceChat: true,
-			customerUrl: this.supportStaffUrl, //企业微信地址
-			corpid: 'wwfe67d19509d43ec5', //企业id
-			success: (res) => {},
-			fail: (err) => {}
-		});
+	onShow() {
+		this.type = uni.getStorageSync('type')
+		// if(this.type ==2){
+		// 	this.queryData({type:1})
+		// }
+		// else{
+		// 	this.queryData({type:1})
+		// }
+		this.queryData()
+		if (this.type == 1) {
+			this.analysisQueryData()
+			this.rankingQueryData()
+		}
+
 	},
-    }
+
+	methods: {
+		canvasInit(canvas, width, height) {
+			// 初始化画布
+			this.canvas2d = canvas;
+		},
+		getPartnerType2(type) {
+			this.typeStatistics2 = type
+			this.analysisQueryData()
+		},
+		getPartnerType3(type) {
+			this.typeStatistics3 = type
+			this.rankingQueryData()
+		},
+		getPartnerType(type) {
+			this.typeStatistics = type
+			this.queryData()
+		},
+		getStatistics(type) {
+			// 	uni.navigateTo({
+			// 	url: "/pages/tools/achievement/achievement"
+			// })
+			// this.studioType=type
+			this.typeStatistics = type
+			this.queryData()
+		},
+		//点击跳转企业微信客服
+		weChatService() {
+			uni.share({
+				provider: "weixin",
+				openCustomerServiceChat: true,
+				customerUrl: this.supportStaffUrl, //企业微信地址
+				corpid: 'wwfe67d19509d43ec5', //企业id
+				success: (res) => { },
+				fail: (err) => { }
+			});
+		},
+		onSeachYear(val, index, type) {
+			this.year.map((value, i) => i === index ? value.startShow = !value.startShow : value.startShow = false);
+			let now = new Date();
+			let year = now.getFullYear();
+			let month = now.getMonth() + 1; // 月份是从0开始的，所以需要加1
+			let day = now.getDate();
+			if (index == 0 && val.startShow) {
+				let theDay = `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
+				this.beginTime=theDay + ' 00:00:01'
+				this.endTime=theDay + ' 23:59:59'
+				type == 1?this.queryData():this.analysisQueryData()
+			}
+			else if (index == 1 && val.startShow) {
+				let dayOfWeek = now.getDay();
+				let firstDayOfWeek = new Date(year, now.getMonth(), day - dayOfWeek + 1);
+				let lastDayOfWeek = new Date(year, now.getMonth(), day + (7 - dayOfWeek));
+				let monday = this.formatDate(firstDayOfWeek);
+				let sunday = this.formatDate(lastDayOfWeek);
+				this.beginTime=monday + ' 00:00:01'
+				this.endTime= sunday + ' 23:59:59'
+				type == 1?this.queryData():this.analysisQueryData()
+			}
+			else if (index == 2 && val.startShow) {
+				this.beginTime= this.getCurrentMonthFirst() + ' 00:00:01'
+				this.endTime= this.getCurrentMonthLast() + ' 23:59:59' 
+				type == 1?this.queryData():this.analysisQueryData()
+			}
+			else {
+				this.beginTime= ''
+				this.endTime= ''
+				type == 1?this.queryData():this.analysisQueryData()
+			}
+
+		},
+		formatDate(date) {
+			let year = date.getFullYear();
+			let month = date.getMonth() + 1;
+			let day = date.getDate();
+			month = month < 10 ? '0' + month : month;
+			day = day < 10 ? '0' + day : day;
+			return year + '-' + month + '-' + day;
+		},
+		getCurrentMonthFirst() {
+			// 获取当月第一天数据
+			let date = new Date()
+			date.setDate(1)
+			let month = parseInt(date.getMonth() + 1)
+			let day = date.getDate()
+			if (month < 10) month = '0' + month
+			if (day < 10) day = '0' + day
+			return date.getFullYear() + '-' + month + '-' + day
+		},
+		getCurrentMonthLast() {
+			// 获取当月最后一天数据
+			let date = new Date()
+			let year = date.getFullYear()
+			let month = date.getMonth() + 1
+			month = month < 10 ? '0' + month : month
+			let day = new Date(year, month, 0)
+			return year + '-' + month + '-' + day.getDate()
+		},
+		async analysisQueryData() {
+			let params = {
+				beginTime: this.beginTime,
+				endTime: this.endTime,
+				type: this.typeStatistics2,
+			}
+			let res = await this.$http.post('/APPPartner/getPartnerProportion', params);
+			if (res.code == '200') {
+				this.chartsDataPie2 = {
+					"series": [{
+						"data": [
+							{  name: `新增`,value: res.data.newProportion,labelText:`历史:${res.data.oldProportion}%` },
+							{name: "历史", value: res.data.oldProportion, labelText:`历史:${res.data.oldProportion}%` }
+						]
+					}]
+				}
+			}
+		},
+		async rankingQueryData() {
+			let params = {
+				type: this.typeStatistics3,
+			}
+			let res = await this.$http.get('/APPPartner/getLevelPartner', params);
+
+			if (res.code == '200') {
+				this.directLsit = res.data
+			}
+		},
+		async queryData() {
+			let params = {
+				beginTime: this.beginTime,
+				endTime: this.endTime,
+				type: this.typeStatistics,
+			}
+			let res = {}
+			if (this.type == 1) {
+				res = await this.$http.post('/APPPartner/getPartnerCount', params);
+			}
+			else {
+				res = await this.$http.post('/APPPartner/getCountUser', params);
+			}
+			if (res.code == '200') {
+				this.echartsList = res.data
+				if (res.data.countUserNumVoList && res.data.countUserNumVoList.length > 0) {
+					let dateList = res.data.countUserNumVoList.map(function (item) {
+						// return item.time.split(" ")[1] ? item.time.split(" ")[1] + ':00' : item.time.split(" ")[0]
+						return item.time
+					});
+					let valueList = res.data.countUserNumVoList.map(function (item) {
+						return item.countNum;
+					});
+
+					let rualit = {
+						categories: dateList,
+						series: [
+							{
+							name: "人数",
+							// type: "line",
+							data: valueList
+						},
+					]
+					};
+					valueList.sort((a,b) => a-b)
+					this.opts1.yAxis.data[0].max= valueList[valueList.length - 1];  
+					this.chartData1 = JSON.parse(JSON.stringify(rualit));
+				}
+			}
+		}
+	}
 }
 </script>
 <style lang="scss" scoped>
@@ -61,27 +465,208 @@ export default {
 	z-index: 999999;
 	padding: 16px;
 	padding-top: 40px;
-		text {
-			font-size: 18px;
-			font-weight: 700;
-			color: #333333;
-		}
+
+	text {
+		font-size: 18px;
+		font-weight: 700;
+		color: #333333;
+	}
+}
+
+.headers-right {
+	position: absolute;
+	right: 15px;
+	display: flex;
+	align-items: center;
+
+	text {
+		font-size: 13px;
+		color: #666666;
+	}
+
+	image {
+		// right: 0;
+		width: 15px;
+		height: 15px;
+		margin-right: 5px;
+	}
+}
+
+.body-box {
+	background: #ffffff;
+
+	margin: 15px
+}
+
+.statistics-title {
+	font-size: 16px;
+	color: #333333;
+}
+
+.statistics-title::before {
+	content: " ";
+	display: inline-block;
+	width: 4px;
+	height: 12px;
+	background: linear-gradient(132deg, #2DD9FF 0%, #2D6DFF 100%);
+	border-radius: 5px 5px 5px 5px;
+	margin-right: 4px;
+	margin-top: 2px;
+}
+
+.search-data {
+	color: #666666;
+	border: 1px solid #EEEEEE;
+
+	.active {
+		color: #FFFFFF;
+		background: linear-gradient(132deg, #2DD9FF 0%, #2D6DFF 100%);
+	}
+
+	text {
+		padding: 5px 6px;
+		border-left: 1px solid #EEEEEE;
+	}
+
+	text:first-child {
+		border-left: none
+	}
+}
+
+.statistics-number {
+	margin: 10px 10px 20px 10px;
+	background: #FBFBFB;
+	border-radius: 4px 4px 4px 4px;
+	text-align: center;
+	padding: 15px 0;
+	overflow: hidden;
+
+	view {
+		width: 33.33%;
+		float: left;
+
+	}
+
+	text {
+		display: block;
+	}
+
+	text:first-child {
+		font-size: 25px;
+		color: #333333;
+	}
+
+	text:last-child {
+		font-size: 13px;
+		color: #999999;
+	}
+}
+
+.statistics-type {
+	text-align: center;
+
+	text {
+		display: inline-block;
+		width: 80px;
+		height: 30px;
+		line-height: 30px;
+		text-align: center;
+		font-size: 16px;
+		color: #666666;
+		background: #F4F4F4;
+	}
+
+	.selected {
+		color: #FFFFFF;
+		background: linear-gradient(132deg, #2DD9FF 0%, #2D6DFF 100%);
+	}
+
+	// text:first-child{
+	// 	color: #FFFFFF;
+	// 	background: linear-gradient( 132deg, #2DD9FF 0%, #2D6DFF 100%);
+
+	// }
+}
+
+.partner-type {
+	margin: 10px;
+	width: 97%;
+	overflow: hidden;
+	white-space: nowrap;
+
+	text {
+		display: inline-block;
+		border-radius: 14px 14px 14px 14px;
+		font-size: 14px;
+		color: #666666;
+		padding: 1px 10px;
+		background: #F4F4F4;
+		margin-right: 8px;
+	}
+
+	.selected {
+		color: #FFFFFF;
+		background: linear-gradient(132deg, #2DD9FF 0%, #2D6DFF 100%);
+	}
+}
+
+.teamStatistics {
+	margin: 10px;
+	background: #FFFFFF;
+	// box-shadow: 0px 4px 10px 0px #DAE3F4;
+	border-radius: 2px 2px 2px 2px;
+	border: 1px solid #C8D8FF;
+}
+
+.statisticsContent {
+	box-sizing: border-box;
+	height: 70upx;
+	text-align: center;
+	line-height: 70upx;
+	font-size: 26rpx;
+	color: #666666;
+	display: flex;
+	flex-wrap: nowrap;
+	justify-content: space-around;
+
+	view {
+		text-align: center;
+		line-height: 70upx;
+		width: 25%;
+		font-size: 12px;
+	}
+
+	image {
+		display: inline-block;
+		width: 21px;
+		height: 21px;
+		vertical-align: middle;
+	}
+}
+
+.statisticsTitle {
+	display: flex;
+	flex-wrap: nowrap;
+	justify-content: space-around;
+	height: 70upx;
+	box-sizing: border-box;
+	line-height: 70upx;
+	font-size: 24rpx;
+	color: #232832;
+	background: linear-gradient(180deg, #DAE0EE 0%, #E9ECF4 100%);
+	border-radius: 6px 6px 0 0;
+
+	view {
+		text-align: center;
+		line-height: 35px;
+		color: #2D6DFF;
+		width: 25%;
+		font-size: 12px;
+	}
+
+}
+.charts-box{
+	width: 100%;
+    height: 300px;
 }
-.headers-right{
-        position: absolute;
-        right: 15px;
-        display: flex;
-        align-items: center;
-        
-        text {
-            font-size: 13px;
-            color: #666666;
-        }
-        image {
-            // right: 0;
-            width: 15px;
-            height: 15px;
-            margin-right: 5px;
-        }
-    }
 </style>

pages/wallet/withdraw.vue

@@ -287,12 +287,14 @@
 						title: res.msg,
 						icon: "none"
 					});
-					setTimeout(() => {
-						return uni.navigateTo({
-							url: "pages/my/my"
-						})
-						// return uni.navigateBack(1);
-					}, 2000);
+					return uni.navigateBack(1);
+
+					// setTimeout(() => {
+					// 	 uni.navigateTo({
+					// 		url: "/pages/my/my"
+					// 	})
+					// 	// return uni.navigateBack(1);
+					// }, 500);
 				}
 
 			},

uni_modules/qiun-data-charts/changelog.md

@@ -1,40 +1,3 @@
-## 2.5.0-20230101（2023-01-01）
-- 秋云图表组件 修改条件编译顺序，确保uniapp的cli方式的项目依赖不完整时可以正常显示
-- 秋云图表组件 恢复props属性directory的使用，以修复vue3项目中，开启echarts后，echarts目录识别错误的bug
-- uCharts.js 修复区域图、混合图只有一个数据时图表显示不正确的bug
-- uCharts.js 修复折线图、区域图中时间轴类别图表tooltip指示点显示不正确的bug
-- uCharts.js 修复x轴使用labelCount时，并且boundaryGap = 'justify' 并且关闭Y轴显示的时候，最后一个坐标值不显示的bug
-- uCharts.js 修复折线图只有一组数据时 ios16 渲染颜色不正确的bug
-- uCharts.js 修复玫瑰图半径显示不正确的bug
-- uCharts.js 柱状图、山峰图增加正负图功能，y轴网格如果需要显示0轴则由 min max 及 splitNumber 确定，后续版本优化自动显示0轴
-- uCharts.js 柱状图column增加 opts.extra.column.labelPosition，数据标签位置，有效值为 outside外部, insideTop内顶部, center内中间, bottom内底部
-- uCharts.js 雷达图radar增加 opts.extra.radar.labelShow，否显示各项标识文案是，默认true
-- uCharts.js 提示窗tooltip增加 opts.extra.tooltip.boxPadding，提示窗边框填充距离，默认3px
-- uCharts.js 提示窗tooltip增加 opts.extra.tooltip.fontSize，提示窗字体大小配置，默认13px
-- uCharts.js 提示窗tooltip增加 opts.extra.tooltip.lineHeight，提示窗文字行高，默认20px
-- uCharts.js 提示窗tooltip增加 opts.extra.tooltip.legendShow，是否显示左侧图例，默认true
-- uCharts.js 提示窗tooltip增加 opts.extra.tooltip.legendShape，图例形状，图例标识样式，有效值为 auto自动跟随图例, diamond◆, circle●, triangle▲, square■, rect▬, line-
-- uCharts.js 标记线markLine增加 opts.extra.markLine.labelFontSize，字体大小配置，默认13px
-- uCharts.js 标记线markLine增加 opts.extra.markLine.labelPadding，标签边框内填充距离，默认6px
-- uCharts.js 折线图line增加 opts.extra.line.linearType，渐变色类型，可选值 none关闭渐变色，custom 自定义渐变色。使用自定义渐变色时请赋值serie.linearColor作为颜色值
-- uCharts.js 折线图line增加 serie.linearColor，渐变色数组，格式为2维数组[起始位置，颜色值]，例如[[0,'#0EE2F8'],[0.3,'#2BDCA8'],[0.6,'#1890FF'],[1,'#9A60B4']]
-- uCharts.js 折线图line增加 opts.extra.line.onShadow，是否开启折线阴影，开启后请赋值serie.setShadow阴影设置
-- uCharts.js 折线图line增加 serie.setShadow，阴影配置，格式为4位数组：[offsetX,offsetY,blur,color]
-- uCharts.js 折线图line增加 opts.extra.line.animation，动画效果方向，可选值为vertical 垂直动画效果，horizontal 水平动画效果
-- uCharts.js X轴xAxis增加 opts.xAxis.lineHeight，X轴字体行高，默认20px
-- uCharts.js X轴xAxis增加 opts.xAxis.marginTop，X轴文字距离轴线的距离，默认0px
-- uCharts.js X轴xAxis增加 opts.xAxis.title，当前X轴标题
-- uCharts.js X轴xAxis增加 opts.xAxis.titleFontSize，标题字体大小，默认13px
-- uCharts.js X轴xAxis增加 opts.xAxis.titleOffsetY，标题纵向偏移距离，负数为向上偏移，正数向下偏移
-- uCharts.js X轴xAxis增加 opts.xAxis.titleOffsetX，标题横向偏移距离，负数为向左偏移，正数向右偏移
-- uCharts.js X轴xAxis增加 opts.xAxis.titleFontColor，标题字体颜色，默认#666666
-
-## 报错TypeError: Cannot read properties of undefined (reading 'length')
-- 如果是uni-modules版本组件，请先登录HBuilderX账号；
-- 在HBuilderX中的manifest.json，点击重新获取uniapp的appid，或者删除appid重新粘贴，重新运行；
-- 如果是cli项目请使用码云上的非uniCloud版本组件；
-- 或者添加uniCloud的依赖；
-- 或者使用原生uCharts；
 ## 2.4.5-20221130（2022-11-30）
 - uCharts.js 优化tooltip当文字很多变为左侧显示时，如果画布仍显显示不下，提示框错位置变为以左侧0位置起画
 - uCharts.js 折线图修复特殊情况下只有单点数据，并改变线宽后点变为圆形的bug

uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue

@@ -428,12 +428,12 @@ export default {
       this.cid = id
     }
     const systemInfo = uni.getSystemInfoSync()
-    if(systemInfo.platform === 'windows' || systemInfo.platform === 'mac'){
+    if(systemInfo.platform === 'windows' || systemInfo.platform === 'macos'){
       this.inWin = true;
     }
     // #ifdef MP-WEIXIN
     this.inWx = true;
-    if (this.canvas2d === false || systemInfo.platform === 'windows' || systemInfo.platform === 'mac') {
+    if (this.canvas2d === false || systemInfo.platform === 'windows' || systemInfo.platform === 'macos') {
       this.type2d = false;
     }else{
       this.type2d = true;
@@ -446,6 +446,9 @@ export default {
     // #endif
     // #ifdef  MP-TOUTIAO || MP-LARK || MP-ALIPAY
     this.type2d = this.canvas2d;
+    if(this.canvas2d === true){
+      this.pixel = systemInfo.pixelRatio;
+    }
     // #endif
     // #ifdef MP-ALIPAY
     this.inAli = true;
@@ -1306,12 +1309,19 @@ export default {
       }else{
         const script = document.createElement('script')
         // #ifdef APP-VUE
-        script.src = './uni_modules/qiun-data-charts/static/app-plus/echarts.min.js'
+        script.src = './uni_modules/qiun-data-charts/static/app-plus/echarts.min.js';
         // #endif
         // #ifdef H5
-        const rooturl = window.location.origin
-        const directory = instance.getDataset().directory
-        script.src = rooturl + directory + 'uni_modules/qiun-data-charts/static/h5/echarts.min.js'
+        const { origin } = window.location;
+        let base_url = "";
+        // #ifdef VUE2
+        base_url = process.env.BASE_URL;
+        // #endif
+        // #ifdef VUE3
+        base_url = import.meta.env.BASE_URL;
+        // #endif
+        const rooturl = origin + base_url;
+        script.src = rooturl + 'uni_modules/qiun-data-charts/static/h5/echarts.min.js';
         // #endif
         script.onload = this.newEChart
         document.head.appendChild(script)

uni_modules/qiun-data-charts/package.json

@@ -11,7 +11,8 @@
     "可视化"
 ],
   "repository": "https://gitee.com/uCharts/uCharts",
-"engines": {
+  "engines": {
+    "HBuilderX": "^3.3.8"
   },
 "dcloudext": {
     "sale": {

uni_modules/qiun-data-charts/readme.md

@@ -34,7 +34,7 @@
 
 ## 社群支持
 
-uCharts官方拥有5个2000人的QQ群及专属VIP会员群支持，庞大的用户量证明我们一直在努力，请各位放心使用！uCharts的开源图表组件的开发，团队付出了大量的时间与精力，经过四来的考验，不会有比较明显的bug，请各位放心使用。如果您有更好的想法，可以在`码云提交Pull Requests`以帮助更多开发者完成需求，再次感谢各位对uCharts的鼓励与支持！
+uCharts官方拥有5个2000人的QQ群及专属VIP会员群支持，庞大的用户量证明我们一直在努力，请各位放心使用！uCharts的开源图表组件的开发，团队付出了大量的时间与精力，经过五年来的考验，不会有比较明显的bug，请各位放心使用。如果您有更好的想法，可以在`码云提交Pull Requests`以帮助更多开发者完成需求，再次感谢各位对uCharts的鼓励与支持！
 
 #### 官方交流群
 - 交流群1：371774600（已满）

uni_modules/uni-popup/changelog.md

@@ -0,0 +1,92 @@
+## 1.9.5（2024-10-15）
+- 修复 微信小程序中的getSystemInfo警告
+## 1.9.4（2024-10-12）
+- 修复 微信小程序中的getSystemInfo警告
+## 1.9.3（2024-10-12）
+- 修复 微信小程序中的getSystemInfo警告
+## 1.9.2（2024-09-21）
+- 修复 uni-popup在android上的重复点击弹出位置不正确的bug
+## 1.9.1（2024-04-02）
+- 修复 uni-popup-dialog vue3下使用value无法进行绑定的bug(双向绑定兼容旧写法)
+## 1.9.0（2024-03-28）
+- 修复 uni-popup-dialog 双向绑定时初始化逻辑修正
+## 1.8.9（2024-03-20）
+- 修复 uni-popup-dialog 数据输入时修正为双向绑定
+## 1.8.8（2024-02-20）
+- 修复 uni-popup 在微信小程序下出现文字向上闪动的bug
+## 1.8.7（2024-02-02）
+- 新增 uni-popup-dialog 新增属性focus：input模式下，是否自动自动聚焦
+## 1.8.6（2024-01-30）
+- 新增 uni-popup-dialog 新增属性maxLength:限制输入框字数
+## 1.8.5（2024-01-26）
+- 新增 uni-popup-dialog 新增属性showClose:控制关闭按钮的显示
+## 1.8.4（2023-11-15）
+- 新增 uni-popup 支持uni-app-x 注意暂时仅支持 `maskClick` `@open` `@close`
+## 1.8.3（2023-04-17）
+- 修复 uni-popup 重复打开时的 bug
+## 1.8.2（2023-02-02）
+- uni-popup-dialog 组件新增 inputType 属性
+## 1.8.1（2022-12-01）
+- 修复 nvue 下 v-show 报错
+## 1.8.0（2022-11-29）
+- 优化 主题样式
+## 1.7.9（2022-04-02）
+- 修复 弹出层内部无法滚动的bug
+## 1.7.8（2022-03-28）
+- 修复 小程序中高度错误的bug
+## 1.7.7（2022-03-17）
+- 修复 快速调用open出现问题的Bug
+## 1.7.6（2022-02-14）
+- 修复 safeArea 属性不能设置为false的bug
+## 1.7.5（2022-01-19）
+- 修复 isMaskClick 失效的bug
+## 1.7.4（2022-01-19）
+- 新增 cancelText \ confirmText 属性 ，可自定义文本
+- 新增 maskBackgroundColor 属性 ，可以修改蒙版颜色
+- 优化 maskClick属性 更新为 isMaskClick ，解决微信小程序警告的问题
+## 1.7.3（2022-01-13）
+- 修复 设置 safeArea 属性不生效的bug
+## 1.7.2（2021-11-26）
+- 优化 组件示例
+## 1.7.1（2021-11-26）
+- 修复 vuedoc 文字错误
+## 1.7.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-popup](https://uniapp.dcloud.io/component/uniui/uni-popup)
+## 1.6.2（2021-08-24）
+- 新增 支持国际化
+## 1.6.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.6.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.5.0（2021-06-23）
+- 新增 mask-click 遮罩层点击事件
+## 1.4.5（2021-06-22）
+- 修复 nvue 平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.4（2021-06-18）
+- 修复 H5平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.3（2021-06-08）
+- 修复 错误的 watch 字段
+- 修复 safeArea 属性不生效的问题
+- 修复 点击内容，再点击遮罩无法关闭的Bug
+## 1.4.2（2021-05-12）
+- 新增 组件示例地址
+## 1.4.1（2021-04-29）
+- 修复 组件内放置 input 、textarea 组件，无法聚焦的问题
+## 1.4.0 （2021-04-29）
+- 新增 type 属性的 left\right 值，支持左右弹出
+- 新增 open(String:type) 方法参数 ，可以省略 type 属性 ，直接传入类型打开指定弹窗
+- 新增 backgroundColor 属性，可定义主窗口背景色,默认不显示背景色
+- 新增 safeArea 属性，是否适配底部安全区
+- 修复 App\h5\微信小程序底部安全区占位不对的Bug
+- 修复 App 端弹出等待的Bug
+- 优化 提升低配设备性能，优化动画卡顿问题
+- 优化 更简单的组件自定义方式
+## 1.2.9（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.2.8（2021-02-05）
+- 调整为uni_modules目录规范
+## 1.2.7（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 支持 PC 端
+- 新增 uni-popup-message 、uni-popup-dialog扩展组件支持 PC 端

uni_modules/uni-popup/components/uni-popup-dialog/keypress.js

@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    this.$once('hook:beforeDestroy', () => {
+      document.removeEventListener('keyup', listener)
+    })
+  },
+	render: () => {}
+}
+// #endif

uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue

@@ -0,0 +1,316 @@
+<template>
+	<view class="uni-popup-dialog">
+		<view class="uni-dialog-title">
+			<text class="uni-dialog-title-text" :class="['uni-popup__'+dialogType]">{{titleText}}</text>
+		</view>
+		<view v-if="mode === 'base'" class="uni-dialog-content">
+			<slot>
+				<text class="uni-dialog-content-text">{{content}}</text>
+			</slot>
+		</view>
+		<view v-else class="uni-dialog-content">
+			<slot>
+				<input class="uni-dialog-input" :maxlength="maxlength" v-model="val" :type="inputType"
+					:placeholder="placeholderText" :focus="focus">
+			</slot>
+		</view>
+		<view class="uni-dialog-button-group">
+			<view class="uni-dialog-button" v-if="showClose" @click="closeDialog">
+				<text class="uni-dialog-button-text">{{closeText}}</text>
+			</view>
+			<view class="uni-dialog-button" :class="showClose?'uni-border-left':''" @click="onOk">
+				<text class="uni-dialog-button-text uni-button-color">{{okText}}</text>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from '../uni-popup/i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+	/**
+	 * PopUp 弹出层-对话框样式
+	 * @description 弹出层-对话框样式
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} value input 模式下的默认值
+	 * @property {String} placeholder input 模式下输入提示
+	 * @property {Boolean} focus input模式下是否自动聚焦，默认为true
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} mode = [base|input] 模式、
+	 * 	@value base 基础对话框
+	 * 	@value input 可输入对话框
+	 * @showClose {Boolean} 是否显示关闭按钮
+	 * @property {String} content 对话框内容
+	 * @property {Boolean} beforeClose 是否拦截取消事件
+	 * @property {Number} maxlength 输入
+	 * @event {Function} confirm 点击确认按钮触发
+	 * @event {Function} close 点击取消按钮触发
+	 */
+
+	export default {
+		name: "uniPopupDialog",
+		mixins: [popup],
+		emits: ['confirm', 'close', 'update:modelValue', 'input'],
+		props: {
+			inputType: {
+				type: String,
+				default: 'text'
+			},
+			showClose: {
+				type: Boolean,
+				default: true
+			},
+			// #ifdef VUE2
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				type: [Number, String],
+				default: ''
+			},
+			// #endif
+
+
+			placeholder: {
+				type: [String, Number],
+				default: ''
+			},
+			type: {
+				type: String,
+				default: 'error'
+			},
+			mode: {
+				type: String,
+				default: 'base'
+			},
+			title: {
+				type: String,
+				default: ''
+			},
+			content: {
+				type: String,
+				default: ''
+			},
+			beforeClose: {
+				type: Boolean,
+				default: false
+			},
+			cancelText: {
+				type: String,
+				default: ''
+			},
+			confirmText: {
+				type: String,
+				default: ''
+			},
+			maxlength: {
+				type: Number,
+				default: -1,
+			},
+			focus: {
+				type: Boolean,
+				default: true,
+			}
+		},
+		data() {
+			return {
+				dialogType: 'error',
+				val: ""
+			}
+		},
+		computed: {
+			okText() {
+				return this.confirmText || t("uni-popup.ok")
+			},
+			closeText() {
+				return this.cancelText || t("uni-popup.cancel")
+			},
+			placeholderText() {
+				return this.placeholder || t("uni-popup.placeholder")
+			},
+			titleText() {
+				return this.title || t("uni-popup.title")
+			}
+		},
+		watch: {
+			type(val) {
+				this.dialogType = val
+			},
+			mode(val) {
+				if (val === 'input') {
+					this.dialogType = 'info'
+				}
+			},
+			value(val) {
+				if (this.maxlength != -1 && this.mode === 'input') {
+					this.val = val.slice(0, this.maxlength);
+				} else {
+					this.val = val
+				}
+			},
+			val(val) {
+				// #ifdef VUE2
+				// TODO 兼容 vue2
+				this.$emit('input', val);
+				// #endif
+				// #ifdef VUE3
+				// TODO　兼容　vue3
+				this.$emit('update:modelValue', val);
+				// #endif
+			}
+		},
+		created() {
+			// 对话框遮罩不可点击
+			// this.popup.disableMask()
+			// this.popup.closeMask()
+			if (this.mode === 'input') {
+				this.dialogType = 'info'
+				this.val = this.value;
+				// #ifdef VUE3
+				this.val = this.modelValue;
+				// #endif
+			} else {
+				this.dialogType = this.type
+			}
+		},
+		methods: {
+			/**
+			 * 点击确认按钮
+			 */
+			onOk() {
+				if (this.mode === 'input') {
+					this.$emit('confirm', this.val)
+				} else {
+					this.$emit('confirm')
+				}
+				if (this.beforeClose) return
+				// this.popup.close()
+			},
+			/**
+			 * 点击取消按钮
+			 */
+			closeDialog() {
+				this.$emit('close')
+				if (this.beforeClose) return
+				// this.popup.close()
+			},
+			close() {
+				// this.popup.close()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-popup-dialog {
+		width: 300px;
+		border-radius: 11px;
+		background-color: #fff;
+	}
+
+	.uni-dialog-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 25px;
+	}
+
+	.uni-dialog-title-text {
+		font-size: 16px;
+		font-weight: 500;
+	}
+
+	.uni-dialog-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		padding: 20px;
+	}
+
+	.uni-dialog-content-text {
+		font-size: 14px;
+		color: #6C6C6C;
+	}
+
+	.uni-dialog-button-group {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		border-top-color: #f5f5f5;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-dialog-button {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+
+		flex: 1;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 45px;
+	}
+
+	.uni-border-left {
+		border-left-color: #f0f0f0;
+		border-left-style: solid;
+		border-left-width: 1px;
+	}
+
+	.uni-dialog-button-text {
+		font-size: 16px;
+		color: #333;
+	}
+
+	.uni-button-color {
+		color: #007aff;
+	}
+
+	.uni-dialog-input {
+		flex: 1;
+		font-size: 14px;
+		border: 1px #eee solid;
+		height: 40px;
+		padding: 0 10px;
+		border-radius: 5px;
+		color: #555;
+	}
+
+	.uni-popup__success {
+		color: #4cd964;
+	}
+
+	.uni-popup__warn {
+		color: #f0ad4e;
+	}
+
+	.uni-popup__error {
+		color: #dd524d;
+	}
+
+	.uni-popup__info {
+		color: #909399;
+	}
+</style>

uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue

@@ -0,0 +1,143 @@
+<template>
+	<view class="uni-popup-message">
+		<view class="uni-popup-message__box fixforpc-width" :class="'uni-popup__'+type">
+			<slot>
+				<text class="uni-popup-message-text" :class="'uni-popup__'+type+'-text'">{{message}}</text>
+			</slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	/**
+	 * PopUp 弹出层-消息提示
+	 * @description 弹出层-消息提示
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} message 消息提示文字
+	 * @property {String} duration 显示时间，设置为 0 则不会自动关闭
+	 */
+
+	export default {
+		name: 'uniPopupMessage',
+		mixins:[popup],
+		props: {
+			/**
+			 * 主题 success/warning/info/error	  默认 success
+			 */
+			type: {
+				type: String,
+				default: 'success'
+			},
+			/**
+			 * 消息文字
+			 */
+			message: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 显示时间，设置为 0 则不会自动关闭
+			 */
+			duration: {
+				type: Number,
+				default: 3000
+			},
+			maskShow:{
+				type:Boolean,
+				default:false
+			}
+		},
+		data() {
+			return {}
+		},
+		created() {
+			this.popup.maskShow = this.maskShow
+			this.popup.messageChild = this
+		},
+		methods: {
+			timerClose(){
+				if(this.duration === 0) return
+				clearTimeout(this.timer) 
+				this.timer = setTimeout(()=>{
+					this.popup.close()
+				},this.duration)
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-popup-message {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+	}
+
+	.uni-popup-message__box {
+		background-color: #e1f3d8;
+		padding: 10px 15px;
+		border-color: #eee;
+		border-style: solid;
+		border-width: 1px;
+		flex: 1;
+	}
+
+	@media screen and (min-width: 500px) {
+		.fixforpc-width {
+			margin-top: 20px;
+			border-radius: 4px;
+			flex: none;
+			min-width: 380px;
+			/* #ifndef APP-NVUE */
+			max-width: 50%;
+			/* #endif */
+			/* #ifdef APP-NVUE */
+			max-width: 500px;
+			/* #endif */
+		}
+	}
+
+	.uni-popup-message-text {
+		font-size: 14px;
+		padding: 0;
+	}
+
+	.uni-popup__success {
+		background-color: #e1f3d8;
+	}
+
+	.uni-popup__success-text {
+		color: #67C23A;
+	}
+
+	.uni-popup__warn {
+		background-color: #faecd8;
+	}
+
+	.uni-popup__warn-text {
+		color: #E6A23C;
+	}
+
+	.uni-popup__error {
+		background-color: #fde2e2;
+	}
+
+	.uni-popup__error-text {
+		color: #F56C6C;
+	}
+
+	.uni-popup__info {
+		background-color: #F2F6FC;
+	}
+
+	.uni-popup__info-text {
+		color: #909399;
+	}
+</style>

uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue

@@ -0,0 +1,187 @@
+<template>
+	<view class="uni-popup-share">
+		<view class="uni-share-title"><text class="uni-share-title-text">{{shareTitleText}}</text></view>
+		<view class="uni-share-content">
+			<view class="uni-share-content-box">
+				<view class="uni-share-content-item" v-for="(item,index) in bottomData" :key="index" @click.stop="select(item,index)">
+					<image class="uni-share-image" :src="item.icon" mode="aspectFill"></image>
+					<text class="uni-share-text">{{item.text}}</text>
+				</view>
+
+			</view>
+		</view>
+		<view class="uni-share-button-box">
+			<button class="uni-share-button" @click="close">{{cancelText}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from '../uni-popup/i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+	export default {
+		name: 'UniPopupShare',
+		mixins:[popup],
+		emits:['select'],
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			beforeClose: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				bottomData: [{
+						text: '微信',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/c2b17470-50be-11eb-b680-7980c8a877b8.png',
+						name: 'wx'
+					},
+					{
+						text: '支付宝',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/d684ae40-50be-11eb-8ff1-d5dcf8779628.png',
+						name: 'ali'
+					},
+					{
+						text: 'QQ',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/e7a79520-50be-11eb-b997-9918a5dda011.png',
+						name: 'qq'
+					},
+					{
+						text: '新浪',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/0dacdbe0-50bf-11eb-8ff1-d5dcf8779628.png',
+						name: 'sina'
+					},
+					// {
+					// 	text: '百度',
+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/1ec6e920-50bf-11eb-8a36-ebb87efcf8c0.png',
+					// 	name: 'copy'
+					// },
+					// {
+					// 	text: '其他',
+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/2e0fdfe0-50bf-11eb-b997-9918a5dda011.png',
+					// 	name: 'more'
+					// }
+				]
+			}
+		},
+		created() {},
+		computed: {
+			cancelText() {
+				return t("uni-popup.cancel")
+			},
+		shareTitleText() {
+				return this.title || t("uni-popup.shareTitle")
+			}
+		},
+		methods: {
+			/**
+			 * 选择内容
+			 */
+			select(item, index) {
+				this.$emit('select', {
+					item,
+					index
+				})
+				this.close()
+
+			},
+			/**
+			 * 关闭窗口
+			 */
+			close() {
+				if(this.beforeClose) return
+				this.popup.close()
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-popup-share {
+		background-color: #fff;
+		border-top-left-radius: 11px;
+		border-top-right-radius: 11px;
+	}
+	.uni-share-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		height: 40px;
+	}
+	.uni-share-title-text {
+		font-size: 14px;
+		color: #666;
+	}
+	.uni-share-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 10px;
+	}
+
+	.uni-share-content-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: wrap;
+		width: 360px;
+	}
+
+	.uni-share-content-item {
+		width: 90px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		padding: 10px 0;
+		align-items: center;
+	}
+
+	.uni-share-content-item:active {
+		background-color: #f5f5f5;
+	}
+
+	.uni-share-image {
+		width: 30px;
+		height: 30px;
+	}
+
+	.uni-share-text {
+		margin-top: 10px;
+		font-size: 14px;
+		color: #3B4144;
+	}
+
+	.uni-share-button-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		padding: 10px 15px;
+	}
+
+	.uni-share-button {
+		flex: 1;
+		border-radius: 50px;
+		color: #666;
+		font-size: 16px;
+	}
+
+	.uni-share-button::after {
+		border-radius: 50px;
+	}
+</style>

uni_modules/uni-popup/components/uni-popup/i18n/en.json

@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "cancel",
+	"uni-popup.ok": "ok",
+	"uni-popup.placeholder": "pleace enter",
+	"uni-popup.title": "Hint",
+	"uni-popup.shareTitle": "Share to"
+}

uni_modules/uni-popup/components/uni-popup/i18n/index.js

@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}

uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json

@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "取消",
+	"uni-popup.ok": "确定",
+	"uni-popup.placeholder": "请输入",
+		"uni-popup.title": "提示",
+		"uni-popup.shareTitle": "分享到"
+}

uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json

@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "取消",
+	"uni-popup.ok": "確定",
+	"uni-popup.placeholder": "請輸入",
+	"uni-popup.title": "提示",
+	"uni-popup.shareTitle": "分享到"
+}

uni_modules/uni-popup/components/uni-popup/keypress.js

@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    // this.$once('hook:beforeDestroy', () => {
+    //   document.removeEventListener('keyup', listener)
+    // })
+  },
+	render: () => {}
+}
+// #endif

uni_modules/uni-popup/components/uni-popup/popup.js

@@ -0,0 +1,26 @@
+
+export default {
+	data() {
+		return {
+			
+		}
+	},
+	created(){
+		this.popup = this.getParent()
+	},
+	methods:{
+		/**
+		 * 获取父元素实例
+		 */
+		getParent(name = 'uniPopup') {
+			let parent = this.$parent;
+			let parentName = parent.$options.name;
+			while (parentName !== name) {
+				parent = parent.$parent;
+				if (!parent) return false
+				parentName = parent.$options.name;
+			}
+			return parent;
+		},
+	}
+}

uni_modules/uni-popup/components/uni-popup/uni-popup.uvue

@@ -0,0 +1,90 @@
+<template>
+  <view class="popup-root" v-if="isOpen" v-show="isShow" @click="clickMask">
+    <view @click.stop>
+      <slot></slot>
+    </view>
+  </view>
+</template>
+
+<script>
+  type CloseCallBack = ()=> void;
+  let closeCallBack:CloseCallBack = () :void => {};
+  export default {
+    emits:["close","clickMask"],
+    data() {
+      return {
+        isShow:false,
+        isOpen:false
+      }
+    },
+    props: {
+      maskClick: {
+        type: Boolean,
+        default: true
+      },
+    },
+    watch: {
+      // 设置show = true 时，如果没有 open 需要设置为 open
+      isShow:{
+        handler(isShow) {
+          // console.log("isShow",isShow)
+          if(isShow && this.isOpen == false){
+            this.isOpen = true
+          }
+        },
+        immediate:true
+      },
+      // 设置isOpen = true 时，如果没有 isShow 需要设置为 isShow
+      isOpen:{
+        handler(isOpen) {
+          // console.log("isOpen",isOpen)
+          if(isOpen && this.isShow == false){
+            this.isShow = true
+          }
+        },
+        immediate:true
+      }
+    },
+    methods:{
+      open(){
+        // ...funs : CloseCallBack[]
+        // if(funs.length > 0){
+        //   closeCallBack = funs[0]
+        // }
+        this.isOpen = true;
+      },
+      clickMask(){
+        if(this.maskClick == true){
+          this.$emit('clickMask')
+          this.close()
+        }
+      },
+      close(): void{
+        this.isOpen = false;
+        this.$emit('close')
+        closeCallBack()
+      },
+      hiden(){
+        this.isShow = false
+      },
+      show(){
+        this.isShow = true
+      }
+    }
+  }
+</script>
+
+<style>
+.popup-root {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 750rpx;
+  height: 100%;
+  flex: 1;
+  background-color: rgba(0, 0, 0, 0.3);
+  justify-content: center;
+  align-items: center;
+  z-index: 99;
+}
+</style>

uni_modules/uni-popup/components/uni-popup/uni-popup.vue

@@ -0,0 +1,518 @@
+<template>
+	<view v-if="showPopup" class="uni-popup" :class="[popupstyle, isDesktop ? 'fixforpc-z-index' : '']">
+		<view @touchstart="touchstart">
+			<uni-transition key="1" v-if="maskShow" name="mask" mode-class="fade" :styles="maskClass"
+				:duration="duration" :show="showTrans" @click="onTap" />
+			<uni-transition key="2" :mode-class="ani" name="content" :styles="transClass" :duration="duration"
+				:show="showTrans" @click="onTap">
+				<view class="uni-popup__wrapper" :style="getStyles" :class="[popupstyle]" @click="clear">
+					<slot />
+				</view>
+			</uni-transition>
+		</view>
+		<!-- #ifdef H5 -->
+		<keypress v-if="maskShow" @esc="onTap" />
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	// #ifdef H5
+	import keypress from './keypress.js'
+	// #endif
+
+	/**
+	 * PopUp 弹出层
+	 * @description 弹出层组件，为了解决遮罩弹层的问题
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [top|center|bottom|left|right|message|dialog|share] 弹出方式
+	 * 	@value top 顶部弹出
+	 * 	@value center 中间弹出
+	 * 	@value bottom 底部弹出
+	 * 	@value left		左侧弹出
+	 * 	@value right  右侧弹出
+	 * 	@value message 消息提示
+	 * 	@value dialog 对话框
+	 * 	@value share 底部分享示例
+	 * @property {Boolean} animation = [true|false] 是否开启动画
+	 * @property {Boolean} maskClick = [true|false] 蒙版点击是否关闭弹窗(废弃)
+	 * @property {Boolean} isMaskClick = [true|false] 蒙版点击是否关闭弹窗
+	 * @property {String}  backgroundColor 主窗口背景色
+	 * @property {String}  maskBackgroundColor 蒙版颜色
+	 * @property {String}  borderRadius 设置圆角(左上、右上、右下和左下) 示例:"10px 10px 10px 10px"
+	 * @property {Boolean} safeArea		   是否适配底部安全区
+	 * @event {Function} change 打开关闭弹窗触发，e={show: false}
+	 * @event {Function} maskClick 点击遮罩触发
+	 */
+
+	export default {
+		name: 'uniPopup',
+		components: {
+			// #ifdef H5
+			keypress
+			// #endif
+		},
+		emits: ['change', 'maskClick'],
+		props: {
+			// 开启动画
+			animation: {
+				type: Boolean,
+				default: true
+			},
+			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+			// message: 消息提示 ; dialog : 对话框
+			type: {
+				type: String,
+				default: 'center'
+			},
+			// maskClick
+			isMaskClick: {
+				type: Boolean,
+				default: null
+			},
+			// TODO 2 个版本后废弃属性 ，使用 isMaskClick
+			maskClick: {
+				type: Boolean,
+				default: null
+			},
+			backgroundColor: {
+				type: String,
+				default: 'none'
+			},
+			safeArea: {
+				type: Boolean,
+				default: true
+			},
+			maskBackgroundColor: {
+				type: String,
+				default: 'rgba(0, 0, 0, 0.4)'
+			},
+			borderRadius:{
+				type: String,
+			}
+		},
+
+		watch: {
+			/**
+			 * 监听type类型
+			 */
+			type: {
+				handler: function(type) {
+					if (!this.config[type]) return
+					this[this.config[type]](true)
+				},
+				immediate: true
+			},
+			isDesktop: {
+				handler: function(newVal) {
+					if (!this.config[newVal]) return
+					this[this.config[this.type]](true)
+				},
+				immediate: true
+			},
+			/**
+			 * 监听遮罩是否可点击
+			 * @param {Object} val
+			 */
+			maskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			isMaskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			// H5 下禁止底部滚动
+			showPopup(show) {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible'
+				// #endif
+			}
+		},
+		data() {
+			return {
+				duration: 300,
+				ani: [],
+				showPopup: false,
+				showTrans: false,
+				popupWidth: 0,
+				popupHeight: 0,
+				config: {
+					top: 'top',
+					bottom: 'bottom',
+					center: 'center',
+					left: 'left',
+					right: 'right',
+					message: 'top',
+					dialog: 'center',
+					share: 'bottom'
+				},
+				maskClass: {
+					position: 'fixed',
+					bottom: 0,
+					top: 0,
+					left: 0,
+					right: 0,
+					backgroundColor: 'rgba(0, 0, 0, 0.4)'
+				},
+				transClass: {
+					backgroundColor: 'transparent',
+					borderRadius: this.borderRadius || "0",
+					position: 'fixed',
+					left: 0,
+					right: 0
+				},
+				maskShow: true,
+				mkclick: true,
+				popupstyle: 'top'
+			}
+		},
+		computed: {
+			getStyles() {
+				let res = { backgroundColor: this.bg };
+				if (this.borderRadius || "0") {
+					res = Object.assign(res, { borderRadius: this.borderRadius })
+				}
+				return res;
+			},
+			isDesktop() {
+				return this.popupWidth >= 500 && this.popupHeight >= 500
+			},
+			bg() {
+				if (this.backgroundColor === '' || this.backgroundColor === 'none') {
+					return 'transparent'
+				}
+				return this.backgroundColor
+			}
+		},
+		mounted() {
+			const fixSize = () => {
+				// #ifdef MP-WEIXIN
+				const {
+					windowWidth,
+					windowHeight,
+					windowTop,
+					safeArea,
+					screenHeight,
+					safeAreaInsets
+				} = uni.getWindowInfo()
+				// #endif
+				// #ifndef MP-WEIXIN
+				const {
+					windowWidth,
+					windowHeight,
+					windowTop,
+					safeArea,
+					screenHeight,
+					safeAreaInsets
+				} = uni.getSystemInfoSync()
+				// #endif
+				this.popupWidth = windowWidth
+				this.popupHeight = windowHeight + (windowTop || 0)
+				// TODO fix by mehaotian 是否适配底部安全区 ,目前微信ios 、和 app ios 计算有差异，需要框架修复
+				if (safeArea && this.safeArea) {
+					// #ifdef MP-WEIXIN
+					this.safeAreaInsets = screenHeight - safeArea.bottom
+					// #endif
+					// #ifndef MP-WEIXIN
+					this.safeAreaInsets = safeAreaInsets.bottom
+					// #endif
+				} else {
+					this.safeAreaInsets = 0
+				}
+			}
+			fixSize()
+			// #ifdef H5
+			// window.addEventListener('resize', fixSize)
+			// this.$once('hook:beforeDestroy', () => {
+			// 	window.removeEventListener('resize', fixSize)
+			// })
+			// #endif
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			this.setH5Visible()
+		},
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.setH5Visible()
+		},
+		// #endif
+		activated() {
+   	  this.setH5Visible(!this.showPopup);
+    },
+    deactivated() {
+      this.setH5Visible(true);
+    },
+		created() {
+			// this.mkclick =  this.isMaskClick || this.maskClick
+			if (this.isMaskClick === null && this.maskClick === null) {
+				this.mkclick = true
+			} else {
+				this.mkclick = this.isMaskClick !== null ? this.isMaskClick : this.maskClick
+			}
+			if (this.animation) {
+				this.duration = 300
+			} else {
+				this.duration = 0
+			}
+			// TODO 处理 message 组件生命周期异常的问题
+			this.messageChild = null
+			// TODO 解决头条冒泡的问题
+			this.clearPropagation = false
+			this.maskClass.backgroundColor = this.maskBackgroundColor
+		},
+		methods: {
+			setH5Visible(visible = true) {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow =  visible ? "visible" : "hidden";
+				// #endif
+			},
+			/**
+			 * 公用方法，不显示遮罩层
+			 */
+			closeMask() {
+				this.maskShow = false
+			},
+			/**
+			 * 公用方法，遮罩层禁止点击
+			 */
+			disableMask() {
+				this.mkclick = false
+			},
+			// TODO nvue 取消冒泡
+			clear(e) {
+				// #ifndef APP-NVUE
+				e.stopPropagation()
+				// #endif
+				this.clearPropagation = true
+			},
+
+			open(direction) {
+				// fix by mehaotian 处理快速打开关闭的情况
+				if (this.showPopup) {
+					return
+				}
+				let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share']
+				if (!(direction && innerType.indexOf(direction) !== -1)) {
+					direction = this.type
+				}
+				if (!this.config[direction]) {
+					console.error('缺少类型：', direction)
+					return
+				}
+				this[this.config[direction]]()
+				this.$emit('change', {
+					show: true,
+					type: direction
+				})
+			},
+			close(type) {
+				this.showTrans = false
+				this.$emit('change', {
+					show: false,
+					type: this.type
+				})
+				clearTimeout(this.timer)
+				// // 自定义关闭事件
+				// this.customOpen && this.customClose()
+				this.timer = setTimeout(() => {
+					this.showPopup = false
+				}, 300)
+			},
+			// TODO 处理冒泡事件，头条的冒泡事件有问题 ，先这样兼容
+			touchstart() {
+				this.clearPropagation = false
+			},
+
+			onTap() {
+				if (this.clearPropagation) {
+					// fix by mehaotian 兼容 nvue
+					this.clearPropagation = false
+					return
+				}
+				this.$emit('maskClick')
+				if (!this.mkclick) return
+				this.close()
+			},
+			/**
+			 * 顶部弹出样式处理
+			 */
+			top(type) {
+				this.popupstyle = this.isDesktop ? 'fixforpc-top' : 'top'
+				this.ani = ['slide-top']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0"
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+				this.$nextTick(() => {
+					this.showPoptrans()
+					if (this.messageChild && this.type === 'message') {
+						this.messageChild.timerClose()
+					}
+				})
+			},
+			/**
+			 * 底部弹出样式处理
+			 */
+			bottom(type) {
+				this.popupstyle = 'bottom'
+				this.ani = ['slide-bottom']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					bottom: 0,
+					paddingBottom: this.safeAreaInsets + 'px',
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0",
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPoptrans()
+			},
+			/**
+			 * 中间弹出样式处理
+			 */
+			center(type) {
+				this.popupstyle = 'center'
+				//微信小程序下，组合动画会出现文字向上闪动问题，再此做特殊处理
+				// #ifdef MP-WEIXIN
+					this.ani = ['fade']
+				// #endif
+				// #ifndef MP-WEIXIN
+					this.ani = ['zoom-out', 'fade']
+				// #endif
+				this.transClass = {
+					position: 'fixed',
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column',
+					/* #endif */
+					bottom: 0,
+					left: 0,
+					right: 0,
+					top: 0,
+					justifyContent: 'center',
+					alignItems: 'center',
+					borderRadius:this.borderRadius || "0"
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPoptrans()
+			},
+			left(type) {
+				this.popupstyle = 'left'
+				this.ani = ['slide-left']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					bottom: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0",
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPoptrans()
+			},
+			right(type) {
+				this.popupstyle = 'right'
+				this.ani = ['slide-right']
+				this.transClass = {
+					position: 'fixed',
+					bottom: 0,
+					right: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0",
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPoptrans()
+			},
+			showPoptrans(){
+				this.$nextTick(()=>{
+					this.showPopup = true
+					this.showTrans = true
+				})
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	.uni-popup {
+		position: fixed;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+
+		/* #endif */
+		&.top,
+		&.left,
+		&.right {
+			/* #ifdef H5 */
+			top: var(--window-top);
+			/* #endif */
+			/* #ifndef H5 */
+			top: 0;
+			/* #endif */
+		}
+
+		.uni-popup__wrapper {
+			/* #ifndef APP-NVUE */
+			display: block;
+			/* #endif */
+			position: relative;
+
+			/* iphonex 等安全区设置，底部安全区适配 */
+			/* #ifndef APP-NVUE */
+			// padding-bottom: constant(safe-area-inset-bottom);
+			// padding-bottom: env(safe-area-inset-bottom);
+			/* #endif */
+			&.left,
+			&.right {
+				/* #ifdef H5 */
+				padding-top: var(--window-top);
+				/* #endif */
+				/* #ifndef H5 */
+				padding-top: 0;
+				/* #endif */
+				flex: 1;
+			}
+		}
+	}
+
+	.fixforpc-z-index {
+		/* #ifndef APP-NVUE */
+		z-index: 999;
+		/* #endif */
+	}
+
+	.fixforpc-top {
+		top: 0;
+	}
+</style>

uni_modules/uni-popup/package.json

@@ -0,0 +1,88 @@
+{
+	"id": "uni-popup",
+	"displayName": "uni-popup 弹出层",
+	"version": "1.9.5",
+	"description": " Popup 组件，提供常用的弹层",
+	"keywords": [
+        "uni-ui",
+        "弹出层",
+        "弹窗",
+        "popup",
+        "弹框"
+    ],
+	"repository": "https://github.com/dcloudio/uni-ui",
+	"engines": {
+		"HBuilderX": ""
+	},
+	"directories": {
+		"example": "../../temps/example_temps"
+	},
+    "dcloudext": {
+        "sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "无",
+			"permissions": "无"
+		},
+        "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+        "type": "component-vue"
+	},
+	"uni_modules": {
+		"dependencies": [
+			"uni-scss",
+			"uni-transition"
+		],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+                "aliyun": "y",
+                "alipay": "n"
+			},
+			"client": {
+				"App": {
+					"app-vue": "y",
+					"app-nvue": "y"
+				},
+				"H5-mobile": {
+					"Safari": "y",
+					"Android Browser": "y",
+					"微信浏览器(Android)": "y",
+					"QQ浏览器(Android)": "y"
+				},
+				"H5-pc": {
+					"Chrome": "y",
+					"IE": "y",
+					"Edge": "y",
+					"Firefox": "y",
+					"Safari": "y"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "y",
+					"百度": "y",
+					"字节跳动": "y",
+					"QQ": "y"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+                },
+                "Vue": {
+                    "vue2": "y",
+                    "vue3": "y"
+                }
+			}
+		}
+	}
+}

uni_modules/uni-popup/readme.md

@@ -0,0 +1,17 @@
+
+
+## Popup 弹出层
+> **组件名：uni-popup**
+> 代码块： `uPopup`
+> 关联组件：`uni-transition`
+
+
+弹出层组件，在应用中弹出一个消息提示窗口、提示框等
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-popup)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
+
+
+

uni_modules/uni-transition/changelog.md

@@ -0,0 +1,24 @@
+## 1.3.3（2024-04-23）
+- 修复 当元素会受变量影响自动隐藏的bug
+## 1.3.2（2023-05-04）
+- 修复 NVUE 平台报错的问题
+## 1.3.1（2021-11-23）
+- 修复 init 方法初始化问题
+## 1.3.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-transition](https://uniapp.dcloud.io/component/uniui/uni-transition)
+## 1.2.1（2021-09-27）
+- 修复 init 方法不生效的 Bug
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.1（2021-05-12）
+- 新增 示例地址
+- 修复 示例项目缺少组件的 Bug
+## 1.1.0（2021-04-22）
+- 新增 通过方法自定义动画
+- 新增 custom-class 非 NVUE 平台支持自定义 class 定制样式
+- 优化 动画触发逻辑，使动画更流畅
+- 优化 支持单独的动画类型
+- 优化 文档示例
+## 1.0.2（2021-02-05）
+- 调整为 uni_modules 目录规范

uni_modules/uni-transition/components/uni-transition/createAnimation.js

@@ -0,0 +1,131 @@
+// const defaultOption = {
+// 	duration: 300,
+// 	timingFunction: 'linear',
+// 	delay: 0,
+// 	transformOrigin: '50% 50% 0'
+// }
+// #ifdef APP-NVUE
+const nvueAnimation = uni.requireNativePlugin('animation')
+// #endif
+class MPAnimation {
+	constructor(options, _this) {
+		this.options = options
+		// 在iOS10+QQ小程序平台下，传给原生的对象一定是个普通对象而不是Proxy对象，否则会报parameter should be Object instead of ProxyObject的错误
+		this.animation = uni.createAnimation({
+			...options
+		})
+		this.currentStepAnimates = {}
+		this.next = 0
+		this.$ = _this
+
+	}
+
+	_nvuePushAnimates(type, args) {
+		let aniObj = this.currentStepAnimates[this.next]
+		let styles = {}
+		if (!aniObj) {
+			styles = {
+				styles: {},
+				config: {}
+			}
+		} else {
+			styles = aniObj
+		}
+		if (animateTypes1.includes(type)) {
+			if (!styles.styles.transform) {
+				styles.styles.transform = ''
+			}
+			let unit = ''
+			if(type === 'rotate'){
+				unit = 'deg'
+			}
+			styles.styles.transform += `${type}(${args+unit}) `
+		} else {
+			styles.styles[type] = `${args}`
+		}
+		this.currentStepAnimates[this.next] = styles
+	}
+	_animateRun(styles = {}, config = {}) {
+		let ref = this.$.$refs['ani'].ref
+		if (!ref) return
+		return new Promise((resolve, reject) => {
+			nvueAnimation.transition(ref, {
+				styles,
+				...config
+			}, res => {
+				resolve()
+			})
+		})
+	}
+
+	_nvueNextAnimate(animates, step = 0, fn) {
+		let obj = animates[step]
+		if (obj) {
+			let {
+				styles,
+				config
+			} = obj
+			this._animateRun(styles, config).then(() => {
+				step += 1
+				this._nvueNextAnimate(animates, step, fn)
+			})
+		} else {
+			this.currentStepAnimates = {}
+			typeof fn === 'function' && fn()
+			this.isEnd = true
+		}
+	}
+
+	step(config = {}) {
+		// #ifndef APP-NVUE
+		this.animation.step(config)
+		// #endif
+		// #ifdef APP-NVUE
+		this.currentStepAnimates[this.next].config = Object.assign({}, this.options, config)
+		this.currentStepAnimates[this.next].styles.transformOrigin = this.currentStepAnimates[this.next].config.transformOrigin
+		this.next++
+		// #endif
+		return this
+	}
+
+	run(fn) {
+		// #ifndef APP-NVUE
+		this.$.animationData = this.animation.export()
+		this.$.timer = setTimeout(() => {
+			typeof fn === 'function' && fn()
+		}, this.$.durationTime)
+		// #endif
+		// #ifdef APP-NVUE
+		this.isEnd = false
+		let ref = this.$.$refs['ani'] && this.$.$refs['ani'].ref
+		if(!ref) return
+		this._nvueNextAnimate(this.currentStepAnimates, 0, fn)
+		this.next = 0
+		// #endif
+	}
+}
+
+
+const animateTypes1 = ['matrix', 'matrix3d', 'rotate', 'rotate3d', 'rotateX', 'rotateY', 'rotateZ', 'scale', 'scale3d',
+	'scaleX', 'scaleY', 'scaleZ', 'skew', 'skewX', 'skewY', 'translate', 'translate3d', 'translateX', 'translateY',
+	'translateZ'
+]
+const animateTypes2 = ['opacity', 'backgroundColor']
+const animateTypes3 = ['width', 'height', 'left', 'right', 'top', 'bottom']
+animateTypes1.concat(animateTypes2, animateTypes3).forEach(type => {
+	MPAnimation.prototype[type] = function(...args) {
+		// #ifndef APP-NVUE
+		this.animation[type](...args)
+		// #endif
+		// #ifdef APP-NVUE
+		this._nvuePushAnimates(type, args)
+		// #endif
+		return this
+	}
+})
+
+export function createAnimation(option, _this) {
+	if(!_this) return
+	clearTimeout(_this.timer)
+	return new MPAnimation(option, _this)
+}

uni_modules/uni-transition/components/uni-transition/uni-transition.vue

@@ -0,0 +1,286 @@
+<template>
+  <!-- #ifndef APP-NVUE -->
+  <view v-show="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
+  <!-- #endif -->
+  <!-- #ifdef APP-NVUE -->
+  <view v-if="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
+  <!-- #endif -->
+</template>
+
+<script>
+import { createAnimation } from './createAnimation'
+
+/**
+ * Transition 过渡动画
+ * @description 简单过渡动画组件
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=985
+ * @property {Boolean} show = [false|true] 控制组件显示或隐藏
+ * @property {Array|String} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
+ *  @value fade 渐隐渐出过渡
+ *  @value slide-top 由上至下过渡
+ *  @value slide-right 由右至左过渡
+ *  @value slide-bottom 由下至上过渡
+ *  @value slide-left 由左至右过渡
+ *  @value zoom-in 由小到大过渡
+ *  @value zoom-out 由大到小过渡
+ * @property {Number} duration 过渡动画持续时间
+ * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
+ */
+export default {
+	name: 'uniTransition',
+	emits:['click','change'],
+	props: {
+		show: {
+			type: Boolean,
+			default: false
+		},
+		modeClass: {
+			type: [Array, String],
+			default() {
+				return 'fade'
+			}
+		},
+		duration: {
+			type: Number,
+			default: 300
+		},
+		styles: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+		customClass:{
+			type: String,
+			default: ''
+		},
+		onceRender:{
+			type:Boolean,
+			default:false
+		},
+	},
+	data() {
+		return {
+			isShow: false,
+			transform: '',
+			opacity: 1,
+			animationData: {},
+			durationTime: 300,
+			config: {}
+		}
+	},
+	watch: {
+		show: {
+			handler(newVal) {
+				if (newVal) {
+					this.open()
+				} else {
+					// 避免上来就执行 close,导致动画错乱
+					if (this.isShow) {
+						this.close()
+					}
+				}
+			},
+			immediate: true
+		}
+	},
+	computed: {
+		// 生成样式数据
+		stylesObject() {
+			let styles = {
+				...this.styles,
+				'transition-duration': this.duration / 1000 + 's'
+			}
+			let transform = ''
+			for (let i in styles) {
+				let line = this.toLine(i)
+				transform += line + ':' + styles[i] + ';'
+			}
+			return transform
+		},
+		// 初始化动画条件
+		transformStyles() {
+			return 'transform:' + this.transform + ';' + 'opacity:' + this.opacity + ';' + this.stylesObject
+		}
+	},
+	created() {
+		// 动画默认配置
+		this.config = {
+			duration: this.duration,
+			timingFunction: 'ease',
+			transformOrigin: '50% 50%',
+			delay: 0
+		}
+		this.durationTime = this.duration
+	},
+	methods: {
+		/**
+		 *  ref 触发 初始化动画
+		 */
+		init(obj = {}) {
+			if (obj.duration) {
+				this.durationTime = obj.duration
+			}
+			this.animation = createAnimation(Object.assign(this.config, obj),this)
+		},
+		/**
+		 * 点击组件触发回调
+		 */
+		onClick() {
+			this.$emit('click', {
+				detail: this.isShow
+			})
+		},
+		/**
+		 * ref 触发 动画分组
+		 * @param {Object} obj
+		 */
+		step(obj, config = {}) {
+			if (!this.animation) return
+			for (let i in obj) {
+				try {
+					if(typeof obj[i] === 'object'){
+						this.animation[i](...obj[i])
+					}else{
+						this.animation[i](obj[i])
+					}
+				} catch (e) {
+					console.error(`方法 ${i} 不存在`)
+				}
+			}
+			this.animation.step(config)
+			return this
+		},
+		/**
+		 *  ref 触发 执行动画
+		 */
+		run(fn) {
+			if (!this.animation) return
+			this.animation.run(fn)
+		},
+		// 开始过度动画
+		open() {
+			clearTimeout(this.timer)
+			this.transform = ''
+			this.isShow = true
+			let { opacity, transform } = this.styleInit(false)
+			if (typeof opacity !== 'undefined') {
+				this.opacity = opacity
+			}
+			this.transform = transform
+			// 确保动态样式已经生效后，执行动画，如果不加 nextTick ，会导致 wx 动画执行异常
+			this.$nextTick(() => {
+				// TODO 定时器保证动画完全执行，目前有些问题，后面会取消定时器
+				this.timer = setTimeout(() => {
+					this.animation = createAnimation(this.config, this)
+					this.tranfromInit(false).step()
+					this.animation.run()
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				}, 20)
+			})
+		},
+		// 关闭过度动画
+		close(type) {
+			if (!this.animation) return
+			this.tranfromInit(true)
+				.step()
+				.run(() => {
+					this.isShow = false
+					this.animationData = null
+					this.animation = null
+					let { opacity, transform } = this.styleInit(false)
+					this.opacity = opacity || 1
+					this.transform = transform
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				})
+		},
+		// 处理动画开始前的默认样式
+		styleInit(type) {
+			let styles = {
+				transform: ''
+			}
+			let buildStyle = (type, mode) => {
+				if (mode === 'fade') {
+					styles.opacity = this.animationType(type)[mode]
+				} else {
+					styles.transform += this.animationType(type)[mode] + ' '
+				}
+			}
+			if (typeof this.modeClass === 'string') {
+				buildStyle(type, this.modeClass)
+			} else {
+				this.modeClass.forEach(mode => {
+					buildStyle(type, mode)
+				})
+			}
+			return styles
+		},
+		// 处理内置组合动画
+		tranfromInit(type) {
+			let buildTranfrom = (type, mode) => {
+				let aniNum = null
+				if (mode === 'fade') {
+					aniNum = type ? 0 : 1
+				} else {
+					aniNum = type ? '-100%' : '0'
+					if (mode === 'zoom-in') {
+						aniNum = type ? 0.8 : 1
+					}
+					if (mode === 'zoom-out') {
+						aniNum = type ? 1.2 : 1
+					}
+					if (mode === 'slide-right') {
+						aniNum = type ? '100%' : '0'
+					}
+					if (mode === 'slide-bottom') {
+						aniNum = type ? '100%' : '0'
+					}
+				}
+				this.animation[this.animationMode()[mode]](aniNum)
+			}
+			if (typeof this.modeClass === 'string') {
+				buildTranfrom(type, this.modeClass)
+			} else {
+				this.modeClass.forEach(mode => {
+					buildTranfrom(type, mode)
+				})
+			}
+
+			return this.animation
+		},
+		animationType(type) {
+			return {
+				fade: type ? 0 : 1,
+				'slide-top': `translateY(${type ? '0' : '-100%'})`,
+				'slide-right': `translateX(${type ? '0' : '100%'})`,
+				'slide-bottom': `translateY(${type ? '0' : '100%'})`,
+				'slide-left': `translateX(${type ? '0' : '-100%'})`,
+				'zoom-in': `scaleX(${type ? 1 : 0.8}) scaleY(${type ? 1 : 0.8})`,
+				'zoom-out': `scaleX(${type ? 1 : 1.2}) scaleY(${type ? 1 : 1.2})`
+			}
+		},
+		// 内置动画类型与实际动画对应字典
+		animationMode() {
+			return {
+				fade: 'opacity',
+				'slide-top': 'translateY',
+				'slide-right': 'translateX',
+				'slide-bottom': 'translateY',
+				'slide-left': 'translateX',
+				'zoom-in': 'scale',
+				'zoom-out': 'scale'
+			}
+		},
+		// 驼峰转中横线
+		toLine(name) {
+			return name.replace(/([A-Z])/g, '-$1').toLowerCase()
+		}
+	}
+}
+</script>
+
+<style></style>

uni_modules/uni-transition/package.json

@@ -0,0 +1,85 @@
+{
+  "id": "uni-transition",
+  "displayName": "uni-transition 过渡动画",
+  "version": "1.3.3",
+  "description": "元素的简单过渡动画",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "动画",
+    "过渡",
+    "过渡动画"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-transition/readme.md

@@ -0,0 +1,11 @@
+
+
+## Transition 过渡动画
+> **组件名：uni-transition**
+> 代码块： `uTransition`
+
+
+元素过渡动画
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-transition)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839