Skip to content

施宇 / icsalesProgram

Go to a project
Commit 5066dee5 by 施宇
Options

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

parents 21a2fc2b 537307a8
Inline Side-by-side
Showing with 143 additions and 162 deletions
pages/person/auth/index.js
...@@ -17,7 +17,46 @@ Page({ ...@@ -17,7 +17,46 @@ Page({
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
var token = wx.getStorageSync('access_token');
if (options.from == 'share') {
//判断页面是从分享页面过来的
//已登录
if (token) {
//已登录状态回调分享接口
http.getData(apis.shareAdd, 'GET', {
user_id: options.user_id
}, (res) => {
wx.switchTab({
url: '/pages/tab/home/home'
})
}, false, false, true);
} else {
//未登录情况下 记录分享者的used_id
wx.setStorage({
key: "share_id",
data: options.user_id
});
}
} else if (options.from == 'invites') {
//判断页面是从邀请好友页面过来的
//只需要判断未登录者的情况
if (!token) {
//未登录情况下 记录邀请者的used_id
wx.setStorage({
key: "invites_id",
data: options.user_id
});
}
}
}, },
......
pages/person/certification/addcertification/index.less
...@@ -112,6 +112,11 @@ ...@@ -112,6 +112,11 @@
width: 220rpx; width: 220rpx;
height: 220rpx; height: 220rpx;
.img {
width: 220rpx;
height: 220rpx;
}
.iconiconxiantiaoshouji7 { .iconiconxiantiaoshouji7 {
position: absolute; position: absolute;
right: -15rpx; right: -15rpx;
...@@ -124,6 +129,7 @@ ...@@ -124,6 +129,7 @@
border-radius: 50%; border-radius: 50%;
text-align: center; text-align: center;
line-height: 44rpx; line-height: 44rpx;
z-index: 99;
} }
} }
......
pages/person/certification/addcertification/index.wxml
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</block> </block>
<block wx:else> <block wx:else>
<view class="view column rowCenter verCenter"> <view class="view column rowCenter verCenter">
<cover-image src="{{imgSrc}}" class="img"></cover-image> <image src="{{imgSrc}}" class="img"></image>
<text class="icon iconfont iconiconxiantiaoshouji7" bind:tap="deleteImg"></text> <text class="icon iconfont iconiconxiantiaoshouji7" bind:tap="deleteImg"></text>
</view> </view>
</block> </block>
......
pages/person/certification/addcertification/index.wxss
.certification .flex-a { .certification .flex-a{flex:1}.certification .flex-b{flex:2}.certification .prompt{padding:0 24rpx;height:68rpx;background:#FFF6E6}.certification .prompt .iconiconxiantiaoshouji12{font-size:30rpx;color:#EAAD37}.certification .prompt .t1{font-size:24rpx;color:#EAA217;margin-left:12rpx}.certification .prompt .iconiconxiantiaoshouji13{font-size:30rpx;color:#D8DFE6}.certification .hr{height:10rpx;background:#F5F9FC}.certification .item{padding:0 24rpx 0 0;margin-left:24rpx;height:100rpx}.certification .item .radio-group .radio-wrap{font-size:28rpx;color:#515559;font-weight:400}.certification .item .t1{font-size:28rpx;color:#515559;font-weight:400}.certification .item .t2{font-size:28rpx;color:#8A9299;font-weight:400}.certification .item .inp{width:492r px;height:100rpx}.certification .item .radio-wrap:first-child{margin-right:50rpx}.certification .item .radio-wrap:first-child .radio-text{font-size:28rpx;font-weight:400;color:#515559}.certification .item .iconChevron{font-size:27rpx;color:#ADB6BF;margin-left:12rpx}.certification .item.bor{border-bottom:1px solid #F5F9FC}.certification .upload-box{margin-top:60rpx;margin-bottom:60rpx}.certification .upload-box .add{width:220rpx;height:220rpx;background:#F0F6FA}.certification .upload-box .add .iconiconxiantiaoshouji15{font-size:80rpx;color:#ADB6BF}.certification .upload-box .add .t1{margin-top:19rpx;font-size:24rpx;color:#8A9299}.certification .upload-box .view{position:relative;width:220rpx;height:220rpx}.certification .upload-box .view .img{width:220rpx;height:220rpx}.certification .upload-box .view .iconiconxiantiaoshouji7{position:absolute;right:-15rpx;top:-12rpx;font-size:30rpx;color:#fff;width:44rpx;height:44rpx;background:#EA1717;border-radius:50%;text-align:center;line-height:44rpx;z-index:99}.certification .upload-box .txt{margin-top:24rpx;font-size:24rpx;color:#8A9299}.certification .btn{margin:0 55rpx;height:98rpx;background:#0d84d1 !important;box-shadow:0 6rpx 10rpx 0 rgba(97,160,242,0.3) !important;border-radius:8rpx;font-size:32rpx;color:#FFFFFF !important;text-align:center;line-height:89rpx}
flex: 1; \ No newline at end of file
}
.certification .flex-b {
flex: 2;
}
.certification .prompt {
padding: 0 24rpx;
height: 68rpx;
background: #FFF6E6;
}
.certification .prompt .iconiconxiantiaoshouji12 {
font-size: 30rpx;
color: #EAAD37;
}
.certification .prompt .t1 {
font-size: 24rpx;
color: #EAA217;
margin-left: 12rpx;
}
.certification .prompt .iconiconxiantiaoshouji13 {
font-size: 30rpx;
color: #D8DFE6;
}
.certification .hr {
height: 10rpx;
background: #F5F9FC;
}
.certification .item {
padding: 0 24rpx 0 0;
margin-left: 24rpx;
height: 100rpx;
}
.certification .item .radio-group .radio-wrap {
font-size: 28rpx;
color: #515559;
font-weight: 400;
}
.certification .item .t1 {
font-size: 28rpx;
color: #515559;
font-weight: 400;
}
.certification .item .t2 {
font-size: 28rpx;
color: #8A9299;
font-weight: 400;
}
.certification .item .inp {
width: 492r px;
height: 100rpx;
}
.certification .item .radio-wrap:first-child {
margin-right: 50rpx;
}
.certification .item .radio-wrap:first-child .radio-text {
font-size: 28rpx;
font-weight: 400;
color: #515559;
}
.certification .item .iconChevron {
font-size: 27rpx;
color: #ADB6BF;
margin-left: 12rpx;
}
.certification .item.bor {
border-bottom: 1px solid #F5F9FC;
}
.certification .upload-box {
margin-top: 60rpx;
margin-bottom: 60rpx;
}
.certification .upload-box .add {
width: 220rpx;
height: 220rpx;
background: #F0F6FA;
}
.certification .upload-box .add .iconiconxiantiaoshouji15 {
font-size: 80rpx;
color: #ADB6BF;
}
.certification .upload-box .add .t1 {
margin-top: 19rpx;
font-size: 24rpx;
color: #8A9299;
}
.certification .upload-box .view {
position: relative;
width: 220rpx;
height: 220rpx;
}
.certification .upload-box .view .iconiconxiantiaoshouji7 {
position: absolute;
right: -15rpx;
top: -12rpx;
font-size: 30rpx;
color: #fff;
width: 44rpx;
height: 44rpx;
background: #EA1717;
border-radius: 50%;
text-align: center;
line-height: 44rpx;
}
.certification .upload-box .txt {
margin-top: 24rpx;
font-size: 24rpx;
color: #8A9299;
}
.certification .btn {
margin: 0 55rpx;
height: 98rpx;
background: #0d84d1 !important;
box-shadow: 0px 6rpx 10rpx 0px rgba(97, 160, 242, 0.3) !important;
border-radius: 8rpx;
font-size: 32rpx;
color: #FFFFFF !important;
text-align: center;
line-height: 89rpx;
}
pages/person/certification/certificationmanage/index.less
This diff could not be displayed because it is too large.
pages/person/certification/certificationmanage/index.wxml
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<view class="content"> <view class="content">
<text class="time">更新时间：{{authInfo.update_time}}</text> <text class="time">更新时间：{{authInfo.update_time}}</text>
<view class="status row verCenter rowCenter"> <view class="status row verCenter rowCenter">
<cover-image src="{{authInfo.auth_img}}" class="img"></cover-image> <image src="{{authInfo.auth_img}}" class="img"></image>
<block wx:if="{{authInfo.status === 1}}"> <block wx:if="{{authInfo.status === 1}}">
<text class="a"></text> <text class="a"></text>
</block> </block>
...@@ -41,16 +41,14 @@ ...@@ -41,16 +41,14 @@
</view> </view>
</view> </view>
<block wx:if="{{authInfo.status === 1}}"> <block wx:if="{{authInfo.status === 1}}">
<button class="btn" data-type="1" data-id="{{authInfo.id}}" data-url='/pages/person/certification/addcertification/index' bind:tap="toUrl"> <button class="btn opac" data-id="{{authInfo.id}}">资料审核中</button>
更新认证信息
</button>
</block> </block>
<block wx:elif="{{authInfo.status === 3}}"> <block wx:elif="{{authInfo.status === 3}}">
<button class="btn" data-type="3" data-id="{{authInfo.id}}" data-url='/pages/tab/me/me' bind:tap="toUrl"> <button class="btn" data-type="1" data-id="{{authInfo.id}}" data-url='/pages/person/certification/addcertification/index' bind:tap="toUrl">
返回会员中心 更新认证信息
</button> </button>
</block> </block>
<block wx:elif="{{authInfo.status === 2}}"> <block wx:elif="{{authInfo.status === 1}}">
<button class="btn" data-type="2" data-id="{{authInfo.id}}" data-url='/pages/person/certification/addcertification/index' bind:tap="toUrl"> <button class="btn" data-type="2" data-id="{{authInfo.id}}" data-url='/pages/person/certification/addcertification/index' bind:tap="toUrl">
重新提交信息 重新提交信息
</button> </button>
......
pages/person/certification/certificationmanage/index.wxss
This diff could not be displayed because it is too large.
pages/person/getphone/index.js
...@@ -87,12 +87,36 @@ Page({ ...@@ -87,12 +87,36 @@ Page({
data: res.data.access_token data: res.data.access_token
}); });
let share_id = wx.getStorageSync('share_id'); //记录分享者的user_id
let invites_id = wx.getStorageSync('invites_id'); //记录邀请者的user_id
if (share_id) {
http.getData(apis.shareAdd, 'GET', {
user_id: share_id
}, (res) => {}, false, false, true);
}
if (invites_id) {
http.getData(apis.invitesAdd, 'GET', {
user_id: invites_id
}, (res) => {}, false, false, true);
}
//登录环信帐号 //登录环信帐号
getApp().getImUser(); getApp().getImUser();
wx.switchTab({ wx.switchTab({
url: '/pages/tab/home/home' url: '/pages/tab/home/home'
}); });
} }
}, true); }, true);
......
pages/person/invitation/index.js
...@@ -67,20 +67,11 @@ Page({ ...@@ -67,20 +67,11 @@ Page({
*/ */
onShareAppMessage: function (res) { onShareAppMessage: function (res) {
let user_id = wx.getStorageSync('user_id');
return { return {
title: '邀请好友', title: '邀请好友',
success: function (res) { path: "/pages/person/auth/index?from=share&user_id=" + user_id
if (res.errMsg == 'shareAppMessage:ok') {
http.getData(apis.invitesAdd, 'GET', {
user_id: this.data.invitesInfo.user_id
}, (res) => {
if (res.errcode === 0) {
}
}, false, false, true);
}
},
path: "/pages/person/invitation/index",
} }
}, },
......
pages/person/setting/index.js
...@@ -65,9 +65,9 @@ Page({ ...@@ -65,9 +65,9 @@ Page({
*/ */
toUrl: function (e) { toUrl: function (e) {
if (e.target.dataset.url) { if (e.currentTarget.dataset.url) {
wx.navigateTo({ wx.navigateTo({
url: e.target.dataset.url url: e.currentTarget.dataset.url
}) })
} }
......
pages/person/welfare/index.js
...@@ -68,23 +68,14 @@ Page({ ...@@ -68,23 +68,14 @@ Page({
*/ */
onShareAppMessage: function (res) { onShareAppMessage: function (res) {
let user_id = wx.getStorageSync('user_id');
return { return {
title: '每日分享', title: '每日分享',
imageUrl: '/res/images/imgs/re.png', path: "/pages/person/auth/index?from=share&user_id=" + user_id
path: "/pages/person/invitation/index",
success: function (res) {
if (res.errMsg == 'shareAppMessage:ok') {
http.getData(apis.shareAdd, 'GET', {
user_id: wx.getStorageSync('user_id')
}, (res) => {
if (res.errcode === 0) {
}
}, true, false, true);
}
}
} }
}, },
/** /**
* 获取数据 * 获取数据
......
pages/tab/home/home.js
...@@ -32,7 +32,7 @@ Page({ ...@@ -32,7 +32,7 @@ Page({
// wx.setStorageSync('homeToken', 1) // wx.setStorageSync('homeToken', 1)
// }; // };
getApp().globalData.bus.on('addXj', () => { getApp().globalData.bus.on('addXj', () => {
if(me.data.xb == 1){ if (me.data.xb == 1) {
me.getData(); me.getData();
} }
}) })
...@@ -201,13 +201,19 @@ Page({ ...@@ -201,13 +201,19 @@ Page({
url: '/pages/search/index/index', url: '/pages/search/index/index',
}) })
}, },
toWelfare: function () {
if (judgeToken(true)) {
wx.navigateTo({
url: "/pages/person/welfare/index"
})
}
},
toXj: function () { toXj: function () {
if (judgeToken(true)) { if (judgeToken(true)) {
wx.navigateTo({ wx.navigateTo({
url: "/pages/form/xj/index" url: "/pages/form/xj/index"
}) })
} }
}, },
fbGood: function () { fbGood: function () {
if (judgeToken(true)) { if (judgeToken(true)) {
......
pages/tab/home/home.wxml
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<image src="/res/images/icons/home-s-3.png" class="img"></image> <image src="/res/images/icons/home-s-3.png" class="img"></image>
<text class="text">发布商品</text> <text class="text">发布商品</text>
</view> </view>
<view class="function-item column verCenter"> <view class="function-item column verCenter" bindtap="toWelfare">
<image src="/res/images/icons/home-s-4.png" class="img"></image> <image src="/res/images/icons/home-s-4.png" class="img"></image>
<text class="text">福利中心</text> <text class="text">福利中心</text>
</view> </view>
......
pages/tab/me/me.js
...@@ -108,17 +108,18 @@ Page({ ...@@ -108,17 +108,18 @@ Page({
if (e.currentTarget.dataset.type == 'certification') { if (e.currentTarget.dataset.type == 'certification') {
if (this.data.userInfo.auth_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"
}); });
} else if (this.data.userInfo.auth_status == -1) {
//取消认证
wx.navigateTo({
url: "/pages/person/certification/addcertification/index"
});
} else { } else {
wx.navigateTo({ wx.navigateTo({
url: "/pages/person/certification/certificationmanage/index" url: "/pages/person/certification/certificationmanage/index"
}); });
} }
} }
......
project.config.json
...@@ -219,6 +219,49 @@ ...@@ -219,6 +219,49 @@
"id": -1, "id": -1,
"name": "pages/person/helpfriend/index", "name": "pages/person/helpfriend/index",
"pathName": "pages/person/helpfriend/index", "pathName": "pages/person/helpfriend/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/person/auth/index",
"pathName": "pages/person/auth/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/person/welfare/index",
"pathName": "pages/person/welfare/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/person/auth/index",
"pathName": "pages/person/auth/index",
"query": "from=share&user_id=123",
"scene": null
},
{
"id": -1,
"name": "pages/tab/home/home",
"pathName": "pages/tab/home/home",
"query": "from=share&user_id=123",
"scene": null
},
{
"id": -1,
"name": "pages/person/auth/index",
"pathName": "pages/person/auth/index",
"query": "from=share&user_id=123",
"scene": null
},
{
"id": -1,
"name": "pages/person/certification/certificationmanage/index",
"pathName": "pages/person/certification/certificationmanage/index",
"query": "from=share&user_id=123",
"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