Skip to content

G
gxpt_wechat
Commit 65d5015b by zhangzhen
Options

细节优化

parent 3e8e1193
Showing with 34 additions and 11 deletions
config/index.config.js
...@@ -2,13 +2,13 @@ const CONFIG = { ...@@ -2,13 +2,13 @@ const CONFIG = {
// 开发环境配置 // 开发环境配置
development: { development: {
// assetsPath: 'https://www.coujio.com/wechat_static', // 静态资源路径 // assetsPath: 'https://www.coujio.com/wechat_static', // 静态资源路径
// assetsPath: 'https://coujiao.pseer.com/wechat_static', // 静态资源路径 assetsPath: 'http://coujiao.pseer.com:8888/wechat_static', // 静态资源路径
assetsPath: 'http://10.24.5.63:8211/static', // 静态资源路径 // assetsPath: 'http://10.24.5.63:8211/static', // 静态资源路径
// 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: 'http://129.211.46.84:8883/front-api', baseUrl: 'https://coujiao.pseer.com/front-api',
hostUrl: 'http://129.211.46.84:8888/prod-api', // H5地址(前端运行地址) hostUrl: 'http://129.211.46.84:8888/prod-api', // H5地址(前端运行地址)
// hostUrl: 'https://coujiao.pseer.com/prod-api', // H5地址(前端运行地址) // hostUrl: 'https://coujiao.pseer.com:8888/prod-api', // H5地址(前端运行地址)
websocketUrl: '', // websocket服务端地址 websocketUrl: '', // websocket服务端地址
weixinAppId: '' ,// 微信公众号appid weixinAppId: '' ,// 微信公众号appid
codeHeadUrl:"", codeHeadUrl:"",
...@@ -16,9 +16,9 @@ const CONFIG = { ...@@ -16,9 +16,9 @@ const CONFIG = {
}, },
// 生产环境配置 // 生产环境配置
production: { production: {
assetsPath: 'http://129.211.46.84: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: 'http://129.211.46.84:8883/front-api', // 后台接口请求地址 baseUrl: 'https://coujiao.pseer.com/front-api', // 后台接口请求地址
// baseUrl: 'https://www.coujio.com/front-api', // 后台接口请求地址 // baseUrl: 'https://www.coujio.com/front-api', // 后台接口请求地址
hostUrl: 'http://129.211.46.84:8888/prod-api', // H5地址(前端运行地址) hostUrl: 'http://129.211.46.84:8888/prod-api', // H5地址(前端运行地址)
// hostUrl: 'https://www.coujio.com/prod-api', // H5地址(前端运行地址) // hostUrl: 'https://www.coujio.com/prod-api', // H5地址(前端运行地址)
......
pages/vipCreate/vipCreate.vue
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
<text class="text-3">{{equityAmountList.length? equityAmountList[1]:'00'}}</text> <text class="text-3">{{equityAmountList.length? equityAmountList[1]:'00'}}</text>
</view> </view>
<view class="cu-btn-box" @tap="onSubmit"> <view class="cu-btn-box" @tap="onSubmit">
<button class="cu-btn bg-pink">立即开通</button> <button class="cu-btn bg-pink"> {{consumerMemberStatus? '权益续期':'立即开通'}}</button>
</view> </view>
</view> </view>
</view> </view>
...@@ -211,6 +211,10 @@ ...@@ -211,6 +211,10 @@
<text class="text-13">时长,下单可抵扣</text> <text class="text-13">时长,下单可抵扣</text>
</view> </view>
<view class="flex-row-center" v-if="rechargeConfList[rechargeIndex].giveType.includes('3')"> <view class="flex-row-center" v-if="rechargeConfList[rechargeIndex].giveType.includes('3')">
<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')">
<text class="text-14">优惠券</text> <text class="text-14">优惠券</text>
<text class="text-13">1张，下单可抵扣</text> <text class="text-13">1张，下单可抵扣</text>
</view> </view>
...@@ -496,6 +500,7 @@ ...@@ -496,6 +500,7 @@
uni.showLoading({ uni.showLoading({
title: "提交中..." title: "提交中..."
}) })
let that = this;
createRecharge({ createRecharge({
payType: 1, payType: 1,
rechargeConfId: this.rechargeConfList[this.rechargeIndex].id rechargeConfId: this.rechargeConfList[this.rechargeIndex].id
...@@ -514,7 +519,12 @@ ...@@ -514,7 +519,12 @@
icon: "success", icon: "success",
title: "下单成功", title: "下单成功",
success: () => { success: () => {
that.$refs.popupPay.close();
setTimeout(()=>{
uni.switchTab({
url:"/pages/my/myInfo"
})
},1000)
} }
}) })
}, },
...@@ -525,6 +535,7 @@ ...@@ -525,6 +535,7 @@
}) })
}, },
"complete": (resp) => { "complete": (resp) => {
that.$refs.popupPay.close();
// 接口调用结束的回调函数（调用成功、失败都会执行） // 接口调用结束的回调函数（调用成功、失败都会执行）
} }
}); });
...@@ -555,8 +566,11 @@ ...@@ -555,8 +566,11 @@
icon: "success", icon: "success",
title: "下单成功", title: "下单成功",
success: () => { success: () => {
that.$refs.popupPay.close();
setTimeout(() => { setTimeout(() => {
that.onGetUserInfo(); uni.switchTab({
url:"/pages/my/myInfo"
})
}, 1000) }, 1000)
} }
}) })
...@@ -568,6 +582,7 @@ ...@@ -568,6 +582,7 @@
}) })
}, },
"complete": (resp) => { "complete": (resp) => {
that.$refs.popupPay.close();
// 接口调用结束的回调函数（调用成功、失败都会执行） // 接口调用结束的回调函数（调用成功、失败都会执行）
} }
}); });
...@@ -1147,7 +1162,8 @@ ...@@ -1147,7 +1162,8 @@
.popup-box{ .popup-box{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background: linear-gradient(-45deg,rgba(255, 170, 0, 0.98), rgba(255,255,255,0.98)); // background: linear-gradient(-45deg,rgba(255, 170, 0, 0.98), rgba(255,255,255,0.98));
background: linear-gradient(-45deg,#ffffff, #f1f1f1);
border-radius: 12upx; border-radius: 12upx;
width: 80%; width: 80%;
margin: 0 auto; margin: 0 auto;
......
setting/recharge/index.vue
...@@ -15,9 +15,15 @@ ...@@ -15,9 +15,15 @@
</view> </view>
<view v-if="item.giveType.includes(2)" class="flex-row"> <view v-if="item.giveType.includes(2)" class="flex-row">
<text>赠送时长</text> <text>赠送时长</text>
<text class="text-pink text-bold text-lg" >{{item.duration}}小时</text> <text class="text-pink text-bold text-lg" >{{item.giveDuration || 0}}</text>
<text>小时</text>
</view> </view>
<view v-if="item.giveType.includes(3)" class="flex-row"> <view v-if="item.giveType.includes(3)" class="flex-row">
<text>赠送</text>
<text class="text-pink text-bold text-lg" >{{item.giveIntegral||0}}</text>
<text>积分</text>
</view>
<view v-if="item.giveType.includes(4)" class="flex-row">
<text>赠送优惠券</text> <text>赠送优惠券</text>
<text class="text-pink text-bold text-lg" >{{item.consumerCouponIds||''}}1张</text> <text class="text-pink text-bold text-lg" >{{item.consumerCouponIds||''}}1张</text>
</view> </view>
...@@ -208,6 +214,7 @@ import NoLogin from "@/components/noLogin/noLogin" ...@@ -208,6 +214,7 @@ import NoLogin from "@/components/noLogin/noLogin"
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: flex-end;
} }
} }
} }
......
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