style update

ionic.config.json

@@ -7,7 +7,7 @@
   "proxies": [
     {
       "path": "/wisdomgroup",
-      "proxyUrl": "http://47.103.35.216:8080/wisdomgroup"
+      "proxyUrl": "http://192.168.1.49:8080/wisdomgroup"
     }
   ]
 }

src/pages/forget-pwd/forget-pwd.html

@@ -10,15 +10,15 @@
   <ng-container *ngIf="!isSend">
     <div class="pwd-item">
       <img src="./assets/imgs/icon-phone-gray.png" class="pwd-img">
-      <input [(ngModel)]="user.phone" class="pwd-content" type="text" required placeholder="请输入手机号码" />
-      <span class="sendCode" (click)="sendCode()">发送验证码</span>
+      <input [(ngModel)]="user.phone" class="pwd-content" (ngModelChange)="nextCheck()" type="text" required placeholder="请输入手机号码" />
+      <button [disabled]="disabledClick" class="sendCode" (click)="sendCode()">{{verifyText}}</button>
     </div>
     <div class="pwd-item">
       <img src="./assets/imgs/icon-password-confirm.png" class="pwd-img">
-      <input [(ngModel)]="user.code" class="pwd-content" type="text" required placeholder="请输入验证码" />
+      <input [(ngModel)]="user.code" class="pwd-content" (ngModelChange)="nextCheck()" type="text" required placeholder="请输入验证码" />
     </div>
     <div class="modify-btn">
-      <button class="submit-btn submit" (click)="next()">下一步</button>
+      <button [class.next]="nextClick" [disabled]="!nextClick" class="submit-btn submit" (click)="next()">下一步</button>
     </div>
   </ng-container>
   <ng-container *ngIf="isSend">

src/pages/forget-pwd/forget-pwd.scss

@@ -33,7 +33,8 @@ page-forget-pwd {
     color: #e42179;
     border: 1px solid #e42179;
     border-radius: 3px;
-    padding: 2px 5px;
+    padding: 7px;
+    background-color: #fff;
   }
 
   .pwd-img {
@@ -42,7 +43,7 @@ page-forget-pwd {
   }
 
   .pwd-content {
-    width: 100%;
+    width: 60%;
     border: 0;
     font-size: 16px;
   }
@@ -64,8 +65,12 @@ page-forget-pwd {
   }
 
   .submit {
+    border: 1px solid #999999;
+    background-color: #999999;
+    margin-top: 50px;
+  }
+  button.next{
     border: 1px solid #e42417;
     background-color: #e42417;
-    margin-top: 20px;
   }
 }

src/pages/forget-pwd/forget-pwd.ts

@@ -26,6 +26,10 @@ export class ForgetPwdPage {
     };
 
     isSend = false;
+    disabledClick = false;
+    verifyText = '获取验证码';
+
+    nextClick = false;
 
     constructor(public navCtrl: NavController, public navParams: NavParams, private commonSer: CommonService,
                 private appService: AppService, private tabSer: TabsService) {
@@ -36,16 +40,46 @@ export class ForgetPwdPage {
 
     //发送验证码
     sendCode() {
+        if (this.user.phone.length !== 11 || !Number(this.user.phone)) {
+            this.commonSer.toast('请输入正确的手机号码');
+            return false;
+        }
         const data = {
             phone: this.user.phone
-        }
+        };
         this.tabSer.sendCode(data).subscribe(
             (res) => {
-                console.log(res);
+                if (res.errcode == 1000) {
+                    this.countTime();
+                }
             }
         )
     }
 
+    nextCheck(){
+        if(this.user.phone.length > 0 && this.user.code.length > 0){
+            this.nextClick = true;
+        }else{
+            this.nextClick = false;
+        }
+    }
+
+    //倒计时
+    countTime() {
+        let totalTime = 60;
+        this.disabledClick = true;
+        this.verifyText = totalTime + 's后重新发送';
+        let clock = window.setInterval(() => {
+            totalTime--;
+            this.verifyText = totalTime + 's后重新发送';
+            if (totalTime < 0) {
+                window.clearInterval(clock);
+                this.verifyText = "重新发送验证码";
+                this.disabledClick = false;
+            }
+        }, 1000)
+    }
+
     //下一步
     next() {
         this.tabSer.checkCode(this.user).subscribe(

src/pages/home/activity/activityApply/activityApply.html

@@ -26,7 +26,7 @@
 	</ion-item>
 	<ion-item class="margin-top-10">
 		<ion-label>报名备注</ion-label>
-		<ion-textarea [(ngModel)]="order.Orderbz" class="content-textarea"></ion-textarea>
+		<ion-textarea [(ngModel)]="order.Orderbz"></ion-textarea>
 	</ion-item>
 
 	<button class="submit-btn submit" (click)="condirmAlert()">提交订单</button>

src/pages/tabs/tabs.service.ts

@@ -191,7 +191,7 @@ export class TabsService {
 
     //校验验证码
     checkCode(data): Observable<any> {
-        return this.http.post(AppGlobal.domain + '/wisdomgroup/manager/checkCode?',data );
+        return this.http.post(AppGlobal.domain + '/wisdomgroup/manager/checkCode',data);
     }
 
     //修改密码