Commit e20902df by 施宇

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

parents f6f2f613 95dba4d9
...@@ -10,7 +10,8 @@ Page({ ...@@ -10,7 +10,8 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
authinfo: {} authinfo: {},
isShowTip: true
}, },
/** /**
...@@ -19,9 +20,9 @@ Page({ ...@@ -19,9 +20,9 @@ Page({
onLoad: function (options) { onLoad: function (options) {
http.getData(apis.authInfo, 'GET', null, (res) => { http.getData(apis.authInfo, 'GET', null, (res) => {
if (res.errcode == 0) { if (res.errcode == 0) {
this.setData({ this.setData({
authInfo: res.data authInfo: res.data
}); });
...@@ -72,28 +73,33 @@ Page({ ...@@ -72,28 +73,33 @@ Page({
onReachBottom: function () { onReachBottom: function () {
}, },
closeTip: function () {
this.setData({
isShowTip: false
})
},
/** /**
* 跳转认证信息 * 跳转认证信息
*/ */
toUrl: function (e) { toUrl: function (e) {
if(e.target.dataset.type == 1){ if (e.target.dataset.type == 1) {
wx.navigateTo({ wx.navigateTo({
url: e.target.dataset.url+'?id='+e.target.dataset.id, url: e.target.dataset.url + '?id=' + e.target.dataset.id,
success: (result)=>{ success: (result) => {
} }
}); });
}else if(e.target.dataset.type == 2){ } else if (e.target.dataset.type == 2) {
wx.navigateTo({ wx.navigateTo({
url: e.target.dataset.url, url: e.target.dataset.url,
success: (result)=>{ success: (result) => {
} }
}); });
}else if(e.target.dataset.type == 3){ } else if (e.target.dataset.type == 3) {
wx.switchTab({ wx.switchTab({
url:e.target.dataset.url url: e.target.dataset.url
}); });
} }
} }
......
<view class="certification" hover-class="none" hover-stop-propagation="false"> <view class="certification" hover-class="none" hover-stop-propagation="false">
<view class="prompt boxsiz row verCenter bothSide"> <view class="tip row bothSide verCenter {{isShowTip?'':'noheight'}}">
<view> <view class="tip-left row verCenter">
<text class="icon iconfont iconiconxiantiaoshouji12"></text> <text class="icon iconfont iconiconxiantiaoshouji12 tip-icon"></text>
<text class="t1">请如实填写认证信息,不符合的认证将被拒绝</text> <text class="tip-c">请如实填写认证信息,不符合的认证将被拒绝</text>
</view>
<view>
<text class="icon iconfont iconiconxiantiaoshouji13"></text>
</view> </view>
<text class="icon iconfont iconiconxiantiaoshouji13 close-icon" bindtap="closeTip"></text>
</view> </view>
<view class="content"> <view class="content">
<text class="time">更新时间:{{authInfo.update_time}}</text> <text class="time">更新时间:{{authInfo.update_time}}</text>
......
...@@ -10,7 +10,8 @@ Page({ ...@@ -10,7 +10,8 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
invitesInfo: {} invitesInfo: {},
isShowTip: true
}, },
/** /**
...@@ -102,7 +103,7 @@ Page({ ...@@ -102,7 +103,7 @@ Page({
http.getData(apis.invitesInfo, 'GET', null, (res) => { http.getData(apis.invitesInfo, 'GET', null, (res) => {
if (res.errcode === 0) { if (res.errcode === 0) {
this.setData({ this.setData({
invitesInfo: res.data invitesInfo: res.data
}); });
...@@ -110,5 +111,10 @@ Page({ ...@@ -110,5 +111,10 @@ Page({
} }
}, true, false, true); }, true, false, true);
},
closeTip: function () {
this.setData({
isShowTip: false
})
} }
}) })
\ No newline at end of file
This diff could not be displayed because it is too large.
<view class="invitation" hover-class="none" hover-stop-propagation="false"> <view class="invitation" hover-class="none" hover-stop-propagation="false">
<view class="prompt boxsiz row verCenter bothSide"> <view class="tip row bothSide verCenter {{isShowTip?'':'noheight'}}" style="position:relative;white-space: nowrap;">
<view> <view class="wrap column">
<text class="icon iconfont iconiconxiantiaoshouji12"></text> <swiper vertical="true" circular="true" interval="5000" autoplay display-multiple-items='2' class="sw">
<text class="t1">1501****484 刚刚邀请好友获得5元红包</text> <swiper-item wx:for="{{invitesInfo.recent_invites}}" wx:key="{{item}}">
</view> <view class="tip-left row verCenter">
<view> <text class="icon iconfont iconiconxiantiaoshouji12 tip-icon"></text>
<text class="icon iconfont iconiconxiantiaoshouji13"></text> <text class="tip-c">
{{item.invited_user_mobile}} 刚刚邀请好友获得{{item.amount}}元红包
</text>
</view>
</swiper-item>
</swiper>
</view> </view>
<text class="icon iconfont iconiconxiantiaoshouji13 close-icon" bindtap="closeTip"></text>
</view> </view>
<view class="head"> <view class="head">
<view class="wrap column rowCenter verCenter"> <view class="wrap column rowCenter verCenter">
......
This diff could not be displayed because it is too large.
...@@ -17,7 +17,8 @@ Page({ ...@@ -17,7 +17,8 @@ Page({
indexOf: -1, indexOf: -1,
exchanging: false, exchanging: false,
exchange_id: '', exchange_id: '',
weixin_exchange_info: {} weixin_exchange_info: {},
isShowTip: true
}, },
/** /**
...@@ -186,6 +187,11 @@ Page({ ...@@ -186,6 +187,11 @@ Page({
}, },
closeTip: function () {
this.setData({
isShowTip: false
})
},
/** /**
* 提交 * 提交
*/ */
......
<view class="withdrawal" hover-class="none" hover-stop-propagation="false"> <view class="withdrawal" hover-class="none" hover-stop-propagation="false">
<view class="prompt boxsiz row verCenter bothSide"> <view class="tip row bothSide verCenter {{isShowTip?'':'noheight'}}">
<view> <view class="tip-left row verCenter">
<text class="icon iconfont iconiconxiantiaoshouji12"></text> <text class="icon iconfont iconiconxiantiaoshouji12 tip-icon"></text>
<text class="t1">金币兑换充值后无法更改,请核对充值账号</text> <text class="tip-c">金币兑换充值后无法更改,请核对充值账号</text>
</view>
<view>
<text class="icon iconfont iconiconxiantiaoshouji13"></text>
</view> </view>
<text class="icon iconfont iconiconxiantiaoshouji13 close-icon" bindtap="closeTip"></text>
</view> </view>
<view class="withdrawal-tab row verCenter rowCenter"> <view class="withdrawal-tab row verCenter rowCenter">
<view class="boxFlex row verCenter rowCenter {{tabIndex == '1' ? 'curr-l':''}}" bind:tap="switchTab" data-id="1"> <view class="boxFlex row verCenter rowCenter {{tabIndex == '1' ? 'curr-l':''}}" bind:tap="switchTab" data-id="1">
......
...@@ -135,6 +135,34 @@ ...@@ -135,6 +135,34 @@
"id": -1, "id": -1,
"name": "pages/tab/me/me", "name": "pages/tab/me/me",
"pathName": "pages/tab/me/me", "pathName": "pages/tab/me/me",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/person/register/index",
"pathName": "pages/person/register/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/person/login/index",
"pathName": "pages/person/login/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/person/certification/certificationmanage/index",
"pathName": "pages/person/certification/certificationmanage/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/person/invitation/index",
"pathName": "pages/person/invitation/index",
"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