diff --git a/common/js/api.js b/common/js/api.js index 7915ebb..d2aecb5 100644 --- a/common/js/api.js +++ b/common/js/api.js @@ -41,7 +41,7 @@ let API = { }, // 首页专区 getZoneList(data, success, fail){ - API.sendRequest('post', data, '/index/zoneList', success, fail, false) + API.sendRequest('post', data, '/index/zoneList', success, fail, true) }, // 首页专区-专区列表 getGoodsList(data, success, fail){ @@ -57,11 +57,11 @@ let API = { }, // 首页中奖纪录 getAwardRecords(data, success, fail){ - API.sendRequest('post', data, '/index/awardRecords', success, fail, false) + API.sendRequest('post', data, '/index/awardRecords', success, fail, true) }, // 首页轮播图 getRotationChart(data, success, fail){ - API.sendRequest('post', data, '/index/rotationChart', success, fail, false) + API.sendRequest('post', data, '/index/rotationChart', success, fail, true) }, // 通用api request(url, data, success, fail, boolean=true){ diff --git a/pages.json b/pages.json index b74cdb3..bb655e7 100644 --- a/pages.json +++ b/pages.json @@ -454,7 +454,7 @@ "backgroundColor": "#F8F8F8", "enablePullDownRefresh": false, // "maxWidth":375, - "rpxCalcMaxDeviceWidth": 375, + "rpxCalcMaxDeviceWidth": 960, "rpxCalcBaseDeviceWidth": 375 // "rpxCalcIncludeWidth":0 }, diff --git a/pages/home/home.vue b/pages/home/home.vue index 9ff94ea..888da07 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -354,7 +354,7 @@ }, renderPie(){ let option = { - color: ['#678CFD', '#22c18b'], + color: ['#22c18b','#678CFD'], series: [ { name: '', @@ -449,7 +449,7 @@ getNotice(){ API.request('/index/getNotice', {}, res=>{ this.notice = res.data; - }, fail=>{}, false) + }, fail=>{}, true) }, }, mounted() { diff --git a/pages/list/agent.vue b/pages/list/agent.vue index cbbfc7d..cabc892 100644 --- a/pages/list/agent.vue +++ b/pages/list/agent.vue @@ -250,7 +250,8 @@ } }, onShow() { - this.getAgentList(); + this.account = ''; + this.search(); }, onReachBottom() { if(!this.noMore){ diff --git a/pages/list/team.vue b/pages/list/team.vue index c3a59f5..3b07c08 100644 --- a/pages/list/team.vue +++ b/pages/list/team.vue @@ -129,7 +129,8 @@ }) }, search(){ - this.page = 1;this.noMore= false; + this.page = 1; + this.noMore= false; this.getDataList(); } }, @@ -137,7 +138,8 @@ updateTabBar.changeAgent(); }, onShow() { - this.getDataList(); + this.account = ''; + this.search(); }, onReachBottom() { if(!this.noMore){ diff --git a/pages/list/user.vue b/pages/list/user.vue index c90c1ff..a9d75a2 100644 --- a/pages/list/user.vue +++ b/pages/list/user.vue @@ -252,7 +252,8 @@ } }, onShow() { - this.getUserList(); + this.account = ''; + this.search(); }, onReachBottom() { if(!this.noMore){ diff --git a/pages/scratchCard/scratchCard.vue b/pages/scratchCard/scratchCard.vue index 48c93b7..40542bf 100644 --- a/pages/scratchCard/scratchCard.vue +++ b/pages/scratchCard/scratchCard.vue @@ -7,7 +7,7 @@ - + ¥{{lineItem.amount}} @@ -262,7 +262,7 @@ export default { font-weight: bold; image{ - width: 80rpx; + width: 60rpx; height: 60rpx; // background-color: #000; } diff --git a/uni_modules/uni-id-pages/pages/register/register.vue b/uni_modules/uni-id-pages/pages/register/register.vue index 068a10e..aa54fb5 100644 --- a/uni_modules/uni-id-pages/pages/register/register.vue +++ b/uni_modules/uni-id-pages/pages/register/register.vue @@ -1,6 +1,6 @@