diff --git a/src/app.json b/src/app.json
index 3c4d93e..e06653b 100644
--- a/src/app.json
+++ b/src/app.json
@@ -3,6 +3,7 @@
   "pages": [
     "pages/home/index",
     "pages/login/index",
+    "pages/switchLogin/index",
     "pages/my/index",
     "pages/topic/index",
     "pages/collection/index",
diff --git a/src/app.ts b/src/app.ts
index 653c521..c84fdd6 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -30,12 +30,9 @@ App<IAppOption>({
 
     loginState: '',
     isLogin: 0,
-    doctorId: null,
+    isAnswer: '0',
 
     scene: null,
-
-    needDeal: '',
-    caseNav: '0',
   },
   onLaunch() {
     Page = page as WechatMiniprogram.Page.Constructor;
@@ -68,26 +65,19 @@ App<IAppOption>({
       this.globalData.scene = parseScene(options.query.scene);
     }
   },
-  waitLogin(waitLoginState = false) {
+  waitLogin(waitLoginState = false, requireLogin = false) {
     let time: number;
-    return new Promise((resolve, reject) => {
+    const { isLogin } = this.globalData;
+    return new Promise((resolve) => {
       time = setInterval(() => {
         if (this.globalData.loginState) {
           clearInterval(time);
           if (waitLoginState) {
             resolve(true);
-          } else if (this.globalData.isLogin === 0) {
-            wx.reLaunch({ url: '/module1/pages/login/index' });
-          } else if (this.globalData.doctorId === null) {
-            this.getApplyDoctor().then((applyDoctorInfo) => {
-              if (applyDoctorInfo.AuditStatus === 0) {
-                wx.reLaunch({ url: '/module1/pages/setInfoResult/index' });
-                reject(new Error('还在审核中'));
-              } else {
-                wx.reLaunch({ url: '/module1/pages/setInfo/index' });
-                reject(new Error('还不是医生'));
-              }
-            });
+          } else if (isLogin === 0) {
+            wx.reLaunch({ url: '/pages/login/index' });
+          } else if (requireLogin && isLogin === 999) {
+            wx.reLaunch({ url: '/pages/login/index' });
           } else {
             resolve(true);
           }
@@ -95,21 +85,17 @@ App<IAppOption>({
       }, 500);
     });
   },
-  getApplyDoctor() {
-    return wx.ajax({
-      method: 'GET',
-      url: '?r=takeda/reg/get-apply-doctor',
-    });
-  },
   getUserInfo(self: WechatMiniprogram.Page.Instance<any, any>, callback?: (res: any) => void) {
     wx.ajax({
       method: 'GET',
-      url: '?r=shizhong/account/info',
+      url: '?r=shizhong/account/get-info',
       data: {},
     }).then((res) => {
-      self.setData({
-        userInfo: res,
-      });
+      if (self) {
+        self.setData({
+          userInfo: res,
+        });
+      }
       callback?.(res);
     });
   },
diff --git a/src/components/global-toast/index.ts b/src/components/global-toast/index.ts
index de9b15a..ab42e7e 100644
--- a/src/components/global-toast/index.ts
+++ b/src/components/global-toast/index.ts
@@ -14,6 +14,10 @@ Component({
       type: Number,
       value: 0,
     },
+    params: {
+      type: Object,
+      value: {},
+    },
   },
 
   /**
@@ -26,7 +30,7 @@ Component({
    */
   methods: {
     handleClose() {
-      this.triggerEvent("close");
+      this.triggerEvent('close');
     },
   },
 });
diff --git a/src/components/global-toast/index.wxml b/src/components/global-toast/index.wxml
index 7e2ff6f..e091afc 100644
--- a/src/components/global-toast/index.wxml
+++ b/src/components/global-toast/index.wxml
@@ -1,7 +1,7 @@
 <van-popup show="{{ show }}" wx:if="{{type===1}}" custom-style="background: transparent;" bind:close="handleClose">
-  <view class="popup1" style="background: url('/images/popup1-bg.png') no-repeat top center/100%;">
+  <view class="popup1" style="background: url('/images/popup1-bg.png') no-repeat top center/100%">
     <view class="title">关注适中健康微信公众号</view>
-    <image class="code" src="/images/place.png" show-menu-by-longpress></image>
+    <image class="code" :src="{{params.mpPicture}}" show-menu-by-longpress></image>
     <view class="tip">长按识别二维码关注</view>
   </view>
 </van-popup>
diff --git a/src/pages/home/index.ts b/src/pages/home/index.ts
index 913ee0c..06ad7e5 100644
--- a/src/pages/home/index.ts
+++ b/src/pages/home/index.ts
@@ -1,11 +1,13 @@
-const _app = getApp<IAppOption>();
+const app = getApp<IAppOption>();
 
 Page({
   data: {},
-  onLoad() {},
+  onLoad() {
+    app.waitLogin().then(() => {});
+  },
   handleDetail() {
     wx.navigateTo({
-      url: "/pages/classify/index",
+      url: '/pages/classify/index',
     });
   },
 });
diff --git a/src/pages/login/index.ts b/src/pages/login/index.ts
index 49394a1..b15babf 100644
--- a/src/pages/login/index.ts
+++ b/src/pages/login/index.ts
@@ -87,13 +87,12 @@ Page({
         mobile,
         code,
       },
-    }).then((res) => {
-      this.submitCallback(res);
+    }).then(() => {
+      this.submitCallback();
     });
   },
   handleWxSubmit(e: any) {
     const { protool } = this.data;
-    const { iv, encryptedData } = e.detail;
     if (!protool) {
       wx.showToast({
         icon: 'none',
@@ -101,6 +100,7 @@ Page({
       });
       return;
     }
+    const { iv, encryptedData } = e.detail;
     if (iv && encryptedData) {
       wx.ajax({
         method: 'POST',
@@ -109,18 +109,22 @@ Page({
           iv: encodeURIComponent(iv),
           encryptedData: encodeURIComponent(encryptedData),
         },
-      }).then((res) => {
-        this.submitCallback(res);
+      }).then(() => {
+        this.submitCallback();
       });
     }
   },
-  submitCallback(res) {
+  submitCallback() {
     app.globalData.isLogin = 1;
-    app.globalData.doctorId = res.doctorId;
-    app.waitLogin().then(() => {
-      wx.reLaunch({
-        url: '/pages/home/index',
-      });
+    app.getUserInfo(null, (res) => {
+      app.globalData.isAnswer = res.isAnswer;
+      if (res.isAnswer === '0') {
+        this.setData({
+          show: true,
+        });
+      } else {
+        wx.reLaunch({ url: '/pages/home/index' });
+      }
     });
   },
   handleProtool() {
@@ -131,11 +135,21 @@ Page({
   handleNavProtool() {
     wx.navigateTo({ url: `/pages/protocol/index` });
   },
-
-  handleTopic() {},
+  handleTopic() {
+    wx.reLaunch({
+      url: '/pages/topic/index',
+    });
+  },
   handleCancelTopic() {
-    this.setData({
-      show: false,
+    app.globalData.isAnswer = '1';
+    wx.reLaunch({
+      url: '/pages/home/index',
+    });
+  },
+  handleVisitor() {
+    app.globalData.isLogin = 999;
+    wx.reLaunch({
+      url: '/pages/home/index',
     });
   },
 });
diff --git a/src/pages/login/index.wxml b/src/pages/login/index.wxml
index ec787b4..f9fe17d 100644
--- a/src/pages/login/index.wxml
+++ b/src/pages/login/index.wxml
@@ -29,11 +29,15 @@
       <text class="link" bind:tap="handleNavProtool">《用户隐私协议》</text>
     </view>
     <view class="submit" bind:tap="handleSubmit">登录</view>
-    <button class="tel-btn" open-type="getPhoneNumber" bindgetphonenumber="handleWxSubmit">
+    <button wx:if="{{protool}}" class="tel-btn" open-type="getPhoneNumber" bindgetphonenumber="handleWxSubmit">
       <image class="icon" src="/images/icon-phone.png"></image>
       手机号快捷登录
     </button>
-    <view class="visitor">
+    <button wx:else class="tel-btn" bind:tap="handleWxSubmit">
+      <image class="icon" src="/images/icon-phone.png"></image>
+      手机号快捷登录
+    </button>
+    <view class="visitor" bind:tap="handleVisitor">
       游客访问
       <van-icon name="arrow" />
     </view>
diff --git a/src/pages/my/index.ts b/src/pages/my/index.ts
index b0f762e..d21c468 100644
--- a/src/pages/my/index.ts
+++ b/src/pages/my/index.ts
@@ -1,14 +1,43 @@
-const _app = getApp<IAppOption>();
+const app = getApp<IAppOption>();
 
 Page({
   data: {
     toastShow: false,
     toastType: 1,
+
+    userInfo: {},
+  },
+  onLoad() {
+    app.waitLogin(true).then(() => {
+      app.getUserInfo(this);
+    });
   },
-  onLoad() {},
   handleCollection() {
     wx.navigateTo({
-      url: "/pages/collection/index",
+      url: '/pages/collection/index',
+    });
+  },
+  handleLogin() {
+    wx.navigateTo({
+      url: '/pages/login/index',
+    });
+  },
+  handleLoginOut() {
+    wx.showModal({
+      title: '是否确认退出登录?',
+      success: (res) => {
+        if (res.confirm) {
+          wx.ajax({
+            method: 'POST',
+            url: '?r=shizhong/account/logout',
+            data: {},
+          }).then(() => {
+            app.globalData.isLogin = 0;
+            app.globalData.isAnswer = '0';
+            app.waitLogin();
+          });
+        }
+      },
     });
   },
   handleOffice() {
diff --git a/src/pages/my/index.wxml b/src/pages/my/index.wxml
index 5757310..d6c2d1a 100644
--- a/src/pages/my/index.wxml
+++ b/src/pages/my/index.wxml
@@ -1,20 +1,21 @@
 <view class="page" style="padding-top:{{ menuButtonInfo.bottom }}px;">
-  <view class="no-login">
-    <image class="avatar" src="/images/user.png"></image>
-    <view class="name">登录</view>
-  </view>
-  <view class="login">
-    <image class="avatar" mode="aspectFill" src="/images/place.png"></image>
+  <view class="login" wx:if="{{userInfo.isLogin===1}}">
+    <image wx:if="{{userInfo.avatar}}" class="avatar" mode="aspectFill" src="{{userInfo.avatar}}"></image>
+    <image wx:else class="avatar" mode="aspectFill" src="/images/user.png"></image>
     <view class="user">
-      <view class="name">徐萌</view>
-      <view class="tel">186****7587</view>
-      <view class="status">非会员</view>
+      <view class="name">{{userInfo.username}}</view>
+      <view class="tel">{{userInfo.telephone}}</view>
+      <view class="status">{{userInfo.isMember===1?'会员':'非会员'}}</view>
     </view>
-    <view class="switch">
-      切换账号
+    <view class="switch" bind:tap="handleLoginOut">
+      退出登录
       <van-icon name="arrow" />
     </view>
   </view>
+  <view class="no-login" wx:else>
+    <image class="avatar" src="/images/user.png"></image>
+    <view class="name" bind:tap="handleLogin">登录</view>
+  </view>
   <view class="nav-list">
     <view class="nav-item" bind:tap="handleCollection">
       <image class="icon" src="/images/my-list-icon1.png"></image>
@@ -27,4 +28,9 @@
   </view>
 </view>
 
-<global-toast show="{{toastShow}}" type="{{toastType}}" bind:close="handleToastClose"></global-toast>
+<global-toast
+  show="{{toastShow}}"
+  type="{{toastType}}"
+  params="{{userInfo}}"
+  bind:close="handleToastClose"
+></global-toast>
diff --git a/src/pages/protocol/index.wxml b/src/pages/protocol/index.wxml
index 6908680..e875ce6 100644
--- a/src/pages/protocol/index.wxml
+++ b/src/pages/protocol/index.wxml
@@ -1 +1,3 @@
-<view class="page"></view>
+<view class="page">
+  产品还没给
+</view>
diff --git a/src/pages/switchLogin/index.json b/src/pages/switchLogin/index.json
new file mode 100644
index 0000000..2b97f2d
--- /dev/null
+++ b/src/pages/switchLogin/index.json
@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "van-icon": "@vant/weapp/icon/index",
+    "van-nav-bar": "@vant/weapp/nav-bar/index"
+  }
+}
diff --git a/src/pages/switchLogin/index.scss b/src/pages/switchLogin/index.scss
new file mode 100644
index 0000000..e0813cc
--- /dev/null
+++ b/src/pages/switchLogin/index.scss
@@ -0,0 +1,161 @@
+.page {
+  .container {
+    margin-top: 336rpx;
+    padding: 64rpx 32rpx 0;
+    background: linear-gradient(to bottom, rgba(255, 255, 255, 0.76) 0%, #ffffff 100%) no-repeat top center/100% 186rpx;
+    border-radius: 32rpx;
+
+    .tel {
+      .input {
+        padding: 24rpx 48rpx;
+        background-color: #f4f7fa;
+        border-radius: 96rpx;
+        font-size: 32rpx;
+      }
+
+      .place-input {
+        color: #babdc1;
+      }
+    }
+
+    .code-row {
+      margin-top: 32rpx;
+      display: flex;
+      align-items: center;
+      gap: 30rpx;
+
+      .code {
+        flex: 1;
+        padding: 24rpx 48rpx;
+        background-color: #f4f7fa;
+        border-radius: 96rpx;
+        font-size: 32rpx;
+      }
+
+      .place-code {
+        color: #babdc1;
+      }
+
+      .btn {
+        flex-shrink: 0;
+        padding: 24rpx;
+        width: 7em;
+        text-align: center;
+        color: #fff;
+        font-size: 32rpx;
+        background-color: #3795f7;
+        border-radius: 96rpx;
+      }
+    }
+
+    .protool {
+      margin-top: 56rpx;
+      display: flex;
+      align-items: center;
+      font-size: 28rpx;
+      color: #999;
+
+      .radio {
+        transform: scale(0.7);
+      }
+
+      .link {
+        color: #3795f7;
+      }
+    }
+
+    .submit {
+      margin-top: 88rpx;
+      padding: 22rpx;
+      text-align: center;
+      font-size: 36rpx;
+      color: #fff;
+      line-height: 44rpx;
+      background: linear-gradient(90deg, #134df6 36%, #3795f7 100%);
+      border-radius: 96rpx 96rpx 96rpx 96rpx;
+    }
+
+    .tel-btn {
+      margin: 78rpx auto 0;
+      padding: 12rpx 44rpx;
+      border-radius: 52rpx;
+      width: 352rpx;
+      font-size: 32rpx;
+      line-height: 40rpx;
+      color: rgba(153, 153, 153, 1);
+      display: flex;
+      gap: 12rpx;
+      align-items: center;
+      justify-content: center;
+      outline: none;
+
+      .icon {
+        width: 28rpx;
+        height: 40rpx;
+      }
+
+      &::after {
+        border: none;
+        outline: none;
+      }
+    }
+
+    .visitor {
+      margin-top: 196rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 32rpx;
+      line-height: 1;
+      color: #3795f7;
+    }
+  }
+}
+
+.popup {
+  padding: 33rpx 0 0;
+
+  .popup-container {
+    padding: 280rpx 48rpx 0;
+    width: 622rpx;
+    height: 490rpx;
+    box-sizing: border-box;
+    background: linear-gradient(180deg, #e7f8ff 0%, #ffffff 100%);
+    border-radius: 32rpx;
+    position: relative;
+
+    .badge {
+      position: absolute;
+      left: 0;
+      top: -33px;
+      width: 246rpx;
+      height: 286rpx;
+    }
+
+    .title {
+      position: absolute;
+      top: 50rpx;
+      right: 28rpx;
+      width: 338rpx;
+      height: 164rpx;
+    }
+
+    .conform {
+      height: 88rpx;
+      text-align: center;
+      background: #3795f7;
+      line-height: 88rpx;
+      font-size: 36rpx;
+      color: #FFFFFF;
+      border-radius: 96rpx 96rpx 96rpx 96rpx;
+    }
+
+    .cancel{
+      margin-top: 10rpx;
+      font-size: 32rpx;
+      color: #999999;
+      text-align: center;
+      line-height: 88rpx;
+    }
+  }
+}
diff --git a/src/pages/switchLogin/index.ts b/src/pages/switchLogin/index.ts
new file mode 100644
index 0000000..6fce3a5
--- /dev/null
+++ b/src/pages/switchLogin/index.ts
@@ -0,0 +1,95 @@
+const app = getApp<IAppOption>();
+let timer: number | null = 0;
+
+Page({
+  data: {
+    menuButtonInfo: {},
+    mobile: '',
+    code: '',
+    codeText: '发送验证码',
+  },
+  onLoad() {},
+  getCode() {
+    if (timer) return;
+    const mobile = this.data.mobile;
+    if (!mobile) {
+      wx.showToast({
+        title: '手机号不能为空',
+        icon: 'none',
+      });
+      return;
+    }
+    // 验证手机号
+    if (!/^1[3-9,]\d{9}$/.test(mobile)) {
+      wx.showToast({
+        title: '手机号格式不正确',
+        icon: 'none',
+      });
+      return;
+    }
+    wx.ajax({
+      method: 'POST',
+      url: '?r=shizhong/login/send-verify-code',
+      data: {
+        mobile,
+      },
+    }).then(() => {
+      wx.showToast({
+        icon: 'none',
+        title: '验证码已发送~',
+      });
+      let time = 60;
+      timer = setInterval(() => {
+        time--;
+        this.setData({
+          codeText: `${time}s后重新发送`,
+        });
+        if (time <= 0) {
+          clearInterval(timer as number);
+          timer = null;
+          this.setData({
+            codeText: '发送验证码',
+          });
+        }
+      }, 1000);
+    });
+  },
+  handleSubmit() {
+    const { mobile, code } = this.data;
+    if (!mobile) {
+      wx.showToast({
+        title: '请输入手机号',
+        icon: 'none',
+      });
+      return;
+    }
+    if (!code) {
+      wx.showToast({
+        title: '请输入验证码',
+        icon: 'none',
+      });
+      return;
+    }
+    wx.ajax({
+      method: 'POST',
+      url: '?r=shizhong/login/reg-login',
+      data: {
+        mobile,
+        code,
+      },
+    }).then(() => {
+      this.submitCallback();
+    });
+  },
+  submitCallback() {
+    app.globalData.isLogin = 1;
+    wx.reLaunch({
+      url: '/pages/home/index',
+    });
+  },
+  handleBack(){
+    wx.navigateBack()
+  }
+});
+
+export {};
diff --git a/src/pages/switchLogin/index.wxml b/src/pages/switchLogin/index.wxml
new file mode 100644
index 0000000..c62ceda
--- /dev/null
+++ b/src/pages/switchLogin/index.wxml
@@ -0,0 +1,35 @@
+<van-nav-bar
+  right-text="按钮"
+  left-arrow
+  fixed
+  custom-style="background:transparent;"
+  bind:click-left="handleBack"
+/>
+<view
+  class="page"
+  style="background: url('/images/login-bg.png') no-repeat top center/100% 624rpx;padding-top:{{menuButtonInfo.bottom}}px;"
+>
+  <view class="container">
+    <view class="tel">
+      <input
+        type="number"
+        model:value="{{mobile}}"
+        placeholder-class="place-input"
+        class="input"
+        placeholder="请输入手机号"
+      />
+    </view>
+    <view class="code-row">
+      <input
+        type="text"
+        placeholder="请输入验证码"
+        class="code"
+        placeholder-class="place-code"
+        model:value="{{code}}"
+        type="number"
+      />
+      <view class="btn" bind:tap="getCode">{{codeText}}</view>
+    </view>
+    <view class="submit" bind:tap="handleSubmit">切换账号</view>
+  </view>
+</view>
diff --git a/src/pages/topic/index.scss b/src/pages/topic/index.scss
index 656fe4d..f409d41 100644
--- a/src/pages/topic/index.scss
+++ b/src/pages/topic/index.scss
@@ -41,18 +41,7 @@ page {
       line-height: 64rpx;
     }
 
-    .conform {
-      margin-top: 64rpx;
-      height: 88rpx;
-      font-size: 36rpx;
-      color: #ffffff;
-      line-height: 88rpx;
-      text-align: center;
-      background: #3795f7;
-      border-radius: 96rpx 96rpx 96rpx 96rpx;
-    }
-
-    .cancel {
+    .btn {
       margin-top: 32rpx;
       font-size: 36rpx;
       color: #65686c;
@@ -61,27 +50,43 @@ page {
       height: 88rpx;
       background: #f4f7fa;
       border-radius: 84rpx 84rpx 84rpx 84rpx;
+
+      &.active {
+        color: #ffffff;
+        background: #3795f7;
+      }
     }
-    .prev {
+
+    .footer {
       position: absolute;
       bottom: 206rpx;
       left: 0;
       width: 100%;
-      padding: 0 106rpx;
+      padding: 0 88rpx;
       box-sizing: border-box;
-      font-size: 36rpx;
-      color: #3795f7;
-      font-weight: bold;
       display: flex;
       align-items: center;
-      justify-content: space-between;
-      .icon {
-        margin-right: 16rpx;
-        width: 44rpx;
-        height: 44rpx;
+      justify-content: center;
+
+      .prev {
+        flex: 1;
+        font-size: 36rpx;
+        color: #3795f7;
+        font-weight: bold;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        box-sizing: border-box;
+
+        .icon {
+          margin-right: 16rpx;
+          width: 44rpx;
+          height: 44rpx;
+        }
       }
+
       .submit {
-        width: 290rpx;
+        flex: 1;
         height: 88rpx;
         font-size: 36rpx;
         color: #ffffff;
diff --git a/src/pages/topic/index.ts b/src/pages/topic/index.ts
index 7de5185..cf7e917 100644
--- a/src/pages/topic/index.ts
+++ b/src/pages/topic/index.ts
@@ -1,44 +1,69 @@
-const _app = getApp<IAppOption>();
+const app = getApp<IAppOption>();
 
 Page({
   data: {
     nav: 0,
-    question: [
-      {
-        content: "这是一个问题的文案，这是一个问题的文案，这是一个问题的文案",
-      },
-
-      {
-        content: "",
-      },
-      {
-        content: "",
-      },
-      {
-        content: "",
-      },
-      {
-        content: "",
-      },
-      {
-        content: "",
-      },
-      {
-        content: "",
-      },
-      {
-        content: "",
-      },
-      {
-        content: "",
+    percentage: 0,
+    question: [] as { questionId: string; title: string; answer?: '1' | '2' }[],
+  },
+  onLoad() {
+    app.waitLogin(true).then(() => {
+      this.getList();
+    });
+  },
+  getList() {
+    wx.ajax({
+      method: 'GET',
+      url: '?r=shizhong/account/get-question',
+      data: {},
+    }).then((res) => {
+      this.setData({
+        question: res,
+      });
+    });
+  },
+  handleBtn(e) {
+    const { index, id } = e.currentTarget.dataset;
+    const { question, nav } = this.data;
+    question[index].answer = id;
+    console.log(nav);
+    console.log(question.length);
+    this.setData({
+      question,
+      nav: nav === question.length - 1 ? nav : nav + 1,
+      percentage: ((nav + 1) / question.length) * 100,
+    });
+  },
+  handlePrev() {
+    this.setData({
+      nav: this.data.nav - 1,
+    });
+  },
+  handleSubmit() {
+    const answer = this.data.question.map((item) => {
+      return {
+        qId: item.questionId,
+        answer: item.answer,
+      };
+    });
+    wx.ajax({
+      method: 'POST',
+      url: '?r=shizhong/account/answer-question',
+      data: {
+        answer: JSON.stringify(answer),
       },
-    ],
+    }).then(() => {
+      app.waitLogin().then(() => {
+        wx.reLaunch({
+          url: '/pages/home/index',
+        });
+      });
+    });
   },
-  onLoad() {},
   bindtransition() {
     this.setData({
       nav: this.data.nav,
-    })
+    });
   },
 });
 
diff --git a/src/pages/topic/index.wxml b/src/pages/topic/index.wxml
index 702e67c..6fce632 100644
--- a/src/pages/topic/index.wxml
+++ b/src/pages/topic/index.wxml
@@ -1,40 +1,65 @@
-<view class="page" style="background: url('/images/topic-bg.png') no-repeat {{menuButtonInfo.bottom+62}}rpx center/100% 1284rpx;">
-
+<view
+  class="page"
+  style="background: url('/images/topic-bg.png') no-repeat {{menuButtonInfo.bottom+62}}rpx center/100% 1284rpx;"
+>
   <swiper
     class="swiper"
     current="{{nav}}"
     bindtransition="bindtransition"
     style="margin-top:{{menuButtonInfo.bottom+73}}px;"
   >
-    <swiper-item
-      wx:for="{{question}}"
-      wx:key="index"
-      wx:for-item="questionItem"
-    >
-      <view class="topic" style="background: url('/images/topic-card-bg.png') no-repeat top center/100% 1232rpx;">
-        <view class="order">{{nav + 1}}/
-          <text class="all">9</text>
+    <swiper-item wx:for="{{question}}" wx:key="index" wx:for-item="questionItem">
+      <view class="topic" style="background: url('/images/topic-card-bg.png') no-repeat top center/100% 1232rpx">
+        <view class="order">
+          {{index + 1}}/
+          <text class="all">{{question.length}}</text>
         </view>
         <view class="progress">
           <van-progress
-            percentage="50"
+            percentage="{{percentage}}"
             show-pivot="{{false}}"
             stroke-width="{{8}}"
             track-color="#F4F7FA"
             color="#3795F7"
           />
         </view>
-        <view class="content">
-          {{questionItem.content}}
+        <view class="content">{{questionItem.title}}</view>
+        <view
+          class="btn {{questionItem.answer==='1' && 'active'}}"
+          bind:tap="handleBtn"
+          data-id="1"
+          data-index="{{index }}"
+        >
+          非常了解
         </view>
-        <view class="conform">是</view>
-        <view class="cancel">否</view>
-        <view class="prev">
-          <view class="prev-item">
+        <view
+          class="btn {{questionItem.answer==='2' && 'active'}}"
+          bind:tap="handleBtn"
+          data-id="2"
+          data-index="{{index}}"
+        >
+          一般了解
+        </view>
+        <view
+          class="btn {{questionItem.answer==='3' && 'active'}}"
+          bind:tap="handleBtn"
+          data-id="3"
+          data-index="{{index}}"
+        >
+          完全不了解
+        </view>
+        <view class="footer">
+          <view class="prev" bind:tap="handlePrev" wx:if="{{index>0}}">
             <image class="icon" src="/images/icon-prev.png"></image>
             上一题
           </view>
-          <view class="submit" wx:if="{{true}}">提交</view>
+          <view
+            class="submit"
+            wx:if="{{index === question.length-1 && question[question.length-1].answer}}"
+            bind:tap="handleSubmit"
+          >
+            提交
+          </view>
         </view>
       </view>
     </swiper-item>
diff --git a/typings/index.d.ts b/typings/index.d.ts
index cc61113..0b96031 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -5,18 +5,14 @@ interface IAppOption {
     upFileUrl: string;
     imageUrl: string;
     loginState: string;
-    isLogin: number;
-    doctorId: null | number;
+    isLogin: 0 | 1 | 999;
+    isAnswer: '0' | '1';
     scene: null | { [key: string]: any };
-
-    needDeal: "" | "1";
-    caseNav: "0" | "1" | "2" | "3";
   };
   userInfoReadyCallback?: WechatMiniprogram.GetUserInfoSuccessCallback;
   waitLogin: (waitLoginState?: boolean) => Promise<any>;
   getMenuInfo: (arg0: WechatMiniprogram.Page.Instance<any, any>) => void;
   getUserInfo: (arg0: WechatMiniprogram.Page.Instance<any, any>, arg1?: (arg0: any) => void) => void;
-  getApplyDoctor: () => Promise<any>;
 }
 
 interface IAgaxParams extends WechatMiniprogram.RequestOption {