shigongli
/
miniapp-v2
Beobachten 6
Favorisieren 0
Fork 0
Code Issues 0 Pull-Requests 0 Releases 0 Wiki Aktivität
Quellcode durchsuchen

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

张延森 vor 3 Jahren
Ursprung
f9dc62fa4f afbd321acf
Commit
1c81659385
14 geänderte Dateien mit 89 neuen und 165 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. 1
    1
      src/components/BossCard/style.less
  2. 2
    2
      src/components/CollectList/MyCollect/style.less
  3. 1
    1
      src/components/CompoentsOrder/complete/style.less
  4. 1
    2
      src/components/CompoentsOrder/complete/styleoen.less
  5. 1
    2
      src/components/PayOrderCard/style.less
  6. 7
    4
      src/index.html
  7. 1
    1
      src/pages/MineUserAll/RefundMoney/CheckRefund/style.less
  8. 1
    2
      src/pages/MineUserAll/RefundMoney/style.less
  9. 1
    3
      src/pages/PayOrder/style.less
  10. 1
    1
      src/pages/TobeShop/style.less
  11. 1
    0
      src/pages/index/components/Card/index.jsx
  12. 70
    0
      src/pages/index/components/Card/style.less
  13. 1
    72
      src/pages/index/tabs/less/Recommend.less
  14. 0
    74
      src/pages/searchResult/searchResult.less

+ 1
- 1
src/components/BossCard/style.less Datei anzeigen 

@@ -68,7 +68,7 @@
68 68 
     display: flex;
69 69 
     position: relative;
70 70 
     margin: 30px auto;
71 
-    width: 700px;
71 
+    width: 100%;
72 72 
     // box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
73 73 
     // filter: drop-shadow(5px 8px 6px rgb(202, 202, 202));
74 74 
     filter: drop-shadow(0 0 0.9rem rgba(0, 0, 0, 0.12));

+ 2
- 2
src/components/CollectList/MyCollect/style.less Datei anzeigen 

@@ -10,7 +10,7 @@
10 10 
   position: relative;
11 11 
   // margin-top: 600px;
12 12 
   // margin: 30px auto;
13 
-  width: 700px;
13 
+  width: 100%;
14 14
15 15 
   // box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
16 16 
   // filter: drop-shadow(5px 8px 6px rgb(202, 202, 202));
 
@@ -229,7 +229,7 @@
229 229 
   position: relative;
230 230 
   // margin-top: 600px;
231 231 
   // margin: 30px auto;
232 
-  width: 700px;
232 
+  width: 100%;
233 233
234 234 
   // box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
235 235 
   // filter: drop-shadow(5px 8px 6px rgb(202, 202, 202));

+ 1
- 1
src/components/CompoentsOrder/complete/style.less Datei anzeigen 

@@ -16,7 +16,7 @@
16 16 
     display: flex;
17 17 
     position: relative;
18 18 
     margin: 30px auto;
19 
-    width: 700px;
19 
+    width: 100%;
20 20
21 21 
     filter: drop-shadow(0 0 0.9rem rgba(0, 0, 0, 0.12));
22 22 
     .card-box-star {

+ 1
- 2
src/components/CompoentsOrder/complete/styleoen.less Datei anzeigen 

@@ -73,8 +73,7 @@
73 73 
     position: relative;
74 74 
     // margin-top: 600px;
75 75 
     margin: 30px auto;
76 
-    width: 700px;
77 
-
76 
+    width: 100%;
78 77 
     // box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
79 78 
     // filter: drop-shadow(5px 8px 6px rgb(202, 202, 202));
80 79 
     filter: drop-shadow(0 0 0.9rem rgba(0, 0, 0, 0.12));

+ 1
- 2
src/components/PayOrderCard/style.less Datei anzeigen 

@@ -67,8 +67,7 @@
67 67 
     position: relative;
68 68 
     // margin-top: 600px;
69 69 
     margin: 30px auto;
70 
-    width: 700px;
71 
-
70 
+    width: 100%;
72 71 
     // box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
73 72 
     // filter: drop-shadow(5px 8px 6px rgb(202, 202, 202));
74 73 
     filter: drop-shadow(0 0 0.9rem rgba(0, 0, 0, 0.12));

+ 7
- 4
src/index.html Datei anzeigen 

@@ -1,19 +1,22 @@
1 1 
 <!DOCTYPE html>
2 2 
 <html>
3 
+
3 4 
 <head>
4 5 
   <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
5 
-  <meta content="width=device-width,initial-scale=1,user-scalable=no" name="viewport">
6 
+  <meta content="width=device-width,initial-scale=1,user-scalcble=no" name="viewport">
6 7 
   <meta name="apple-mobile-web-app-capable" content="yes">
7 8 
   <meta name="apple-touch-fullscreen" content="yes">
8 9 
   <meta name="format-detection" content="telephone=no,address=no">
9 10 
   <meta name="apple-mobile-web-app-status-bar-style" content="white">
10 
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" >
11 
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
11 12 
   <title></title>
12 13 
   <script>
13 
-    !function(n){function e(){var e=n.document.documentElement,t=e.getBoundingClientRect().width;e.style.fontSize=t>=640?"40px":t<=320?"20px":t/320*20+"px"}n.addEventListener("resize",(function(){e()})),e()}(window);
14 
+    !function (n) { function e() { var e = n.document.documentElement, t = e.getBoundingClientRect().width; e.style.fontSize = t >= 640 ? "40px" : t <= 320 ? "20px" : t / 320 * 20 + "px" } n.addEventListener("resize", (function () { e() })), e() }(window);
14 15 
   </script>
15 16 
 </head>
17 
+
16 18 
 <body>
17 19 
   <div id="app"></div>
18 20 
 </body>
19 
-</html>
21 
+
22 
+</html>

+ 1
- 1
src/pages/MineUserAll/RefundMoney/CheckRefund/style.less Datei anzeigen 

@@ -34,7 +34,7 @@
34 34 
     position: relative;
35 35 
     // margin-top: 600px;
36 36 
     // margin: 30px auto;
37 
-    // width: 700px;
37 
+    // width: 100%;
38 38
39 39 
     // box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
40 40 
     // filter: drop-shadow(5px 8px 6px rgb(202, 202, 202));

+ 1
- 2
src/pages/MineUserAll/RefundMoney/style.less Datei anzeigen 

@@ -10,8 +10,7 @@
10 10 
     position: relative;
11 11 
     // margin-top: 600px;
12 12 
     // margin: 30px auto;
13 
-    width: 700px;
14 
-
13 
+    width: 100%;
15 14 
     // box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
16 15 
     // filter: drop-shadow(5px 8px 6px rgb(202, 202, 202));
17 16 
     filter: drop-shadow(0 0 0.9rem rgba(0, 0, 0, 0.12));

+ 1
- 3
src/pages/PayOrder/style.less Datei anzeigen 

@@ -67,9 +67,7 @@
67 67 
     position: relative;
68 68 
     // margin-top: 600px;
69 69 
     margin: 30px auto;
70 
-    width: 700px;
71 
-
72 
-    // box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
70 
+    width: calc(100% - 50px);    // box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
73 71 
     // filter: drop-shadow(5px 8px 6px rgb(202, 202, 202));
74 72 
     filter: drop-shadow(0 0 0.9rem rgba(0, 0, 0, 0.12));
75 73

+ 1
- 1
src/pages/TobeShop/style.less Datei anzeigen 

@@ -79,7 +79,7 @@
79 79 
     position: relative;
80 80 
     // margin-top: 600px;
81 81 
     // margin: 30px auto;
82 
-    // width: 700px;
82 
+    // width: 100%;
83 83
84 84 
     // box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
85 85 
     // filter: drop-shadow(5px 8px 6px rgb(202, 202, 202));

src/pages/index/components/Card.js → src/pages/index/components/Card/index.jsx Datei anzeigen 

@@ -7,6 +7,7 @@ import glTip from '@/assets/icons/housemantj/gltip.png'
7 7 
 import location from '@/assets/icons/housemantj/location.png'
8 8 
 import onlove from '@/assets/icons/housemantj/onlove.png'
9 9 
 import love from '@/assets/icons/housemantj/bheart.png'
10 
+import './style.less'
10 11
11 12 
 export default (props) => {
12 13

+ 70
- 0
src/pages/index/components/Card/style.less Datei anzeigen 

@@ -0,0 +1,70 @@
1 
+.contentCard{
2 
+  background: #FFF;
3 
+  box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
4 
+  border-radius: 24px;
5 
+  overflow: hidden;
6 
+  margin-bottom:50px;
7 
+  break-inside: avoid;
8 
+  position: relative;
9 
+
10 
+  .cardTop{
11 
+    border-radius: 24px 24px 0px 0px;
12 
+    .cCardimg{
13 
+      width: 100%;
14 
+      border-radius: 24px 24px 0px 0px;
15 
+    }
16 
+    .lefttips{
17 
+      width:99px;
18 
+      height:37px;
19 
+      position: absolute;
20 
+      left: 0;
21 
+      top: 0;
22 
+    }
23 
+    .loveharde{
24 
+      width: 28px;
25 
+      height: 26px;
26 
+      position: absolute;
27 
+      right: 20px;
28 
+      top: 10px;
29 
+    }
30 
+  }
31 
+  .bContent{
32 
+    padding:20px;
33 
+    .cCword{
34 
+      font-size: 24px;
35 
+      font-weight: bold;
36 
+      color: #404040;
37 
+      text-align: justify;
38 
+    }
39 
+
40 
+    .cCleft{
41 
+      float: left;
42 
+      position: relative;
43 
+      padding:40px 0 30px 0;
44 
+      .cCicon{
45 
+        width: 17px;
46 
+        height: 21px;
47 
+        position: absolute;
48 
+        left: 0;
49 
+        top: 48px;
50 
+      }
51 
+      .distance{
52 
+        padding-left: 24px;
53 
+        font-size: 24px;
54 
+        color: #C0C8D3;
55 
+      }
56 
+    }
57 
+    .cCright{
58 
+      position: relative;
59 
+      float: right;
60 
+      padding:40px 0 30px 0;
61 
+      .price{
62 
+        font-size: 24px;
63 
+        color: #FF3434;
64 
+        .money{
65 
+          font-size: 20px;
66 
+        }
67 
+      }
68 
+    }
69 
+  }
70 
+}

+ 1
- 72
src/pages/index/tabs/less/Recommend.less Datei anzeigen 

@@ -31,78 +31,7 @@
31 31 
   column-count: 2;      //分两列
32 32 
   column-gap: 30px;    //列间距
33 33 
   background-color: #F8F8F8;
34 
-  padding:30px 30px 0 30px;
35 
-
36 
-  .contentCard{
37 
-    background: #FFF;
38 
-    box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
39 
-    border-radius: 24px;
40 
-    overflow: hidden;
41 
-    margin-bottom:50px;
42 
-    break-inside: avoid;
43 
-    position: relative;
44 
-
45 
-    .cardTop{
46 
-      border-radius: 24px 24px 0px 0px;
47 
-      .cCardimg{
48 
-        width: 100%;
49 
-        border-radius: 24px 24px 0px 0px;
50 
-      }
51 
-      .lefttips{
52 
-        width:99px;
53 
-        height:37px;
54 
-        position: absolute;
55 
-        left: 0;
56 
-        top: 0;
57 
-      }
58 
-      .loveharde{
59 
-        width: 28px;
60 
-        height: 26px;
61 
-        position: absolute;
62 
-        right: 20px;
63 
-        top: 10px;
64 
-      }
65 
-    }
66 
-    .bContent{
67 
-      padding:20px;
68 
-      .cCword{
69 
-        font-size: 24px;
70 
-        font-weight: bold;
71 
-        color: #404040;
72 
-        text-align: justify;
73 
-      }
74 
-
75 
-      .cCleft{
76 
-        float: left;
77 
-        position: relative;
78 
-        padding:40px 0 30px 0;
79 
-        .cCicon{
80 
-          width: 17px;
81 
-          height: 21px;
82 
-          position: absolute;
83 
-          left: 0;
84 
-          top: 48px;
85 
-        }
86 
-        .distance{
87 
-          padding-left: 24px;
88 
-          font-size: 24px;
89 
-          color: #C0C8D3;
90 
-        }
91 
-      }
92 
-      .cCright{
93 
-        position: relative;
94 
-        float: right;
95 
-        padding:40px 0 30px 0;
96 
-        .price{
97 
-          font-size: 24px;
98 
-          color: #FF3434;
99 
-          .money{
100 
-            font-size: 20px;
101 
-          }
102 
-        }
103 
-      }
104 
-    }
105 
-  }
34 
+  padding:30px 30px 0 30px;
106 35 
 }
107 36 
 .botton{
108 37 
   font-size: 28px;

+ 0
- 74
src/pages/searchResult/searchResult.less Datei anzeigen 

@@ -32,80 +32,6 @@
32 32 
   column-gap: 30px;    //列间距
33 33 
   background-color: #F8F8F8;
34 34 
   padding:30px 30px 0 30px;
35 
-
36 
-  .contentCard{
37 
-    background: #FFF;
38 
-    box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
39 
-    border-radius: 24px;
40 
-    overflow: hidden;
41 
-    margin-bottom:50px;
42 
-    break-inside: avoid;
43 
-    position: relative;
44 
-
45 
-    .cardTop{
46 
-      border-radius: 24px 24px 0px 0px;
47 
-      .cCardimg{
48 
-        width: 100%;
49 
-        border-radius: 24px 24px 0px 0px;
50 
-      }
51 
-      .lefttips{
52 
-        width:99px;
53 
-        height:37px;
54 
-        position: absolute;
55 
-        left: 0;
56 
-        top: 0;
57 
-      }
58 
-      .loveharde{
59 
-        width: 22px;
60 
-        height: 20px;
61 
-        position: absolute;
62 
-        right: 20px;
63 
-        top: 10px;
64 
-      }
65 
-    }
66 
-    .bContent{
67 
-      padding:20px;
68 
-      .cCword{
69 
-        font-size: 24px;
70 
-        font-weight: bold;
71 
-        color: #404040;
72 
-      }
73 
-
74 
-      .cCleft{
75 
-        float: left;
76 
-        position: relative;
77 
-        padding:40px 0 30px 0;
78 
-        .cCicon{
79 
-          width: 17px;
80 
-          height: 21px;
81 
-          position: absolute;
82 
-          left: 0;
83 
-          top: 48px;
84 
-        }
85 
-        .distance{
86 
-          padding-left: 24px;
87 
-          font-size: 24px;
88 
-          color: #C0C8D3;
89 
-        }
90 
-      }
91 
-      .cCright{
92 
-        position: relative;
93 
-        float: right;
94 
-        padding:40px 0 30px 0;
95 
-        .money{
96 
-          font-size: 20px;
97 
-          color: #FF3434;
98 
-          position: absolute;
99 
-          right: 78px;
100 
-          bottom: 32px;
101 
-        }
102 
-        .price{
103 
-          font-size: 24px;
104 
-          color: #FF3434;
105 
-        }
106 
-      }
107 
-    }
108 
-  }
109 35 
 }
110 36 
 .botton{
111 37 
   font-size: 28px;