合并分支,修改差异文件

components/Head.vue

@@ -4,9 +4,11 @@
     <div class="head-top-content">
       <div class="max-width-content">
         <img
-          :src="$cookies.get('lang') == 'en-US'
-            ? 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/www/pc/en-logo.png'
-            : 'https://zws-imgs-pub.ezijing.com/static/public/0411340f9306b908eda54b5d66668f50.png'"
+          :src="
+            $cookies.get('lang') == 'en-US'
+              ? 'https://webapp-pub.oss-cn-beijing.aliyuncs.com/www/pc/en-logo.png'
+              : 'https://zws-imgs-pub.ezijing.com/static/public/0411340f9306b908eda54b5d66668f50.png'
+          "
           alt=""
           @click="goPage('/')"
         />
@@ -147,18 +149,6 @@ export default {
               name: this.$t('menu.servicesChild.online'),
               isShow: false,
               childern: [
-                {
-                  name: this.$t('menu.servicesChild.onlineChild.design'),
-                  pathType: 3
-                },
-                {
-                  name: this.$t('menu.servicesChild.onlineChild.support'),
-                  pathType: 3
-                },
-                {
-                  name: this.$t('menu.servicesChild.onlineChild.joint'),
-                  pathType: 3
-                },
                 {
                   name: '核心能力概括',
                   path: '/services/solution'