wesmiler 报恩寺项目

.gitignore

@@ -4,3 +4,5 @@
 .env.php
 .env
 
+
+/dist/归档.zip

App.vue

@@ -1,8 +1,15 @@
 
 <script>
 	export default {
-		onLaunch: function() {
-			console.log('App Launch');
+		onLaunch: function() {
+			console.log('App Launch')
+			console.log(this.$store.state)
+			if(this.$store.state.token == '' && this.$router.history.current.path != '/pages/entry/auth'){
+				console.log(this.$store.state)
+				uni.navigateTo({
+					url: '/pages/entry/auth?reback_url='+location.href
+				})
+			}
 		},
 		onShow: function() {
 			console.log('App Show')

components/common/auth.vue

@@ -1,43 +0,0 @@
-<template>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				code: '',
-				authUrl: 'https://open.weixin.qq.com/connect/oauth2/authorize?appid='+this.config.appId+'&response_type=code&scope=snsapi_userinfo&state=bes&redirect_uri='
-			}
-		},
-		onLoad() {
-			let code = this.getUrlParam('code')
-			if(code == null || code == '') {
-				// 重新获取code
-				let url = this.authUrl + location.href
-				window.location.href = url
-			} else {
-				// 发送code           
-				this.getAccessToken(code)
-			}
-		},
-		methods: {
-			// 解析URL 参数
-			getUrlParam(name) {
-				let reg = new RegExp('(^|&)'+ name + '=([^&]*)(&|$)')
-				let r = window.location.search.substr(1).match(reg)
-				if(r!=null){
-					return unescape(r[2])
-				} 
-				return null
-			},
-			getAccessToken(url) {
-				console.log(url)
-				uni.navigateTo({
-					url: url
-				})
-			}
-		}
-	}
-</script>
-<style>
-</style>

config/index.js

@@ -1,7 +1,5 @@
 // let baseUrl = 'http://127.0.3.60'
-let appId = 'wxbfded07802dd0cae'
 let baseUrl = 'http://bes-api.ts.dongerkj.com'
 export default {
-	appId,
 	baseUrl,
 }

config/request.js

@@ -2,7 +2,7 @@ import config from './index.js'
 const request = {}
 const headers = {}
 let responseType = 'json'
-request.api = (url, data, method='post', type=1) => {
+request.api = (url, data, method='post', type=2) => {
     switch (type){
         case 1:
             responseType = 'blob'
@@ -10,9 +10,9 @@ request.api = (url, data, method='post', type=1) => {
         default:
 			const token = uni.getStorageSync('token');
             headers['Authorization'] = `Bearer ${
-                this.$store.state.token? this.$store.state.token : token
+                token
             }`
-            headers['TENANT-ID'] = this.$store.getters.userInfo.tenant_id
+			//headers['TIMESMAP'] = (new Date()).valueOf();
             break;
     }
             
@@ -33,10 +33,10 @@ request.api = (url, data, method='post', type=1) => {
             throw res[1].data
         }
     }).catch(parmas => {
-		console.log(res)
 　　　　　　switch (parmas.code) {
-　　　　　　　　case 401:
+　　　　　　　　case 10001:
 　　　　　　　　　　uni.clearStorageSync()
+				 location.reload()
 　　　　　　　　　　break
 　　　　　　　　default:
 　　　　　　　　　　return Promise.reject()

main.js

@@ -8,11 +8,11 @@ App.mpType = 'app'
 import uView from "uview-ui";
 Vue.use(uView);
 
+import store from 'store/index.js'
+Vue.prototype.$store = store
+
 import request from 'config/request.js'
 Vue.prototype.$request = request
-
-import store from './store'
-Vue.prototype.$store = store
 
 const app = new Vue({
     ...App,

manifest.json

@@ -70,6 +70,9 @@
     },
     "h5" : {
         "title" : "报恩寺",
-        "domain" : "besweb.ts.dongerkj.com"
+        "domain" : "besweb.ts.dongerkj.com",
+        "router" : {
+            "mode" : "history"
+        }
     }
 }

pages.json

@@ -17,6 +17,13 @@
 		    }
 		},
 		{
+			"path": "pages/entry/auth",//登录
+		    "style": {
+		        "navigationStyle":"custom",//添加自定义配置
+				"navigationBarTitleText":"授权"
+		    }
+		},
+		{
 			"path": "pages/entry/register",//注册
 		    "style": {
 		        "navigationStyle":"custom",//添加自定义配置

pages/entry/auth.vue

@@ -0,0 +1,99 @@
+<template>
+	<view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+			}
+		},
+		onLoad(option) {
+			uni.showLoading({
+				title: 'loading'
+			})
+			
+			// 授权调用
+			if(typeof(option.code) != 'undefined' && option.code){
+				this.userAuth(option.code);
+			}else{
+				sessionStorage.setItem('redirceUrl', option.reback_url)
+				this.getAuthUrl();
+			}
+			
+		},
+		methods: {
+			// 获取授权地址
+			getAuthUrl() {
+				this.$request.api('/api/auth/url', {url: document.location.protocol+'://'+document.domain+'/page/entry/auth'}).then(res => {
+					uni.hideLoading()
+					if(res.success == true){
+						location.href = res.data
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+				}).catch(parmas => {
+					console.log(params)
+				})
+			},
+			// 用户授权登录
+			userAuth(code) {
+				let _uni = this
+				let redirceUrl = sessionStorage.getItem('redirceUrl')
+				redirceUrl = typeof(redirceUrl)!= 'undefined'? redirceUrl : location.domain+'/pages/index/index';
+				this.$request.api('/api/auth', {code: code}).then(res => {
+					console.log(res)
+					uni.hideLoading()
+					let accessToken = typeof(res.access_token)!= 'undefined'? res.access_token : ''
+					if(res.success == true && accessToken){
+							_uni.$store.commit('setToken', res);
+							location.href = redirceUrl
+					}else{
+						uni.showModal({
+						    title: '错误提示',
+						    content: accessToken? '授权失败，点击确定重试或者取消返回': res.msg+'，点击确定重试或者取消返回',
+						    success: function (res) {
+						        if (res.confirm) {
+						            uni.navigateTo({
+						            	url: '/pages/entry/auth'
+						            })
+						        } else if (res.cancel) {
+									location.href = redirceUrl
+						        }
+						    }
+						});
+					}
+				}).catch(parmas => {
+					console.log(parmas)
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	.nav-bar {
+		padding-top: 50rpx;
+		padding-bottom: 10rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		background: linear-gradient(rgb(255, 152, 101), rgb(255, 122, 85));
+		height: 125rpx;
+	}
+	.btn {
+		width: 50%;
+		height: 80rpx;
+		line-height: 80rpx;
+		margin: 0 auto;
+		background-color: #18B566;
+		color: #fff;
+		text-align: center;
+		margin-top: 50%;
+		border-radius: 6rpx;
+	}
+</style>

pages/index/chaodu/index.vue

@@ -274,9 +274,4 @@
 			top: -62rpx;
 		}
 	}
-
-
-	@media screen and (max-width: 375px) {
-		
-	}
 </style>

pages/index/index.vue

@@ -4,7 +4,7 @@
 			<view class="nav-bar">
 				<view class="left-nav">
 					<ul>
-						<li v-for="(item,index) in navList" :class="{active:!(index-menuIndex)}">
+						<li v-for="(item,index) in navList" :class="{active:!(index-menuIndex)}" :key=index>
 							<view v-if="item.url">
 								<navigator :url="item.url" v-text="item.name"></navigator>
 							</view>

store/index.js

@@ -3,20 +3,19 @@ import Vuex from 'vuex'
 Vue.use(Vuex)
 const store = new Vuex.Store({
 	state: {
-		wechatInfo: {},
-		userInfo: {uid:0},
+		userInfo: {id:0},
 		token: '',
 	},
 	mutations: {
-		setToken(state, info){
-			state.token = info.access_token;
-			state.userInfo = info;
+		setToken(state, data){
+			state.token = data.access_token;
+			state.userInfo = data.info;
 			uni.setStorage({
 				key: 'auth',
-				data: JSON.stringify(info)
+				data: JSON.stringify(data.info)
 			})
 			
-			// 退出
+			// 登录
 			uni.setTabBarItem({
 				index: 4,
 				text: '我的'
@@ -33,13 +32,7 @@ const store = new Vuex.Store({
 					})
 				}
 			})
-			
-			// 退出
-			uni.setTabBarItem({
-				index: 4,
-				text: '未登录'
-			})
-		}
+		},
 	},
 	actions: {},
 	getters: {