nothing

App.vue

@@ -1,6 +1,69 @@
 <script>
 	export default {
 		globalData: {
+			global_page: '',
+			schoolInfo:[{
+				schoolName:'清华大学',
+				schoolImg: require('static/qinghua@2x.png'),
+				jianlishijian:'1949',
+				banxuexingzhi:'公立',
+				leixing:'大学',
+				lishu:'教育部',
+				shengshi:'北京',
+				dizhi:'学院南路校区北京市海淀区学院南路39号'
+			},
+			{
+				schoolName:'北京大学',
+				schoolImg: require('static/beida@2x.png'),
+				jianlishijian:'1949',
+				banxuexingzhi:'公立',
+				leixing:'大学',
+				lishu:'教育部',
+				shengshi:'北京',
+				dizhi:'学院南路校区北京市海淀区学院南路39号'
+			},
+			{
+				schoolName:'中南大学',
+				schoolImg:require('static/zhongnan@2x.png'),
+				jianlishijian:'1949',
+				banxuexingzhi:'公立',
+				leixing:'大学',
+				lishu:'教育部',
+				shengshi:'北京',
+				dizhi:'学院南路校区北京市海淀区学院南路39号'
+			},
+			{
+				schoolName:'中央财经大学',
+				schoolImg:require('static/zhongyangcaijing@2x.png'),
+				jianlishijian:'1949',
+				banxuexingzhi:'公立',
+				leixing:'大学',
+				lishu:'教育部',
+				shengshi:'北京',
+				dizhi:'学院南路校区北京市海淀区学院南路39号'
+			},
+			{
+				schoolName:'复旦大学',
+				schoolImg:require('static/fudan@2x.png'),
+				jianlishijian:'1949',
+				banxuexingzhi:'公立',
+				leixing:'大学',
+				lishu:'教育部',
+				shengshi:'北京',
+				dizhi:'学院南路校区北京市海淀区学院南路39号'
+			},
+			{
+				schoolName:'四川大学',
+				schoolImg:require('static/sichuan@2x.png'),
+				jianlishijian:'1949',
+				banxuexingzhi:'公立',
+				leixing:'大学',
+				lishu:'教育部',
+				shengshi:'北京',
+				dizhi:'学院南路校区北京市海淀区学院南路39号'
+			}
+			],
+			
 			global_colle: [{
 					name: "北京大学",
 					address: "北京",

manifest.json

@@ -1,80 +1,73 @@
-{
-	"name" : "UniApp",
-	"appid" : "",
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
-    /* 5+App特有相关 */
-	"app-plus": {
-		"usingComponents": true,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-        /* 模块配置 */
-		"modules": {
-
-		},
-        /* 应用发布信息 */
-		"distribute": {
-            /* android打包配置 */
-			"android": {
-				"permissions": ["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
-			},
-            /* ios打包配置 */
-			"ios": {
-
-			},
-            /* SDK配置 */
-			"sdkConfigs": {
-
-			}
-		}
-	},
-    /* 快应用特有相关 */
-	"quickapp": {
-
-	},
-    /* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "",
-		"setting": {
-			"urlCheck": false
-		},
-		"usingComponents": true
-	},
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    }
-}
+{
+    "name" : "UniApp",
+    "appid" : "__UNI__89AE9B1",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {},
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {},
+            /* SDK配置 */
+            "sdkConfigs" : {}
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    }
+}

pages.json

@@ -17,16 +17,34 @@
 			}
 		},
 		{
-			"path": "pages/myinfo2/myinfo2",
+			"path": "pages/schooldetail/schooldetail",
 			"style": {
-				"navigationBarTitleText": "我的2"
+				"navigationBarTitleText": "school-name"
+			}
+		},
+		{
+			"path": "pages/majorbox/majorbox",
+			"style": {
+				"navigationBarTitleText": "专业库"
+			}
+		},
+		{
+			"path": "pages/schoolbox/schoolbox",
+			"style": {
+				"navigationBarTitleText": "院校库"
+			}
+		},
+		{
+			"path": "pages/interestbox/interestbox",
+			"style": {
+				"navigationBarTitleText": "兴趣测评"
 			}
 		}
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#F8F8F8",
+		"navigationBarBackgroundColor": "#ffffff",
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
@@ -47,34 +65,10 @@
 		}, {
 			"pagePath": "pages/myinfo/myinfo",
 			"iconPath": "static/home_icon_my_nor.png",
-			"selectedIconPath": "static/home_icon_my_nor.png",
+			"selectedIconPath": "static/Screenshot_2019-09-24.png",
 			"text": "我的"
 		}]
 	},
-	"condition": { //模式配置，仅开发期间生效
-	},
-    "tabBar": {
-        "color": "#7A7E83",
-        "selectedColor": "#EF3A3A",
-        "borderStyle": "black",
-        "backgroundColor": "#ffffff",
-        "list": [{
-            "pagePath": "pages/index/index",
-            "iconPath": "static/home_icon_default_nor.png",
-            "selectedIconPath": "static/home_icon_default_sel.png",
-            "text": "首页"
-        },{
-            "pagePath": "pages/predict/predict",
-            "iconPath": "static/home_icon_volunteer_nor.png",
-            "selectedIconPath": "static/home_icon_volunteer_sel.png",
-            "text": "志愿预测"
-        }, {
-            "pagePath": "pages/myinfo/myinfo",
-            "iconPath": "static/home_icon_my_nor.png",
-            "selectedIconPath": "static/home_icon_my_nor.png",
-            "text": "我的"
-        }]
-    },
 	"condition" : { //模式配置，仅开发期间生效
 		"current": 0, //当前激活的模式(list 的索引项)
 		"list": [{

pages/index/index.vue

@@ -33,35 +33,23 @@
 			<view class="titleRed">
 				<image src="../../static/btn_bg_big.png" mode=""></image>
 			</view>
-			<view class="school-content">
-				<view class="schol-icon" @tap="detail">
-					<image src="../../static/清华@2x.png" mode="widthFix"></image>
-					<span>清华大学</span>
-				</view>
-				<view class="schol-icon">
-					<image src="../../static/清华@2x.png" mode="widthFix"></image>
-					<span>清华大学</span>
-				</view>
-			</view>
-			<view class="school-content">
-				<view class="schol-icon">
-					<image src="../../static/清华@2x.png" mode="widthFix"></image>
-					<span>清华大学</span>
-				</view>
-				<view class="schol-icon">
-					<image src="../../static/清华@2x.png" mode="widthFix"></image>
-					<span>清华大学</span>
-				</view>
-			</view>
-			<view class="school-content">
-				<view class="schol-icon">
-					<image src="../../static/清华@2x.png" mode="widthFix"></image>
-					<span>清华大学</span>
-				</view>
-				<view class="schol-icon">
-					<image src="../../static/清华@2x.png" mode="widthFix"></image>
-					<span>清华大学</span>
+			<view class="school-container">
+				<view class="school-content">
+					<block v-for="(school,index) in school_list" :key="index" v-if="(index+1)%2!=0">
+						<view class="schol-icon" @tap.stop="detail" :id="index">
+							<image :src="school.schoolImg" mode="widthFix"></image>
+							<span>{{school.schoolName}}</span>
+						</view>
+					</block>
 				</view>
+				<view class="school-content">
+					<block v-for="(school,index) in school_list" :key="index" v-if="(index+1)%2==0">
+						<view class="schol-icon" @tap.stop="detail" :id="index">
+							<image :src="school.schoolImg" mode="widthFix"></image>
+							<span>{{school.schoolName}}</span>
+						</view>
+					</block>
+				</view>	
 			</view>
 		</view>
 
@@ -107,7 +95,6 @@
 				</view>
 			</view>
 		</view>
-
 	<!-- 	<div class="footer">
 			<div>
 				<image src="../../static/icon/home_icon_default_sel@2x.png" mode="widthFix"></image>
@@ -121,8 +108,7 @@
 				<image src="../../static/icon/home_icon_my_nor@2x.png" mode="widthFix"></image>
 				<p>我的</p>
 			</div>
-		</div>
- -->
+		</div> -->
 		<uni-popup :show="welcome" :type="type" :custom="true" :mask-click="false">
 			<view class="uni-tip-wel">
 				<image src="../../static/home_ic_college@2x.png" mode="widthFix" style="width: 300upx;height: 300upx;margin: 40upx auto 0;"></image>
@@ -274,7 +260,8 @@
 				leftDrawer: false,
 				rightDrawer: false,
 				mode: 'right',
-				wenliArr: ['文科','理科']
+				wenliArr: ['文科','理科'],
+				school_list:getApp().globalData.schoolInfo
 			};
 		},
 		onLoad() {
@@ -419,27 +406,28 @@
 			jumpschool(ev) {
 				console.log(ev);
 				uni.navigateTo({
-					url: '../myinfo2/myinfo2'
+					url: '../schoolbox/schoolbox'
 				});
 			},
 			detail: function(e) {
+				console.log(e)
 				// const page = e.currentTarget.id;
-				console.log(e);
+				getApp().globalData.global_page=e.currentTarget.id;
 				uni.navigateTo({
-					url: '../myinfo2/myinfo2',
+					url: '../schooldetail/schooldetail',
 					// url: `../${page}/${page}`
 				})
 			},
 			jumpmajor(ev) {
 				console.log(ev);
 				uni.navigateTo({
-					url: '../myinfo2/myinfo2'
+					url: '../majorbox/majorbox'
 				});
 			},
 			jumpinterest(ev) {
 				console.log(ev);
 				uni.navigateTo({
-					url: '../myinfo2/myinfo2'
+					url: '../interestbox/interestbox'
 				});
 			}
 		}
@@ -902,25 +890,35 @@
 		margin: 0 auto;
 		display: block;
 	}
-
-	.school-content {
+	.school-container{
+		width: 100%;
+		/* box-sizing: border-box; */
 		display: flex;
+		flex-direction: row;
 		flex-wrap: wrap;
+		justify-content: space-between;
+		padding-top: 40rpx;
 	}
-
+	.school-content {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		/* flex-wrap: wrap; */
+	}
+/* 
 	.school-content view:first-child {
 		margin-left: 98upx;
 		margin-right: 195upx;
+	} */
+	.schol-icon{
+		width: 100%;
 	}
-
 	.schol-icon image {
 		width: 180upx;
 		height: 180upx;
 	}
 
 	.schol-icon span {
-		width: 112upx;
-		height: 40upx;
 		font-size: 28upx;
 		font-family: PingFangSC;
 		font-weight: 500;

pages/myinfo2/myinfo2.vue

@@ -1,80 +0,0 @@
-<template>
-	<view class="jiben">
-		<view class="schoolicon">
-			<image src="../../static/北大@2x.png" mode=""></image>
-		</view>
-		<view class="icontext">
-			系统预测该校录取概率为：{{}}
-		</view>
-		<view class="jieshao">
-			<!-- <sun-tab :value.sync="index" :tabList="tabList"></sun-tab> -->
-			<sun-tab :value.sync="index" @change="objectChange" :tabList="tabObjectList" rangeKey="name"></sun-tab>
-		</view>
-	</view>
-</template>
-
-<script>
-	import sunTab from '@/components/sun-tab/sun-tab.vue';
-
-	export default {
-	        components: {
-	            sunTab
-	        },
-	        data() {
-	            return {
-	                index: 0,
-	                tabList: ['学院介绍','开设专业','录取招生'], //普通数据赋值
-	                tabObjectList: [ //对象数组赋值
-	                    {
-	                        name: '学院介绍',
-	                        value: 1
-	                    },
-	                    {
-	                        name: '开设专业',
-	                        value: 2
-	                    },
-	                    {
-	                        name: '录取招生',
-	                        value: 3
-	                    }
-	                ],
-	            }
-	        },
-	        methods: {
-	            arrayChange(e){
-	                console.log('数组数据返回格式');
-	                console.log(e);
-	            },
-	            objectChange(e){
-	                console.log('对象数据返回格式');
-	                console.log(e);
-	            }
-	        }
-	    }
-</script>
-
-<style>
-	.jiben{
-		padding-top: 60upx;
-		width:750upx;
-		height:1002upx;
-		background:rgba(255,255,255,1);
-	}
-	.schoolicon{
-		margin: 0 auto;
-		width: 180upx;
-		height: 180upx;
-	}
-	.schoolicon image{
-		display: inline;
-	}
-	.icontext{
-		margin-top: 24upx;
-		text-align: center;
-		font-size:28upx;
-		font-family:PingFangSC;
-		font-weight:400;
-		color:rgba(117,119,128,1);
-		line-height:40upx;
-	}
-</style>

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -520,5 +520,68 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /*每个页面公共css */