李志伟 3 years ago
parent
commit
00ea9d2d4d

+ 5
- 8
src/components/ShopUnused/style.less View File

@@ -5,7 +5,7 @@
5 5
     color: #666666;
6 6
     line-height: 44px;
7 7
     float: left;
8
-    margin: 60px 0 32px 0;
8
+    margin: 60px 0 0 0;
9 9
 
10 10
   }
11 11
   .orderTime{    
@@ -13,7 +13,7 @@
13 13
     color: #666666;
14 14
     line-height: 44px;
15 15
     float: right;
16
-    margin: 60px 0 32px 0;
16
+    margin: 60px 0 0 0;
17 17
   }
18 18
   .order{
19 19
     background: #FFFFFF;
@@ -25,21 +25,19 @@
25 25
       height: 194px;
26 26
       border-radius: 22px;
27 27
       float: left;
28
-      margin:0 26px 30px 0;
28
+      margin:0 26px 0 0;
29 29
     }
30 30
     .orderRight{
31 31
       .foodName{
32 32
         font-size: 24px;
33 33
         color: #333333;
34
-        line-height: 40px;
34
+        margin-top: 40px;
35 35
       }
36 36
       .price{
37 37
         font-size: 20px;
38 38
         font-weight: bold;
39 39
         color: #202020;
40
-        line-height: 44px;
41
-        margin: 37px 0 40px 0;
42
-        height: 19px;
40
+        margin: 0 0 10px 0;
43 41
         .pnum{
44 42
           color: #333333;
45 43
           font-weight: 400;
@@ -72,7 +70,6 @@
72 70
       width: 160px;
73 71
     height: 40px;
74 72
     background: #1A3B83;
75
-    /* margin: 0 auto; */
76 73
     line-height: 40px;
77 74
     border-radius: 12px;
78 75
     font-size: 23px;

+ 2
- 5
src/components/ShopUsed/style.less View File

@@ -28,17 +28,14 @@
28 28
     }
29 29
     .orderRight {
30 30
       .foodName {
31
-        height: 63px;
32 31
         font-size: 24px;
33 32
         color: #333333;
34
-        line-height: 40px;
35 33
       }
36 34
       .price {
37 35
         font-size: 20px;
38 36
         font-weight: bold;
39 37
         color: #202020;
40 38
         line-height: 44px;
41
-        margin: 37px 0 40px 0;
42 39
         height: 19px;
43 40
         .pnum {
44 41
           color: #333333;
@@ -57,16 +54,16 @@
57 54
     }
58 55
     .veri_Date {
59 56
       color: red;
60
-      height: 5px;
61 57
       letter-spacing: 1px;
62 58
       font-size: 30px;
59
+      padding-top: 20px;
63 60
     }
64 61
     .line {
65 62
       width: 100%;
66 63
       height: 2px;
67 64
       background: #000;
68 65
       opacity: 0.1;
69
-      margin-top: 100px;
66
+      margin-top: 30px;
70 67
     }
71 68
     .phone {
72 69
       font-size: 24px;

+ 1
- 2
src/shop/components/ShopKeeper/shopKeeper.jsx View File

@@ -1,7 +1,6 @@
1 1
 import { React, useState, useEffect, useMemo, useRef } from 'react'
2 2
 import Taro, { useRouter } from '@tarojs/taro'
3
-import { getShopList, getShopMoney, getAccount, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
4
-
3
+import { getVerifiedOrder } from '@/services/shopBoss'
5 4
 import Picker from '@/components/Picker'
6 5
 import ShopUsed from '@/components/ShopUsed' //已核销
7 6
 import ShopUnused from '@/components/ShopUnused' //未核销