From af58cd8f1cc409666e47bddaf5cdd7f0bb822d65 Mon Sep 17 00:00:00 2001
From: chenwei <timeless646@163.com>
Date: Thu, 29 Aug 2024 10:15:58 +0800
Subject: [PATCH] 1: 移除url 中的/#/

---
 frontend/app-user/App.vue                     |   4 ++--
 frontend/app-user/api/login.js                |  14 +++++++++++++-
 frontend/app-user/manifest.json               |   4 ++--
 frontend/app-user/pages.json                  |  12 +++++++++---
 frontend/app-user/pages/jump/weChatOffAcc.vue | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 frontend/app-user/permission.js               |   4 ++--
 frontend/app-user/utils/request.js            |   4 ++--
 7 files changed, 155 insertions(+), 12 deletions(-)
 create mode 100644 frontend/app-user/pages/jump/weChatOffAcc.vue

diff --git a/frontend/app-user/App.vue b/frontend/app-user/App.vue
index 343f549..2c8800d 100644
--- a/frontend/app-user/App.vue
+++ b/frontend/app-user/App.vue
@@ -44,7 +44,7 @@
 				const pages = getCurrentPages()
 				// 当前页面
 				const page = pages?.[pages.length - 1]?.$page?.fullPath
-				return !page || page === '/pages/login' || page === '/pages/code'
+				return !page || page === '/pages/login' || page === '/pages/code' || page === '/pages/jump/weChatOffAcc'
 			},
 			checkWhite(url) {
 				const path = url.split('?')[0]
@@ -69,4 +69,4 @@
 	/*每个页面公共scss */
 	@import 'app.scss';
 	@import '@/static/scss/index.scss'
-</style>
\ No newline at end of file
+</style>
diff --git a/frontend/app-user/api/login.js b/frontend/app-user/api/login.js
index ef31bb4..f4a1d3f 100644
--- a/frontend/app-user/api/login.js
+++ b/frontend/app-user/api/login.js
@@ -83,6 +83,17 @@ export function getUserInfo(params) {
 	})
 }
 
+
+export function getWechatOpenId(code) {
+	return request({
+		'url': '/sso/weixinPublic?code=' + code,
+		'method': 'get'
+	})
+}
+
+
+
+
 // 获取短信验证码
 export function getCode(params) {
 	return request({
@@ -137,5 +148,6 @@ export default {
 	codeLogin,
 	getPublicKey,
 	changUserPsd,
-	forgotPassword
+	forgotPassword,
+	getWechatOpenId
 }
diff --git a/frontend/app-user/manifest.json b/frontend/app-user/manifest.json
index 710602a..fb4cea1 100644
--- a/frontend/app-user/manifest.json
+++ b/frontend/app-user/manifest.json
@@ -142,8 +142,8 @@
             "https" : false
         },
         "router" : {
-            "base" : "./",
-            "mode" : "hash"
+            "base" : "",
+            "mode" : "history"
         },
         "sdkConfigs" : {
             "maps" : {
diff --git a/frontend/app-user/pages.json b/frontend/app-user/pages.json
index 849a461..6c07f5b 100644
--- a/frontend/app-user/pages.json
+++ b/frontend/app-user/pages.json
@@ -286,7 +286,7 @@
 		// 退瓶列表
 		{
 			"path" : "pages/mine/appList/listOfBottleReturn/listOfBottleReturn",
-			"style" : 
+			"style" :
 			{
 				"navigationStyle": "custom",
 				"enablePullDownRefresh" : true
@@ -295,11 +295,17 @@
 		// 其他气站电话
 		{
 			"path" : "pages/home/otherGasStationsPhone",
-			"style" : 
+			"style" :
 			{
 				"navigationStyle": "custom",
 				"enablePullDownRefresh" : true
 			}
+		},
+		{
+			"path": "pages/jump/weChatOffAcc",
+			"style": {
+				"navigationStyle": "custom"
+			}
 		}
 	],
 	"tabBar": {
@@ -322,4 +328,4 @@
 		"navigationStyle": "custom",
 		"backgroundColor": "#F8F8F8"
 	}
-}
\ No newline at end of file
+}
diff --git a/frontend/app-user/pages/jump/weChatOffAcc.vue b/frontend/app-user/pages/jump/weChatOffAcc.vue
new file mode 100644
index 0000000..7be45c3
--- /dev/null
+++ b/frontend/app-user/pages/jump/weChatOffAcc.vue
@@ -0,0 +1,125 @@
+<template>
+  <view class="container">
+    <div>微信公众号-授权认证中</div>
+  </view>
+</template>
+
+<script>
+
+const {Base64} = require('js-base64');
+export default {
+  data() {
+    return {
+      currentModeIndex: 2, //1账号密码 2验证码 3忘记密码
+      inputType: 'password',
+      codeDisabled: false,
+      codeTips: '',
+      formData: {
+        mobile: '',
+        password: '',
+      },
+      flag: true,
+      rules: {
+        mobile: [{
+          type: 'string',
+          required: true,
+          message: '请输入手机号',
+          trigger: ['blur', 'change']
+        },
+          // {
+          //   // 自定义验证函数，见上说明
+          //   validator: (rule, value, callback) => {
+          //     // 上面有说，返回true表示校验通过，返回false表示不通过
+          //     // uni.$u.test.mobile()就是返回true或者false的
+          //     return uni.$u.test.mobile(value)
+          //   },
+          //   message: '手机号码不正确',
+          //   // 触发器可以同时用blur和change
+          //   trigger: ['change', 'blur']
+          // }
+        ],
+        password: {
+          type: 'string',
+          min: 4,
+          max: 16,
+          required: true,
+          message: '密码长度4-16位密码',
+          trigger: ['blur', 'change']
+        },
+        code: {
+          type: 'integer',
+          len: 4,
+          required: true,
+          message: '请填写4位验证码',
+          trigger: ['blur', 'change']
+        }
+      },
+      isAutoLogin: [], //是否自动登录
+      hasForgot: false, //忘记密码
+      loginText: "短信登录",
+      btnText: "发送验证码",
+      checkValue: ['agree'],
+      accountTile: "短信验证码登录",
+      accountTip: "未注册手机号登录后自动生成账号",
+      accountPlaceholder: "请输入手机号",
+      appid: this.$config.appid,
+      openId: null
+    }
+  },
+  created() {
+    this.handleAuthorization();
+  },
+  methods: {
+    handleAuthorization() {
+      console.log("================================");
+      this.code = "";
+      let local = window.location.href;
+      console.log("local", local);
+      console.log("this.code", this.code);
+      let scope = "snsapi_base"; //静默授权 用户无感知
+      console.log("this.scope", scope);
+      this.code = this.getUrlCode().code;
+      console.log("this.code", this.code);
+
+      this.getOpenId(this.code);
+      console.log("================================");
+    },
+    getOpenId(code) {
+      let that = this;
+      this.$api.loginApi.getWechatOpenId(code).then(res => {
+        console.log("11111that.res ", res);
+        if (res.status == 1000) {
+          that.openId = res.data.openId;
+          console.log("that.openId ", that.openId);
+        } else {
+          Toast(res.message);
+        }
+      });
+
+    },
+    getUrlCode() {
+      let fullUrl = window.location.href;
+      console.log("fullUrl ", fullUrl);
+      let theRequest = new Object();
+      if (fullUrl.indexOf("?") != -1) {
+        var temp = fullUrl.split("?");
+        let str = temp[1];
+        let strs = str.split("&");
+        for (var i = 0; i < strs.length; i++) {
+          theRequest[strs[i].split("=")[0]] = strs[i].split("=")[1];
+        }
+      }
+      return theRequest;
+    },
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100vh;
+}
+</style>
diff --git a/frontend/app-user/permission.js b/frontend/app-user/permission.js
index 4a75f8f..806ba04 100644
--- a/frontend/app-user/permission.js
+++ b/frontend/app-user/permission.js
@@ -7,7 +7,7 @@ const loginPage = "/pages/login"
 
 // 页面白名单
 const whiteList = [
-	'/pages/login', '/pages/code', '/pages/register', '/pages/forgotPassword', '/pages/common/webview/index'
+	'/pages/login', '/pages/code', '/pages/register', '/pages/forgotPassword', '/pages/common/webview/index', '/pages/jump/weChatOffAcc'
 ]
 
 // 检查地址白名单
@@ -42,4 +42,4 @@ list.forEach(item => {
 			console.log(err)
 		}
 	})
-})
\ No newline at end of file
+})
diff --git a/frontend/app-user/utils/request.js b/frontend/app-user/utils/request.js
index 4eff156..10ae7d8 100644
--- a/frontend/app-user/utils/request.js
+++ b/frontend/app-user/utils/request.js
@@ -107,7 +107,7 @@ function isLoginPage() {
 	const pages = getCurrentPages()
 	// 当前页面
 	const page = pages?.[pages.length - 1]?.$page?.fullPath
-	return !page || page === '/pages/login' || page === '/pages/code'
+	return !page || page === '/pages/login' || page === '/pages/code'|| page === '/pages/jump/weChatOffAcc'
 }
 
-export default request
\ No newline at end of file
+export default request
--
libgit2 0.21.2