1002884655 3 vuotta sitten
vanhempi
commit
2e58b05ef8

+ 1
- 1
project.config.json Näytä tiedosto

@@ -27,7 +27,7 @@
27 27
 			"outputPath": ""
28 28
 		},
29 29
 		"useIsolateContext": true,
30
-		"useCompilerModule": false,
30
+		"useCompilerModule": true,
31 31
 		"userConfirmedUseCompilerModuleSwitch": false
32 32
 	},
33 33
 	"compileType": "miniprogram",

+ 2
- 2
src/components/ProjectItemCard/index.jsx Näytä tiedosto

@@ -42,7 +42,7 @@ export default (props) => {
42 42
       <view className='Views flex-h' onClick={() => goto(Data)}>
43 43
         <view className='flex-item'>
44 44
           <text className='iconfont icon-fenxiang'></text>
45
-          <text>{`${Data.shareList?.total || 199} 次分享`}</text>
45
+          <text>{`${199 + (Data.shareList?.total || 0)} 次分享`}</text>
46 46
         </view>
47 47
         {
48 48
           (Data.uvList?.length || 0) > 0 && (
@@ -57,7 +57,7 @@ export default (props) => {
57 57
             </view>
58 58
           )
59 59
         }
60
-        <text>{`...${Data.uvList?.length || 199}人围观`}</text>
60
+        <text>{`...${199 + (Data.uvList?.length || 0)}人围观`}</text>
61 61
       </view>
62 62
       {props.children}
63 63
     </view>

+ 2
- 2
src/components/ProjectListItem/index.jsx Näytä tiedosto

@@ -41,7 +41,7 @@ export default function ProjectListItem (props) {
41 41
         </view>
42 42
         <view className='ShareInfo'>
43 43
           <text className='iconfont icon-fenxiang'></text>
44
-          <text>{Data.shareNum || 299 + Math.floor(Math.random() * 10)}次分享</text>
44
+          <text>{299 + (Data.shareNum || 0)}次分享</text>
45 45
           <view className='Users'>
46 46
             {
47 47
               (uvList?.records || []).slice(0, 3).map((item, index) => (
@@ -51,7 +51,7 @@ export default function ProjectListItem (props) {
51 51
               ))
52 52
             }
53 53
           </view>
54
-          <text>{(uvList?.records || []).length > 0 ? '...' : ''}{Data.pvNum || 299 + Math.floor(Math.random() * 10)}人围观</text>
54
+          <text>{(uvList?.records || []).length > 0 ? '...' : ''}{299 + (Data.pvNum || 0)}人围观</text>
55 55
         </view>
56 56
       </view>
57 57
     </view>

+ 1
- 1
src/pages/index/addedValueService/index.jsx Näytä tiedosto

@@ -117,7 +117,7 @@ export default function AddedValueService () {
117 117
     <view className='components AddedValueService'>
118 118
       {
119 119
         ShowPopup &&
120
-        <SubmitBuyHouseResult List={ResultList.slice(0, 1)}></SubmitBuyHouseResult>
120
+        <SubmitBuyHouseResult List={ResultList.slice(0, 1)} ShowResult={false}></SubmitBuyHouseResult>
121 121
       }
122 122
       <ScrollView scroll-y>
123 123
         <view className='PageContent'>

+ 3
- 2
src/pages/index/buildingDetail/components/SpecialPriceHouse/index.jsx Näytä tiedosto

@@ -5,7 +5,7 @@ import '@/assets/css/iconfont.css'
5 5
 import useTimer from './useTimer'
6 6
 import './index.scss'
7 7
 
8
-const toW = n => `${Number(n / 10000).toFixed(1)}`
8
+const toW = n => `${Number(n / 10000).toFixed(1)}`
9 9
 const itFmt = it => `${it.unitType} ${Number(it.currentPrice / it.area).toFixed(0)}元/㎡`
10 10
 
11 11
 export default function SpecialPriceHouse (props) {
@@ -37,7 +37,8 @@ export default function SpecialPriceHouse (props) {
37 37
                 <text className='Tips'>省{`${toW(item.thriftPrice)}`}</text>
38 38
                 <view className='Price'>
39 39
                   <text>{toW(item.currentPrice)}</text>
40
-                  <text>{toW(item.originalPrice)}</text>
40
+                  <text>万</text>
41
+                  <text>{toW(item.originalPrice)}万</text>
41 42
                 </view>
42 43
                 <text className='Time'>{`距结束还有 ${leftTime[index] ? leftTime[index][1] : ''}`}</text>
43 44
                 <text className='HouseType'>{itFmt(item)}</text>

+ 5
- 2
src/pages/index/buildingDetail/components/SpecialPriceHouse/index.scss Näytä tiedosto

@@ -65,15 +65,18 @@
65 65
           >text {
66 66
             display: inline-block;
67 67
             vertical-align: middle;
68
-            font-size: 32px;
68
+            font-size: 24px;
69 69
             font-weight: bold;
70 70
             color: #FC2C2C;
71 71
             line-height: 1;
72
+            &:first-child {
73
+              font-size: 32px;
74
+            }
72 75
             &:last-child {
73 76
               color: #ccc;
74 77
               text-decoration: line-through;
75 78
               margin-left: 20px;
76
-              font-size: 28px;
79
+              font-size: 24px;
77 80
             }
78 81
           }
79 82
         }

+ 2
- 2
src/pages/index/findHouseFromMap/index.jsx Näytä tiedosto

@@ -178,7 +178,7 @@ export default withLayout((props) => {
178 178
             <view className='Views flex-h'>
179 179
               <view className='flex-item'>
180 180
                 <text className='iconfont icon-fenxiang'></text>
181
-                <text>{`${current.shareNum || 199}次分享`}</text>
181
+                <text>{`${199 + (current.shareNum || 0)}次分享`}</text>
182 182
               </view>
183 183
               <view className='Icons'>
184 184
                 {
@@ -189,7 +189,7 @@ export default withLayout((props) => {
189 189
                   ))
190 190
                 }
191 191
               </view>
192
-              <text>{(current.uvList?.records || []).length > 0 ? '...' : ''}{`${current.pvNum || 199}人围观`}</text>
192
+              <text>{(current.uvList?.records || []).length > 0 ? '...' : ''}{`${199 + (current.pvNum || 0)}人围观`}</text>
193 193
             </view>
194 194
           </view>
195 195
         </view>

+ 2
- 2
src/pages/index/helpToFindHouse/components/SubmitBuyHouseResult/index.jsx Näytä tiedosto

@@ -7,7 +7,7 @@ import '@/assets/css/iconfont.css'
7 7
 import './index.scss'
8 8
 
9 9
 export default function SubmitBuyHouseResult (props) {
10
-  const { List = [], setting } = props
10
+  const { List = [], setting, ShowResult = true } = props
11 11
 
12 12
   const handlePhone = () => {
13 13
     if (!setting?.phone) {
@@ -46,7 +46,7 @@ export default function SubmitBuyHouseResult (props) {
46 46
 
47 47
             {/* 匹配楼盘 */}
48 48
             {
49
-              !!List.length &&
49
+              !!List.length && ShowResult &&
50 50
               <view className='Recommend'>
51 51
                 <view className='Title'>
52 52
                   <view>

+ 7
- 6
src/pages/index/specialPriceHouse/index.jsx Näytä tiedosto

@@ -123,7 +123,7 @@ export default withLayout((props) => {
123 123
                       <view className='Views flex-h' onClick={() => goto(item)}>
124 124
                         <view className='flex-item'>
125 125
                           <text className='iconfont icon-fenxiang'></text>
126
-                          <text>{`${shareNum || 199} 次分享`}</text>
126
+                          <text>{`${199 + (shareNum || 0)} 次分享`}</text>
127 127
                         </view>
128 128
                         {
129 129
                           uvNum > 0 && (
@@ -138,7 +138,7 @@ export default withLayout((props) => {
138 138
                             </view>
139 139
                           )
140 140
                         }
141
-                        <text>{`...${uvNum || 199}人围观`}</text>
141
+                        <text>{`...${199 + (uvNum || 0)}人围观`}</text>
142 142
                       </view>
143 143
                       <view className='SpecialList'>
144 144
                         <ScrollView scrollX>
@@ -146,9 +146,9 @@ export default withLayout((props) => {
146 146
                             specialRoomList.map((it) => {
147 147
                               const unitPrice = it.area ? it.currentPrice / it.area : undefined
148 148
                               const unitW = unitPrice ? `${Number(unitPrice).toFixed(0)}元/㎡` : '单价待定'
149
-                              const currentW = it.currentPrice ? `${Number(it.currentPrice / 10000).toFixed(1)}` : '待定'
150
-                              const originalW = it.originalPrice ? `${Number(it.originalPrice / 10000).toFixed(1)}` : '待定'
151
-                              const thriftW = it.thriftPrice ? `省${Number(it.thriftPrice / 10000).toFixed(1)}` : '待定'
149
+                              const currentW = it.currentPrice ? `${Number(it.currentPrice / 10000).toFixed(1)}` : '待定'
150
+                              const originalW = it.originalPrice ? `${Number(it.originalPrice / 10000).toFixed(1)}` : '待定'
151
+                              const thriftW = it.thriftPrice ? `省${Number(it.thriftPrice / 10000).toFixed(1)}` : '待定'
152 152
                               const leftTime = formateLeftTime(new Date(it.endTime) - new Date(), 'min');
153 153
 
154 154
                               return (
@@ -156,7 +156,8 @@ export default withLayout((props) => {
156 156
                                   <text className='Tips'>{thriftW}</text>
157 157
                                   <view className='Price'>
158 158
                                     <text>{currentW}</text>
159
-                                    <text>{originalW}</text>
159
+                                    <text>万</text>
160
+                                    <text>{originalW}万</text>
160 161
                                   </view>
161 162
                                   <text className='Time'>{`距结束 ${leftTime}`}</text>
162 163
                                   <text className='HouseType'>{`${it.unitType} ${unitW}`}</text>

+ 5
- 2
src/pages/index/specialPriceHouse/index.scss Näytä tiedosto

@@ -232,15 +232,18 @@
232 232
                     >text {
233 233
                       display: inline-block;
234 234
                       vertical-align: middle;
235
-                      font-size: 32px;
235
+                      font-size: 24px;
236 236
                       font-weight: bold;
237 237
                       color: red;
238 238
                       line-height: 1;
239
+                      &:first-child {
240
+                        font-size: 32px;
241
+                      }
239 242
                       &:last-child {
240 243
                         color: #ccc;
241 244
                         text-decoration: line-through;
242 245
                         margin-left: 20px;
243
-                        font-size: 28px;
246
+                        font-size: 24px;
244 247
                       }
245 248
                     }
246 249
                   }

+ 1
- 1
src/pages/mine/index.jsx Näytä tiedosto

@@ -27,7 +27,7 @@ export default withLayout(() => {
27 27
   useEffect(() => {
28 28
     if (user?.userInfo?.person?.personId) {
29 29
       const person = user.userInfo.person
30
-      setUserRole(person.personType === ROLE_CODE.CUSTOMER || person.personType === ROLE_CODE.DRIFT ? 1 : person.personType === ROLE_CODE.CHANNEL_AGENT ? 2 : person.personType === ROLE_CODE.CONSULTANT ? 3 : 4)
30
+      setUserRole(person.personType === ROLE_CODE.CHANNEL_AGENT ? 2 : person.personType === ROLE_CODE.CONSULTANT ? 3 : person.personType === ROLE_CODE.MARKETING ? 4 : 1)
31 31
     }
32 32
   }, [user])
33 33