Commit 5e8cf76c by shibukun

解决bug

parent 55092b9c
...@@ -74,12 +74,13 @@ export default { ...@@ -74,12 +74,13 @@ export default {
getUserInfo() { getUserInfo() {
this.isLogin = true; this.isLogin = true;
this.$net this.$net
.get('/staff/detail', {}) .get('/staff/detail', {'refreshToken': 'not'})
.then(res => { .then(res => {
if (res.code === 200) { if (res.code === 200) {
this.name = res.data.staffName; this.name = res.data.staffName;
this.integralCount = res.data.allIntegral; this.integralCount = this.$numUtils.moneyFormat(res.data.surplusIntegral, 3, ',');
this.isLogin = true this.isLogin = true
this.$store.commit('refreshUserLogin', true)
this.$store.commit('refreshUserInfo', res.data) this.$store.commit('refreshUserInfo', res.data)
} else { } else {
this.isLogin = false this.isLogin = false
...@@ -92,39 +93,10 @@ export default { ...@@ -92,39 +93,10 @@ export default {
}, },
getData() { getData() {
this.$net this.$net
.get('/goods/brand', { page: this.page, pageSize: this.pageSize }) .get('/goods/brand', { page: this.page, pageSize: this.pageSize, 'refreshToken': 'not' })
.then(res => { .then(res => {
if (res.data.list.length > 0) { if (res.data.list.length > 0) {
this.brandList = this.brandList this.brandList = this.brandList.concat(res.data.list);
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list);
this.page += 1; this.page += 1;
} }
this.loadingType = res.data.list.length < this.pageSize ? 'noMore' : 'more'; this.loadingType = res.data.list.length < this.pageSize ? 'noMore' : 'more';
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<text class="item-name">{{ item.title }}</text> <text class="item-name">{{ item.title }}</text>
<text class="item-count">{{ item.number <= 0 ? '' : '*' + item.number }}</text> <text class="item-count">{{ item.number <= 0 ? '' : '*' + item.number }}</text>
</view> </view>
<text :class="item.integral > 0 ? 'item-integral' : 'item-integral-income'">{{ item.integral }}</text> <text :class="item.integral > 0 ? 'item-integral' : 'item-integral-income'">{{item.integral>0?'+':''}}{{ item.integral }}</text>
</view> </view>
<view class="item-right-bottom"> <view class="item-right-bottom">
<text class="item-time">{{ item.transactionTime }}</text> <text class="item-time">{{ item.transactionTime }}</text>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment