Commit 03282775 by songbingqi

修复部分bug

parent 6527b804
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</view> </view>
<view :style="[priceDescColor]" class="price_desc">{{info.priceDesc}}</view> <view :style="[priceDescColor]" class="price_desc">{{info.priceDesc}}</view>
</view> </view>
<view class="one_right"> <view class="one_right" @click="selected(info)">
<view class="right_top"> <view class="right_top">
<view class="info"> <view class="info">
<view :style="[titleColor]" class="title">{{info.title}}</view> <view :style="[titleColor]" class="title">{{info.title}}</view>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</view> </view>
<view class="action"> <view class="action">
<view v-if="type==='use'"> <view v-if="type==='use'">
<view class="check" @click="selected(info)" :class="info.checkStatus?'checked':'nochecked'"></view> <view class="check" :class="info.checkStatus?'checked':'nochecked'"></view>
</view> </view>
<view v-else> <view v-else>
<view v-if="info.status===0"> <view v-if="info.status===0">
......
...@@ -59,7 +59,7 @@ export default { ...@@ -59,7 +59,7 @@ export default {
let timeStart = '' let timeStart = ''
let timeEnd = '' let timeEnd = ''
if(item.useStartTime){ if(item.useStartTime){
timeStart = Date.parse(item.useStartTime)<new Date().valueOf()<Date.parse(item.useEndTime)?'':item.useStartTime.slice(0,11).replace(new RegExp('-','g'), '.') timeStart = Date.parse(item.useStartTime.replace(/-/g,'/'))<new Date().valueOf()<Date.parse(item.useEndTime.replace(/-/g,'/'))?'':item.useStartTime.slice(0,11).replace(new RegExp('-','g'), '.')
} }
if(item.useEndTime){ if(item.useEndTime){
timeEnd = item.useEndTime.slice(0,11).replace(new RegExp('-','g'), '.') timeEnd = item.useEndTime.slice(0,11).replace(new RegExp('-','g'), '.')
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<view class="label">生日</view> <view class="label">生日</view>
<view class="input"> <view class="input">
<view class="birthdayBox"> <view class="birthdayBox">
<view class="text">{{birthdayComuted}}</view> <view :class="canEditBirthday?'text':'textDisabled'">{{birthdayComuted}}</view>
<view class="btn" v-if="canEditBirthday" @click="changeBirthday">修改</view> <view class="btn" v-if="canEditBirthday" @click="changeBirthday">修改</view>
</view> </view>
</view> </view>
...@@ -145,7 +145,7 @@ export default { ...@@ -145,7 +145,7 @@ export default {
if(!birthday){ if(!birthday){
this.userInfo.birthday = new Date(createTime.replace(/-/g,'/')).valueOf() this.userInfo.birthday = new Date(createTime.replace(/-/g,'/')).valueOf()
}else{ }else{
this.userInfo.birthday = new Date(birthday.replace(/-/g,'/')).valueOf() this.userInfo.birthday = Date.parse(birthday)
} }
this.userInfo.avatarUrl = avatarUrl this.userInfo.avatarUrl = avatarUrl
...@@ -306,7 +306,9 @@ export default { ...@@ -306,7 +306,9 @@ export default {
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
.textDisabled {
color: #999999;
}
.btn { .btn {
width: 96rpx; width: 96rpx;
height: 48rpx; height: 48rpx;
......
...@@ -17,7 +17,7 @@ const order = { ...@@ -17,7 +17,7 @@ const order = {
let timeStart = '' let timeStart = ''
let timeEnd = '' let timeEnd = ''
if(item.useStartTime){ if(item.useStartTime){
timeStart = Date.parse(item.useStartTime)<new Date().valueOf()<Date.parse(item.useEndTime)?'':item.useStartTime.slice(0,11).replace(new RegExp('-','g'), '.') timeStart = Date.parse(item.useStartTime.replace(/-/g,'/'))<new Date().valueOf()<Date.parse(item.useEndTime.replace(/-/g,'/'))?'':item.useStartTime.slice(0,11).replace(new RegExp('-','g'), '.')
} }
if(item.useEndTime){ if(item.useEndTime){
timeEnd = item.useEndTime.slice(0,11).replace(new RegExp('-','g'), '.') timeEnd = item.useEndTime.slice(0,11).replace(new RegExp('-','g'), '.')
...@@ -59,7 +59,7 @@ const order = { ...@@ -59,7 +59,7 @@ const order = {
let timeStart = '' let timeStart = ''
let timeEnd = '' let timeEnd = ''
if(item.useStartTime){ if(item.useStartTime){
timeStart = Date.parse(item.useStartTime)<new Date().valueOf()<Date.parse(item.useEndTime)?'':item.useStartTime.slice(0,11).replace(new RegExp('-','g'), '.') timeStart = Date.parse(item.useStartTime.replace(/-/g,'/'))<new Date().valueOf()<Date.parse(item.useEndTime.replace(/-/g,'/'))?'':item.useStartTime.slice(0,11).replace(new RegExp('-','g'), '.')
} }
if(item.useEndTime){ if(item.useEndTime){
timeEnd = item.useEndTime.slice(0,11).replace(new RegExp('-','g'), '.') timeEnd = item.useEndTime.slice(0,11).replace(new RegExp('-','g'), '.')
......
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