diff --git a/api/interfaces/user.js b/api/interfaces/user.js
index b4fc34c..d062ebb 100644
--- a/api/interfaces/user.js
+++ b/api/interfaces/user.js
@@ -59,7 +59,10 @@ const washcarBuy = (welfare_id, right_id, qty, address_id, is_deliver) => req({u
const washcarCreate = (welfare_id, right_id, qty, address_id, is_deliver) => req({url: "washcar/create", method: "POST", data:{welfare_id : welfare_id, right_id : right_id, qty : qty, address_id : address_id || '', is_deliver : is_deliver}})
// 我的分享
-const myshare = (parent_id) => req({url: "user/share",data:{parent_id : parent_id || ''}})
+const myshare = (channel,parent_id,url) => req({url: "user/share",data:{channel: channel,parent_id : parent_id || '', url: url}})
+
+// 我的分享-展示参数
+const wechatShares = () => req({url: "ajax/wechat_shares"})
// 我的推荐
const childs = (page) => req({url: "user/childs",data:{page : page || ''}})
@@ -118,6 +121,12 @@ const storedList = () => req({url: "shares/recharges"})
// 产品分享二维码+储值分享二维码
const publicCode = (channel, type, url) => req({url: "user/share/goods", data:{channel: channel, type : type, url: url}})
+// 订单收益列表
+const profits = (page) => req({url: "data/profits", data:{page : page || ''}})
+
+// 订单收益列表-下级明细
+const profitsNext = (order_type, order_id, page) => req({url: "data/profitlogs", data:{order_type : order_type, order_id : order_id, page : page || ''}})
+
export default({
index,
mobiles,
@@ -139,6 +148,7 @@ export default({
washcarBuy,
washcarCreate,
myshare,
+ wechatShares,
childs,
ajaxTel,
transfers,
@@ -158,5 +168,7 @@ export default({
productInfo,
productPoster,
storedList,
- publicCode
+ publicCode,
+ profits,
+ profitsNext
})
diff --git a/app.js b/app.js
index 6a88e2a..6f5f76c 100644
--- a/app.js
+++ b/app.js
@@ -9,7 +9,10 @@ var QQMapWX = require('utils/qqmap-wx-jssdk.min.js');
var qqmapsdk;
App({
- onLaunch() {
+ onLaunch(e) {
+ // 获取打开场景值
+ this.globalData.scene = e.scene
+
// 沃支付是否开启
api.index.woPayment().then(res=>{
this.globalData.unicomPay = res.data.unicom_pay
@@ -61,6 +64,7 @@ App({
wx.$api = api
},
globalData: {
+ scene : '',
isUser : false,
userInfo : null,
token : "",
@@ -72,6 +76,11 @@ App({
adcode : '',
longitude : '',
latitude : '',
- unicomPay : false
+ unicomPay : '',
+ shareObj : {
+ type : '',
+ goodsId : '',
+ userId : ''
+ }
}
})
\ No newline at end of file
diff --git a/app.json b/app.json
index 23e98bf..edf7963 100644
--- a/app.json
+++ b/app.json
@@ -45,7 +45,8 @@
"pages/userGoods/userGoods",
"pages/userGoods/goodsCode/goodsCode",
"pages/userGoods/goodsDet/goodsDet",
- "pages/cashier/cashier"
+ "pages/cashier/cashier",
+ "pages/myBalance/myBalance_list/myBalance_list"
],
"window": {
"backgroundTextStyle": "light",
diff --git a/pages/car/index.js b/pages/car/index.js
index cf6b480..d60f51d 100644
--- a/pages/car/index.js
+++ b/pages/car/index.js
@@ -25,21 +25,20 @@ Page({
score : '', //应付总积分
freight : '', //运费
welfareType : '', //权益类型
- noticeShow : false, //须知显示状态
+ noticeShow : true, //须知显示状态
addressShow : false, //收货地址显示
payWayIndex : 0,
- unicomPay : getApp().globalData.unicomPay //是否有沃支付
+ unicomPay : '' //是否有沃支付
},
/**
* 生命周期函数--监听页面加载
*/
onLoad (options) {
- console.log(getApp().globalData.unicomPay)
-
this.setData({
rightId : options.right_id,
- welfareId: options.welfare_id
+ welfareId: options.welfare_id,
+ unicomPay: getApp().globalData.unicomPay
})
// 获取卡券列表
diff --git a/pages/car/index.wxml b/pages/car/index.wxml
index 1023678..14195cc 100644
--- a/pages/car/index.wxml
+++ b/pages/car/index.wxml
@@ -1,118 +1,105 @@
-
-
-
- 等待买家付款
- 请您尽快下单购买
-
-
+
+
+
+ 共：{{num}}件商品
+ 实付：￥{{amount}}
+
+
-
-
-
-
-
-
-
- {{address.name}} {{address.mobile}}
-
- {{address.all_address}}
-
-
-
-
- 暂无收货地址
-
-
-
-
-
-
-
-
- {{detail.type == 'virtual' ? '券' : '实'}}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
{{detail.title}}
-
- 数量：x{{num}}
+
+
+
+
+
+
+
+
+ {{detail.title}}
+
+
+ ￥{{detail.price}}
+
+ -
+
+ +
+
+
+ {{detail.attribute.form_type}}
+ -￥{{score}}
+
+
+ {{detail.attribute.form_pay}}
+ ￥{{amount}}
+
+
+
-
-
-
- {{detail.attribute.form_price}}
-
-
- ￥{{moreAmount}}
-
-
-
- {{detail.attribute.form_type}}
- ￥{{score}}
-
-
- {{detail.attribute.form_pay}}
- ￥{{amount}}
-
-
-
- 运费
-
-
- ￥{{freight}}
-
-
-
-
-
-
-
-
- 购买数量
-
-
- -
- {{num}}
- +
-
-
-
-
-
-
-
- 请选择提交方式
-
-
-
- {{platformCp[platIndex].name}}
-
-
-
-
-
-
+
+
+
+ 提交方式
+
+
+
+ {{platformCp[platIndex].name}}
+
+
+
+
+
+
+
+
+
+
+ {{address.name}}{{address.mobile}}
+ {{address.all_address}}
+
+
+
+
+
+
+
+ 添加收货地址
+
+
+
+
+
+
+ 快递运费
+ ￥{{freight}}
+
+
+
-
-
- 请选择支付方式
-
+
+
@@ -129,12 +116,8 @@
-
-
-
+
+
@@ -159,14 +142,9 @@
-
-
- 实际付款￥{{amount}}
- 立即购买
-
-
+
请选择收货地址
diff --git a/pages/car/index.wxss b/pages/car/index.wxss
index 86ac0a1..9550886 100644
--- a/pages/car/index.wxss
+++ b/pages/car/index.wxss
@@ -1,226 +1,131 @@
-/* 下单状态 */
-.state {
- background: #2e71e3;
- padding: 30rpx 60rpx;
+
+.cont {
width: 100%;
- box-sizing: border-box;
- color: #fff;
- font-size: 26rpx;
- display: flex;
+ overflow: hidden;
}
-.state.active {
- padding: 30rpx 100rpx 60rpx;
-}
-.state-title {
- flex: 1;
- font-size: 32rpx;
-}
-
-.state-title text {
- opacity:.8;
- display: block;
- font-size: 28rpx;
- margin-top: 10rpx;
-}
-
-.state-img {
- width: 70rpx;
- height: 70rpx;
- margin-top: 10rpx;
-}
-
-/* 默认地址 */
-.content {
- padding: 0 30rpx;
- box-sizing: border-box;
- width: 100%;
- border-bottom: solid transparent 120rpx;
-}
-
-.site {
- background-color: #fff;
- margin-top: -30rpx;
- border-radius: 10rpx;
- padding: 30rpx;
- box-sizing: border-box;
- box-shadow: 0 0 10rpx rgba(0, 0, 0, .1);
-}
-
-.siteTips {
+/* 卡券权益 */
+.contBack {
+ position: relative;
+ width: 200%;
+ height: 340rpx;
+ left: -50%;
text-align: center;
+ background: #000000;
+ border-radius: 0 0 100% 100%;
+ overflow: hidden;
}
-.siteTips-tips {
- color: #2e71e3;
- border: #2e71e3 2rpx solid;
+.classBack {
+ position: absolute;
+ left: 28%;
+ right: 30%;
+ width: 44%;
+ top: 40rpx;
+}
+
+.classCircle {
+ position: relative;
+}
+
+.classCircle::after,
+.contBack::before {
+ position: absolute;
+ border-radius: 50%;
+ content: '';
+ z-index: 1;
+ background-color: rgba(255,255,255,.1);
+}
+
+.classCircle::after {
+ left: 20%;
+ top: -20rpx;
+ width: 260rpx;
+ height: 260rpx;
+}
+
+.contBack::before {
+ right: 20%;
+ top: 55%;
+ width: 300rpx;
+ height: 300rpx;
+}
+
+
+.welfareCont-top{
+ white-space: nowrap;
+ flex-direction: row;
+ align-items: center;
+ justify-content: space-around;
+ width: 100%;
+ padding: 0 10rpx;
+ box-sizing: border-box;
+ margin: 50rpx 0 20rpx;
+ height: 120rpx;
+}
+
+.welfareCont-list-img {
+ border-radius: 50%;
+ width: 120rpx;
+ height: 120rpx;
display: inline-block;
- font-size: 28rpx;
- line-height: 70rpx;
- padding: 0 20rpx;
- text-align: center;
- margin: 0 auto;
+ margin: 0 15rpx;
+ overflow: hidden;
}
-.siteTips-tips image {
- width: 32rpx;
- height: 32rpx;
- vertical-align: -5rpx;
- padding-right: 10rpx;
-}
-
-.siteCont {
- display: flex;
- position: relative;
-}
-
-.siteCont-right {
- width: calc(100% - 70rpx);
- margin-left: 30rpx;
-}
-
-.state-arrow {
- position: absolute;
- right: 0;
- top: 24rpx;
- width: 34rpx;
- height: 34rpx;
-}
-
-.siteCont-site {
- width: 40rpx;
- height: 40rpx;
- margin-top: 24rpx;
-}
-
-.site-text {
- margin-bottom: 10rpx;
-}
-
-.site-text text {
- padding-left: 10rpx;
- color: #999;
- font-size: 28rpx;
-}
-
-.site-all {
- font-size: 26rpx;
-}
-
-.goods {
+.welfareCont-list-img image {
width: 100%;
- background-color: #fff;
- border-radius: 10rpx;
- padding: 30rpx;
- box-sizing: border-box;
- box-shadow: 0 0 10rpx rgba(0, 0, 0, .1);
- margin: 30rpx 0;
-}
-
-.goods-content {
- position: relative;
-}
-
-.goods-cont {
- position: absolute;
- left: 0;
- top: 0;
- width: 100%;
- padding-left: 150rpx;
- box-sizing: border-box;
-}
-
-.goods-title {
- margin: 10rpx 0 20rpx;
- font-weight: 600;
- font-size: 30rpx;
-}
-
-.goods-qty {
- color: #999;
- font-size: 28rpx;
-}
-
-.goods-cover {
- position: relative;
- width: 130rpx;
- height: 130rpx;
-}
-
-.goods-image {
- position: absolute;
- left: 0;
- top: 0;
- width: 100%;
height: 100%;
}
-.goods-type {
- position: absolute;
- z-index: 2;
- left: 15rpx;
- top: 15rpx;
- font-size: 24rpx;
- background-color: #5d69fb;
- color: #fff;
- border-radius: 50rpx;
- height: 36rpx;
- line-height: 34rpx;
- padding: 0 6rpx;
-}
-.goods-type.active {
- background-color: #fb5d64;
-}
-
-.goods-type text {
- transform: scale(.9);
- display: inline-block;
-}
-
-/* 规格 */
-.label {
- background-color: #fff;
- border-radius: 10rpx;
- padding: 10rpx 30rpx;
- width: 100%;
- box-sizing: border-box;
- box-shadow: 0 0 10rpx rgba(0, 0, 0, .1);
- margin-bottom: 30rpx;
+.rightsNumber {
+ background-color: #ffffff;
position: relative;
+ padding: 30rpx 40rpx;
+ box-sizing: border-box;
}
-.labelList {
+.rightsGoods-img {
+ width: 200rpx;
+ height: 200rpx;
+ border-radius: 10rpx;
+}
+
+.rightsGoods {
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ padding: 80rpx 40rpx 0 270rpx;
+ box-sizing: border-box;
+}
+
+.rightsGoods-text {
+ margin-bottom: 40rpx;
+ font-weight: 600;
+}
+
+.rightsGoods-price {
display: flex;
- line-height: 80rpx;
- font-size: 28rpx;
}
-.labelList-label {
+.rightsGoods-number {
flex: 1;
+ font-size: 34rpx;
}
-.rightsLabel-range {
- display: flex;
- color: #000;
-}
-
-.rightsLabel-row {
- width: 38rpx;
- height: 38rpx;
- margin: 20rpx 0 0 6rpx;
+.rightsGoods-number>text {
+ font-size: 28rpx;
}
.rightsAdd {
display: flex;
- padding-top: 14rpx;
}
.rightsAdd-btn {
- background: #eaeaea;
- color: #535353;
- border-radius: 50%;
+ border-radius: 4rpx;
text-align: center;
width: 50rpx;
height: 50rpx;
@@ -229,62 +134,251 @@
font-weight: 600;
}
+.rightsAdd-remove {
+ background: #f8f8f8;
+ color: #d9d9d9;
+}
+
+.rightsAdd-remove.active,
+.rightsAdd-plus {
+ background: #e8e4e5;
+ color: #6b6768;
+}
+
.rightsAdd-input {
- width: 60rpx;
+ width: 100rpx;
text-align: center;
font-size: 28rpx;
line-height: 50rpx;
}
-/* 购买 */
-.buy {
- position: fixed;
- width: 100%;
- left: 0;
- bottom: 0;
- height: 100rpx;
- line-height: 100rpx;
- background-color: #fff;
+/* 支付类型选择 */
+.radioList-label {
+ padding: 20rpx 0 40rpx;
+ font-size: 28rpx
}
-.buy-price {
- background-color: #f1cb4c;
- color: #8d5226;
- width: calc(100% - 240rpx);
+.payContList-label {
+ font-size: 28rpx;
+ display: flex;
+ margin-bottom: 40rpx;
+}
+
+.payContList-label:last-child {
+ border:none;
+ margin-bottom: 0;
+}
+
+.payContList-label-name {
+ flex: 1;
+ font-size: 32rpx;
+ display: flex;
+ line-height: 46rpx;
+}
+
+.payContList-label-img {
+ width: 46rpx;
+ height: 46rpx;
+ margin-right: 20rpx;
+}
+
+radio {
+ transform:scale(0.8);
+}
+
+
+.rightsCont {
position: absolute;
- left: 0;
- top: 0;
- height: 100%;
- padding-left: 50rpx;
+ z-index: 3;
+ left: calc(28% - 2rpx);
+ right: calc(30% - 2rpx);
+ width: calc(44% + 4rpx);
+ top: 50rpx;
+}
+
+.rightsCont-btn {
+ background: rgba(255, 255, 0255, .4);
+ width: 100%;
+ line-height: 70rpx;
+ font-size: 40rpx;
+ font-weight: 600;
+ color: #000000;
+ padding: 0 20rpx;
box-sizing: border-box;
+}
+
+.rightsCont-tips {
+ color: #fff;
+}
+
+.rightsNumber {
+ background-color: #ffffff;
+ position: relative;
+ padding: 30rpx 40rpx;
+ box-sizing: border-box;
+}
+
+/* 购买按钮 */
+.rightsBtn,
+.newrightsBtn {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ height: 160rpx;
+ z-index: 9;
+ background: #fff;
+ padding: 30rpx;
+ box-sizing: border-box;
+ display: flex;
+}
+
+.rightsBtn button,
+.rightsBtn text {
+ display: block;
+ margin: 12rpx 30rpx;
+ width: calc(100% - 60rpx) !important;
+ height: 74rpx !important;
+ line-height: 74rpx !important;
+ padding: 0;
+ background: #eacf88;
+ text-align: center;
+ border-radius: 60rpx;
+ font-size: 30rpx;
+}
+
+.rightsBtn-text {
+ flex: 1;
+ font-weight: 600;
+ font-size: 30rpx;
+}
+
+.rightsBtn-text-num {
+ font-size: 30rpx;
+ margin-bottom: 10rpx;
+}
+
+.rightsBtn-text text {
+ font-size: 38rpx;
+ color: #fe2d55;
+}
+
+.newrightsBtn button {
+ width: 280rpx !important;
+ background-color: #000000;
+ color: #ffffff;
+ border-radius: 80rpx;
+ height: 100rpx;
+ line-height: 100rpx;
+ padding: 0;
+ margin: 0;
+}
+
+
+.rightsBtn.active text {
+ background: #dedede;
+ color: #888;
+}
+
+
+.rightsList,
+.notice,
+.detailsStore {
+ background: white;
+ border-radius: 10rpx;
+ padding: 10rpx 0;
+ margin-top: 20rpx;
+ box-sizing: border-box;
+}
+
+.rightsLabel,
+.rightsLabel-pay {
+ display: flex;
+ padding: 20rpx 40rpx;
+ color: #6c6c6c;
+ font-weight: 600;
+ font-size: 30rpx;
+}
+
+.rightsLabel .rightsLabel-left {
+ flex: 1;
+ color: #747d86;
+}
+
+.rightsLabel .rightsLabel-icon {
+ width: 70rpx;
+ height: 70rpx;
+ margin-top: 14rpx;
+}
+
+.rightsLabel-address .rightsLabel-right {
+ width: calc(100% - 90rpx);
+ margin-left: 20rpx;
+ color: #000000;
+}
+
+.rightsLabel-address .rightsLabel-row {
+ margin-top: 30rpx;
+}
+
+.rightsLabel-address-name {
+ display: flex;
+ font-size: 32rpx;
+ margin-bottom: 10rpx;
+}
+
+.rightsLabel-address-tel {
+ padding-left: 30rpx;
+ color: #959595;
+}
+
+.rightsLabel-freight {
+ color: #000000;
+}
+
+.rightsLabel-black {
+ padding-top: 30rpx;
+}
+
+.rightsLabel-range {
+ display: flex;
+ color: #000;
+ font-weight: 600;
+}
+
+.rightsLabel-row {
+ width: 42rpx;
+ height: 42rpx;
+ margin: 0 0 0 6rpx;
+}
+
+.rightsLabel-black .rightsLabel-right,
+.rightsLabel-red {
+ color: #ff5b5d;
font-weight: 600;
font-size: 32rpx;
}
-.buy-price text {
- font-size: 42rpx;
+.rightsLabel-black .rightsLabel-left {
+ color: #000;
}
-.buy .buy-btn {
- background-color: #2e71e3;
- color: #fff;
- position: absolute;
- right: 0;
- top: 0;
- width: 240rpx;
- text-align: center;
- height: 100%;
+.rightsLabel-score {
+ font-weight: 600;
+ color: #000;
+ font-size: 38rpx;
+}
+
+.rightsLabel-pay {
+ color: #000;
+}
+
+.rightsLabel-pay .rightsLabel-left {
+ flex: 1;
}
-/* 购买须知 */
.notice {
- background: white;
- margin: 30rpx 0;
- border-radius: 10rpx;
- padding: 10rpx 0;
- box-sizing: border-box;
- box-shadow: 0 0 30rpx rgba(0,0,0,.15);
- padding: 20rpx;
+ padding: 20rpx 30rpx;
}
.noticeTitle {
@@ -294,7 +388,7 @@
.noticeTitle-flex {
flex: 1;
display: flex;
- font-size: 28rpx;
+ font-size: 30rpx;
line-height: 46rpx;
}
@@ -332,6 +426,47 @@
transform: rotate(90deg);
}
+
+.rightsLabel-address {
+ display: flex;
+ position: relative;
+ margin: 10rpx 0;
+ padding: 25rpx 40rpx;
+}
+
+.rightsLabel-address::after,
+.rightsLabel-address::before {
+ position: absolute;
+ content: '';
+ left: 30rpx;
+ width: calc(100% - 60rpx);
+ height: 2rpx;
+ background-color: #bfbfbf;
+}
+
+.rightsLabel-address::after {
+ top: 0;
+}
+
+.rightsLabel-address::before {
+ bottom: 0;
+}
+
+.rightsLabel-address text {
+ display: inline-block;
+ width: calc(100% - 46rpx);
+}
+
+.rightsLabel-address .rightsLabel-right {
+ display: flex;
+ font-size: 28rpx;
+}
+
+.rightsLabel-address-text {
+ flex: 1;
+}
+
+
/* 选择收货地址 */
.addressBack {
position: fixed;
@@ -412,6 +547,45 @@
border: none;
}
+.rightsLabel-address {
+ display: flex;
+ position: relative;
+ margin: 10rpx 0;
+ padding: 25rpx 40rpx;
+}
+
+.rightsLabel-address::after,
+.rightsLabel-address::before {
+ position: absolute;
+ content: '';
+ left: 30rpx;
+ width: calc(100% - 60rpx);
+ height: 2rpx;
+ background-color: #bfbfbf;
+}
+
+.rightsLabel-address::after {
+ top: 0;
+}
+
+.rightsLabel-address::before {
+ bottom: 0;
+}
+
+.rightsLabel-address text {
+ display: inline-block;
+ width: calc(100% - 46rpx);
+}
+
+.rightsLabel-address .rightsLabel-right {
+ display: flex;
+ font-size: 28rpx;
+}
+
+.rightsLabel-address-text {
+ flex: 1;
+}
+
.address-tool {
display: flex;
float: right;
@@ -451,35 +625,123 @@
font-size: 24rpx;
}
-/* 支付类型选择 */
-.radioList-label {
- padding: 20rpx 0 40rpx;
- font-size: 28rpx
+.rightsPoint {
+ position: fixed;
+ left: 0;
+ bottom: 160rpx;
+ background: #eeeeee;
+ z-index: 9;
+ width: 100%;
+ padding: 20rpx 20rpx 10rpx;
+ box-sizing: border-box;
}
-.payContList-label {
+.rightsPoint-cont {
+ width: 100%;
+ background: #eeeeee;
+ border-radius: 10rpx;
+ position: relative;
+ max-height: 50vh;
+ overflow-y: scroll;
+}
+
+.rightsPoint-top {
font-size: 28rpx;
display: flex;
- margin-bottom: 40rpx;
+ padding: 0 20rpx 20rpx;
+ box-sizing: border-box;
+ font-weight: 600;
}
-.payContList-label:last-child {
- border:none
+.rightsPoint-top image {
+ width: 36rpx;
+ height: 36rpx;
+ margin-right: 10rpx;
}
-.payContList-label-name {
- flex: 1;
- font-size: 32rpx;
- display: flex;
- line-height: 46rpx;
+.rightsPoint-text {
+ padding: 0 20rpx;
+ box-sizing: border-box;
+ font-size: 24rpx;
+ line-height: 44rpx;
+ height: 90rpx;
+ transition: height 25s;
+ overflow: hidden;
}
-.payContList-label-img {
- width: 46rpx;
- height: 46rpx;
- margin-right: 20rpx;
+.rightsPoint-text.active {
+ height: auto;
+ transition: 2s;
}
-radio {
- transform:scale(0.8);
+.rightsPoint-text view {
+ position: relative;
+ padding-left: 40rpx;
+}
+
+.rightsPoint-text view::after {
+ position: absolute;
+ content: '';
+ left: 10rpx;
+ top: 20rpx;
+ background: #000;
+ width: 10rpx;
+ height: 10rpx;
+ border-radius: 50%;
+}
+
+.rightsPoint-bolck {
+ position: absolute;
+ top: 0;
+ left: 0;
+ height: calc(100% - 40rpx);
+}
+
+.pointMore {
+ text-align: center;
+ width: 100%;
+ background: #eeeeee;
+ height: 80rpx;
+ line-height: 82rpx;
+ position: relative;
+ margin-top: 10rpx;
+}
+
+.pointMore::after {
+ position: absolute;
+ content: '';
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 2rpx;
+ background: #f2ecde;
+}
+
+.pointMore text {
+ font-size: 28rpx;
+ color: #c38e00;
+ animation: dong 1.8s infinite;
+ display: inline-block;
+}
+
+.pointMore image {
+ width: 30rpx;
+ height: 30rpx;
+ margin-left: 4rpx;
+ vertical-align: -4rpx;
+ animation: dong 1.8s infinite;
+}
+
+@keyframes dong {
+ 0% {
+ transform: translate(0px, 0px);
+ }
+
+ 50% {
+ transform: translate(0px, -6rpx);
+ }
+
+ 100% {
+ transform: translate(0px, 0px);
+ }
}
\ No newline at end of file
diff --git a/pages/cashier/cashier.js b/pages/cashier/cashier.js
index afaa2af..d3a0dbd 100644
--- a/pages/cashier/cashier.js
+++ b/pages/cashier/cashier.js
@@ -7,11 +7,11 @@ Page({
data: {
allAmount: '', //支付金额
tradeNo : '', //支付订单
- current : 1, //支付方式类型
+ current : '', //支付方式类型
paytType : '', //支付来源类型 welfarePay为周五福利支付 rightsPay为权益支付
isDeliver: '', //提货方式 1为自提 0为快递
barHeight: getApp().globalData.statusBarHeight, //顶部菜单栏
- unicomPay: getApp().globalData.unicomPay //是否有沃支付
+ unicomPay: '' //是否有沃支付
},
/**
@@ -22,10 +22,19 @@ Page({
allAmount : options.amount,
tradeNo : options.trade_no,
paytType : options.pay_type,
- isDeliver : options.is_deliver
+ isDeliver : options.is_deliver,
+ unicomPay: getApp().globalData.unicomPay
})
- console.log(getApp().globalData.unicomPay)
+ if(getApp().globalData.unicomPay == true) {
+ this.setData({
+ current: 1
+ })
+ } else {
+ this.setData({
+ current: 2
+ })
+ }
},
/**
diff --git a/pages/code/code.js b/pages/code/code.js
index 6228071..57f24fb 100644
--- a/pages/code/code.js
+++ b/pages/code/code.js
@@ -8,30 +8,37 @@
* 页面的初始数据
*/
data: {
- qrcode : '', //二维码
- userInfo : '', //我的信息
- isImgLay : false,//是否显示图片弹出层
- parentId : '', //是否分享进入
- shareState : false //显示分享朋友圈弹出层
+ qrcode : '', //二维码
+ userInfo : '', //我的信息
+ isImgLay : false, //是否显示图片弹出层
+ shareState : false, //显示分享朋友圈弹出层
+ sharesData : '' //分享携带参数
},
/**
* 生命周期函数--监听页面加载
*/
onLoad (options) {
- // 判断是否由分享进入
- if(options.type == "share"){
- // 写入缓存
- this.setData({
- parentId: options.parent_id
+ if(getApp().globalData.scene === 1155 && options.type === "shareLogin"){
+ wx.switchTab({
+ url: '/pages/index/index',
})
}
- wx.$api.user.myshare(this.data.parentId).then(res=>{
+
+ // 获取用户信息和二维码
+ wx.$api.user.myshare('mini','','pages/index/index?type=shareLogin').then(res=>{
this.setData({
qrcode : res.data.qrcode,
userInfo : res.data.user
})
}).catch(err=>{})
+
+ // 获取分享好友标题
+ wx.$api.user.wechatShares().then(res=>{
+ this.setData({
+ sharesData: res.data
+ })
+ }).catch(err=>{})
},
/**
@@ -176,20 +183,20 @@
*/
onShareAppMessage(){
return {
- title : this.data.userInfo.nickname + "邀请您进入本时生活",
- imageUrl: "",
- path : "/pages/index/index?parent_id=" + this.data.userInfo.user_id + "&type=share"
+ title : this.data.userInfo.nickname + this.data.sharesData.title,
+ path : "/pages/index/index?parent_id=" + this.data.userInfo.user_id + "&type=shareLogin",
+ imageUrl: this.data.sharesData.image
}
},
/**
* 用户点击右上角分享朋友圈
*/
- onShareTimeline () {
- return {
- title : this.data.userInfo.nickname + "邀请您进入本时生活",
- path : "/pages/index/index?parent_id=" + this.data.userInfo.user_id + "&type=share",
- imageUrl: ''
- }
- }
+ // onShareTimeline () {
+ // return {
+ // title : this.data.userInfo.nickname + this.data.sharesData.title,
+ // query : "type=shareLogin",
+ // imageUrl: this.data.sharesData.image
+ // }
+ // }
})
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index 5d982cd..564de96 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -39,16 +39,15 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
- // 判断是否由分享进入
- if(options.parent_id !== ""){
- // 写入缓存
- wx.setStorage({
- key : 'parentId',
- data : options.parent_id
- })
+ if(options.type){
+ getApp().globalData.shareObj = {
+ type : options.type,
+ goodsId : '',
+ userId : options.parent_id
+ }
}
},
-
+
/**
* 生命周期函数--监听页面显示
*/
@@ -242,14 +241,14 @@ Page({
canId = e.currentTarget.dataset.id,
canFrom = e.currentTarget.dataset.from,
canRightid = e.currentTarget.dataset.rightid
- if(!canBuy) {
- wx.showToast({
- title : canText,
- icon : 'none',
- duration: 2000
- })
- return
- }
+ // if(!canBuy) {
+ // wx.showToast({
+ // title : canText,
+ // icon : 'none',
+ // duration: 2000
+ // })
+ // return
+ // }
wx.getStorage({
key : 'token',
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 3abbeff..a2cce7a 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -33,7 +33,8 @@
bindchange="swiperChange">
+ bindtap="clickImg" data-img="{{item.qrcode}}" data-url="{{item.url}}"
+ data-channel="{{item.channel}}">
@@ -149,11 +150,14 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 055c1b0..a3f30bc 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -691,8 +691,19 @@ page {
/* 漂浮弹出层 */
.indexFloat {
position: fixed;
+ height: 70%;
+ width: 110rpx;
right: 20rpx;
- bottom: 30rpx;
+ bottom: 0;
+ z-index: 99;
+}
+
+.indexFloat-movable {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ height: 280rpx;
z-index: 99;
}
diff --git a/pages/login/login.js b/pages/login/login.js
index 2e4ca42..d3af19c 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -90,14 +90,21 @@ Page({
userLogin(){
let code = this.data.loginCode,
iv = this.data.iv,
- encryptedData = this.data.encryptedData
+ encryptedData = this.data.encryptedData,
+ shareObj = getApp().globalData.shareObj
- // 检查用户扫码进入
- const parentId = wx.getStorageSync("parentId")
-
- wx.$api.enroll.record(code, iv, encryptedData, parentId).then(res=>{
+ wx.$api.enroll.record(code, iv, encryptedData, shareObj.userId).then(res=>{
getApp().globalData.token = res.data.token
+ // 清空分享信息
+ if(shareObj.type == 'shareLogin'){
+ getApp().globalData.shareObj = {
+ type : '',
+ goodsId : '',
+ userId : ''
+ }
+ }
+
// 更新全局存储器用户状态
getApp().globalData.isUser = true
@@ -130,9 +137,6 @@ Page({
key : 'users',
data : res.data.users
})
-
- // 清除扫码进入获取parent_id的缓存
- wx.removeStorageSync('parentId')
}).catch(err => {});
}
diff --git a/pages/myBalance/myBalance.js b/pages/myBalance/myBalance.js
index 889a615..fd5f5de 100644
--- a/pages/myBalance/myBalance.js
+++ b/pages/myBalance/myBalance.js
@@ -8,22 +8,6 @@ Page({
type : "balance ", //卡类型
number : '', //账户余额
accounts : '', //账户列表
- screenArray : [
- {
- channel: 'all',
- name: '全部'
- },
- {
- channel: 'in',
- name: '入账'
- },
- {
- channel: 'out',
- name: '出账'
- }
- ], //账变记录筛选数组
- screenChannel: '', //账变记录筛选数组标识
- screenIndex : 0, //账变记录筛选index
page : {}, //分页信息
lodingStats : false, //加载状态
},
@@ -31,47 +15,41 @@ Page({
/**
* 生命周期函数--监听页面加载
*/
- onLoad (options) {},
+ onLoad (options) {
+ // 获取余额数量
+ wx.$api.user.logs().then(res=>{
+ this.setData({
+ number : res.data.account.balance
+ })
+ }).catch(err => {});
+ },
/**
* 生命周期函数--监听页面显示
*/
onShow () {
- // 获取账变记录
+ // 获取收益订单记录
this.accountInfo();
},
/**
- * 账变记录
+ * 收益订单记录
*/
accountInfo(page) {
- wx.$api.user.logs(this.data.type, this.data.screenChannel, page).then(res=>{
+ wx.$api.user.profits(page).then(res=>{
+ console.log(res.data.data)
let listArr = this.data.accounts,
newData = []
if(page == 1 || page == undefined) listArr = []
newData = listArr.concat(res.data.data)
this.setData({
- number : res.data.account.balance,
accounts : newData,
page : res.data.page
})
}).catch(err => {});
},
- /**
- * 筛选账变记录-条件
- */
- screenBind(e) {
- this.setData({
- screenIndex : e.detail.value,
- screenChannel: this.data.screenArray[e.detail.value].channel
- })
-
- // 获取账变记录
- this.accountInfo();
- },
-
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
diff --git a/pages/myBalance/myBalance.wxml b/pages/myBalance/myBalance.wxml
index 6438532..58f775f 100644
--- a/pages/myBalance/myBalance.wxml
+++ b/pages/myBalance/myBalance.wxml
@@ -25,39 +25,24 @@
-
+
- 账变记录
-
-
- {{screenArray[screenIndex].name}}
-
-
-
+ 收益订单列表
-
-
-
-
-
-
- {{item.title}}
-
-
- {{item.created_at}}
-
-
-
- {{item.variable}}
-
-
+
+ {{item.right}}
+
+
+ {{item.user.nickname}}{{item.user.username}}
-
+
+
加载中...
diff --git a/pages/myBalance/myBalance.wxss b/pages/myBalance/myBalance.wxss
index 5cf2088..445a252 100644
--- a/pages/myBalance/myBalance.wxss
+++ b/pages/myBalance/myBalance.wxss
@@ -83,106 +83,78 @@
}
/* 账变记录 */
-.record {
- padding: 20rpx 25rpx;
- box-sizing: border-box;
-}
-
.record-title {
+ padding: 0 30rpx;
+ box-sizing: border-box;
color: #404040;
font-weight: 600;
font-size: 36rpx;
line-height: 60prx;
- margin-bottom: 40rpx;
+ margin: 40rpx 0 30rpx;
flex: 1;
}
-.integra-cont-title {
- display: flex;
-}
-
-.integra-cont-picker {
- display: flex;
- color: #797979;
- font-size: 30rpx;
- padding-top: 4rpx;
-}
-
-.integra-cont-icon {
- width: 28rpx;
- height: 28rpx;
- margin: 6rpx 0 0 10rpx;
-}
-
-/* 记录列表 */
-
.record-list {
- background-color: #fff;
- border-radius: 10rpx;
- padding: 25rpx;
+ background-color: #ffffff;
+ margin-bottom: 50rpx;
+ padding: 0 30rpx 20rpx 30rpx;
box-sizing: border-box;
- margin-bottom: 30rpx;
-}
-
-.record-list-img {
- width: 50rpx;
- height: 50rpx;
- margin-top: 6rpx;
-}
-
-.record-list-cont {
- display: flex;
- width: 100%;
-}
-
-.record-list-top {
- display: flex;
- padding-left: 30rpx;
- width: 100%;
- box-sizing: border-box;
-}
-
-.record-list-left {
- flex: 1;
- margin-right: 20rpx;
-}
-
-.record-list-time {
- margin-top: 10rpx;
- font-size: 28rpx;
- color: #999;
-}
-
-.record-list-right {
- color: green;
-}
-
-.record-list-right.active {
- color: red;
-}
-
-.record-list-remark {
- color: #333;
- font-size: 28rpx;
- margin: 30rpx 0 0;
- background-color: #f5f5f5;
- padding: 10rpx 15rpx;
- display: inline-block;
- border-radius: 4rpx;
+ border-top: 2rpx solid #e9e9e9;
+ border-bottom: 2rpx solid #e9e9e9;
position: relative;
- box-sizing: border-box;
}
-.record-list-remark::after {
+.accounts-more {
+ position: absolute;
+ bottom: -20rpx;
+ left: calc(50% - 40rpx);
+ width: 80rpx;
+ height: 40rpx;
+ text-align: center;
+ border-radius: 10rpx;
+ z-index: 9;
+ background-color: #ffffff;
+ border: #e9e9e9 2rpx solid;
+}
+
+.accounts-more image {
+ width: 28rpx;
+ height: 28rpx;
+ margin: 8rpx 26rpx;
+}
+
+.accounts-title {
+ position: relative;
+ padding: 30rpx 0 30rpx 35rpx;
+}
+
+.accounts-title::after {
position: absolute;
- left: 20rpx;
- top: -14rpx;
content: '';
- width: 0;
- height: 0;
- border-left: 14rpx solid transparent;
- border-right: 14rpx solid transparent;
- border-bottom: 14rpx solid #f5f5f5;
+ left: 6rpx;
+ top: 37%;
+ width: 8rpx;
+ height: 30%;
+ background-color: #000000;
+}
+
+.accounts-user {
+ color: #838383;
+ display: flex;
+ border-top: 2rpx solid #f5f5f5;
+ padding: 30rpx 0;
+}
+
+.accounts-user text {
+ display: block;
+ margin-bottom: 20rpx;
+}
+
+.accounts-user-icon {
+ width: 36rpx;
+ height: 36rpx;
+ margin-right: 20rpx;
+ margin-top: 4rpx;
}
@@ -196,4 +168,6 @@
.recommend-hint image {
width: 200rpx;
height: 200rpx;
+ border-radius: 50%;
+ margin-bottom: 20rpx;
}
diff --git a/pages/myBalance/myBalance_list/myBalance_list.js b/pages/myBalance/myBalance_list/myBalance_list.js
new file mode 100644
index 0000000..ac2c8c8
--- /dev/null
+++ b/pages/myBalance/myBalance_list/myBalance_list.js
@@ -0,0 +1,51 @@
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ accounts : '' //账户列表
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad (options) {
+ // 获取账变记录
+ this.accountInfo(options.type, options.id);
+ },
+
+ /**
+ * 账变记录
+ */
+ accountInfo(type, id, page) {
+ wx.$api.user.profitsNext(type, id, page).then(res=>{
+ this.setData({
+ accounts : res.data
+ })
+ }).catch(err => {});
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+ // 获取账变记录
+ this.accountInfo();
+ },
+
+ /**
+ * 上拉加载
+ */
+ onReachBottom(){
+ this.setData({
+ lodingStats: true
+ })
+ let pageNumber = this.data.page.current
+ if(this.data.page.has_more){
+ pageNumber++
+ // 获取账变记录
+ this.accountInfo('', '', pageNumber);
+ }
+ }
+})
\ No newline at end of file
diff --git a/pages/myBalance/myBalance_list/myBalance_list.json b/pages/myBalance/myBalance_list/myBalance_list.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/myBalance/myBalance_list/myBalance_list.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/myBalance/myBalance_list/myBalance_list.wxml b/pages/myBalance/myBalance_list/myBalance_list.wxml
new file mode 100644
index 0000000..3e71f5c
--- /dev/null
+++ b/pages/myBalance/myBalance_list/myBalance_list.wxml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+ {{item.rule.title}}
+
+
+ {{item.created_at}}
+
+
+
+ +{{item.bonus}}
+
+
+
+
+
+
+
+
+
+ 抱歉，目前暂无内容~
+
\ No newline at end of file
diff --git a/pages/myBalance/myBalance_list/myBalance_list.wxss b/pages/myBalance/myBalance_list/myBalance_list.wxss
new file mode 100644
index 0000000..d684291
--- /dev/null
+++ b/pages/myBalance/myBalance_list/myBalance_list.wxss
@@ -0,0 +1,84 @@
+/* 账变记录 */
+.record {}
+
+/* 记录列表 */
+
+.record-list {
+ background-color: #fff;
+ border-radius: 10rpx;
+ padding: 25rpx;
+ box-sizing: border-box;
+ margin-bottom: 30rpx;
+}
+
+.record-list-img {
+ width: 50rpx;
+ height: 50rpx;
+ margin-top: 6rpx;
+}
+
+.record-list-cont {
+ display: flex;
+ width: 100%;
+}
+
+.record-list-top {
+ display: flex;
+ padding-left: 30rpx;
+ width: 100%;
+ box-sizing: border-box;
+}
+
+.record-list-left {
+ flex: 1;
+ margin-right: 20rpx;
+}
+
+.record-list-time {
+ margin-top: 10rpx;
+ font-size: 28rpx;
+ color: #999;
+}
+
+.record-list-right {
+ color: red;
+}
+
+.record-list-remark {
+ color: #333;
+ font-size: 28rpx;
+ margin: 30rpx 0 0;
+ background-color: #f5f5f5;
+ padding: 10rpx 15rpx;
+ display: inline-block;
+ border-radius: 4rpx;
+ position: relative;
+ box-sizing: border-box;
+}
+
+.record-list-remark::after {
+ position: absolute;
+ left: 20rpx;
+ top: -14rpx;
+ content: '';
+ width: 0;
+ height: 0;
+ border-left: 14rpx solid transparent;
+ border-right: 14rpx solid transparent;
+ border-bottom: 14rpx solid #f5f5f5;
+}
+
+
+/* 暂无内容 */
+.recommend-hint {
+ text-align: center;
+ color: #999;
+ padding: 100rpx 0;
+}
+
+.recommend-hint image {
+ width: 200rpx;
+ height: 200rpx;
+ border-radius: 50%;
+ margin-bottom: 20rpx;
+}
diff --git a/pages/myProfit/myProfit.js b/pages/myProfit/myProfit.js
index 9d5c8b8..1b57204 100644
--- a/pages/myProfit/myProfit.js
+++ b/pages/myProfit/myProfit.js
@@ -25,8 +25,9 @@ Page({
publicData : [], //订单与团队 公共数据列表
//我的团队筛选列表
teamWay : [
- {value: 0, name: "用户"},
- {value: 1, name: "达人"}
+ {value: 0, name: "全部"},
+ {value: 1, name: "用户"},
+ {value: 2, name: "达人"}
],
teamIndex : 0, //我的团队筛选列表index
teamValue : 0, //我的团队筛选列表value
@@ -154,7 +155,7 @@ Page({
screenTeam(val) {
this.setData({
teamIndex: val.detail.value,
- teamValue: this.data.ordersWay[val.detail.value].value
+ teamValue: this.data.teamWay[val.detail.value].value
})
// 获取收益订单列表 + 我的团队列表
this.publicInfo();
diff --git a/pages/myProfit/myProfit.wxss b/pages/myProfit/myProfit.wxss
index 1569099..5b3f755 100644
--- a/pages/myProfit/myProfit.wxss
+++ b/pages/myProfit/myProfit.wxss
@@ -31,7 +31,7 @@ page {
height: 300rpx;
position: absolute;
top: -50rpx;
- right: -40rpx;
+ right: 0;
}
/* 内容 */
diff --git a/pages/order/order.js b/pages/order/order.js
index 2508661..8187eb1 100644
--- a/pages/order/order.js
+++ b/pages/order/order.js
@@ -15,7 +15,8 @@ Page({
payTips : 1, //支付方式
payState : false, //支付状态
orderId : '', //支付订单
- }
+ },
+ unicomPay : '' //是否有沃支付
},
/**
@@ -24,7 +25,8 @@ Page({
onLoad (options) {
this.setData({
orderType: options.orderType,
- stateType: options.stateType
+ stateType: options.stateType,
+ unicomPay: getApp().globalData.unicomPay
})
},
diff --git a/pages/order/order.wxml b/pages/order/order.wxml
index 3eba6ab..b12fd0d 100644
--- a/pages/order/order.wxml
+++ b/pages/order/order.wxml
@@ -95,7 +95,7 @@
-
+
沃钱包支付
diff --git a/pages/rights/rights.js b/pages/rights/rights.js
index 532a372..7d7a524 100644
--- a/pages/rights/rights.js
+++ b/pages/rights/rights.js
@@ -35,7 +35,8 @@ Page({
payWay :[
{value: 0, name: "微信支付"},
{value: 1, name: "沃钱包支付"}
- ]
+ ],
+ orderType : '' //订单类型
},
/**
@@ -47,17 +48,19 @@ Page({
typeWeb : options.type,
getType : options.getType,
openid : options.openid || '',
- parentId : options.parentid || ''
+ orderType : options.orderType
})
- // 获取详情
- this.rightsInfo();
+ console.log(getApp().globalData.shareObj)
},
/**
* 生命周期函数--监听页面显示
*/
- onShow() {},
+ onShow() {
+ // 获取详情
+ this.rightsInfo();
+ },
/**
* 详情
@@ -259,13 +262,24 @@ Page({
isdeliver: this.data.detail.def_get
})
}
+
let right_id = this.data.detail.right_id,
address_id = this.data.address.id,
is_deliver = this.data.isdeliver,
qty = this.data.num,
- parent_id = this.data.parentId
+ newParent = '',
+ shareObj = getApp().globalData.shareObj
+
+ if(shareObj.type == 'shareStored' && shareObj.type == this.data.orderType){
+ newParent = shareObj.userId
+ }
+
+ if(shareObj.type == 'shareGoods' && shareObj.goodsId == right_id){
+ console.log(22222)
+ newParent = shareObj.userId
+ }
- wx.$api.index.rightStore(right_id, address_id, is_deliver, qty, parent_id).then(res=>{
+ wx.$api.index.rightStore(right_id, address_id, is_deliver, qty, newParent).then(res=>{
if(res.data.canPay == false) {
wx.showToast({
title : '支付成功',
@@ -287,6 +301,24 @@ Page({
rightsTap: true
})
}else {
+ // 储值
+ if(shareObj.type == 'shareStored'){
+ getApp().globalData.shareObj = {
+ type : '',
+ goodsId : '',
+ userId : ''
+ }
+ }
+
+ // 商品
+ if(shareObj.type == 'shareGoods' && shareObj.goodsId == right_id){
+ getApp().globalData.shareObj = {
+ type : '',
+ goodsId : '',
+ userId : ''
+ }
+ }
+
// 跳转收银台
wx.navigateTo({
url: "/pages/cashier/cashier?trade_no=" + res.data.trade_no + "&amount=" + this.data.amount + "&is_deliver=" + is_deliver + "&pay_type=rightsPay"
diff --git a/pages/rights/rights.wxml b/pages/rights/rights.wxml
index 0b990f3..0dce9cf 100644
--- a/pages/rights/rights.wxml
+++ b/pages/rights/rights.wxml
@@ -61,11 +61,11 @@
{{detail.title}}
- ￥{{detail.price}}
+ ￥{{detail.amount}}
-
+ bindblur="goodsNumberInput" disabled>
+
@@ -78,34 +78,15 @@
{{detail.attribute.form_type}}
-￥{{score}}
-
-
电子券
{{detail.qty}}张
-
-
-
+
提交方式
@@ -130,9 +111,11 @@
-
- 添加收货地址
+
+
+ 添加收货地址
+
+
@@ -142,37 +125,7 @@
-
-
-
-
-
-
-
+
@@ -214,14 +167,6 @@
{{item.all_address}}
选择地址
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/pages/rights/rights.wxss b/pages/rights/rights.wxss
index 4172666..c078901 100644
--- a/pages/rights/rights.wxss
+++ b/pages/rights/rights.wxss
@@ -20,17 +20,6 @@ page {
overflow: hidden;
}
-/* .contBack::after {
- width: 100%;
- height: 30rpx;
- position: absolute;
- left: 0;
- bottom: 0;
- z-index: 2;
- content: '';
- background-image: linear-gradient(transparent, rgba(0,0,0,.25));
-} */
-
.classBack {
position: absolute;
left: 28%;
@@ -712,6 +701,7 @@ page {
padding: 0 10rpx;
box-sizing: border-box;
margin: 50rpx 0 20rpx;
+ height: 120rpx;
}
.welfareCont-list-img {
diff --git a/pages/user/user.js b/pages/user/user.js
index 1e0cad3..85312f6 100644
--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -49,6 +49,11 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad (options) {
+ // 写入缓存
+ wx.setStorage({
+ key : 'parentId',
+ data : options.parent_id
+ })
},
/**
* 生命周期函数--监听页面显示
diff --git a/pages/userGoods/goodsCode/goodsCode.js b/pages/userGoods/goodsCode/goodsCode.js
index 0e5a43e..422b8fe 100644
--- a/pages/userGoods/goodsCode/goodsCode.js
+++ b/pages/userGoods/goodsCode/goodsCode.js
@@ -22,15 +22,12 @@ Page({
*/
onLoad (options) {
this.setData({
- rightId: options.rightid,
+ rightId : options.rightid,
parentId: options.parent_id
})
-
- // 判断是否由分享进入
- // if(options.type == "share"){}
// 获取二维码
- wx.$api.user.publicCode('mini', 'goods', 'pages/userGoods/goodsDet/goodsDet?rightid=' + options.rightid + '&type=share').then(res=>{
+ wx.$api.user.publicCode('mini', 'goods', 'pages/userGoods/goodsDet/goodsDet?rightid=' + options.rightid + '&type=shareGoods').then(res=>{
this.setData({
qrcode : res.data.qrcode,
userInfo : res.data.user
@@ -203,19 +200,19 @@ Page({
onShareAppMessage(){
return {
title : this.data.userInfo.nickname + "邀请您进入本时生活",
- imageUrl: this.data.pageShare,
- path : "/pages/userGoods/goodsDet/goodsDet?parent_id=" + this.data.userInfo.user_id + "&rightid=" + this.data.rightId + "&type=share",
+ path : "/pages/userGoods/goodsDet/goodsDet?parent_id=" + this.data.userInfo.user_id + "&rightid=" + this.data.rightId + "&type=shareGoods",
+ imageUrl: this.data.pageShare
}
},
/**
* 用户点击右上角分享朋友圈
*/
- onShareTimeline: function () {
- return {
- title : this.data.userInfo.nickname + "邀请您进入本时生活",
- path : "/pages/userGoods/goodsDet/goodsDet?parent_id=" + this.data.userInfo.user_id + "&rightid=" + this.data.rightId + "&type=share",
- imageUrl: this.data.pageShare
- }
- }
+ // onShareTimeline: function () {
+ // return {
+ // title : this.data.userInfo.nickname + "邀请您进入本时生活",
+ // path : "/pages/userGoods/goodsDet/goodsDet?parent_id=" + this.data.userInfo.user_id + "&rightid=" + this.data.rightId + "&type=shareGoods",
+ // imageUrl: this.data.pageShare
+ // }
+ // }
})
diff --git a/pages/userGoods/goodsCode/goodsCode.wxss b/pages/userGoods/goodsCode/goodsCode.wxss
index 3adb14e..198ed61 100644
--- a/pages/userGoods/goodsCode/goodsCode.wxss
+++ b/pages/userGoods/goodsCode/goodsCode.wxss
@@ -126,6 +126,7 @@
margin-top: 20rpx;
padding: 0 !important;
width: 33.33%;
+ background-color: transparent;
}
.codeShare-label image {
diff --git a/pages/userGoods/goodsDet/goodsDet.js b/pages/userGoods/goodsDet/goodsDet.js
index 3a259d9..e925017 100644
--- a/pages/userGoods/goodsDet/goodsDet.js
+++ b/pages/userGoods/goodsDet/goodsDet.js
@@ -8,7 +8,7 @@ Page({
isUser : false, //用户登录状态
qrcode : '', //二维码
userInfo : '', //我的信息
- current : 0, //产品轮播index
+ current : 1, //产品轮播index
rightId : '', //产品id
parentId : '', //分享人id
productData : '', //详情数据
@@ -21,21 +21,12 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad (options) {
- // 判断是否由分享进入
- if(options.type == "share"){
- this.setData({
- parentId: options.parent_id
- })
-
- // 写入缓存
- wx.setStorage({
- key : 'parentId',
- data : options.parent_id
- })
-
- this.setData({
- rightId : options.rightid
- })
+ if(options.type){
+ getApp().globalData.shareObj = {
+ type : options.type,
+ goodsId : options.rightid,
+ userId : options.parent_id
+ }
}
this.setData({
@@ -52,6 +43,13 @@ Page({
})
},
+ // 商品轮播
+ swiperChange(e) {
+ this.setData({
+ current: e.detail.current + 1
+ })
+ },
+
/**
* 产品详情
*/
diff --git a/pages/userGoods/goodsDet/goodsDet.wxml b/pages/userGoods/goodsDet/goodsDet.wxml
index fd1e082..8167c81 100644
--- a/pages/userGoods/goodsDet/goodsDet.wxml
+++ b/pages/userGoods/goodsDet/goodsDet.wxml
@@ -5,7 +5,8 @@
- {{current}}/{{productData.share.pictures.length}}
+
+ {{current}}/{{productData.share.pictures.length}}
@@ -18,14 +19,16 @@
门市价￥{{productData.share.cost}}
- 立即购买
+ 立即购买
- 规格
- {{productData.share.type_name}}
+ 规格
+ {{productData.share.type_name}}
门店
@@ -53,8 +56,11 @@
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/userGoods/goodsDet/goodsDet.wxss b/pages/userGoods/goodsDet/goodsDet.wxss
index 440a69c..8989457 100644
--- a/pages/userGoods/goodsDet/goodsDet.wxss
+++ b/pages/userGoods/goodsDet/goodsDet.wxss
@@ -191,8 +191,19 @@ page {
/* 漂浮弹出层 */
.indexFloat {
position: fixed;
+ height: 52%;
+ width: 130rpx;
right: 20rpx;
- bottom: 30rpx;
+ bottom: 40rpx;
+ z-index: 99;
+}
+
+.indexFloat-movable {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ height: 150rpx;
z-index: 99;
}
diff --git a/pages/userStored/storedCode/storedCode.js b/pages/userStored/storedCode/storedCode.js
index 4425b01..7ceca50 100644
--- a/pages/userStored/storedCode/storedCode.js
+++ b/pages/userStored/storedCode/storedCode.js
@@ -19,16 +19,8 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad (options) {
- // 判断是否由分享进入
- // if(options.type == "share"){
- // // 写入缓存
- // this.setData({
- // parentId: options.parent_id
- // })
- // }
-
// 获取二维码
- wx.$api.user.publicCode('mini', 'recharge', 'pages/userStored/userStored?type=share').then(res=>{
+ wx.$api.user.publicCode('mini', 'recharge', 'pages/userStored/userStored?type=shareStored').then(res=>{
this.setData({
qrcode : res.data.qrcode,
userInfo : res.data.user
@@ -173,19 +165,19 @@ Page({
onShareAppMessage(){
return {
title : this.data.userInfo.nickname + "邀请您进入本时生活",
- imageUrl: "",
- path : "/pages/userStored/userStored?parent_id=" + this.data.userInfo.user_id + "&type=share",
- }
+ path : "/pages/userStored/userStored?parent_id=" + this.data.userInfo.user_id + "&type=shareStored",
+ imageUrl: "/static/img/storedCode.png"
+ }
},
/**
* 用户点击右上角分享朋友圈
*/
- onShareTimeline: function () {
- return {
- title : this.data.userInfo.nickname + "邀请您进入本时生活",
- path : "/pages/userStored/userStored?parent_id=" + this.data.userInfo.user_id + "&type=share",
- imageUrl: ''
- }
- }
+ // onShareTimeline: function () {
+ // return {
+ // title : this.data.userInfo.nickname + "邀请您进入本时生活",
+ // path : "/pages/userStored/userStored?parent_id=" + this.data.userInfo.user_id + "&type=shareStored",
+ // imageUrl: "/static/img/storedCode.png"
+ // }
+ // }
})
\ No newline at end of file
diff --git a/pages/userStored/userStored.js b/pages/userStored/userStored.js
index 36b0814..233c0a3 100644
--- a/pages/userStored/userStored.js
+++ b/pages/userStored/userStored.js
@@ -15,17 +15,12 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad (options) {
- // 判断是否由分享进入
- if(options.type == "share"){
- this.setData({
- parentId: options.parent_id
- })
-
- // 写入缓存
- wx.setStorage({
- key : 'parentId',
- data : options.parent_id
- })
+ if(options.type){
+ getApp().globalData.shareObj = {
+ type : options.type,
+ goodsId : '',
+ userId : options.parent_id
+ }
}
},
diff --git a/pages/userStored/userStored.wxml b/pages/userStored/userStored.wxml
index 1bb5373..b7b0b59 100644
--- a/pages/userStored/userStored.wxml
+++ b/pages/userStored/userStored.wxml
@@ -27,19 +27,23 @@
￥{{item.worth}}(满{{item.full}}减{{item.worth}})
- 立即儲值
+ 立即儲值
-
-
- 储值分享
-
暂无订单
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/userStored/userStored.wxss b/pages/userStored/userStored.wxss
index 680be00..cb21846 100644
--- a/pages/userStored/userStored.wxss
+++ b/pages/userStored/userStored.wxss
@@ -172,24 +172,23 @@
margin-top: 35rpx;
}
-/* 分享按钮 */
-.userStoredBtn {
- background: #bca585;
- border-radius: 80rpx;
- margin: 40rpx 30rpx;
- width: calc(100% - 60rpx);
- line-height: 80rpx;
- text-align: center;
- color: #ffffff;
- font-weight: 600;
-}
-
/* 漂浮弹出层 */
-/* .indexFloat {
+.indexFloat {
position: fixed;
+ height: 70%;
+ width: 130rpx;
right: 20rpx;
- bottom: 60rpx;
+ bottom: 40rpx;
+ z-index: 99;
+}
+
+.indexFloat-movable {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ height: 150rpx;
z-index: 99;
}
@@ -197,4 +196,4 @@
width: 130rpx;
height: 130rpx;
margin-bottom: 20rpx;
-} */
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/pages/welfare/welfare.js b/pages/welfare/welfare.js
index 9136190..bee7c7c 100644
--- a/pages/welfare/welfare.js
+++ b/pages/welfare/welfare.js
@@ -8,7 +8,7 @@ Page({
amount : '', //总金额
allAddress : '', //收货地址列表
addressShow : false, //收货地址显示
- noticeShow : false, //须知显示状态
+ noticeShow : true, //须知显示状态
pointMoreShow : false, //重要提示显示状态
freight : '', //运费
isdeliver : -1,
@@ -20,12 +20,7 @@ Page({
remark : '', //使用须知
platformCp : [], //选择提交数组
platIndex : 0, //选择提交方式下标
- payWayIndex : 0, //选择支付方式下标
- subscribeTips : '', //订阅--临时舍去
- payWay :[
- {value: 0, name: "微信支付"}
- // {value: 1, name: "沃钱包支付"}
- ]
+ subscribeTips : '' //订阅--临时舍去
},
diff --git a/pages/welfare/welfare.wxml b/pages/welfare/welfare.wxml
index a1c8a8c..e09f132 100644
--- a/pages/welfare/welfare.wxml
+++ b/pages/welfare/welfare.wxml
@@ -1,6 +1,10 @@
-
-
+
+
+ 共：1件商品
+ 实付：￥{{amount}}
+
+
@@ -23,37 +27,58 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{rightData.subtitle}}
+
+
+
+
-
-
-
-
-
-
-
- {{rightData.title}}
- {{rightData.subtitle}}
-
-
-
-
-
+
+
+
+
+ {{rightData.title}}
+
+
+ ￥{{contData.price}}
+
+ -
+
+ +
+
+
+
+
+
+
+
- {{contData.attribute.form_price}}
+ {{contData.attribute.form_pay}}
￥{{contData.total}}
{{contData.attribute.form_qty}}
- 1张
+ 1
{{contData.attribute.form_type}}
- ￥{{contData.score}}
+ -￥{{contData.score}}
-
+
- 请选择提交方式
+ 提交方式
@@ -64,53 +89,39 @@
- 收货地址
+
- {{address.all_address}}
+
+ {{address.name}}{{address.mobile}}
+ {{address.all_address}}
+
-
- 添加收货地址
+
+
+ 添加收货地址
+
+
-
+
快递运费
- ￥{{freight}}
+ ￥{{freight}}
-
+
-
+
-
-
- 请选择支付方式
-
-
-
- {{payWay[payWayIndex].name}}
-
-
-
-
-
-
- 支付方式
- {{payWay[payWayIndex].name}}
-
-
+ -->
diff --git a/pages/welfare/welfare.wxss b/pages/welfare/welfare.wxss
index 934077b..73ff435 100644
--- a/pages/welfare/welfare.wxss
+++ b/pages/welfare/welfare.wxss
@@ -1,70 +1,133 @@
+page {
+ background-color: #eeeeee;
+}
+
+.cont {
+ width: 100%;
+ overflow: hidden;
+}
+
+
/* 卡券权益 */
-.welfare {
- text-align: center;
- width: 100%;
- background-color: #fff;
- padding: 30rpx;
- box-sizing: border-box;
-}
-
-.welfareCont-top{
- flex-wrap: wrap;
- flex-direction: column;
- margin: 10rpx 0;
-}
-
-.welfareCont-list-img {
- border: 2rpx solid #eccc69;
- border-radius: 50%;
- width: 100rpx;
- height: 100rpx;
- display: inline-block;
- margin: 0 10rpx;
-}
-
-.welfareCont-text {
+.contBack {
position: relative;
- padding: 20rpx 50rpx;
- box-sizing: border-box;
- width: 100%;
- display: grid;
- border-top: 4rpx dashed #ebcc68;
-}
-
-.welfareCont-tips {
- background-color: #000000;
- color: #ffd88d;
- border-radius: 10rpx;
- margin-top: 20rpx;
- height: 54rpx;
- line-height: 54rpx;
- font-size: 27rpx;
- display: inline-block;
- font-weight: 600;
- padding: 0 20rpx;
-}
-
-.welfareCont {
- background: #fcf9e8;
- border: 2rpx solid #eac85c;
- border-radius: 20rpx;
- display: inline-block;
+ width: 200%;
+ height: 340rpx;
+ left: -50%;
text-align: center;
+ background: #000000;
+ border-radius: 0 0 100% 100%;
+ overflow: hidden;
+}
+
+/* .contBack::after {
+ width: 100%;
+ height: 30rpx;
+ position: absolute;
+ left: 0;
+ bottom: 0;
+ z-index: 2;
+ content: '';
+ background-image: linear-gradient(transparent, rgba(0,0,0,.25));
+} */
+
+.classBack {
+ position: absolute;
+ left: 28%;
+ right: 30%;
+ width: 44%;
+ top: 40rpx;
+}
+
+.classCircle {
+ position: relative;
+}
+
+.classCircle::after,
+.contBack::before {
+ position: absolute;
+ border-radius: 50%;
+ content: '';
+ z-index: 1;
+ background-color: rgba(255,255,255,.1);
+}
+
+.classCircle::after {
+ left: 20%;
+ top: -20rpx;
+ width: 260rpx;
+ height: 260rpx;
+}
+
+.contBack::before {
+ right: 20%;
+ top: 55%;
+ width: 300rpx;
+ height: 300rpx;
+}
+
+.rightsCont {
+ position: absolute;
+ z-index: 3;
+ left: calc(28% - 2rpx);
+ right: calc(30% - 2rpx);
+ width: calc(44% + 4rpx);
+ top: 50rpx;
+}
+
+.rightsCont-btn {
+ background: rgba(255, 255, 0255, .4);
+ width: 100%;
+ line-height: 70rpx;
+ font-size: 40rpx;
+ font-weight: 600;
+ color: #000000;
+ padding: 0 20rpx;
box-sizing: border-box;
}
+.rightsCont-tips {
+ color: #fff;
+}
.rightsNumber {
- display: flex;
- width: 100%;
- margin: 30px 0 20px;
- padding: 0 30rpx;
+ background-color: #ffffff;
+ position: relative;
+ padding: 30rpx 40rpx;
box-sizing: border-box;
}
-.rightsNumber text {
- display: inline-block;
+.rightsGoods-img {
+ width: 200rpx;
+ height: 200rpx;
+ border-radius: 10rpx;
+}
+
+.rightsGoods {
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ padding: 80rpx 40rpx 0 270rpx;
+ box-sizing: border-box;
+}
+
+.rightsGoods-text {
+ margin-bottom: 40rpx;
+ font-weight: 600;
+}
+
+.rightsGoods-price {
+ display: flex;
+}
+
+.rightsGoods-number {
flex: 1;
+ font-size: 34rpx;
+}
+
+.rightsGoods-number>text {
+ font-size: 28rpx;
}
.rightsAdd {
@@ -72,9 +135,7 @@
}
.rightsAdd-btn {
- background: #eaeaea;
- color: #535353;
- border-radius: 50%;
+ border-radius: 4rpx;
text-align: center;
width: 50rpx;
height: 50rpx;
@@ -83,6 +144,17 @@
font-weight: 600;
}
+.rightsAdd-remove {
+ background: #f8f8f8;
+ color: #d9d9d9;
+}
+
+.rightsAdd-remove.active,
+.rightsAdd-plus {
+ background: #e8e4e5;
+ color: #6b6768;
+}
+
.rightsAdd-input {
width: 100rpx;
text-align: center;
@@ -101,17 +173,18 @@
.notice,
.detailsStore {
background: white;
- margin: 30rpx;
border-radius: 10rpx;
padding: 10rpx 0;
+ margin-top: 20rpx;
box-sizing: border-box;
}
.rightsLabel,
.rightsLabel-pay {
display: flex;
- padding: 20rpx;
- color: #6f7880;
+ padding: 20rpx 40rpx;
+ color: #6c6c6c;
+ font-weight: 600;
font-size: 30rpx;
}
@@ -120,6 +193,37 @@
color: #747d86;
}
+.rightsLabel .rightsLabel-icon {
+ width: 70rpx;
+ height: 70rpx;
+ margin-top: 14rpx;
+}
+
+.rightsLabel-address .rightsLabel-right {
+ width: calc(100% - 90rpx);
+ margin-left: 20rpx;
+ color: #000000;
+}
+
+.rightsLabel-address .rightsLabel-row {
+ margin-top: 30rpx;
+}
+
+.rightsLabel-address-name {
+ display: flex;
+ font-size: 32rpx;
+ margin-bottom: 10rpx;
+}
+
+.rightsLabel-address-tel {
+ padding-left: 30rpx;
+ color: #959595;
+}
+
+.rightsLabel-freight {
+ color: #000000;
+}
+
.rightsLabel-black {
padding-top: 30rpx;
}
@@ -131,14 +235,15 @@
}
.rightsLabel-row {
- width: 38rpx;
- height: 38rpx;
- margin: 2rpx 0 0 6rpx;
+ width: 42rpx;
+ height: 42rpx;
+ margin: 0 0 0 6rpx;
}
.rightsLabel-black .rightsLabel-right,
.rightsLabel-red {
color: #ff5b5d;
+ font-weight: 600;
font-size: 32rpx;
}
@@ -161,12 +266,11 @@
}
.notice {
- padding: 20rpx;
+ padding: 20rpx 30rpx;
}
.noticeTitle {
display: flex;
- margin-bottom: 20rpx;
}
.noticeTitle-flex {
@@ -199,7 +303,6 @@
.noticeText-cont {
line-height: 60rpx;
- color: #666;
}
.noticeTitle-row {
@@ -244,14 +347,18 @@
}
/* 购买按钮 */
-.rightsBtn {
+.rightsBtn,
+.newrightsBtn {
position: fixed;
bottom: 0;
left: 0;
width: 100%;
- height: 100rpx;
+ height: 160rpx;
z-index: 9;
background: #fff;
+ padding: 30rpx;
+ box-sizing: border-box;
+ display: flex;
}
.rightsBtn button,
@@ -268,6 +375,33 @@
font-size: 30rpx;
}
+.rightsBtn-text {
+ flex: 1;
+ font-weight: 600;
+ font-size: 30rpx;
+}
+
+.rightsBtn-text-num {
+ font-size: 30rpx;
+ margin-bottom: 10rpx;
+}
+
+.rightsBtn-text text {
+ font-size: 38rpx;
+ color: #fe2d55;
+}
+
+.newrightsBtn button {
+ width: 280rpx !important;
+ background-color: #000000;
+ color: #ffffff;
+ border-radius: 80rpx;
+ height: 100rpx;
+ line-height: 100rpx;
+ padding: 0;
+ margin: 0;
+}
+
.rightsBtn.active text {
background: #dedede;
@@ -356,6 +490,27 @@
.rightsLabel-address {
display: flex;
+ position: relative;
+ margin: 10rpx 0;
+ padding: 25rpx 40rpx;
+}
+
+.rightsLabel-address::after,
+.rightsLabel-address::before {
+ position: absolute;
+ content: '';
+ left: 30rpx;
+ width: calc(100% - 60rpx);
+ height: 2rpx;
+ background-color: #bfbfbf;
+}
+
+.rightsLabel-address::after {
+ top: 0;
+}
+
+.rightsLabel-address::before {
+ bottom: 0;
}
.rightsLabel-address text {
@@ -368,6 +523,10 @@
font-size: 28rpx;
}
+.rightsLabel-address-text {
+ flex: 1;
+}
+
.address-tool {
display: flex;
float: right;
@@ -410,8 +569,8 @@
.rightsPoint {
position: fixed;
left: 0;
- bottom: 100rpx;
- background: #fff;
+ bottom: 160rpx;
+ background: #eeeeee;
z-index: 9;
width: 100%;
padding: 20rpx 20rpx 10rpx;
@@ -420,8 +579,7 @@
.rightsPoint-cont {
width: 100%;
- background: #fcf9e8;
- border: 2rpx solid #ecd390;
+ background: #eeeeee;
border-radius: 10rpx;
position: relative;
max-height: 50vh;
@@ -431,7 +589,7 @@
.rightsPoint-top {
font-size: 28rpx;
display: flex;
- padding: 20rpx;
+ padding: 0 20rpx 20rpx;
box-sizing: border-box;
font-weight: 600;
}
@@ -483,7 +641,7 @@
.pointMore {
text-align: center;
width: 100%;
- background: #fff8e5;
+ background: #eeeeee;
height: 80rpx;
line-height: 82rpx;
position: relative;
@@ -497,7 +655,7 @@
top: 0;
width: 100%;
height: 2rpx;
- background: #ecd390;
+ background: #f2ecde;
}
.pointMore text {
@@ -529,27 +687,6 @@
}
}
-.rightsCont-btn {
- display:inline-block;
- text-align: center;
- background-image: linear-gradient(to right, #eaaaa8, #f4e5c2, #eaaaa8);
- box-shadow: 0 0 10rpx rgba(233, 166, 166, .9);
- border-radius: 30px;
- padding: 5rpx;
- line-height: 40rpx;
-}
-
-.rightsCont-btn text {
- border-radius: 30px;
- width: 100%;
- height: 100%;
- display: block;
- padding: 10rpx 20rpx;
- box-sizing: border-box;
- background: linear-gradient(#fefcfa, #f9f0db, #f7ebcf);
- font-size: 30rpx;
-}
-
.webBack {
position: fixed;
width: 100%;
@@ -566,51 +703,28 @@
display: block;
}
-.subscribe {
- position: fixed;
- bottom: 400rpx;
- right: 20rpx;
- z-index: 999;
- width: 100rpx;
- height: 100rpx;
- -webkit-animation: Tada 3s both infinite;
- -moz-animation: Tada 3s both infinite;
- -ms-animation: Tada 3s both infinite;
- animation: Tada 3s both infinite;
+.welfareCont-top{
+ white-space: nowrap;
+ flex-direction: row;
+ align-items: center;
+ justify-content: space-around;
+ width: 100%;
+ padding: 0 10rpx;
+ box-sizing: border-box;
+ margin: 50rpx 0 20rpx;
+ height: 120rpx;
}
-.subscribe.active {
- display: none;
+.welfareCont-list-img {
+ border-radius: 50%;
+ width: 120rpx;
+ height: 120rpx;
+ display: inline-block;
+ margin: 0 15rpx;
+ overflow: hidden;
}
-@keyframes Tada {
- 0% {
- transform: scale(1);
- transform: scale(1)
- }
-
- 70%,73%{
- transform: scale(1) rotate(-3deg);
- transform: scale(1) rotate(-3deg)
- }
-
- 77%,83%,90%,97% {
- transform: scale(1) rotate(3deg);
- transform: scale(1) rotate(3deg)
- }
-
- 80%,87%,93%{
- transform: scale(1) rotate(-3deg);
- transform: scale(1) rotate(-3deg)
- }
-
- 100% {
- transform: scale(1) rotate(0);
- transform: scale(1) rotate(0)
- }
-}
-
-.subscribe image {
+.welfareCont-list-img image {
width: 100%;
height: 100%;
}
\ No newline at end of file
diff --git a/pages/withdrawal_form/withdrawal_form.js b/pages/withdrawal_form/withdrawal_form.js
index 68e8aee..a6259af 100644
--- a/pages/withdrawal_form/withdrawal_form.js
+++ b/pages/withdrawal_form/withdrawal_form.js
@@ -5,9 +5,10 @@ Page({
* 页面的初始数据
*/
data: {
- balance : '', //余额
- tax : '', //手续费
- disabled: false //按钮状态
+ balance : '', //余额
+ tax : '', //手续费
+ amount : '', //提现金额
+ disabled : false //按钮状态
},
/**
@@ -31,11 +32,26 @@ Page({
}).catch(err=>{})
},
+ /**
+ * 获取提现金额
+ */
+ getAmount (val) {
+ var money;
+ if (/^(\d?)+(\.\d{0,1})?$/.test(val.detail.value)) { //正则验证，提现金额小数点后不能大于两位数字
+ money = val.detail.value;
+ } else {
+ money = val.detail.value.substring(0, val.detail.value.length - 1);
+ }
+ this.setData({
+ amount: money
+ })
+ },
+
/**
* 提现表单填写
*/
formSubmit(e) {
- let newAmount = e.detail.value.amount
+ let newAmount = this.data.amount
if(newAmount > 1) {
wx.$api.user.withdrawsForm(newAmount, "mini").then(res=>{
this.setData({
@@ -48,7 +64,7 @@ Page({
setTimeout(()=>{
wx.redirectTo({
- url: '/pages/withdrawal_record/withdrawal_record'
+ url: "/pages/withdrawal_record/withdrawal_record?status=''&idx=0"
})
},2000)
diff --git a/pages/withdrawal_form/withdrawal_form.wxml b/pages/withdrawal_form/withdrawal_form.wxml
index 0a7b93e..68377d9 100644
--- a/pages/withdrawal_form/withdrawal_form.wxml
+++ b/pages/withdrawal_form/withdrawal_form.wxml
@@ -12,7 +12,7 @@