From a0399a89440ac9e978536dcbd10fea65bbb361d0 Mon Sep 17 00:00:00 2001 From: zhangjing Date: Thu, 27 Jul 2023 16:27:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E6=BB=B4=E5=85=91=E6=8D=A2=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/assess/assess.js | 14 +- pages/index/index.js | 1 + pages/mall/confirm/confirm.js | 12 +- pages/mall/confirm/confirm.wxss | 646 +++++++------ pages/mall/details/details.js | 8 + pages/mall/details/details.wxml | 2 +- pages/mall/details/details.wxss | 1108 +++++++++++----------- pages/pay/index.js | 18 +- pages/recruit/exchange/exchange.js | 17 +- pages/recruit/exchange/exchange.wxml | 2 +- pages/recruit/exchange/exchange.wxss | 22 + pages/recruit/referto/referto.js | 4 +- pages/recruit/refertoEdit/refertoEdit.js | 3 +- pages/recruit/signWrite/signWrite.js | 16 +- 14 files changed, 986 insertions(+), 887 deletions(-) diff --git a/pages/index/assess/assess.js b/pages/index/assess/assess.js index 87d759b..f198450 100644 --- a/pages/index/assess/assess.js +++ b/pages/index/assess/assess.js @@ -156,19 +156,22 @@ Page({ * 创建订单 */ payFound() { + this.setData({ + disabled : true + }) wx.$api.index.skinOrder().then(res => { - this.setData({ - disabled : true - }) this.payBtn(res.data.order_id) - }).catch(err => {}) + }).catch(err => { + this.setData({ + disabled: false + }) + }) }, /** * 确认支付1元 */ payBtn(orderid) { - wx.showLoading({ title: '支付中...', mask : true @@ -190,6 +193,7 @@ Page({ }) } this.setData({ + disabled : false, payStatus: false }) this.setData({ diff --git a/pages/index/index.js b/pages/index/index.js index e3ef5e8..9228024 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -13,6 +13,7 @@ Page({ }, onLoad(options) { + console.log(options) if(options.invite != undefined) { getApp().globalData.inviteText = options.invite } diff --git a/pages/mall/confirm/confirm.js b/pages/mall/confirm/confirm.js index 7414695..c00901c 100644 --- a/pages/mall/confirm/confirm.js +++ b/pages/mall/confirm/confirm.js @@ -18,7 +18,7 @@ Page({ paySuccess : false, // 兑换成功显示 maxcoupon : '', //拥有兑换券数量 coupon_qty : 1, //兑换券数量 - checked : false//兑换券 + checked : false, //兑换券 }, onLoad(options) { @@ -169,6 +169,10 @@ Page({ * 产品确认购买 */ buyTap() { + this.setData({ + disabled: false + }) + wx.showLoading({ title: '加载中...', }) @@ -181,9 +185,6 @@ Page({ coupon_qty : this.data.coupon_qty } wx.$api.mall.mallAffirm(data).then(res => { - this.setData({ - disabled: false - }) wx.hideLoading() if(res.data.can_pay) { @@ -201,7 +202,8 @@ Page({ mask:true, success: function () { that.setData({ - paySuccess: true + paySuccess: true, + disabled: true }) setTimeout(()=>{ wx.redirectTo({ diff --git a/pages/mall/confirm/confirm.wxss b/pages/mall/confirm/confirm.wxss index 7c98d82..d12aa30 100644 --- a/pages/mall/confirm/confirm.wxss +++ b/pages/mall/confirm/confirm.wxss @@ -1,315 +1,333 @@ -page { - background-color: #f5f6f8; - padding: 30rpx; - box-sizing: border-box; -} - -/* 地址 */ -.address { - background-color: #FFFFFF; - border-radius: 15rpx; - overflow: hidden; - position: relative; -} - -.address-arrow { - position: absolute; - right: 15rpx; - top: 78rpx; - width: 50rpx; - height: 50rpx; -} - -.address-cont { - padding: 30rpx; - box-sizing: border-box; -} - -.address-top { - width: calc(100% - 80rpx); -} - -.address-area { - color: #585866; - font-size: 28rpx; -} - -.address-text { - font-weight: 600; - padding: 10px 0; -} - -.address-name text { - color: #585866; - padding-left: 30rpx; -} - -.address-img { - width: 100%; - display: block; -} - -.address-add { - width: 100%; - text-align: center; - padding: 30rpx 30rpx 0; - box-sizing: border-box; -} - -.address-go { - display: inline-block; - font-size: 28rpx; - line-height: 68rpx; - border-radius: 10rpx; - color: #df723a; - padding-bottom: 20rpx; -} - -/* 商品 */ - -.list-goods { - background-color: #FFFFFF; - margin: 30rpx 0; - display: flex; - padding: 30rpx; - border-radius: 15rpx; - box-sizing: border-box; -} - -.list-goods-img { - width: 184rpx; - height: 184rpx; - margin-right: 30rpx; - border-radius: 10rpx; -} - -.list-goods-cont { - width: calc(100% - 214rpx); -} - -.list-goods-name { - font-size: 32rpx; -} - -.list-goods-text { - line-height: 90rpx; - display: flex; - font-size: 28rpx; - color: #999999; -} - -.list-goods-text text { - flex: 1; -} - -.list-goods-parice { - text-align: right; - font-size: 26rpx; -} - -.list-goods-parice text { - font-size: 34rpx; -} - -/* 规格 */ -.label { - background-color: #FFFFFF; - border-radius: 15rpx; - overflow: hidden; - box-sizing: border-box; -} - -.label-item { - display: flex; - line-height: 100rpx; - color: #585866; - font-size: 30rpx; - padding: 0 30rpx; - box-sizing: border-box; - border-bottom: 2rpx solid rgb(243, 243, 243); -} - -.label-item:last-child { - border: none; -} - -.label-integral { - color: #3b7cff; - font-weight: 600; -} - -.label-name { - flex: 1; -} - -.coupons { - border-bottom: 2rpx solid rgb(243, 243, 243); - padding: 0 30rpx 30rpx; - box-sizing: border-box; -} - -.coupons-item { - display: flex; - line-height: 100rpx; - color: #585866; - font-size: 30rpx; -} - -.coupon-checked { - background-color: #fff3ea; - padding: 20rpx 30rpx; - box-sizing: border-box; - border-radius: 10rpx; - position: relative; -} - -.coupon-checked-name { - color: #ff9951; - font-size: 28rpx; - line-height: 42rpx; -} - -.coupon-checked-number { - position: absolute; - right: 0rpx; - top: 0rpx; - display: flex; - background-color:transparent; -} - -.coupon-checked-btn { - color: #db6815; - width: 80rpx; - text-align: center; - font-weight: 600; - font-size: 38rpx; - line-height: 78rpx; -} - -.coupon-checked-input { - width: 60rpx; - border: 2rpx solid #bd5e1b; - border-radius: 4rpx; - text-align: center; - color: #dd620a; - height: 36rpx; - min-height: 36rpx; - display: inline-block; - margin-top: 20rpx; - font-size: 26rpx; -} - -/*checkbox选中后样式 */ -.label-text-checkbox { - margin-right: -14rpx; - margin-left: 10rpx; -} - -.label-text-checkbox .wx-checkbox-input.wx-checkbox-input-checked { - background: #ff9951; - border-color: #ff9951; -} - -.label-text-checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { - width: 30rpx; - height: 30rpx; - line-height: 28rpx; - text-align: center; - font-size: 30rpx; - color: #fff; - background: transparent; - transform: translate(-50%, -50%) scale(1); - -webkit-transform: translate(-50%, -50%) scale(1); -} - -.label-price { - text-align: right; - line-height: 90rpx; - font-size: 30rpx; - font-weight: 600; - padding: 0 30rpx 5rpx; - box-sizing: border-box; -} - -.label-price text { - font-size: 34rpx; - padding: 0 10rpx; -} - -.label-number { - display: flex; - margin-top: 25rpx; -} - -.number-btn { - background-color: #f1f1f1; - width: 48rpx; - height: 48rpx; - line-height: 46rpx; - text-align: center; -} - -.number-input { - width: 80rpx; - text-align: center; -} - -/* 底部 */ -.footer { - width: 100%; - height: 60px; - background-color: #272e4f; - position: fixed; - left: 0; - bottom: 0; - z-index: 9; - box-sizing: border-box; - display: flex; -} - -.number { - flex: 1; - line-height: 60px; - color: #ffffff; - display: flex; - padding: 0 30rpx; - box-sizing: border-box; -} - -.number text { - font-size: 28rpx; - padding-top: 5rpx; -} - -.number-price { - padding: 0 5rpx; - font-size: 40rpx; -} - -.number-vip { - margin-left: 20rpx; - color: #8d97a1; - font-size: 28rpx; -} - -.btn { - height: 100%; - background-color: #ff9951; - text-align: center; - color: #FFFFFF; - padding: 0 70rpx; - line-height: 60px; -} - -.btn.active { - background-color: #cacaca; -} - -.detailsBrief-back{ - width: 100%; -} - -.grey { - background-color: #f9f9f9; - z-index: 99999; +page { + background-color: #f5f6f8; + padding: 30rpx; + box-sizing: border-box; +} + +/* 地址 */ +.address { + background-color: #FFFFFF; + border-radius: 15rpx; + overflow: hidden; + position: relative; +} + +.address-arrow { + position: absolute; + right: 15rpx; + top: 78rpx; + width: 50rpx; + height: 50rpx; +} + +.address-cont { + padding: 30rpx; + box-sizing: border-box; +} + +.address-top { + width: calc(100% - 80rpx); +} + +.address-area { + color: #585866; + font-size: 28rpx; +} + +.address-text { + font-weight: 600; + padding: 10px 0; +} + +.address-name text { + color: #585866; + padding-left: 30rpx; +} + +.address-img { + width: 100%; + display: block; +} + +.address-add { + width: 100%; + text-align: center; + padding: 30rpx 30rpx 0; + box-sizing: border-box; +} + +.address-go { + display: inline-block; + font-size: 28rpx; + line-height: 68rpx; + border-radius: 10rpx; + color: #df723a; + padding-bottom: 20rpx; +} + +/* 商品 */ + +.list-goods { + background-color: #FFFFFF; + margin: 30rpx 0; + display: flex; + padding: 30rpx; + border-radius: 15rpx; + box-sizing: border-box; +} + +.list-goods-img { + width: 184rpx; + height: 184rpx; + margin-right: 30rpx; + border-radius: 10rpx; +} + +.list-goods-cont { + width: calc(100% - 214rpx); +} + +.list-goods-name { + font-size: 32rpx; +} + +.list-goods-text { + line-height: 90rpx; + display: flex; + font-size: 28rpx; + color: #999999; +} + +.list-goods-text text { + flex: 1; +} + +.list-goods-parice { + text-align: right; + font-size: 26rpx; +} + +.list-goods-parice text { + font-size: 34rpx; +} + +/* 规格 */ +.label { + background-color: #FFFFFF; + border-radius: 15rpx; + overflow: hidden; + box-sizing: border-box; +} + +.label-item { + display: flex; + line-height: 100rpx; + color: #585866; + font-size: 30rpx; + padding: 0 30rpx; + box-sizing: border-box; + border-bottom: 2rpx solid rgb(243, 243, 243); +} + +.label-item:last-child { + border: none; +} + +.label-integral { + color: #3b7cff; + font-weight: 600; +} + +.label-name { + flex: 1; +} + +.coupons { + border-bottom: 2rpx solid rgb(243, 243, 243); + padding: 0 30rpx 30rpx; + box-sizing: border-box; +} + +.coupons-item { + display: flex; + line-height: 100rpx; + color: #585866; + font-size: 30rpx; +} + +.coupon-checked { + background-color: #fff3ea; + padding: 20rpx 30rpx; + box-sizing: border-box; + border-radius: 10rpx; + position: relative; +} + +.coupon-checked-name { + color: #ff9951; + font-size: 28rpx; + line-height: 42rpx; +} + +.coupon-checked-number { + position: absolute; + right: 0rpx; + top: 0rpx; + display: flex; + background-color:transparent; +} + +.coupon-checked-btn { + color: #db6815; + width: 80rpx; + text-align: center; + font-weight: 600; + font-size: 38rpx; + line-height: 78rpx; +} + +.coupon-checked-input { + width: 60rpx; + border: 2rpx solid #bd5e1b; + border-radius: 4rpx; + text-align: center; + color: #dd620a; + height: 36rpx; + min-height: 36rpx; + display: inline-block; + margin-top: 20rpx; + font-size: 26rpx; +} + +/*checkbox选中后样式 */ +.label-text-checkbox { + margin-right: -14rpx; + margin-left: 10rpx; +} + +.label-text-checkbox .wx-checkbox-input.wx-checkbox-input-checked { + background: #ff9951; + border-color: #ff9951; +} + +.label-text-checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { + width: 30rpx; + height: 30rpx; + line-height: 28rpx; + text-align: center; + font-size: 30rpx; + color: #fff; + background: transparent; + transform: translate(-50%, -50%) scale(1); + -webkit-transform: translate(-50%, -50%) scale(1); +} + +.label-price { + text-align: right; + line-height: 90rpx; + font-size: 30rpx; + font-weight: 600; + padding: 0 30rpx 5rpx; + box-sizing: border-box; +} + +.label-price text { + font-size: 34rpx; + padding: 0 10rpx; +} + +.label-number { + display: flex; + margin-top: 25rpx; +} + +.number-btn { + background-color: #f1f1f1; + width: 48rpx; + height: 48rpx; + line-height: 46rpx; + text-align: center; +} + +.number-input { + width: 80rpx; + text-align: center; +} + +/* 底部 */ +.footer { + width: 100%; + height: 60px; + background-color: #272e4f; + position: fixed; + left: 0; + bottom: 0; + z-index: 9; + box-sizing: border-box; + display: flex; +} + +.number { + flex: 1; + line-height: 60px; + color: #ffffff; + display: flex; + padding: 0 30rpx; + box-sizing: border-box; +} + +.number text { + font-size: 28rpx; + padding-top: 5rpx; +} + +.number-price { + padding: 0 5rpx; + font-size: 40rpx; +} + +.number-vip { + margin-left: 20rpx; + color: #8d97a1; + font-size: 28rpx; +} + +.btn { + height: 100%; + background-color: #ff9951; + text-align: center; + color: #FFFFFF; + padding: 0 70rpx; + line-height: 60px; +} + +.btn-disabled { + line-height: 60px; + text-align: center; + border: none; + border-radius:0; + background-color: #ff9951; + padding: 0; + margin: 0; +} + +button[disabled]{ + padding: 0; + padding: 0; + height: 60px; + line-height: 60px; + background-color: transparent !important; +} + +.btn.active { + background-color: #cacaca; +} + +.detailsBrief-back{ + width: 100%; +} + +.grey { + background-color: #f9f9f9; + z-index: 99999; } \ No newline at end of file diff --git a/pages/mall/details/details.js b/pages/mall/details/details.js index 949f078..fb039f9 100644 --- a/pages/mall/details/details.js +++ b/pages/mall/details/details.js @@ -14,6 +14,7 @@ Page({ inviteText : '', // 自己的邀请码 isParent : false, // 绑定邀请码 nameValue : '', // 上级邀请码 + disabled : false }, onLoad(options) { @@ -64,7 +65,14 @@ Page({ buyTap() { // 获取登录状态 if(wx.getStorageSync("token") != ''){ + this.setData({ + disabled: true + }) + if(this.data.mallData.is_parent == true) { + this.setData({ + disabled: false + }) wx.navigateTo({ url: '/pages/mall/confirm/confirm?goodsid=' + this.data.mallData.goods_id + '&skuid=' + this.data.mallData.skus[0].sku_id + '&qty=1', }) diff --git a/pages/mall/details/details.wxml b/pages/mall/details/details.wxml index b9fba3e..2c79fcb 100644 --- a/pages/mall/details/details.wxml +++ b/pages/mall/details/details.wxml @@ -84,7 +84,7 @@ {{mallData.is_vip ? mallData.price.vip : mallData.price.price}} {{mallData.is_vip ? 'VIP会员价' : '市场指导价'}} - 确认购买 + diff --git a/pages/mall/details/details.wxss b/pages/mall/details/details.wxss index 7f527f1..1c097d3 100644 --- a/pages/mall/details/details.wxss +++ b/pages/mall/details/details.wxss @@ -1,545 +1,565 @@ -page { - background-color: #f7faff; -} - -/* 返回 */ -.navigation { - position: fixed; - top: 0; - left: 0; - z-index: 999; - width: 100%; - height: 90rpx; - background-color: transparent; - transition: .2s; -} - -.navigation.active { - background-color: transparent; -} - -.navigation-arrow { - width: 44rpx; - height: 44rpx; - margin: 20rpx 15rpx 0 20rpx; -} - -/* 产品图 */ -.banner { - overflow: hidden; - position: relative; - padding-top: 100%; -} - -.swiperCont, -.swiperImg { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; -} - -/* 产品详情 */ -.goodsCont { - padding: 30rpx; - border-bottom: 60px solid transparent; - box-sizing: border-box; -} - -.goodsWhite { - background-color: #ffffff; - box-sizing: border-box; - border-radius: 15rpx; - margin-bottom: 30rpx; -} - -.goodsInfo { - padding: 30rpx; - box-sizing: border-box; - position: relative; -} - -.goodsInfo-price { - display: flex; - position: relative; - line-height: 52rpx; - color: #ff9951; -} - -.goodsInfo-cost { - font-size: 48rpx; -} - -.goodsInfo-cost text { - font-size: 28rpx; -} - -.goodsInfo-vip { - background-color: #fff5ed; - border-radius: 80rpx; - margin-left: 30rpx; - padding: 0 25rpx; - height: 52rpx; - font-size: 32rpx; -} - -.goodsInfo-vip text { - font-size: 24rpx; - padding-right: 5rpx; -} - -.goodsInfo-name { - margin-top: 20rpx; - font-size: 32rpx; -} - -.goodsInfo-share { - position: absolute; - top: 40rpx; - right: 30rpx; - display: flex; - font-size: 27rpx; - line-height: 34rpx; - color: #9b9b9b; -} - -.goodsInfo-share-image { - width: 34rpx; - height: 34rpx; - margin-right: 10rpx; -} - -/* 开通vip */ -.vipOpen { - box-sizing: border-box; - position: relative; - padding-top: 17%; - overflow: hidden; -} - -.vipOpen-back { - position: absolute; - width: calc(100% - 60rpx); - height: 100%; - top: 0; - border-radius: 20rpx 20rpx 0 0; - left: 30rpx; - z-index: 1; -} - -.vipOpen-cont { - position: absolute; - width: 100%; - height: 100%; - left: 0; - top: 0; - z-index: 9; - display: flex; - padding: 15rpx 55rpx; - box-sizing: border-box; -} - -.vipOpen-cont-icon { - width: 60rpx; - height: 60rpx; -} - -.vipOpen-cont-name { - padding: 0 20rpx; - box-sizing: border-box; -} - -.vipOpen-cont-vip { - background-image: linear-gradient(to right, #fbf6d9, #d4af72, #c89a59); - -webkit-background-clip: text; - color: transparent; - font-weight: 600; - margin-bottom: 5rpx; - font-size: 34rpx; -} - -.vipOpen-cont-vip text { - font-style: oblique; - padding-right: 13rpx; -} - -.vipOpen-cont-tips { - color: #f4e1c4; - font-size: 26rpx; -} - -.vipOpen-btn { - position: absolute; - top: 45rpx; - right: 50rpx; - display: flex; - z-index: 9; - line-height: 30rpx; - color: #f4e1c4; - font-size: 28rpx; -} - -.vipOpen-btn-arrow { - width: 30rpx; - height: 30rpx; - margin: 2rpx 0 0 6rpx; -} - -/* 参数 */ -.goodsItem { - padding: 30rpx 30rpx 0; -} - -.goodsItem-label { - display: flex; -} - -.goodsItem-label-name { - color: #999999; - width: 120rpx; - line-height: 110rpx; -} - -.goodsItem-label-see { - display: flex; - width: calc(100% - 120rpx); - background-color: #f7faff; - padding: 10rpx 0; - border-radius: 15rpx; -} - -.goodsItem-label-block { - flex: 3; - text-align: center; - font-size: 26rpx; - position: relative; -} - -.goodsItem-label-block::after { - position: absolute; - content: ''; - background-color: #d1d1d1; - width: 1rpx; - height: 60%; - top: 20%; - left: 0; -} - -.goodsItem-label-block:first-child::after { - display: none; -} - -.goodsItem-label-title { - color: #3b7cff; - line-height: 50rpx; -} - -.goodsItem-label-tips { - color: #999999; -} - -.goodsItem-label-text { - line-height: 110rpx; -} - -/* 详情 */ -.goodsBrief { - padding: 30rpx; - box-sizing: border-box; -} - -/* 底部 */ -.footer { - width: 100%; - height: 60px; - background-color: #ffffff; - position: fixed; - left: 0; - bottom: 0; - z-index: 9; - box-sizing: border-box; - display: flex; -} - -.number { - flex: 1; - line-height: 60px; - color: #ff9951; - display: flex; - padding: 0 30rpx; - box-sizing: border-box; -} - -.number text { - font-size: 28rpx; - padding-top: 10rpx; -} - -.number-price { - padding: 0 5rpx; - font-size: 52rpx; -} - -.number-vip { - margin-left: 20rpx; - font-size: 26rpx; - color: #8d97a1; - padding-top: 6rpx; - box-sizing: border-box; -} - - -.btn { - height: 100%; - background-color: #ff9951; - text-align: center; - color: #FFFFFF; - padding: 0 70rpx; - line-height: 60px; -} - -.detailsBrief-back { - width: 100%; -} - -/* 产品分享弹窗 */ -.goodsShare { - width: 100%; - z-index: 9999; - position: fixed; - bottom: 340rpx; - left: 0; - padding: 40rpx; - box-sizing: border-box; - display: none; -} - -.goodsShare.active { - display: block; -} - -.goodsShare-back { - width: 80%; - margin: 0 auto; - background-color: #ffffff; - border-radius: 15rpx; - overflow: hidden; -} - -.goodsShare-photo { - width: 100%; -} - -.goodsShare-cont { - padding: 30rpx; - box-sizing: border-box; -} - -.goodsShare-name { - font-size: 36rpx; -} - -.goodsShare-price { - font-size: 52rpx; - color: #3b7cff; -} - -.goodsShare-price text { - font-size: 30rpx; -} - -.goodsShare-see { - position: relative; - padding: 40rpx 0 20rpx; -} - -.goodsShare-tips { - font-size: 28rpx; - color: #b3b3b3; - margin-top: 10rpx; -} - -.goodsShare-code { - width: 130rpx; - height: 130rpx; - position: absolute; - right: 0; - top: 30rpx; -} - -/* 分享弹出 */ - -.shareBack { - position: fixed; - width: 100vw; - height: 100vh; - z-index: 9900; - left: 0; - bottom: 0; - background-color: rgba(0, 0, 0, .6); - display: none; -} - -.shareBack.active { - display: block; -} - -.sharePop { - position: fixed; - width: 100%; - z-index: 9999; - left: 0; - bottom: 0; - background-color: #ffffff; - display: none; - height: 280rpx; -} - -.sharePop.active { - display: block; -} - -.shareCont-label image { - width: 60rpx; - height: 60rpx; - display: block; - margin: 0 auto 10rpx; -} - -.shareCancel { - border-top: 2rpx solid #dddddd; - width: 100%; - text-align: center; - line-height: 100rpx; -} - -.shareCont { - display: flex; - padding: 30rpx 0; -} - -.shareCont-label { - flex: 2; - text-align: center; - font-size: 28rpx; -} - -.codeShare-button { - background-color: transparent; - padding: 0; - font-weight: normal; -} - -/* canvas */ -.canvas-img { - position: fixed; - left: -100000%; - top: 0; - z-index: 99; -} - - -/* 邀请码弹出 */ -.namePop { - position: fixed; - background-color: rgba(0, 0, 0, .5); - left: 0; - top: 0; - height: 100vh; - width: 100vw; - z-index: 100000; - display: none; -} - -.namePop.active { - display: block; -} - -.nameCont { - -webkit-box-orient: vertical; - -webkit-box-pack: center; - position: fixed; - left: 0; - right: 0; - top: 0; - bottom: 0; - z-index: 100000; - padding: 0 15%; - box-sizing: border-box; - display: none; -} - -.nameCont.active { - display: -webkit-box; -} - -.nameCont-white { - background-color: #ffffff; - border-radius: 15rpx; - overflow: hidden; -} - -.nameCont-top { - padding: 30rpx; - box-sizing: border-box; -} - -.nameCont-title { - font-size: 34rpx; - margin-bottom: 30rpx; -} - -.nameCont-input { - height: 90rpx; - line-height: 90rpx; - position: relative; - background-color: #f3f3f3; - border-radius: 10rpx; - overflow: hidden; - padding: 0 25rpx; - box-sizing: border-box; -} - -.nameCont-input input { - width: calc(100% - 40rpx); - height: 100%; - background-color: transparent; -} - -.nameCont-colse { - width: 40rpx; - height: 40rpx; - top: 25rpx; - right: 20rpx; - position: absolute; - z-index: 9; -} - -.nameCont-btn { - line-height: 100rpx; - background-color: #f3f3f3; - display: flex; - margin-top: 30rpx; - border-top: 2rpx solid #dfdfdf; -} - -.nameCont-btn-go { - text-align: center; - flex: 2; -} - -.nameCont-btn-go:last-child { - position: relative; - color: #ff9951; -} - -.nameCont-btn-go:last-child::after { - position: absolute; - content: ''; - left: 0; - top: 0; - width: 2rpx; - height: 100%; - background-color: #dfdfdf; +page { + background-color: #f7faff; +} + +/* 返回 */ +.navigation { + position: fixed; + top: 0; + left: 0; + z-index: 999; + width: 100%; + height: 90rpx; + background-color: transparent; + transition: .2s; +} + +.navigation.active { + background-color: transparent; +} + +.navigation-arrow { + width: 44rpx; + height: 44rpx; + margin: 20rpx 15rpx 0 20rpx; +} + +/* 产品图 */ +.banner { + overflow: hidden; + position: relative; + padding-top: 100%; +} + +.swiperCont, +.swiperImg { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; +} + +/* 产品详情 */ +.goodsCont { + padding: 30rpx; + border-bottom: 60px solid transparent; + box-sizing: border-box; +} + +.goodsWhite { + background-color: #ffffff; + box-sizing: border-box; + border-radius: 15rpx; + margin-bottom: 30rpx; +} + +.goodsInfo { + padding: 30rpx; + box-sizing: border-box; + position: relative; +} + +.goodsInfo-price { + display: flex; + position: relative; + line-height: 52rpx; + color: #ff9951; +} + +.goodsInfo-cost { + font-size: 48rpx; +} + +.goodsInfo-cost text { + font-size: 28rpx; +} + +.goodsInfo-vip { + background-color: #fff5ed; + border-radius: 80rpx; + margin-left: 30rpx; + padding: 0 25rpx; + height: 52rpx; + font-size: 32rpx; +} + +.goodsInfo-vip text { + font-size: 24rpx; + padding-right: 5rpx; +} + +.goodsInfo-name { + margin-top: 20rpx; + font-size: 32rpx; +} + +.goodsInfo-share { + position: absolute; + top: 40rpx; + right: 30rpx; + display: flex; + font-size: 27rpx; + line-height: 34rpx; + color: #9b9b9b; +} + +.goodsInfo-share-image { + width: 34rpx; + height: 34rpx; + margin-right: 10rpx; +} + +/* 开通vip */ +.vipOpen { + box-sizing: border-box; + position: relative; + padding-top: 17%; + overflow: hidden; +} + +.vipOpen-back { + position: absolute; + width: calc(100% - 60rpx); + height: 100%; + top: 0; + border-radius: 20rpx 20rpx 0 0; + left: 30rpx; + z-index: 1; +} + +.vipOpen-cont { + position: absolute; + width: 100%; + height: 100%; + left: 0; + top: 0; + z-index: 9; + display: flex; + padding: 15rpx 55rpx; + box-sizing: border-box; +} + +.vipOpen-cont-icon { + width: 60rpx; + height: 60rpx; +} + +.vipOpen-cont-name { + padding: 0 20rpx; + box-sizing: border-box; +} + +.vipOpen-cont-vip { + background-image: linear-gradient(to right, #fbf6d9, #d4af72, #c89a59); + -webkit-background-clip: text; + color: transparent; + font-weight: 600; + margin-bottom: 5rpx; + font-size: 34rpx; +} + +.vipOpen-cont-vip text { + font-style: oblique; + padding-right: 13rpx; +} + +.vipOpen-cont-tips { + color: #f4e1c4; + font-size: 26rpx; +} + +.vipOpen-btn { + position: absolute; + top: 45rpx; + right: 50rpx; + display: flex; + z-index: 9; + line-height: 30rpx; + color: #f4e1c4; + font-size: 28rpx; +} + +.vipOpen-btn-arrow { + width: 30rpx; + height: 30rpx; + margin: 2rpx 0 0 6rpx; +} + +/* 参数 */ +.goodsItem { + padding: 30rpx 30rpx 0; +} + +.goodsItem-label { + display: flex; +} + +.goodsItem-label-name { + color: #999999; + width: 120rpx; + line-height: 110rpx; +} + +.goodsItem-label-see { + display: flex; + width: calc(100% - 120rpx); + background-color: #f7faff; + padding: 10rpx 0; + border-radius: 15rpx; +} + +.goodsItem-label-block { + flex: 3; + text-align: center; + font-size: 26rpx; + position: relative; +} + +.goodsItem-label-block::after { + position: absolute; + content: ''; + background-color: #d1d1d1; + width: 1rpx; + height: 60%; + top: 20%; + left: 0; +} + +.goodsItem-label-block:first-child::after { + display: none; +} + +.goodsItem-label-title { + color: #3b7cff; + line-height: 50rpx; +} + +.goodsItem-label-tips { + color: #999999; +} + +.goodsItem-label-text { + line-height: 110rpx; +} + +/* 详情 */ +.goodsBrief { + padding: 30rpx; + box-sizing: border-box; +} + +/* 底部 */ +.footer { + width: 100%; + height: 60px; + background-color: #ffffff; + position: fixed; + left: 0; + bottom: 0; + z-index: 9; + box-sizing: border-box; + display: flex; +} + +.number { + flex: 1; + line-height: 60px; + color: #ff9951; + display: flex; + padding: 0 30rpx; + box-sizing: border-box; +} + +.number text { + font-size: 28rpx; + padding-top: 10rpx; +} + +.number-price { + padding: 0 5rpx; + font-size: 52rpx; +} + +.number-vip { + margin-left: 20rpx; + font-size: 26rpx; + color: #8d97a1; + padding-top: 6rpx; + box-sizing: border-box; +} + + +.btn { + height: 100%; + background-color: #ff9951; + text-align: center; + color: #FFFFFF; + padding: 0 70rpx; + line-height: 60px; +} + +.btn-disabled { + line-height: 60px; + text-align: center; + border: none; + border-radius:0; + background-color: #ff9951; + padding: 0; + margin: 0; +} + +button[disabled]{ + padding: 0; + padding: 0; + height: 100rpx; + line-height: 60px; + color: white !important; + opacity: .8; + background-color: transparent !important; +} + +.detailsBrief-back { + width: 100%; +} + +/* 产品分享弹窗 */ +.goodsShare { + width: 100%; + z-index: 9999; + position: fixed; + bottom: 340rpx; + left: 0; + padding: 40rpx; + box-sizing: border-box; + display: none; +} + +.goodsShare.active { + display: block; +} + +.goodsShare-back { + width: 80%; + margin: 0 auto; + background-color: #ffffff; + border-radius: 15rpx; + overflow: hidden; +} + +.goodsShare-photo { + width: 100%; +} + +.goodsShare-cont { + padding: 30rpx; + box-sizing: border-box; +} + +.goodsShare-name { + font-size: 36rpx; +} + +.goodsShare-price { + font-size: 52rpx; + color: #3b7cff; +} + +.goodsShare-price text { + font-size: 30rpx; +} + +.goodsShare-see { + position: relative; + padding: 40rpx 0 20rpx; +} + +.goodsShare-tips { + font-size: 28rpx; + color: #b3b3b3; + margin-top: 10rpx; +} + +.goodsShare-code { + width: 130rpx; + height: 130rpx; + position: absolute; + right: 0; + top: 30rpx; +} + +/* 分享弹出 */ + +.shareBack { + position: fixed; + width: 100vw; + height: 100vh; + z-index: 9900; + left: 0; + bottom: 0; + background-color: rgba(0, 0, 0, .6); + display: none; +} + +.shareBack.active { + display: block; +} + +.sharePop { + position: fixed; + width: 100%; + z-index: 9999; + left: 0; + bottom: 0; + background-color: #ffffff; + display: none; + height: 280rpx; +} + +.sharePop.active { + display: block; +} + +.shareCont-label image { + width: 60rpx; + height: 60rpx; + display: block; + margin: 0 auto 10rpx; +} + +.shareCancel { + border-top: 2rpx solid #dddddd; + width: 100%; + text-align: center; + line-height: 100rpx; +} + +.shareCont { + display: flex; + padding: 30rpx 0; +} + +.shareCont-label { + flex: 2; + text-align: center; + font-size: 28rpx; +} + +.codeShare-button { + background-color: transparent; + padding: 0; + font-weight: normal; +} + +/* canvas */ +.canvas-img { + position: fixed; + left: -100000%; + top: 0; + z-index: 99; +} + + +/* 邀请码弹出 */ +.namePop { + position: fixed; + background-color: rgba(0, 0, 0, .5); + left: 0; + top: 0; + height: 100vh; + width: 100vw; + z-index: 100000; + display: none; +} + +.namePop.active { + display: block; +} + +.nameCont { + -webkit-box-orient: vertical; + -webkit-box-pack: center; + position: fixed; + left: 0; + right: 0; + top: 0; + bottom: 0; + z-index: 100000; + padding: 0 15%; + box-sizing: border-box; + display: none; +} + +.nameCont.active { + display: -webkit-box; +} + +.nameCont-white { + background-color: #ffffff; + border-radius: 15rpx; + overflow: hidden; +} + +.nameCont-top { + padding: 30rpx; + box-sizing: border-box; +} + +.nameCont-title { + font-size: 34rpx; + margin-bottom: 30rpx; +} + +.nameCont-input { + height: 90rpx; + line-height: 90rpx; + position: relative; + background-color: #f3f3f3; + border-radius: 10rpx; + overflow: hidden; + padding: 0 25rpx; + box-sizing: border-box; +} + +.nameCont-input input { + width: calc(100% - 40rpx); + height: 100%; + background-color: transparent; +} + +.nameCont-colse { + width: 40rpx; + height: 40rpx; + top: 25rpx; + right: 20rpx; + position: absolute; + z-index: 9; +} + +.nameCont-btn { + line-height: 100rpx; + background-color: #f3f3f3; + display: flex; + margin-top: 30rpx; + border-top: 2rpx solid #dfdfdf; +} + +.nameCont-btn-go { + text-align: center; + flex: 2; +} + +.nameCont-btn-go:last-child { + position: relative; + color: #ff9951; +} + +.nameCont-btn-go:last-child::after { + position: absolute; + content: ''; + left: 0; + top: 0; + width: 2rpx; + height: 100%; + background-color: #dfdfdf; } \ No newline at end of file diff --git a/pages/pay/index.js b/pages/pay/index.js index cdac2b5..21e2faf 100644 --- a/pages/pay/index.js +++ b/pages/pay/index.js @@ -24,6 +24,9 @@ Page({ * 确认支付 */ payBtn() { + this.setData({ + disabled: false + }) wx.showLoading({ title: '支付中...', mask : true @@ -31,9 +34,6 @@ Page({ let that = this wx.$api.mall.mallPay(this.data.orderNo,{type: 'miniapp', openid: wx.getStorageSync("openid")}).then(res=>{ wx.hideLoading() - this.setData({ - disabled: false - }) let payInfo = JSON.parse(res.data.wechat) wx.requestPayment({ timeStamp: payInfo.timeStamp, @@ -51,7 +51,8 @@ Page({ mask:true, success: function () { that.setData({ - paySuccess: true + paySuccess: true, + disabled: true }) setTimeout(()=>{ wx.redirectTo({ @@ -71,7 +72,8 @@ Page({ mask:true, success: function () { that.setData({ - paySuccess: true + paySuccess: true, + disabled: true }) setTimeout(()=>{ wx.redirectTo({ @@ -82,6 +84,10 @@ Page({ }) } }) - }).catch(err => {}); + }).catch(err => { + that.setData({ + disabled: true + }) + }); } }) diff --git a/pages/recruit/exchange/exchange.js b/pages/recruit/exchange/exchange.js index ab6467a..5b4b082 100644 --- a/pages/recruit/exchange/exchange.js +++ b/pages/recruit/exchange/exchange.js @@ -13,7 +13,8 @@ Page({ address : '', // 地址 addressId : '', // 地址id dataShow : '', // 数据 - exchangesHide: false + exchangesHide: false, + disabled : false }, /** @@ -56,6 +57,9 @@ Page({ * 水滴兑换提交 */ createGo (){ + this.setData({ + disabled: true + }) wx.showModal({ title : '兑换提示', content : '尊敬的用户,是否确认兑换此商品', @@ -65,9 +69,18 @@ Page({ if (res.confirm) { wx.$api.recruit.exchangesPost({address_id: this.data.addressId}).then(res => { this.setData({ + disabled: false, exchangesHide: true }) - }).catch(err => { }) + }).catch(err => { + this.setData({ + disabled: false + }) + }) + } else { + this.setData({ + disabled: false + }) } } }) diff --git a/pages/recruit/exchange/exchange.wxml b/pages/recruit/exchange/exchange.wxml index a2a4b39..8b06f5c 100644 --- a/pages/recruit/exchange/exchange.wxml +++ b/pages/recruit/exchange/exchange.wxml @@ -54,7 +54,7 @@ - 兑换水感应喷雾一瓶 + diff --git a/pages/recruit/exchange/exchange.wxss b/pages/recruit/exchange/exchange.wxss index 8f71945..654f76f 100644 --- a/pages/recruit/exchange/exchange.wxss +++ b/pages/recruit/exchange/exchange.wxss @@ -187,6 +187,28 @@ font-size: 34rpx; } +.recruit-btn-disabled { + line-height: 100rpx; + height: 100rpx; + width: 100% !important; + text-align: center; + border: none; + border-radius:0; + background-color:transparent; + padding: 0; + margin: 0; +} + +button[disabled]{ + padding: 0; + padding: 0; + height: 100rpx; + line-height: 100rpx; + color: white !important; + opacity: .8; + background-color: transparent !important; +} + .siteTop { color: #ffffff; display: flex; diff --git a/pages/recruit/referto/referto.js b/pages/recruit/referto/referto.js index 799233e..bc6a652 100644 --- a/pages/recruit/referto/referto.js +++ b/pages/recruit/referto/referto.js @@ -138,7 +138,6 @@ Page({ }) return } - let data = { name : value.name, address : value.address, @@ -154,7 +153,8 @@ Page({ }) wx.$api.recruit.recruitAdd(data).then(res => { this.setData({ - checkStatus: true + checkStatus: true, + disabled: false }) }).catch(() =>{ this.setData({ diff --git a/pages/recruit/refertoEdit/refertoEdit.js b/pages/recruit/refertoEdit/refertoEdit.js index df8b9c5..a6a0143 100644 --- a/pages/recruit/refertoEdit/refertoEdit.js +++ b/pages/recruit/refertoEdit/refertoEdit.js @@ -98,7 +98,8 @@ Page({ }) wx.$api.recruit.EditPut(this.data.enrollData.experience_area_enroll_id,data).then(res => { this.setData({ - checkStatus: true + checkStatus: true, + disabled: false }) }).catch(() =>{ this.setData({ diff --git a/pages/recruit/signWrite/signWrite.js b/pages/recruit/signWrite/signWrite.js index 869fd0a..6fd1e53 100644 --- a/pages/recruit/signWrite/signWrite.js +++ b/pages/recruit/signWrite/signWrite.js @@ -126,14 +126,13 @@ Page({ * 签到提交 */ tapSign() { - this.setData({ - disabled: true - }) let newPictures = [] for (let pictures of this.data.albumArr){ newPictures.push(pictures.path) } - + this.setData({ + disabled: true + }) wx.$api.recruit.signLabor({ experience_id : this.data.experienceId, describe : this.data.etciData, @@ -143,8 +142,13 @@ Page({ this.setData({ refertoStatus: true, signDayNumber: res.data.signDayNumber, - signWaterNumber: res.data.signWaterNumber + signWaterNumber: res.data.signWaterNumber, + disabled: false }) - }).catch(err => {}) + }).catch(err => { + this.setData({ + disabled: false + }) + }) }, }) \ No newline at end of file