首页

.env.dev.js

@@ -2,13 +2,13 @@ const UNI_APP = {
 	BASE_URL: 'https://charging.xiaoxinda.com/making-friends-server/',
     //BASE_URL: 'http://192.168.33.162:8086/making-friends-server/' ,
 	NODE_ENV :"dev",
-	SIMPLE_RUN:true,// 无视权限控制跳转页面   ， 用于样式人员快速访问各种功能 ，快速测试等
+	SIMPLE_RUN:false,// 无视权限控制跳转页面   ， 用于样式人员快速访问各种功能 ，快速测试等
 	//openId:"oHjCawsxTJkxixR74OVp7aCKahj8",//测试用openId  
 	//openId:"oHjCawgwCGen5k1-hAsimdEX5lZo",
 	//openId:"oHjCawgwCGen5k1-hAsimdEX5lZo",
 	openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",
 	//小鹏管家appid
-	VUE_APP_WXAPPID:"wx7e70eb62a8459869"
+	VUE_APP_WXAPPID:"wxa8954f417fa7c32f"
 }  
 
 module.exports = UNI_APP;

.env.prod.js

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

.env.test.js

@@ -9,7 +9,7 @@ const UNI_APP = {
 	//openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",//测试用openId
 	//openId:"oHjCawmHqG44pqUW54iBlenaHYB8",
 	//小鹏管家appid
-	VUE_APP_WXAPPID:"wx7e70eb62a8459869",
+	VUE_APP_WXAPPID:"wxa8954f417fa7c32f",
 	//zkx的测试openId
 	openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",
 	//zq的测试openId oHjCawsxTJkxixR74OVp7aCKahj8

pages.json

@@ -5,6 +5,14 @@
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages	
 		
 		
+		{
+			"name":"欢迎页",
+			"path": "pages/index/main-zkx",
+			"style": {
+			
+				//"navigationStyle": "custom" // 隐藏系统导航栏
+			}
+		},
 		{
 			"name":"首页",
 			"path": "pages/index/index",

pages/index/main-zkx.vue

@@ -0,0 +1,84 @@
+<template>
+		<view>
+				<u-navbar></u-navbar>
+				首页图
+				<view v-if="bottonShow"> 
+					<u-button @click="gotoMain(true)" >加入我们</u-button>
+					<u-button @click="gotoMain(false)">我先逛逛</u-button>
+				</view>
+			
+		</view>
+</template>
+
+<script>
+	import * as loginApi from '@/apis/login.js'
+	
+	export default {
+		data() {
+			return {
+				bottonShow:false
+			}
+		},
+		methods: {
+			gotoMain(k){
+				if(k){
+					uni.navigateTo({
+						url:"/pages/login/index"
+					})
+				}else{
+					uni.switchTab({
+						url: '/pages/index/index'
+					});
+				}
+			},
+			findByOpenId(){
+				var openId=this.carhelp.getOpenId()
+				if(openId==""){
+					console.log("------------------")
+					setTimeout(()=>{
+						this.findByOpenId()
+					},1000)
+					return
+				}
+				uni.request({
+					method:'get',
+					url: process.car.BASE_URL + "/mobile/regUser/findByOpenId",
+					data: {
+						openId:openId,			
+					},
+					header: {
+						'Content-Type': 'application/x-www-form-urlencoded',
+						'X-Requested-With': 'XMLHttpRequest',
+					}
+				}).then((response) => {
+					let [error, res] = response;
+				  
+					if (res.data.code == 200&&res.data.result) {			
+						var token = res ? res.data.data.token : '';					
+						this.carhelp.setPersonInfo(res.data.data.memberInfo );
+						this.carhelp.setToken(token);
+						
+						setTimeout(()=>{
+							uni.switchTab({
+								url: '/pages/index/index'
+							});
+						},1000)
+					
+					} else{
+						this.bottonShow=true
+					}
+				}).catch(error => {
+					
+					this.bottonShow=true
+				})
+			}
+		},
+		onReady() {
+			
+			this.findByOpenId()
+		}
+	}
+</script>
+
+<style>
+</style>

pages/login/register.vue

@@ -1,7 +1,8 @@
 <template>
 	<view>
-		<u-navbar :background="background" :border-bottom="false"></u-navbar>
 		<view class="jpLogin">
+			<u-navbar :background="background" :border-bottom="false"></u-navbar>
+			
 			<view class="jpLogin-title">
 				<h2>新用户注册</h2>
 				<p>请填写您的真实信息</p>
@@ -84,7 +85,7 @@
 					orgName: '',
 					telephone: '',
 				},
-				value: '0',
+				value: "0",
 				customStyle: {
 					background: '#FF5E5E'
 				},
@@ -110,7 +111,7 @@
 		},
 		methods: {
 			radioChange() {
-				this.value = true;
+				//this.value = true;
 			},
 			getSearch() {
 				uni.navigateTo({
@@ -192,7 +193,8 @@
 				}
 				if (!this.form.realName) {
 					uni.showToast({
-						title: "请输入姓名"
+						title: "请输入姓名",
+						icon: "none"
 					})
 					return
 				}