Skip to content

G
gxpt_wechat
Commit 18b23e5b by zhangzhen
Options

细节优化

parent 79d35db0
Showing with 179 additions and 78 deletions
config/index.config.js
...@@ -7,7 +7,7 @@ const CONFIG = { ...@@ -7,7 +7,7 @@ const CONFIG = {
// baseUrl: 'https://www.coujio.com/front-api', // 后台接口请求地址 // baseUrl: 'https://www.coujio.com/front-api', // 后台接口请求地址
// baseUrl: 'https://coujiao.pseer.com/front-api', // 后台接口请求地址 // baseUrl: 'https://coujiao.pseer.com/front-api', // 后台接口请求地址
baseUrl: 'https://coujiao.pseer.com/front-api', baseUrl: 'https://coujiao.pseer.com/front-api',
hostUrl: 'http://129.211.46.84:8888/prod-api', // H5地址(前端运行地址) hostUrl: 'http://coujiao.pseer.com:8888/prod-api', // H5地址(前端运行地址)
// hostUrl: 'https://coujiao.pseer.com:8888/prod-api', // H5地址(前端运行地址) // hostUrl: 'https://coujiao.pseer.com:8888/prod-api', // H5地址(前端运行地址)
websocketUrl: '', // websocket服务端地址 websocketUrl: '', // websocket服务端地址
weixinAppId: '' ,// 微信公众号appid weixinAppId: '' ,// 微信公众号appid
...@@ -16,11 +16,11 @@ const CONFIG = { ...@@ -16,11 +16,11 @@ const CONFIG = {
}, },
// 生产环境配置 // 生产环境配置
production: { production: {
assetsPath: 'https://coujiao.pseer.com:8888/wechat_static', // 静态资源路径 assetsPath: 'http://coujiao.pseer.com:8888/wechat_static', // 静态资源路径
// assetsPath: 'https://www.coujio.com/wechat_static', // 静态资源路径 // assetsPath: 'https://www.coujio.com/wechat_static', // 静态资源路径
baseUrl: 'https://coujiao.pseer.com/front-api', // 后台接口请求地址 baseUrl: 'https://coujiao.pseer.com/front-api', // 后台接口请求地址
// baseUrl: 'https://www.coujio.com/front-api', // 后台接口请求地址 // baseUrl: 'https://www.coujio.com/front-api', // 后台接口请求地址
hostUrl: 'https://coujiao.pseer.com:8888/prod-api', // H5地址(前端运行地址) hostUrl: 'http://coujiao.pseer.com:8888/prod-api', // H5地址(前端运行地址)
// hostUrl: 'https://www.coujio.com/prod-api', // H5地址(前端运行地址) // hostUrl: 'https://www.coujio.com/prod-api', // H5地址(前端运行地址)
websocketUrl: '', // websocket服务端地址 websocketUrl: '', // websocket服务端地址
weixinAppId: '', // 微信公众号appid weixinAppId: '', // 微信公众号appid
......
pages/vipCreate/vipCreate.vue
...@@ -186,66 +186,87 @@ ...@@ -186,66 +186,87 @@
</view> </view>
</uni-popup> </uni-popup>
<uni-popup ref="popupPay" type="bottom"> <uni-popup ref="popupPay" type="center">
<view class="popup-box popup-box-2"> <view class="popup-box-content">
<view class="title-header"> <view class="popup-box popup-box-2">
<text class="text-title text-black text-lg text-bold">购买详情</text> <view class="close-box" @tap="onClose">
<text class="cuIcon-roundclose text-xl text-icon" @tap="onClose"></text> <text class="cuIcon-close text-xl text-icon" ></text>
</view> </view>
<view v-if="rechargeConfList.length" class="flex-col popup-content"> <view class="title-header">
<view v-if="tabIndex ==1" class="recharge-content"> <text class="text-title text-black text-lg text-bold">购买详情</text>
<text class="text-1">余额充值，多充多送，待支付：</text> </view>
<view class="payfee-text"> <view v-if="rechargeConfList.length" class="flex-col popup-content">
<text>￥{{rechargeConfList[rechargeIndex].rechargeAmount}}</text> <view v-if="tabIndex ==1" class="recharge-content">
</view> <text class="text-1">· 余额充值，多充多送，待支付:</text>
<view class="flex-row"> <view class="payfee-text">
<text class="text-3">赠送：</text> <text>￥{{rechargeConfList[rechargeIndex].rechargeAmount}}</text>
<view class="flex-col"> </view>
<view class="flex-row-center" v-if="rechargeConfList[rechargeIndex].giveType.includes('1')"> <view class="flex-row content-tip">
<text class="text-11">￥</text> <text class="text-3">赠送：</text>
<text class="text-12">{{rechargeConfList[rechargeIndex].giveAmount}}</text> <view class="flex-col">
<text class="text-13">钱包余额，下单可抵扣</text> <view class="flex-row-center" v-if="rechargeConfList[rechargeIndex].giveType.includes('1')">
</view> <view class="gift-box">
<view class="flex-row-center" v-if="rechargeConfList[rechargeIndex].giveType.includes('2')"> <image class="gift-icon" :src="assetsPath+'/gift_icon.png'" mode="widthFix"></image>
<text class="text-12">{{rechargeConfList[rechargeIndex].giveDuration}}小时</text> </view>
<text class="text-13">时长,下单可抵扣</text> <text class="text-12">￥{{rechargeConfList[rechargeIndex].giveAmount}}</text>
</view> <text class="text-13">钱包余额，下单可抵扣</text>
<view class="flex-row-center" v-if="rechargeConfList[rechargeIndex].giveType.includes('3')"> </view>
<text class="text-12">{{rechargeConfList[rechargeIndex].giveRatio}}%</text> <view class="flex-row-center" v-if="rechargeConfList[rechargeIndex].giveType.includes('2')">
<text class="text-13">充值金额积分比例赠送</text> <view class="gift-box">
</view> <image class="gift-icon" :src="assetsPath+'/gift_icon.png'" mode="widthFix"></image>
<view class="flex-row-center" v-if="rechargeConfList[rechargeIndex].giveType.includes('4')"> </view>
<text class="text-14">优惠券</text> <text class="text-12">{{rechargeConfList[rechargeIndex].giveDuration}}小时</text>
<text class="text-13">1张，下单可抵扣</text> <text class="text-13">时长,下单可抵扣</text>
</view>
<view class="flex-row-center" v-if="rechargeConfList[rechargeIndex].giveType.includes('3')">
<view class="gift-box">
<image class="gift-icon" :src="assetsPath+'/gift_icon.png'" mode="widthFix"></image>
</view>
<text class="text-12">{{rechargeConfList[rechargeIndex].giveRatio}}%</text>
<text class="text-13">充值金额积分比例赠送</text>
</view>
<view class="flex-row-center" v-if="rechargeConfList[rechargeIndex].giveType.includes('4')">
<view class="gift-box">
<image class="gift-icon" :src="assetsPath+'/gift_icon.png'" mode="widthFix"></image>
</view>
<text class="text-14">优惠券</text>
<text class="text-13">1张，下单可抵扣</text>
</view>
</view> </view>
</view> </view>
</view> </view>
</view> <view v-else-if="tabIndex ==2" class="recharge-content">
<view v-else-if="tabIndex ==2" class="recharge-content"> <text v-if="consumerMemberStatus" class="text-1">权益续期，<text class="text-pink">{{userInfo.consumerMember.expirationDate}}</text> 过期，优惠享不停，待支付：</text>
<text v-if="consumerMemberStatus" class="text-1">权益续期，<text class="text-pink">{{userInfo.consumerMember.expirationDate}}</text> 过期，优惠享不停，待支付：</text> <text v-else class="text-1">购买权益，优惠享不停，待支付：</text>
<text v-else class="text-1">购买权益，优惠享不停，待支付：</text> <view class="payfee-text">
<view class="payfee-text"> <text>￥{{list[0].requiredAmount}}</text>
<text>￥{{list[0].requiredAmount}}</text> </view>
</view> <view class="flex-row content-tip">
<view class="flex-row"> <text class="text-3">可享权益：</text>
<text class="text-3">可享权益：</text> <view class="flex-col">
<view class="flex-col"> <view class="flex-row-center" v-if="rechargeConfList[rechargeIndex].giveType.includes('1')">
<view class="flex-row-center" v-if="rechargeConfList[rechargeIndex].giveType.includes('1')"> <view class="gift-box">
<text class="text-13">房间预定，下单即可享98折起</text> <image class="gift-icon" :src="assetsPath+'/gift_icon.png'" mode="widthFix"></image>
</view> </view>
<view class="flex-row-center" v-if="rechargeConfList[rechargeIndex].giveType.includes('2')"> <text class="text-13">房间预定，会员日即可享98折起</text>
<text class="text-13">房间预定，下单即可享会员积分赠送</text> </view>
</view> <view class="flex-row-center" v-if="rechargeConfList[rechargeIndex].giveType.includes('2')">
<view class="flex-row-center" v-if="rechargeConfList[rechargeIndex].giveType.includes('3')"> <view class="gift-box">
<text class="text-13">更多权益请查看多动规则</text> <image class="gift-icon" :src="assetsPath+'/gift_icon.png'" mode="widthFix"></image>
</view>
<text class="text-13">房间预定，下单即可享会员积分赠送</text>
</view>
<view class="flex-row-center" v-if="rechargeConfList[rechargeIndex].giveType.includes('3')">
<text class="text-13">更多权益请查看多动规则</text>
</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> <view class="btn-list-box">
<view class="btn-list-box"> <view class="btn-box">
<view class="btn-box"> <button class="cu-btn bg-pink" @tap="onConfirmPay">确认支付</button>
<button class="cu-btn bg-pink" @tap="onConfirmPay">确认支付</button> </view>
</view> </view>
</view> </view>
</view> </view>
...@@ -547,7 +568,7 @@ ...@@ -547,7 +568,7 @@
equityMembersConfigId: this.list[this.index].id equityMembersConfigId: this.list[this.index].id
}).then(res => { }).then(res => {
uni.hideLoading(); uni.hideLoading();
if (res.data.data.jsConfig) { if (res.data.data && res.data.data.jsConfig) {
wx.requestPayment({ wx.requestPayment({
"timeStamp": res.data.data.jsConfig.timeStamp, "timeStamp": res.data.data.jsConfig.timeStamp,
"nonceStr": res.data.data.jsConfig.nonceStr, "nonceStr": res.data.data.jsConfig.nonceStr,
...@@ -580,6 +601,11 @@ ...@@ -580,6 +601,11 @@
// 接口调用结束的回调函数（调用成功、失败都会执行） // 接口调用结束的回调函数（调用成功、失败都会执行）
} }
}); });
} else {
uni.showToast({
icon:"none",
title: res.data.msg
})
} }
}) })
} }
...@@ -1198,58 +1224,133 @@ ...@@ -1198,58 +1224,133 @@
} }
} }
} }
.popup-box-content{
background-color: #ffffff;
width: 72vw;
border-radius: 36upx;
}
.popup-box-2{ .popup-box-2{
position: relative;
width: 100%; width: 100%;
border-radius: 20upx 20upx 0 0; background: linear-gradient(0deg, rgba(255,255,255,0.65), rgba(255,214,241,0.43));
.close-box{
position: absolute;
top: 16upx;
right: 20upx;
display: flex;
justify-content: center;
align-items: center;
width: 24px;
height: 24px;
font-size: 36upx;
}
.title-header{ .title-header{
display: flex; display: flex;
justify-content: space-between; justify-content: center;
padding: 30upx 24upx; align-items: center;
.text-icon{ padding: 30upx 24upx 8upx;
font-size: 50upx; border-bottom: none;
color: #ffffff; .text-title{
font-size: 36upx;
color: #333333;
} }
} }
.popup-content{ .popup-content{
padding: 0 24upx;
min-height: 240upx; min-height: 240upx;
.recharge-content{ .recharge-content{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center;
align-items: center;
width: 100%; width: 100%;
.text-1{ .text-1{
font-size: 26upx; font-weight: 400;
font-size: 24upx;
color: #666666;
} }
.payfee-text{ .payfee-text{
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
width: 100%; width: 100%;
font-size: 52upx; padding: 10upx 0 16upx;
color: rgba(224, 57, 151, 1); margin-bottom: 16upx;
font-weight: bolder; border-bottom: 1px dashed #C9CACA;
margin: 24upx 0; text{
font-size: 52rpx;
color: #E40583;
}
} }
.flex-row{ .flex-row{
.text-3{
color: #999999;
}
.flex-col{ .flex-col{
.text-11{
color: rgba(224, 57, 151, 0.9);
}
.text-12{ .text-12{
color: rgba(224, 57, 151, 0.9); width: 77upx;
font-size: 36upx; color: #000000;
font-size: 28upx;
font-weight: bold;
text-align: justify-all;
} }
.text-13{ .text-13{
color: #333333; color: #999999;
font-size: 26upx;
margin-left: 4upx; margin-left: 4upx;
} }
.text-14{ .text-14{
color: rgba(224, 57, 151, 0.9); color: #000000;
} }
} }
} }
.content-tip{
display: flex;
flex-direction: column;
margin: 20upx 0 12upx;
.text-3{
font-size: 28upx;
color: #333333;
margin-bottom: 20upx;
}
.flex-col{
.flex-row-center{
margin: 8upx 0;
.gift-box{
display: flex;
justify-content: center;
align-items: center;
width: 22px;
height: 22px;
background: #FCE8F2;
border-radius: 6px;
.gift-icon{
display: block;
width: 70%;
max-height: 40upx;
}
}
}
}
}
}
}
.btn-list-box{
display: flex;
justify-content: center;
align-items: center;
width: 100%;
border-top: none;
.btn-box{
display: flex;
flex: none;
width: 87%;
.cu-btn{
padding: 0;
width: 100%;
height: 88upx;
background: #E40583;
border-radius: 44upx;
font-size: 37upx;
color: #FFFFFF;
}
} }
} }
} }
......
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 to comment