diff --git a/common/js/api.js b/common/js/api.js
index 9d97b2c..2928240 100644
--- a/common/js/api.js
+++ b/common/js/api.js
@@ -94,18 +94,21 @@ let API = {
// 200=成功， 400 = 失败错误返回、404 token验证失败 ,403 token已过2小时失效
if(res.data.code==200){
success && success(res.data);
- }else if(res.data.code==403){
+ return;
+ }
+
+ uni.showToast({
+ title: res.data.msg || res.msg,
+ icon: 'none'
+ })
+
+ if(res.data.code==403 || res.data.code==201){
uni.removeStorageSync('user_token');
setTimeout(()=>{
uni.reLaunch({
url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
})
}, 1000)
- }else{
- uni.showToast({
- title: res.data.msg,
- icon: 'none'
- })
}
}
})
diff --git a/pages/about/bonusSet/bonusList.vue b/pages/about/bonusSet/bonusList.vue
index ae8de36..9d63538 100644
--- a/pages/about/bonusSet/bonusList.vue
+++ b/pages/about/bonusSet/bonusList.vue
@@ -6,10 +6,13 @@
面值：{{item.price}}
- 最高中奖金额：{{item.max_awards_amount}}
+ 最高中奖金额：{{item.max_awards_amount | formatAmount}}
+
+ - 暂无记录 -
+
@@ -30,6 +33,16 @@
}
},
+ filters: {
+ formatAmount(item){
+ if(item>999999 && item==1000000){
+ return '一百万元'
+ }
+ if(item.split('.')[1].length>2){
+ return (+item).toFixed(2);
+ }
+ }
+ },
methods: {
toSet(id){
uni.navigateTo({
@@ -76,7 +89,8 @@
this.getList();
}else{
uni.showToast({
- title: '没有更多了'
+ title: '没有更多了',
+ icon: 'none'
})
}
}
diff --git a/pages/about/bonusSet/bonusSet.vue b/pages/about/bonusSet/bonusSet.vue
index 7777415..35e169d 100644
--- a/pages/about/bonusSet/bonusSet.vue
+++ b/pages/about/bonusSet/bonusSet.vue
@@ -108,7 +108,7 @@
},
getList(){
API.request('/adminZoneManage/goodsParamList', {zone_goods_id:this.id}, res=>{
- this.setList = res.data;
+ this.setList = res.data.list;
})
}
diff --git a/pages/about/bonusSet/index.vue b/pages/about/bonusSet/index.vue
index b4aa1a4..971afe2 100644
--- a/pages/about/bonusSet/index.vue
+++ b/pages/about/bonusSet/index.vue
@@ -69,7 +69,8 @@
this.getList();
}else{
uni.showToast({
- title: '没有更多了'
+ title: '没有更多了',
+ icon: 'none'
})
}
}
diff --git a/pages/about/serviceSet/serviceSet.vue b/pages/about/serviceSet/serviceSet.vue
index 1b2c20b..db4ce2d 100644
--- a/pages/about/serviceSet/serviceSet.vue
+++ b/pages/about/serviceSet/serviceSet.vue
@@ -132,7 +132,8 @@
this.getList();
}else{
uni.showToast({
- title: '没有更多了'
+ title: '没有更多了',
+ icon: 'none'
})
}
}
diff --git a/pages/home/home.vue b/pages/home/home.vue
index cf50fe9..6391648 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -167,6 +167,7 @@
this.getAwardRecords();
this.getNotice();
}else if(this.userType=='background'){
+ this.chartIndex = 1;
updateTabBar.changebackground();
this.getNeedSta();
this.getUserSta();
@@ -182,9 +183,12 @@
}, 500)
},
+ onHide() {
+ this.isPlay = false;
+ this.innerAudioContext.pause();
+ },
created() {
this.userType = uni.getStorageSync('userType');
-
},
mounted() {
if(this.userType=='user'){
@@ -251,7 +255,7 @@
grid: {
top: '12%',
bottom: '12%',
- left: '10%',
+ left: '18%',
right: '5%'
},
tooltip: {},
diff --git a/pages/list/agent.vue b/pages/list/agent.vue
index 942d46c..dcef211 100644
--- a/pages/list/agent.vue
+++ b/pages/list/agent.vue
@@ -48,7 +48,7 @@
密码:
-
+
@@ -186,7 +186,7 @@
this.search();
})
}else if(this.editType=='edit'){
- API.request('/adminAgentTeam/editUser', {
+ API.request('/adminAgentTeam/editAgent', {
aid: this.editInfo.id,
password: this.editInfo.password
}, res=>{
@@ -256,7 +256,8 @@
this.getAgentList();
}else{
uni.showToast({
- title: '没有更多了'
+ title: '没有更多了',
+ icon: 'none'
})
}
}
diff --git a/pages/list/team.vue b/pages/list/team.vue
index 189ae1c..b8055fc 100644
--- a/pages/list/team.vue
+++ b/pages/list/team.vue
@@ -37,7 +37,7 @@
可提余额：{{scoreInfo.withdrawal_balance}}
-
+
@@ -132,16 +132,19 @@
}
},
onLoad() {
- this.getDataList();
updateTabBar.changeAgent();
},
+ onShow() {
+ this.getDataList();
+ },
onReachBottom() {
if(!this.noMore){
this.page++;
this.getDataList();
}else{
uni.showToast({
- title: '没有更多了'
+ title: '没有更多了',
+ icon: 'none'
})
}
}
diff --git a/pages/list/user.vue b/pages/list/user.vue
index a4a4999..df1e33c 100644
--- a/pages/list/user.vue
+++ b/pages/list/user.vue
@@ -49,7 +49,7 @@
密码:
-
+
@@ -257,7 +257,8 @@
this.getUserList();
}else{
uni.showToast({
- title: '没有更多了'
+ title: '没有更多了',
+ icon: 'none'
})
}
}
diff --git a/pages/serivce/serivce.vue b/pages/serivce/serivce.vue
index a8b6099..119f8e4 100644
--- a/pages/serivce/serivce.vue
+++ b/pages/serivce/serivce.vue
@@ -6,8 +6,8 @@
客服名：{{item.name}}
- 微信号码：{{item.wx}}
- 复制联系方式
+ 微信号码：{{item.wx_number}}
+ 复制联系方式
- 暂无记录 -
@@ -21,14 +21,7 @@
data() {
return {
serviceList:[
- {
- name: '100.00',
- wx: '17177771111',
- },
- {
- name: '100.00',
- wx: '1000.00',
- },
+
],
page: 1,
noMore: true,