Forráskód Böngészése

Merge branch '3.0' of http://39.101.143.165:8090/lihongxiao/partnerApp into 3.0

baijunde 7 hónapja
szülő
commit
e0160be0f2

+ 2 - 2
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";

+ 0 - 17
pages/index/applyteam.vue

@@ -205,23 +205,6 @@
 				console.log('err', err);
 			})
 		},
-		//  submit(ref){
-		// 	this.$refs[ref].validate().then(res => {
-		// 		if(res){
-		// 			this.$http.post('/user/saveTeamLeader', {
-		// 				sysUser:{...this.personData,roleId:"21",referrerId:this.userInfo.sysUser.userId},
-		// 				esmUserImageVo:this.personData.esmUserImageVo
-		// 			}).then(res=>{
-						
-		// 			})
-		// 		}
-				
-		// 		// if (data.code == '200') {
-		// 		// }
-		// 	}).catch(err => {
-		// 		console.log('err', err);
-		// 	})
-		// },
 		async userfrontChange() {
 			let [chooseImageErr, chooseImageRes] = await uni.chooseImage({
 				count: 1,

+ 4 - 0
pages/my/my.vue

@@ -477,6 +477,10 @@ export default {
 	},
 	logout() {
 		this.emptyUserInfo();
+		uni.clearStorage({
+			success: function () {
+			}
+		});
 		setTimeout(() => {
 			uni.reLaunch({
 				url: "/pages/login/login"

+ 57 - 45
pages/statistics/statistics.vue

@@ -74,7 +74,7 @@
 				</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" :opts="opts1" :chartData="chartData1" />
 
 		</view>
 		<view class="body-box" v-if="type == 1">
@@ -87,9 +87,8 @@
 			</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 class="charts-box" style="height: 200px;">
+				<qiun-data-charts type="ring" :eopts="ringOpts" :chartData="chartsDataPie2" />
 			</view>
 		</view>
 		<view class="body-box" style="padding-bottom: 10px;" v-if="type == 1">
@@ -150,7 +149,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" />
 		</view>
 
 	</view>
@@ -166,14 +165,16 @@ export default {
 	},
 	data() {
 		return {
-			beginTime:'',
-			endTime:'',
+			beginTime: '',
+			endTime: '',
 			ringOpts: {
-                color: [ '#02CDFF','#2D97FF '],
-                legend: { show: false },
+				color: [ '#02CDFF ','#2D97FF'],
+				legend: {
+					show: false // 设置图例不显示
+				},
 				dataLabel: true,
-            },
-			chartsDataPie2 :{},
+			},
+			chartsDataPie2: {},
 			level: '',
 			type: null,
 			typeStatistics: 1,
@@ -219,17 +220,17 @@ export default {
 			// optsMax:10,
 			opts1: {
 				legend: {
-				show: false // 设置图例不显示
+					show: false // 设置图例不显示
 				},
 				yAxis: {
-				gridType: "dash",
-				dashLength: 2,
-				data: [
-					{
-					min: 0,
-					max: 10
-					}
-				]
+					gridType: "dash",
+					dashLength: 2,
+					data: [
+						{
+							min: 0,
+							max: 10
+						}
+					]
 				},
 				extra: {
 					area: {
@@ -248,7 +249,7 @@ export default {
 					// }
 				}
 			},
-			
+
 			chartData1: {},
 			directLsit: []
 		}
@@ -331,9 +332,9 @@ export default {
 			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()
+				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();
@@ -341,19 +342,19 @@ export default {
 				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()
+				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()
+				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()
+				this.beginTime = ''
+				this.endTime = ''
+				type == 1 ? this.queryData() : this.analysisQueryData()
 			}
 
 		},
@@ -393,13 +394,20 @@ export default {
 			let res = await this.$http.post('/APPPartner/getPartnerProportion', params);
 			if (res.code == '200') {
 				this.chartsDataPie2 = {
-					"series": [{
+					series: [{
+						// "data": [
+						// 	{ name: `新增`, value: res.data.newProportion, labelText: `
+						// 	${res.data.newProportion?'新增:'+res.data.newProportion+'%':false}
+						// 	` },
+						// 	{ name: "历史", value: res.data.oldProportion, labelText: `历史:${res.data.oldProportion}%` }
+						// ]
 						"data": [
-							{  name: `新增`,value: res.data.newProportion,labelText:`历史:${res.data.oldProportion}%` },
-							{name: "历史", value: res.data.oldProportion, labelText:`历史:${res.data.oldProportion}%` }
+							{ name: `新增`, value: res.data.newProportion},
+							{ name: "历史", value: res.data.oldProportion}
 						]
 					}]
 				}
+			
 			}
 		},
 		async rankingQueryData() {
@@ -440,16 +448,19 @@ export default {
 						categories: dateList,
 						series: [
 							{
-							name: "人数",
-							// type: "line",
-							data: valueList
-						},
-					]
+								name: "人数",
+								// type: "line",
+								data: valueList
+							},
+						]
 					};
-					valueList.sort((a,b) => a-b)
-					this.opts1.yAxis.data[0].max= valueList[valueList.length - 1];  
+					valueList.sort((a, b) => a - b)
+					this.opts1.yAxis.data[0].max = valueList[valueList.length - 1];
 					this.chartData1 = JSON.parse(JSON.stringify(rualit));
 				}
+				else {
+					this.echartsList.countUserNumVoList = []
+				}
 			}
 		}
 	}
@@ -665,8 +676,9 @@ export default {
 	}
 
 }
-.charts-box{
+
+.charts-box {
 	width: 100%;
-    height: 300px;
+	height: 300px;
 }
 </style>

+ 12 - 12
uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js

@@ -17,7 +17,7 @@
  */
 
 // 主题颜色配置:如每个图表类型需要不同主题,请在对应图表类型上更改color属性
-const color = ['#1890FF', '#91CB74', '#FAC858', '#EE6666', '#73C0DE', '#3CA272', '#FC8452', '#9A60B4', '#ea7ccc'];
+const color = ['#02CDFF', '#2D97FF', '#FAC858', '#EE6666', '#73C0DE', '#3CA272', '#FC8452', '#9A60B4', '#ea7ccc'];
 
 //事件转换函数,主要用作格式化x轴为时间轴,根据需求自行修改
 const formatDateTime = (timeStamp, returnType)=>{
@@ -118,20 +118,20 @@ const cfu = {
 		"rotate": false,
 		"dataLabel": true,
 		"legend": {
-			"show": true,
+			"show": false,
 			"position": "right",
       "lineHeight": 25,
 		},
-		"title": {
-			"name": "收益率",
-			"fontSize": 15,
-			"color": "#666666"
-		},
-		"subtitle": {
-			"name": "70%",
-			"fontSize": 25,
-			"color": "#7cb5ec"
-		},
+		// "title": {
+		// 	"name": "收益率",
+		// 	"fontSize": 15,
+		// 	"color": "#666666"
+		// },
+		// "subtitle": {
+		// 	"name": "70%",
+		// 	"fontSize": 25,
+		// 	"color": "#7cb5ec"
+		// },
 		"extra": {
 			"ring": {
 				"ringWidth":30,