bug修改

src/layout/components/AppFooter.vue

@@ -27,6 +27,7 @@
         <div>
           <div class="address_text">西青地址：天津市西青区中北镇万卉路3号新城市中心B座</div>
           <div class="address_text">联系电话：<span class="address_number">022-60633170</span></div>
+          <div class="address_text">联系邮箱：<span class="address_number">caie@catarc.ac.cn</span></div>
         </div>
         <div class="address_divider">
           <el-divider direction="vertical" />

src/utils/request.js

@@ -13,7 +13,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 100000
+  timeout: 1200000
   // headers: { 'clientType': 'fy_authority' }
 })
 // let loadingInstance = ''

src/views/courseResources/courseMall/index.vue

@@ -167,28 +167,33 @@
                   fit="cover"
                 />
               </div>
-              <div v-if="course.lessonPrice !== 0" :class="'status status-' + (course.lessonIsPay === 1 ? 'purchased' : 'unPurchased')">
-                {{ course.lessonIsPay === 1 ? '已购' : '未购' }}
-              </div>
+<!--              <div v-if="course.lessonPrice !== 0" :class="'status status-' + (course.lessonIsPay === 1 ? 'purchased' : 'unPurchased')">-->
+<!--                {{ course.lessonIsPay === 1 ? '已购' : '未购' }}-->
+<!--              </div>-->
             </div>
             <div class="card-bottom">
               <div :title="course.lessonName" class="title">{{ course.lessonName }}</div>
               <div class="info">
-                <div :class="'price price-' + (course.lessonPrice ? 'charge' : 'free')">
-                  {{
-                    formatPrice(course.lessonPrice)
-                  }}
-                </div>
-                <div class="follow">
-                  <div class="icon">
-                    <el-image
-                      class="img"
-                      :src="require('@/assets/image/people.png')"
-                      fit="cover"
-                    />
-                  </div>
-                  {{ formattedNumber(course.lessonViews) }}
+                <div class="teacherRow">
+                  <img class="teacherImg" :src="teacherImg">
+                  <div>讲师：</div>
+                  <div>{{course.teacherName}}</div>
                 </div>
+<!--                <div :class="'price price-' + (course.lessonPrice ? 'charge' : 'free')">-->
+<!--                  {{-->
+<!--                    formatPrice(course.lessonPrice)-->
+<!--                  }}-->
+<!--                </div>-->
+<!--                <div class="follow">-->
+<!--                  <div class="icon">-->
+<!--                    <el-image-->
+<!--                      class="img"-->
+<!--                      :src="require('@/assets/image/people.png')"-->
+<!--                      fit="cover"-->
+<!--                    />-->
+<!--                  </div>-->
+<!--                  {{ formattedNumber(course.lessonViews) }}-->
+<!--                </div>-->
               </div>
             </div>
           </div>
@@ -287,6 +292,7 @@ export default {
       // 课程维度字典数据
       courseDimensionsOptions: [],
       backTop: require('@/assets/image/top.png'),
+      teacherImg: require('@/assets/image/teacherImg.png'),
       suggestion: require('@/assets/image/suggestion.png'),
       // 默认头像
       defaultAvatarUrl: require('@/assets/image/defaultAvatar.png'),
@@ -885,7 +891,7 @@ export default {
 
       .course-card {
         cursor: pointer;
-        height: 288px;
+        height: 256px;
         background: #ffffff;
         border-radius: 6px;
         box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.15);
@@ -936,7 +942,7 @@ export default {
         }
 
         .card-bottom {
-          padding: 24px 20px;
+          padding: 24px 20px 16px;
 
           .title {
             height: 23px;
@@ -945,7 +951,7 @@ export default {
             font-weight: 700;
             color: #000000;
             line-height: 23px;
-            margin-bottom: 26px;
+            margin-bottom: 16px;
             text-overflow: ellipsis;
             display: -webkit-box; /* 适用于 WebKit 浏览器，如 Chrome 和 Safari */
             -webkit-line-clamp: 1; /* 限制显示的行数，此处设置为 1 行 */
@@ -963,7 +969,15 @@ export default {
             display: flex;
             justify-content: space-between;
             align-items: center;
-
+            .teacherRow{
+              display: flex;
+              align-items: center;
+              .teacherImg{
+                width: 16px;
+                height: 16px;
+                margin-right: 8px;
+              }
+            }
             .price {
               font-size: 20px;
               font-family: Source Han Sans CN, Source Han Sans CN-700;