Przeglądaj źródła

Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

张延森 3 lat temu
rodzic
commit
b48e3cbcbc

+ 5
- 8
src/components/ShopUnused/style.less Wyświetl plik

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

+ 2
- 5
src/components/ShopUsed/style.less Wyświetl plik

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

+ 1
- 2
src/shop/components/ShopKeeper/shopKeeper.jsx Wyświetl plik

1
 import { React, useState, useEffect, useMemo, useRef } from 'react'
1
 import { React, useState, useEffect, useMemo, useRef } from 'react'
2
 import Taro, { useRouter } from '@tarojs/taro'
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
 import Picker from '@/components/Picker'
4
 import Picker from '@/components/Picker'
6
 import ShopUsed from '@/components/ShopUsed' //已核销
5
 import ShopUsed from '@/components/ShopUsed' //已核销
7
 import ShopUnused from '@/components/ShopUnused' //未核销
6
 import ShopUnused from '@/components/ShopUnused' //未核销