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

components/common/layout/desComp/desWithCode.vue

@@ -1,10 +1,10 @@
 <template>
   <!--  立即咨询  -->
-  <div class="client-zixun-code mta-hidden-xs" :class="pageData.topClass" :style="pageData.topStyle">
+  <div class="service-code-box mta-hidden-xs" :class="pageData.topClass" :style="pageData.topStyle">
     <h4>{{ pageData.title }}</h4>
-    <p v-if="pageData.p1" class="p1">{{ pageData.p1 }}</p>
+    <p v-if="pageData.p1" class="jinglu-weixin">{{ pageData.p1 }}</p>
     <img :src="imgUrl" alt="">
-    <p v-if="pageData.p2" class="p2">{{ pageData.p2 }}</p>
+    <p v-if="pageData.p2" class="kefu-weixin">{{ pageData.p2 }}</p>
   </div>
 </template>
 
@@ -18,10 +18,10 @@ export default {
   },
   data() {
     return {
-      imgUrl: require('static/codeImage/code_kefu.png'), // 客服二维码
-      imgUrl2: require('static/codeImage/code_jingli.png'), // 经理二维码
-      bg1: require('static/codeImage/bg01.png'), // 企业培训
-      bg2: require('static/codeImage/bg01.png'), // 教育机构+食品餐饮
+      imgUrl: require('static/codeImage/code-kefu.png'), // 客服二维码
+      imgUrl2: require('static/codeImage/code-jingli.png'), // 经理二维码
+      bg1: require('static/codeImage/code-bj01.png'), // 企业培训
+      bg2: require('static/codeImage/code-bj02.png'), // 教育机构+食品餐饮
     }
   },
   computed: {
@@ -33,14 +33,14 @@ export default {
       switch (this.source) {
         case 'exam':
           // 严肃考试
-           result = Object.assign({title, p2}, {topClass: 'kefu'}, {topStyle: 'background: none'}, {imgUrl: this.imgUrl});
+           result = Object.assign({title, p2}, {topClass: 'kefu'}, {topStyle: ''}, {imgUrl: this.imgUrl});
            break;
         case 'peixun':
           // 企业培训
           result = Object.assign({
             title,
             p1
-          }, {topClass: 'jingli'}, {topStyle: `background: url(${this.bg1})`}, {imgUrl: this.imgUrl2});
+          }, {topClass: 'jingli'}, {topStyle: `background-image: url(${this.bg1})`}, {imgUrl: this.imgUrl2});
         case 'education':
           // 解决方案 -> 教育机构
         case 'bitAnsSup':
@@ -64,7 +64,7 @@ export default {
           result = Object.assign({
             title,
             p2
-          }, {topClass: 'kefu_level2'}, {topStyle: `background: url(${this.bg2})`}, {imgUrl: this.imgUrl});
+          }, {topClass: 'kefu-leve-bj'}, {topStyle: `background-image: url(${this.bg2})`}, {imgUrl: this.imgUrl});
           break;
       }
       return result;
@@ -74,87 +74,36 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.client-zixun-code {
+.service-code-box {
   width: 100%;
-  background: green;
+  height: 440px;
   text-align: center;
   box-sizing: border-box;
   overflow: hidden;
+  background-repeat: no-repeat;
+  padding: 100px 0 83px;
 
-  h4 {
-    text-align: center;
-    font-size: 30px;
-    height: 30px;
-  }
+  h4 {font-size: 30px;text-align: center;margin: 0 0 45px;color: #fff;}
 
-  img {
-    text-align: center;
-    margin: 0 auto;
-    width: 142px;
-    height: 142px;
+  img {width: 142px;height: 142px;margin: 0 auto;}
 
-  }
+  p {font-size: 18px;text-align: center;margin: 24px 0 0;color: #fff;}
 
-  p {
-    text-align: center;
-    height: 18px;
-  }
-
-  // 客服
+  // 客服---(纯白色背景)
   &.kefu {
-    height: 440px;
-
-    h4 {
-      color: #333;
-      margin-top: 62px;
-      margin-bottom: 43px;
-    }
-
-    p.p2 {
-      font-size: 18px;
-      color: #333;
-      margin-bottom: 81px;
-      margin-top: 24px;
-    }
+    height: 360px;background-color: #FAFAFA;
+    h4,p {color: #333;}
   }
 
-  // 经理
+  // 经理---（/背景为弧形的光）
   &.jingli {
-    height: 360px;
-
-    h4 {
-      color: #fff;
-      margin-top: 62px;
-      margin-bottom: 30px;
-    }
-
-    p.p1 {
-      font-size: 18px;
-      color: #fff;
-      margin-bottom: 16px;
-    }
-
-    img {
-      margin-bottom: 60px;
-    }
+    padding: 62px 0 62px;
+    h4 {margin: 0 0 30px;}
+    p{margin: 0 0 16px;}
   }
 
-  &.kefu_level2 {
-    height: 360px;
-
-    h4 {
-      color: #fff;
-      margin-top: 62px;
-      margin-bottom: 43px;
-    }
-
-    p.p2 {
-      font-size: 18px;
-      color: #fff;
-      margin-bottom: 81px;
-      margin-top: 24px;
-    }
-  }
+  // 客服带背景图---(背景为菱形的光)
+  &.kefu-leve-bj {}
 
 
 }

components/common/layout/desComp/gangweiList.vue

@@ -1,21 +1,22 @@
 <template>
   <div class="client-gangwei-box">
-
+    <div class="client-container">
     <h4 class="gangwei-label" v-if="label">{{label}}</h4>
 
-    <div class="gangwei-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"></iconGangwei>
-      </template>
-    </div>
-    <div class="gangwei-row mta-hidden-sm cur-h5" :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"></iconGangwei>
-      </template>
+      <div class="gangwei-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>
+        </template>
+      </div>
+      <div class="gangwei-row mta-hidden-sm cur-h5" :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>
+        </template>
+      </div>
     </div>
   </div>
 </template>

pages/index.vue

@@ -164,7 +164,7 @@ export default {
             order: 2,
           },
           img: {
-            url: require('~/static/codeImage/code_jingli.png'),
+            url: require('~/static/codeImage/code-jingli.png'),
             order: 1,
           },
           mianfei: true,
@@ -205,7 +205,7 @@ export default {
             order: 1,
           },
           img: {
-            url: require('~/static/codeImage/code_jingli.png'),
+            url: require('~/static/codeImage/code-jingli.png'),
             order: 2,
           },
           mianfei: true,
@@ -243,7 +243,7 @@ export default {
             order: 2,
           },
           img: {
-            url: require('~/static/codeImage/code_jingli.png'),
+            url: require('~/static/codeImage/code-jingli.png'),
             order: 1,
           },
           mianfei: false,
@@ -287,7 +287,7 @@ export default {
             order: 1,
           },
           img: {
-            url: require('~/static/codeImage/code_jingli.png'),
+            url: require('~/static/codeImage/code-jingli.png'),
             order: 2,
           },
           mianfei: false,

pages/product/exam.vue

@@ -121,7 +121,7 @@ export default {
             order: 2,
           },
           img: {
-            url: require('~/static/codeImage/code_jingli.png'),
+            url: require('~/static/codeImage/code-jingli.png'),
             order: 1,
           },
           mianfei: true,
@@ -146,7 +146,7 @@ export default {
             order: 1,
           },
           img: {
-            url: require('~/static/codeImage/code_jingli.png'),
+            url: require('~/static/codeImage/code-jingli.png'),
             order: 2,
           },
           mianfei: true,
@@ -171,7 +171,7 @@ export default {
             order: 2,
           },
           img: {
-            url: require('~/static/codeImage/code_jingli.png'),
+            url: require('~/static/codeImage/code-jingli.png'),
             order: 1,
           },
           mianfei: true,
@@ -196,7 +196,7 @@ export default {
             order: 1,
           },
           img: {
-            url: require('~/static/codeImage/code_jingli.png'),
+            url: require('~/static/codeImage/code-jingli.png'),
             order: 2,
           },
           mianfei: true,

pages/product/peixun.vue

@@ -138,7 +138,7 @@ export default {
             order: 2,
           },
           img: {
-            url: require('~/static/codeImage/code_jingli.png'),
+            url: require('~/static/codeImage/code-jingli.png'),
             order: 1,
           },
           mianfei: true,
@@ -153,7 +153,7 @@ export default {
             order: 1,
           },
           img: {
-            url: require('~/static/codeImage/code_jingli.png'),
+            url: require('~/static/codeImage/code-jingli.png'),
             order: 2,
           },
           mianfei: true,
@@ -168,7 +168,7 @@ export default {
             order: 2,
           },
           img: {
-            url: require('~/static/codeImage/code_jingli.png'),
+            url: require('~/static/codeImage/code-jingli.png'),
             order: 1,
           },
           mianfei: true,
@@ -183,7 +183,7 @@ export default {
             order: 1,
           },
           img: {
-            url: require('~/static/codeImage/code_jingli.png'),
+            url: require('~/static/codeImage/code-jingli.png'),
             order: 2,
           },
           mianfei: true,

pages/product/xingZhengGuanLi.vue

@@ -15,10 +15,8 @@
       行政部门主要负责企业的行政管理工作，配合业务部门进行文案写作、协调组织会议，商务接待、办公品采购等业务。
     </div>
 
-    <div class="client-container">
       <!--  岗位职责  -->
       <gangweiList label="岗位职责" :list="gangwei" :pc-num="3" :h5-num="2" :pc-margin="320" :h5-margin="0"></gangweiList>
-    </div>
 
 
     <!--  部分课程列表  -->

pages/solution/exam.vue

@@ -154,7 +154,7 @@ export default {
             order: 2,
           },
           img: {
-            url: require('~/static/codeImage/code_jingli.png'),
+            url: require('~/static/codeImage/code-jingli.png'),
             order: 1,
           },
           mianfei: true,
@@ -180,7 +180,7 @@ export default {
             order: 1,
           },
           img: {
-            url: require('~/static/codeImage/code_jingli.png'),
+            url: require('~/static/codeImage/code-jingli.png'),
             order: 2,
           },
           mianfei: true,
@@ -209,7 +209,7 @@ export default {
             order: 2,
           },
           img: {
-            url: require('~/static/codeImage/code_jingli.png'),
+            url: require('~/static/codeImage/code-jingli.png'),
             order: 1,
           },
           mianfei: false,
@@ -232,7 +232,7 @@ export default {
             order: 1,
           },
           img: {
-            url: require('~/static/codeImage/code_jingli.png'),
+            url: require('~/static/codeImage/code-jingli.png'),
             order: 2,
           },
           mianfei: false,

pages/testPage.vue

@@ -32,7 +32,7 @@ export default {
             order: 2,
           },
           img: {
-            url: require('~/static/codeImage/code_jingli.png'),
+            url: require('~/static/codeImage/code-jingli.png'),
             order: 1,
           },
           mianfei: true,
@@ -57,7 +57,7 @@ export default {
             order: 1,
           },
           img: {
-            url: require('~/static/codeImage/code_jingli.png'),
+            url: require('~/static/codeImage/code-jingli.png'),
             order: 2,
           },
           mianfei: true,
@@ -82,7 +82,7 @@ export default {
             order: 2,
           },
           img: {
-            url: require('~/static/codeImage/code_jingli.png'),
+            url: require('~/static/codeImage/code-jingli.png'),
             order: 1,
           },
           mianfei: true,
@@ -107,7 +107,7 @@ export default {
             order: 1,
           },
           img: {
-            url: require('~/static/codeImage/code_jingli.png'),
+            url: require('~/static/codeImage/code-jingli.png'),
             order: 2,
           },
           mianfei: true,