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 @@
-
+
面值:{{item.price}}
最高中奖金额:{{item.max_awards_amount | formatAmount}}
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 @@
-
+
{{about.appName}}
Version {{version}}
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 @@
{{userInfo.balance}}
-
+
余额
- 充值
+ 充值
@@ -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 @@
-
+
@@ -37,7 +37,9 @@
{{config.isAdmin ? '注册管理员账号': '新注册'}}
-
+
温馨提示:
忘记密码,请联系平台
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 @@
-
+
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,