commit in 3.2

src/components/m-content/m-content.vue

@@ -1448,7 +1448,7 @@ export default {
             p4: '餐饮、家居等领域，为传统行业赋能，加速催生传统领域的新面貌。'
           },
           ct8: {
-            p1: 'Graphicsmedia是一个非营利性的国际组织，专注于计算机图形学、',
+            p1: 'GraphicsMedia是一个非营利性的国际组织，专注于计算机图形学、',
             p2: '多媒体技术及可视化交互数字媒体和3D视频技术等领域的研究开发。',
             p3: '组织成员均为以应用研究为重点的独立国际机构，',
             p4: '广泛分布于世界各地，如德国、西班牙、意大利、葡萄牙。'
@@ -1668,9 +1668,9 @@ export default {
           ct1: {
             title: 'Research Field',
             p1: 'High Accuracy and Fully Automatic 3D Digitization',
-            p2: 'Automatic 3D detection on production line',
-            p3: '3D digital modeling display of cultural ',
-            p4: 'heritage and architecture'
+            p2: 'Widely used for automatic 3D detection of industrial products,',
+            p3: 'and the high-precision 3D reconstruction of industrial products,',
+            p4: 'cultural relics, architecture, etc.'
           },
           ct2: {
             p6: 'Automatic identification ',
@@ -1721,7 +1721,7 @@ export default {
             // p6: " industry and subvert traditional way of display. "
           },
           ct8: {
-            p1: 'Graphicsmedia is an international non-profit organization which focuses on research and',
+            p1: 'GraphicsMedia is an international non-profit organization which focuses on research and',
             p2: 'development of computer graphics, multimedia and interactive technologies and 3D video',
             p3: 'technologies. They bring together independent international institutions from around the',
             p4: ' world such as Germany, Spain, Italy, Portugal, China, etc.',

src/components/m-content/style.css

@@ -77,6 +77,8 @@
   letter-spacing: 2px;
   font-weight: 600;
   line-height: 1.3em;
+  margin-bottom: 0.375em;
+
 }
 
 .content-bg {
@@ -85,7 +87,6 @@
 
 .fs40 {
   font-size: 1.0em;
-  margin-bottom: 0.85em;
   font-weight: 600;
 }
 .fs14{
@@ -298,7 +299,7 @@
   top: 16.925em;
   color: #fff;
   z-index: 3;
-  text-align: right;
+  text-align: left;
   margin-right: 3.8em;
 }
 
@@ -436,7 +437,7 @@
   z-index: 3;
   color: #fff;
   right: 3.8em;
-  text-align: right;
+  text-align: left;
 }
 
 /* .content-ar:after {
@@ -491,7 +492,7 @@
 
 .DFKI-text {
   position: absolute;
-  text-align: right;
+  text-align: left;
   top: 6.6em;
   right: 3.9em;
 }
@@ -642,8 +643,8 @@
   position: relative;
   color: #fff;
   right: 3.9em;
-  top: -8em;
-  text-align: right;
+  top: -7em;
+  text-align: left;
 }
 
 .click-box {
@@ -701,7 +702,7 @@
 .graphicsmedia-text {
   position: absolute;
   right: 3.9em;
-  text-align: right;
+  text-align: left;
   top: 0.375em;
 }
 
@@ -1057,6 +1058,7 @@
 }
 
 .Quotes__bottom-pattern {
+  display: none;
   position: absolute;
   bottom: 3.25em;
   width: 100%;
@@ -1108,7 +1110,7 @@
 
 .content-dynamicinformation {
   width: 100%;
-  height: 36.1em;
+  height: 32.1em;
   position: relative;
 }
 
@@ -1141,7 +1143,7 @@
 }
 
 .DI-title {
-  bottom: 1.625em;
+  bottom:1.2em;
 }
 
 .DI-text-one {

src/components/message-consultation/message-consultation.vue

@@ -3,7 +3,7 @@
     <div class="partners-title">
       <img :src="researchSrc" />
       <h3 class="fix-h3" v-if="Lang==='zh'">消息资讯</h3>
-      <h3 class="fix-h3" v-if="Lang==='en'">news</h3>
+      <h3 class="fix-h3" v-if="Lang==='en'">News</h3>
       <h3 class="fix-h3" v-if="Lang==='ge'">Informationen</h3>
     </div>
     <div class="message-consultation_body">

src/components/wrap-nav/wrap-nav.vue

@@ -97,7 +97,7 @@ export default {
             subMenu: [{title: 'DFKI', hash: '/index#cooperation'}, {
               title: '四维时代',
               hash: '/index#partners4DMail'
-            }, {title: '四维看看', hash: '/index#partners4DKKMail'}, {title: 'Graphicsmedia', hash: '/index#graphicsmediaMail'}]
+            }, {title: '四维看看', hash: '/index#partners4DKKMail'}, {title: 'GraphicsMedia', hash: '/index#graphicsmediaMail'}]
           },
           {name: '中德大会',
             id: 3,
@@ -129,7 +129,7 @@ export default {
             subMenu: [{title: 'DFKI', hash: '/index#cooperation'}, {
               title: '4DAGE',
               hash: '/index#partners4DMail'
-            }, {title: '4DKanKan', hash: '/index#partners4DKKMail'}, {title: 'Graphicsmedia', hash: '/index#graphicsmediaMail'}]},
+            }, {title: '4DKanKan', hash: '/index#partners4DKKMail'}, {title: 'GraphicsMedia', hash: '/index#graphicsmediaMail'}]},
           {name: 'Konferenz',
             id: 3,
             url: '',
@@ -160,7 +160,7 @@ export default {
             subMenu: [{title: 'DFKI', hash: '/index#cooperation'}, {
               title: '4DAGE',
               hash: '/index#partners4DMail'
-            }, {title: '4DKanKan', hash: '/index#partners4DKKMail'}, {title: 'Graphicsmedia', hash: '/index#graphicsmediaMail'}]},
+            }, {title: '4DKanKan', hash: '/index#partners4DKKMail'}, {title: 'GraphicsMedia', hash: '/index#graphicsmediaMail'}]},
           {name: 'Conference',
             id: 3,
             url: '',