Merge branch 'dev' of http://git.echepei.com/tubao/Smart_platform_ui into dev

src/page/login/userlogin.vue

@@ -31,8 +31,8 @@
                 v-model="loginForm.password"
                 auto-complete="off"
                 :placeholder="$t('login.password')">
-        <i class="el-icon-view el-input__icon" slot="suffix" @click="showPassword"/>
-        <i slot="prefix" class="icon-mima"/>
+<!--        <i class="el-icon-view el-input__icon" slot="suffix" @click="showPassword"/>-->
+<!--        <i slot="prefix" class="icon-mima"/>-->
       </el-input>
     </el-form-item>
     <el-form-item v-if="this.website.captchaMode" prop="code">