、、

components/uni-popup/uni-popup.vue

@@ -1,8 +1,8 @@
 <template>
 	<view v-if="showPopup" class="uni-popup">
-		<view :class="[ani, animation ? 'ani' : '', !custom ? 'uni-custom' : '']" class="uni-popup__mask" @click="close(true)" />
-		<view :class="[type, ani, animation ? 'ani' : '', !custom ? 'uni-custom' : '']" class="uni-popup__wrapper" @click="close(true)">
-			<view class="uni-popup__wrapper-box" @click.stop="clear">
+		<view :class="[ani, animation ? 'ani' : '', !custom ? 'uni-custom' : '']" class="uni-popup__mask" @tap="close(true)" />
+		<view :class="[type, ani, animation ? 'ani' : '', !custom ? 'uni-custom' : '']" class="uni-popup__wrapper" @tap="close(true)">
+			<view class="uni-popup__wrapper-box" @tap.stop="clear">
 				<slot />
 			</view>
 		</view>
@@ -103,8 +103,8 @@
 		left: 0;
 		right: 0;
 		z-index: 998;
-		background: rgba(0, 0, 0, .4);
-		opacity: 0
+		background: silver;
+		opacity: 0.6
 	}
 
 	.uni-popup__mask.ani {

pages.json

@@ -3,56 +3,60 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "首页"
+				"navigationBarTitleText": "芝麻高报系统"
 			}
-		}, {
-        "path": "pages/predict/predict",
-        "style": {
-            "navigationBarTitleText": "志愿预测"
-        }
-    }, {
-        "path": "pages/myinfo/myinfo",
-        "style": {
-            "navigationBarTitleText": "我的"
-        }
-    }
+		}, {
+			"path": "pages/predict/predict",
+			"style": {
+				"navigationBarTitleText": "志愿预测"
+			}
+		}, {
+			"path": "pages/myinfo/myinfo",
+			"style": {
+				"navigationBarTitleText": "我的"
+			}
+		},
+		{
+			"path": "pages/myinfo2/myinfo2",
+			"style": {
+				"navigationBarTitleText": "我的2"
+			}
+		}
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
-	},
-    "tabBar": {
-        "color": "#7A7E83",
-        "selectedColor": "#3cc51f",
-        "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" : { //模式配置，仅开发期间生效
+	},
+	"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": [
-			{
-				"name": "", //模式名称
-				"path": "", //启动页面，必选
-				"query": "" //启动参数，在页面的onLoad函数里面得到
-			}
-		]
+		"list": [{
+			"name": "", //模式名称
+			"path": "", //启动页面，必选
+			"query": "" //启动参数，在页面的onLoad函数里面得到
+		}]
 	}
 }

unpackage/dist/dev/.sourcemap/mp-weixin/pages/API/index.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"pages/API/index.js","sourceRoot":""}

unpackage/dist/dev/.sourcemap/mp-weixin/pages/component/view/index.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"pages/component/view/index.js","sourceRoot":""}

unpackage/dist/dev/mp-weixin/app.json

@@ -2,7 +2,8 @@
   "pages": [
     "pages/index/index",
     "pages/predict/predict",
-    "pages/myinfo/myinfo"
+    "pages/myinfo/myinfo",
+    "pages/myinfo2/myinfo2"
   ],
   "subPackages": [],
   "window": {
@@ -13,7 +14,7 @@
   },
   "tabBar": {
     "color": "#7A7E83",
-    "selectedColor": "#3cc51f",
+    "selectedColor": "#EF3A3A",
     "borderStyle": "black",
     "backgroundColor": "#ffffff",
     "list": [
@@ -38,5 +39,5 @@
     ]
   },
   "usingComponents": {},
-  "sitemapLocation": "sitemap86.json"
+  "sitemapLocation": "sitemap7.json"
 }

unpackage/dist/dev/mp-weixin/common/runtime.js

@@ -104,11 +104,11 @@
 /******/
 /******/
 /******/ 		// mini-css-extract-plugin CSS loading
-/******/ 		var cssChunks = {"components/uni-icon/uni-icon":1,"components/uni-popup/uni-popup":1};
+/******/ 		var cssChunks = {"components/keyboard-input/keyboard-input":1,"components/keyboard/keyboard":1,"components/search-input-box/search-input-box":1,"components/uni-icon/uni-icon":1,"components/uni-popup/uni-popup":1,"components/sun-tab/sun-tab":1};
 /******/ 		if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
 /******/ 		else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
 /******/ 			promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {
-/******/ 				var href = "" + ({"components/uni-icon/uni-icon":"components/uni-icon/uni-icon","components/uni-popup/uni-popup":"components/uni-popup/uni-popup"}[chunkId]||chunkId) + ".wxss";
+/******/ 				var href = "" + ({"components/keyboard-input/keyboard-input":"components/keyboard-input/keyboard-input","components/keyboard/keyboard":"components/keyboard/keyboard","components/search-input-box/search-input-box":"components/search-input-box/search-input-box","components/uni-icon/uni-icon":"components/uni-icon/uni-icon","components/uni-popup/uni-popup":"components/uni-popup/uni-popup","components/sun-tab/sun-tab":"components/sun-tab/sun-tab"}[chunkId]||chunkId) + ".wxss";
 /******/ 				var fullhref = __webpack_require__.p + href;
 /******/ 				var existingLinkTags = document.getElementsByTagName("link");
 /******/ 				for(var i = 0; i < existingLinkTags.length; i++) {

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -1,8 +1,8 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["common/vendor"],[
 /* 0 */
-/*!****************************************************!*\
-  !*** H:/Documents/HBuilderProjects/UniApp/main.js ***!
-  \****************************************************/
+/*!**********************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/HBuilderProjects/UniApp/main.js ***!
+  \**********************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -753,7 +753,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"NODE_ENV":"development","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -6965,7 +6965,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"NODE_ENV":"development","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -6986,14 +6986,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"NODE_ENV":"development","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"NODE_ENV":"development","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -7069,7 +7069,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"NODE_ENV":"development","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -7476,9 +7476,9 @@ module.exports = g;
 
 /***/ }),
 /* 4 */
-/*!*******************************************************!*\
-  !*** H:/Documents/HBuilderProjects/UniApp/pages.json ***!
-  \*******************************************************/
+/*!*************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/HBuilderProjects/UniApp/pages.json ***!
+  \*************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -7598,9 +7598,9 @@ function normalizeComponent (
 
 /***/ }),
 /* 11 */
-/*!*************************************************************************************!*\
-  !*** H:/Documents/HBuilderProjects/UniApp/main.js?{"page":"pages%2Findex%2Findex"} ***!
-  \*************************************************************************************/
+/*!*******************************************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/HBuilderProjects/UniApp/main.js?{"page":"pages%2Findex%2Findex"} ***!
+  \*******************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -7621,9 +7621,9 @@ createPage(_index.default);
 /* 17 */,
 /* 18 */,
 /* 19 */
-/*!*****************************************************************************************!*\
-  !*** H:/Documents/HBuilderProjects/UniApp/main.js?{"page":"pages%2Fpredict%2Fpredict"} ***!
-  \*****************************************************************************************/
+/*!***********************************************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/HBuilderProjects/UniApp/main.js?{"page":"pages%2Fpredict%2Fpredict"} ***!
+  \***********************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -7642,9 +7642,9 @@ createPage(_predict.default);
 /* 23 */,
 /* 24 */,
 /* 25 */
-/*!***************************************************************************************!*\
-  !*** H:/Documents/HBuilderProjects/UniApp/main.js?{"page":"pages%2Fmyinfo%2Fmyinfo"} ***!
-  \***************************************************************************************/
+/*!*********************************************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/HBuilderProjects/UniApp/main.js?{"page":"pages%2Fmyinfo%2Fmyinfo"} ***!
+  \*********************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -7656,6 +7656,27 @@ var _myinfo = _interopRequireDefault(__webpack_require__(/*! ./pages/myinfo/myin
 createPage(_myinfo.default);
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"]))
 
+/***/ }),
+/* 26 */,
+/* 27 */,
+/* 28 */,
+/* 29 */,
+/* 30 */,
+/* 31 */
+/*!***********************************************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/HBuilderProjects/UniApp/main.js?{"page":"pages%2Fmyinfo2%2Fmyinfo2"} ***!
+  \***********************************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 4);
+
+var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 2));
+var _myinfo = _interopRequireDefault(__webpack_require__(/*! ./pages/myinfo2/myinfo2.vue */ 32));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
+createPage(_myinfo.default);
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"]))
+
 /***/ })
 ]]);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/common/vendor.js.map

unpackage/dist/dev/mp-weixin/components/uni-popup/uni-popup.wxss

@@ -17,8 +17,8 @@
 	left: 0;
 	right: 0;
 	z-index: 998;
-	background: rgba(0, 0, 0, .4);
-	opacity: 0
+	background: silver;
+	opacity: 0.6
 }
 .uni-popup__mask.ani {
 	-webkit-transition: all .3s;

unpackage/dist/dev/mp-weixin/pages/index/index.json

@@ -1,7 +1,10 @@
 {
-  "navigationBarTitleText": "首页",
+  "navigationBarTitleText": "芝麻高报系统",
   "usingComponents": {
     "uni-popup": "/components/uni-popup/uni-popup",
-    "uni-icon": "/components/uni-icon/uni-icon"
+    "uni-icon": "/components/uni-icon/uni-icon",
+    "search-input-box": "/components/search-input-box/search-input-box",
+    "tui-keyboard": "/components/keyboard/keyboard",
+    "tui-keyboard-input": "/components/keyboard-input/keyboard-input"
   }
 }

unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -1,45 +1,377 @@
 
-.search-input-box{
-		width:690rpx;
-		height:70rpx;
+.tui-container {
+		width: 100%;
+		padding-top: 60rpx;
+		-webkit-box-sizing: border-box;
+		        box-sizing: border-box;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: -ms-flexbox;
+		display: flex;
+		-webkit-box-orient: horizontal;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: row;
+		    -ms-flex-direction: row;
+		        flex-direction: row;
+		-webkit-flex-wrap: wrap;
+		    -ms-flex-wrap: wrap;
+		        flex-wrap: wrap;
+		-webkit-box-pack: justify;
+		-webkit-justify-content: space-between;
+		    -ms-flex-pack: justify;
+		        justify-content: space-between;
+}
+.titleRed image{
+		width:86rpx !important;
+		height:8rpx !important;
+		background:rgba(239,58,58,1);
+		opacity:0.9;
+		margin: 0 auto;
+}
+.tui-extend-box {
+		-webkit-box-flex: 1;
+		-webkit-flex: 1;
+		    -ms-flex: 1;
+		        flex: 1;
+		font-size: 32rpx;
+		font-family: PingFangSC;
+		font-weight: 500;
+		color: rgba(44, 44, 44, 1);
+		line-height: 45rpx;
+}
+.box-distance {
+		padding-bottom: 60rpx;
+}
+.tui-extend-box image {
+		width: 6rpx !important;
+		height: 30rpx !important;
+		background: rgba(239, 58, 58, 1);
+		display: inline-block !important;
+		margin-right: 20rpx !important;
+		margin-left: 40rpx !important;
+		margin-top: 6rpx !important;
+}
+	/*底部抽屉样式 start*/
+.mask-screen {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		background: #000;
+		opacity: 0.5;
+		overflow: hidden;
+		z-index: 9;
+}
+.region-box {
+		width: 100%;
+		overflow: hidden;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		z-index: 10;
+		background: #fff;
+		padding-top: 20rpx;
+		height: 712rpx;
+		padding: 40rpx 30rpx 48rpx 30rpx;
+		-webkit-box-sizing: border-box;
+		        box-sizing: border-box;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: -ms-flexbox;
+		display: flex;
+		-webkit-box-orient: horizontal;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: row;
+		    -ms-flex-direction: row;
+		        flex-direction: row;
+		-webkit-flex-wrap: wrap;
+		    -ms-flex-wrap: wrap;
+		        flex-wrap: wrap;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		    -ms-flex-align: center;
+		        align-items: center;
+		-webkit-box-pack: start;
+		-webkit-justify-content: flex-start;
+		    -ms-flex-pack: start;
+		        justify-content: flex-start;
+}
+.region-txt {
+		width: 96rpx;
+		height: 82rpx;
+		background: #e9edfc;
+		line-height: 82rpx;
+		border-radius: 6rpx;
+		font-size: 30rpx;
+		color: #333;
+		text-align: center;
+		margin-right: 23rpx;
+		margin-bottom: 26rpx;
+		-webkit-box-flex: 1;
+		-webkit-flex-grow: 1;
+		    -ms-flex-positive: 1;
+		        flex-grow: 1;
+}
+.region-txt:nth-of-type(6n) {
+		margin-right: 0;
+}
+.grow {
+		-webkit-box-flex: 0;
+		-webkit-flex-grow: 0;
+		    -ms-flex-positive: 0;
+		        flex-grow: 0;
+}
+.active {
+		background: #5677fc;
+		color: #fff;
+}
+.uni-tip-wel{
+		width: 560rpx;
+		height: 608rpx;
+		background:rgba(255,255,255,1);
+		border-radius:8rpx;
+		margin-top: 235rpx;
+		margin-left: 95rpx;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: -ms-flexbox;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		    -ms-flex-direction: column;
+		        flex-direction: column;
+}
+.uni-tip-wel-content{
+		font-size:34rpx;
+		font-family:PingFangSC-Medium,PingFangSC;
+		font-weight:500;
+		color:rgba(44,44,44,1);
+		line-height:48rpx;
+		text-align: center;
+		margin: 40rpx auto 54rpx auto;
+}
+.uni-tip--wel-button{
+		width:480rpx;
+		height:80rpx;
+		background:rgba(26,173,23,1);
+		-webkit-box-shadow:0rpx 6rpx 12rpx 0rpx rgba(26,173,23,0.2);
+		        box-shadow:0rpx 6rpx 12rpx 0rpx rgba(26,173,23,0.2);
+		border-radius:40rpx;
+		margin: 0 auto;
+}
+.uni-tip-wel-button-text{
+		font-size:30rpx;
+		font-family:PingFangSC-Medium,PingFangSC;
+		font-weight:500;
+		color:rgba(255,255,255,1);
+		line-height:80rpx;
+		text-align: center;
+}
+	/* 授权窗口 */
+.uni-tip {
+		position: relative;
+		left: 95rpx;
+		top: 410rpx;
+		padding: 0rpx;
+		-webkit-box-sizing: border-box;
+		        box-sizing: border-box;
+		width: 560rpx;
+		height: 515rpx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 8rpx;
+}
+.uni-tip-title {
+		text-align: center;
+		padding: 21rpx 100rpx;
+		height: 48rpx;
+		font-size: 34rpx;
+		font-family: PingFangSC;
+		font-weight: 500;
+		color: rgba(0, 0, 0, 1);
+		line-height: 48rpx;
+		border-bottom: 1px solid rgba(229, 229, 229, 1);
+}
+.uni-tip-image {
+		border: 0rpx;
+		text-align: center;
+}
+.uni-tip-image image {
+		width: 64rpx;
+		height: 64rpx;
+		border: 0rpx;
+		margin-top: 36rpx;
+		margin-bottom: 24rpx;
+}
+.uni-tip-content {
+		margin-left: 54rpx;
+		width: 420rpx;
+		height: 40rpx;
+		font-size: 28rpx;
+		font-family: PingFangSC;
+		font-weight: 400;
+		color: rgba(0, 0, 0, 1);
+		line-height: 40rpx;
+}
+.uni-tip-content-son {
+		width: 452rpx;
+		height: 74rpx;
+		font-size: 26rpx;
+		font-family: PingFangSC-Regular, PingFangSC;
+		font-weight: 400;
+		color: rgba(136, 136, 136, 1);
+		line-height: 37rpx;
+		margin: 0 auto;
+		margin-bottom: 36rpx;
+}
+	/* .uni-tip-content-son ul{
+		list-style: upper-alpha;
+	} */
+.uni-tip-group-button {
+		height: 99rpx;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: -ms-flexbox;
+		display: flex;
+		-webkit-justify-content: space-around;
+		    -ms-flex-pack: distribute;
+		        justify-content: space-around;
+		border-top: 1rpx solid rgba(229, 229, 229, 1);
+		font-size: 32rpx;
+		font-family: PingFangSC;
+		font-weight: 400;
+		color: #000000;
+		line-height: 99rpx;
+}
+.uni-tip-button {
+		width: 100%;
+		text-align: center;
+}
+.jiangexian{
+		border-right: 1rpx solid rgba(229,229,229,1);
+}
+.getwenli {
+		position: fixed;
+		bottom: 0;
+
+		width: 100%;
+		height: 100rpx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 8rpx;
+		text-align: center;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: -ms-flexbox;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		    -ms-flex-direction: column;
+		        flex-direction: column;
+		margin: 0 auto;
+}
+.get-grade {
+		position: relative;
+		left: 95rpx;
+		top: 359rpx;
+		width: 560rpx;
+		height: 616rpx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 8rpx;
+		text-align: center;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: -ms-flexbox;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		    -ms-flex-direction: column;
+		        flex-direction: column;
+		margin: 0 auto;
+}
+.get-grade-title {
+		padding: 40rpx;
+		font-size: 34rpx;
+		font-family: PingFangSC-Medium, PingFangSC;
+		font-weight: 500;
+		color: rgba(44, 44, 44, 1);
+		line-height: 48rpx;
+}
+.get-grade-content2 input {
+		width: 480rpx;
+		height: 80rpx;
+		background: rgba(248, 248, 248, 1);
+		border-radius: 40rpx;
+		border: 1rpx solid rgba(242, 242, 242, 1);
+		margin: 20rpx 40rpx;
+}
+.get-grade-content1 {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: -ms-flexbox;
+		display: flex;
+		-webkit-box-orient: horizontal;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: row;
+		    -ms-flex-direction: row;
+		        flex-direction: row;
+		margin: auto 40rpx;
+}
+.get-grade-content1 view:nth-child(1){
+		margin-right: 20rpx;
+}
+.i-picker-two{
+		width:230rpx;
+		height:80rpx;
 		background:rgba(248,248,248,1);
-		border-radius:36rpx;
-		border:1rpx solid rgba(242,242,242,1); 
-		margin-top: 42rpx;
-}
-.search-input-box image{
-		width:70rpx;
-		height:70rpx;
-		margin-left: 20rpx;
-		float: left;
+		border-radius:40rpx;
+		border:1rpx solid rgba(242,242,242,1);
+		line-height: 80rpx;
 }
-.search-input-box  uni-input {
-		overflow: visible;
+.i-picker-two view{
 		float: left;
-}
-.search-input-box input{
-		 -webkit-box-sizing: border-box;
-		         box-sizing: border-box;
-		 /* margin-bottom: 1upx; */
-		 outline: none;
-		 padding-left: 10rpx;
-		 border:0;
-		 /* margin-top: 10upx; */
-		 height:70rpx;
-}
-.search-input-box .uni-input-placeholder{
-		width:196rpx;
-		height:40rpx;
+		margin-left: 40rpx;
 		font-size:28rpx;
-		font-family:PingFangSC;
+		font-family:PingFangSC-Regular,PingFangSC;
 		font-weight:400;
-		color:rgba(175,178,191,1);
-		line-height:40rpx;
+		color:rgba(47,49,51,1);
+		line-height:80rpx;
+}
+.i-picker-two image{
+		float: right;
+		line-height: 80rpx;
+		width:40rpx;
+		height:40rpx !important;
+		margin-right: 20rpx;
+		margin-top: 20rpx;
+		display: block;
 }
-.banner{
-		width:690rpx;
-		height:308rpx;
-		border-radius:20rpx;
+.uni-get-grade-button {
+		width: 480rpx;
+		height: 80rpx;
+		background: rgba(239, 58, 58, 1);
+		-webkit-box-shadow: 0rpx 6rpx 12rpx 0rpx rgba(239, 58, 58, 0.2);
+		        box-shadow: 0rpx 6rpx 12rpx 0rpx rgba(239, 58, 58, 0.2);
+		border-radius: 40rpx;
+		text-align: center;
+		margin: 22rpx 40rpx;
+}
+._select {
+		width: auto;
+		padding: 0 0 0 55rpx;
+		margin: 0;
+}
+.get-grade-button {
+		width: 120rpx;
+		height: 42rpx;
+		font-size: 30rpx;
+		font-family: PingFangSC;
+		font-weight: 500;
+		color: rgba(255, 255, 255, 1);
+		line-height: 80rpx;
+		margin: 0 auto;
 }
 .content {
 		display: -webkit-box;
@@ -59,9 +391,73 @@
 		-webkit-justify-content: center;
 		    -ms-flex-pack: center;
 		        justify-content: center;
-		/* background-color: #F8F8F8; */
+		background-color:  #F2F2F2 ;
+}
+.logo {
+		height: 200rpx;
+		width: 200rpx;
+		margin-top: 200rpx;
+		margin-left: auto;
+		margin-right: auto;
+		margin-bottom: 50rpx;
 }
-.view-content{
+.text-area {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: -ms-flexbox;
+		display: flex;
+		-webkit-box-pack: center;
+		-webkit-justify-content: center;
+		    -ms-flex-pack: center;
+		        justify-content: center;
+}
+.title {
+		font-size: 36rpx;
+		color: #8f8f94;
+}
+swiper {
+		width: 750rpx;
+		height: 308rpx;
+
+		padding: 0;
+		margin: 0;
+}
+swiper-item {
+		border-radius: 20rpx;
+}
+swiper-item image {
+		position: relative;
+		left: 30rpx;
+		width: 690rpx;
+		height: 500rpx;
+		margin: 8rpx 0rpx 8rpx 0rpx;
+		border-radius: 20rpx;
+}
+.banner {
+		width: 690rpx;
+		height: 308rpx;
+		border-radius: 20rpx;
+}
+.content {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: -ms-flexbox;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		    -ms-flex-direction: column;
+		        flex-direction: column;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		    -ms-flex-align: center;
+		        align-items: center;
+		-webkit-box-pack: center;
+		-webkit-justify-content: center;
+		    -ms-flex-pack: center;
+		        justify-content: center;
+}
+.view-content {
 		display: -webkit-box;
 		display: -webkit-flex;
 		display: -ms-flexbox;
@@ -71,26 +467,33 @@
 		-webkit-flex-direction: row no-wrap;
 		    -ms-flex-direction: row no-wrap;
 		        flex-direction: row no-wrap;
-		height:210rpx;
-		background:rgba(255,255,255,1);
-}
-.view-content image{
-		width:128rpx;
-		height:128rpx;
+		-webkit-justify-content: space-around;
+		    -ms-flex-pack: distribute;
+		        justify-content: space-around;
+		padding-right: 61rpx;
+		padding-left: 61rpx;
+		height: 210rpx;
+		width: 750rpx;
+		background: rgba(255, 255, 255, 1);
+}
+.view-content image {
+		width: 128rpx;
+		height: 128rpx;
 		overflow: visible;
-		vertical-align:middle;
-}
-.view-content ._p{
-		text-align:center;
-		width:96rpx;
-		height:33rpx;
-		font-size:24rpx;
-		font-family:PingFangSC;
-		font-weight:500;
-		color:rgba(117,119,128,1);
-		line-height:33rpx;
-}
-.view-content ._div{
+		vertical-align: middle;
+		margin-top: 8rpx;
+}
+.view-content ._p {
+		text-align: center;
+		width: 96rpx;
+		height: 33rpx;
+		font-size: 24rpx;
+		font-family: PingFangSC;
+		font-weight: 500;
+		color: rgba(117, 119, 128, 1);
+		line-height: 33rpx;
+}
+.view-content view {
 		display: -webkit-box;
 		display: -webkit-flex;
 		display: -ms-flexbox;
@@ -100,48 +503,46 @@
 		-webkit-flex-direction: column;
 		    -ms-flex-direction: column;
 		        flex-direction: column;
-		width:80rpx;
-		height:28rpx;
+		width: 80rpx;
+		height: 28rpx;
 }
-.view-content ._div:first-child{
+.view-content view:first-child {
 		margin-left: 61rpx;
 		margin-right: 0rpx;
 }
-.view-content ._div:nth-child(2){
+.view-content view:nth-child(2) {
 		margin-left: 122rpx;
 		margin-right: 122rpx;
 }
-.view-content ._div:nth-child(3){
+.view-content view:nth-child(3) {
 		margin-right: 61rpx;
 }
-.view-content ._p{
-		-webkit-align-self:center;
-		    -ms-flex-item-align:center;
-		        align-self:center;
+.view-content ._p {
+		-webkit-align-self: center;
+		    -ms-flex-item-align: center;
+		        align-self: center;
 }
-.view-content image{
-		-webkit-align-self:center;
-		    -ms-flex-item-align:center;
-		        align-self:center;
+.view-content image {
+		-webkit-align-self: center;
+		    -ms-flex-item-align: center;
+		        align-self: center;
 }
 .school {
-		-webkit-box-align:start;
-		-webkit-align-items:flex-start;
-		    -ms-flex-align:start;
-		        align-items:flex-start;
-		width:750rpx;
-		/* height:984upx; */
-		background:rgba(255,255,255,1);
+		-webkit-box-align: start;
+		-webkit-align-items: flex-start;
+		    -ms-flex-align: start;
+		        align-items: flex-start;
+		width: 750rpx;
+		background: rgba(255, 255, 255, 1);
+		margin-top: 20rpx;
 }
-.school image{
+.school image {
 		width: 170rpx;
 		height: 54rpx;
-		    margin: 0 auto;
-		    /* text-align: center; */
-		    /* vertical-align: middle; */
-		    display: block;
+		margin: 0 auto;
+		display: block;
 }
-.school-content{
+.school-content {
 		display: -webkit-box;
 		display: -webkit-flex;
 		display: -ms-flexbox;
@@ -150,234 +551,103 @@
 		    -ms-flex-wrap: wrap;
 		        flex-wrap: wrap;
 }
-.school-content ._div:first-child{
+.school-content view:first-child {
 		margin-left: 98rpx;
 		margin-right: 195rpx;
 }
-.schol-icon image{
+.schol-icon image {
 		width: 180rpx;
 		height: 180rpx;
 }
-.schol-icon ._span{
-		width:112rpx;
-		height:40rpx;
-		font-size:28rpx;
-		font-family:PingFangSC;
-		font-weight:500;
-		color:rgba(44,44,44,1);
-		line-height:40rpx;
+.schol-icon ._span {
+		width: 112rpx;
+		height: 40rpx;
+		font-size: 28rpx;
+		font-family: PingFangSC;
+		font-weight: 500;
+		color: rgba(44, 44, 44, 1);
+		line-height: 40rpx;
 		margin-top: 24rpx;
 		margin-bottom: 40rpx;
 }
-.schol-icon{
-		    display: -webkit-box;
-		    display: -webkit-flex;
-		    display: -ms-flexbox;
-		    display: flex;
-		    -webkit-box-orient: vertical;
-		    -webkit-box-direction: normal;
-		    -webkit-flex-direction: column;
-		        -ms-flex-direction: column;
-		            flex-direction: column;
-		    -webkit-box-align: end;
-		    -webkit-align-items: flex-end;
-		        -ms-flex-align: end;
-		            align-items: flex-end;
-			text-align: -webkit-center;
-}
-.major{
-		width:750rpx;
-		height:470rpx;
-		background:rgba(255,255,255,1);
+.schol-icon {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: -ms-flexbox;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		    -ms-flex-direction: column;
+		        flex-direction: column;
+		-webkit-box-align: end;
+		-webkit-align-items: flex-end;
+		    -ms-flex-align: end;
+		        align-items: flex-end;
+		text-align: -webkit-center;
+}
+.major {
+		width: 750rpx;
+		height: 470rpx;
+		background: rgba(255, 255, 255, 1);
 		margin-top: 20rpx;
+		margin-bottom: 20rpx;
 }
-.major image{
+.major image:nth-child(1) {
 		width: 170rpx;
 		height: 54rpx;
 		margin: 0 auto;
 		display: block;
 }
-	/* 授权窗口 */
-.uni-tip {
-	padding: 15rpx;
-	width: 300rpx;
-	background: #fff;
-	-webkit-box-sizing: border-box;
-	        box-sizing: border-box;
-	border-radius: 10rpx;
-	width:560rpx;
-	height:515rpx;
-	background:rgba(255,255,255,1);
-	border-radius:8rpx;
-}
-.uni-tip-title {
-	text-align: center;
-	padding: 21rpx 100rpx;
-	/* width:136upx; */
-	height:48rpx;
-	font-size:34rpx;
-	font-family:PingFangSC;
-	font-weight:500;
-	color:rgba(0,0,0,1);
-	line-height:48rpx;
-	border-bottom: 1px solid rgba(229,229,229,1);
-}
-.uni-tip-image {
-	border:0rpx;
-	text-align: center;
-}
-.uni-tip-image image{
-	width: 64rpx;
-	height: 64rpx;
-	border:0rpx;
-	margin-top: 36rpx;
-	margin-bottom: 24rpx;
+.footer {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: -ms-flexbox;
+		display: flex;
+		position: fixed;
+		bottom: 0;
+		width: 750rpx;
+		height: 99rpx;
+		background: rgba(255, 255, 255, 1);
+		margin-top: 20rpx;
 }
-.uni-tip-content {
-	margin-left: 54rpx;
-	padding-bottom: 36rpx;
-	width:420rpx;
-	height:40rpx;
-	font-size:28rpx;
-	font-family:PingFangSC;
-	font-weight:400;
-	color:rgba(0,0,0,1);
-	line-height:40rpx;
+.footer ._div:first-child {
+		margin-left: 92rpx;
+		margin-right: 184rpx;
 }
-.uni-tip-group-button {
-	margin-top: 10rpx;
-	display: -webkit-box;
-	display: -webkit-flex;
-	display: -ms-flexbox;
-	display: flex;
-	-webkit-justify-content: space-around;
-	    -ms-flex-pack: distribute;
-	        justify-content: space-around;
-	border-top: 1px solid rgba(229,229,229,1);
-	padding-top: 27rpx;
-}
-.uni-tip-group-button view:nth-child(1){
-	width:144rpx;
-	height:45rpx;
-	font-size:32rpx;
-	font-family:PingFangSC;
-	font-weight:400;
-	color:#000000;
-	line-height:45rpx;
-}
-.uni-tip-group-button view:nth-child(2){
-	width:111rpx;
-	height:45rpx;
-	font-size:32rpx;
-	font-family:PingFangSC;
-	font-weight:400;
-	color:#02BB00;
-	line-height:45rpx;
+.footer ._div:nth-child(2) {
+		margin-right: 183rpx;
 }
-.uni-tip-button {
-	width: 100%;
-	text-align: center;
-	/* font-size: 14upx; */
-	/* color: #3b4144; */
-}
-.get-grade{
-	width:560rpx;
-	height:616rpx;
-	background:rgba(255,255,255,1);
-	border-radius:8rpx;
-	text-align: center;
-}
-.get-grade-title{
-	padding: 40rpx;
-}
-	/* .get-grade-content{
-	margin: 0 auto;
-} */
-.get-grade-content ._select{
-	width:230rpx;
-	height:80rpx;
-	background:rgba(248,248,248,1);
-	border-radius:40rpx;
-	border:1rpx solid rgba(242,242,242,1);
-	margin-right: 20rpx;
-}
-	/* .get-grade-content option{
-	margin: 20upx 40upx;
-} */
-.get-grade-content input{
-	width:480rpx;
-	height:80rpx;
-	background:rgba(248,248,248,1);
-	border-radius:40rpx;
-	border:1rpx solid rgba(242,242,242,1);
-	margin: 10rpx 40rpx;
-}
-.uni-get-grade-button{
-	width:480rpx;
-	height:80rpx;
-	background:rgba(239,58,58,1);
-	-webkit-box-shadow:0rpx 6rpx 12rpx 0rpx rgba(239,58,58,0.2);
-	        box-shadow:0rpx 6rpx 12rpx 0rpx rgba(239,58,58,0.2);
-	border-radius:40rpx;
-	text-align: center;
-	margin: 22rpx 40rpx;
-}
-._select{
-	width: auto;
-	padding: 0 0 0 55rpx;
-	margin: 0;
-}
-.get-grade-button{
-	/* margin: 24upx 100upx; */
-	width:120rpx;
-	height:42rpx;
-	font-size:30rpx;
-	font-family:PingFangSC;
-	font-weight:500;
-	color:rgba(255,255,255,1);
-	line-height:80rpx;
-	margin: 0 auto;
-	/* height:80upx; */
+.footer ._div:nth-child(3) {
+		margin-right: 93rpx;
 }
-.content {
-	display: -webkit-box;
-	display: -webkit-flex;
-	display: -ms-flexbox;
-	display: flex;
-	-webkit-box-orient: vertical;
-	-webkit-box-direction: normal;
-	-webkit-flex-direction: column;
-	    -ms-flex-direction: column;
-	        flex-direction: column;
-	-webkit-box-align: center;
-	-webkit-align-items: center;
-	    -ms-flex-align: center;
-	        align-items: center;
-	-webkit-box-pack: center;
-	-webkit-justify-content: center;
-	    -ms-flex-pack: center;
-	        justify-content: center;
+.footer image {
+		width: 66rpx;
+		height: 67rpx;
+		overflow: visible;
 }
-.logo {
-	height: 200rpx;
-	width: 200rpx;
-	margin-top: 200rpx;
-	margin-left: auto;
-	margin-right: auto;
-	margin-bottom: 50rpx;
+.footer ._div:first-child ._p {
+		margin-left: 15rpx;
 }
-.text-area {
-	display: -webkit-box;
-	display: -webkit-flex;
-	display: -ms-flexbox;
-	display: flex;
-	-webkit-box-pack: center;
-	-webkit-justify-content: center;
-	    -ms-flex-pack: center;
-	        justify-content: center;
+.footer ._div:nth-child(3) ._p {
+		margin-left: 15rpx;
 }
-.title {
-	font-size: 36rpx;
-	color: #8f8f94;
+.footer ._div {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: -ms-flexbox;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		    -ms-flex-direction: column;
+		        flex-direction: column;
+		width: 80rpx;
+		height: 28rpx;
+		font-size: 20rpx;
+		font-family: PingFangSC;
+		font-weight: 500;
+		color: rgba(175, 178, 191, 1);
+		line-height: 28rpx;
 }
 

unpackage/dist/dev/mp-weixin/sitemap33.json

@@ -1,7 +0,0 @@
-{
-  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
-  "rules": [{
-  "action": "allow",
-  "page": "*"
-  }]
-}

unpackage/dist/dev/mp-weixin/sitemap86.json

@@ -1,7 +0,0 @@
-{
-  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
-  "rules": [{
-  "action": "allow",
-  "page": "*"
-  }]
-}

unpackage/dist/dev/mp-weixin/sitemap95.json

@@ -1,7 +0,0 @@
-{
-  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
-  "rules": [{
-  "action": "allow",
-  "page": "*"
-  }]
-}