xy il y a 2 ans
Parent
commit
903c111fa1

+ 1 - 0
pages/AI_chat/AI_chat.vue

@@ -120,6 +120,7 @@
 			}	
 		},
 		mounted(){
+			    this.user_mobile = this.tools.get_user_info().mobile
 				marked.setOptions({
 				          renderer: new marked.Renderer(),
 				          gfm: true,

+ 0 - 1
pages/enter/enter-navigator.vue

@@ -62,7 +62,6 @@
 				if(this.currenIndex === index) {
 					return
 				}
-				this.currenIndex = index
 				this.$emit('clickToIndex', index)
 			},
 			clickToRegist() {

+ 4 - 0
pages/enter/enter.vue

@@ -30,6 +30,7 @@
 					}
 				}
 				this.nav_current_index = index
+				this.tools.current_navigator_page_index = index
 			}
 		},
 		mounted() {
@@ -40,6 +41,9 @@
 			
 			let self = this
 			uni.$on(config.notification.switch_page_index, function(index) {
+				if(self.nav_current_index == index) {
+					return
+				}
 				self.nav_current_index = index
 			})
 		},

+ 2 - 1
pages/login/login.vue

@@ -136,8 +136,9 @@
 				display: flex;
 				margin-top: 80px;
 				width: 260px;
-				height: 40px;
+				height: 60px;
 				border-radius: 10px;
+				font-size: 22px;
 				color: #ffffff;
 				background-color: #32B3AA;
 				justify-content: center;

BIN
unpackage/dist/.DS_Store


+ 5 - 1
unpackage/dist/build/h5/index.html

@@ -1,2 +1,6 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>chatgpd</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.15388f02.js></script><script src=/static/js/index.9309ca3c.js></script></body></html>
+<<<<<<< HEAD
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.15388f02.js></script><script src=/static/js/index.9309ca3c.js></script></body></html>
+=======
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.091ebf81.js></script><script src=/static/js/index.9c62c02c.js></script></body></html>
+>>>>>>> 250ea0f636824df4cca773ccbd5d90eb317d7314

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/h5/static/js/chunk-vendors.091ebf81.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/h5/static/js/chunk-vendors.15388f02.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/h5/static/js/index.9c62c02c.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-enter-enter.11a8ff1d.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-enter-enter~pages-index-index.cf36c9bc.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-index.5c53cb35.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-login-login.5f9ba7ff.js


+ 3 - 1
utils/tools.js

@@ -1,7 +1,7 @@
 import config from '@/utils/config.js'
 import interfaces from '@/utils/interfaces.js'
 const tools = {
-	
+	current_navigator_page_index: 0,
 	// 是否登录
 	is_login() {
 		let user_data = this.get_user_info()
@@ -43,6 +43,7 @@ const tools = {
 	
 	// 请求登录
 	request_login(that, mobile, password, callback) {
+		// 测试账号: 18612220000 18612221111 18612221221 18612221211
 		let self = that
 		self.request({
 			url: interfaces.login,
@@ -69,6 +70,7 @@ const tools = {
 		setTimeout(function() {
 			tools.set_user_info({})
 			uni.$emit(config.notification.login_state_changed)
+			uni.$emit(config.notification.switch_page_index, 0)
 			callback(true)
 		}, 1000);
 	}

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff