Merge branch 'dev-followUp-20190312' of...

Merge branch 'dev-followUp-20190312' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312

src/App.vue

 <template>
-	<div>
+	<div v-if="$route.name!='loginPage'">
 		<v-header :userName="userName" :portrait="portrait" :idType="idType"></v-header>
-    	<v-slidebar :authList="authList" :tokenValue="token"></v-slidebar>
+    <v-slidebar :authList="authList" :tokenValue="token"></v-slidebar>
 		<el-container>
 			<div class="content" id="body-content">
 				<transition name="router-fade" mode="out-in">
@@ -15,7 +15,12 @@
 				<v-footer></v-footer>
 			</div>
 		</el-container>
-    </div>
+  </div>
+  <div class="login-div" v-else>
+    <transition name="router-fade" mode="out-in">
+      <router-view v-if="!$route.meta.keepAlive"></router-view>
+    </transition>
+  </div>
 </template>
 
 <script>
@@ -139,4 +144,7 @@ export default {
 			overflow-y: scroll;
 		}
 	}
+  .login-div {
+    height: 100%;
+  }
 </style>

src/assets/image/auth-code.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="20px" viewBox="0 0 18 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>分组 5</title>
+    <desc>Created with Sketch.</desc>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="切图" transform="translate(-388.000000, -267.000000)">
+            <g id="分组-5" transform="translate(387.000000, 267.000000)">
+                <g id="验证码" transform="translate(1.000000, 0.000000)" fill="#BFBFBF" fill-rule="nonzero">
+                    <path d="M17.2947053,3.1215984 C17.2947053,2.99072927 17.1772627,2.87998002 17.0363437,2.87666334 L16.5463936,2.86997003 C16.5296304,2.86997003 14.5699101,2.83308691 12.533027,2.03440559 C10.4692907,1.22569431 9.12367632,0.286093906 9.11024975,0.276043956 L8.81158841,0.067992008 C8.76799201,0.0344655345 8.71092907,0.0176623377 8.65384615,0.0176623377 C8.59676324,0.0176623377 8.54311688,0.0344255744 8.4961039,0.067992008 L8.2007992,0.272687313 C8.14711289,0.30957043 6.83506494,1.22569431 4.77802198,2.03104895 C2.74447552,2.82971029 0.784775225,2.86661339 0.767992008,2.86661339 L0.274705295,2.87330669 C0.13040959,2.87668332 0.0163436563,2.98741259 0.0163436563,3.11824176 L0.0163436563,11.295984 C0.0163436563,13.1885514 1.18073926,15.3496304 3.21090909,17.2221179 C5.03306693,18.9032767 7.17056943,19.9905495 8.65718282,19.9905495 C10.1470929,19.9905495 12.288012,18.9033367 14.1101499,17.2221179 C16.136963,15.3496703 17.3013986,13.1886114 17.3013986,11.2926474 L17.2947053,3.12157842 L17.2947053,3.1215984 Z M13.3517882,16.41003 C11.5095105,18.1113287 9.62697303,18.8831369 8.65722278,18.8831369 C8.04313686,18.8831369 7.26795205,18.6382018 6.40893107,18.1750849 C5.57672328,17.7254146 4.72777223,17.1046154 3.95256743,16.3798002 C3.13378621,15.6146853 2.44251748,14.7724276 1.95928072,13.9435964 C1.40897103,13.0073526 1.13040959,12.1147652 1.13040959,11.2993007 L1.13040959,3.96383616 L1.23778222,3.95714286 C2.01966034,3.89674326 3.57332667,3.70211788 5.18741259,3.06787213 C6.88203796,2.4033966 8.13366633,1.64505495 8.59338661,1.34977023 L8.65712288,1.30949051 L8.72085914,1.34977023 C9.17724276,1.64507493 10.4255345,2.4000999 12.1268332,3.06787213 C13.7442358,3.70545455 15.2945854,3.89674326 16.0764635,3.95714286 L16.1838362,3.96383616 L16.1872128,11.2993007 C16.1872128,12.8597003 15.1268332,14.7724076 13.3516484,16.40999 L13.3517882,16.41003 Z" id="形状"></path>
+                    <path d="M11.8585015,7.26251748 C11.7108292,7.26251748 11.5699301,7.31956044 11.4625175,7.42693307 L7.47934066,11.4101099 L5.85182817,9.7825974 C5.74781219,9.67858142 5.60689311,9.61818182 5.45922078,9.61818182 C5.31154845,9.61818182 5.17064935,9.67522478 5.06323676,9.7825974 C4.84847153,9.99736264 4.84847153,10.353027 5.06323676,10.5678122 L7.08333666,12.5879121 C7.18735265,12.6919281 7.32827173,12.7523277 7.47594406,12.7523277 C7.62361638,12.7523277 7.76451548,12.6952847 7.86855145,12.5879121 L12.251049,8.21208791 C12.3584216,8.10471528 12.4154645,7.96715285 12.4154645,7.8161039 C12.4154645,7.66843157 12.3584216,7.52753247 12.251049,7.4234965 C12.147033,7.31948052 12.0061139,7.26243756 11.8584416,7.26243756 L11.8585015,7.26251748 Z" id="路径"></path>
+                </g>
+                <rect id="矩形-copy-2" fill="#D8D8D8" opacity="0" x="0" y="0" width="20" height="20"></rect>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

src/assets/image/invitation-code.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>分组 6</title>
+    <desc>Created with Sketch.</desc>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="切图" transform="translate(-421.000000, -267.000000)">
+            <g id="分组-6" transform="translate(421.000000, 267.000000)">
+                <g id="邀请-(2)" transform="translate(0.000000, -0.000000)" fill="#BFBFBF" fill-rule="nonzero">
+                    <path d="M16.5254083,18.8113734 L3.23546192,18.8113734 C2.01561178,18.8113734 1.05257219,17.8483338 1.05257219,16.6284837 L1.05257219,9.56619329 L9.5273206,17.463118 C9.59152325,17.5273206 9.71992851,17.5915232 9.78413116,17.5915232 L9.91253644,17.5915232 C10.0409417,17.5915232 10.169347,17.5273206 10.2977523,17.463118 L18.7725007,9.43778803 L18.7725007,16.564281 C18.7725007,17.8483338 17.7452585,18.8113734 16.5254083,18.8113734 M2.20821969,6.93388507 L2.20821969,9.05257219 L1.2451801,8.15373522 C1.37358538,7.64011411 1.69459858,7.25489827 2.20821969,6.93388507 M5.73936488,1.15564752 L14.1499107,1.15564752 C15.4981661,1.15564752 16.589611,1.99028183 16.589611,3.08172671 L16.589611,10.0798144 L9.91253644,16.3716731 L3.29966457,10.144017 L3.29966457,3.08172671 C3.29966457,1.99028183 4.39110945,1.15564752 5.73936488,1.15564752 M18.5798928,8.08953259 L17.6168532,8.98836954 L17.6168532,6.93388507 C18.0662717,7.19069563 18.4514875,7.57591147 18.5798928,8.08953259 M17.6810558,5.71403493 L17.6810558,3.01752406 C17.6810558,1.34825543 16.0759899,-5.68434189e-14 14.1499107,-5.68434189e-14 L5.73936488,-5.68434189e-14 C3.81328569,-5.68434189e-14 2.20821971,1.34825543 2.20821969,3.01752406 L2.20821969,5.71403493 C1.18097745,6.09925077 0.410545773,6.86968245 0.153735219,7.89692466 C0.025329932,8.02532995 -0.0388726919,8.28214051 0.0253299514,8.41054579 L0.0253299514,16.564281 C0.0253299514,18.4261576 1.50199067,19.9028183 3.36386721,19.9028183 L16.6538136,19.9028183 C18.5156901,19.9028183 19.9923509,18.4261576 19.9923509,16.564281 L19.9923509,8.85996426 C19.8639456,7.44750618 18.9651086,6.22765603 17.6810558,5.71403493" id="形状"></path>
+                    <path d="M7.47283613,7.126493 C7.47283613,6.6128719 7.92225462,6.16345341 8.43587572,6.16345339 C8.82109156,6.16345339 9.20630741,6.42026395 9.33471269,6.80547979 C9.39891534,6.9980877 9.59152325,7.12649298 9.78413116,7.126493 L10.1051444,7.126493 C10.2977523,7.126493 10.4903602,6.99808772 10.5545628,6.80547979 C10.6829681,6.42026395 11.0681839,6.16345339 11.4533998,6.16345339 C11.9670209,6.16345339 12.4164394,6.61287188 12.4164394,7.126493 L12.4164394,7.25489827 C12.4164394,8.53895106 10.3619549,9.75880121 9.97673909,9.82300385 C9.59152325,9.75880121 7.53703878,8.53895106 7.53703878,7.25489827 L7.53703878,7.19069563 C7.47283613,7.25489827 7.47283613,7.19069563 7.47283613,7.126493 M9.91253644,10.9144487 C10.7471707,10.9144487 13.4436816,9.2451801 13.4436816,7.31910091 L13.4436816,7.25489827 L13.4436816,7.19069563 C13.4436816,6.09925075 12.5448447,5.2004138 11.3891972,5.2004138 C10.8113734,5.2004138 10.2977523,5.45722435 9.91253644,5.84244019 C9.5273206,5.45722435 9.01369949,5.2004138 8.43587572,5.2004138 C7.34443085,5.2004138 6.38139125,6.09925075 6.38139127,7.19069563 L6.38139127,7.31910091 C6.38139127,9.2451801 9.07790214,10.9144487 9.91253644,10.9144487" id="形状"></path>
+                </g>
+                <rect id="矩形-copy-3" fill="#D8D8D8" opacity="0" x="0" y="0" width="20" height="20"></rect>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

src/assets/image/mobile.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>矩形</title>
+    <desc>Created with Sketch.</desc>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="切图" transform="translate(-312.000000, -267.000000)">
+            <g id="分组" transform="translate(312.000000, 267.000000)">
+                <g id="手机-4" transform="translate(3.000000, 0.000000)" fill="#BFBFBF" fill-rule="nonzero">
+                    <path d="M2.09150327,1.56163239e-16 C0.906318083,1.56163239e-16 0,0.914285714 0,2.10989011 L0,17.8637363 C0,18.989011 0.906318083,19.9736264 2.09150327,19.9736264 L6.97167756,19.9736264 C7.25054466,19.9736264 7.43016098,19.7734512 7.43016098,19.4921325 C7.43016098,19.2108138 7.32026144,18.9974518 6.97167756,18.9974518 L2.32011275,18.9974518 C1.62294499,18.9974518 0.860188802,18.2857143 0.860188802,17.5824176 L0.860188802,15.7538462 L12.3433801,15.7538462 L12.3433801,17.5824176 C12.3433801,18.2857143 11.6374421,18.9186813 10.9402743,18.9186813 C10.9402743,18.9186813 10.5979133,18.9363149 10.4588734,18.9974518 C10.3198335,19.0585887 10.2176551,19.1700867 10.2176551,19.4514054 C10.2176551,19.7327241 10.5180301,19.9032967 10.7968972,19.9032967 L11.2244009,19.9032967 C12.4095861,19.9032967 13.3159041,18.9186813 13.3159041,17.7934066 L13.3159041,2.10989011 C13.2461874,0.914285714 12.3398693,0 11.1546841,0 L2.09150327,1.56163239e-16 Z M0.862257778,14.9233433 L0.862257778,2.21072948 C0.862257778,1.4842944 1.51035182,0.830502831 2.2304563,0.830502831 L11.0157311,0.830502831 C11.7358355,0.830502831 12.3839296,1.4842944 12.3839296,2.21072948 L12.3839296,14.9233433 L0.862257778,14.9233433 Z" id="Shape"></path>
+                    <path d="M8.22657952,2.12307692 L5.08932462,2.12307692 C4.81045752,2.12307692 4.53159041,2.33406593 4.53159041,2.68571429 C4.53159041,2.96703297 4.74074074,3.24835165 5.08932462,3.24835165 L8.22657952,3.24835165 C8.50544662,3.17802198 8.71459695,2.96703297 8.71459695,2.61538462 C8.71459695,2.33406593 8.50544662,2.12307692 8.22657952,2.12307692 L8.22657952,2.12307692 Z M7.45969499,16.8923077 L5.7167756,16.8923077 C5.4379085,16.8923077 5.22875817,17.0741259 5.22875817,17.3165501 C5.22875817,17.5589743 5.4379085,17.7407925 5.7167756,17.7407925 L7.45969499,17.7407925 C7.73856209,17.7407925 8.01742919,17.5589743 8.01742919,17.255944 C8.01742919,17.0741259 7.80827887,16.8923077 7.45969499,16.8923077 Z" id="Shape"></path>
+                </g>
+                <rect id="矩形" fill="#D8D8D8" opacity="0" x="0" y="0" width="20" height="20"></rect>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

src/assets/image/password.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>矩形 copy</title>
+    <desc>Created with Sketch.</desc>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="切图" transform="translate(-348.000000, -267.000000)">
+            <g id="分组-4" transform="translate(348.000000, 267.000000)">
+                <g id="密码" transform="translate(2.000000, 1.000000)" fill="#BFBFBF" fill-rule="nonzero">
+                    <path d="M14.3399249,7.05417601 L3.67617752,7.05417601 L3.67617752,5.35338327 C3.67617752,3.03430719 5.60720881,1.1465916 7.98159984,1.1465916 C10.3559909,1.1465916 12.2870222,3.0363613 12.2870222,5.35749147 C12.2870222,5.6717684 12.5454736,5.92647649 12.8690632,5.92647649 C13.1905515,5.92647649 13.4511042,5.67382249 13.4511042,5.35749147 C13.4490029,2.40780748 10.9947651,0.0106756959 7.98159984,0.0106756959 C6.5212443,0.0106756959 5.14703922,0.565282021 4.11533479,1.57589799 C3.08152914,2.58445986 2.51419676,3.92578552 2.51419676,5.35338327 L2.51419676,7.05417601 L1.2891791,7.05417601 C0.576861801,7.05417601 0.00532696109,7.61289053 0.00532694056,8.30717549 L0.00532694056,16.934385 C0.00532694056,17.630724 0.578963004,18.2079254 1.2891791,18.2079254 L14.3399249,18.2079254 C15.0522422,18.2079254 15.6384857,17.6327781 15.6384856,16.934385 L15.6384856,8.30717549 C15.6405869,7.61083644 15.0543434,7.05417601 14.3399249,7.05417601 L14.3399249,7.05417601 Z M14.4786061,16.9467096 C14.4786061,17.0165489 14.4197717,17.0740636 14.3483298,17.0740636 L1.29548279,17.0740636 C1.22404093,17.0740636 1.16520647,17.0165489 1.16520647,16.9467096 L1.16520647,8.31744598 C1.16520647,8.24760665 1.22404093,8.19009193 1.29548279,8.19009193 L14.3462286,8.19009193 C14.4176704,8.19009193 14.4765049,8.24760665 14.4765049,8.31744598 L14.4765049,16.9467096 L14.4786061,16.9467096 L14.4786061,16.9467096 Z M7.71684475,9.99769771 C7.05915944,9.99769771 6.52754801,10.5173844 6.52754799,11.1603169 C6.52754799,11.583461 6.76078463,11.9552526 7.10958898,12.1586083 L7.10958898,14.4119532 C7.10958898,14.7241761 7.37014163,14.9809383 7.69162996,14.9809382 C8.01311829,14.9809382 8.27367096,14.7262302 8.27367096,14.4119532 L8.27367096,12.1873657 C8.65189255,11.9942805 8.90824273,11.6060561 8.90824273,11.1603169 C8.90404026,10.5173844 8.37453005,9.99769773 7.71684475,9.99769771 L7.71684475,9.99769771 Z" id="Shape"></path>
+                </g>
+                <rect id="矩形-copy" fill="#D8D8D8" opacity="0" x="0" y="0" width="20" height="20"></rect>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

src/assets/image/shadow.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="490px" height="101px" viewBox="0 0 490 101" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>矩形</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <filter x="-6.8%" y="-58.8%" width="113.6%" height="217.6%" filterUnits="objectBoundingBox" id="filter-1">
+            <feGaussianBlur stdDeviation="10" in="SourceGraphic"></feGaussianBlur>
+        </filter>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.4">
+        <g id="切图" transform="translate(-287.000000, -29.000000)" fill="#449284">
+            <rect id="矩形" filter="url(#filter-1)" x="312" y="54" width="440" height="51" rx="3"></rect>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

src/assets/image/underline.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="112px" height="6px" viewBox="0 0 112 6" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>矩形</title>
+    <desc>Created with Sketch.</desc>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.300000012">
+        <g id="切图" transform="translate(-123.000000, -66.000000)" fill="#449284">
+            <rect id="矩形" x="123" y="66" width="112" height="6"></rect>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

src/router/router.js

 import App from '../App'
 
+const login = r => require.ensure([], () => r(require('../views/login')), 'login')
+
 const home = r => require.ensure([], () => r(require('../views/home')), 'home')
 const blank = r => require.ensure([], () => r(require('../views/blank')), 'blank')
 const itemManager = r => require.ensure([], () => r(require('../views/education/item-manager.vue')), 'item-manager')
@@ -15,6 +17,11 @@ export default [{
     path: '/',
     component: App,
     children: [
+        {
+          path: '/login',
+          component: login,
+          name: 'loginPage',
+        },
         {
             path: '',
             redirect: '/home'

src/style/common.scss

@@ -63,7 +63,9 @@ html,body{
     font-family: Arial, Helvetica, sans-serif;
     font-size: 16px;
 }
-
+#app {
+  height: 100%;
+}
 .clear:after{
     content: '';
     display: block;

src/views/followup/reservation-manage/reservation-list.vue

@@ -53,8 +53,9 @@
           <el-radio-button label="">全部({{reservationList.count}})</el-radio-button>
           <el-radio-button label="1">未发送({{reservationList.unSendCount}})</el-radio-button>
           <el-radio-button label="2">待确认({{reservationList.waitAcceptCount}})</el-radio-button>
-          <el-radio-button label="3">已接受({{reservationList.acceptedCount}})</el-radio-button>
           <el-radio-button label="4">已拒绝({{reservationList.refusedCount }})</el-radio-button>
+          <el-radio-button label="3">已接受({{reservationList.acceptedCount}})</el-radio-button>
+
         </el-radio-group>
         <el-button class="button-green" type="primary" size="small" @click="sendReservation">发送预约</el-button>
         <el-table
@@ -98,7 +99,7 @@
             label="随访预约时间"
             align="center">
             <template slot-scope="scope">
-              <span v-if="scope.row.status==1" style="color: #49C688;">未完成</span>
+              <span v-if="scope.row.status==1" style="color: #49C688;">未发送</span>
               <span v-else-if="scope.row.status==2">待确认</span>
               <span v-else-if="scope.row.status==4"  style="color: #D5172E;">已拒绝</span>
               <span v-else>{{scope.row.appointmentTime}}</span>

src/views/login.vue

+<template>
+  <div class="login-other">
+    <div class="left"></div>
+    <div class="right">
+      <div class="content">
+        <p class="title"><img src="../assets/image/logo.svg" alt="">云鹊医工作站</p>
+        <!--<div class="input-info">
+          <div class="title-div">
+            <p class="title-input">账号登录</p>
+            <img src="../assets/image/underline.svg" alt="">
+          </div>
+          <el-form ref="loginForm" :model="loginData" >
+            <el-form-item label="">
+              <el-input v-model="loginData.mobile" placeholder="手机号">
+                <i slot="prefix" class="el-input__icon my-icon mobile-icon"></i>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="">
+              <el-input v-model="loginData.password" placeholder="密码">
+                <i slot="prefix" class="el-input__icon my-icon password-icon"></i>
+              </el-input>
+            </el-form-item>
+          </el-form>
+          <div class="button-div">
+            <div class="forget-password">
+              <p>忘记密码？</p>
+            </div>
+            <button>登 录</button>
+          </div>
+        </div>-->
+
+        <div class="input-info">
+          <div class="title-div">
+            <p class="title-input">重设密码</p>
+            <img src="../assets/image/underline.svg" alt="">
+          </div>
+          <el-form ref="loginForm" :model="resetPassword" >
+            <el-form-item label="">
+              <el-input v-model="resetPassword.mobile" placeholder="手机号">
+                <i slot="prefix" class="el-input__icon my-icon mobile-icon"></i>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="">
+              <el-input v-model="resetPassword.authCode" placeholder="短信验证码">
+                <i slot="prefix" class="el-input__icon my-icon auth-code-icon"></i>
+                <i slot="suffix" class="el-input__icon">获取短信验证码</i>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="">
+              <el-input v-model="resetPassword.password" placeholder="新密码">
+                <i slot="prefix" class="el-input__icon my-icon password-icon"></i>
+              </el-input>
+            </el-form-item>
+          </el-form>
+          <div class="button-div">
+            <!--<div class="forget-password">
+              <p>忘记密码？</p>
+            </div>-->
+            <div class="login-btn">
+              <button>登 录</button>
+              <p class="shadow"></p>
+            </div>
+            <div class="login-now">
+              <p>立即登录</p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "login",
+    data() {
+      return {
+        loginData: {},
+        resetPassword: {}
+      }
+    },
+  }
+</script>
+
+<style  lang="scss">
+  .my-icon {
+    display: inline-block;
+    height: 20px;
+    margin-top: 9px;
+  }
+  .mobile-icon {
+    background: url("../assets/image/mobile.svg") no-repeat;
+  }
+  .password-icon {
+    background: url("../assets/image/password.svg") no-repeat;
+  }
+  .auth-code-icon {
+    background: url("../assets/image/auth-code.svg") no-repeat;
+  }
+  .login-other {
+    display: flex;
+    height: 100%;
+    flex-direction: row;
+    .left {
+      flex-grow: 1;
+
+    }
+    .right {
+      .content {
+        padding: 40px 50px 20px 50px;
+        .title {
+          text-align: center;
+          font-weight: 500;
+          font-size: 34px;
+          color: #333333;
+          img {
+            width: 54px;
+            height: 54px;
+            vertical-align: middle;
+          }
+        }
+        .input-info {
+          margin-top: 60px;
+          .title-div {
+            position: relative;
+            margin-bottom: 30px;
+            .title-input {
+              font-size: 28px;
+            }
+            img {
+              display: block;
+              position: absolute;
+              bottom: 3px;
+            }
+          }
+          .el-form {
+            .el-form-item {
+              .el-form-item__content {
+                .el-input {
+                  .el-input__inner {
+                    border-radius: 0;
+                    border: none;
+                    border-bottom: 1px solid #D9D9D9;
+                  }
+                }
+
+              }
+            }
+
+          }
+          .button-div {
+            .login-btn {
+              button {
+                width: 100%;
+                height: 70px;
+                background: #449284;
+                color: #ffffff;
+                font-size: 24px;
+                margin-top: 20px;
+                cursor: pointer;
+                box-shadow: 0px 10px 12px 0px rgba(59,132,119,0.2);
+              }
+              /*.shadow {
+                width: 100%;
+                height: 20px;
+                background: url("../assets/image/shadow.svg") no-repeat;
+                background-size: cover;
+              }*/
+            }
+            .forget-password {
+              margin-top: 52px;
+              color:red;
+              p {
+                cursor: pointer;
+                width: 80px;
+                float: right;
+                font-size: 16px;
+                color: #449284;
+              }
+            }
+          }
+        }
+
+      }
+
+    }
+    /*大于1441*/
+    @media only screen and (min-width: 1441px) {
+      .left {
+        background: url("../assets/image/bg-big.png") no-repeat;
+        background-size: cover;
+      }
+      .right {
+        width: 570px;
+      }
+    }
+    /*小于1440*/
+    @media only screen and (max-width: 1441px) {
+      .left {
+        background: url("../assets/image/bg-small.png") no-repeat;
+        background-size: cover;
+      }
+      .right {
+        width: 500px;
+      }
+    }
+  }
+</style>