no message

manifest.json

@@ -1,79 +1,81 @@
 {
-    "name" : "校园考勤打卡",
-    "appid" : "__UNI__28774C0",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    "app-plus" : {
-        /* 5+App特有相关 */
-        "usingComponents" : true,
-        "nvueCompiler" : "uni-app",
-        "nvueStyleCompiler" : "uni-app",
-        "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.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.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<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.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            "ios" : {},
-            /* ios打包配置 */
-            "sdkConfigs" : {}
-        }
-    },
-    /* SDK配置 */
-    "quickapp" : {},
-    /* 快应用特有相关 */
-    "mp-weixin" : {
-        /* 小程序特有相关 */
-        "appid" : "wxb4d969974f931f62",
-        "lazyCodeLoading" : "requiredComponents",
-        "setting" : {
-            "urlCheck" : false,
-            "postcss" : false,
-            "minified" : false
-        },
-        "usingComponents" : true,
-        "plugins" : {
-            "myPlugin" : {
-                "provider" : "wx1549b963bbae9931",
-                "version" : "4.0.0"
-            }
-        },
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "您的位置信息将用于记录打卡"
-            }
-        }
-    },
-    "vueVersion" : "2",
-    "h5" : {
-        "sdkConfigs" : {
-            "maps" : {}
-        }
-    }
+	"name": "校园考勤打卡",
+	"appid": "__UNI__28774C0",
+	"description": "",
+	"versionName": "1.0.0",
+	"versionCode": "100",
+	"transformPx": false,
+	"app-plus": {
+		/* 5+App特有相关 */
+		"usingComponents": true,
+		"nvueCompiler": "uni-app",
+		"nvueStyleCompiler": "uni-app",
+		"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.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.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<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.FLASHLIGHT\"/>",
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				]
+			},
+			"ios": {},
+			/* ios打包配置 */
+			"sdkConfigs": {}
+		}
+	},
+	/* SDK配置 */
+	"quickapp": {},
+	/* 快应用特有相关 */
+	"mp-weixin": {
+		/* 小程序特有相关 */
+		"appid": "wxd6f090391d410534",
+		"lazyCodeLoading": "requiredComponents",
+		"setting": {
+			"urlCheck": false,
+			"postcss": false,
+			"minified": false,
+			"es6": false
+		},
+		"usingComponents": true,
+		"plugins": {
+			"myPlugin": {
+				"provider": "wx1549b963bbae9931",
+				"version": "4.0.1"
+			}
+		},
+		"permission": {
+			"scope.userLocation": {
+				"desc": "您的位置信息将用于记录打卡"
+			}
+		},
+		"requiredPrivateInfos": ["getLocation", "chooseLocation"]
+	},
+	"vueVersion": "2",
+	"h5": {
+		"sdkConfigs": {
+			"maps": {}
+		}
+	}
 }

pages.json

@@ -1,14 +1,27 @@
 {
 	"pages": [{
+			"path": "pages/home/home",
+			"style": {
+				"navigationBarTitleText": "智慧校园打卡",
+				// "navigationStyle": "custom",
+				"enablePullDownRefresh": false
+			}
+		}, {
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "授权中"
+				"navigationBarTitleText": "授权中",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/404/404",
+			"style": {
+				"navigationBarTitleText": "404",
+				"enablePullDownRefresh": false
 			}
 		}, {
-			"path": "pages/home/home",
+			"path": "pages/qr_code/qr_code",
 			"style": {
-				"navigationBarTitleText": "智慧校园打卡",
-				// "navigationStyle": "custom",
+				"navigationBarTitleText": "校园卡二维码",
 				"enablePullDownRefresh": false
 			}
 		}, {
@@ -171,6 +184,9 @@
 		"backgroundColor": "#F8F8F8",
 		"app-plus": {
 			"background": "#efeff4"
+		},
+		"usingComponents": {
+			"login": "plugin://myPlugin/login"
 		}
 	}
 }

pages/404/404.vue

@@ -0,0 +1,46 @@
+<template>
+	<view class="container">
+		<view class="img">
+			<img src="../../static/404.png">
+		</view>
+
+		<view class="msg">
+			暂无权限
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		padding-top: 218rpx;
+		width: 100vw;
+		height: 100vh;
+		background-color: #fff;
+
+		.img {
+			margin: 0 auto;
+			width: 480rpx;
+			height: 508rpx;
+
+			img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.msg {
+			text-align: center;
+			color: #5792F0;
+		}
+	}
+</style>

pages/home/home.vue

@@ -105,7 +105,7 @@
 			};
 		},
 		onLoad() {
-			this.getRulesList()
+			// this.getRulesList()
 		},
 		methods: {
 			// 获取打卡规则列表

pages/index/index.vue

@@ -1,8 +1,7 @@
 <template>
 	<view>
-		123
 		<view v-if="showLogin">
-			<login :ocode="ocode" :appkey="appKey" scope="snsapi_userinfo" :visible="visible" @success="loginSuccess"
+			<login :ocode="ocode" :appkey="appkey" scope="snsapi_userinfo" :visible="visible" @success="loginSuccess"
 				@fail="loginFail" @cancel="loginCancel" />
 		</view>
 	</view>
@@ -12,13 +11,16 @@
 	export default {
 		data() {
 			return {
-				homeUrl: "https://www.web-server.top:443",
-				ocode: '1015730314', // 获取用户信息
-				appkey: '3183DC96A6DABA8D', // 商户appkey
-				visible: false, // 是否授权可见
-
-				showLogin: true, // 是否启动授权
-				appid: 'wxd6f090391d410534', // 获取用户信息
+				// 获取用户信息
+				ocode: '1015730314',
+				// 商户appkey
+				appkey: '3183DC96A6DABA8D',
+				// 是否授权可见
+				visible: false,
+				// 是否启动授权
+				showLogin: false,
+				// 获取用户信息
+				appid: 'wxd6f090391d410534',
 			}
 		},
 		onLoad() {
@@ -34,7 +36,7 @@
 						url: "/pages/home/home"
 					})
 				} else {
-					console.log(4);
+					console.log("重新授权");
 					this.showLogin = true
 					this.visible = true
 				}
@@ -42,44 +44,61 @@
 
 			// 授权成功回调
 			loginSuccess(res) {
-				console.log(1);
+				console.log(res);
+				console.log("成功");
+				let wxcode = res.detail.wxcode
+				// 获取wxcode后请求登录
+				this.login(wxcode)
 			},
-			// login_success_callback({detail}) {
-			// 	const {
-			// 		wxcode = ""
-			// 	} = detail
-
-			// 	this.validation_failed = false
-
-			// 	// 屏蔽用户操作
-			// 	uni.showLoading({
-			// 		title: '获取数据中…',
-			// 		mask: true
-			// 	})
-
-			// 	setTimeout(() => {
-			// 		uni.hideLoading()
-			// 	}, 1000)
-
-			// 	// 通过wxcode换取access_token
-			// 	this.get_access_token(wxcode)
-			// },
 			// 授权失败回调
 			loginFail() {
-				console.log(12);
+				console.log("授权失败");
+				uni.showModal({
+					title: '提示',
+					content: '授权：请先领取校园卡、并激活！',
+					confirmText: '领取',
+					success: (res) => {
+						if (res.confirm) {
+							uni.navigateTo({
+								url: "/pages/qr_code/qr_code"
+							});
+						} else if (res.cancel) {
+							uni.reLaunch({
+								url: "/pages/404/404"
+							})
+						}
+					}
+				});
 			},
 			// 授权取消回调
 			loginCancel() {
-				console.log(123);
+				console.log("取消");
+				uni.showModal({
+					title: '提示',
+					content: '请先授权，否则无法使用该功能',
+					confirmText: '授权',
+					success: (res) => {
+						if (res.confirm) {
+							uni.reLaunch({
+								url: "/pages/index/index"
+							})
+						} else if (res.cancel) {
+							uni.reLaunch({
+								url: "/pages/404/404"
+							})
+						}
+					}
+				});
 			},
-			async login() {
+
+			async login(wxcode) {
 				console.log(123);
 				let res = await this.$myRequest({
 					url: "/attendance/api/system/user/login/app",
 					method: "post",
 					data: {
-						redirect_uri: `${this.homeUrl}/attendance/api/system/user/login/app`,
-						wxcode: ""
+						redirect_uri: `mnp://${this.appid}`,
+						wxcode
 					}
 				})
 				console.log(res);

pages/location/location.vue

@@ -2,8 +2,8 @@
 	<view class="container">
 		<!-- 地图区域 -->
 		<view class="map">
-			<map style="width: 100%; height: 100%;" :latitude="latitude" :longitude="longitude" :scale="18"
-				:markers="covers">
+			<map style="width: 100%; height: 100%;" :latitude="latitude" :longitude="longitude" :scale="16"
+				:markers="covers" :circles="circles">
 			</map>
 		</view>
 		<!-- 盒子区域 -->
@@ -45,33 +45,59 @@
 	export default {
 		data() {
 			return {
-				latitude: 39.909,
-				longitude: 116.39742,
+				latitude: null,
+				longitude: null,
 				covers: [{
 					id: 1,
-					latitude: 39.909,
-					longitude: 116.39742,
+					latitude: null,
+					longitude: null,
 					iconPath: '../../static/location.png',
 					width: 20,
 					height: 20
 				}],
+				circles: [{
+					longitude: null,
+					latitude: null,
+					fillColor: "#FF2B431A",
+					color: "#FF0000",
+					radius: 100,
+					strokeWidth: 1
+				}],
 				imgUrl: ""
 			};
 		},
 		onLoad() {
-			// this.getLocationData()
+			this.getLocationData()
+			this.test()
 		},
 		methods: {
 			getLocationData() {
-				console.log(123);
 				uni.getLocation({
 					type: 'gcj02',
-					success: function(res) {
+					success: (res) => {
+						console.log(res);
+						this.latitude = res.latitude
+						this.longitude = res.longitude
+						this.covers[0].latitude = res.latitude
+						this.covers[0].longitude = res.longitude
+						this.circles[0].latitude = res.latitude
+						this.circles[0].longitude = res.longitude
 						console.log('当前位置的经度：' + res.longitude);
 						console.log('当前位置的纬度：' + res.latitude);
 					}
 				});
 			},
+			test() {
+				console.log(789);
+				uni.chooseLocation({
+					success: (res) => {
+						console.log('位置名称：' + res.name);
+						console.log('详细地址：' + res.address);
+						console.log('纬度：' + res.latitude);
+						console.log('经度：' + res.longitude);
+					}
+				});
+			},
 			// 点击拍照图标回调
 			handlePhoto() {
 				// 获取用户摄像头权限

pages/qr_code/qr_code.vue

@@ -0,0 +1,15 @@
+<template>
+	<web-view src="https://msg.weixiao.qq.com/t/700e3125b237694ec06512a4b35ade59" :progress="true"></web-view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {}
+		}
+	}
+</script>
+
+<style>
+
+</style>

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

@@ -1,7 +1,9 @@
 {
   "pages": [
-    "pages/index/index",
     "pages/home/home",
+    "pages/index/index",
+    "pages/404/404",
+    "pages/qr_code/qr_code",
     "pages/group/group",
     "pages/stat/stat",
     "pages/my/my",
@@ -57,7 +59,7 @@
   "plugins": {
     "myPlugin": {
       "provider": "wx1549b963bbae9931",
-      "version": "4.0.0"
+      "version": "4.0.1"
     }
   },
   "permission": {
@@ -65,7 +67,12 @@
       "desc": "您的位置信息将用于记录打卡"
     }
   },
+  "requiredPrivateInfos": [
+    "getLocation",
+    "chooseLocation"
+  ],
   "usingComponents": {
+    "login": "plugin://myPlugin/login",
     "drop-down": "/uni_modules/zwx-dropDown/components/zwx-dropDown/zwx-dropDown"
   }
 }

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

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "404",
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/pages/404/404.wxml

@@ -0,0 +1 @@
+<view class="container data-v-43ff52f8"><view class="img data-v-43ff52f8"><image src="{{$root.m0}}" class="_img data-v-43ff52f8"></image></view><view class="msg data-v-43ff52f8">暂无权限</view></view>

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

@@ -0,0 +1,23 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.container.data-v-43ff52f8 {
+  padding-top: 218rpx;
+  width: 100vw;
+  height: 100vh;
+  background-color: #fff;
+}
+.container .img.data-v-43ff52f8 {
+  margin: 0 auto;
+  width: 480rpx;
+  height: 508rpx;
+}
+.container .img ._img.data-v-43ff52f8 {
+  width: 100%;
+  height: 100%;
+}
+.container .msg.data-v-43ff52f8 {
+  text-align: center;
+  color: #5792F0;
+}
+

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

@@ -1,4 +1,5 @@
 {
   "navigationBarTitleText": "授权中",
+  "enablePullDownRefresh": false,
   "usingComponents": {}
 }

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

@@ -1 +1 @@
-<view class="data-v-57280228">123<block wx:if="{{showLogin}}"><view class="data-v-57280228"><login vue-id="8dd740cc-1" ocode="{{ocode}}" appkey="{{appKey}}" scope="snsapi_userinfo" visible="{{visible}}" data-event-opts="{{[['^success',[['loginSuccess']]],['^fail',[['loginFail']]],['^cancel',[['loginCancel']]]]}}" bind:success="__e" bind:fail="__e" bind:cancel="__e" class="data-v-57280228" bind:__l="__l"></login></view></block></view>
+<view class="data-v-57280228"><block wx:if="{{showLogin}}"><view class="data-v-57280228"><login vue-id="8dd740cc-1" ocode="{{ocode}}" appkey="{{appkey}}" scope="snsapi_userinfo" visible="{{visible}}" data-event-opts="{{[['^success',[['loginSuccess']]],['^fail',[['loginFail']]],['^cancel',[['loginCancel']]]]}}" data-com-type="wx" bind:success="__e" bind:fail="__e" bind:cancel="__e" class="data-v-57280228" bind:__l="__l"></login></view></block></view>

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

@@ -1,4 +0,0 @@
-@charset "UTF-8";
-/* 水平间距 */
-/* 水平间距 */
-

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

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "校园卡二维码",
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/pages/qr_code/qr_code.wxml

@@ -0,0 +1 @@
+<web-view src="https://msg.weixiao.qq.com/t/700e3125b237694ec06512a4b35ade59" progress="{{true}}"></web-view>

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

@@ -0,0 +1 @@
+/* pages/qr_code/qr_code.wxss */

unpackage/dist/dev/mp-weixin/project.config.json

@@ -18,8 +18,8 @@
         }
     },
     "compileType": "miniprogram",
-    "libVersion": "2.28.0",
-    "appid": "wxb4d969974f931f62",
+    "libVersion": "2.28.1",
+    "appid": "wxd6f090391d410534",
     "projectname": "校园考勤打卡",
     "condition": {},
     "editorSetting": {

util/api.js

@@ -1,7 +1,7 @@
 // 线上地址
 // const BASE_URL = "https://chtech.ncjti.edu.cn/jiaofei/jiaofei-api/tuitionpayment"
 // 本地地址
-const BASE_URL = "https://www.web-server.top:443"
+const BASE_URL = "https://www.web-server.top"
 export const myRequest = (options) => {
 	uni.showLoading({
 		title: "加载中",
@@ -12,7 +12,7 @@ export const myRequest = (options) => {
 			url: BASE_URL + options.url,
 			method: options.method || "GET",
 			data: options.data || {},
-			header: {
+			header: options.header || {
 				'Authorization': 'token'
 			},
 			success: (res) => {