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

src/onlineSelling/components/Blank/index.js

@@ -3,5 +3,12 @@ import { View } from '@tarojs/components'
 import './index.scss'
 
 export default function Blank(props) {
-  return (<View className="blank"></View>)
+  return (
+    <View className="blank">
+      <View className="nodata"></View>
+      {
+        props.tips && <View className="tips">{props.tips}</View>
+      }      
+    </View>
+  )
 }

src/onlineSelling/components/Blank/index.scss

@@ -1,9 +1,20 @@
 
 .blank {
   width: 280rpx;
-  height: 220rpx;
-  background: url('../../assets/norecord.png');
-  background-size: cover;
   transform: translateY(50%);
   margin: 0 auto;
+
+  .nodata {
+    height: 220rpx;
+    background: url('../../assets/norecord.png');
+    background-size: cover;
+  }
+
+  .tips {
+    margin-top: 10rpx;
+    font-size: 28rpx;
+    line-height: 1.8em;
+    color: #999;
+    text-align: center;
+  }
 }

src/onlineSelling/pages/houseList/index.js

@@ -243,7 +243,7 @@ export default class HouseList extends Component {
 
   renderBlank() {
     return (
-      <View className="container"><Blank /></View>      
+      <View className="container"><Blank tips="暂无可选房源" /></View>      
     )
   }
 

src/onlineSelling/pages/records/index.js

@@ -1,6 +1,7 @@
 import Taro, { Component } from '@tarojs/taro'
 import { View, ScrollView } from '@tarojs/components'
 import HouseCard from '../../components/HouseCard'
+import Blank from '../../components/Blank'
 
 import './index.scss'
 
@@ -58,12 +59,14 @@ export default class Records extends Component {
     ]
   }
 
+
   render() {
     const { testData } = this.state
 
     return (
       <View className="records">
-        <ScrollView scrollY>
+        <Blank tips="暂无预选记录"/>
+        {/* <ScrollView scrollY>
           {
             testData.map((item) => {
               return (
@@ -73,7 +76,7 @@ export default class Records extends Component {
               )
             })
           }
-        </ScrollView>
+        </ScrollView> */}
       </View>
     )
   }

yarn-error.log

@@ -1,5 +1,5 @@
 Arguments: 
-  D:\Applications\nodejs\node.exe D:\Applications\Yarn\bin\yarn.js add src/onlineSelling/components/ScrollMessage --silent --no-progress
+  D:\Applications\nodejs\node.exe D:\Applications\Yarn\bin\yarn.js add src/onlineSelling/components/Blank --silent --no-progress
 
 PATH: 
   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,7 +14,7 @@ Platform:
   win32 x64
 
 Trace: 
-  Error: https://registry.npm.taobao.org/src%2fonlineSelling/components/ScrollMessage: [not_found] document not found
+  Error: https://registry.npm.taobao.org/src%2fonlineSelling/components/Blank: [not_found] document not found
       at Request.params.callback [as _callback] (D:\Applications\Yarn\lib\cli.js:65364:18)
       at Request.self.callback (D:\Applications\Yarn\lib\cli.js:129397:22)
       at Request.emit (events.js:198:13)