合并提交

manifest.json

@@ -51,7 +51,7 @@
 	    "devServer" : {
 	        // "port" : 8083,
 	        "disableHostCheck" : true,
-	        "https" : true,
+	        "https" : false,
 	        "proxy" : {
 	            "/api" : {
 	                "ws" : false,

pages/login/register.vue

@@ -88,6 +88,7 @@
 
 <script>
 	import UButton from '../../uview-ui/components/u-button/u-button.vue'
+	import api from '@/utils/api'
 	export default {
 		name: "register",
 		data() {
@@ -109,37 +110,37 @@
 					payPassword: {
 						type: "string",
 						required: true,
-						message: this.$t("login.withdrawalPasswordMessage"),
+						message: this.$t("login").withdrawalPasswordMessage,
 						trigger: ["blur", "change"],
 					},
 					email: {
 						type: "string",
 						required: true,
-						message: this.$t("login.emailInputMessage"),
+						message: this.$t("login").emailInputMessage,
 						trigger: ["blur", "change"],
 					},
 					code: {
 						type: "string",
 						required: true,
-						message: this.$t("login.verificationCodeMessage"),
+						message: this.$t("login").verificationCodeMessage,
 						trigger: ["blur", "change"]
 					},
 					password: {
 						type: "string",
 						required: true,
-						message: this.$t("login.passwordInputMessage"),
+						message: this.$t("login").passwordInputMessage,
 						trigger: ["blur", "change"]
 					},
 					InvitationCode: {
 						type: "string",
 						required: true,
-						message: this.$t("login.InvitationCodeMessage"),
+						message: this.$t("login").InvitationCodeMessage,
 						trigger: ["blur", "change"]
 					},
 					confirmPassword: {
 						type: "string",
 						required: true,
-						message: this.$t("login.confirmPasswordMessage"),
+						message: this.$t("login").confirmPasswordMessage,
 						trigger: ["blur", "change"]
 					},
 
@@ -171,11 +172,11 @@
 			// 验证码获取
 			getCode() {
 				if (!this.userInfo.email) {
-					uni.$u.toast(this.$t("login.Emailempty"))
+					uni.$u.toast(this.$t("login").Emailempty)
 					return
 				}
 				if (!this.isCanGetCode) {
-					uni.$u.toast(this.$t("login.Emailincorrect"))
+					uni.$u.toast(this.$t("login").Emailincorrect)
 					return
 				}
 				if (this.$refs.uCode.canGetCode) {
@@ -185,13 +186,14 @@
 					}
 					// 模拟向后端请求验证码
 					uni.showLoading({
-						title: this.$t("login.GettingVerificationCode")
+						title: this.$t("login").GettingVerificationCode
 					})
-					this.$api.sendEmailCode(data).then(res => {
+					console.log(123)
-						if (res.code === 200) {
+					api.sendEmailCode(data).then(res => {
-							uni.hideLoading();
+						if (res.errCode === 'SUCCESS') {
+							uni.hideLoading(this.$t("login").CodeHasSent);
 							// 这里此提示会被this.start()方法中的提示覆盖
-							uni.$u.toast(this.$t("login.CodeHasSent"));
+							uni.$u.toast(this.$t("login").CodeHasSent);
 							// 通知验证码组件内部开始倒计时
 							this.$refs.uCode.start();
 						} else {
@@ -199,7 +201,7 @@
 						}
 					})
 				} else {
-					uni.$u.toast(this.$t("login.SendAfter"));
+					uni.$u.toast(this.$t("login").SendAfter);
 				}
 			},
 			// 注册
@@ -209,7 +211,7 @@
 						if (res.errCode === 'SUCCESS') {
 							setTimeout(() => {
 								uni.showToast({
-									title: this.$t("login.resSuccess")
+									title: this.$t("login").resSuccess
 								})
 							}, 600)
 							uni.switchTab({

utils/axios.js

@@ -66,11 +66,7 @@ service.interceptors.request.use(
 		}
 
 		if (config.method == 'post') {
-			console.log(config.data)
+			dataStr = decodeURIComponent(qs.stringify(config.data)).split('&');
-			dataStr = qs.stringify(config.data).split('&');
-
-
-
 		}
 		//console.log(config.url,111111,config.data,dataStr)
 		config.data = {};
@@ -105,7 +101,7 @@ service.interceptors.request.use(
 		});
 
 
-		key = "key=" + constant.KEY;
+		var key = "key=" + constant.KEY;
 		
 		
 		console.log(sign + key)
@@ -135,6 +131,7 @@ service.interceptors.request.use(
 service.interceptors.response.use(res => {
 	console.log('过期了吗', res)
 	uni.hideLoading()
+	res=res.data;
 	// console.log(res)
 	// console.log(res.data)
 	// console.log(res.data.data[0].nameAlias)