From fab38bb5c575e9a5dcfb1b22219c873141088356 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 26 Apr 2021 14:13:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/Studentcommon/FictitiousList.vue   |  6 ++-
 .../common/Studentcommon/TeachingList.vue     |  6 ++-
 src/components/page/PersonalCenter.vue        | 48 +++++++++++--------
 src/components/page/Record.vue                |  2 +-
 src/utils/api.js                              |  2 +-
 5 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/src/components/common/Studentcommon/FictitiousList.vue b/src/components/common/Studentcommon/FictitiousList.vue
index 4e7c900..1b6f261 100644
--- a/src/components/common/Studentcommon/FictitiousList.vue
+++ b/src/components/common/Studentcommon/FictitiousList.vue
@@ -10,7 +10,11 @@
             <el-table-column prop="id" label="次序" width="120" align="center" type="index"></el-table-column>
             <el-table-column prop="projectName" label="实验项目名称" align="center"></el-table-column>
             <el-table-column prop="score" label="得分" align="center"></el-table-column>
-            <el-table-column prop="timeConsuming" label="耗时" align="center"></el-table-column>
+            <el-table-column prop="timeConsuming" label="耗时" align="center">
+                <template slot-scope="scope">
+                    {{scope.row.timeConsuming}}分
+                </template>
+            </el-table-column>
             <el-table-column prop="startTime" label="起始时间" align="center"></el-table-column>
             <el-table-column prop="endTime" label="结束时间" align="center"></el-table-column>
             <el-table-column label="操作" align="center">
diff --git a/src/components/common/Studentcommon/TeachingList.vue b/src/components/common/Studentcommon/TeachingList.vue
index 9d61e2b..fd18725 100644
--- a/src/components/common/Studentcommon/TeachingList.vue
+++ b/src/components/common/Studentcommon/TeachingList.vue
@@ -11,7 +11,11 @@
             <el-table-column prop="experimentalClassName" label="班级" align="center"></el-table-column>
             <el-table-column prop="projectName" label="实验项目名称" align="center"></el-table-column>
             <el-table-column prop="score" label="得分" align="center"></el-table-column>
-            <el-table-column prop="timeConsuming" label="耗时" align="center"></el-table-column>
+            <el-table-column prop="timeConsuming" label="耗时" align="center">
+                <template slot-scope="scope">
+                    {{scope.row.timeConsuming}}分
+                </template>
+            </el-table-column>
             <el-table-column prop="startTime" label="起始时间" align="center"></el-table-column>
             <el-table-column prop="endTime" label="结束时间" align="center"></el-table-column>
             <el-table-column label="操作" align="center">
diff --git a/src/components/page/PersonalCenter.vue b/src/components/page/PersonalCenter.vue
index 94f7678..6b816d1 100644
--- a/src/components/page/PersonalCenter.vue
+++ b/src/components/page/PersonalCenter.vue
@@ -111,7 +111,7 @@
                     </div>
                     <div class="item">
                         <span>证件</span>
-                        <input id="idnumber" class="idnumber" placeholder="请输入姓名" type="text" v-model="personalInformation.idNumber"/>
+                        <input id="idnumber" class="idnumber" placeholder="请输入证件" type="text" v-model="personalInformation.idNumber"/>
                     </div>
                 </div>
                 <div class="line">
@@ -270,36 +270,35 @@
                     </div>
                     <div class="item">
                         <span>手机号</span>
-                        <div class="btns">
-                            {{personalInformation.phone}}
-                            <el-button v-if="personalInformation.phone" style="margin-left: 5px;width:100%;" size="small" @click="bindPhone">更换</el-button>
-                            <el-button v-else style="width:100%;" size="small" @click="bindPhone">绑定</el-button>
+                        <div class="btns flex-between">
+                            <span>{{personalInformation.phone}}</span>
+                            <el-button v-if="personalInformation.phone" type="primary" size="small" @click="bindPhone">更换</el-button>
+                            <el-button v-else type="primary" size="small" @click="bindPhone">绑定</el-button>
                         </div>
                     </div>
                 </div>
                 <div class="line">
                     <div class="item">
                         <span>邮箱</span>
-                        <div class="btns">
-                            {{personalInformation.email}}
-                            <el-button v-if="personalInformation.email" style="margin-left: 5px;width:100%;" size="small" @click="bindEmail">更换</el-button>
-                            <el-button v-else style="width:100%;" size="small" @click="bindEmail">绑定</el-button>
+                        <div class="btns flex-between">
+                            <span>{{personalInformation.email}}</span>
+                            <el-button v-if="personalInformation.email" type="primary" size="small" @click="bindEmail">更换</el-button>
+                            <el-button v-else type="primary" size="small" @click="bindEmail">绑定</el-button>
                         </div>
                     </div>
-                    <div class="item">
+                    <!-- <div class="item">
                         <span>微信</span>
-                        <!-- <div class="read">{{personalInformation.weChatID}}</div> -->
                         <input id="weChat" class="weChat" disabled placeholder="微信" type="text" v-model="personalInformation.weChatID"/>
-                    </div>
-                </div>
-                <div class="line">
-                    <div class="item">
-                        <span>密码</span>
-                        <div class="btns">
-                            <el-button size="small" style="width:100%;" @click="bindPassword">更换密码</el-button>
+                    </div> -->
+                    <div class="line">
+                        <div class="item">
+                            <span>密码</span>
+                            <div class="btns flex-end-content">
+                                <el-button type="primary" size="small" @click="bindPassword">更换</el-button>
+                            </div>
                         </div>
+                        <!-- <div class="item"></div> -->
                     </div>
-                    <div class="item"></div>
                 </div>
             </div>
         </div>
@@ -1216,6 +1215,8 @@ input:focus {
                 .btns{
                     display: inline-flex;
                     align-items: center;
+                    border-bottom: 1px solid #b5b5b5;
+                    padding: 5px 0;
                 }
                 .selects{
                     display: inline-flex;
@@ -1242,11 +1243,14 @@ input:focus {
             }
             /deep/.el-input__inner {
                 color: #656565;
-                font-size: 16px;
+                font-size: 14px;
                 border-radius: 0 !important;
                 border: 0px;
                 border-bottom: 1px solid #b5b5b5;
             }
+            /deep/.el-input--prefix .el-input__inner{
+                padding-left: 15px;
+            }
             /deep/.el-input__icon {
                 color: #9278ff;
                 &.el-icon-date{
@@ -1320,5 +1324,9 @@ input:focus {
         font-size: 14px;
         color: #c0c0c0;
     }
+    /deep/ .el-button--primary{
+        background-color: #9278ff;
+        border-color: #9278ff;
+    }
 }
 </style>
\ No newline at end of file
diff --git a/src/components/page/Record.vue b/src/components/page/Record.vue
index 481b15d..2fa1540 100644
--- a/src/components/page/Record.vue
+++ b/src/components/page/Record.vue
@@ -17,7 +17,7 @@
 
                     <div class="newPractice-card-other">
                             <p style="font-size:18px">实验总时长</p>
-                            <p style="font-size:36px">{{overview.totalTime ? overview.totalTime : 0}}</p>
+                            <p style="font-size:36px">{{overview.totalTime ? overview.totalTime : 0}}小时</p>
                             <!-- <p style="font-size:36px">94</p> -->
                     </div>
 
diff --git a/src/utils/api.js b/src/utils/api.js
index de94ec9..a8190a0 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -10,7 +10,7 @@ if(process.env.NODE_ENV === 'development'){
 
 export default {
   logins: `${host}/liuwanr/userInfo/logins`, //登录 
-  updateLogInNumber: `http://116.63.168.79/liuwanr/userInfo/updateLogInNumber`, //用户登录修改登录次数和登陆时间
+  updateLogInNumber: `${host}/liuwanr/userInfo/updateLogInNumber`, //用户登录修改登录次数和登陆时间
   uploadUserAvatars: `${host}/liuwanr/userInfo/uploadUserAvatars`, //上传头像
   loginSchool: `${host}/liuwanr/userInfo/loginSchoolClient`, //登陆查询学校
   loginRole: `${host}/liuwanr/userInfo/loginRole`, //登陆查询角色