吃个甘蔗嚼一年 3 years ago
parent
commit
a26e51b8f4

+ 16
- 14
src/components/CollectList/MyCollect/style.less View File

1
 .View-box-LR {
1
 .View-box-LR {
2
-  margin: 30px 0;  
2
+  margin: 30px 0;
3
   .cpn-card-text {
3
   .cpn-card-text {
4
     font-size: 24px;
4
     font-size: 24px;
5
     font-weight: 400;
5
     font-weight: 400;
31
     display: flex;
31
     display: flex;
32
     margin-top: 10px;
32
     margin-top: 10px;
33
     position: relative;
33
     position: relative;
34
-    .wdscbaozan{
35
-    .title-on {
36
-      width: 28px;
37
-      height: 28px;
38
-      padding-right: 10px;
34
+    .wdscbaozan {
39
       position: relative;
35
       position: relative;
40
-      top: 0.1em;
41
-    }
42
-    .title-on-text {
43
-      align-items: center;
44
-      font-size: 22px;
45
-      color: #333;
36
+      left: 5vh;
37
+      .title-on {
38
+        width: 28px;
39
+        height: 28px;
40
+        padding-right: 10px;
41
+        position: relative;
42
+        top: 0.1em;
43
+      }
44
+      .title-on-text {
45
+        align-items: center;
46
+        font-size: 22px;
47
+        color: #333;
48
+      }
46
     }
49
     }
47
   }
50
   }
48
-  }
49
-}
51
+}

+ 5
- 3
src/components/CompoentsOrder/OrderCard/index.jsx View File

103
                     <view className={item.isVerified == 1 ? 'title-time' : ''}>
103
                     <view className={item.isVerified == 1 ? 'title-time' : ''}>
104
                       {
104
                       {
105
                         sh == 1 ? '有效期:' + formatTime(item.endTime, "yyyy/MM/dd") :
105
                         sh == 1 ? '有效期:' + formatTime(item.endTime, "yyyy/MM/dd") :
106
-                          item.isVerified == 1 ? '核销时间 :' + formatTime(item?.verifiedDate, "yyyy/MM/dd") :
106
+                          item.isVerified == 1 ? '' + formatTime(item?.verifiedDate, "yyyy/MM/dd hh:mm:ss") :
107
                             '有效期:' + formatTime(item?.startTime, "yyyy/MM/dd") + '-' +
107
                             '有效期:' + formatTime(item?.startTime, "yyyy/MM/dd") + '-' +
108
                             formatTime(item.endTime, "yyyy/MM/dd")
108
                             formatTime(item.endTime, "yyyy/MM/dd")
109
                       }
109
                       }
115
           </CouponCard>
115
           </CouponCard>
116
         </SlideViewOrder>
116
         </SlideViewOrder>
117
           :
117
           :
118
-          <CouponCard action={PayAction}>
118
+          <CouponCard onClick={() => {
119
+            item.status === 1 && item.isVerified == false ? Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` }) : ''
120
+          }} action={PayAction} >
119
             <CouponMedia>
121
             <CouponMedia>
120
               <CouponMedia.Header
122
               <CouponMedia.Header
121
                 cashback={item.cashback}
123
                 cashback={item.cashback}
137
                     <view className={item.isVerified == 1 ? 'title-time' : ''}>
139
                     <view className={item.isVerified == 1 ? 'title-time' : ''}>
138
                       {
140
                       {
139
                         sh == 1 ? '有效期:' + formatTime(item.endTime, "yyyy/MM/dd") :
141
                         sh == 1 ? '有效期:' + formatTime(item.endTime, "yyyy/MM/dd") :
140
-                          item.isVerified == 1 ? '核销时间 :' + formatTime(item?.verifiedDate, "yyyy/MM/dd") :
142
+                          item.isVerified == 1 ? '' + formatTime(item?.verifiedDate, "yyyy/MM/dd hh:mm:ss") :
141
                             '有效期:' + formatTime(item?.startTime, "yyyy/MM/dd") + '-' +
143
                             '有效期:' + formatTime(item?.startTime, "yyyy/MM/dd") + '-' +
142
                             formatTime(item.endTime, "yyyy/MM/dd")
144
                             formatTime(item.endTime, "yyyy/MM/dd")
143
                       }
145
                       }

+ 7
- 6
src/hotel/pages/landlord/landlord.less View File

1
-.bottomTab{
1
+.bottomTab {
2
   height: 98px;
2
   height: 98px;
3
   line-height: 98px;
3
   line-height: 98px;
4
-  font-size: 30px;     
4
+  font-size: 30px;
5
   font-weight: bold;
5
   font-weight: bold;
6
   color: #202020;
6
   color: #202020;
7
-  .incomeTab{
7
+
8
+  .incomeTab {
8
     color: #666;
9
     color: #666;
9
   }
10
   }
10
-  .houseTab{
11
+  .houseTab {
11
     color: #666;
12
     color: #666;
12
   }
13
   }
13
-  image{
14
+  image {
14
     width: 31px;
15
     width: 31px;
15
     height: 31px;
16
     height: 31px;
16
     position: relative;
17
     position: relative;
17
     top: 7px;
18
     top: 7px;
18
     margin-right: 12px;
19
     margin-right: 12px;
19
   }
20
   }
20
-}
21
+}

+ 1
- 1
src/pages/details/foodDetails/foodDetails.jsx View File

272
           }
272
           }
273
         </scroll-view>
273
         </scroll-view>
274
       </SpinBox>
274
       </SpinBox>
275
-      <view className='bottomTab custom-tabbar'>
275
+      <view className='bottomTab'>
276
         <Button openType='share' className='sharebtn'>
276
         <Button openType='share' className='sharebtn'>
277
           分享
277
           分享
278
         </Button>
278
         </Button>

+ 2
- 0
src/pages/details/foodDetails/foodDetails.less View File

187
   border-radius: 12px;
187
   border-radius: 12px;
188
   column-count: 3;
188
   column-count: 3;
189
   text-align: center;
189
   text-align: center;
190
+  height: 6em;
191
+
190
   .sharebtn {
192
   .sharebtn {
191
     position: absolute;
193
     position: absolute;
192
     width: 260px;
194
     width: 260px;

+ 63
- 57
src/pages/details/mjDetails/sceneryDetails.less View File

1
-.storeDetails{
2
-  background-color: #fff;  
1
+.storeDetails {
2
+  background-color: #fff;
3
   border-radius: 12px;
3
   border-radius: 12px;
4
   margin-bottom: 20px;
4
   margin-bottom: 20px;
5
-  .swiper{
5
+  .swiper {
6
     height: calc((100vw - 60px) * 0.6);
6
     height: calc((100vw - 60px) * 0.6);
7
   }
7
   }
8
-  .storeImage{
8
+  .storeImage {
9
     position: relative;
9
     position: relative;
10
     border-radius: 22px;
10
     border-radius: 22px;
11
     width: 100%;
11
     width: 100%;
12
     height: 100%;
12
     height: 100%;
13
-    .tpPage{
13
+    .tpPage {
14
       position: absolute;
14
       position: absolute;
15
       right: 20px;
15
       right: 20px;
16
       bottom: 20px;
16
       bottom: 20px;
17
       background: #000000;
17
       background: #000000;
18
-      border-radius: 16px;  
19
-      font-size: 24px;       
20
-      color: #FFFFFF;
21
-      padding:0 7px;
22
-      opacity: 0.4;  
18
+      border-radius: 16px;
19
+      font-size: 24px;
20
+      color: #ffffff;
21
+      padding: 0 7px;
22
+      opacity: 0.4;
23
       line-height: 32px;
23
       line-height: 32px;
24
       padding: 7px 8px 8px 7px;
24
       padding: 7px 8px 8px 7px;
25
-      text{
25
+      text {
26
         opacity: 0.64;
26
         opacity: 0.64;
27
       }
27
       }
28
     }
28
     }
29
-  }  
30
-  .storeJs{
29
+  }
30
+  .storeJs {
31
     padding: 22px;
31
     padding: 22px;
32
-    .introduce{
32
+    .introduce {
33
       display: inline-block;
33
       display: inline-block;
34
-      .storeName{
35
-        font-size: 32px;         
34
+      .storeName {
35
+        font-size: 32px;
36
         font-weight: bold;
36
         font-weight: bold;
37
         color: #020200;
37
         color: #020200;
38
       }
38
       }
39
     }
39
     }
40
-    .bz{
40
+    .bz {
41
       float: right;
41
       float: right;
42
-      .bzRight{
43
-        font-size: 24px;         
42
+      .bzRight {
43
+        font-size: 24px;
44
         color: #202020;
44
         color: #202020;
45
         line-height: 34px;
45
         line-height: 34px;
46
         height: 23px;
46
         height: 23px;
47
       }
47
       }
48
     }
48
     }
49
-    .wz{
50
-      font-size: 24px;      
49
+    .wz {
50
+      font-size: 24px;
51
       padding: 30rpx 0 32rpx 0;
51
       padding: 30rpx 0 32rpx 0;
52
       font-weight: bold;
52
       font-weight: bold;
53
       color: #404040;
53
       color: #404040;
54
     }
54
     }
55
-    .dpPosition{
55
+    .dpPosition {
56
       position: relative;
56
       position: relative;
57
-      .dwTip{
57
+      .dwTip {
58
         width: 28px;
58
         width: 28px;
59
         height: 28px;
59
         height: 28px;
60
         position: absolute;
60
         position: absolute;
61
         top: 4px;
61
         top: 4px;
62
-        left:0;
62
+        left: 0;
63
       }
63
       }
64
-      .distance{
64
+      .distance {
65
         padding-left: 38px;
65
         padding-left: 38px;
66
-        font-size: 24px;         
67
-        color: #C0C8D3;        
68
-        .zhuandao{
66
+        font-size: 24px;
67
+        color: #c0c8d3;
68
+        .zhuandao {
69
           width: 14px;
69
           width: 14px;
70
           height: 24px;
70
           height: 24px;
71
           transform: rotate(180deg);
71
           transform: rotate(180deg);
72
           position: relative;
72
           position: relative;
73
           left: 8px;
73
           left: 8px;
74
           top: 5px;
74
           top: 5px;
75
-        }        
75
+        }
76
       }
76
       }
77
     }
77
     }
78
   }
78
   }
79
 }
79
 }
80
-.jdjs{
81
-  background: #FFF;
80
+.jdjs {
81
+  background: #fff;
82
   border-radius: 12px 12px 0px 0px;
82
   border-radius: 12px 12px 0px 0px;
83
   padding: 30px 20px 43px 20px;
83
   padding: 30px 20px 43px 20px;
84
   text-align: justify;
84
   text-align: justify;
85
-  font-size: 24px;   
85
+  font-size: 24px;
86
   font-weight: bold;
86
   font-weight: bold;
87
   color: #202020;
87
   color: #202020;
88
   line-height: 54px;
88
   line-height: 54px;
89
   overflow: hidden;
89
   overflow: hidden;
90
-  .line{
90
+  .line {
91
     height: 1px;
91
     height: 1px;
92
     background: #000;
92
     background: #000;
93
     opacity: 0.1;
93
     opacity: 0.1;
94
-    margin:57px 0 42px 0;
94
+    margin: 57px 0 42px 0;
95
   }
95
   }
96
-  .sc{
97
-    font-size: 20px;     
96
+  .sc {
97
+    font-size: 20px;
98
     font-weight: bold;
98
     font-weight: bold;
99
     color: #333;
99
     color: #333;
100
     float: right;
100
     float: right;
101
     line-height: 0;
101
     line-height: 0;
102
     margin-right: 4px;
102
     margin-right: 4px;
103
-    .scTip{
103
+    .scTip {
104
       width: 20px;
104
       width: 20px;
105
       height: 20px;
105
       height: 20px;
106
       margin-right: 8px;
106
       margin-right: 8px;
107
     }
107
     }
108
   }
108
   }
109
 }
109
 }
110
-.title{
111
-  margin: 60px 0 40px 0; 
112
-  font-size: 34px;      
110
+.title {
111
+  margin: 60px 0 40px 0;
112
+  font-size: 34px;
113
   font-weight: bold;
113
   font-weight: bold;
114
   color: #202020;
114
   color: #202020;
115
-  image{
115
+  image {
116
     width: 30px;
116
     width: 30px;
117
     height: 30px;
117
     height: 30px;
118
     margin-right: 10px;
118
     margin-right: 10px;
119
   }
119
   }
120
 }
120
 }
121
-.showMore{
121
+.showMore {
122
   width: 100%;
122
   width: 100%;
123
-  background: linear-gradient(0deg, rgba(248, 248, 248, 0.58) 42%, rgba(248, 248, 248, 0) 100%);
123
+  background: linear-gradient(
124
+    0deg,
125
+    rgba(248, 248, 248, 0.58) 42%,
126
+    rgba(248, 248, 248, 0) 100%
127
+  );
124
   font-size: 28px;
128
   font-size: 28px;
125
   font-weight: bold;
129
   font-weight: bold;
126
   color: #202020;
130
   color: #202020;
129
   bottom: -130px;
133
   bottom: -130px;
130
   padding-top: 77px;
134
   padding-top: 77px;
131
   padding-bottom: 20px;
135
   padding-bottom: 20px;
132
-  .moreTip{
136
+  .moreTip {
133
     width: 38px;
137
     width: 38px;
134
     height: 19px;
138
     height: 19px;
135
     margin-top: 14px;
139
     margin-top: 14px;
136
   }
140
   }
137
 }
141
 }
138
 
142
 
139
-.bottom{
140
-  font-size: 28px;    
141
-  color: #C0C8D3;
143
+.bottom {
144
+  font-size: 28px;
145
+  color: #c0c8d3;
142
   line-height: 34px;
146
   line-height: 34px;
143
   text-align: center;
147
   text-align: center;
144
-  padding:40px 0 60px 0;
145
-  background-color: #F8F8F8;
148
+  padding: 40px 0 60px 0;
149
+  background-color: #f8f8f8;
146
 }
150
 }
147
 
151
 
148
-.bottomTab{
149
-  background: #FFF;
152
+.bottomTab {
153
+  background: #fff;
150
   border-radius: 12px;
154
   border-radius: 12px;
151
   column-count: 3;
155
   column-count: 3;
152
-  text-align: center; 
153
-  .sharebtn{
156
+  text-align: center;
157
+  height: 6em;
158
+
159
+  .sharebtn {
154
     position: absolute;
160
     position: absolute;
155
     width: 260px;
161
     width: 260px;
156
     opacity: 0;
162
     opacity: 0;
157
   }
163
   }
158
-  .tab{
164
+  .tab {
159
     line-height: 96px;
165
     line-height: 96px;
160
-    font-size: 28px;     
166
+    font-size: 28px;
161
     font-weight: bold;
167
     font-weight: bold;
162
     color: #202020;
168
     color: #202020;
163
-    image{
169
+    image {
164
       width: 31px;
170
       width: 31px;
165
       height: 31px;
171
       height: 31px;
166
       position: relative;
172
       position: relative;
168
       margin-right: 12px;
174
       margin-right: 12px;
169
     }
175
     }
170
   }
176
   }
171
-}
177
+}

+ 10
- 1
src/pages/index/index.jsx View File

9
 import { getHotelDetail } from '@/services/landlord'
9
 import { getHotelDetail } from '@/services/landlord'
10
 import { getTaRoom } from '@/services/taRoom​'
10
 import { getTaRoom } from '@/services/taRoom​'
11
 import withLayout from '@/layouts'
11
 import withLayout from '@/layouts'
12
+import { useModel } from "@/store";
12
 import { withSubscribeMessage } from '@/utils/subscribeMessage'
13
 import { withSubscribeMessage } from '@/utils/subscribeMessage'
13
 import { TPL_MESSAGE_HOTEL_CHECK_OUT } from '@/utils/constants'
14
 import { TPL_MESSAGE_HOTEL_CHECK_OUT } from '@/utils/constants'
14
 import tabList from './tabbar'
15
 import tabList from './tabbar'
15
 import Guide from './tabs/Guide'
16
 import Guide from './tabs/Guide'
16
 import Mine from './tabs/Mine'
17
 import Mine from './tabs/Mine'
17
 import Recommend from './tabs/Recommend'
18
 import Recommend from './tabs/Recommend'
19
+
18
 import './index.less'
20
 import './index.less'
19
 
21
 
20
 
22
 
21
 
23
 
22
 export default withLayout((props) => {
24
 export default withLayout((props) => {
23
   const { router, person, location } = props
25
   const { router, person, location } = props
24
-  const { roomId, roomOrderId } = router.params
26
+  let { roomId, roomOrderId } = router.params
27
+  const { roomId: rid } = useModel('hotel')
25
 
28
 
26
   const { params, path } = router
29
   const { params, path } = router
27
   const { tab } = params || {}
30
   const { tab } = params || {}
35
 
38
 
36
   const [isDidShow, setIsDidShow] = useState(0)
39
   const [isDidShow, setIsDidShow] = useState(0)
37
 
40
 
41
+  if (!roomId && rid) {
42
+    roomId = rid
43
+  }
44
+
45
+
46
+
38
   useDidShow(() => {
47
   useDidShow(() => {
39
     setIsDidShow(isDidShow + 1)
48
     setIsDidShow(isDidShow + 1)
40
   })
49
   })

+ 6
- 6
src/shop/pages/spread/spreadIndex.less View File

1
-.bottomTab{
1
+.bottomTab {
2
   height: 98px;
2
   height: 98px;
3
   line-height: 98px;
3
   line-height: 98px;
4
-  font-size: 30px;     
4
+  font-size: 30px;
5
   font-weight: bold;
5
   font-weight: bold;
6
   color: #202020;
6
   color: #202020;
7
-  .orderstab{
7
+  .orderstab {
8
     color: #666;
8
     color: #666;
9
   }
9
   }
10
-  .spreadtab{
10
+  .spreadtab {
11
     color: #666;
11
     color: #666;
12
   }
12
   }
13
-  image{
13
+  image {
14
     width: 31px;
14
     width: 31px;
15
     height: 31px;
15
     height: 31px;
16
     position: relative;
16
     position: relative;
17
     top: 7px;
17
     top: 7px;
18
     margin-right: 12px;
18
     margin-right: 12px;
19
   }
19
   }
20
-}
20
+}