Showing
4 changed files
with
12 additions
and
4 deletions
| @@ -133,6 +133,7 @@ Page({ | @@ -133,6 +133,7 @@ Page({ | ||
| 133 | hasOwner:true, | 133 | hasOwner:true, |
| 134 | type:reserev.type, | 134 | type:reserev.type, |
| 135 | is_set_ddate:reserev.is_set_ddate, | 135 | is_set_ddate:reserev.is_set_ddate, |
| 136 | + hasUpTime:reserev.type==1 && reserev.hasRunning && reserev.status!=2, | ||
| 136 | } | 137 | } |
| 137 | }) | 138 | }) |
| 138 | App.Reserve.SellerInfo({seller_id:reserev.seller.id}).then(async sc=>{ | 139 | App.Reserve.SellerInfo({seller_id:reserev.seller.id}).then(async sc=>{ |
| @@ -20,9 +20,9 @@ | @@ -20,9 +20,9 @@ | ||
| 20 | 时间 | 20 | 时间 |
| 21 | <view class="title-right"></view> | 21 | <view class="title-right"></view> |
| 22 | </view> | 22 | </view> |
| 23 | - <view class="content flex-cc"> | 23 | + <view class="content flex-cc date-time"> |
| 24 | {{date}} | 24 | {{date}} |
| 25 | - <view class="upTime" bindtap="upTime" wx:if="{{is_set_ddate==0 && type==1}}">修改时间</view> | 25 | + <view class="upTime" bindtap="upTime" wx:if="{{hasUpTime}}">{{is_set_ddate==0?'添加时间':'修改时间'}}</view> |
| 26 | </view> | 26 | </view> |
| 27 | <view class="title title-addr-view flex-cc" bindtap="lookLocation"> | 27 | <view class="title title-addr-view flex-cc" bindtap="lookLocation"> |
| 28 | <view class="title-addr"></view> | 28 | <view class="title-addr"></view> |
| @@ -255,6 +255,11 @@ | @@ -255,6 +255,11 @@ | ||
| 255 | height: 40rpx; | 255 | height: 40rpx; |
| 256 | line-height: 40rpx; | 256 | line-height: 40rpx; |
| 257 | } | 257 | } |
| 258 | +.date-time{ | ||
| 259 | + position: relative; | ||
| 260 | + height: 50rpx; | ||
| 261 | + line-height: 50rpx; | ||
| 262 | +} | ||
| 258 | .upTime{ | 263 | .upTime{ |
| 259 | width: 92rpx; | 264 | width: 92rpx; |
| 260 | height: 34rpx; | 265 | height: 34rpx; |
| @@ -262,5 +267,7 @@ | @@ -262,5 +267,7 @@ | ||
| 262 | font-size: 20rpx; | 267 | font-size: 20rpx; |
| 263 | background-color: #ECD9B7; | 268 | background-color: #ECD9B7; |
| 264 | color: #794F28; | 269 | color: #794F28; |
| 265 | - margin-left: 20rpx; | 270 | + position: absolute; |
| 271 | + right:0; | ||
| 272 | + top:8rpx; | ||
| 266 | } | 273 | } |
| @@ -359,7 +359,7 @@ | @@ -359,7 +359,7 @@ | ||
| 359 | "id": 40, | 359 | "id": 40, |
| 360 | "name": "邀请Ren pages/customer/index ", | 360 | "name": "邀请Ren pages/customer/index ", |
| 361 | "pathName": "pages/customer/detail_owner_invitation", | 361 | "pathName": "pages/customer/detail_owner_invitation", |
| 362 | - "query": "id=25569&fromid=test&hasInvitation=1&hasSellerShare=1&tplid=1", | 362 | + "query": "id= 45539&fromid=test&hasInvitation=1&hasSellerShare=1&tplid=1", |
| 363 | "scene": null | 363 | "scene": null |
| 364 | }, | 364 | }, |
| 365 | { | 365 | { |
-
Please register or login to post a comment