吃个甘蔗嚼一年 3 anni fa
parent
commit
fb1ff15255

+ 0
- 2
src/components/ShopUnused/index.jsx Vedi File

25
         <image className='orderImg' src={item.poster} mode='aspectFit' />
25
         <image className='orderImg' src={item.poster} mode='aspectFit' />
26
         <view className='orderRight'>
26
         <view className='orderRight'>
27
           <view className='foodName'>{item.description}</view>
27
           <view className='foodName'>{item.description}</view>
28
-
29
-
30
           <view className='price'>合计金额:¥<text style={{ fontSize: '24rpx' }}>{((item.actualPrice / 100) - (item.cashback / 100) - (item.commissionCharge / 100)).toFixed(2)}</text>元 <text className='pnum'>数量:<text>1</text>张</text> </view>
28
           <view className='price'>合计金额:¥<text style={{ fontSize: '24rpx' }}>{((item.actualPrice / 100) - (item.cashback / 100) - (item.commissionCharge / 100)).toFixed(2)}</text>元 <text className='pnum'>数量:<text>1</text>张</text> </view>
31
           <view>已下单:等待客户上门就餐</view>
29
           <view>已下单:等待客户上门就餐</view>
32
         </view>
30
         </view>

+ 30
- 30
src/components/ShopUnused/style.less Vedi File

1
-.orderCard{
1
+.orderCard {
2
   margin-bottom: 20px;
2
   margin-bottom: 20px;
3
-  .orderId{
3
+  .orderId {
4
     font-size: 20px;
4
     font-size: 20px;
5
     color: #666666;
5
     color: #666666;
6
     line-height: 44px;
6
     line-height: 44px;
7
     float: left;
7
     float: left;
8
     margin: 60px 0 0 0;
8
     margin: 60px 0 0 0;
9
-
10
   }
9
   }
11
-  .orderTime{    
10
+  .orderTime {
12
     font-size: 20px;
11
     font-size: 20px;
13
     color: #666666;
12
     color: #666666;
14
     line-height: 44px;
13
     line-height: 44px;
15
     float: right;
14
     float: right;
16
     margin: 60px 0 0 0;
15
     margin: 60px 0 0 0;
17
   }
16
   }
18
-  .order{
19
-    background: #FFFFFF;
17
+  .order {
18
+    background: #ffffff;
20
     box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
19
     box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
21
     border-radius: 12px;
20
     border-radius: 12px;
22
     padding: 20px;
21
     padding: 20px;
23
-    .orderImg{
22
+    .orderImg {
24
       width: 194px;
23
       width: 194px;
25
       height: 194px;
24
       height: 194px;
26
       border-radius: 22px;
25
       border-radius: 22px;
27
       float: left;
26
       float: left;
28
-      margin:0 26px 0 0;
27
+      margin: 0 26px 0 0;
29
     }
28
     }
30
-    .orderRight{
31
-      .foodName{
29
+    .orderRight {
30
+      .foodName {
32
         font-size: 24px;
31
         font-size: 24px;
33
         color: #333333;
32
         color: #333333;
34
         margin-top: 40px;
33
         margin-top: 40px;
35
       }
34
       }
36
-      .price{
35
+      .price {
37
         font-size: 20px;
36
         font-size: 20px;
38
         font-weight: bold;
37
         font-weight: bold;
39
         color: #202020;
38
         color: #202020;
40
         margin: 0 0 10px 0;
39
         margin: 0 0 10px 0;
41
-        .pnum{
40
+        .pnum {
42
           color: #333333;
41
           color: #333333;
43
           font-weight: 400;
42
           font-weight: 400;
44
-          margin-left: 47px;         
43
+          margin-left: 47px;
45
         }
44
         }
46
       }
45
       }
47
-      .price+view{
46
+      .price + view {
48
         font-size: 20px;
47
         font-size: 20px;
49
         font-weight: bold;
48
         font-weight: bold;
50
-        color: #FF3434;
49
+        color: #ff3434;
51
         line-height: 44px;
50
         line-height: 44px;
52
         margin-bottom: 35px;
51
         margin-bottom: 35px;
53
         height: 19px;
52
         height: 19px;
54
       }
53
       }
55
     }
54
     }
56
-    .line{
55
+    .line {
56
+      margin-top: 30px;
57
+
57
       width: 100%;
58
       width: 100%;
58
       height: 2px;
59
       height: 2px;
59
       background: #000;
60
       background: #000;
60
       opacity: 0.1;
61
       opacity: 0.1;
61
     }
62
     }
62
-    .phone{
63
+    .phone {
63
       font-size: 24px;
64
       font-size: 24px;
64
       color: #666666;
65
       color: #666666;
65
       line-height: 44px;
66
       line-height: 44px;
66
       height: 23px;
67
       height: 23px;
67
-      margin: 30px 0;
68
+      margin: 37px 0;
68
     }
69
     }
69
-    .button-OK{
70
+    .button-OK {
70
       width: 160px;
71
       width: 160px;
71
-    height: 40px;
72
-    background: #1A3B83;
73
-    line-height: 40px;
74
-    border-radius: 12px;
75
-    font-size: 23px;
76
-    color: #ffffff;
77
-    position: relative;
78
-    right: -8em;
79
-    top: -2em;
72
+      height: 40px;
73
+      background: #1a3b83;
74
+      line-height: 40px;
75
+      border-radius: 12px;
76
+      font-size: 23px;
77
+      color: #ffffff;
78
+      position: relative;
79
+      right: -8em;
80
+      top: -2em;
80
     }
81
     }
81
-    .tripTime{
82
+    .tripTime {
82
       font-size: 24px;
83
       font-size: 24px;
83
       color: #666666;
84
       color: #666666;
84
       line-height: 44px;
85
       line-height: 44px;
85
       margin-bottom: 30px;
86
       margin-bottom: 30px;
86
     }
87
     }
87
   }
88
   }
88
-  
89
 }
89
 }

+ 3
- 1
src/components/ShopUsed/style.less Vedi File

59
       padding-top: 20px;
59
       padding-top: 20px;
60
     }
60
     }
61
     .line {
61
     .line {
62
+      margin-top: 30px;
63
+
62
       width: 100%;
64
       width: 100%;
63
       height: 2px;
65
       height: 2px;
64
       background: #000;
66
       background: #000;
70
       color: #666666;
72
       color: #666666;
71
       line-height: 44px;
73
       line-height: 44px;
72
       height: 23px;
74
       height: 23px;
73
-      margin: 30px 0;
75
+      margin: 37px 0;
74
       // .Button-OK{
76
       // .Button-OK{
75
       //   font-size: 28px;
77
       //   font-size: 28px;
76
       //   color: #C0C8D3;
78
       //   color: #C0C8D3;

+ 101
- 97
src/pages/MineUserAll/RefundMoney/CheckRefund/index.jsx Vedi File

92
       refundReason: explain,
92
       refundReason: explain,
93
     }).then((res) => {
93
     }).then((res) => {
94
       Taro.hideLoading();
94
       Taro.hideLoading();
95
-      Taro.navigateBack({
96
-        delta: 1
97
-      })
98
       Taro.showToast({
95
       Taro.showToast({
99
-        title: "退款成功",
100
-        icon: "none",
101
-        duration: 3000,
102
-      });
96
+        title: '已提交',
97
+        icon: 'success',
98
+        duration: 3000
99
+      })
100
+      setTimeout(() => {
101
+        Taro.navigateBack({
102
+          delta: 1
103
+        })
104
+      }, 2000);
105
+
106
+
103
     });
107
     });
104
   };
108
   };
105
   useEffect(() => {
109
   useEffect(() => {
124
       <View className='index-container'>
128
       <View className='index-container'>
125
         <SpinBox loading={loading} className='box-content'>
129
         <SpinBox loading={loading} className='box-content'>
126
           <scroll-view scroll-y style={{ height: '100%' }} >
130
           <scroll-view scroll-y style={{ height: '100%' }} >
127
-              <view className='Refund-Content-box'>
128
-                <view className='title-image'>
129
-                  <image
130
-                    mode='scaleToFill'
131
-                    className='title-image-cup'
132
-                    src={BlackSpot}
133
-                  />
134
-                  <text className='title-title-boss'>商品信息</text>
135
-                </view>
136
-              </view>
137
-              {/* 商品信息结束 */}
138
-              <view>
139
-                {(list || []).map((item) => {
140
-                  return (
141
-                    <OrderCard item={item} key={item.orderId} kkp='1' />
142
-                  );
143
-                })}
144
-              </view>
145
-              {/* 卡片结束 */}
146
-              <view className='Refund-Content-box'>
147
-                <view className='title-image'>
148
-                  <image
149
-                    mode='scaleToFill'
150
-                    className='title-image-cup'
151
-                    src={BlackSpot}
152
-                  />
153
-                  <text className='title-title-boss'>退款原因</text>
154
-                </view>
155
-                {/* 退款结束 */}
156
-              </view>
157
-              <view className='Refund-content'>
158
-                {options.map((x) => {
159
-                  return (
160
-                    <text
161
-                      className={`Refund-star-view1 ${checkeds.indexOf(x.key) > -1
162
-                        ? "bg2"
163
-                        : `Refund-star-view2`
164
-                        }`}
165
-                      key={x.key}
166
-                      onClick={() => viewOK(x)}
167
-                    >
168
-                      {x.title}
169
-                    </text>
170
-                  );
171
-                })}
172
-              </view>
173
-              <view className='Refund-Content-box'>
174
-                <view className='title-image'>
175
-                  <image
176
-                    mode='scaleToFill'
177
-                    className='title-image-cup'
178
-                    src={BlackSpot}
179
-                  />
180
-                  <text className='title-title-boss'>退款说明</text>
181
-                </view>
182
-              </view>
183
-              <view class='section'>
184
-                <Textarea
185
-                  placeholder='请补充退款说明(选填)!'
186
-                  onInput={(e) => setExplain(e.detail.value)}
187
-                  confirm-type='done'
131
+            <view className='Refund-Content-box'>
132
+              <view className='title-image'>
133
+                <image
134
+                  mode='scaleToFill'
135
+                  className='title-image-cup'
136
+                  src={BlackSpot}
188
                 />
137
                 />
138
+                <text className='title-title-boss'>商品信息</text>
189
               </view>
139
               </view>
190
-              <view className='money-title'>
191
-                实付金额:{" "}
192
-                <text className='money-name'>{formatPrice(totalPrice.charges)}元</text>
193
-              </view>
194
-              <view className='money-title'>
195
-                已获返现:{" "}
196
-                <text className='money-name'>{formatPrice(totalPrice.cashback)}元</text>
197
-              </view>
198
-              <view className='money-title'>
199
-                退款金额:{" "}
200
-                <text className='money-name'>{formatPrice(totalPrice.refundPrice)}元</text>
201
-              </view>
202
-              <view className='ul-li-text'>
203
-                <view className='ul-li-view'></view>
204
-                <text className='ul-li-textname'>退款金额不可修改</text>
205
-              </view>
206
-              <view className='ul-li-text'>
207
-                <view className='ul-li-view'></view>
208
-                <text className='ul-li-textname'>
209
-                  下单获得返现金额,会在退款时被扣除;
210
-                </text>
211
-              </view>
212
-              <view className='ul-li-text'>
213
-                <view className='ul-li-view'></view>
214
-                <text className='ul-li-textname'>退款将在七个工作日内原路退还。</text>
140
+            </view>
141
+            {/* 商品信息结束 */}
142
+            <view>
143
+              {(list || []).map((item) => {
144
+                return (
145
+                  <OrderCard item={item} key={item.orderId} kkp='1' />
146
+                );
147
+              })}
148
+            </view>
149
+            {/* 卡片结束 */}
150
+            <view className='Refund-Content-box'>
151
+              <view className='title-image'>
152
+                <image
153
+                  mode='scaleToFill'
154
+                  className='title-image-cup'
155
+                  src={BlackSpot}
156
+                />
157
+                <text className='title-title-boss'>退款原因</text>
215
               </view>
158
               </view>
216
-              <view className='button-info' >
217
-                <Button className='button-box' onClick={() => onRefund()}>
218
-                  提交申请
219
-                </Button>
159
+              {/* 退款结束 */}
160
+            </view>
161
+            <view className='Refund-content'>
162
+              {options.map((x) => {
163
+                return (
164
+                  <text
165
+                    className={`Refund-star-view1 ${checkeds.indexOf(x.key) > -1
166
+                      ? "bg2"
167
+                      : `Refund-star-view2`
168
+                      }`}
169
+                    key={x.key}
170
+                    onClick={() => viewOK(x)}
171
+                  >
172
+                    {x.title}
173
+                  </text>
174
+                );
175
+              })}
176
+            </view>
177
+            <view className='Refund-Content-box'>
178
+              <view className='title-image'>
179
+                <image
180
+                  mode='scaleToFill'
181
+                  className='title-image-cup'
182
+                  src={BlackSpot}
183
+                />
184
+                <text className='title-title-boss'>退款说明</text>
220
               </view>
185
               </view>
186
+            </view>
187
+            <view class='section'>
188
+              <Textarea
189
+                placeholder='请补充退款说明(选填)!'
190
+                onInput={(e) => setExplain(e.detail.value)}
191
+                confirm-type='done'
192
+              />
193
+            </view>
194
+            <view className='money-title'>
195
+              实付金额:{" "}
196
+              <text className='money-name'>{formatPrice(totalPrice.charges)}元</text>
197
+            </view>
198
+            <view className='money-title'>
199
+              已获返现:{" "}
200
+              <text className='money-name'>{formatPrice(totalPrice.cashback)}元</text>
201
+            </view>
202
+            <view className='money-title'>
203
+              退款金额:{" "}
204
+              <text className='money-name'>{formatPrice(totalPrice.refundPrice)}元</text>
205
+            </view>
206
+            <view className='ul-li-text'>
207
+              <view className='ul-li-view'></view>
208
+              <text className='ul-li-textname'>退款金额不可修改</text>
209
+            </view>
210
+            <view className='ul-li-text'>
211
+              <view className='ul-li-view'></view>
212
+              <text className='ul-li-textname'>
213
+                下单获得返现金额,会在退款时被扣除;
214
+              </text>
215
+            </view>
216
+            <view className='ul-li-text'>
217
+              <view className='ul-li-view'></view>
218
+              <text className='ul-li-textname'>退款将在七个工作日内原路退还。</text>
219
+            </view>
220
+            <view className='button-info' >
221
+              <Button className='button-box' onClick={() => onRefund()}>
222
+                提交申请
223
+              </Button>
224
+            </view>
221
           </scroll-view>
225
           </scroll-view>
222
         </SpinBox>
226
         </SpinBox>
223
       </View>
227
       </View>

+ 2
- 3
src/pages/index/tabs/Guide.jsx Vedi File

172
               </view>
172
               </view>
173
               {/* --------房屋位置-------- */}
173
               {/* --------房屋位置-------- */}
174
               {
174
               {
175
-                !roomGps ? <view></view>
175
+                !taRoomContent.location ? <view></view>
176
                   :
176
                   :
177
                   <view className='room-box-info-HouLocation'>
177
                   <view className='room-box-info-HouLocation'>
178
                     <view className='room-bi-name-HouLocation' >
178
                     <view className='room-bi-name-HouLocation' >
192
 
192
 
193
               {/* --------停车场-------- */}
193
               {/* --------停车场-------- */}
194
               {
194
               {
195
-                !parkingGps ? <view></view>
195
+                !taRoomContent.parkingLocation ? <view></view>
196
                   :
196
                   :
197
                   <view className='room-box-info-Parking'>
197
                   <view className='room-box-info-Parking'>
198
                     <view className='room-bi-name-Parking' >
198
                     <view className='room-bi-name-Parking' >
206
                       </view>
206
                       </view>
207
                     </view>
207
                     </view>
208
                   </view>
208
                   </view>
209
-
210
               }
209
               }
211
 
210
 
212
 
211
 

+ 1
- 1
src/shop/components/Sparead/spreadMoney.jsx Vedi File

87
         <view className='title'>推广收入记录</view>
87
         <view className='title'>推广收入记录</view>
88
 
88
 
89
         <List
89
         <List
90
-          style={{ height: 'calc(100% - 145px)' }}
90
+          style={{ height: '50%' }}
91
           request={reqestAPI}
91
           request={reqestAPI}
92
           params={queryParams}
92
           params={queryParams}
93
           noData={<NoData />}
93
           noData={<NoData />}