Merge branch 'master' of http://gitea.yxtsoft.com/yxt_group/mallplus

# Conflicts:
#	mallplusui-web-admin/src/views/home/index.vue

mallplusui-uniapp-app/pages/public/login.vue

@@ -179,7 +179,8 @@
 				}, 1000);
 				//获取验证码
 				let params = {
-					phone: this.phone
+					phone: this.phone,
+					type: 1
 				};
 				let data = await Api.apiCall('post', Api.index.sendCodes, params);
 				if (data) {