Commit eb7caaef by 施宇

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

# Conflicts:
#	app.json
#	project.config.json
parents 08247a96 a98951c6
......@@ -37,7 +37,13 @@
"pages/list/rate/index",
"pages/list/ratemanage/index",
"pages/form/appeal/index",
"pages/list/signin/index"
"pages/list/signin/index",
"pages/person/withdrawal/index",
"pages/person/withdrawalsuccess/index",
"pages/person/integralrule/index",
"pages/person/packet/index",
"pages/person/invitation/index",
"pages/person/invitationrecord/index"
],
"window": {
"backgroundTextStyle": "light",
......
......@@ -53,6 +53,18 @@ image {
align-items: center;
}
.boxFlex{
-webkit-box-flex: 1;
-moz-box-flex: 1;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
}
.tc{
text-align: center;
}
/*复用样式*/
/* 公共导航切换样式 */
.switch-tab-com {
......
......@@ -75,6 +75,6 @@
</block>
<view class="btn">
<text class="icon iconfont iconiconxiantiaoshouji28"></text>
<text class="t1">现兑换</text>
<text class="t1">现兑换</text>
</view>
</view>
\ No newline at end of file
// pages/person/integralrule/index.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
{
"usingComponents": {},
"navigationBarTitleText": "积分规则"
}
\ No newline at end of file
<view class="agreement">
<text class="t1">本协议是您与猎芯网(简称"本站",网址:http://www.ichunt.com)所有者(以下简称为"猎芯网")之间就猎芯网服务等相关事宜所订立的契约,请您仔细阅读本注册协议,您点击"下一步"按钮后,本协议即构成对双方有约束力的法律文件。</text>
</view>
\ No newline at end of file
.agreement{
padding: 34rpx 55rpx 0 55rpx;
}
.agreement .t1{
font-size: 26rpx;
color: #8A9299;
line-height:30px;
text-align: justify;
}
\ No newline at end of file
// pages/person/invitation/index.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
{
"usingComponents": {},
"navigationBarTitleText": "邀请好友"
}
\ 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="prompt boxsiz row verCenter bothSide">
<view>
<text class="icon iconfont iconiconxiantiaoshouji12"></text>
<text class="t1">1501****484 刚刚邀请好友获得5元红包</text>
</view>
<view>
<text class="icon iconfont iconiconxiantiaoshouji13"></text>
</view>
</view>
<view class="head">
<view class="wrap column rowCenter verCenter">
<text class="t1">邀请好友立赚</text>
<text class="t2">10元最高</text>
</view>
<view class="show-text row verCenter rowCenter">
<view class="column boxFlex tc">
<text class="t1">邀请人数</text>
<text class="t2 mt">12</text>
<text class="t3">邀请记录</text>
</view>
<view class="column boxFlex tc">
<text class="t1">获得红包</text>
<view class="mt">
<text class="t2">0.00</text>
<text class="t1">元</text>
</view>
<text class="t3">立即提现</text>
</view>
</view>
</view>
<button class="btn">立即邀请赚钱</button>
<view class="show-ico row verCenter avarage">
<view class="column">
<text class="icon iconfont iconjuxing6"></text>
<text class="t1">分享专属链接</text>
</view>
<view class="column">
<text class="icon iconfont iconjuxing7"></text>
<text class="t1">好友点击链接 并完成注册</text>
</view>
<view class="column">
<text class="icon iconfont iconjuxing1"></text>
<text class="t1">您和好友均 获得红包</text>
</view>
</view>
<view class="txt column">
<text class="tit">邀请提示:</text>
<text class="t1">·分享至3个以上微信群/QQ群,邀请成功的几率提升150%</text>
<text class="t1">·可告诉您的朋友,注册可领最高10元红包,并可立即提现。</text>
<text class="t1">·好友必须为IC业务助手新注册用户,才能邀请成功。</text>
</view>
</view>
\ No newline at end of file
This diff could not be displayed because it is too large.
// pages/person/invitationrecord/index.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
{
"usingComponents": {},
"navigationBarTitleText": "邀请记录"
}
\ No newline at end of file
.invitationrecord {
.wrap {
height: 136rpx;
padding: 0 24rpx 0 0;
margin-left: 24rpx;
.t1 {
font-size: 32rpx;
font-weight: 600;
color: #515559;
margin-bottom: 13rpx;
}
.t2 {
font-size: 22rpx;
color: #ADB6BF;
}
.t3 {
font-size: 38rpx;
color: #515559;
font-weight: 600;
}
.t4 {
font-size: 48rpx;
color: #515559;
}
&.bor {
border-bottom: 1px solid #F5F9FC;
}
}
}
\ No newline at end of file
<view class="invitationrecord" hover-class="none" hover-stop-propagation="false">
<view class="wrap row bothSide verCenter bor">
<view class="column">
<text class="t1">深圳市猎芯科技有限公司</text>
<text class="t2">2019-05-10 10:15</text>
</view>
<view class="row verCenter">
<text class="t3">+</text>
<text class="t4">¥0.05</text>
</view>
</view>
<view class="wrap row bothSide verCenter bor">
<view class="column">
<text class="t1">深圳市猎芯科技有限公司</text>
<text class="t2">2019-05-10 10:15</text>
</view>
<view class="row verCenter">
<text class="t3">+</text>
<text class="t4">¥0.05</text>
</view>
</view>
</view>
\ No newline at end of file
.invitationrecord .wrap {
height: 136rpx;
padding: 0 24rpx 0 0;
margin-left: 24rpx;
}
.invitationrecord .wrap .t1 {
font-size: 32rpx;
font-weight: 600;
color: #515559;
margin-bottom: 13rpx;
}
.invitationrecord .wrap .t2 {
font-size: 22rpx;
color: #ADB6BF;
}
.invitationrecord .wrap .t3 {
font-size: 38rpx;
color: #515559;
font-weight: 600;
}
.invitationrecord .wrap .t4 {
font-size: 48rpx;
color: #515559;
}
.invitationrecord .wrap.bor {
border-bottom: 1px solid #F5F9FC;
}
// pages/person/packet/index.js
Page({
/**
* 页面的初始数据
*/
data: {
isShow: true
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
},
/**
* 关闭弹出层
*/
isShow: function () {
this.setData({
isShow: false
});
}
})
\ No newline at end of file
{
"usingComponents": {},
"navigationBarTitleText": "红包码"
}
\ No newline at end of file
This diff could not be displayed because it is too large.
<view class="packet" hover-class="none" hover-stop-propagation="false">
<view class="head">
<view class="wrap column rowCenter verCenter">
<text class="t1">输入好友的红包码</text>
<text class="t2">领取随机红包</text>
</view>
<view class="inp">
<input type="text" placeholder="请输入红包码" class="inpt" placeholder-class="plac"></input>
</view>
</view>
<button class="btn">兑换好友红包</button>
<view class="txt column">
<text class="tit">温馨提示:</text>
<text class="t1">1.红包码可向已注册好友索要,填写后可获得随机红包。</text>
<text class="t1">2.一个账户红包码仅限兑换一次,多次兑换无效。</text>
<text class="t1">3.本活动最终解释权归深圳市电界网络科技有限公司所有。</text>
</view>
</view>
<!-- 弹出层 -->
<view wx:if="{{isShow}}" class="layer-mask column verCenter rowCenter" hover-class="none" hover-stop-propagation="false">
<view class="layer column verCenter rowCenter">
<cover-image class="im" src="/res/images/imgs/ss.png"></cover-image>
<text class="t1">恭喜您</text>
<text class="t2">获得</text>
<view class="mt">
<text class="t3">0.06</text>
<text class="t4">元</text>
</view>
<view class="btn">收下红包</view>
<view class="close row rowCenter verCenter" bind:tap="isShow">
<text class="icon iconfont iconiconxiantiaoshouji13"></text>
</view>
</view>
</view>
\ No newline at end of file
This diff could not be displayed because it is too large.
// pages/person/withdrawal/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.id;
if (i == 1) {
this.setData({
tabIndex: 1
});
} else if (i == 2) {
this.setData({
tabIndex: 2
});
}
}
})
\ No newline at end of file
{
"usingComponents": {},
"navigationBarTitleText": "提现兑换"
}
\ No newline at end of file
<view class="withdrawal" hover-class="none" hover-stop-propagation="false">
<view class="prompt boxsiz row verCenter bothSide">
<view>
<text class="icon iconfont iconiconxiantiaoshouji12"></text>
<text class="t1">金币兑换充值后无法更改,请核对充值账号</text>
</view>
<view>
<text class="icon iconfont iconiconxiantiaoshouji13"></text>
</view>
</view>
<view class="withdrawal-tab row verCenter rowCenter">
<view class="boxFlex row verCenter rowCenter {{tabIndex == '1' ? 'curr-l':''}}" bind:tap="switchTab" data-id="1">
<text class="icon iconfont iconjuxing"></text>
<text class="t1">兑换话费</text>
</view>
<view class="boxFlex row verCenter rowCenter {{tabIndex == '2' ? 'curr-r':''}}" bind:tap="switchTab" data-id="2">
<text class="icon iconfont iconjuxing1"></text>
<text class="t1">红包提现</text>
</view>
</view>
<block wx:if="{{tabIndex == '1'}}">
<view class="content">
<view class="inp boxsiz row bothSide verCenter">
<view class="boxFlex">
<input type="text" placeholder="" value="15012479484" class="inpt"></input>
</view>
<text class="boxFlex t1">默认注册号码</text>
</view>
<view class="bar boxsiz row verCenter">
<text class="t1">兑换话费</text>
<text class="t2">账户红包:¥10.94</text>
</view>
<view class="list row avarage boxsiz">
<view class="wrap column rowCenter verCenter">
<text class="t1">10元</text>
<text class="t2">剩余名额:10</text>
</view>
<view class="wrap column rowCenter verCenter">
<text class="t1">20元</text>
<text class="t2">剩余名额:20</text>
</view>
<view class="wrap column rowCenter verCenter">
<text class="t1">30元</text>
<text class="t2">剩余名额:20</text>
</view>
<view class="wrap column rowCenter verCenter">
<text class="t1">50元</text>
<text class="t2">剩余名额:20</text>
</view>
<view class="wrap column rowCenter verCenter">
<text class="t1">100元</text>
<text class="t2">剩余名额:20</text>
</view>
<view class="wrap column rowCenter verCenter">
<text class="t1">200元</text>
<text class="t2">剩余名额:20</text>
</view>
</view>
<button class="btn">立即兑换</button>
</view>
</block>
<block wx:elif="{{tabIndex == '2'}}">
<view class="content">
<view class="bar boxsiz row verCenter">
<text class="t1">红包提现</text>
<text class="t2">账户红包:¥10.94</text>
</view>
<view class="list row avarage boxsiz">
<view class="wrap column rowCenter verCenter">
<text class="t1">1元</text>
<text class="t2">剩余名额:10</text>
</view>
<view class="wrap column rowCenter verCenter">
<text class="t1">5元</text>
<text class="t2">剩余名额:20</text>
</view>
<view class="wrap column rowCenter verCenter">
<text class="t1">10元</text>
<text class="t2">剩余名额:20</text>
</view>
<view class="wrap column rowCenter verCenter">
<text class="t1">20元</text>
<text class="t2">剩余名额:20</text>
</view>
<view class="wrap column rowCenter verCenter">
<text class="t1">50元</text>
<text class="t2">剩余名额:20</text>
</view>
<view class="wrap column rowCenter verCenter">
<text class="t1">100元</text>
<text class="t2">剩余名额:20</text>
</view>
</view>
<button class="btn">申请提现</button>
<text class="fr-txt">好友助力,已完成(2/2)</text>
</view>
</block>
<view class="txt column">
<text class="tit">温馨提示:</text>
<text class="t1">1.提现申请将在1~3个工作日内审批到账,请耐心等待。</text>
<text class="t1">2.金币可累计,并提现至绑定的微信账户。</text>
<text class="t1">3.本活动如发现恶意操作,可拒绝提现申请。</text>
<text class="t1">4.金币有效期为1年,逾期将自动失效。</text>
<text class="t1">5.本活动最终解释权归深圳市电界网络科技有限公司所有。</text>
</view>
</view>
\ No newline at end of file
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
{
"usingComponents": {},
"navigationBarTitleText": "兑换成功"
}
\ No newline at end of file
.success {
width: 100%;
padding-top: 50rpx;
.img {
width: 480rpx;
height: 346rpx;
}
.tit {
padding-top: 40rpx;
font-size: 48rpx;
color: #2e3033;
line-height: 67rpx;
font-weight: 600;
display: block;
}
.btn {
width: 87%;
height: 98rpx;
line-height: 98rpx;
background: rgba(13, 132, 209, 1);
box-shadow: 0px 6px 10px 0px rgba(97, 160, 242, 0.3);
border-radius: 8px;
font-size: 32rpx;
color: #ffffff;
text-align: center;
display: block;
}
.t1 {
margin-top: 14rpx;
margin-bottom: 80rpx;
font-size: 26rpx;
color: #8a9299;
}
}
\ No newline at end of file
<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>
<navigator url="/pages/person/welfare/index" class="btn">
返回福利中心
</navigator>
</view>
\ No newline at end of file
.success {
width: 100%;
padding-top: 50rpx;
}
.success .img {
width: 480rpx;
height: 346rpx;
}
.success .tit {
padding-top: 40rpx;
font-size: 48rpx;
color: #2e3033;
line-height: 67rpx;
font-weight: 600;
display: block;
}
.success .btn {
width: 87%;
height: 98rpx;
line-height: 98rpx;
background: #0d84d1;
box-shadow: 0px 6px 10px 0px rgba(97, 160, 242, 0.3);
border-radius: 8px;
font-size: 32rpx;
color: #ffffff;
text-align: center;
display: block;
}
.success .t1 {
margin-top: 14rpx;
margin-bottom: 80rpx;
font-size: 26rpx;
color: #8a9299;
}
......@@ -48,7 +48,7 @@
"list": []
},
"miniprogram": {
"current": 12,
"current": 16,
"list": [
{
"id": -1,
......@@ -121,23 +121,51 @@
"scene": null
},
{
"id": 10,
"name": "pages/list/ratemanage/index",
"pathName": "pages/list/ratemanage/index",
"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/welfare/index",
"pathName": "pages/person/welfare/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/person/integralrule/index",
"pathName": "pages/person/integralrule/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/person/packet/index",
"pathName": "pages/person/packet/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/form/appeal/index",
"pathName": "pages/form/appeal/index",
"name": "pages/person/invitation/index",
"pathName": "pages/person/invitation/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/list/signin/index",
"pathName": "pages/list/signin/index",
"name": "pages/person/invitationrecord/index",
"pathName": "pages/person/invitationrecord/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