zhengkaixin 2 rokov pred
rodič
commit
82bc2bb126
8 zmenil súbory, kde vykonal 124 pridanie a 62 odobranie
  1. 2 0
      .env.dev.js
  2. 2 1
      .env.prod.js
  3. 2 0
      .env.test.js
  4. 2 2
      main.js
  5. 22 11
      pages/index/index.vue
  6. 1 1
      pages/index/main.vue
  7. 2 2
      utils/index.js
  8. 91 45
      utils/init.js

+ 2 - 0
.env.dev.js

@@ -8,6 +8,8 @@ const UNI_APP = {
 	//openId:"oHjCawgwCGen5k1-hAsimdEX5lZo",
 	//openId:"oHjCawgwCGen5k1-hAsimdEX5lZo",
 	openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",
+	//小鹏管家appid
+	VUE_APP_WXAPPID:"wx7e70eb62a8459869",
 
 }  
 

+ 2 - 1
.env.prod.js

@@ -3,7 +3,8 @@ const UNI_APP = {
 	NODE_ENV :"prod",
 	SIMPLE_RUN:false,
 	openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",//测试用openId
-
+//小鹏管家appid
+	VUE_APP_WXAPPID:"wx7e70eb62a8459869",
 }  
 
 module.exports = UNI_APP;

+ 2 - 0
.env.test.js

@@ -13,6 +13,8 @@ const UNI_APP = {
 	openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",
 	//zq的测试openId oHjCawsxTJkxixR74OVp7aCKahj8
 	//openId:"oHjCawqzNFywmsRzC7L_OCzk3hwc",
+	//小鹏管家appid
+	VUE_APP_WXAPPID:"wx7e70eb62a8459869",
 }  
 
 module.exports = UNI_APP;

+ 2 - 2
main.js

@@ -3,8 +3,8 @@ import App from './App'
  
 //import MyCommon from '@/components/Common.vue'
 //import CarLoading from '@/components/Loading.vue'
-//import  getOpenId from './utils/init.js'
-//getOpenId.init()
+import  getOpenId from './utils/init.js'
+getOpenId.init()
 
 import  mixin from './utils/mixin.js'
 

+ 22 - 11
pages/index/index.vue

@@ -6,18 +6,29 @@
 		
 		<u-navbar :is-back="false" :border-bottom="false" height="84" >
 		
-			<view class="home-head">
+			<view class="home-head" style="width: 100%;">
 				<view class="" >
 					<img class="homeLogo" :src="homeLogo" alt="">
 				
+				</view>
+				<view>
+					<view class="homeTab" style="
+							float: left;
+						">
+						<u-tabs :list="tabList" :current="current" @change="change" :show-bar="false" active-color="#333" inactive-color="#c4c0c0"></u-tabs>
+					
+					</view>
+					<view class="homeAdd" style="
+							float: right;
+							    height: 34px;
+							    line-height: 34px;
+						" >
+						<u-icon custom-prefix="custom-icon" name="map-pin-2-fill"></u-icon>
+						<span  @click="memberQyshowBtn">{{memberQyObj.name}}</span>
+					</view>
 				</view>
-				<view class="homeTab">
-					<u-tabs :list="tabList" :current="current" @change="change" :show-bar="false" active-color="#333" inactive-color="#c4c0c0"></u-tabs>
-				</view>
-				<view class="homeAdd" >
-					<u-icon custom-prefix="custom-icon" name="map-pin-2-fill"></u-icon>
-					<span  @click="memberQyshowBtn">{{memberQyObj.name}}</span>
-				</view>
+				
+			
 			</view>
 		</u-navbar>
 		
@@ -270,9 +281,9 @@
 		background-color: #fff;
 		z-index: 99;
 		.homeAdd{
-			position: absolute;
-			right: -55px;
-			top:45px;
+			// position: absolute;
+			// right: -55px;
+			// top:45px;
 			color: #FF5E5E;
 			span{
 				margin-left: 3px;

+ 1 - 1
pages/index/main.vue

@@ -103,7 +103,7 @@
 		},
 		onLoad(op) {
 			 
-				this.carhelp.setOpenId(op.openid)
+				//this.carhelp.setOpenId(op.openid)
 				this.setBackImg( )
 			 
 		},

+ 2 - 2
utils/index.js

@@ -275,8 +275,8 @@ export const checkCreditCode = (value) => {
 
 //是否为微信浏览器
 export const isWeiXin = () => {
-	//return /MicroMessenger/.test(window.navigator.userAgent)
-	return true
+	return /MicroMessenger/.test(window.navigator.userAgent)
+	//return true
 }
 
 //获取当前根链接

+ 91 - 45
utils/init.js

@@ -1,55 +1,101 @@
 import carhelp from '@/utils/mixin.js'
 import * as API_WeiXin from '@/apis/weixin.js'
- 
- var openId = carhelp.getOpenId();
+
+import {
+	getUrlParam,
+	getWeixinRedirectURI,
+	isWeiXin
+} from '@/utils'
+var checkOpenId = true; //是否需要获取openId
+var openId = carhelp.getOpenId();
 
 var app = {
 	init: function() {
-		
-		// #ifdef H5
-			console.log("SIMPLE_RUN 模式,取配置固定openId  可修改SIMPLE_RUN ")
-			carhelp.setOpenId(process.car.openId)
-		// #endif
-		
-		// #ifdef MP-WEIXIN
-			if(process.car.SIMPLE_RUN&& process.env.NODE_ENV === "development" ){
-				console.log("SIMPLE_RUN 模式,取配置固定openId  可修改SIMPLE_RUN ")
-				carhelp.setOpenId(process.car.openId)
-				
-			}else{
-				if (!openId) {
-					this.getOpenId()
+		 
+		if(isWeiXin()|| !(process.env.NODE_ENV === "development") ){
+			if (isWeiXin()) {
+				if (checkOpenId) {
+					if (!openId) {
+						this.getOpenId();
+					} else {
+						//this.getPersion(openId)
+					}
+				}
+			} else{
+				var NODE_NAME=  process.env['NODE_NAME']
+				if(NODE_NAME=="production"){
+					alert("请使用微信打开本页面")
 				}
 			}
-			
-		// #endif
-
+		}else{
+			carhelp.setOpenId(process.car.openId)
+			//this.getPersion(process.car.openId)
+		}
+		
+		
 	},
-	 	
-	getOpenId() {
-		var openId = carhelp.getOpenId()
-		if (!openId) {
-		
-			uni.login({
-				provider: 'weixin',
-				success: loginRes => {
-					
-					API_WeiXin.getDataByCode(loginRes.code).then(response => {
-						carhelp.setOpenId(response.data.openId)
-						//user_info 等属性 ,头像,名称,可通过授权获得  uniapp方法申请
-						//carhelp.set("xpgj_wx_user_info",response.data)
-						if(this.onload){
-							this.onload();
-						}						
-					}).catch(error => {
-						console.log(error);
-					});
-				}
-			});
-			
+	 getPersion(thisopenId){
+		 var tdate=new Date( +new Date() + 8 * 3600 * 1000 ).toJSON().substr(0,15).replace("T"," ")
+		 var token_tdate=carhelp.get("token_tdate");//每10分钟存储一次token
+		 
+		  if(token_tdate&&token_tdate==tdate){
+			return
+		  }
+		  
+		 var loginurl="/mobile/regUser/findByOpenId"
+		  
+		 uni.request({
+		 	method:'get',
+		 	url: process.car.BASE_URL + loginurl,
+		 	data: {
+		 		openId:thisopenId,
+		 	},
+		 	header: {
+		 		'Content-Type': 'application/x-www-form-urlencoded',
+		 		'X-Requested-With': 'XMLHttpRequest',
+		 		//'Authorization':token
+		 	}
+		 }).then((response) => {
+			 
+		 	let [error, res] = response;
+		 	
+		 	if (res.data.code == 200&&res.data.result) {
+		 		
+		 		var token = res ? res.data.data.token : '';
+		 		carhelp.setPersonInfo(res.data.data.regUser );
+		 		
+		 		carhelp.setToken(token);
+		 	 
+		 	} 
+		 }).catch(error => {
+		 	
+		 	
+		 })
+	 },
+	getOpenId() {
+		
+		const code = getUrlParam('code');
+		var openId = carhelp.getOpenId()
+		if (!openId) {
+			if (!code) {
+				var url = document.URL;
+				var getUrl= getWeixinRedirectURI(process.car.VUE_APP_WXAPPID, url);
+				 
+				window.location.href = getUrl;
+			} else {
+				
+				API_WeiXin.getDataByCode(code).then(response => {
+					
+					carhelp.setOpenId(response.data.openid)
+					openId = response.data.openid;
+					carhelp.set("xpgj_wx_user_info",response.data)
+					
+					 location.reload();
+				}).catch(error => {
+					console.log(error);
+				});
+			}
 		}
-	
-	}
-
+	}
 }
-module.exports = app
+module.exports = app