Commit 4611865f by zhangzhen

功能和细节完善

parent 03ae9fd5
...@@ -2,13 +2,12 @@ const CONFIG = { ...@@ -2,13 +2,12 @@ const CONFIG = {
// 开发环境配置 // 开发环境配置
development: { development: {
// assetsPath: 'https://www.coujio.com/wechat_static', // 静态资源路径 // assetsPath: 'https://www.coujio.com/wechat_static', // 静态资源路径
// assetsPath: 'http://coujiao.pseer.com:8888/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: 'https://coujiao.pseer.com/front-api', // hostUrl: 'http://coujiao.pseer.com:8888/prod-api', // H5地址(前端运行地址)
hostUrl: 'http://coujiao.pseer.com: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:"",
...@@ -20,7 +19,7 @@ const CONFIG = { ...@@ -20,7 +19,7 @@ const CONFIG = {
// 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: 'http://coujiao.pseer.com:8888/prod-api', // H5地址(前端运行地址) hostUrl: 'https://coujiao.pseer.com/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
......
...@@ -437,7 +437,7 @@ ...@@ -437,7 +437,7 @@
if(this.userInfo.consumerMember && this.userInfo.consumerMember.expirationDate){ if(this.userInfo.consumerMember && this.userInfo.consumerMember.expirationDate){
let dateTime = moment(`${this.userInfo.consumerMember.expirationDate} 23:59:59`).valueOf(); let dateTime = moment(`${this.userInfo.consumerMember.expirationDate} 23:59:59`).valueOf();
let nowDateTime = moment().valueOf(); let nowDateTime = moment().valueOf();
if(dateTime-nowDateTime < 3*24*3600*1000){ if(dateTime-nowDateTime < 3.5*24*3600*1000){
this.$refs.popupVipTip.open(); this.$refs.popupVipTip.open();
} }
} }
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<text class="text-2">权益会员</text> <text class="text-2">权益会员</text>
</view> </view>
</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> <image class="img-icon" :src="assetsPath+'/tag_icon_3.png'" mode="widthFix"></image>
<view class="absolute"> <view class="absolute">
<text class="text-3">普通会员</text> <text class="text-3">普通会员</text>
......
...@@ -116,8 +116,9 @@ ...@@ -116,8 +116,9 @@
} }
}) })
list.sort((a,b)=> a.membershipLevel-b.membershipLevel) list.sort((a,b)=> a.membershipLevel-b.membershipLevel)
this.list = [] this.list = list
if(this.userInfo.memberConfig && this.userInfo.memberConfig.membershipLevel>=0){ if(this.userInfo.memberConfig && this.userInfo.memberConfig.membershipLevel>=0){
this.list = [];
this.list.push(list.find(item => item.membershipLevel === this.userInfo.memberConfig.membershipLevel)) this.list.push(list.find(item => item.membershipLevel === this.userInfo.memberConfig.membershipLevel))
list.forEach(item => { list.forEach(item => {
if(item.membershipLevel !== this.userInfo.memberConfig.membershipLevel){ if(item.membershipLevel !== this.userInfo.memberConfig.membershipLevel){
...@@ -125,7 +126,6 @@ ...@@ -125,7 +126,6 @@
} }
}) })
} }
} }
}) })
}, },
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class="order-record"> <view class="order-record">
<view v-if="loginStatus" class="content-box"> <view v-if="loginStatus" class="content-box">
<view class="list-content"> <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="flex-between part-1">
<view class=""> <view class="">
<text class="text-title">{{item.operationType? '增加' : "消费"}}</text> <text class="text-title">{{item.operationType? '增加' : "消费"}}</text>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class="order-record"> <view class="order-record">
<view v-if="loginStatus" class="content-box"> <view v-if="loginStatus" class="content-box">
<view class="list-content"> <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="flex-between part-1">
<view class=""> <view class="">
<text class="text-title">{{item.operationType? '增加' : "消费"}}</text> <text class="text-title">{{item.operationType? '增加' : "消费"}}</text>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class="order-record"> <view class="order-record">
<view v-if="loginStatus" class="content-box"> <view v-if="loginStatus" class="content-box">
<view class="list-content"> <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="flex-between part-1">
<view class=""> <view class="">
<text class="text-title">{{item.operationType? '增加' : "消费"}}</text> <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