Skip to content

施宇 / icsalesProgram

Go to a project
Commit da07e575 by 施宇
Options

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

# Conflicts:
#	app.json
#	project.config.json
parents 21ca4b84 8739df1a
Inline Side-by-side
Showing with 440 additions and 19 deletions
app.json
......@@ -32,7 +32,8 @@
"pages/person/editcompany/index",
"pages/person/welfare/index",
"pages/form/rate/index",
"pages/detail/company/index"
"pages/detail/company/index",
"pages/person/exchange/index"
],
"window": {
"backgroundTextStyle": "light",
......
pages/person/exchange/index.js 0 → 100644
// pages/person/exchange/index.js
Page({
/**
* 页面的初始数据
*/
data: {
tabIndex: 1
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
},
/**
* tab切换
*/
switchTab: function (e) {
let i = e.currentTarget.dataset.index;
if (i == this.data.tabIndex) {
return;
} else {
this.setData({
tabIndex: i,
})
}
}
})
\ No newline at end of file
pages/person/exchange/index.json 0 → 100644
{
"usingComponents": {},
"navigationBarTitleText": "兑换记录"
}
\ No newline at end of file
pages/person/exchange/index.less 0 → 100644
.exchange {
.content {
.list {
height: 136rpx;
padding: 0 22rpx 0 27rpx;
.t1 {
color: #515559;
font-size: 32rpx;
font-weight: 600;
line-height: 45rpx;
margin-bottom: 13rpx;
}
.t2 {
color: #ADB6BF;
font-size: 22rpx;
line-height: 30rpx;
}
.t2s{
color: #EA1717;
font-size: 22rpx;
line-height: 30rpx;
}
.t3 {
font-size: 38rpx;
font-weight: 600;
color: #515559;
}
.t4 {
font-size: 48rpx;
color: #515559;
}
.t5 {
font-size: 38rpx;
font-weight: 600;
color: #515559;
line-height: 53rpx;
}
.t6 {
font-size: 24rpx;
color: #8A9299;
}
}
}
.btn {
position: absolute;
bottom: 68rpx;
left: 0;
right: 0;
margin: 0 55rpx;
height: 98rpx;
line-height: 98rpx;
text-align: center;
background: rgba(13, 132, 209, 1);
box-shadow: 0px 6rpx 10rpx 0px rgba(97, 160, 242, 0.3);
border-radius: 8rpx;
.iconiconxiantiaoshouji28 {
font-size: 40rpx;
color: #fff;
margin-right: 8rpx;
}
.t1 {
font-size: 32rpx;
font-weight: 500;
color: #fff;
}
}
}
\ No newline at end of file
pages/person/exchange/index.wxml 0 → 100644
<view class="exchange" hover-class="none" hover-stop-propagation="false">
<view class="switch-tab-com row">
<view bindtap="switchTab" class="{{tabIndex == 1&&'active'}}" data-index="1">
<text>收入明细</text>
<text class="active-bg"></text>
</view>
<view bindtap="switchTab" class="{{tabIndex == 2&&'active'}}" data-index="2">
<text>兑换记录</text>
<text class="active-bg"></text>
</view>
</view>
<block wx:if="{{tabIndex == 1}}">
<view class="content">
<view class="list row verCenter bothSide boxsiz">
<view class="column">
<text class="t1">首次上传库存奖励</text>
<text class="t2">2019-05-10 10:15</text>
</view>
<view>
<text class="t3">+</text>
<text class="t4">￥0.05</text>
</view>
</view>
<view class="list row verCenter bothSide boxsiz">
<view class="column">
<text class="t1">首次上传库存奖励</text>
<text class="t2">2019-05-10 10:15</text>
</view>
<view>
<text class="t3">+</text>
<text class="t4">￥0.05</text>
</view>
</view>
<view class="list row verCenter bothSide boxsiz">
<view class="column">
<text class="t1">首次上传库存奖励</text>
<text class="t2">2019-05-10 10:15</text>
</view>
<view>
<text class="t3">+</text>
<text class="t4">￥0.05</text>
</view>
</view>
</view>
</block>
<block wx:else>
<view class="content">
<view class="list row verCenter bothSide boxsiz">
<view class="column">
<text class="t1">话费充值</text>
<text class="t2">2019-05-10 10:15</text>
</view>
<view class="t6">
15012479484
</view>
<view class="column">
<text class="t5">￥50</text>
<text class="t2">充值成功</text>
</view>
</view>
<view class="list row verCenter bothSide boxsiz">
<view class="column">
<text class="t1">话费充值</text>
<text class="t2">2019-05-10 10:15</text>
</view>
<view class="t6">
15012479484
</view>
<view class="column">
<text class="t5">￥50</text>
<text class="t2s">充值失败</text>
</view>
</view>
</view>
</block>
<view class="btn">
<text class="icon iconfont iconiconxiantiaoshouji28"></text>
<text class="t1">体现兑换</text>
</view>
</view>
\ No newline at end of file
pages/person/exchange/index.wxss 0 → 100644
.exchange .content .list {
height: 136rpx;
padding: 0 22rpx 0 27rpx;
}
.exchange .content .list .t1 {
color: #515559;
font-size: 32rpx;
font-weight: 600;
line-height: 45rpx;
margin-bottom: 13rpx;
}
.exchange .content .list .t2 {
color: #ADB6BF;
font-size: 22rpx;
line-height: 30rpx;
}
.exchange .content .list .t2s {
color: #EA1717;
font-size: 22rpx;
line-height: 30rpx;
}
.exchange .content .list .t3 {
font-size: 38rpx;
font-weight: 600;
color: #515559;
}
.exchange .content .list .t4 {
font-size: 48rpx;
color: #515559;
}
.exchange .content .list .t5 {
font-size: 38rpx;
font-weight: 600;
color: #515559;
line-height: 53rpx;
}
.exchange .content .list .t6 {
font-size: 24rpx;
color: #8A9299;
}
.exchange .btn {
position: absolute;
bottom: 68rpx;
left: 0;
right: 0;
margin: 0 55rpx;
height: 98rpx;
line-height: 98rpx;
text-align: center;
background: #0d84d1;
box-shadow: 0px 6rpx 10rpx 0px rgba(97, 160, 242, 0.3);
border-radius: 8rpx;
}
.exchange .btn .iconiconxiantiaoshouji28 {
font-size: 40rpx;
color: #fff;
margin-right: 8rpx;
}
.exchange .btn .t1 {
font-size: 32rpx;
font-weight: 500;
color: #fff;
}
pages/person/welfare/index.less
This diff could not be displayed because it is too large.
pages/person/welfare/index.wxml
......@@ -26,6 +26,78 @@
</view>
</view>
<view class="list">
<view class="list-wrap row verCenter bothSide bor">
<view>
<view>
<text class="t1">邀请好友</text>
<text class="icon iconfont iconiconxiantiaoshouji27"></text>
<text class="t2">立得三元</text>
</view>
<view>
<text class="t3">限时活动，邀请好友注册立得三元红包</text>
</view>
</view>
<view class="btn blue">去邀请</view>
</view>
<view class="list-wrap row verCenter bothSide bor">
<view>
<view>
<text class="t1">每日上传商品</text>
<text class="icon iconfont iconiconxiantiaoshouji27"></text>
<text class="t2">最高88元红包</text>
</view>
<view>
<text class="t3">每日首次上传商品，得随机红包奖励</text>
</view>
</view>
<view class="btn blue">去上传</view>
</view>
<view class="list-wrap row verCenter bothSide">
<view>
<view>
<text class="t1">输入红包码</text>
<text class="icon iconfont iconiconxiantiaoshouji27"></text>
<text class="t2">随机红包</text>
</view>
<view>
<text class="t3">领取好友红包，每个用户限领一次</text>
</view>
</view>
<view class="btn blue">去兑换</view>
</view>
<view class="hr"></view>
<view class="list-wrap row verCenter bothSide bor">
<view>
<view>
<text class="t1">天天签到领金币</text>
</view>
<view>
<text class="t3">领取好友红包，每个用户限领一次。</text>
</view>
</view>
<view class="btn yellow">签到</view>
</view>
<view class="list-wrap row verCenter bothSide bor">
<view>
<view>
<text class="t1">每日分享</text>
</view>
<view>
<text class="t3">每日首次分享，被好友点击后可获得奖励</text>
</view>
</view>
<view class="btn yellow">去分享</view>
</view>
<view class="list-wrap row verCenter bothSide">
<view>
<view>
<text class="t1">每日报价</text>
</view>
<view>
<text class="t3">每日首次回复报价，可获得奖励</text>
</view>
</view>
<view class="btn yellow">去报价</view>
</view>
</view>
</view>
\ No newline at end of file
pages/person/welfare/index.wxss
......@@ -75,5 +75,57 @@
margin-right: 8rpx;
}
.welfare .list {
padding: 0 24rpx 0 34rpx;
margin-top: 44rpx;
padding-bottom: 100rpx;
}
.welfare .list .hr {
height: 10rpx;
background: #F5F9FC;
}
.welfare .list .list-wrap {
height: 154rpx;
padding: 0 24rpx 0 0;
margin-left: 24rpx;
}
.welfare .list .list-wrap .t1 {
font-size: 28rpx;
font-weight: 600;
color: #515559;
}
.welfare .list .list-wrap .t2 {
font-size: 26rpx;
color: #EA1717;
font-weight: 400;
}
.welfare .list .list-wrap .t3 {
margin-top: 14rpx;
font-size: 24rpx;
color: #8A9299;
line-height: 33rpx;
}
.welfare .list .list-wrap .iconiconxiantiaoshouji27 {
margin-left: 24rpx;
margin-right: 5rpx;
font-size: 40rpx;
color: #EA4343;
}
.welfare .list .list-wrap .btn {
width: 150rpx;
height: 48rpx;
border-radius: 24rpx;
line-height: 48rpx;
text-align: center;
font-size: 24rpx;
color: #fff;
}
.welfare .list .list-wrap .btn.blue {
background: linear-gradient(143deg, #61a0f2 0%, #0d84d1 100%);
box-shadow: 0px 10rpx 20rpx 0rpx rgba(97, 160, 242, 0.4);
}
.welfare .list .list-wrap .btn.yellow {
background: linear-gradient(143deg, #eaa217 0%, #ff6327 100%);
box-shadow: 0px 10rpx 20rpx 0rpx rgba(242, 191, 97, 0.4);
}
.welfare .list .list-wrap.bor {
border-bottom: 1px solid #F5F9FC;
}
project.config.json
......@@ -114,24 +114,11 @@
"scene": null
},
{
"id": -1,
"name": "pages/person/welfare/index",
"pathName": "pages/person/welfare/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/form/rate/index",
"pathName": "pages/form/rate/index",
"id": 9,
"name": "pages/person/exchange/index",
"pathName": "pages/person/exchange/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/detail/company/index",
"pathName": "pages/detail/company/index",
"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