Skip to content

施宇 / icsalesProgram

Go to a project
Commit b386e4bc by 施宇
Options

Merge branch 'master' of http://119.23.72.7/shiyu/icsalesProgram

parents 8b22af06 06b473ba
Inline Side-by-side
Showing with 48 additions and 13 deletions
pages/person/exchange/index.js
...@@ -90,8 +90,6 @@ Page({ ...@@ -90,8 +90,6 @@ Page({
}); });
} }
} }
}, true, false, true); }, true, false, true);
......
pages/person/exchange/index.wxml
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
</view> </view>
<block wx:if="{{tabIndex == 1}}"> <block wx:if="{{tabIndex == 1}}">
<view class="content"> <view class="content">
<block wx:if="{{integralBillsList.length > 0}}">
<block wx:for="{{integralBillsList}}" wx:key="item"> <block wx:for="{{integralBillsList}}" wx:key="item">
<view class="list row verCenter bothSide boxsiz"> <view class="list row verCenter bothSide boxsiz">
<view class="column"> <view class="column">
...@@ -23,10 +24,18 @@ ...@@ -23,10 +24,18 @@
</view> </view>
</view> </view>
</block> </block>
</block>
<block wx:else>
<view class="nodata">
<image src="/res/images/imgs/noxb.png" class="img"></image>
<view class="h3 bold">暂无收入明细数据</view>
</view>
</block>
</view> </view>
</block> </block>
<block wx:else> <block wx:else>
<view class="content"> <view class="content">
<block wx:if="{{userExchanges.length > 0}}">
<block wx:for="{{userExchanges}}" wx:key="item"> <block wx:for="{{userExchanges}}" wx:key="item">
<view class="list row verCenter bothSide boxsiz"> <view class="list row verCenter bothSide boxsiz">
<view class="column"> <view class="column">
...@@ -48,6 +57,13 @@ ...@@ -48,6 +57,13 @@
</view> </view>
</view> </view>
</block> </block>
</block>
<block wx:else>
<view class="nodata">
<image src="/res/images/imgs/noxb.png" class="img"></image>
<view class="h3 bold">暂无兑换记录数据</view>
</view>
</block>
</view> </view>
</block> </block>
<view class="btn" bind:tap="toUrl"> <view class="btn" bind:tap="toUrl">
......
pages/person/setting/index.js
...@@ -85,18 +85,18 @@ Page({ ...@@ -85,18 +85,18 @@ Page({
http.getData(apis.authLogout, 'POST', null, (res) => { http.getData(apis.authLogout, 'POST', null, (res) => {
if (res.errcode === 0) { if (res.errcode === 0) {
// wx.switchTab({
// url: '/pages/tab/home/home'
// });
wx.reLaunch({
url: '/pages/person/auth/index',
});
wx.removeStorageSync('access_token'); wx.removeStorageSync('access_token');
wx.removeStorageSync('user_id'); wx.removeStorageSync('user_id');
wx.removeStorageSync('myUsername'); wx.removeStorageSync('myUsername');
wx.removeStorageSync('myPassword'); wx.removeStorageSync('myPassword');
wx.removeStorageSync('auth'); wx.removeStorageSync('auth');
wx.reLaunch({
url: '/pages/person/auth/index',
});
} else { } else {
wx.showToast({ wx.showToast({
title: res.errmsg, title: res.errmsg,
icon: 'none', icon: 'none',
......
pages/tab/me/me.js
...@@ -102,7 +102,7 @@ Page({ ...@@ -102,7 +102,7 @@ Page({
//认证管理 //认证管理
if (e.currentTarget.dataset.type == 'certification') { if (e.currentTarget.dataset.type == 'certification') {
if (e.currentTarget.dataset.status == null) { if (this.data.userInfo.auth_status == null) {
wx.navigateTo({ wx.navigateTo({
url: "/pages/person/certification/addcertification/index" url: "/pages/person/certification/addcertification/index"
...@@ -111,7 +111,7 @@ Page({ ...@@ -111,7 +111,7 @@ Page({
} else { } else {
wx.navigateTo({ wx.navigateTo({
url: "/pages/person/certification/addcertification/index" url: "/pages/person/certification/certificationmanage/index"
}); });
} }
...@@ -152,7 +152,7 @@ Page({ ...@@ -152,7 +152,7 @@ Page({
}) })
}, },
toSignin:function(){ toSignin: function () {
wx.navigateTo({ wx.navigateTo({
url: "/pages/list/signin/index" url: "/pages/list/signin/index"
}) })
......
pages/tab/me/me.wxml
...@@ -57,14 +57,14 @@ ...@@ -57,14 +57,14 @@
<text class="t2">{{userInfo.mobile}}</text> <text class="t2">{{userInfo.mobile}}</text>
</view> </view>
</view> </view>
<view class="boxsiz bar row bothSide verCenter" data-type="certification" data-status="{{userInfo.auth_status}}" bind:tap="toUrl"> <view class="boxsiz bar row bothSide verCenter" data-type="certification" bind:tap="toUrl">
<view> <view>
<text class="icon iconfont iconiconxiantiaoshouji19"></text> <text class="icon iconfont iconiconxiantiaoshouji19"></text>
<text class="t1">认证管理</text> <text class="t1">认证管理</text>
</view> </view>
<view> <view>
<block wx:if="{{userInfo.auth_status_val == null}}"> <block wx:if="{{userInfo.auth_status_val == null}}">
<text class="t2">{{userInfo.auth_status_val}}</text> <text class="t2">未认证</text>
</block> </block>
<block wx:else> <block wx:else>
<text class="t2">{{userInfo.auth_status_val}}</text> <text class="t2">{{userInfo.auth_status_val}}</text>
......
project.config.json
...@@ -114,6 +114,27 @@ ...@@ -114,6 +114,27 @@
"id": -1, "id": -1,
"name": "pages/person/exchange/index", "name": "pages/person/exchange/index",
"pathName": "pages/person/exchange/index", "pathName": "pages/person/exchange/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/tab/home/home",
"pathName": "pages/tab/home/home",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/person/setting/index",
"pathName": "pages/person/setting/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/tab/me/me",
"pathName": "pages/tab/me/me",
"scene": null "scene": null
} }
] ]
......
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 sign in to comment