Merge remote-tracking branch 'origin/大连青谷网站' into 大连青谷网站

components/common/iconGangwei.vue

@@ -1,7 +1,9 @@
 <template>
   <div class="gangwei-icon">
-    <i :style="iconStyle"></i>
-    <p>{{ des.text }}</p>
+    <div class="gangwei-icon-content">
+      <i :style="iconStyle"></i>
+      <p>{{ des.text }}</p>
+    </div>
   </div>
 </template>
 
@@ -21,31 +23,3 @@ export default {
   }
 }
 </script>
-
-<style lang="scss" scoped>
-.gangwei-icon {
-  text-align: center;
-
-  i {
-    display: block;
-    width: 200px;
-    height: 160px;
-    background-size: contain;
-    background-repeat: no-repeat;
-    background-position: center;
-  }
-
-  p {
-    margin-top: 25px;
-    font-size: 18px;
-    font-weight: 800;
-  }
-
-  @media (max-width: 768px){
-    i {
-      width: 150px;
-      height: 120px;
-    }
-  }
-}
-</style>

components/common/layout/desComp/desWithCode.vue

@@ -92,13 +92,13 @@ export default {
 
   // 客服---(纯白色背景)
   &.kefu {
-    height: 360px;background-color: #FAFAFA;
+    background-color: #FAFAFA;
     h4,p {color: #333;}
   }
 
   // 经理---（/背景为弧形的光）
   &.jingli {
-    padding: 62px 0 62px;
+    height: 360px;padding: 62px 0 62px;
     h4 {margin: 0 0 30px;}
     p{margin: 0 0 16px;}
   }

components/common/layout/desComp/gangweiList.vue

@@ -1,20 +1,20 @@
 <template>
   <div class="client-gangwei-box">
     <div class="client-container">
-    <h4 class="gangwei-label" v-if="label">{{label}}</h4>
+    <h4 class="gangwei-title" v-if="label">{{label}}</h4>
 
-      <div class="gangwei-row mta-hidden-xs" :class="rowClassPc" v-for="(rowList,index) in myListPc" :key="`pc-${index}`">
+      <div class="gangwei-cp-row mta-hidden-xs" :class="rowClassPc" v-for="(rowList,index) in myListPc" :key="`pc-${index}`">
         <template v-for="(des,ind) in rowList">
           <!--    站位div    -->
           <div v-if="des.type === 'empty'"></div>
-          <iconGangwei v-else class="my-icon"  :key="ind" :des="des" :style="iconStylePc"></iconGangwei>
+          <iconGangwei v-else  :key="ind" :des="des" :style="iconStylePc"></iconGangwei>
         </template>
       </div>
-      <div class="gangwei-row mta-hidden-sm cur-h5" :class="rowClassH5"v-for="(rowList,index) in myListH5" :key="`h5${index}`">
+      <div class="gangwei-phone-row mta-hidden-sm" :class="rowClassH5"v-for="(rowList,index) in myListH5" :key="`h5${index}`">
         <template  v-for="(des,ind) in rowList">
           <!--    站位div    -->
           <div v-if="des.type === 'empty'"></div>
-          <iconGangwei v-else class="my-icon" :key="ind" :des="des" :style="iconStyleH5"></iconGangwei>
+          <iconGangwei v-else :key="ind" :des="des" :style="iconStyleH5"></iconGangwei>
         </template>
       </div>
     </div>
@@ -98,45 +98,51 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-.client-gangwei-box {
-  margin: 0 auto;
+<style lang="scss">
+  .client-gangwei-box {
+    // 标题
+    .gangwei-title {font-size: 30px;color: #333;font-weight: 800;text-align: center;margin: 92px 0 105px;}
 
-  .gangwei-row {
-    width: 98%;
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    margin-bottom: 119px;
-
-    .my-icon {
-      &:last-child {
-        margin-right: 0 !important;
+    /**************** pc样式 ****************/
+    .gangwei-cp-row{display: flex;flex-wrap: wrap;}
+    // 图标列表
+    .gangwei-icon-three,.gangwei-icon-four{
+      text-align: center;
+      .gangwei-icon{margin-bottom: 116px}
+      .gangwei-icon-content{
+        display: inline-block;margin: 0 auto;text-align: center;
+        i{width:164px;height:164px;margin:0 auto 22px;display: block;
+          background-repeat: no-repeat;background-position: center;background-size: contain;}
+        p{font-size: 18px;font-weight: 800;color: #333333;}
       }
     }
-  }
-
 
-  .gangwei-label {
-    text-align: center;
-    font-size: 30px;
-    color: #333;
-    margin-bottom: 160px;
-    margin-top: 90px;
-    font-weight: 800;
-  }
+    // 一行三个
+    .gangwei-icon-three{
+      .gangwei-icon{width: 33.33%;}
+    }
 
-}
-.client-gangwei-box {
-  @media (max-width: 768px){
-    .gangwei-label {
-      margin-bottom: 60px;
+    // 一行四个
+    .gangwei-icon-four{
+      .gangwei-icon{width: 25%;}
     }
 
-    .gangwei-row {
-      margin-bottom: 60px;
+    /**************** 手机样式 ****************/
+    @media (max-width: 768px){
+      // 标题
+      .gangwei-title {font-size: 18px;margin: 50px 0 26px;}
+      .gangwei-phone-row{display: flex;flex-wrap: wrap;}
+      .gangwei-icon-two{
+        text-align: center;
+        .gangwei-icon{width: 50%;margin-bottom: 25px;}
+        .gangwei-icon-content{
+          display: inline-block;margin: 0 auto;text-align: center;
+          i{width:75px;height:75px;margin:0 auto 10px;display: block;
+            background-repeat: no-repeat;background-position: center;background-size: contain;}
+          p{font-size: 16px;font-weight: normal;color: #333333;}
+        }
+      }
     }
   }
-}
 
 </style>

pages/product/caiWuGuanLi.vue

@@ -15,10 +15,8 @@
       财务部主要负责企业的财务管理，主要只能是在本企业一定的整体目标下，
       关于资本的购置，资本的融通和经营中现金流量，以及利润分配的管理。
     </div>
-    <div class="client-container">
       <!--  岗位职责  -->
       <gangwei-list label="岗位职责" :list="gangwei" :pc-num="3" :h5-num="2" :pc-margin="320" :h5-margin="0"></gangwei-list>
-    </div>
 
     <!--  部分课程列表  -->
     <div class="platform-course-list">

pages/product/chanPinYunYing.vue

@@ -9,10 +9,8 @@
       <p>紧随市场趋势，接轨企业需求，获得产品运营技能</p>
       <span>产品部、运营部</span>
     </div>
-    <div class="client-container">
-      <!--  岗位职责  -->
-      <gangwei-list label="岗位职责" :list="gangwei" :pc-num="3" :h5-num="2" :pc-margin="320" :h5-margin="0"></gangwei-list>
-    </div>
+    <!--  岗位职责  -->
+    <gangwei-list label="岗位职责" :list="gangwei" :pc-num="3" :h5-num="2" :pc-margin="320" :h5-margin="0"></gangwei-list>
 
     <!--  能力提升  -->
     <div class="client-nengli-box">

pages/product/courseCustom.vue

@@ -15,10 +15,8 @@
       <p class="p1">服务企业 <i>100+</i>，累计开发课时 <i>30,000+</i></p>
       <p class="p2">青谷是国内专业、成熟的课程设计、开发团队、拥有丰富的电子课程制作经验，
         业务方向包括教学设计体验、动画设计、视频拍摄等，涉及的行业有教育培训、零售连锁、机械制造、金融保险等。</p>
-      <div class="client-container">
         <!--  岗位职责  -->
-        <gangweiList :list="gangwei" :pc-num="4" :h5-num="2" :pc-margin="150" :h5-margin="0"></gangweiList>
-      </div>
+        <gangweiList :list="gangwei" :pc-num="4" :h5-num="2"></gangweiList>
 
 
       <div class="btns-group">

pages/product/keFuFuWu.vue

@@ -10,10 +10,8 @@
       <span>产品部、运营部</span>
     </div>
 
-    <div class="client-container">
       <!--  岗位职责  -->
-      <gangweiList label="岗位职责" :list="gangwei" :pc-num="3" :h5-num="2" :pc-margin="320" :h5-margin="0"></gangweiList>
-    </div>
+      <gangweiList label="岗位职责" :list="gangwei" :pc-num="3" :h5-num="2"></gangweiList>
 
     <!--  能力提升  -->
     <div class="client-nengli-box">

pages/product/shengChanCaiGou.vue

@@ -10,10 +10,8 @@
       <span><i></i> 生产部门、采购部门</span>
     </div>
 
-    <div class="client-container">
       <!--  岗位职责  -->
-      <gangweiList label="岗位职责" :list="gangwei" :pc-num="4" :h5-num="2" :pc-margin="150" :h5-margin="0"></gangweiList>
-    </div>
+      <gangweiList label="岗位职责" :list="gangwei" :pc-num="4" :h5-num="2"></gangweiList>
 
     <!--  部分课程列表  -->
     <div class="platform-course-list">

pages/product/xingZhengGuanLi.vue

@@ -16,7 +16,7 @@
     </div>
 
       <!--  岗位职责  -->
-      <gangweiList label="岗位职责" :list="gangwei" :pc-num="3" :h5-num="2" :pc-margin="320" :h5-margin="0"></gangweiList>
+      <gangweiList label="岗位职责" :list="gangwei" :pc-num="3" :h5-num="2"></gangweiList>
 
 
     <!--  部分课程列表  -->

pages/solution/exam.vue

@@ -11,11 +11,8 @@
       <onlineInformationBtn/>
     </div>
 
-    <div class="client-container">
       <!--  常见严肃性考试场景  -->
-      <gangweiList label="常见严肃性考试场景" :list="gangwei" :pc-num="4" :h5-num="2" :pc-margin="120"
-                   :h5-margin="0"></gangweiList>
-    </div>
+      <gangweiList label="常见严肃性考试场景" :list="gangwei" :pc-num="4" :h5-num="2"></gangweiList>
 
 
     <!--  严肃性考试解决方案  -->