吃个甘蔗嚼一年 3 年前
父节点
当前提交
27b8a33497

+ 2
- 2
src/components/OrderMolded/style.less 查看文件

8
     padding-bottom: 21px;
8
     padding-bottom: 21px;
9
     display: flex;
9
     display: flex;
10
     border-radius: 15px 0px 0px 15px;
10
     border-radius: 15px 0px 0px 15px;
11
-    align-items: center;    
11
+    align-items: center;
12
     .left-viewText-payOrder {
12
     .left-viewText-payOrder {
13
       background: url(../../assets/icons/ProCard/ProCard_hot.png) no-repeat;
13
       background: url(../../assets/icons/ProCard/ProCard_hot.png) no-repeat;
14
       background-size: 100% 100%;
14
       background-size: 100% 100%;
24
     //图片
24
     //图片
25
     .title-image-cardOrder {
25
     .title-image-cardOrder {
26
       width: 100%;
26
       width: 100%;
27
-      margin-left: 20px;
28
       border-radius: 24px;
27
       border-radius: 24px;
28
+      display: flex;
29
       overflow: hidden;
29
       overflow: hidden;
30
       position: relative;
30
       position: relative;
31
       .image-1-cardOrder {
31
       .image-1-cardOrder {

+ 8
- 4
src/pages/MineUserAll/ContactMe/index.jsx 查看文件

24
         content
24
         content
25
       }).then(() => {
25
       }).then(() => {
26
 
26
 
27
-        Taro.navigateBack({
28
-          delta: 1
29
-        })
30
         Taro.showToast({
27
         Taro.showToast({
31
           title: '反馈成功',
28
           title: '反馈成功',
32
           icon: 'success',
29
           icon: 'success',
33
           duration: 2000
30
           duration: 2000
31
+
32
+        }).then(x => {
33
+
34
+          Taro.navigateBack({
35
+            delta: 1
36
+          })
37
+          setLoading(false)
38
+
34
         })
39
         })
35
-        setLoading(false)
36
       })
40
       })
37
     }
41
     }
38
     else {
42
     else {

+ 6
- 2
src/pages/MineUserAll/RefundMoney/index.jsx 查看文件

29
         pageNum === 1 ? res.records || [] : list.concat(res.records || [])
29
         pageNum === 1 ? res.records || [] : list.concat(res.records || [])
30
       );
30
       );
31
       setHasNextPage(res.current < res.pages);
31
       setHasNextPage(res.current < res.pages);
32
-      Taro.hideLoading();
32
+      setLoading(false)
33
 
33
 
34
-    });
34
+    }).catch(e => {
35
+      setLoading(false)
36
+    })
35
   };
37
   };
36
 
38
 
37
 
39
 
62
         <SpinBox loading={loading} className='index-container' >
64
         <SpinBox loading={loading} className='index-container' >
63
 
65
 
64
           <view className='View-box-Card'>
66
           <view className='View-box-Card'>
67
+
65
             {(list || []).map((item) => {
68
             {(list || []).map((item) => {
66
               return (
69
               return (
67
                 <OrderCard item={item} key={item.orderId} sh='1' />
70
                 <OrderCard item={item} key={item.orderId} sh='1' />
68
               )
71
               )
69
             })}
72
             })}
70
             <view className='foot'>这是我的底线</view>
73
             <view className='foot'>这是我的底线</view>
74
+
71
           </view>
75
           </view>
72
         </SpinBox>
76
         </SpinBox>
73
 
77
 

+ 13
- 9
src/pages/PayOrder/style.less 查看文件

98
           margin-right: 5px;
98
           margin-right: 5px;
99
           width: 10px;
99
           width: 10px;
100
           height: 10px;
100
           height: 10px;
101
-          background: #999999;
101
+          font-weight: 800;
102
+
103
+          background: #000;
102
           border-radius: 50%;
104
           border-radius: 50%;
103
         }
105
         }
104
         .ul-li-textname {
106
         .ul-li-textname {
107
+          font-weight: 800;
108
+
105
           font-size: 25px;
109
           font-size: 25px;
106
-          color: #999999;
110
+          color: #000;
107
         }
111
         }
108
       }
112
       }
109
     }
113
     }
110
-    .payorder{
114
+    .payorder {
111
       margin: 40px 30px;
115
       margin: 40px 30px;
112
       color: #fff;
116
       color: #fff;
113
       background-color: #274190;
117
       background-color: #274190;
118
       align-items: center;
122
       align-items: center;
119
       //垂直居中
123
       //垂直居中
120
       justify-content: center;
124
       justify-content: center;
121
-      .paytext{
125
+      .paytext {
122
         font-size: 30px;
126
         font-size: 30px;
123
       }
127
       }
124
-      .paycontent{
125
-        margin:0 40px 0 20px;
126
-        .paybuttontop{
128
+      .paycontent {
129
+        margin: 0 40px 0 20px;
130
+        .paybuttontop {
127
           background: url(../../assets/icons/ProCard/ProCard_hot.png) no-repeat;
131
           background: url(../../assets/icons/ProCard/ProCard_hot.png) no-repeat;
128
           background-size: 100% 100%;
132
           background-size: 100% 100%;
129
           padding: 5px 25px 8px 6px;
133
           padding: 5px 25px 8px 6px;
134
           color: @whiteColor;
138
           color: @whiteColor;
135
           font-weight: 600;
139
           font-weight: 600;
136
         }
140
         }
137
-        .paybuttonbottom{          
141
+        .paybuttonbottom {
138
           font-size: 18px;
142
           font-size: 18px;
139
           text-decoration: line-through;
143
           text-decoration: line-through;
140
           line-height: 17px;
144
           line-height: 17px;
142
       }
146
       }
143
     }
147
     }
144
   }
148
   }
145
-}
149
+}

+ 10
- 16
src/pages/TobeShop/index.jsx 查看文件

1
 import Taro from "@tarojs/taro";
1
 import Taro from "@tarojs/taro";
2
-import { Button, Icon, Text, Textarea, View } from "@tarojs/components";
2
+import { Button, View } from "@tarojs/components";
3
 import { useState, useEffect } from "react";
3
 import { useState, useEffect } from "react";
4
 import withLayout from "@/layouts";
4
 import withLayout from "@/layouts";
5
 import CustomNav from "@/components/CustomNav";
5
 import CustomNav from "@/components/CustomNav";
6
-import { getShopDetail, getShopPackage, getExtendContent } from '@/services/home';
6
+import { getShopDetail } from '@/services/home';
7
 import { getVerifyTargetList, putVerifyTarget } from "@/services/payOrder";
7
 import { getVerifyTargetList, putVerifyTarget } from "@/services/payOrder";
8
-import formatTime from '@/utils/formatTime'
9
 import Popup from "@/components/Popup";
8
 import Popup from "@/components/Popup";
10
 import SpinBox from "@/components/Spin/SpinBox";
9
 import SpinBox from "@/components/Spin/SpinBox";
11
-import formatPrice from "@/utils/formatPrice";
12
 
10
 
13
 import LocationBig from "@/assets/icons/UserCenter/LocationBig.png";
11
 import LocationBig from "@/assets/icons/UserCenter/LocationBig.png";
14
 import Perfection from "@/assets/icons/UserCenter/Perfection.png";
12
 import Perfection from "@/assets/icons/UserCenter/Perfection.png";
15
-import Check_OK from "@/assets/icons/UserCenter/Check_OK.png";
16
-import Check_NO from "@/assets/icons/UserCenter/Check_NO.png";
17
 import BlackSpot from "@/assets/icons/GuideCheck/BlackSpot.png";
13
 import BlackSpot from "@/assets/icons/GuideCheck/BlackSpot.png";
18
-import food from "@/assets/icons/ProCard/food.png";
19
-import ProCard_hot from "@/assets/icons/ProCard/ProCard_hot.png";
20
 import TBCard from './Card'
14
 import TBCard from './Card'
21
 
15
 
22
 import "./style.less";
16
 import "./style.less";
105
   };
99
   };
106
   const ButtonOK = (e) => {
100
   const ButtonOK = (e) => {
107
     if (!submiting) {
101
     if (!submiting) {
108
-      Taro.showLoading({
109
-        title: '核销中'
110
-      })
111
 
102
 
112
       setSubmiting(true);
103
       setSubmiting(true);
113
       Promise.all(checked.map(verifyNo => putVerifyTarget(verifyNo)))
104
       Promise.all(checked.map(verifyNo => putVerifyTarget(verifyNo)))
114
         .then(res => {
105
         .then(res => {
115
-          Taro.hideLoading()
106
+
116
           setSubmiting(false);
107
           setSubmiting(false);
117
           setShowDialog(false);
108
           setShowDialog(false);
118
           setConsumption(true);
109
           setConsumption(true);
119
         })
110
         })
120
         .catch(e => {
111
         .catch(e => {
121
-          Taro.hideLoading()
112
+
122
           setShowDialog(false);
113
           setShowDialog(false);
123
           setSubmiting(false);
114
           setSubmiting(false);
124
           getList();  // 刷新数据
115
           getList();  // 刷新数据
136
     if (list?.length > 1) {
127
     if (list?.length > 1) {
137
       getList()
128
       getList()
138
     } else {
129
     } else {
139
-      Taro.navigateBack({ delta: 1 })
130
+      Taro.redirectTo({
131
+        url: '/pages/MineUserAll/AllOrder/index?tabJump=3',
132
+      });
133
+      // Taro.navigateBack({ delta: 1 })
140
     }
134
     }
141
   };
135
   };
142
 
136
 
190
         <SpinBox loading={loading}>
184
         <SpinBox loading={loading}>
191
           {(list || []).map((item) => {
185
           {(list || []).map((item) => {
192
             return (
186
             return (
193
-              <TBCard item={item} key={item.verifyNo} checked={checked} handleCheck={handleCheck} />             
194
-            )           
187
+              <TBCard item={item} key={item.verifyNo} checked={checked} handleCheck={handleCheck} />
188
+            )
195
           })}
189
           })}
196
         </SpinBox>
190
         </SpinBox>
197
         <view className='button-info'>
191
         <view className='button-info'>

+ 9
- 7
src/pages/index/tabs/GuideCss/style.less 查看文件

8
   .room-box-info-ROOM {
8
   .room-box-info-ROOM {
9
     width: 97%;
9
     width: 97%;
10
     display: flex;
10
     display: flex;
11
-    margin: 60px auto;
12
-
11
+    margin-top: 35px;
12
+    margin: auto;
13
     .room-bi-name-ROOM {
13
     .room-bi-name-ROOM {
14
       width: 100%;
14
       width: 100%;
15
 
15
 
34
   .room-box-info-HouLocation {
34
   .room-box-info-HouLocation {
35
     width: 97%;
35
     width: 97%;
36
     display: flex;
36
     display: flex;
37
-    margin: 60px auto;
37
+    margin-top: 35px;
38
+    margin: auto;
38
 
39
 
39
     .room-bi-name-HouLocation {
40
     .room-bi-name-HouLocation {
40
       width: 100%;
41
       width: 100%;
91
   .room-box-info-Parking {
92
   .room-box-info-Parking {
92
     width: 97%;
93
     width: 97%;
93
     display: flex;
94
     display: flex;
94
-    margin: 60px auto;
95
-
95
+    margin-top: 35px;
96
+    margin: auto;
96
     .room-bi-name-Parking {
97
     .room-bi-name-Parking {
97
       width: 100%;
98
       width: 100%;
98
 
99
 
148
   .room-box-info-WIFIContent {
149
   .room-box-info-WIFIContent {
149
     width: 97%;
150
     width: 97%;
150
     display: flex;
151
     display: flex;
151
-    margin: 60px auto;
152
-
152
+    margin-top: 35px;
153
+    margin: auto;
153
     .room-bi-name-WIFIContent {
154
     .room-bi-name-WIFIContent {
154
       width: 100%;
155
       width: 100%;
155
 
156
 
270
     }
271
     }
271
   }
272
   }
272
   .Guide-Content-box {
273
   .Guide-Content-box {
274
+    margin-top: 2em;
273
     .title-image {
275
     .title-image {
274
       display: flex;
276
       display: flex;
275
       // width: 270px;
277
       // width: 270px;