Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/waterElectricityMinApp

# Conflicts:
#	pages/index/index.vue

manifest.json

@@ -1,101 +1,102 @@
 {
-    "name" : "智慧校园水电",
-    "appid" : "__UNI__D7AE6E0",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {},
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
-                ]
-            },
-            /* ios打包配置 */
-            "ios" : {},
-            /* SDK配置 */
-            "sdkConfigs" : {
-                "payment" : {}
-            }
-        },
-        // ====================支持分包==================
-        "optimization" : {
-            "subPackages" : true
-        },
-        "runmode" : "liberate" // 开启分包优化后，必须配置资源释放模式
-    },
-    // ====================支持分包==================
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "wxd6f090391d410534",
-        "setting" : {
-            "urlCheck" : false,
-            "es6" : true,
-            "minified" : true
-        },
-        "usingComponents" : true,
-        "plugins" : {
-            "myPlugin" : {
-                "provider" : "wx1549b963bbae9931",
-                "version" : "4.0.0"
-            }
-        },
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "您的位置信息将用于连接热水表蓝牙"
-            }
-        },
-        "lazyCodeLoading" : "requiredComponents",
-        "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    }
-}
+	"name": "智慧校园水电",
+	"appid": "__UNI__D7AE6E0",
+	"description": "",
+	"versionName": "1.0.0",
+	"versionCode": "100",
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		/* 模块配置 */
+		"modules": {},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
+					"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.INTERNET\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+					"<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
+					"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
+				]
+			},
+			/* ios打包配置 */
+			"ios": {},
+			/* SDK配置 */
+			"sdkConfigs": {
+				"payment": {}
+			}
+		},
+		// ====================支持分包==================
+		"optimization": {
+			"subPackages": true
+		},
+		"runmode": "liberate" // 开启分包优化后，必须配置资源释放模式
+	},
+	// ====================支持分包==================
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "wxd6f090391d410534",
+		"setting": {
+			"urlCheck": false,
+			"es6": true,
+			"minified": true
+		},
+		"usingComponents": true,
+		"plugins": {
+			"myPlugin": {
+				"provider": "wx1549b963bbae9931",
+				"version": "4.0.0"
+			}
+		},
+		"permission": {
+			"scope.userLocation": {
+				"desc": "您的位置信息将用于连接热水表蓝牙"
+			}
+		},
+		"lazyCodeLoading": "requiredComponents",
+		"requiredPrivateInfos": ["getLocation", "chooseLocation"],
+		"resizable": true
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"uniStatistics": {
+		"enable": false
+	}
+}

pages.json

@@ -270,6 +270,12 @@
 						"navigationBarTitleText": "授权中",
 						"enablePullDownRefresh": false
 					}
+				}, {
+					"path": "money/money",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
 				}
 			]
 		}

pages/index/index.vue

@@ -21,6 +21,13 @@
 					<image src="../../static/images/clockIn.png" mode=""></image>
 					<text>校园打卡</text>
 				</navigator> -->
+<<<<<<< HEAD
+=======
+				<navigator :url="'/pagesClockIn/money/money'" open-type="navigate" class="menu_item">
+					<image src="../../static/images/money.png" mode=""></image>
+					<text>学费缴纳</text>
+				</navigator>
+>>>>>>> 7a29f577c010db0a0372ee381f1e9f4e53986777
 			</view>
 		</view>
 		<view class="qr_code" v-if="showQR_code">
@@ -100,11 +107,11 @@
 					} else if (res.data.data[0].value == 2) {
 						// 系统正在维护...
 						this.$store.state.test = 'weihuzhong'
-						
+
 						uni.showModal({
 							title: '提示信息',
-							content:'系统维护中...\r\n暂时请不要使用！\r\n避免造成不必要的损失！',
-							showCancel:false
+							content: '系统维护中...\r\n暂时请不要使用！\r\n避免造成不必要的损失！',
+							showCancel: false
 						});
 					} else {
 						// 正式模式
@@ -474,4 +481,4 @@
 			background-color: #FFFFFF;
 		}
 	}
-</style>
+</style>

pagesClockIn/money/money.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		<web-view src="https://chtech.ncjti.edu.cn/jiaofei/jiaofeiH5/"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+
+</style>