瀏覽代碼

Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into dev

1007395918@qq.com 5 年之前
父節點
當前提交
6ceb9b150e

+ 8
- 1
src/onlineSelling/components/Blank/index.js 查看文件

3
 import './index.scss'
3
 import './index.scss'
4
 
4
 
5
 export default function Blank(props) {
5
 export default function Blank(props) {
6
-  return (<View className="blank"></View>)
6
+  return (
7
+    <View className="blank">
8
+      <View className="nodata"></View>
9
+      {
10
+        props.tips && <View className="tips">{props.tips}</View>
11
+      }      
12
+    </View>
13
+  )
7
 }
14
 }

+ 14
- 3
src/onlineSelling/components/Blank/index.scss 查看文件

1
 
1
 
2
 .blank {
2
 .blank {
3
   width: 280rpx;
3
   width: 280rpx;
4
-  height: 220rpx;
5
-  background: url('../../assets/norecord.png');
6
-  background-size: cover;
7
   transform: translateY(50%);
4
   transform: translateY(50%);
8
   margin: 0 auto;
5
   margin: 0 auto;
6
+
7
+  .nodata {
8
+    height: 220rpx;
9
+    background: url('../../assets/norecord.png');
10
+    background-size: cover;
11
+  }
12
+
13
+  .tips {
14
+    margin-top: 10rpx;
15
+    font-size: 28rpx;
16
+    line-height: 1.8em;
17
+    color: #999;
18
+    text-align: center;
19
+  }
9
 }
20
 }

+ 1
- 1
src/onlineSelling/pages/houseList/index.js 查看文件

243
 
243
 
244
   renderBlank() {
244
   renderBlank() {
245
     return (
245
     return (
246
-      <View className="container"><Blank /></View>      
246
+      <View className="container"><Blank tips="暂无可选房源" /></View>      
247
     )
247
     )
248
   }
248
   }
249
 
249
 

+ 5
- 2
src/onlineSelling/pages/records/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro'
1
 import Taro, { Component } from '@tarojs/taro'
2
 import { View, ScrollView } from '@tarojs/components'
2
 import { View, ScrollView } from '@tarojs/components'
3
 import HouseCard from '../../components/HouseCard'
3
 import HouseCard from '../../components/HouseCard'
4
+import Blank from '../../components/Blank'
4
 
5
 
5
 import './index.scss'
6
 import './index.scss'
6
 
7
 
58
     ]
59
     ]
59
   }
60
   }
60
 
61
 
62
+
61
   render() {
63
   render() {
62
     const { testData } = this.state
64
     const { testData } = this.state
63
 
65
 
64
     return (
66
     return (
65
       <View className="records">
67
       <View className="records">
66
-        <ScrollView scrollY>
68
+        <Blank tips="暂无预选记录"/>
69
+        {/* <ScrollView scrollY>
67
           {
70
           {
68
             testData.map((item) => {
71
             testData.map((item) => {
69
               return (
72
               return (
73
               )
76
               )
74
             })
77
             })
75
           }
78
           }
76
-        </ScrollView>
79
+        </ScrollView> */}
77
       </View>
80
       </View>
78
     )
81
     )
79
   }
82
   }

+ 2
- 2
yarn-error.log 查看文件

1
 Arguments: 
1
 Arguments: 
2
-  D:\Applications\nodejs\node.exe D:\Applications\Yarn\bin\yarn.js add src/onlineSelling/components/ScrollMessage --silent --no-progress
2
+  D:\Applications\nodejs\node.exe D:\Applications\Yarn\bin\yarn.js add src/onlineSelling/components/Blank --silent --no-progress
3
 
3
 
4
 PATH: 
4
 PATH: 
5
   D:\Applications\nodejs\node_modules\npm\node_modules\npm-lifecycle\node-gyp-bin;D:\FrontProjects\estateagents\miniapp-v3\node_modules\.bin;D:\Applications\nodejs\node_modules\npm\node_modules\npm-lifecycle\node-gyp-bin;D:\FrontProjects\estateagents\miniapp-v3\node_modules\.bin;D:\Applications\Java8\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;D:\Applications\nodejs\;D:\Applications\Git\cmd;D:\Applications\go1.12\go\bin;D:\Applications\bin;D:\Applications\nginx-1.10.2;D:\Applications\apache-maven-3.6.0\bin;D:\Applications\Yarn\bin\;C:\Users\yansen\AppData\Local\Microsoft\WindowsApps;C:\Program Files\Bandizip\;C:\Users\yansen\AppData\Roaming\npm;D:\Applications\Microsoft VS Code\bin;D:\GoProjects\bin;C:\Users\yansen\AppData\Local\Yarn\bin
5
   D:\Applications\nodejs\node_modules\npm\node_modules\npm-lifecycle\node-gyp-bin;D:\FrontProjects\estateagents\miniapp-v3\node_modules\.bin;D:\Applications\nodejs\node_modules\npm\node_modules\npm-lifecycle\node-gyp-bin;D:\FrontProjects\estateagents\miniapp-v3\node_modules\.bin;D:\Applications\Java8\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;D:\Applications\nodejs\;D:\Applications\Git\cmd;D:\Applications\go1.12\go\bin;D:\Applications\bin;D:\Applications\nginx-1.10.2;D:\Applications\apache-maven-3.6.0\bin;D:\Applications\Yarn\bin\;C:\Users\yansen\AppData\Local\Microsoft\WindowsApps;C:\Program Files\Bandizip\;C:\Users\yansen\AppData\Roaming\npm;D:\Applications\Microsoft VS Code\bin;D:\GoProjects\bin;C:\Users\yansen\AppData\Local\Yarn\bin
14
   win32 x64
14
   win32 x64
15
 
15
 
16
 Trace: 
16
 Trace: 
17
-  Error: https://registry.npm.taobao.org/src%2fonlineSelling/components/ScrollMessage: [not_found] document not found
17
+  Error: https://registry.npm.taobao.org/src%2fonlineSelling/components/Blank: [not_found] document not found
18
       at Request.params.callback [as _callback] (D:\Applications\Yarn\lib\cli.js:65364:18)
18
       at Request.params.callback [as _callback] (D:\Applications\Yarn\lib\cli.js:65364:18)
19
       at Request.self.callback (D:\Applications\Yarn\lib\cli.js:129397:22)
19
       at Request.self.callback (D:\Applications\Yarn\lib\cli.js:129397:22)
20
       at Request.emit (events.js:198:13)
20
       at Request.emit (events.js:198:13)