Skip to content

施宇 / icsalesProgram

Go to a project
Commit 1a8f2e77 by 施宇
Options

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

# Conflicts:
#	pages/form/xj/index.wxml
parents 21094872 4a36b75e
Inline Side-by-side
Showing with 119 additions and 50 deletions
pages/detail/chat/index.wxml
......@@ -4,7 +4,7 @@
<view class="tip row bothSide verCenter {{isShowTip?'':'noheight'}}">
<view class="tip-left row verCenter">
<text class="icon iconfont iconiconxiantiaoshouji12 tip-icon"></text>
<text class="tip-c">如实填写申诉信息，以便客服人员进行判断！</text>
<text class="tip-c">请如实填写申诉内容，以便工作人员审查</text>
</view>
<text class="icon iconfont iconiconxiantiaoshouji13 close-icon" bindtap="closeTip"></text>
</view>
......
pages/form/bj/index.wxml
......@@ -3,7 +3,7 @@
<view class="tip row bothSide verCenter {{isShowTip?'':'noheight'}}">
<view class="tip-left row verCenter">
<text class="icon iconfont iconiconxiantiaoshouji12 tip-icon"></text>
<text class="tip-c">请回复真实价格，否则将会影响您的排名</text>
<text class="tip-c">请回复真实价格，更容易被采纳</text>
</view>
<text class="icon iconfont iconiconxiantiaoshouji13 close-icon" bindtap="closeTip"></text>
</view>
......
pages/form/good/index.wxml
......@@ -3,7 +3,7 @@
<view class="tip row bothSide verCenter {{isShowTip?'':'noheight'}}">
<view class="tip-left row verCenter">
<text class="icon iconfont iconiconxiantiaoshouji12 tip-icon"></text>
<text class="tip-c">批量商品上传请到<text class="pc-url">www.icsales.com</text>操作</text>
<text class="tip-c">如需批量上传商品，请登录网页操作<text class="pc-url">www.icsales.com</text></text>
</view>
<text class="icon iconfont iconiconxiantiaoshouji13 close-icon" bindtap="closeTip"></text>
</view>
......@@ -16,7 +16,7 @@
<image src="{{imgUrl}}" class="img"></image>
<text class="icon iconfont iconiconxiantiaoshouji7 deleteImg" bindtap="deleteImg"></text>
</view>
<view class="text">据说上传图片更容易被采纳报价</view>
<view class="text">上传真实商品图片更利于排名靠前</view>
</view>
<form bindsubmit="formSubmit">
<view class="form-item row verCenter">
......
pages/form/xj/index.wxml
......@@ -3,7 +3,7 @@
<view class="tip row bothSide verCenter {{isShowTip?'':'noheight'}}">
<view class="tip-left row verCenter">
<text class="icon iconfont iconiconxiantiaoshouji12 tip-icon"></text>
<text class="tip-c">请提供真实的商品信息和图片，有助于使搜索排名靠前</text>
<text class="tip-c">完整的求购信息更利于他人回复真实精准的报价</text>
</view>
<text class="icon iconfont iconiconxiantiaoshouji13 close-icon" bindtap="closeTip"></text>
</view>
......@@ -16,7 +16,7 @@
<image src="{{imgUrl}}" class="img"></image>
<text class="icon iconfont iconiconxiantiaoshouji7 deleteImg" bindtap="deleteImg"></text>
</view>
<view class="text">据说上传图片更容易让人报价</view>
<view class="text">上传真实商品图片能增加回复率</view>
</view>
<form bindsubmit="formSubmit">
<view class="form-item row verCenter">
......
pages/person/certification/addcertification/index.js
......@@ -18,7 +18,7 @@ Page({
index: 0,
companyType: [{
id: 1,
name: '贸易商'
name: '经销商'
}, {
id: 2,
name: '代理商'
......@@ -30,7 +30,8 @@ Page({
name: '制造商'
}],
companyTypeText: '请选择经营性质',
placeholderText: '请输入公司名称',
placeholderText: '请输入营业执照上完整的公司名称',
tip: "请上传企业营业执照、商用租赁合同、相关证明资料等扫描图片或照片，所提交资料越详尽，审核通过越快（单张图片大小不超过2M)",
name: '',
imgSrc: '',
disabled: false,
......@@ -56,12 +57,23 @@ Page({
imgSrc: res.data.auth_img,
checked: res.data.auth_type,
companyTypeText: res.data.company_type_val,
placeholderText:res.data.auth_type == 1 ? '请输入个人名称':'请输入公司名称',
nameText:res.data.auth_type == 1 ? '个人名称':'公司名称',
placeholderText: res.data.auth_type == 1 ? '请输入姓名或昵称' : '请输入营业执照上完整的公司名称',
nameText: res.data.auth_type == 1 ? '个人名称' : '公司名称',
authInfo: res.data
});
if (res.data.auth_type == 1) {
this.setData({
tip: '请上传身份证、驾驶证、工牌、名片等扫描图片或照片，所提交资料越详尽，审核通过越快（单张图片大小不超过2M)'
});
} else {
this.setData({
tip: '请上传企业营业执照、商用租赁合同、相关证明资料等扫描图片或照片，所提交资料越详尽，审核通过越快（单张图片大小不超过2M)'
});
}
//选中经营性质
for (let i = 0; i < this.data.companyType.length; i++) {
......@@ -130,12 +142,14 @@ Page({
if (e.detail.value == 1) {
this.setData({
nameText: "个人名称",
placeholderText: '请输入个人名称'
placeholderText: '请输入姓名或昵称',
tip: '请上传身份证、驾驶证、工牌、名片等扫描图片或照片，所提交资料越详尽，审核通过越快（单张图片大小不超过2M)'
});
} else if (e.detail.value == 2) {
this.setData({
nameText: "公司名称",
placeholderText: '请输入公司名称'
placeholderText: '请输入营业执照上完整的公司名称',
tip: '请上传企业营业执照、商用租赁合同、相关证明资料等扫描图片或照片，所提交资料越详尽，审核通过越快（单张图片大小不超过2M)'
});
}
}
......
pages/person/certification/addcertification/index.less
......@@ -137,6 +137,7 @@
margin-top: 24rpx;
font-size: 24rpx;
color: #8A9299;
width: 80%;
}
}
......
pages/person/certification/addcertification/index.wxml
......@@ -2,7 +2,7 @@
<view class="prompt boxsiz row verCenter bothSide">
<view>
<text class="icon iconfont iconiconxiantiaoshouji12"></text>
<text class="t1">请如实填写认证信息，不符合的认证将被拒绝</text>
<text class="t1">请按要求提交真实认证信息，否则将审核不通过</text>
</view>
<view>
<text class="icon iconfont iconiconxiantiaoshouji13"></text>
......@@ -60,7 +60,7 @@
<text class="icon iconfont iconiconxiantiaoshouji7" bind:tap="deleteImg"></text>
</view>
</block>
<text class="txt">请上传名片/工作，任意材料，证明您的身份信息</text>
<text class="txt">{{tip}}</text>
</view>
<button class="btn" form-type="submit" disabled="{{disabled}}" loading="{{loading}}">提交认证</button>
</form>
......
pages/person/certification/addcertification/index.wxss
.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}
\ No newline at end of file
.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;width:80%}.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}
\ No newline at end of file
pages/person/welfare/index.js
......@@ -72,6 +72,7 @@ Page({
return {
title: '每日分享',
imageUrl: 'http://img.ichunt.com/images/ichunt/minProgram/d70d39f0d68d410b230bc7eb9da0140b.jpg',
path: "/pages/person/auth/index?from=share&user_id=" + user_id
}
......@@ -150,8 +151,8 @@ Page({
} else if (id == 4) {
} else if (id == 5) {
wx.navigateTo({
url: "/pages/list/qd/index"
wx.switchTab({
url: '/pages/list/qd/index'
})
} else if (id == 6) {
wx.navigateTo({
......
pages/person/withdrawal/index.js
......@@ -20,6 +20,7 @@ Page({
exchanging: false,
exchange_id: '',
weixin_exchange_info: {},
official_account_bind: '',
isShowTip: true
},
......@@ -78,6 +79,7 @@ Page({
if (this.data.weixin_exchange_info.exchange_id) {
return {
title: '好友助力',
imageUrl: 'http://img.ichunt.com/images/ichunt/minProgram/d70d39f0d68d410b230bc7eb9da0140b.jpg',
path: "/pages/person/helpfriend/index?exchange_id=" + this.data.weixin_exchange_info.exchange_id
}
}
......@@ -99,7 +101,8 @@ Page({
can_exchange: res.can_exchange,
mobile: res.mobile,
weixin_exchange_info: res.weixin_exchange_info,
exchange_id: res.weixin_exchange_info.exchange_id
exchange_id: res.weixin_exchange_info.exchange_id,
official_account_bind: res.official_account_bind
});
}
......@@ -142,7 +145,7 @@ Page({
},
/**
* 提现
* 提现（邀请好友）
*/
withdrawal: function (e) {
......@@ -188,11 +191,7 @@ Page({
});
}
}, true, false, true);
}
},
/**
* 关闭提示
......
pages/person/withdrawal/index.wxml
......@@ -47,23 +47,38 @@
<text class="t1">红包提现</text>
<text class="t2">账户红包:￥{{integral}}</text>
</view>
<view class="list row boxsiz">
<view class="list row boxsiz {{weixin_exchange_info.assist_count == 2 ? 'opacity':''}}">
<block wx:for="{{exchangeSettings}}" wx:key="item" wx:for-index="index">
<view class="wrap column rowCenter verCenter boxsiz {{index == indexOf ? 'curr':''}}" data-index="{{index}}" data-id="{{item.id}}" data-stock="{{item.stock}}" bind:tap="tab">
<text class="t1">{{item.name}}</text>
<text class="t2">剩余名额：{{item.stock}}</text>
</view>
<block wx:if="{{weixin_exchange_info.assist_count == 2}}">
<view class="wrap column rowCenter verCenter boxsiz {{index == indexOf ? 'curr':''}}" data-index="{{index}}" data-id="{{item.id}}" data-stock="{{item.stock}}">
<text class="t1">{{item.name}}</text>
<text class="t2">剩余名额：{{item.stock}}</text>
</view>
</block>
<block wx:else>
<view class="wrap column rowCenter verCenter boxsiz {{index == indexOf ? 'curr':''}}" data-index="{{index}}" data-id="{{item.id}}" data-stock="{{item.stock}}" bind:tap="tab">
<text class="t1">{{item.name}}</text>
<text class="t2">剩余名额：{{item.stock}}</text>
</view>
</block>
</block>
</view>
<block wx:if="{{weixin_exchange_info.exchanging == 0}}">
<button class="btn {{can_exchange == -1 || can_exchange == 0 ? 'opacity':''}}" bind:tap="withdrawal">
申请提现
</button>
<block wx:if="{{weixin_exchange_info.assist_count == 2}}">
<button class="btn">等待到账</button>
</block>
<block wx:else>
<button class="btns" open-type="share">分享给好友助力，可提现</button>
<block wx:if="{{weixin_exchange_info.exchanging == 0}}">
<button class="btn {{can_exchange == -1 || can_exchange == 0 ? 'opacity':''}}" bind:tap="withdrawal">
申请提现
</button>
</block>
<block wx:else>
<button class="btns" open-type="share">分享给好友助力，可提现</button>
</block>
</block>
<block wx:if="{{weixin_exchange_info.exchanging != 0}}">
<text class="fr-txt">好友助力，已完成（{{weixin_exchange_info.assist_count}}/2）</text>
</block>
<text class="fr-txt">好友助力，已完成（{{weixin_exchange_info.assist_count}}/2）</text>
</view>
</block>
<view class="txt column">
......
pages/person/withdrawalsuccess/index.js
Page({
/**
* 页面的初始数据
*/
data: {
text_1: '话费兑换成功',
text_2: '话费预计将在24小时内充值到账！',
money: ''
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
let money = options.money;
if (money) {
this.setData({
text_1: '申请提现成功',
text_2: '预计将在24小时内充值到账！'
});
}
},
/**
......
pages/person/withdrawalsuccess/index.wxml
<view class="success column rowCenter verCenter">
<image src="/res/images/imgs/success.png" class="img"></image>
<text class="tit">话费兑换成功</text>
<text class="t1">话费预计将在24小时内充值到账！</text>
<text class="tit">{{text_1}}</text>
<text class="t1">{{text_2}}</text>
<navigator url="/pages/person/welfare/index" class="btn">
返回福利中心
</navigator>
......
pages/tab/home/home.wxml
......@@ -2,7 +2,7 @@
<view class="home-view">
<view class="search-section">
<text class="icon iconfont iconiconxiantiaoshouji8"></text>
<input placeholder='请输入芯片型号' placeholder-class="placeholderClass" bindtap="toSearch" disabled></input>
<input placeholder='输入型号，搜一下' placeholder-class="placeholderClass" bindtap="toSearch" disabled></input>
</view>
<view class="home-content">
<view class="home-function bothSide row">
......
pages/tab/message/message.wxml
......@@ -8,7 +8,7 @@
<view class="tip row bothSide verCenter {{isShowTip?'':'noheight'}}">
<view class="tip-left row verCenter">
<text class="icon iconfont iconiconxiantiaoshouji12 tip-icon"></text>
<text class="tip-c">风险提示文字风险提示文字风险提示文字风险</text>
<text class="tip-c">请确认对方真实有效信息，勿轻易转帐及发货，操作需谨慎!</text>
</view>
<text class="icon iconfont iconiconxiantiaoshouji13 close-icon" bindtap="closeTip"></text>
</view>
......
project.config.json
......@@ -310,6 +310,35 @@
"id": -1,
"name": "pages/person/agreement/index",
"pathName": "pages/person/agreement/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/person/withdrawal/index",
"pathName": "pages/person/withdrawal/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/person/withdrawalsuccess/index",
"pathName": "pages/person/withdrawalsuccess/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/person/withdrawalsuccess/index",
"pathName": "pages/person/withdrawalsuccess/index",
"query": "money=10",
"scene": null
},
{
"id": -1,
"name": "pages/person/withdrawalsuccess/index",
"pathName": "pages/person/withdrawalsuccess/index",
"query": "money=10",
"scene": null
}
]
......
utils/api.js
......@@ -173,8 +173,8 @@ const apis = {
*/
userSetmsg: user_url + "/user/setmsg",
/***
* 账户隐私项设置
*/
* 账户隐私项设置
*/
userSetprivacy: user_url + "/user/setprivacy",
/***
* 账户设置
......@@ -193,8 +193,8 @@ const apis = {
*/
countBusiness: user_url + '/count/business',
/**
* 获取别人的数量统计
*/
* 获取别人的数量统计
*/
countUserBusiness: user_url + '/count/user/business',
/**
* 获取会员系统通知
......@@ -261,8 +261,8 @@ const apis = {
*/
evaluateList: user_url + '/evaluate/list',
/**
* 评价列表(其他用户,根据user_id获取)
*/
* 评价列表(其他用户,根据user_id获取)
*/
evaluateUserList: user_url + '/evaluate/user/list',
/**
* 新增评价
......@@ -331,7 +331,11 @@ const apis = {
/**
* 添加好友助力
*/
assistsAdd: welfare_url + '/assists/add'
assistsAdd: welfare_url + '/assists/add',
/**
* 确认兑换接口
*/
userExchangesConfirm: welfare_url + '/user_exchanges/exchange/confirm'
}
......
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