代码提交

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 = {

manifest.json

@@ -9,8 +9,8 @@
             "src" : "图片路径"
         }
     ],
-    "versionName" : "1.2.2",
-    "versionCode" : 122,
+    "versionName" : "1.2.4",
+    "versionCode" : 124,
     "app-plus" : {
         "error" : {
             "url" : "hybrid/html/error.html"

pages/components/todaydate-picker.vue

@@ -0,0 +1,415 @@
+<template>
+  <div >
+   <u-popup ref="popup" class="popup" :mask="true" mode="bottom" >
+   	<view >
+   		<view class="popup-title ">
+   			<text >时间筛选</text>
+   			<text  @click="$refs.popup.close()">×</text>
+   		</view>
+		<view style="margin-left: 16px;">
+			<text class="quick-title">快捷选择</text>
+			<view style="margin: 15px 0;">
+				<text style="margin-right: 25px;" :class="typeStatistics == val.value ? 'selected' : 'text-border'" v-for="val in partnerTypeOption"
+					:key="val.value" @click="getPartnerType(val.value)">{{ val.lable }}</text>
+			</view>
+		</view>
+		<text class="quick-title" style="margin-left: 16px;">自定义时间</text>
+   		<view style="padding: 15px">
+   			<view class="popup-data dis j-s">
+   				<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">
+   			  <picker-view-column>
+   				<view class="item" v-for="(item,index) in years" :key="index">{{item}}年</view>
+   			  </picker-view-column>
+   			  <picker-view-column>
+   				<view class="item" v-for="(item,index) in months" :key="index">{{item}}月</view>
+   			  </picker-view-column>
+   			  <picker-view-column>
+   				<view class="item" v-for="(item,index) in days" :key="index">{{item}}日</view>
+   			  </picker-view-column>
+   			</picker-view>
+   		</view>
+   	</view>
+   	<view class="popup-footer dis j-s">
+   		<text @click.stop="reset" >重置</text>
+   		<text @click.stop="confirm" >确定</text>
+   	</view>
+   </u-popup>
+   <u-toast ref="uToast" />
+  </div>
+</template>
+<script>
+import { log } from 'util';
+  export default {
+    data() {
+      return {
+		  typeStatistics:0,
+		  partnerTypeOption: [
+		  	{
+		  		lable: '今日',
+		  		value: '1'
+		  	}, {
+		  		lable: '本月',
+		  		value: '2'
+		  	}, {
+		  		lable: '本年',
+		  		value: '3'
+		  	}, {
+		  		lable: '全部',
+		  		value: '4'
+		  	}
+		  ],
+		  startShow: false,
+		  endShow: false,
+		  interviewStartTime:'',
+		  interviewEndTime:'',
+		  beginStartTime:'',
+		  beginEndTime:'',
+        years: [],
+        year: null,
+        months: [],
+        month: null,
+        days: [],
+        day: null,
+        hours: [],
+        hour: null,
+        minutes: [],
+        minute: null,
+        value: [],
+        indicatorStyle: `height: 50px;color:#2D6DFF `,
+		visible:false
+      }
+    },
+    props: {
+      // visible: {
+      //   type: Boolean,
+      //   default: true
+      // },
+      
+      // interviewTime: {
+      //   type: String,
+      //   default() {
+      //     return '';
+      //   },
+      // }
+    },
+    mounted() {
+      this.init();
+    },
+    watch: {
+      // visible: {
+      //   handler(newValue, oldValue) {
+      //     if (newValue) {
+      //       if (this.interviewTime) {
+      //         this.init(this.interviewTime);
+      //       }
+      //     }
+      //   },
+      //   immediate: false,
+      //   deep: true
+      // }
+    },
+    methods: {
+		open(){
+			this.typeStatistics=0
+			this.interviewStartTime=''
+			this.interviewEndTime =''
+			this.visible=false
+			this.startShow = false
+			this.endShow = false
+			this.$refs.popup.open()
+		},
+      bindChange: function (e) {
+        const val = e.detail.value
+        let year = this.years[val[0]] 
+        let isDay = 30, days = [];
+        if (val[1]+1 == 2) {
+            if((val[0]%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(val[1]+1)) {
+          isDay = 31;
+        } else {
+          isDay = 30;
+        }
+      
+        for (let i = 1; i <= isDay; i++) {
+          days.push(i)
+        }
+        this.days = days;
+        this.year = this.years[val[0]]
+        this.month =  this.months[val[1]]
+        this.day = this.days[val[2]]
+        if(this.startShow){
+      	  this.interviewStartTime=this.year+'-'+this.month+'-'+this.day
+        }
+        if(this.endShow){
+        	this.interviewEndTime=this.year+'-'+this.month+'-'+this.day
+        }
+      },
+      init() {
+        const date =  new Date();
+        const years = []
+        const year = date.getFullYear()
+        const months = []
+        const month = date.getMonth() + 1
+        const days = []
+        const day = date.getDate()
+      
+        let isDay = 30;
+        if (month == 2) {
+          if((year%4==0 && year%100!=0)||(year%400==0)){
+            isDay = 29;
+          }else {
+            isDay = 28;
+          }
+        } else if ([1,3,5,7,8,10,12].includes(month)) {
+          isDay = 31;
+        } else {
+          isDay = 30;
+        }
+      
+        for (let i = date.getFullYear();  i >= 1900; i--) {
+          years.push(i)
+        }
+        for (let i = 1; i <= 12; i++) {
+          months.push(i)
+        }
+        for (let i = 1; i <= isDay; i++) {
+          days.push(i)
+        }
+      
+        this.years = years
+        this.year = year
+        this.months = months
+        this.month = month
+        this.days = days
+        this.day = day
+        this.value = [0, month-1, day-1]
+      },
+      // 补0
+      padZeroStr(originStr){
+         if(+originStr < 10){
+            return  String(originStr).padStart(2,'0')
+         }
+         return originStr + ''
+      },
+      close(){
+        this.$emit('update:visible', false);
+      },
+	  reset(){
+        this.$emit('update:visible', false);
+        this.interviewStartTime=''
+        this.interviewEndTime =''
+      },
+      startClick(){
+        // this.interviewStartTime=''
+		this.typeStatistics=0
+        this.interviewStartTime = this.year+'-'+this.month+'-'+this.day
+        this.visible=true
+        this.startShow = true
+        this.endShow = false
+      },
+      endClick(){
+		  this.typeStatistics=0
+        this.interviewEndTime= this.year+'-'+this.month+'-'+this.day
+        this.visible=true
+        this.startShow = false
+        this.endShow = true
+      },
+      confirm() {
+        // let monthStr = this.padZeroStr(this.month)
+        // let dayStr = this.padZeroStr(this.day)
+        // let hourStr = this.padZeroStr(this.hour)
+        // let minuteStr = this.padZeroStr(this.minute)
+        // this.timeValue = `${this.year}/${monthStr}/${dayStr} ${hourStr}:${minuteStr}:00`;
+		let timeValue=''
+		// if(this.interviewStartTime || this.interviewEndTime){
+		// 	timeValue=this.interviewStartTime ||this.interviewEndTime
+		// }
+		if(this.interviewStartTime && this.interviewEndTime){
+			// let timeValue=this.interviewStartTime +'~'+this.interviewEndTime
+			// console.log(this.compareArrays(this.interviewStartTime.split('-'),this.interviewEndTime.split('-')),999)
+			// if(!this.compareArrays(this.interviewStartTime.split('-'),this.interviewEndTime.split('-'))){
+			// 	this.$refs.uToast.show({
+			// 		title: '开始时间必须小于结束时间',
+			// 		type: 'warning',
+			// 		icon:false
+			// 		// url: '/pages/user/index'
+			// 	})
+			// 	return false
+			// }
+			// this.compareArrays(this.interviewStartTime.split('-'),this.interviewEndTime.split('-'))
+			// log(this.compareDates(new Date(this.interviewStartTime),new Date(this.interviewEndTime),222222))
+			// log(this.compareDates(new Date("2022-01-01"),new Date("2022-01-02"),222222))	
+			if(this.compareDates(new Date(this.interviewStartTime),new Date(this.interviewEndTime))==1){
+				this.$refs.uToast.show({
+					title: '开始时间必须小于结束时间',
+					type: 'warning',
+					icon:false
+					// url: '/pages/user/index'
+				})
+				return false
+			}
+		}
+		else{
+			this.$refs.uToast.show({
+				title: '请选择时间!',
+				type: 'warning',
+				icon:false
+				// url: '/pages/user/index'
+			})
+			return false
+		}
+		  this.$emit('confirmPickDate', this.interviewStartTime,this.interviewEndTime,this.interviewStartTime +'~'+this.interviewEndTime);
+		  this.$refs.popup.close()
+      },
+	   compareDates(date1, date2) {
+		     var dateString1 = date1.toISOString().slice(0, 10);
+		      var dateString2 = date2.toISOString().slice(0, 10);
+		      
+		      if (dateString1 > dateString2) {
+		        return 1;
+		      } else if (dateString1 < dateString2) {
+		        return -1;
+		      } else {
+		        return 0;
+		      }
+	  },
+		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()
+		},
+	  getPartnerType(type) {
+		  this.typeStatistics=type
+		 let now = new Date();
+		 let year = now.getFullYear();
+		 let month = now.getMonth() + 1; // 月份是从0开始的，所以需要加1
+		 let day = now.getDate();
+		 if(type==1){
+		 	let theDay=`${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
+			this.$emit('confirmPickDate',theDay,theDay,'今日数据');
+			this.$refs.popup.close()
+		 }
+		 else if(type==2){
+			 this.$emit('confirmPickDate', this.getCurrentMonthFirst(),this.getCurrentMonthLast(),'本月数据');
+			 this.$refs.popup.close()
+		 }
+		 else if(type==3 ){
+			 this.$emit('confirmPickDate', year+'-01-01',year+ '-12-31','本年数据');
+			 this.$refs.popup.close()
+		 }
+		 else if(type==4 ){
+			 this.$emit('confirmPickDate', '','','全部数据');
+			 this.$refs.popup.close()
+		 }
+		this.interviewStartTime=''
+		this.interviewEndTime =''
+	  },
+    },
+  }
+</script>
+<style lang="scss" scoped>
+	.popup {
+	  border-radius:10px 10px 0 0 !important; 
+	}
+	.quick-title{
+		font-weight: 400;
+		font-size: 16px;
+		color: #333333;
+		line-height: 18px;
+	}
+	.text-border{
+		border-radius: 2px 2px 2px 2px;
+		border: 1px solid #EEEEEE;
+		color: #666666;
+		font-size: 14px;
+		padding: 3px 10px;
+		
+	}
+	.selected {
+		padding: 3px 10px;
+		color: #2D6DFF;
+		background: rgba(45,109,255,0.1);
+	}
+  .popup-title{
+  	font-size: 15px;
+  	color: #333333;
+  	padding:10px;
+  	margin-bottom: 10px;
+  	position: relative;
+  	text-align: center;
+  	text:first-child {
+  		font-weight: 600;
+  	}
+  	text:last-child {
+  		position: absolute;
+  		right: 10px;
+  		font-size: 21px;
+  		color: #999999;
+  		line-height: 23px;
+  	}
+  }
+  .popup-footer{
+  	margin:10px 15px;
+  	text{
+  		font-size: 16px;
+  		padding: 5px 0;
+  		color: #FFFFFF;
+  		display: inline-block;
+  		width: 45%;
+  		text-align: center;
+  	}
+  	text:first-child {
+  		color: #2D6DFF;
+  		background: rgba(45,109,255,0.1);
+  		border-radius: 5px 5px 5px 5px;
+  	}
+  	text:last-child {
+  		background: linear-gradient( 132deg, #2DD9FF 0%, #2D6DFF 100%);
+  		border-radius: 5px 5px 5px 5px;
+  	}
+  }
+  .popup-data{
+  	line-height: 25px;
+  	text{
+  		font-size: 14px;
+  		color: #999999 ;
+  		display: inline-block;
+  		width: 45%;
+  		text-align: center;
+  		border: 1px solid #DDDDDD;
+		border-radius: 2px 2px 2px 2px;
+  	}
+  	.active{
+  		border: 1px solid #2D6DFF;
+  		color: #2D6DFF;
+  	}
+  }
+   .picker-view {
+          width: 100%;
+          height: 150px;
+        }
+</style>

pages/index/index.vue

@@ -9,14 +9,43 @@
 		<!-- <image style="position: relative;height:230px" src="../../static/beijing.png"></image> -->
 		<!-- <image v-if="type == 1" style="position: relative;height:230px" src="../../static/shouye1.png"></image> -->
 		<view class="Personnel">
-			<view class="avatar">
+			<!-- <view class="avatar">
 				<image src="/static/img/Frame (8).png"  mode=""></image>
 				<text>团队新人员加入信息/新出单信息</text>
-			</view>
-			<uni-notice-bar show-icon scrollable text="uni-app 版正式发布，开发一次，同时发布iOS、Android、H5、微信小程序、支付宝小程序、百度小程序、头条小程序等7大平台。" />
+			</view> -->
+			<!-- <uni-notice-bar show-icon scrollable text="uni-app 版正式发布，开发一次，同时发布iOS、Android、H5、微信小程序、支付宝小程序、百度小程序、头条小程序等7大平台。" /> -->
 		</view>
-		<view class="insurance dis j-s" >
-			<view style="text-align: center;">
+		<view class="insurance " >
+			<view class="insurance-balance">
+				<text>我的余额</text>
+				<view style="font-weight: bold;font-size: 21px;line-height: 24px;">{{totalList.balanceFee || 0}}</view>
+			</view>
+			<view class="insurance-today">
+					<view class="search" @click="searchPopup">
+						<text>{{showData}}<i></i></text>
+					</view>
+					<view class=" dis a-c">
+						<view class="today-data">
+							<text>订单</text>
+							<view>{{totalList.orderNumber || 0}}</view>
+						</view>
+						<view class="today-data">
+							<text>保费</text>
+							<view>{{totalList.sumPremium || 0}}</view>
+						</view>
+					</view>
+					<view class=" dis a-c">
+						<view class="today-data">
+							<text>会员人数 </text>
+							<view>{{totalList.teamManNum || 0}}</view>
+						</view>
+						<view class="today-data">
+							<text>总佣金</text>
+							<view>{{totalList.extractFee || 0}}</view>
+						</view>
+					</view>
+			</view>
+			<!-- <view style="text-align: center;">
 				<view class="insurance-cash">{{totalList.teamManNum || 0}}</view>
 				<text class="insurance-text">会员总人数	</text>
 			</view>
@@ -27,7 +56,7 @@
 			<view style="text-align: center;">
 				<view class="insurance-cash">{{totalList.extractFee || 0}}</view>
 				<text class="insurance-text">我的佣金</text>
-			</view>
+			</view> -->
 		</view>
 		<view >
 			<view class="institutional-data  dis j-s" v-if="type == 2 ||userInfo.sysUser.level==5">
@@ -90,9 +119,11 @@
 				</view>
 			</view>
 		</u-popup>
+		<my-date-picker ref="datePicker" @confirmPickDate="confirmPickDate" />
 	</view>
 </template>
 <script>
+	import myDatePicker from '../components/todaydate-picker.vue';
 	import QR from "@/common/wxqrcode.js"
 	import {
 		mapState,
@@ -103,8 +134,12 @@ export default {
 	computed: {
 		...mapState(['userInfo', "userCheckInfo", ]),
 	},
+	components: {
+		myDatePicker
+	},
 	data() {
 		return {
+			showData:'全部数据',
 			ShowModalCode:false,
 			ShowModalCode1:false,
 			ShowModalCodebusiness:false,
@@ -138,15 +173,42 @@ export default {
 	},
 	async onShow(e) {
 		this.type = uni.getStorageSync('type')
-		let res = await this.$http.get('/APPPartner/getHomePage', {
-			type: uni.getStorageSync('type'),
-		});
-		if (res.code == '200') {
-			this.totalList = res.data
-		}
+		this.showData='全部数据',
+		this.getList()
+		
+		// let res = await this.$http.post('/APPPartner/getHomePage', {
+		// 	type: uni.getStorageSync('type'),
+		// });
+		// if (res.code == '200') {
+		// 	this.totalList = res.data
+		// }
 	
 	},
 	methods: {
+		async getList(beginTime, endTime) {
+			let params = {
+				type: this.type,
+				"endTime": endTime || '',
+				"beginTime": beginTime || '',
+			}
+			let res = await this.$http.post('/APPPartner/getHomePage',  params);
+			if (res.code == '200') {
+				this.totalList = res.data
+			}
+		},
+		searchPopup() {
+			this.$refs.datePicker.open()
+		},
+		confirmPickDate(dateStr, dateStr1,val) {
+			if (dateStr) {
+				dateStr += ' 00:00:01'
+			}
+			if (dateStr1) {
+				dateStr1 += ' 23:59:59'
+			}
+			this.showData=val
+			this.getList(dateStr, dateStr1)
+		},
 		styleChange(e) {
 			this.deptSource = e.detail.value
 		},
@@ -390,8 +452,9 @@ export default {
 		background: #F7F7F7;
 		background-image: url("/static/beijing.png");
 		background-size: 100% 100%;
-		padding: 200px 16px 15px 16px;
-	
+		padding: 235px 16px 15px 16px;
+		// background-size: cover;
+	    // padding: 225px 16px 15px 16px;
 		.avatar {
 			background: #FFFFFF;
 			box-shadow: 0px 0 8px 0px rgba(0,0,0,0.1);
@@ -411,11 +474,63 @@ export default {
 		
 	}
 	.insurance{
-		margin: 0 16px;
+		margin: -50px 16px 0 16px;
 		background: #FFFFFF;
 		box-shadow: 0px 0 8px 0px rgba(0,0,0,0.1);
 		border-radius: 5px 5px 5px 5px;
-		padding: 20px 30px;
+		padding:13px 16px  16px;
+		// padding: 200px 16px 15px 16px;
+		.insurance-balance{
+			text-align: center;
+			margin-bottom: 10px;
+			color: #333333;
+			line-height: 24px;
+			
+			text{
+				font-size: 10px;
+				color: #999999;
+				line-height: 12px;
+			}
+		}
+		.insurance-today{
+			background:  #F7FBFF;
+			border-radius: 5px 5px 5px 5px;
+			padding: 8px 10px 16px 10px;
+			.today-data{
+				width: 50%;
+				padding-left: 16px;
+				text{
+					font-size: 10px;
+					color: #999999;
+					line-height: 12px;
+				}
+				view{
+					font-weight: 600;
+					font-size: 17px;
+					color: #333333;
+					line-height: 20px;
+				}
+			}
+			.search {
+				text-align: center;
+				text {
+					font-size: 14px;
+					color: #666666;
+				}
+			
+				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;
+				}
+			}
+		}
 		.insurance-cash{
 			font-weight: 700;
 			font-size: 21px;

pages/institutional/institutionalTeam.vue

@@ -68,27 +68,27 @@
 			<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>
+			<u-popup v-model="ShowModalCodebusiness" mode="bottom" border-radius="15">
 				<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" />
+					<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>
-							<view class="uni-list-item__notestext">{{ item.notestext }}</view>
-						</view>
-					</radio-group>
+						</radio-group>
+					</view>
+					<view class="ShowModalCode-sumbit" @click="ShowModalPromptChannel=true">确定</view>
 				</view>
-				<view class="ShowModalCode-sumbit" @click="ShowModalCodeSumbit()">确定</view>
-			</view>
-		</u-popup>
+			</u-popup>
 		<u-popup v-model="ShowModalCode1" mode="bottom" border-radius="15">
 			<view class="ShowModalCode-style ">
 				<text>{{deptSource==1?'渠道':'个代'}}工作室招募码</text>
@@ -98,6 +98,35 @@
 				</view>
 			</view>
 		</u-popup>
+		<u-popup v-model="ShowModalPromptChannel" mode="center" border-radius="15" width="80%">
+				<view>
+					<text class=" ShowModalCode-business">
+						<u-icon
+						style="margin-right: 5px;"
+						  size="38"
+						  color="#F13F3F"
+						  name="info-circle-fill"
+						/>提示</text>
+					<view class="ShowModalPrompt-con">
+						您选择的
+						<span v-if="deptSource==1" style="color:#2D6DFF;font-size: 16px; ">渠道</span>
+						<span v-else style="color:#2D6DFF;font-size: 16px;  ">个代</span>
+						模式，业务员出单后，业务员的
+						<span v-if="deptSource==1" >
+							<span style="color:#333;font-weight: 700; ">佣金都会归到团队长账户内</span>
+							由团队长进行分配。
+							</span>
+						<span v-else style="color:#333;font-weight: 700; ">佣金都会归到自己账户内。</span>
+						
+					</view>
+					<view class="ShowModalPrompt-con ShowModalPrompt-button"  @click="ShowModalCodeSumbit()">
+						<text v-if="deptSource==1">确认为渠道模式</text>
+						<text v-else>确认为个代模式</text>
+					</view>
+					<view class="ShowModalPrompt-con ShowModalPrompt-button" @click="ShowModalPromptChannel=false">重新选择</view>
+				</view>
+			</u-popup>
+		
 	</view>
 </template>
 <script>
@@ -115,6 +144,7 @@ export default {
 		return {
 			ShowModalCodebusiness:false,
 			ShowModalCode1:false,
+			ShowModalPromptChannel:false,
 			styles: [{
 				value: '1',
 				text: '渠道',
@@ -246,6 +276,7 @@ export default {
 			this.deptSource = 1
 		},
 		ShowModalCodeSumbit(){
+			this. ShowModalPromptChannel = false
 			this. ShowModalCode1 = true
 			this.workImg = QR.createQrCodeImg(this.$base.h5BaseUrl + "/#/pages/index/applystudio?deptSource=" + this.deptSource + '&userId=' + this.userInfo.sysUser.userId, {
 				size: parseInt(200) //二维码大小  
@@ -514,7 +545,7 @@ export default {
 	font-size: 16px;
 	color: #333333;
 	// border: 1px solid #EEEEEE;
-	padding: 15px;
+	padding: 10px;
 	text-align: center;
 }
 
@@ -604,5 +635,17 @@ export default {
 		color: #666666;
 	}
 }
-
+.ShowModalPrompt-con{
+	padding: 0 16px;
+	padding-bottom:16px;
+	font-weight: 400;
+	font-size: 15px;
+	color: #666666;
+	border-bottom: 1px solid #eee;
+}
+.ShowModalPrompt-button{
+	padding:12px 0;
+	text-align: center;
+	color: #333333;
+}
 </style>

pages/my/commission.vue

@@ -38,12 +38,13 @@
 						</view>
 						<view class="contribution">
 							<view class="contribution_left">
-								贡献合伙人
-								<text v-if="val.profferLevel-userLevel==0">无</text>
-								<text v-if="val.profferLevel-userLevel==1">一级合伙人</text>
-								<text v-if="val.profferLevel-userLevel==2">二级合伙人</text>
-								<text v-if="val.profferLevel-userLevel==3">三级合伙人</text>
-								<text v-if="val.profferLevel-userLevel==4">四级合伙人</text>
+								贡献人：
+								<text v-if="type==1&&val.profferLevel-userLevel==0">{{val.workName}}</text>
+								<text v-if="type==1&&val.profferLevel-userLevel==1">一级合伙人</text>
+								<text v-if="type==1&&val.profferLevel-userLevel==2">二级合伙人</text>
+								<text v-if="type==1&&val.profferLevel-userLevel==3">三级合伙人</text>
+								<text v-if="type==1&&val.profferLevel-userLevel==4">四级合伙人</text>
+								<text v-if="type==2">{{val.issuerName}}</text>
 							</view>
 							<view class="contribution_right">
 								{{val.extractFee}}
@@ -51,7 +52,7 @@
 						</view>
 						<view class="dividend">
 							<view class="dividend_left">
-								分红合伙人
+								佣金明细：
 							</view>
 							<view class="dividend_right">
 								<view class="dividend_options" v-for="(item,index) in val.profferList" :key="index">
@@ -94,6 +95,7 @@
 		},
 		data() {
 			return {
+				type: uni.getStorageSync('type'),
 				userLevel: 0,
 				headerStyle: {
 					backgroundColor: 'transparent',

pages/my/commissionDetail.vue

@@ -34,14 +34,14 @@
 					<text>{{MoneyData.issuerName}}</text>
 				</view>
 				<view class="dis j-s a-c" v-if="MoneyData.profferName&&MoneyData.profferLevel">
-					<text style="font-size: 30rpx; font-weight: 400;">贡献合伙人</text>
+					<text style="font-size: 30rpx; font-weight: 400;">贡献人</text>
 					<text>
 					<!-- 	<text v-if="MoneyData.profferLevel ==1"> 一级合伙人</text>
 						<text v-if="MoneyData.profferLevel ==2"> 二级合伙人</text>
 						<text v-if="MoneyData.profferLevel ==3"> 三级合伙人</text>
 						<text v-if="MoneyData.profferLevel ==4"> 四级合伙人</text>
 						<text v-if="MoneyData.profferLevel ==5"> 五级合伙人</text> -->
-						<text v-if="MoneyData.profferLevel-userLevel==0">无</text>
+						<text v-if="MoneyData.profferLevel-userLevel==0">{{MoneyData.workName}}</text>
 						<text v-if="MoneyData.profferLevel-userLevel==1">{{MoneyData.profferName}}-一级合伙人</text>
 						<text v-if="MoneyData.profferLevel-userLevel==2">{{MoneyData.profferName}}-二级合伙人</text>
 						<text v-if="MoneyData.profferLevel-userLevel==3">{{MoneyData.profferName}}-三级合伙人</text>

pages/my/my.vue

@@ -195,8 +195,8 @@ export default {
 
 	async onShow() {
 		// level:0 工作室
-		this.backImage = this.userInfo.sysUser.sysPartnerConfig.image
-		this.backLogo = this.userInfo.sysUser.sysPartnerConfig.logo
+		this.backImage =  this.userInfo.sysUser.sysPartnerConfig?this.userInfo.sysUser.sysPartnerConfig.image:''
+		this.backLogo = this.userInfo.sysUser.sysPartnerConfig?this.userInfo.sysUser.sysPartnerConfig.logo:''
 		let res = await this.$http.get('/APPPartner/getFee');
 		if (res.code == 200) {
 			this.getApplication = res.data || [];

pages/statistics/statistics.vue

@@ -49,15 +49,14 @@
 					<text>代理人</text>
 				</view>
 			</view>
-			<view class="partner-type dis">
+			<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" />
-
+			<qiun-data-charts v-else type="area" :ontouch="true" :opts="opts1" :chartData="chartData1"   />
 		</view>
 		<view class="body-box" v-if="type == 1 && level!==5">
 			<view class=" dis j-s a-c" style="padding: 10px 10px 0 0;">
@@ -155,7 +154,7 @@
 				<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" />
+			<qiun-data-charts v-else type="area" :opts="opts1" :chartData="chartData1" :ontouch="true"    />
 		</view>
 
 	</view>
@@ -228,6 +227,8 @@ export default {
 			],
 			// optsMax:10,
 			opts1: {
+				 enableScroll: true,
+				padding: [15,10,15,0],
 				legend: {
 					show: false // 设置图例不显示
 				},
@@ -249,14 +250,25 @@ export default {
 						width: 2,
 						gradient: true,
 						activeType: "hollow"
-					}
+					},
 					// line: {
 					// 	type: "curve",
 					// 	width: 2,
 					// 	activeType: "hollow",
 					// 	linearType: "custom"
 					// }
-				}
+				},
+				xAxis: {
+					 disableGrid: true,
+					 type:'grid',
+					 gridType:'dash',
+					 itemCount:4,//x轴单屏显示数据的数量，默认为5个
+					 scrollShow:true,//新增是否显示滚动条，默认false
+					 scrollAlign:'left',//滚动条初始位置
+					 scrollBackgroundColor:'#F7F7FF',//默认为 #EFEBEF
+					 scrollColor:'#A6A6A6',//默认为 #A6A6A6,
+					 fontSize:11,
+				   },
 			},
 
 			chartData1: {},
@@ -343,7 +355,7 @@ export default {
 			let params = {
 				beginTime: this.beginTime,
 				endTime: this.endTime,
-				type: this.typeStatistics2,
+				type: this.typeStatistics2,	
 			}
 			let res = await this.$http.post('/APPPartner/getPartnerProportion', params);
 			if (res.code == '200' ) {
@@ -351,11 +363,14 @@ export default {
 				this.chartsDataPie2 = {
 					series: [{
 						"data": [
-							{ name: `新增`, value: res.data.newProportion, 
-							  labelText: `${res.data.newProportion?'新增：'+res.data.newProportion+'%':'新增：0%'}` },
-							{ name: "历史", value: res.data.oldProportion, 
+							{ name: `新增`, 
+							  value: res.data.newProportion, 
+							  labelText: `${res.data.newProportion?'新增：'+res.data.newProportion+'%':'新增：0%'}` 
+							},
+							{ name: "历史", 
+							  value: res.data.oldProportion, 
 							  labelText: `${res.data.oldProportion?'历史：'+res.data.oldProportion+'%':'历史：0%'}`
-							 }
+							}
 						]
 						// "data": [
 						// 	{ name: `新增`, value: res.data.newProportion?res.data.newProportion:0},
@@ -380,7 +395,7 @@ export default {
 			this.beginTime=beginTime
 			this.endTime=endTime
 		},
-		async queryData() {
+		async queryData() { 
 			let params = {
 				beginTime: this.beginTime,
 				endTime: this.endTime,
@@ -402,6 +417,8 @@ export default {
 			}
 			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]
@@ -410,9 +427,8 @@ export default {
 					let valueList = res.data.countUserNumVoList.map(function (item) {
 						return item.countNum;
 					});
-
 					let rualit = {
-						categories: dateList,
+						categories:dateList ,
 						series: [
 							{
 								name: "人数",
@@ -543,7 +559,7 @@ export default {
 
 .statistics-type {
 	text-align: center;
-
+margin-bottom: 20px;
 	text {
 		display: inline-block;
 		width: 80px;