baozhangchao 3 年 前
コミット
2fe0f066d7
共有5 個のファイルを変更した381 個の追加101 個の削除を含む
  1. バイナリ
      src/assets/icons/GuideCheck/Boon.jpg
  2. バイナリ
      src/assets/icons/GuideCheck/RaidersImage.jpg
  3. 146
    95
      src/pages/index/tabs/Guide.jsx
  4. 148
    6
      src/pages/index/tabs/GuideCss/style.less
  5. 87
    0
      yarn-error.log

バイナリ
src/assets/icons/GuideCheck/Boon.jpg ファイルの表示


バイナリ
src/assets/icons/GuideCheck/RaidersImage.jpg ファイルの表示


+ 146
- 95
src/pages/index/tabs/Guide.jsx ファイルの表示

@@ -9,10 +9,9 @@ import position from '@/assets/icons/GuideCheck/position_logo.png'
9 9
 import Cup from '@/assets/icons/GuideCheck/Cup.png'
10 10
 import starOn from '@/assets/icons/GuideCheck/starOn.png'
11 11
 import starOff from '@/assets/icons/GuideCheck/starOff.png'
12
-import Boon from '@/assets/icons/GuideCheck/Boon.jpg'
13 12
 import loveOn from '@/assets/icons/GuideCheck/loveOn.png'
14 13
 import Raiders from '@/assets/icons/GuideCheck/Raiders.png'
15
-
14
+import RaidersImage from '@/assets/icons/GuideCheck/RaidersImage.jpg'
16 15
 import './GuideCss/style.less'
17 16
 
18 17
 
@@ -39,116 +38,168 @@ export default (props) => {
39 38
   }
40 39
   // onClick={handleClick}
41 40
   return (
41
+    <scroll-view scroll-y style='height: 77vh;' >
42 42
 
43
-    <view className='Guide-Home-box'>
44
-      {/* <view className='Guide-image-text-box'>
45
-        <image className='Guide-images' src={sleep} />
46
-        <view className='Guide-text'>休息一下,休息一下~</view>
47
-      </view> */}
48
-      {/* 图片结束 */}
49
-      {/* <view className='Guide-Content-box'>
50
-        <view className='title-image'>
51
-          <image mode='scaleToFill' className='title-image-cup' src={Cup} />
52
-          <text className='title-title-boss' >老板推荐好吃的</text>
53
-        </view>
54
-      </view> */}
55
-      {/* 小标题结束 */}
56
-      {/* <view class='wrapper'> */}
57
-      {/* <view class='left-complete-one'>
58
-          <image className='left-image-1' src={ProCard_hot}></image>
59
-          <view className='left-viewText'>
60
-            返现¥16.00
61
-          </view> */}
62
-      {/* 评分 */}
63
-      {/* <view className='card-box-star'>
64
-            {
65
-              scoreList.map((_, index) => {
66
-                console.log(index)
67
-                const src = (index + '0.1') < score ? starOn : starOff
68
-                return (
69
-                  <image className='card-star-image' key={index} src={src} />
70
-                )
71
-              })
72
-            }
73
-            <text className='card-star-text' >{score}</text>
43
+      <view className='Guide-Home-box'>
44
+        {/* <view className='Guide-image-text-box'>
45
+          <image className='Guide-images' src={sleep} />
46
+          <view className='Guide-text'>休息一下,休息一下~</view>
47
+        </view> */}
48
+        {/* 图片结束 */}
49
+        {/* 有民宿的情况下 */}
50
+        <view className='MessageCard'>
51
+          <view className='MessageCard-title1'>
52
+            <text className='MessageCard-left'>----------</text>
53
+            停车位置
54
+            <text className='MessageCard-right'>----------</text>
55
+          </view>
56
+          <view className='MessageCard-content'>
57
+            <view className='MessageCard-name' >江苏通讯大厦停车厂</view>
58
+            <view className='MessageCard-info' >江苏省南京市秦淮区集庆路</view>
74 59
           </view>
60
+          <view className='MessageCard-button'>
61
+            <image className='MessageCard-image' />
62
+            <text className='MessageCard-text'>去这里</text>
63
+          </view>
64
+        </view>
65
+
66
+        <view className='Guide-Content-box'>
75 67
           <view className='title-image'>
76
-            <image className='image-1' mode='scaleToFill' src={image}></image>
77
-            <image className='image-2' src={food}></image>
68
+            <image mode='scaleToFill' className='title-image-cup' src={Cup} />
69
+            <text className='title-title-boss' >老板推荐好吃的</text>
78 70
           </view>
79
-          <view className='title-content'>
80
-            <view className='Pro-title'>
81
-              <view className='title-text'>【橘里橘啊换行啊啊啊气咖啡店】新鲜出炉啦!</view>
71
+        </view>
72
+        {/* 小标题结束 */}
73
+        <view class='wrapper'>
74
+          <view class='left-complete-one'>
75
+            <image className='left-image-1' src={ProCard_hot}></image>
76
+            <view className='left-viewText'>
77
+              返现¥16.00
78
+            </view>
79
+            {/* 评分 */}
80
+            <view className='card-box-star'>
81
+              {
82
+                scoreList.map((_, index) => {
83
+                  console.log(index)
84
+                  const src = (index + '0.1') < score ? starOn : starOff
85
+                  return (
86
+                    <image className='card-star-image' key={index} src={src} />
87
+                  )
88
+                })
89
+              }
90
+              <text className='card-star-text' >{score}</text>
91
+            </view>
92
+            <view className='title-image'>
93
+              <image className='image-1' mode='scaleToFill' src={image}></image>
94
+              <image className='image-2' src={food}></image>
82 95
             </view>
83
-            <text className='title-money' >¥6990元<text className='title-money-2'>门市价78元</text></text> */}
84
-      {/* <view className='title-time' >有效期:2021/06/21-2021/12/31</view> */}
85
-      {/* <view className='title-position-on'>
86
-              <image className='title-position' src={position} />
87
-              <text className='title-position-image'>南京市/秦淮区</text>
88
-              <image className='title-on' src={imageSrc} />
89
-              <text onClick={() => Ac()} className='title-on-text'>{value}</text>
96
+            <view className='title-content'>
97
+              <view className='Pro-title'>
98
+                <view className='title-text'>【橘里橘啊换行啊啊啊气咖啡店】新鲜出炉啦!</view>
99
+              </view>
100
+              <text className='title-money' >¥6990元<text className='title-money-2'>门市价78元</text></text>
101
+              <view className='title-time' >有效期:2021/06/21-2021/12/31</view>
102
+              <view className='title-position-on'>
103
+                <image className='title-position' src={position} />
104
+                <text className='title-position-image'>南京市/秦淮区</text>
105
+                <image className='title-on' src={imageSrc} />
106
+                <text onClick={() => Ac()} className='title-on-text'>{value}</text>
107
+              </view>
108
+            </view>
109
+          </view>
110
+          <view class='right-complete-two'>
111
+            <view className='right-content'>
112
+              <image className='right-image' src={Pay} />
113
+              <view className='right-title'>支付</view>
90 114
             </view>
91 115
           </view>
92 116
         </view>
93
-        <view class='right-complete-two'>
94
-          <view className='right-content'> */}
95
-      {/* <view className='right-number'>×1</view> */}
96
-      {/* <image className='right-image' src={Pay} />
97
-            <view className='right-title'>支付</view>
117
+        {/* 卡片----------------- */}
118
+        <view class='wrapper'>
119
+          <view class='left-complete-one'>
120
+            <image className='left-image-1' src={ProCard_hot}></image>
121
+            <view className='left-viewText'>
122
+              返现¥16.00
123
+            </view>
124
+            {/* 评分 */}
125
+            <view className='card-box-star'>
126
+              {
127
+                scoreList.map((_, index) => {
128
+                  console.log(index)
129
+                  const src = (index + '0.1') < score ? starOn : starOff
130
+                  return (
131
+                    <image className='card-star-image' key={index} src={src} />
132
+                  )
133
+                })
134
+              }
135
+              <text className='card-star-text' >{score}</text>
136
+            </view>
137
+            <view className='title-image'>
138
+              <image className='image-1' mode='scaleToFill' src={image}></image>
139
+              <image className='image-2' src={food}></image>
140
+            </view>
141
+            <view className='title-content'>
142
+              <view className='Pro-title'>
143
+                <view className='title-text'>【橘里橘啊换行啊啊啊气咖啡店】新鲜出炉啦!</view>
144
+              </view>
145
+              <text className='title-money' >¥6990元<text className='title-money-2'>门市价78元</text></text>
146
+              {/* ProCard区域定位 */}
147
+              <view className='title-position-on'>
148
+                <image className='title-position' src={position} />
149
+                <text className='title-position-image'>南京市/秦淮区</text>
150
+                <image className='title-on' src={imageSrc} />
151
+                <text onClick={() => Ac()} className='title-on-text'>{value}</text>
152
+              </view>
153
+            </view>
154
+          </view>
155
+          <view class='right-complete-two'>
156
+            <view className='right-content'>
157
+              {/* <view className='right-number'>×1</view> */}
158
+              <image className='right-image' src={Pay} />
159
+              <view className='right-title'>支付</view>
160
+            </view>
98 161
           </view>
99 162
         </view>
100
-      </view> */}
101
-      {/* 卡片----------------- */}
102
-      <view class='wrapper'>
103
-        <view class='left-complete-one'>
104
-          <image className='left-image-1' src={ProCard_hot}></image>
105
-          <view className='left-viewText'>
106
-            返现¥16.00
163
+        {/* 卡片------------- */}
164
+        <view className='Guide-Content-box-two'>
165
+          <view className='title-image-two'>
166
+            <image mode='scaleToFill' className='title-image-cup-two' src={Cup} />
167
+            <text className='title-title-boss-two' >老板推荐的攻略</text>
107 168
           </view>
108
-          {/* 评分 */}
109
-          <view className='card-box-star'>
110
-            {
111
-              scoreList.map((_, index) => {
112
-                console.log(index)
113
-                const src = (index + '0.1') < score ? starOn : starOff
114
-                return (
115
-                  <image className='card-star-image' key={index} src={src} />
116
-                )
117
-              })
118
-            }
119
-            <text className='card-star-text' >{score}</text>
169
+        </view>
170
+        {/* 小标题结束 */}
171
+        {/* 攻略卡片 */}
172
+        <view className='Raiders-box-one'>
173
+          <view className='Raiders-imageLove'>
174
+            <image className='Raiders-image-Raiders' src={Raiders} />
175
+            <image className='Raiders-image-loveOn' src={loveOn} />
120 176
           </view>
121
-          <view className='title-image'>
122
-            <image className='image-1' mode='scaleToFill' src={image}></image>
123
-            <image className='image-2' src={food}></image>
177
+          <view className='Raiders-box'>
178
+            <image className='Raiders-image' mode='widthFix' src={RaidersImage} />
179
+            <text className='Raiders-text'>南京古称金陵,自东吴孙权迁都南京以来,多个汉字汉字汉字汉字</text>
180
+            <view className='Raiders-kilometer-on'>
181
+              <image className='Raiders-kilometer' src={position} />
182
+              <text className='Raiders-kilometer-image'>12.8公里</text>
183
+              <text className='Raiders-on-text'>¥8888/人</text>
184
+            </view>
124 185
           </view>
125
-          <view className='title-content'>
126
-            <view className='Pro-title'>
127
-              <view className='title-text'>【橘里橘啊换行啊啊啊气咖啡店】新鲜出炉啦!</view>
186
+          <view className='Raiders-box' style='padding-lift:10px'>
187
+            <view className='Raiders-imageLove'>
188
+              <image className='Raiders-image-Raiders' src={Raiders} />
189
+              <image className='Raiders-image-loveOn' src={loveOn} />
128 190
             </view>
129
-            <text className='title-money' >¥6990元<text className='title-money-2'>门市价78元</text></text>
130
-            {/* <view className='title-time' >有效期:2021/06/21-2021/12/31</view> */}
131
-            <view className='title-position-on'>
132
-              <image className='title-position' src={position} />
133
-              <text className='title-position-image'>南京市/秦淮区</text>
134
-              <image className='title-on' src={imageSrc} />
135
-              <text onClick={() => Ac()} className='title-on-text'>{value}</text>
191
+            <image className='Raiders-image' mode='widthFix' src={RaidersImage} />
192
+            <text className='Raiders-text'>南京古称金陵,自东吴孙权迁都南京以来,多个汉字汉字汉字汉字</text>
193
+            <view className='Raiders-kilometer-on'>
194
+              <image className='Raiders-kilometer' src={position} />
195
+              <text className='Raiders-kilometer-image'>12.8公里</text>
196
+              <text className='Raiders-on-text'>¥8888/人</text>
136 197
             </view>
137 198
           </view>
199
+          {/* <view className='Raiders-box'></view> */}
138 200
         </view>
139
-        <view class='right-complete-two'>
140
-          <view className='right-content'>
141
-            {/* <view className='right-number'>×1</view> */}
142
-            <image className='right-image' src={Pay} />
143
-            <view className='right-title'>支付</view>
144
-          </view>
145
-        </view>
146
-      </view>
147
-      {/* 卡片------------- */}
148
-      <view className='Raiders-box-one'>
149
-        <view className='Raiders-box'></view>
150
-        <view className='Raiders-box'></view>
151 201
       </view>
152
-    </view>
202
+    </scroll-view>
203
+
153 204
   )
154 205
 }

+ 148
- 6
src/pages/index/tabs/GuideCss/style.less ファイルの表示

@@ -5,6 +5,47 @@
5 5
 }
6 6
 .Guide-Home-box {
7 7
   // width: 333333333333px;
8
+  .MessageCard {
9
+    width: 690px;
10
+    height: 175px;
11
+    background: #ffffff;
12
+    border-radius: 12px;
13
+    margin: 30px auto;
14
+    .MessageCard-title1 {
15
+      width: 55px;
16
+      height: 26px;
17
+      font-size: 28px;
18
+      font-weight: bold;
19
+      color: #666666;
20
+      line-height: 44px;
21
+      .MessageCard-left {
22
+        width: 530px;
23
+        height: 2px;
24
+        padding-right: 50px;
25
+
26
+        opacity: 0.5;
27
+      }
28
+      .MessageCard-right {
29
+        width: 530px;
30
+        height: 2px;
31
+        padding-left: 50px;
32
+        opacity: 0.5;
33
+      }
34
+    }
35
+    .MessageCard-content {
36
+      .MessageCard-name {
37
+      }
38
+      .MessageCard-info {
39
+      }
40
+    }
41
+    .MessageCard-button {
42
+      .MessageCard-image {
43
+      }
44
+      .MessageCard-text {
45
+      }
46
+    }
47
+  }
48
+
8 49
   .Guide-image-text-box {
9 50
     width: 472px;
10 51
     height: 548px;
@@ -272,17 +313,118 @@
272 313
     height: 70%;
273 314
     border-left: 1px dashed #595959;
274 315
   }
316
+  .Guide-Content-box-two {
317
+    margin-top: 61px;
318
+    margin-bottom: 31px;
319
+    .title-image-two {
320
+      display: flex;
321
+      width: 270px;
322
+      height: 40px;
323
+      .title-image-cup-two {
324
+        width: 32px;
325
+        height: 32px;
326
+        margin-top: 10px;
327
+        padding-right: 10px;
328
+        align-items: center;
329
+      }
330
+
331
+      .title-title-boss-two {
332
+        align-items: center;
333
+
334
+        font-size: 32px;
335
+        font-weight: 800;
336
+        color: #202020;
337
+      }
338
+    }
339
+  }
275 340
 
276 341
   //攻略卡片.
277 342
   .Raiders-box-one {
278
-    width: 100%;
279
-    height: 694px;
280
-    border: 1px solid red;
343
+    // width: 100%;
344
+    // // background-color: black;
345
+    margin-bottom: 60px;
346
+    display: flex;
347
+    flex: 2;
348
+    flex-flow: row wrap;
349
+    align-content: flex-start;
350
+    .Raiders-imageLove {
351
+      display: flex;
352
+      position: absolute;
353
+      width: 330px;
354
+
355
+      .Raiders-image-Raiders {
356
+        // position: absolute;
357
+        width: 99px;
358
+        height: 37px;
359
+      }
360
+      .Raiders-image-loveOn {
361
+        position: absolute;
362
+        top: 12px;
363
+        right: 21px;
364
+        width: 22px;
365
+        height: 20px;
366
+      }
367
+    }
281 368
     .Raiders-box {
282
-      display: inline;
283
-      border: 1px solid RED;
369
+      // display: inline;
370
+      // border: 1px solid RED;
284 371
       width: 330px;
285
-      height: 649px;
372
+      // height: 649px;
373
+      background: #ffffff;
374
+      box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
375
+      border-radius: 24px;
376
+      flex-grow: 1;
377
+      // padding-right: 30px;
378
+      // display: flex;
379
+      // flex-flow: row nowrap;
380
+      justify-content: space-between;
381
+      .Raiders-image {
382
+        width: 330px;
383
+        height: 439px !important;
384
+        border-radius: 24px 24px 0px 0px;
385
+      }
386
+      .Raiders-text {
387
+        margin: auto;
388
+        width: 287px;
389
+        font-size: 24px;
390
+        font-weight: 700;
391
+        color: #404040;
392
+        line-height: 46px;
393
+        padding-top: 28px;
394
+        margin-bottom: 42px;
395
+        word-break: break-all;
396
+        text-overflow: ellipsis;
397
+        display: -webkit-box;
398
+        -webkit-box-orient: vertical;
399
+        -webkit-line-clamp: 2;
400
+        overflow: hidden;
401
+        word-wrap: break-word;
402
+      }
403
+      .Raiders-kilometer-on {
404
+        text-align: center;
405
+        margin-bottom: 50px;
406
+
407
+        .Raiders-kilometer {
408
+          width: 18px;
409
+          height: 24px;
410
+          padding-right: 10px;
411
+        }
412
+        .Raiders-kilometer-image {
413
+          width: 90px;
414
+          height: 21px;
415
+          font-size: 24px;
416
+          font-weight: 400;
417
+          color: #c0c8d3;
418
+        }
419
+        .Raiders-on-text {
420
+          padding-left: 75px;
421
+          width: 70px;
422
+          height: 21px;
423
+          font-size: 24px;
424
+          font-weight: 400;
425
+          color: #ff3434;
426
+        }
427
+      }
286 428
     }
287 429
   }
288 430
 }

+ 87
- 0
yarn-error.log ファイルの表示

@@ -0,0 +1,87 @@
1
+Arguments: 
2
+  C:\Program Files\nodejs\node.exe C:\Users\Administrator\AppData\Roaming\npm\node_modules\yarn\bin\yarn.js
3
+
4
+PATH: 
5
+  C:\ProgramData\Oracle\Java\javapath;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\nodejs\;C:\Program Files\Git\cmd;C:\Users\Administrator\AppData\Local\Microsoft\WindowsApps;C:\Users\Administrator\AppData\Roaming\npm;F:\Microsoft VS Code\bin
6
+
7
+Yarn version: 
8
+  1.22.11
9
+
10
+Node version: 
11
+  14.17.3
12
+
13
+Platform: 
14
+  win32 x64
15
+
16
+Trace: 
17
+  Error: getaddrinfo ENOTFOUND registry.npm.taobao.org
18
+      at GetAddrInfoReqWrap.onlookup [as oncomplete] (dns.js:69:26)
19
+
20
+npm manifest: 
21
+  {
22
+    "name": "miniapp",
23
+    "version": "1.0.0",
24
+    "private": true,
25
+    "description": "十公里",
26
+    "templateInfo": {
27
+      "name": "default",
28
+      "typescript": false,
29
+      "css": "less"
30
+    },
31
+    "scripts": {
32
+      "build:weapp": "taro build --type weapp",
33
+      "build:swan": "taro build --type swan",
34
+      "build:alipay": "taro build --type alipay",
35
+      "build:tt": "taro build --type tt",
36
+      "build:h5": "taro build --type h5",
37
+      "build:rn": "taro build --type rn",
38
+      "build:qq": "taro build --type qq",
39
+      "build:jd": "taro build --type jd",
40
+      "build:quickapp": "taro build --type quickapp",
41
+      "dev:weapp": "npm run build:weapp -- --watch",
42
+      "dev:swan": "npm run build:swan -- --watch",
43
+      "dev:alipay": "npm run build:alipay -- --watch",
44
+      "dev:tt": "npm run build:tt -- --watch",
45
+      "dev:h5": "npm run build:h5 -- --watch",
46
+      "dev:rn": "npm run build:rn -- --watch",
47
+      "dev:qq": "npm run build:qq -- --watch",
48
+      "dev:jd": "npm run build:jd -- --watch",
49
+      "dev:quickapp": "npm run build:quickapp -- --watch"
50
+    },
51
+    "browserslist": [
52
+      "last 3 versions",
53
+      "Android >= 4.1",
54
+      "ios >= 8"
55
+    ],
56
+    "author": "",
57
+    "dependencies": {
58
+      "@babel/runtime": "^7.7.7",
59
+      "@tarojs/components": "3.3.2",
60
+      "@tarojs/react": "3.3.2",
61
+      "@tarojs/runtime": "3.3.2",
62
+      "@tarojs/taro": "3.3.2",
63
+      "react": "^17.0.0",
64
+      "react-dom": "^17.0.0",
65
+      "taro-ui": "^2.3.4"
66
+    },
67
+    "devDependencies": {
68
+      "@types/webpack-env": "^1.13.6",
69
+      "@types/react": "^17.0.2",
70
+      "@tarojs/mini-runner": "3.3.2",
71
+      "@babel/core": "^7.8.0",
72
+      "@tarojs/webpack-runner": "3.3.2",
73
+      "babel-preset-taro": "3.3.2",
74
+      "eslint-config-taro": "3.3.2",
75
+      "eslint": "^6.8.0",
76
+      "eslint-plugin-react": "^7.8.2",
77
+      "eslint-plugin-import": "^2.12.0",
78
+      "eslint-plugin-react-hooks": "^4.2.0",
79
+      "stylelint": "9.3.0"
80
+    }
81
+  }
82
+
83
+yarn manifest: 
84
+  No manifest
85
+
86
+Lockfile: 
87
+  No lockfile