dusenyao 3 years ago
parent
commit
7dc855ad6c

+ 2 - 2
src/components/payment/Audit.vue

@@ -52,7 +52,7 @@ export default {
       },
       type: Object
     },
-    id: {
+    goodsId: {
       default: '',
       type: String
     },
@@ -73,7 +73,7 @@ export default {
     // 提交申请
     buy() {
       ApplyJoinCourse({
-        course_id: this.id, // 课程 ID
+        course_id: this.goodsId, // 课程 ID
         discount_code: this.discount_code // 优惠码 (目前暂时没有用到)
       }).then(() => {
         this.$message.success('申请加入课程成功');

+ 54 - 76
src/layouts/components/LayoutHeader.vue

@@ -48,46 +48,39 @@
       </el-menu>
     </div>
     <div class="userName">
-      <el-dropdown
-        style="margin-right: 16px; cursor: pointer"
-        trigger="click"
-        @command="changeLang"
-      >
-        <span class="el-dropdown-link" style="color: #000">
+      <el-dropdown style="margin-right: 16px" trigger="click" @command="changeLang">
+        <span class="el-dropdown-link">
           {{ lang }}<i class="el-icon-arrow-down el-icon--right"></i>
         </span>
         <el-dropdown-menu slot="dropdown" style="width: 200px">
-          <el-dropdown-item
-            v-for="item in language_list"
-            :key="item.language_type"
-            :command="item"
-            >{{ item.language_name }}</el-dropdown-item
-          >
+          <el-dropdown-item v-for="item in language_list" :key="item.language_type" :command="item">
+            {{ item.language_name }}
+          </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
       <div v-if="!userMessage" class="selectLoginOrRegistration">
         <span @click="cutLoginReg">登录</span>
       </div>
       <!-- 用户头像和用户名 -->
-      <div v-else class="user">
-        <img
-          class="headPhoto"
-          :src="userMessage.image_url ? userMessage.image_url : '../../assets/login/Group3214.png'"
-          alt=""
-          @click="userShow = !userShow"
-        />
-        <span @click="userShow = !userShow">{{ userMessage.user_real_name }}</span>
-        <div v-show="userShow" class="userShow">
-          <p @click="gopresonal">
-            <img src="../../assets/login/project7.png" alt="" />
-            个人中心
-          </p>
-          <p @click="QuitLogin">
-            <img src="../../assets/login/Frame77.png" alt="" />
-            退出登录
-          </p>
-        </div>
-      </div>
+      <el-dropdown v-else style="margin-right: 16px" trigger="click" class="user">
+        <span class="el-dropdown-link">
+          <img
+            class="headPhoto"
+            :src="
+              userMessage.image_url ? userMessage.image_url : '../../assets/login/Group3214.png'
+            "
+          />
+          <span class="real_name">{{ userMessage.user_real_name }}</span>
+        </span>
+        <el-dropdown-menu slot="dropdown" class="user-menu">
+          <el-dropdown-item @click.native="gopresonal">
+            <img src="../../assets/login/project7.png" /><span>个人中心</span>
+          </el-dropdown-item>
+          <el-dropdown-item @click.native="QuitLogin">
+            <img src="../../assets/login/Frame77.png" /><span>退出登录</span>
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
       <!-- 消息 铃铛图片 -->
       <div class="message">
         <img src="../../assets/login/Vector.png" alt="" />
@@ -481,12 +474,9 @@ export default {
     }
 
     .headPhoto {
-      width: 50px;
-      height: 50px;
-      // background: url("../assets/teacherTrain/image 4.png") no-repeat 100% 100%;
-      // background-size: 100%;
+      width: 34px;
+      height: 34px;
       border-radius: 50%;
-      // margin-right: 10px;
     }
 
     .message {
@@ -532,55 +522,19 @@ export default {
     }
 
     .user {
-      display: flex;
-      align-items: center;
       cursor: pointer;
-      position: relative;
-
-      > img {
-        width: 34px;
-        height: 34px;
-      }
 
-      > span {
+      .real_name {
+        display: inline-block;
+        vertical-align: super;
         font-size: 20px;
         padding-left: 10px;
       }
-
-      .userShow {
-        position: absolute;
-        width: 156px;
-        height: 96px;
-        background: #fff;
-        box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
-        border-radius: 8px;
-        bottom: -100px;
-        color: black;
-
-        img {
-          width: 24px;
-          height: 24px;
-          margin-right: 10px;
-        }
-
-        p {
-          font-size: 16px;
-          height: 40px;
-          display: flex;
-          align-items: center;
-          padding-left: 20px;
-          margin: 0;
-          margin-top: 5px;
-        }
-
-        > p:hover {
-          background: #f2f2f2;
-        }
-      }
     }
   }
 }
 </style>
+
 <style lang="scss">
 .LoginNav {
   .el-dropdown-menu__item {
@@ -600,7 +554,12 @@ export default {
     line-height: 78px;
   }
 
+  .el-dropdown-link {
+    color: #000;
+  }
+
   .el-dropdown {
+    cursor: pointer;
     display: block;
 
     > span {
@@ -637,3 +596,22 @@ export default {
   }
 }
 </style>
+
+<style lang="scss">
+.user-menu {
+  width: 156px;
+
+  .el-dropdown-menu__item {
+    display: flex;
+    align-items: center;
+    color: #000;
+    font-size: 16px;
+
+    img {
+      width: 24px;
+      height: 24px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

+ 4 - 10
src/views/course_details/index.vue

@@ -318,7 +318,7 @@
         width="720px"
         :before-close="closeaudit"
       >
-        <audit :id="id" :data="CourseData" :goods-type="goods_type" />
+        <audit :goods-id="goods_id" :data="CourseData" :goods-type="goods_type" />
       </el-dialog>
     </div>
   </div>
@@ -458,7 +458,8 @@ export default {
 
     .bookDetail {
       width: 1200px;
-      height: 452px;
+      height: 524px;
+      padding: 64px;
       margin: 0 auto;
       background: url('../../assets/course_details/Rectangle113.png');
       border-radius: 8px;
@@ -467,7 +468,6 @@ export default {
       overflow: hidden;
 
       .rightUp {
-        margin: 0;
         width: 72px;
         height: 72px;
         background: url('../../assets/course_details/Rectangle903.png');
@@ -476,20 +476,14 @@ export default {
         top: 0;
 
         span {
-          display: inline-block;
           color: #fff;
-          transform: rotateZ(45deg);
+          transform: translateX(4px) translateY(4px) rotateZ(45deg);
           position: absolute;
           left: 30px;
           top: 10px;
         }
       }
 
-      > div {
-        margin-top: 40px;
-        margin-left: 40px;
-      }
-
       .text {
         width: 1100px;
         color: white;