1002884655 4 лет назад
Родитель
Сommit
bd08909653

+ 15
- 15
package-lock.json Просмотреть файл

@@ -4436,7 +4436,7 @@
4436 4436
       "dependencies": {
4437 4437
         "camelcase": {
4438 4438
           "version": "2.1.1",
4439
-          "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-2.1.1.tgz?cache=0&sync_timestamp=1603924797555&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcamelcase%2Fdownload%2Fcamelcase-2.1.1.tgz",
4439
+          "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-2.1.1.tgz?cache=0&sync_timestamp=1603921884289&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcamelcase%2Fdownload%2Fcamelcase-2.1.1.tgz",
4440 4440
           "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
4441 4441
         }
4442 4442
       }
@@ -5268,7 +5268,7 @@
5268 5268
     },
5269 5269
     "dayjs": {
5270 5270
       "version": "1.9.7",
5271
-      "resolved": "https://registry.npm.taobao.org/dayjs/download/dayjs-1.9.7.tgz?cache=0&sync_timestamp=1607180938588&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdayjs%2Fdownload%2Fdayjs-1.9.7.tgz",
5271
+      "resolved": "https://registry.npm.taobao.org/dayjs/download/dayjs-1.9.7.tgz?cache=0&sync_timestamp=1607178538136&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdayjs%2Fdownload%2Fdayjs-1.9.7.tgz",
5272 5272
       "integrity": "sha1-SyYLsX3O7S1fKQON/uA8ZaZ4b8A="
5273 5273
     },
5274 5274
     "debug": {
@@ -5448,7 +5448,7 @@
5448 5448
     },
5449 5449
     "delegates": {
5450 5450
       "version": "1.0.0",
5451
-      "resolved": "https://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdelegates%2Fdownload%2Fdelegates-1.0.0.tgz",
5451
+      "resolved": "https://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz",
5452 5452
       "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
5453 5453
     },
5454 5454
     "depd": {
@@ -7422,7 +7422,7 @@
7422 7422
     },
7423 7423
     "gauge": {
7424 7424
       "version": "2.7.4",
7425
-      "resolved": "https://registry.npm.taobao.org/gauge/download/gauge-2.7.4.tgz?cache=0&sync_timestamp=1580507640343&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fgauge%2Fdownload%2Fgauge-2.7.4.tgz",
7425
+      "resolved": "https://registry.npm.taobao.org/gauge/download/gauge-2.7.4.tgz",
7426 7426
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
7427 7427
       "requires": {
7428 7428
         "aproba": "^1.0.3",
@@ -9170,7 +9170,7 @@
9170 9170
       "dependencies": {
9171 9171
         "pify": {
9172 9172
           "version": "2.3.0",
9173
-          "resolved": "https://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz",
9173
+          "resolved": "https://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz?cache=0&sync_timestamp=1593529716831&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpify%2Fdownload%2Fpify-2.3.0.tgz",
9174 9174
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
9175 9175
         }
9176 9176
       }
@@ -9389,7 +9389,7 @@
9389 9389
     },
9390 9390
     "meow": {
9391 9391
       "version": "3.7.0",
9392
-      "resolved": "https://registry.npm.taobao.org/meow/download/meow-3.7.0.tgz",
9392
+      "resolved": "https://registry.npm.taobao.org/meow/download/meow-3.7.0.tgz?cache=0&sync_timestamp=1603923049745&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmeow%2Fdownload%2Fmeow-3.7.0.tgz",
9393 9393
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
9394 9394
       "requires": {
9395 9395
         "camelcase-keys": "^2.0.0",
@@ -9880,7 +9880,7 @@
9880 9880
     },
9881 9881
     "node-sass": {
9882 9882
       "version": "5.0.0",
9883
-      "resolved": "https://registry.npm.taobao.org/node-sass/download/node-sass-5.0.0.tgz?cache=0&sync_timestamp=1604150672615&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-sass%2Fdownload%2Fnode-sass-5.0.0.tgz",
9883
+      "resolved": "https://registry.npm.taobao.org/node-sass/download/node-sass-5.0.0.tgz?cache=0&sync_timestamp=1604150619472&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-sass%2Fdownload%2Fnode-sass-5.0.0.tgz",
9884 9884
       "integrity": "sha1-To85++87rI0txy6+O1OXEYg6eNI=",
9885 9885
       "requires": {
9886 9886
         "async-foreach": "^0.1.3",
@@ -9903,12 +9903,12 @@
9903 9903
       "dependencies": {
9904 9904
         "ansi-styles": {
9905 9905
           "version": "2.2.1",
9906
-          "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz?cache=0&sync_timestamp=1606792371412&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-2.2.1.tgz",
9906
+          "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz?cache=0&sync_timestamp=1601839122515&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-2.2.1.tgz",
9907 9907
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
9908 9908
         },
9909 9909
         "chalk": {
9910 9910
           "version": "1.1.3",
9911
-          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz?cache=0&sync_timestamp=1592843133653&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-1.1.3.tgz",
9911
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz?cache=0&sync_timestamp=1591687028262&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-1.1.3.tgz",
9912 9912
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
9913 9913
           "requires": {
9914 9914
             "ansi-styles": "^2.2.1",
@@ -9920,7 +9920,7 @@
9920 9920
         },
9921 9921
         "supports-color": {
9922 9922
           "version": "2.0.0",
9923
-          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-2.0.0.tgz?cache=0&sync_timestamp=1606205080621&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-2.0.0.tgz",
9923
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-2.0.0.tgz?cache=0&sync_timestamp=1606205060845&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-2.0.0.tgz",
9924 9924
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
9925 9925
         }
9926 9926
       }
@@ -10018,7 +10018,7 @@
10018 10018
     },
10019 10019
     "number-is-nan": {
10020 10020
       "version": "1.0.1",
10021
-      "resolved": "https://registry.npm.taobao.org/number-is-nan/download/number-is-nan-1.0.1.tgz?cache=0&sync_timestamp=1581061562193&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnumber-is-nan%2Fdownload%2Fnumber-is-nan-1.0.1.tgz",
10021
+      "resolved": "https://registry.npm.taobao.org/number-is-nan/download/number-is-nan-1.0.1.tgz?cache=0&sync_timestamp=1581061498787&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnumber-is-nan%2Fdownload%2Fnumber-is-nan-1.0.1.tgz",
10022 10022
       "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
10023 10023
     },
10024 10024
     "nwsapi": {
@@ -11484,7 +11484,7 @@
11484 11484
     },
11485 11485
     "read-pkg": {
11486 11486
       "version": "1.1.0",
11487
-      "resolved": "https://registry.npm.taobao.org/read-pkg/download/read-pkg-1.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fread-pkg%2Fdownload%2Fread-pkg-1.1.0.tgz",
11487
+      "resolved": "https://registry.npm.taobao.org/read-pkg/download/read-pkg-1.1.0.tgz",
11488 11488
       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
11489 11489
       "requires": {
11490 11490
         "load-json-file": "^1.0.0",
@@ -11504,7 +11504,7 @@
11504 11504
         },
11505 11505
         "pify": {
11506 11506
           "version": "2.3.0",
11507
-          "resolved": "https://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz",
11507
+          "resolved": "https://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz?cache=0&sync_timestamp=1593529716831&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpify%2Fdownload%2Fpify-2.3.0.tgz",
11508 11508
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
11509 11509
         }
11510 11510
       }
@@ -11520,7 +11520,7 @@
11520 11520
       "dependencies": {
11521 11521
         "find-up": {
11522 11522
           "version": "1.1.2",
11523
-          "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-1.1.2.tgz?cache=0&sync_timestamp=1597169884679&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffind-up%2Fdownload%2Ffind-up-1.1.2.tgz",
11523
+          "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-1.1.2.tgz?cache=0&sync_timestamp=1597169882796&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffind-up%2Fdownload%2Ffind-up-1.1.2.tgz",
11524 11524
           "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
11525 11525
           "requires": {
11526 11526
             "path-exists": "^2.0.0",
@@ -12914,7 +12914,7 @@
12914 12914
     },
12915 12915
     "string-width": {
12916 12916
       "version": "1.0.2",
12917
-      "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-1.0.2.tgz?cache=0&sync_timestamp=1573488535785&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-width-1.0.2.tgz",
12917
+      "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-1.0.2.tgz",
12918 12918
       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
12919 12919
       "requires": {
12920 12920
         "code-point-at": "^1.0.0",

+ 1
- 1
project.config.json Просмотреть файл

@@ -26,10 +26,10 @@
26 26
 			"disablePlugins": [],
27 27
 			"outputPath": ""
28 28
 		},
29
-		"bundle": false,
30 29
 		"useIsolateContext": true,
31 30
 		"useCompilerModule": false,
32 31
 		"userConfirmedUseCompilerModuleSwitch": false,
32
+		"bundle": false,
33 33
 		"useMultiFrameRuntime": false,
34 34
 		"useApiHook": true,
35 35
 		"enableEngineNative": false,

+ 1
- 1
src/pages/FuLi/ShangPinXiangQing/index.jsx Просмотреть файл

@@ -53,8 +53,8 @@ export default function ShangPinXiangQing () {
53 53
           <view className='Title'>
54 54
             <view className='Line'></view>
55 55
             <text>产品详情</text>
56
-            <image mode='widthFix' src={GoodsDetail === null ? null : GoodsDetail.detailImgUrl} style={{ width: `100%` }}></image>
57 56
           </view>
57
+          <image mode='widthFix' src={GoodsDetail === null ? null : GoodsDetail.detailImgUrl} style={{ width: `100%` }}></image>
58 58
           <view className='BottomBtn'>
59 59
             <text className='active' onClick={() => { Taro.navigateTo({ url: `/pages/FuLi/ShangPinDuiHuan/index?id=${CurrnetId}` }) }}>立即兑换</text>
60 60
           </view>

+ 2
- 2
src/pages/ShouYe/index.less Просмотреть файл

@@ -60,7 +60,7 @@
60 60
               z-index: 1;
61 61
               left: 0;
62 62
               top: 0;
63
-              padding-bottom: 60%;
63
+              padding-bottom: 50%;
64 64
               border-radius: 0 0 100px 100px;
65 65
               background-image: linear-gradient(#f35844, #ff8d61);
66 66
               z-index: 1;
@@ -69,7 +69,7 @@
69 69
               display: block;
70 70
               font-size: 30px;
71 71
               color: #fff;
72
-              margin-top: 60px;
72
+              margin-top: 20px;
73 73
               text-indent: 30px;
74 74
             }
75 75
             > .BannerContainer {

+ 41
- 53
src/pages/WoDe/index.jsx Просмотреть файл

@@ -11,7 +11,6 @@ import './index.less'
11 11
 export default function WoDe () {
12 12
 
13 13
   const { user, setUser } = useModel('user')
14
-  const [IsPull, setIsPull] = useState(false)
15 14
   const [UserTab] = useState([
16 15
     { icon: 'iconrenzheng1', name: '业主认证', id: 1, router: '/pages/WoDe/WoDeRenZheng/index' },
17 16
     { icon: 'iconjifenguize', name: '积分明细', id: 2, router: '/pages/FuLi/JiFenMingXi/index' },
@@ -48,69 +47,58 @@ export default function WoDe () {
48 47
     })
49 48
   }
50 49
 
51
-  const OnRefresh = () => { // 页面下拉刷新
52
-    setIsPull(true)
53
-
54
-    const t = setTimeout(() => {
55
-      setIsPull(false)
56
-      clearTimeout(t)
57
-    }, 1000)
58
-  }
59
-
60 50
   return (
61 51
     <Page>
62 52
       <view className='WoDe'>
63 53
         <NavHeader BgColor='none' Title='我的' IsFixed={true}></NavHeader>
64
-        <scroll-view scroll-y='true' style='height: 100%;' refresher-enabled={true} onrefresherrefresh={OnRefresh} refresher-triggered={IsPull} refresher-background='#F35844'>
65
-          <view className='WoDeContent'>
54
+        <view className='WoDeContent'>
66 55
 
67
-            {/* 顶部背景图 */}
68
-            <view className='TopBg'>
69
-              <view className='ColorBg'></view>
70
-              <view className='UserInfo flex-h'>
71
-                <view className='Icon' onClick={() => { Taro.navigateTo({ url: '/pages/WoDe/GeRenXinXi/index' }) }}>
72
-                  <image mode='aspectFill' src={user.avatarurl} class='centerLabel'></image>
73
-                </view>
74
-                <view className='flex-item' onClick={() => { Taro.navigateTo({ url: '/pages/WoDe/GeRenXinXi/index' }) }}>
75
-                  <text>{user.nickname || '暂未授权用户信息'}</text>
76
-                  <text>{user.phone || '暂未授权手机号'}</text>
77
-                </view>
78
-                {
79
-                  user.havaSigned !== undefined &&
80
-                  <text onClick={ToSign}>{user.havaSigned - 0 === 1 ? '已签到' : '签到'}</text>
81
-                }
56
+          {/* 顶部背景图 */}
57
+          <view className='TopBg'>
58
+            <view className='ColorBg'></view>
59
+            <view className='UserInfo flex-h'>
60
+              <view className='Icon' onClick={() => { Taro.navigateTo({ url: '/pages/WoDe/GeRenXinXi/index' }) }}>
61
+                <image mode='aspectFill' src={user.avatarurl} class='centerLabel'></image>
62
+              </view>
63
+              <view className='flex-item' onClick={() => { Taro.navigateTo({ url: '/pages/WoDe/GeRenXinXi/index' }) }}>
64
+                <text>{user.nickname || '暂未授权用户信息'}</text>
65
+                <text>{user.phone || '暂未授权手机号'}</text>
82 66
               </view>
83
-            </view>
84
-
85
-            {/* 用户选项 */}
86
-            <view className='UserTab'>
87
-              {
88
-                UserTab.map((item, index) => (
89
-                  <view key={`UserTab-${index}`} className='flex-h' onClick={() => { Taro.navigateTo({ url: item.router }) }}>
90
-                    <text className={`iconfont ${item.icon}`}></text>
91
-                    <view className='flex-h flex-item'>
92
-                      <text className='flex-item'>{item.name}</text>
93
-                      <text className='iconfont iconjiantouright'></text>
94
-                    </view>
95
-                  </view>
96
-                ))
97
-              }
98
-              <view className='Line'></view>
99 67
               {
100
-                MoreUserTab.map((item, index) => (
101
-                  <view key={`UserTab-${index}`} className='flex-h' onClick={() => { Taro.navigateTo({ url: item.router }) }}>
102
-                    <text className={`iconfont ${item.icon}`}></text>
103
-                    <view className='flex-h flex-item'>
104
-                      <text className='flex-item'>{item.name}</text>
105
-                      <text className='iconfont iconjiantouright'></text>
106
-                    </view>
107
-                  </view>
108
-                ))
68
+                user.havaSigned !== undefined &&
69
+                <text onClick={ToSign}>{user.havaSigned - 0 === 1 ? '已签到' : '签到'}</text>
109 70
               }
110 71
             </view>
72
+          </view>
111 73
 
74
+          {/* 用户选项 */}
75
+          <view className='UserTab'>
76
+            {
77
+              UserTab.map((item, index) => (
78
+                <view key={`UserTab-${index}`} className='flex-h' onClick={() => { Taro.navigateTo({ url: item.router }) }}>
79
+                  <text className={`iconfont ${item.icon}`}></text>
80
+                  <view className='flex-h flex-item'>
81
+                    <text className='flex-item'>{item.name}</text>
82
+                    <text className='iconfont iconjiantouright'></text>
83
+                  </view>
84
+                </view>
85
+              ))
86
+            }
87
+            <view className='Line'></view>
88
+            {
89
+              MoreUserTab.map((item, index) => (
90
+                <view key={`UserTab-${index}`} className='flex-h' onClick={() => { Taro.navigateTo({ url: item.router }) }}>
91
+                  <text className={`iconfont ${item.icon}`}></text>
92
+                  <view className='flex-h flex-item'>
93
+                    <text className='flex-item'>{item.name}</text>
94
+                    <text className='iconfont iconjiantouright'></text>
95
+                  </view>
96
+                </view>
97
+              ))
98
+            }
112 99
           </view>
113
-        </scroll-view>
100
+
101
+        </view>
114 102
       </view>
115 103
     </Page>
116 104
   )