Merge branch 'master' of http://101.37.147.115:3000/mz666/bocai_supplyChain

pages/login/index.js

@@ -260,7 +260,7 @@ Page({
                   });
                 } else if (comeFrom == "set") {
                   wx.reLaunch({
-                    url: "../workBench/index",
+                    url: "../firstBill/index",
                   });
                 } else if (comeFrom == "collect") {
                   wx.reLaunch({
@@ -974,7 +974,7 @@ Page({
           data: "login",
         });
         wx.reLaunch({
-          url: "/pages/workBench/index",
+          url: "/pages/firstBill/index",
         });
       }
     } catch (e) {

pages/login/index.wxss

@@ -154,7 +154,7 @@ label.radio:last-child {
 }
 .loginForm {
 	padding: 0 37px;
-	margin-top: -12%;
+	margin-top: -20%;
 }
 
 .phoneInput {