diff --git a/api/login/index.js b/api/login/index.js
index c0a1988..a019b09 100644
--- a/api/login/index.js
+++ b/api/login/index.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 // api地址
 const api = {
-  login: 'passport/login',
+  login: 'user/v1/userLogin',
   loginMpWx: 'passport/loginMpWx',
   loginMpWxMobile: 'passport/loginMpWxMobile',
 }
diff --git a/config.js b/config.js
index 760b327..3cce17c 100644
--- a/config.js
+++ b/config.js
@@ -5,7 +5,8 @@ module.exports = {
 
   // 必填: 后端api地址, 斜杠/结尾, 参照下面格式
   // 例如: https://www.你的域名.com/index.php?s=/api/
-  apiUrl: "http://192.168.66.16:8089/index.php?s=/api/",
+  //apiUrl: "http://192.168.66.16:8089/index.php?s=/api/",
+  apiUrl: "http://58.30.231.137:8022/AgencyAddress/",
 
   /**
    * 是否启用商城设置缓存
diff --git a/pages.json b/pages.json
index 1914b62..6d92734 100644
--- a/pages.json
+++ b/pages.json
@@ -15,7 +15,7 @@
       "selectedIconPath": "static/tabbar/cate-active.png",
       "text": "分类"
     }, {
-      "pagePath": "pages/cart/index",
+      "pagePath": "pages/order/index",
       "iconPath": "static/tabbar/cart.png",
       "selectedIconPath": "static/tabbar/cart-active.png",
       "text": "订单"
@@ -69,7 +69,7 @@
     {
       "path": "pages/login/index",
       "style": {
-        "navigationBarTitleText": "会员登录"
+        "navigationBarTitleText": "登录"
       }
     },
     {
diff --git a/pages/login/components/main.vue b/pages/login/components/main.vue
index 2d0a5d1..50d8f7a 100644
--- a/pages/login/components/main.vue
+++ b/pages/login/components/main.vue
@@ -14,27 +14,17 @@
     <view class="login-form">
       <!-- 手机号 -->
       <view class="form-item">
-        <input class="form-item--input" type="number" v-model="mobile" maxlength="11" placeholder="请输入手机号码" />
-      </view>
-      <!-- 图形验证码 -->
-      <view class="form-item">
-        <input class="form-item--input" type="text" v-model="captchaCode" maxlength="5" placeholder="请输入图形验证码" />
-        <view class="form-item--parts">
-          <view class="captcha" @click="getCaptcha()">
-            <image class="image" :src="captcha.base64"></image>
-          </view>
-        </view>
-      </view>
-      <!-- 短信验证码 -->
-      <view class="form-item">
-        <input class="form-item--input" type="number" v-model="smsCode" maxlength="6" placeholder="请输入短信验证码" />
-        <view class="form-item--parts">
-          <view class="captcha-sms" @click="handelSmsCaptcha()">
-            <text v-if="!smsState" class="activate">获取验证码</text>
-            <text v-else class="un-activate">重新发送({{ times }})秒</text>
-          </view>
-        </view>
+        <input class="form-item--input" type="number" v-model="mobile" maxlength="11" autocomplete="off" placeholder="请输入手机号码" />
       </view>
+	  <!-- 密码 -->
+	  <view class="form-item">
+		  <input class="form-item--input" type="password" v-model="vpass" autocomplete="off" placeholder="请输入密码" />
+	  </view>
+	  <!-- 选择机构、个人 -->
+	  <view class="form-item">
+		  <input class="form-item--input" type="password" v-model="vpass"  placeholder="请输入密码" />
+	  </view>
+
       <!-- 登录按钮 -->
       <view class="login-button" @click="handleLogin">
         <text>登录</text>
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 08b5a9b..a7747f2 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -1,7 +1,7 @@
 <template>
-  <view v-if="isLoad" class="login">
-    <MpWeixin v-if="isMpWeixinAuth" @success="onGetUserInfoSuccess" />
-    <Main v-else :isParty="isParty" :partyData="partyData" />
+  <view class="login">
+	  <!-- 常规方式登录 -->
+    <Main :isParty="isParty" :partyData="partyData" />
   </view>
 </template>