merge

manifest.json

@@ -2,7 +2,7 @@
     "name" : "共力生态",
     "appid" : "__UNI__DE7B0E6",
     "description" : "共力生态",
-    "versionName" : "1.0.26",
+    "versionName" : "1.0.27",
     "versionCode" : 100,
     "transformPx" : false,
     /* 5+App特有相关 */

pages/auth/auth.vue

@@ -14,7 +14,7 @@
 				<button :disabled="getSms" size="mini" @click="getPhoneCode()">{{sendCode}}</button>
 			</view>
 			<view class="auth-input">
-				<input v-model="parentId" type="number" placeholder="输入邀请码">
+				<input v-model="parentId" placeholder="输入邀请码">
 			</view>
 			<view class="auth-button">
 				<button @click="login('code')">登录</button>
@@ -50,6 +50,10 @@
 		methods: {
 			// 获取验证码
 			getPhoneCode() {
+				uni.showLoading({
+					title	: '加载中...',
+					mask	:true
+				})
 				let outTime;
 				let smsTime = 60;
 				getSms({