Skip to content

G
gxpt_wechat
Commit 4611865f by zhangzhen
Options

功能和细节完善

parent 03ae9fd5
Showing with 13 additions and 14 deletions
config/index.config.js
......@@ -2,13 +2,12 @@ const CONFIG = {
// 开发环境配置
development: {
// assetsPath: 'https://www.coujio.com/wechat_static', // 静态资源路径
// assetsPath: 'http://coujiao.pseer.com:8888/wechat_static', // 静态资源路径
assetsPath: 'http://10.24.5.63:8211/static', // 静态资源路径
assetsPath: 'http://coujiao.pseer.com:8888/wechat_static', // 静态资源路径
// assetsPath: 'http://10.24.5.63:8211/static', // 静态资源路径
// baseUrl: 'https://www.coujio.com/front-api', // 后台接口请求地址
// baseUrl: 'https://coujiao.pseer.com/front-api', // 后台接口请求地址
baseUrl: 'https://coujiao.pseer.com/front-api',
hostUrl: 'http://coujiao.pseer.com:8888/prod-api', // H5地址(前端运行地址)
// hostUrl: 'https://coujiao.pseer.com:8888/prod-api', // H5地址(前端运行地址)
baseUrl: 'https://coujiao.pseer.com/front-api', // 后台接口请求地址
// hostUrl: 'http://coujiao.pseer.com:8888/prod-api', // H5地址(前端运行地址)
hostUrl: 'https://coujiao.pseer.com/prod-api', // H5地址(前端运行地址)
websocketUrl: '', // websocket服务端地址
weixinAppId: '' ,// 微信公众号appid
codeHeadUrl:"",
......@@ -20,7 +19,7 @@ const CONFIG = {
// assetsPath: 'https://www.coujio.com/wechat_static', // 静态资源路径
baseUrl: 'https://coujiao.pseer.com/front-api', // 后台接口请求地址
// baseUrl: 'https://www.coujio.com/front-api', // 后台接口请求地址
hostUrl: 'http://coujiao.pseer.com:8888/prod-api', // H5地址(前端运行地址)
hostUrl: 'https://coujiao.pseer.com/prod-api', // H5地址(前端运行地址)
// hostUrl: 'https://www.coujio.com/prod-api', // H5地址(前端运行地址)
websocketUrl: '', // websocket服务端地址
weixinAppId: '', // 微信公众号appid
......
pages/index/index.vue
......@@ -437,7 +437,7 @@
if(this.userInfo.consumerMember && this.userInfo.consumerMember.expirationDate){
let dateTime = moment(`${this.userInfo.consumerMember.expirationDate} 23:59:59`).valueOf();
let nowDateTime = moment().valueOf();
if(dateTime-nowDateTime < 3*24*3600*1000){
if(dateTime-nowDateTime < 3.5*24*3600*1000){
this.$refs.popupVipTip.open();
}
}
......
pages/my/myInfo.vue
......@@ -26,7 +26,7 @@
<text class="text-2">权益会员</text>
</view>
</view>
<view v-if="!userInfo.consumerMember || !(userInfo.consumerMember && userInfo.consumerMember.isRights && userInfo.consumerMember.isRecharge) " class="relative" @tap.stop="onNavToVip">
<view v-if="!userInfo.consumerMember || !(userInfo.consumerMember && (userInfo.consumerMember.isRights || userInfo.consumerMember.isRecharge)) " class="relative" @tap.stop="onNavToVip">
<image class="img-icon" :src="assetsPath+'/tag_icon_3.png'" mode="widthFix"></image>
<view class="absolute">
<text class="text-3">普通会员</text>
......
setting/levelDetail/index.vue
......@@ -116,8 +116,9 @@
}
})
list.sort((a,b)=> a.membershipLevel-b.membershipLevel)
this.list = []
this.list = list
if(this.userInfo.memberConfig && this.userInfo.memberConfig.membershipLevel>=0){
this.list = [];
this.list.push(list.find(item => item.membershipLevel === this.userInfo.memberConfig.membershipLevel))
list.forEach(item => {
if(item.membershipLevel !== this.userInfo.memberConfig.membershipLevel){
......@@ -125,7 +126,6 @@
}
})
}
}
})
},
......
setting/recharge/duration.vue
......@@ -2,7 +2,7 @@
<view class="order-record">
<view v-if="loginStatus" class="content-box">
<view class="list-content">
<view v-for="(item,index) in list" :key="index" class="list-item" @tap="onNavToOrderInfo(item)">
<view v-for="(item,index) in list" :key="index" class="list-item" >
<view class="flex-between part-1">
<view class="">
<text class="text-title">{{item.operationType? '增加' : "消费"}}</text>
......
setting/recharge/integral.vue
......@@ -2,7 +2,7 @@
<view class="order-record">
<view v-if="loginStatus" class="content-box">
<view class="list-content">
<view v-for="(item,index) in list" :key="index" class="list-item" @tap="onNavToOrderInfo(item)">
<view v-for="(item,index) in list" :key="index" class="list-item" >
<view class="flex-between part-1">
<view class="">
<text class="text-title">{{item.operationType? '增加' : "消费"}}</text>
......
setting/recharge/record.vue
......@@ -2,7 +2,7 @@
<view class="order-record">
<view v-if="loginStatus" class="content-box">
<view class="list-content">
<view v-for="(item,index) in list" :key="index" class="list-item" @tap="onNavToOrderInfo(item)">
<view v-for="(item,index) in list" :key="index" class="list-item">
<view class="flex-between part-1">
<view class="">
<text class="text-title">{{item.operationType? '增加' : "消费"}}</text>
......
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