From aeadf5dce5646f19ada355b3a35eab4f5b0956a1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 27 五月 2024 18:34:57 +0800
Subject: [PATCH] ''

---
 h5/pages.json                                      |    9 +
 h5/pages/visitorApplication/visitorApplication.vue |    1 
 h5/api/index.js                                    |    8 +
 h5/pages/auth/auth.vue                             |   28 ++++
 h5/pages/notice/notice.vue                         |    2 
 h5/pages/login/login.vue                           |  237 ++++++++++++++++++---------------
 h5/App.vue                                         |    6 
 h5/manifest.json                                   |  125 +++++++++--------
 8 files changed, 242 insertions(+), 174 deletions(-)

diff --git a/h5/App.vue b/h5/App.vue
index cfca3fb..28cf67f 100644
--- a/h5/App.vue
+++ b/h5/App.vue
@@ -1,4 +1,5 @@
 <script>
+import { wxAuthorize } from '@/api'
 export default {
 	onLaunch: function () {
 		var that = this
@@ -7,15 +8,16 @@
 			let code = ''
 			if (url.indexOf('code=') !== -1) {
 				const query = url.split('?')
-
+				console.log('app-app', url);
 				for (const q of query) {
 					if (q.indexOf('code=') !== -1) {
 						code = q.substring(q.indexOf('code=') + 5, q.length)
 					}
 				}
-				that.$u.api.wxAuthorize({
+				wxAuthorize({
 					code: code
 				}).then(res => {
+					console.log('app_ress', res);
 					if (res.code === 200) {
 						that.$store.commit('setOpenId', res.data.openid)
 						if (res.data.member) {
diff --git a/h5/api/index.js b/h5/api/index.js
index b7406b7..d3d05bc 100644
--- a/h5/api/index.js
+++ b/h5/api/index.js
@@ -16,4 +16,12 @@
     method: 'get',
     data
   })
+}
+// 鎺堟潈
+export const wxAuthorize = (data) => {
+  return http({
+    url: 'visitsAdmin/cloudService/web/visitor/wxAuthorize',
+    method: 'get',
+    data
+  })
 }
\ No newline at end of file
diff --git a/h5/manifest.json b/h5/manifest.json
index 4a982e6..3d85f5b 100644
--- a/h5/manifest.json
+++ b/h5/manifest.json
@@ -1,28 +1,28 @@
 {
-    "name" : "laborVisitors",
-    "appid" : "__UNI__E9B0763",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
+    "name": "laborVisitors",
+    "appid": "__UNI__E9B0763",
+    "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
+    "app-plus": {
+        "usingComponents": true,
+        "nvueStyleCompiler": "uni-app",
+        "compilerVersion": 3,
+        "splashscreen": {
+            "alwaysShowBeforeRender": true,
+            "waiting": true,
+            "autoclose": true,
+            "delay": 0
         },
         /* 妯″潡閰嶇疆 */
-        "modules" : {},
+        "modules": {},
         /* 搴旂敤鍙戝竷淇℃伅 */
-        "distribute" : {
+        "distribute": {
             /* android鎵撳寘閰嶇疆 */
-            "android" : {
-                "permissions" : [
+            "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\"/>",
@@ -41,60 +41,65 @@
                 ]
             },
             /* ios鎵撳寘閰嶇疆 */
-            "ios" : {},
+            "ios": {},
             /* SDK閰嶇疆 */
-            "sdkConfigs" : {}
+            "sdkConfigs": {}
         }
     },
     /* 蹇簲鐢ㄧ壒鏈夌浉鍏� */
-    "quickapp" : {},
+    "quickapp": {},
     /* 灏忕▼搴忕壒鏈夌浉鍏� */
-    "mp-weixin" : {
-        "appid" : "wxcd2b89fd2ff065f8",
-        "setting" : {
-            "urlCheck" : false,
-            "es6" : true,
-            "postcss" : true,
-            "minified" : true
+    "mp-weixin": {
+        "appid": "wxcd2b89fd2ff065f8",
+        "setting": {
+            "urlCheck": false,
+            "es6": true,
+            "postcss": true,
+            "minified": true
         },
-        "usingComponents" : true,
-        "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ],
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "鐢ㄤ簬鑾峰彇鍛ㄨ竟鎴挎簮浣嶇疆"
+        "usingComponents": true,
+        "requiredPrivateInfos": [
+            "getLocation",
+            "chooseLocation"
+        ],
+        "permission": {
+            "scope.userLocation": {
+                "desc": "鐢ㄤ簬鑾峰彇鍛ㄨ竟鎴挎簮浣嶇疆"
             }
         }
     },
-    "mp-alipay" : {
-        "usingComponents" : true
+    "mp-alipay": {
+        "usingComponents": true
     },
-    "mp-baidu" : {
-        "usingComponents" : true
+    "mp-baidu": {
+        "usingComponents": true
     },
-    "mp-toutiao" : {
-        "usingComponents" : true
+    "mp-toutiao": {
+        "usingComponents": true
     },
-    "uniStatistics" : {
-        "enable" : false
+    "uniStatistics": {
+        "enable": false
     },
-    "vueVersion" : "2",
-    "h5" : {
-        "router" : {
-            "mode" : "hash",
-            "base" : "/"
+    "vueVersion": "2",
+    "h5": {
+        "router": {
+            "mode": "hash",
+            "base": "/"
             // "base" : "/h5/"
         },
-		"devServer" : {
-		   "port": 8090,
-		   "proxy" : {
-			   "/api" : {  // 杩欎釜瀛楁鍚嶉渶涓庝綘閰嶇疆鐨刡asePrefixUrl涓�鑷达紝绯荤粺璇嗗埆鍒板甫鏈�/dev-api璇锋眰鐨勫湴鍧�鏃讹紝浼氬湪鍓嶉潰鎷兼帴涓婁唬鐞嗘湇鍔″櫒鍦板潃
-				   "target" : "http://192.168.0.106:10010", // 浠g悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
-				   "changeOrigin" : true, // 鍏佽璺ㄥ煙 
-				   "pathRewrite" : {
-					   "^/api" : ""  // 閲嶅啓鍦板潃锛屽鏋滃疄闄呮帴鍙d腑鏄笉甯�/dev-api锛岄渶瑕佸皢杩欎釜鍓嶇紑缃┖锛屽洜涓鸿繖涓墠缂�鍙槸涓轰簡璇嗗埆鐢紝璇嗗埆瀹屼箣鍚庡氨娌$敤浜�
-				   }
-			   }
-		   } 
-		}
+        "devServer": {
+            "port": 8090,
+            "historyApiFallback": true,
+            "disableHostCheck": true,
+            "proxy": {
+                "/api": { // 杩欎釜瀛楁鍚嶉渶涓庝綘閰嶇疆鐨刡asePrefixUrl涓�鑷达紝绯荤粺璇嗗埆鍒板甫鏈�/dev-api璇锋眰鐨勫湴鍧�鏃讹紝浼氬湪鍓嶉潰鎷兼帴涓婁唬鐞嗘湇鍔″櫒鍦板潃
+                    "target": "http://192.168.0.143:10010", // 浠g悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
+                    "changeOrigin": true, // 鍏佽璺ㄥ煙 
+                    "pathRewrite": {
+                        "^/api": "" // 閲嶅啓鍦板潃锛屽鏋滃疄闄呮帴鍙d腑鏄笉甯�/dev-api锛岄渶瑕佸皢杩欎釜鍓嶇紑缃┖锛屽洜涓鸿繖涓墠缂�鍙槸涓轰簡璇嗗埆鐢紝璇嗗埆瀹屼箣鍚庡氨娌$敤浜�
+                    }
+                }
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/h5/pages.json b/h5/pages.json
index 35dbba4..06ed35b 100644
--- a/h5/pages.json
+++ b/h5/pages.json
@@ -354,6 +354,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/auth/auth",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "寰俊鎺堟潈",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"subPackages": [{
 			"root": "n_pages",
diff --git a/h5/pages/auth/auth.vue b/h5/pages/auth/auth.vue
new file mode 100644
index 0000000..14138b1
--- /dev/null
+++ b/h5/pages/auth/auth.vue
@@ -0,0 +1,28 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		},
+		onLoad() {
+			const appID = 'wx4d7c10bdec51942b'
+			const AppSecret = '922c93596d134fedf5bd22a9354b3bfe'
+			// const scope = 'snsapi_userinfo'
+			let uri = encodeURIComponent('http://xiaopiqiu2.natapp1.cc')
+			let authURL =
+			  `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appID}&redirect_uri=${uri}&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect`
+			window.location.href = authURL
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/h5/pages/login/login.vue b/h5/pages/login/login.vue
index 5d34620..a948b9d 100644
--- a/h5/pages/login/login.vue
+++ b/h5/pages/login/login.vue
@@ -1,28 +1,33 @@
 <template>
   <view class="login">
-		<image class="login_bg" src="@/static/login_bg@2x.png" />
+    <image class="login_bg" src="@/static/login_bg@2x.png" />
     <image class="login_logo" src="@/static/logo@2x.png" mode="widthFix" />
     <view class="login_title">瀹夋嘲鐗╂祦鏅烘収鍥尯</view>
     <view class="login_list">
       <view class="login_list_item">
         <image src="@/static/login_ic_phone@2x.png" mode="widthFix" />
-        <input v-model="form.idCard" maxlength="18" type="number" placeholder="璐﹀彿">
+        <input
+          v-model="form.idCard"
+          maxlength="18"
+          type="number"
+          placeholder="璐﹀彿"
+        />
       </view>
       <view class="login_list_item">
         <image src="@/static/login_ic_password@2x.png" mode="widthFix" />
-        <input v-model="form.password" type="password" placeholder="瀵嗙爜">
+        <input v-model="form.password" type="password" placeholder="瀵嗙爜" />
       </view>
     </view>
     <view class="login_btn">
-      <view class="login_btn_n">绔嬪嵆鐧诲綍</view>
-			<view class="for_psd">蹇樿瀵嗙爜</view>
+      <view class="login_btn_n" @click="onLogin">绔嬪嵆鐧诲綍</view>
+      <view class="for_psd">蹇樿瀵嗙爜</view>
     </view>
 
-		<view class="deal_wrap">
-			<checkbox @change="dealChange" />
-			<text>鐧诲綍鍗冲悓鎰�</text>
-			<text class="deal">銆婂畨娉扮墿娴佺敤鎴峰崗璁��</text>
-		</view>
+    <view class="deal_wrap">
+      <checkbox @change="dealChange" />
+      <text>鐧诲綍鍗冲悓鎰�</text>
+      <text class="deal">銆婂畨娉扮墿娴佺敤鎴峰崗璁��</text>
+    </view>
   </view>
 </template>
 
@@ -30,7 +35,7 @@
 export default {
   name: 'login',
 
-  data () {
+  data() {
     return {
       form: {
         idCard: '',
@@ -39,112 +44,124 @@
     }
   },
 
-  created () {
-		console.log('---');
+  created() {
   },
 
   methods: {
-		dealChange(e) {
-			console.log(e);
-		}
+    dealChange(e) {
+      console.log(e)
+    },
+    onLogin() {
+      const appID = 'wx4d7c10bdec51942b'
+      const AppSecret = '922c93596d134fedf5bd22a9354b3bfe'
+      // const scope = 'snsapi_userinfo'
+      let uri = encodeURIComponent('http://xiaopiqiu2.natapp1.cc')
+      let authURL =
+        `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appID}&redirect_uri=${uri}&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect`
+      window.location.href = authURL
+
+    }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-	.login {
-		width: 100%;
-		height: 100vh;
-		display: flex;
-		padding-top: 160rpx;
-		box-sizing: border-box;
-		align-items: center;
-		flex-direction: column;
-		background: linear-gradient( 180deg, rgba(39,155,170,0.2) 0%, rgba(39,155,170,0) 100%);
-		.login_logo {
-			width: 180rpx;
-			height: 180rpx;
-		}
-		.login_bg{
-			position: absolute;
-			top: 0;
-			width: 750rpx;
-		}
-		.login_title {
-			font-size: 44rpx;
-			font-weight: 600;
-			color: #333333;
-			margin-top: 40rpx;
-			margin-bottom: 120rpx;
-		}
-		.login_list {
-			width: 100%;
-			padding: 0 60rpx;
-			box-sizing: border-box;
-			.login_list_item {
-				width: 100%;
-				border-radius: 50rpx;
-				height: 98rpx;
-				padding: 0 40rpx;
-				box-sizing: border-box;
-				background: #FFFFFF;
-				margin-bottom: 40rpx;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				&:last-child {
-					margin-bottom: 0 !important;
-				}
-				image {
-				  flex-shrink: 0;
-				  width: 40rpx;
-				  height: 40rpx;
-				}
-				input {
-				  flex: 1;
-				  height: 100%;
-				  color: #666666;
-				  margin-left: 24rpx;
-				  border: none;
-				}
-			}
-		}
-		.login_btn {
-			width: 100%;
-			padding: 0 60rpx;
-			box-sizing: border-box;
-			margin-top: 80rpx;
-			.for_psd{
-				color: #279BAA;
-				margin-top: 40rpx;
-				width: 140rpx;
-				text-align: center;
-				margin: 40rpx auto;
-			}
-			.login_btn_n {
-				width: 100%;
-				height: 98rpx;
-				background: #279BAA;
-				box-shadow: 0rpx 12rpx 24rpx 0rpx rgba(39,155,170,0.2);
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				font-weight: 500;
-				font-size: 32rpx;
-				color: #FFFFFF;
-				border-radius: 50rpx;
-			}
-		}
-		.deal_wrap{
-			position: absolute;
-			width: 100%;
-			left: 0;
-			text-align: center;
-			bottom: 108rpx;
-			.deal{
-				color: #279BAA;
-			}
-			
-		}
+.login {
+  width: 100%;
+  height: 100vh;
+  display: flex;
+  padding-top: 160rpx;
+  box-sizing: border-box;
+  align-items: center;
+  flex-direction: column;
+  background: linear-gradient(
+    180deg,
+    rgba(39, 155, 170, 0.2) 0%,
+    rgba(39, 155, 170, 0) 100%
+  );
+  .login_logo {
+    width: 180rpx;
+    height: 180rpx;
   }
+  .login_bg {
+    position: absolute;
+    top: 0;
+    width: 750rpx;
+  }
+  .login_title {
+    font-size: 44rpx;
+    font-weight: 600;
+    color: #333333;
+    margin-top: 40rpx;
+    margin-bottom: 120rpx;
+  }
+  .login_list {
+    width: 100%;
+    padding: 0 60rpx;
+    box-sizing: border-box;
+    .login_list_item {
+      width: 100%;
+      border-radius: 50rpx;
+      height: 98rpx;
+      padding: 0 40rpx;
+      box-sizing: border-box;
+      background: #ffffff;
+      margin-bottom: 40rpx;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      &:last-child {
+        margin-bottom: 0 !important;
+      }
+      image {
+        flex-shrink: 0;
+        width: 40rpx;
+        height: 40rpx;
+      }
+      input {
+        flex: 1;
+        height: 100%;
+        color: #666666;
+        margin-left: 24rpx;
+        border: none;
+      }
+    }
+  }
+  .login_btn {
+    width: 100%;
+    padding: 0 60rpx;
+    box-sizing: border-box;
+    margin-top: 80rpx;
+    .for_psd {
+      color: #279baa;
+      margin-top: 40rpx;
+      width: 140rpx;
+      text-align: center;
+      margin: 40rpx auto;
+    }
+    .login_btn_n {
+      width: 100%;
+      height: 98rpx;
+      background: #279baa;
+      box-shadow: 0rpx 12rpx 24rpx 0rpx rgba(39, 155, 170, 0.2);
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-weight: 500;
+      font-size: 32rpx;
+      color: #ffffff;
+      border-radius: 50rpx;
+    }
+  }
+  .deal_wrap {
+    position: absolute;
+    width: 100%;
+    left: 0;
+    text-align: center;
+    bottom: 108rpx;
+    .deal {
+      color: #279baa;
+    }
+  }
+}
 </style>
diff --git a/h5/pages/notice/notice.vue b/h5/pages/notice/notice.vue
index ddd051b..6a15db8 100644
--- a/h5/pages/notice/notice.vue
+++ b/h5/pages/notice/notice.vue
@@ -24,7 +24,7 @@
     }
   },
   onLoad() {
-    this.getInfo()
+    // this.getInfo()
   },
   methods: {
     getInfo() {
diff --git a/h5/pages/visitorApplication/visitorApplication.vue b/h5/pages/visitorApplication/visitorApplication.vue
index 6fda6d3..e838995 100644
--- a/h5/pages/visitorApplication/visitorApplication.vue
+++ b/h5/pages/visitorApplication/visitorApplication.vue
@@ -374,7 +374,6 @@
 			if (options.data) {
 				this.form = JSON.parse(options.data)
 			}
-			console.log('this.form', this.form);
 			// this.getvisit()
 			// this.getVisit1()
 			// this.getUserValid()

--
Gitblit v1.9.3