Showing
5 changed files
with
39 additions
and
4 deletions
| @@ -68,6 +68,10 @@ | @@ -68,6 +68,10 @@ | ||
| 68 | background-color: #E95750; | 68 | background-color: #E95750; |
| 69 | border: 2rpx solid #E95750; | 69 | border: 2rpx solid #E95750; |
| 70 | } | 70 | } |
| 71 | +.board.highlight-yellow .status,.board.disabled-highlight-yellow .status{ | ||
| 72 | + background-color: #F59A23; | ||
| 73 | + border: 2rpx solid #F59A23; | ||
| 74 | +} | ||
| 71 | 75 | ||
| 72 | .board.disabled,.board.disabled-highlight { | 76 | .board.disabled,.board.disabled-highlight { |
| 73 | background-color: #E0E0E0; | 77 | background-color: #E0E0E0; |
| @@ -5,6 +5,7 @@ | @@ -5,6 +5,7 @@ | ||
| 5 | padding:0 40rpx; | 5 | padding:0 40rpx; |
| 6 | box-sizing:border-box; | 6 | box-sizing:border-box; |
| 7 | border-bottom: 2rpx solid #F1F0F4; | 7 | border-bottom: 2rpx solid #F1F0F4; |
| 8 | + position: relative; | ||
| 8 | } | 9 | } |
| 9 | .book-list-td{ | 10 | .book-list-td{ |
| 10 | width:25%; | 11 | width:25%; |
| @@ -19,4 +20,20 @@ | @@ -19,4 +20,20 @@ | ||
| 19 | } | 20 | } |
| 20 | .reserve-status-4 .green-font,.reserve-status-3 .green-font,.reserve-status-6 .green-font{ | 21 | .reserve-status-4 .green-font,.reserve-status-3 .green-font,.reserve-status-6 .green-font{ |
| 21 | color:#999999; | 22 | color:#999999; |
| 23 | +} | ||
| 24 | +.checkout{ | ||
| 25 | + position: absolute; | ||
| 26 | + left: 0; | ||
| 27 | + top:0; | ||
| 28 | + width:104rpx; | ||
| 29 | + height:38rpx; | ||
| 30 | + background:rgba(245,154,35,1); | ||
| 31 | + border-radius:0rpx 0rpx 10rpx 0rpx; | ||
| 32 | + | ||
| 33 | + font-size:24rpx; | ||
| 34 | + font-family:PingFangSC-Semibold,PingFang SC; | ||
| 35 | + font-weight:600; | ||
| 36 | + color:rgba(255,255,255,1); | ||
| 37 | + line-height:38rpx; | ||
| 38 | + text-align: center; | ||
| 22 | } | 39 | } |
| @@ -169,6 +169,10 @@ Page({ | @@ -169,6 +169,10 @@ Page({ | ||
| 169 | id:r.id, | 169 | id:r.id, |
| 170 | status:r.status, | 170 | status:r.status, |
| 171 | rname:rname, | 171 | rname:rname, |
| 172 | + checkout:{} | ||
| 173 | + } | ||
| 174 | + if(r.order_info){ | ||
| 175 | + tids[tid].checkout.status=r.order_info.status | ||
| 172 | } | 176 | } |
| 173 | }) | 177 | }) |
| 174 | }) | 178 | }) |
| @@ -193,10 +197,14 @@ Page({ | @@ -193,10 +197,14 @@ Page({ | ||
| 193 | tb.status_classname='highlight'; | 197 | tb.status_classname='highlight'; |
| 194 | tb.reserve_id=tids[tb.id].id; | 198 | tb.reserve_id=tids[tb.id].id; |
| 195 | tb.reserve_name=tids[tb.id].rname; | 199 | tb.reserve_name=tids[tb.id].rname; |
| 200 | + if(tids[tb.id].checkout.status==3){//已买单 | ||
| 201 | + tb.status_str='已买单'; | ||
| 202 | + tb.status_classname='highlight-yellow'; | ||
| 203 | + } | ||
| 196 | } | 204 | } |
| 197 | if(tb.enable!=1){ | 205 | if(tb.enable!=1){ |
| 198 | if(tb.status_str){ | 206 | if(tb.status_str){ |
| 199 | - tb.status_classname='disabled-highlight'; | 207 | + tb.status_classname='disabled-'+tb.status_classname; |
| 200 | }else{ | 208 | }else{ |
| 201 | tb.status_str='已停用'; | 209 | tb.status_str='已停用'; |
| 202 | tb.status_classname='disabled'; | 210 | tb.status_classname='disabled'; |
| 1 | { | 1 | { |
| 2 | "description": "项目配置文件。", | 2 | "description": "项目配置文件。", |
| 3 | "setting": { | 3 | "setting": { |
| 4 | - "urlCheck": true, | 4 | + "urlCheck": false, |
| 5 | "es6": true, | 5 | "es6": true, |
| 6 | "enhance": true, | 6 | "enhance": true, |
| 7 | "postcss": true, | 7 | "postcss": true, |
| 8 | + "preloadBackgroundData": false, | ||
| 8 | "minified": true, | 9 | "minified": true, |
| 9 | "newFeature": true, | 10 | "newFeature": true, |
| 10 | "coverView": true, | 11 | "coverView": true, |
| 11 | "nodeModules": true, | 12 | "nodeModules": true, |
| 12 | "autoAudits": false, | 13 | "autoAudits": false, |
| 13 | "showShadowRootInWxmlPanel": true, | 14 | "showShadowRootInWxmlPanel": true, |
| 14 | - "scopeDataCheck": true, | 15 | + "scopeDataCheck": false, |
| 15 | "uglifyFileName": false, | 16 | "uglifyFileName": false, |
| 16 | "checkInvalidKey": true, | 17 | "checkInvalidKey": true, |
| 17 | "checkSiteMap": true, | 18 | "checkSiteMap": true, |
| @@ -21,7 +22,11 @@ | @@ -21,7 +22,11 @@ | ||
| 21 | "disablePlugins": [], | 22 | "disablePlugins": [], |
| 22 | "outputPath": "" | 23 | "outputPath": "" |
| 23 | }, | 24 | }, |
| 24 | - "preloadBackgroundData": false | 25 | + "useIsolateContext": true, |
| 26 | + "useCompilerModule": true, | ||
| 27 | + "userConfirmedUseCompilerModuleSwitch": false, | ||
| 28 | + "packNpmManually": false, | ||
| 29 | + "packNpmRelationList": [] | ||
| 25 | }, | 30 | }, |
| 26 | "compileType": "miniprogram", | 31 | "compileType": "miniprogram", |
| 27 | "libVersion": "2.10.1", | 32 | "libVersion": "2.10.1", |
-
Please register or login to post a comment