From a09e67d1af9abbe7ba849ff1598d2637de447e2d Mon Sep 17 00:00:00 2001
From: luyisha <luyisha@xingtongworld.com>
Date: Fri, 15 Sep 2023 17:41:41 +0800
Subject: [PATCH] 1

---
 common/js/api.js                              |  2 +-
 pages/about/bonusSet/bonusList.vue            |  2 +-
 pages/home/home.vue                           | 20 ++++++++-----
 pages/ucenter/about/about.vue                 |  2 +-
 pages/ucenter/ucenter.vue                     | 17 +++++------
 .../pages/login/login-withpwd.vue             |  6 ++--
 .../uni-id-pages/pages/retrieve/retrieve.vue  |  2 +-
 .../pages/userinfo/change_pwd/change_pwd.vue  | 30 ++++++++++++++-----
 8 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/common/js/api.js b/common/js/api.js
index 58e1443..7915ebb 100644
--- a/common/js/api.js
+++ b/common/js/api.js
@@ -1,6 +1,6 @@
 // let baseUrl = 'http://192.168.66.221:8000'
 let baseUrl = 'http://192.168.66.16:8084'
-// let baseUrl = ''
+// baseUrl = ''
 
 let API = {
 	baseUrl: baseUrl,
diff --git a/pages/about/bonusSet/bonusList.vue b/pages/about/bonusSet/bonusList.vue
index 5afed02..a239333 100644
--- a/pages/about/bonusSet/bonusList.vue
+++ b/pages/about/bonusSet/bonusList.vue
@@ -3,7 +3,7 @@
 		<view class="nav_area"></view>
 		<view class="setPage">
 			<view class="switch_item" v-for="(item, index) in datasList" @click="toSet(item.id)">
-				<view class="icon_new"><image :src="item.cover_image" mode=""></image></view>
+				<view class="icon_new"><image :src="item.cover_image" mode="aspectFill"></image></view>
 				<view style="flex:1;">
 					<view class=""><text>面值：</text>{{item.price}}</view>
 					<view style="font-size: 12px;"><text>最高中奖金额：</text>{{item.max_awards_amount | formatAmount}}</view>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index ea8d0a3..9ff94ea 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -127,7 +127,7 @@
 				userType: 'background',//user|agent|background
 				bannerList: [],
 				goodsList: [],
-				recordsList: [1,2,3,4,5,6],
+				recordsList: [],
 				chartIndex: 1,//1上分2下分
 				myChart: null,
 				pieChart: null,
@@ -139,20 +139,20 @@
 					update_time: '2023/08/30 19:00',
 					down_scores_quota: {
 						title: '待下分额度',
-						quota: '10010.00'
+						quota: ''
 					}
 				},
 				userStatistics: {
 					agent: {
-						num: '7',
-						rate: '36.84%'
+						num: '0',
+						rate: '0%'
 					},
 					user: {
-						num: '12',
-						rate: '63.16%'
+						num: '0',
+						rate: '0%'
 					},
 					sum: {
-						num: "19人" //总人数
+						num: "0人" //总人数
 					} 
 				},
 				UpDownSta: {
@@ -411,10 +411,14 @@
 				API.getAwardRecords({
 					page:page, limit: limit
 				}, res=>{
-					this.recordsList = res.data.list;
 					if(res.data.list.length<10){
 						this.nomore = true;
 					}
+					if(page>1){
+						this.recordsList = this.recordsList.concat(res.data.list);
+					}else{
+						this.recordsList = res.data.list;
+					}
 				})
 			},
 			/*总后台待办*/
diff --git a/pages/ucenter/about/about.vue b/pages/ucenter/about/about.vue
index 63a74a0..5113a17 100644
--- a/pages/ucenter/about/about.vue
+++ b/pages/ucenter/about/about.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="about">
 		<view class="box">
-			<image class="logoImg" :src="about.logo"></image>
+			<image class="logoImg" src="../../../static/home/logo.png"></image>
 			<text class="tip appName">{{about.appName}}</text>
 			<text class="tip">Version {{version}}</text>
 			<view class="qrcode">
diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue
index 0a7ef96..2c86fbb 100644
--- a/pages/ucenter/ucenter.vue
+++ b/pages/ucenter/ucenter.vue
@@ -19,9 +19,9 @@
 		<view class="balance_area" v-if="userType=='user'||userType=='agent'">
 			<view class="item">
 				<text style="font-size: 20px;margin-bottom: 10rpx;">{{userInfo.balance}}</text>
-				<view class="item_btn" :style="showRecharge?'justify-content: space-between;':''">
+				<view class="item_btn" :style="userInfo.recharge?'justify-content: space-between;':''">
 					<text>余额</text>
-					<text v-if="showRecharge" @click="toRecharge()" style="color: #4976FF;">充值</text>
+					<text v-if="userInfo.recharge" @click="toRecharge()" style="color: #4976FF;">充值</text>
 				</view>
 			</view>
 			<view class="line"></view>
@@ -218,12 +218,12 @@
 							"icon": "compose",
 							"iconN": "lock"
 						},
-						{
-							"title": '关于',
-							"to": '/pages/ucenter/about/about',
-							"icon": "compose",
-							"iconN": "list"
-						},
+						// {
+						// 	"title": '关于',
+						// 	"to": '/pages/ucenter/about/about',
+						// 	"icon": "compose",
+						// 	"iconN": "list"
+						// },
 					],
 					[
 						{
@@ -310,7 +310,6 @@
 						"radius": "100%" // 边框圆角，支持百分比
 					}
 				},
-				showRecharge: true,
 				userInfo: {},
 			}
 		},
diff --git a/uni_modules/uni-id-pages/pages/login/login-withpwd.vue b/uni_modules/uni-id-pages/pages/login/login-withpwd.vue
index f740c32..1070642 100644
--- a/uni_modules/uni-id-pages/pages/login/login-withpwd.vue
+++ b/uni_modules/uni-id-pages/pages/login/login-withpwd.vue
@@ -1,6 +1,6 @@
 <!-- 账号密码登录页 -->
 <template>
-	<view class="uni-content" style="padding: 0px 53px;">
+	<view class="uni-content" style="padding: 0px 53px;margin: 0px auto;">
 		<view class="nav_area"></view>
 		<view class="logo_area">
 			<image src="../../../../static/home/logo.png" mode=""></image>
@@ -37,7 +37,9 @@
 			<text class="link" @click="toRegister">{{config.isAdmin ? '注册管理员账号': '新注册'}}</text>
 			<!-- <text class="link" @click="toRegister" v-if="!config.isAdmin">注册账号</text> -->
 		</view>
-		<view v-if="this.userType=='user'" style="width: 100vw;text-align: center;color: #dcdcdc;font-size: 14px;line-height: 28px;position: fixed;bottom: 50px;left:0px">
+		<view v-if="this.userType=='user'"
+		 style="width: 100vw;text-align: center;color: #dcdcdc;font-size: 14px;
+		 line-height: 28px;position: fixed;top: calc(100vh - 100px);left:0px;">
 			温馨提示：<br/>
 			忘记密码，请联系平台
 		</view>
diff --git a/uni_modules/uni-id-pages/pages/retrieve/retrieve.vue b/uni_modules/uni-id-pages/pages/retrieve/retrieve.vue
index 2473915..3c58fd2 100644
--- a/uni_modules/uni-id-pages/pages/retrieve/retrieve.vue
+++ b/uni_modules/uni-id-pages/pages/retrieve/retrieve.vue
@@ -1,6 +1,6 @@
 <!-- 找回密码页 -->
 <template>
-	<view class="uni-content" style="padding: 0px 53px;">
+	<view class="uni-content" style="padding: 0px 53px;margin: 0px auto;">
 		<match-media :min-width="690">
 			<view class="login-logo">
 				<image :src="logo"></image>
diff --git a/uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd.vue b/uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd.vue
index b2a7d6f..f7bd5e4 100644
--- a/uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd.vue
+++ b/uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd.vue
@@ -92,16 +92,30 @@
 							password: this.formData.newPassword,
 							repassword: this.formData.repassword
 						}
-						API.modifyPassword(data, res=>{
-							uni.showToast({
-								title: '修改成功'
+						if(uni.getStorageSync('userType')=='user'){
+							API.modifyPassword(data, res=>{
+								uni.showToast({
+									title: '修改成功'
+								})
+								setTimeout(()=>{
+									uni.navigateBack({
+										delta: 1
+									})
+								}, 1000)
 							})
-							setTimeout(()=>{
-								uni.navigateBack({
-									delta: 1
+						}else{
+							API.request('/agentTeam/modifyPassword', data, res=>{
+								uni.showToast({
+									title: '修改成功'
 								})
-							}, 1000)
-						})
+								setTimeout(()=>{
+									uni.navigateBack({
+										delta: 1
+									})
+								}, 1000)
+							})
+						}
+						
 						return;
 						let {
 							oldPassword,