更新代码

package-lock.json

@@ -6281,7 +6281,7 @@
     },
     "opencollective": {
       "version": "1.0.3",
-      "resolved": "https://registry.npm.taobao.org/opencollective/download/opencollective-1.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fopencollective%2Fdownload%2Fopencollective-1.0.3.tgz",
+      "resolved": "https://registry.npm.taobao.org/opencollective/download/opencollective-1.0.3.tgz",
       "integrity": "sha1-ruY3K8KBRFg2kMPKja7PwSDdDvE=",
       "requires": {
         "babel-polyfill": "6.23.0",
@@ -6299,12 +6299,12 @@
         },
         "ansi-styles": {
           "version": "2.2.1",
-          "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz",
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "requires": {
             "ansi-styles": "^2.2.1",
@@ -6316,7 +6316,7 @@
         },
         "inquirer": {
           "version": "3.0.6",
-          "resolved": "https://registry.npm.taobao.org/inquirer/download/inquirer-3.0.6.tgz",
+          "resolved": "https://registry.npm.taobao.org/inquirer/download/inquirer-3.0.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Finquirer%2Fdownload%2Finquirer-3.0.6.tgz",
           "integrity": "sha1-4EqqnQW3o8ubD0B9BDdfBEcZA0c=",
           "requires": {
             "ansi-escapes": "^1.1.0",

pages/components/MainPage.js

@@ -195,11 +195,16 @@ export default class MainPage extends BasePage {
 				/>
 				{/* 搜索区域 */}
 				<View style={styles.searchSection}>
-					<TextInput
-						style={styles.searchBox}
-						onChangeText={(text) => this.setState({ text })}
-						value={this.state.text}
-					/>
+					<View style={{position: 'relative'}}>
+						<TextInput
+							style={styles.searchBox}
+							onChangeText={(text) => this.setState({ text })}
+							value={this.state.text}
+						/>
+						<TouchableOpacity onPress={() => this.search(this)} style={{position: 'absolute', right: 10, top: 10}}>
+							<Image style={styles.search} source={require('../images/common/search.png')}></Image>
+						</TouchableOpacity>
+					</View>
 					<TouchableOpacity onPress={this.tabCallOutHandler}>
 						<View style={styles.rightBtn}>
 							<Image source={require('../images/common/switch.png')} style={styles.rightBtnIcon} />
@@ -464,6 +469,7 @@ export default class MainPage extends BasePage {
 			});
 		}
 	};
+	// 获取用户信息
 	async getUserInfo() {
 		await global.storage
 			.load({
@@ -520,6 +526,11 @@ export default class MainPage extends BasePage {
 			return true;
 		});
 	}
+	// 搜索
+	search() {
+		const searchText = this.state.text;
+		this.toNextPage('SearchResult', {searchText})
+	}
 }
 
 const styles = StyleSheet.create({
@@ -549,6 +560,10 @@ const styles = StyleSheet.create({
 		backgroundColor: '#fff',
 		borderRadius: 20
 	},
+	search: {
+		width: 30,
+		height: 30,
+	},
 	rightBtn: {
 		width: Dimensions.getWidth(113),
 		height: Dimensions.getHeight(40),

pages/searchResult.js

@@ -23,10 +23,30 @@ import Dimensions from './utils/dimensions';
 import ShopBox from "./components/ShopBox";
 import TopicTitle from './components/TopicTitle';
 import ScrollRow from './components/ScrollRow';
+import CourseTitle from './components/CourseTitle';
 
 export default class SearchResult extends BasePage {
+    componentDidMount() {
+        const { searchText } = this.props.navigation.state.params;
+        console.log('searchText',searchText)
+        this.setState({
+            text: searchText
+        })
+        // courseDetails.getCourseDetails(courseId).then(res => {
+        //   console.log('列表',res.data)
+        //   const courseList = res.data.course;
+        //   const wareList = res.data.wareList;
+        //   this.setState({
+        //     courseList,
+        //     wareList,
+        //     uri: wareList[0].playUrl
+        //   })
+        // }).catch(err => {
+        //   console.log(err)
+        // });
+    }
     state = {
-        text: '123123123123'
+        text: ''
     };
     searchBox = () => {
         return (
@@ -49,9 +69,19 @@ export default class SearchResult extends BasePage {
     } 
     render() {
         return (
-            <FlatList
-                ListHeaderComponent={() => this.searchBox()}
-            />
+            <View>
+                <CourseTitle
+                    width={Dimensions.width}
+                    title="搜索"
+                    lefttype={1}
+                    textcolor={'#231F20'}
+                    backPress={() => this.goBack()}
+                    // backPress={() => alert("左侧按钮")}
+                />
+                {/* <FlatList
+                    ListHeaderComponent={() => this.searchBox()}
+                /> */}
+            </View>
         )
     }
 
@@ -69,6 +99,7 @@ const styles = StyleSheet.create({
         width: '88.5%',
         height: 40,
         borderRadius: 20,
-        backgroundColor: '#fff'
+        backgroundColor: '#fff',
+        paddingLeft: 15
     }
 })

pages/services/schedule.js

@@ -11,6 +11,5 @@ export default class ScheduleUrl {
             code
         }).get();
     }
-    
 
 }