0201

.env.development

@@ -1,4 +1,4 @@
-VUE_APP_BASE_URL=http://192.168.50.104:8080
+VUE_APP_BASE_URL=https://www.imttech.cn
 VUE_APP_PHONE=862160797117
 VUE_APP_EMAIL=imttech@itoc.com.cn
 VUE_APP_PRODUCTSTATUS=PENDING_REVIEW,NOW_ON_SHELF

src/components/News/Grid.vue

@@ -38,7 +38,7 @@
             </div>
 
             <div class="time" v-if="info.type === 'NEW_PRODUCT_RELEASE'">
-                {{ info.auditTime }}
+                {{ info.createdAt }}
             </div>
         </div>
         <div class="news-info-only" v-else>

src/components/filter/Application.vue

@@ -150,7 +150,7 @@ export default {
 
 .isEn {
     .list {
-        justify-content: flex-start!important;
+        justify-content: flex-start !important;
         .van-button {
             margin-right: 10px;
             font-size: 12px !important;

src/components/imt/Core.vue

@@ -1,12 +1,12 @@
 <template>
     <div class="core">
         <div class="name">
-            {{ info.title }}
+            {{ getName(info.title) }}
         </div>
         <div class="sub">
-            {{ info.sub }}
+            {{ getName(info.sub) }}
         </div>
-        <p>{{ info.content }}</p>
+        <p>{{ getName(info.content) }}</p>
         <div class="core-banner">
             <banner :banners="banners"></banner>
         </div>

src/locales/en.json

@@ -180,7 +180,7 @@
   "wai-gao-qiao-zhi-neng-zhi-zao-fu-wu-chan-ye-yuan": "Waigaoqiao Intelligent Manufacturing Trading Center",
   "dian-ji-guan-kan-imt-3d-zhan-ting": "Go to IMT 3D Showroom",
   "zhi-neng-zhi-zao-chan-ye-lian-sheng-tai-xi-tong": "Active ecosystem of intelligent manufacturing",
-  "ke-ji-ping-tai": "Technology",
+  "ke-ji-ping-tai": "Tech",
   "gao-du-ji-ju-xing": "Industry Agglomeration",
   "gao-jing-mi-chan-pin-ji-shu": "Cutting-edge Technologies",
   "gao-du-zhuan-ye-hua": "Specialized Services",

src/mixins/commont.js

@@ -47,7 +47,6 @@ export default {
             ) {
                 return info[labels[0]];
             } else {
-                console.log('c');
                 return info[labels[1]] || info[labels[0]];
             }
         },

src/pages/Home.vue

@@ -365,11 +365,15 @@ export default {
             };
         }
     },
-    onLoad(options) {
-        if (this.nodeEnv && options.local) {
-            this.$i18n.set('en');
-            this.checkTabBar();
+    watch: {
+        isChinese() {
+            getBanner('HOME', !this.isChinese).then(res => {
+                console.log(res);
+                this.banners = res;
+            });
         }
+    },
+    onLoad() {
         getBanner('HOME', !this.isChinese).then(res => {
             console.log(res);
             this.banners = res;

src/pages/My.vue

@@ -18,8 +18,8 @@
                 :radius="4"
             />
             <van-button
-                v-if="nodeEnv"
                 class="btn1"
+                v-if="nodeEnv"
                 color="#0F264D"
                 plain
                 @click="choose"

src/pagesImt/Index.vue

@@ -39,8 +39,7 @@
                     </Title>
 
                     <div class="p1">
-                        IMT科技平台，是外高桥智能制造服务产业园（IMT）推出的在线贸易服务平台，依托IMT行业高度集聚性、高度专业化的优势，引进全球制造业高精密机械设备及先进技术，打破物理空间局限性，拓宽功能服务，构建活跃的智能制造生态圈，使企业在资源整合的生态中共同发展。从设备供应商到采购商，从国外工厂到国内用户，实现智能制造产业链各企业间
-                        “纵向+横向”的信息集成，为制造商、经销商、买家和服务商之间开展国际和国内贸易拓宽渠道、消除壁垒。
+                        {{ getName(introduce) }}
                     </div>
 
                     <div class="introduce-img">
@@ -101,16 +100,33 @@ export default {
                     img: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/imt_top_banner.jpg'
                 }
             ],
+            introduce: {
+                chName:
+                    'IMT科技平台，是外高桥智能制造服务产业园（IMT）推出的在线贸易服务平台，依托IMT行业高度集聚性、高度专业化的优势，引进全球制造业高精密机械设备及先进技术，打破物理空间局限性，拓宽功能服务，构建活跃的智能制造生态圈，使企业在资源整合的生态中共同发展。从设备供应商到采购商，从国外工厂到国内用户，实现智能制造产业链各企业间 “纵向+横向”的信息集成，为制造商、经销商、买家和服务商之间开展国际和国内贸易拓宽渠道、消除壁垒。',
+                enName:
+                    'IMT Tech is the online trade service platform developed by Waigaoqiao Intelligent Manufacturing Trading Center (IMT). Relying on the advantages of industry agglomeration and specialization, IMT Tech introduces high-precision equipment and advanced technologies of global manufacturing industry, breaks the limitations of physical space and expands functional services to build an active ecosystem of intelligent manufacturing and to achieve common development by resource integration. From equipment suppliers to purchasers and from foreign factories to domestic users, we can realize "vertical + horizontal" information integration among enterprises in the field of intelligent manufacturing industry, and broaden channels and eliminate barriers for international and domestic trade among manufacturers, distributors, buyers and service providers.'
+            },
             modulars: [
                 {
                     imgs: [
                         'http://imttech.oss-cn-hangzhou.aliyuncs.com/case/imt_hexin_img_01_a.jpg',
                         'http://imttech.oss-cn-hangzhou.aliyuncs.com/case/imt_hexin_img_01_b.jpg'
                     ],
-                    title: '高端的服务定位',
-                    sub: '打造功能集成的智能制造服务产业平台',
-                    content:
-                        '外高桥智能制造服务产业园（IMT），坐落于中国（上海）自由贸易试验区，是一个服务模式、服务能级全面创新升级，针对高端智能制造行业的国际贸易便利化和专业化服务平台。'
+                    title: {
+                        chName: '高端的服务定位',
+                        enName: 'High-end Service Positioning'
+                    },
+                    sub: {
+                        chName: '打造功能集成的智能制造服务产业平台',
+                        enName:
+                            'To build a service platform with integrated functions for intelligent manufacturing industry'
+                    },
+                    content: {
+                        chName:
+                            '外高桥智能制造服务产业园（IMT），坐落于中国（上海）自由贸易试验区，是一个服务模式、服务能级全面创新升级，针对高端智能制造行业的国际贸易便利化和专业化服务平台。',
+                        enName:
+                            'Waigaoqiao Intelligent Manufacturing Trading Center (IMT), located in the Pilot Free Trade Zone (Shanghai), China, is an industry service platform focusing on international trade facilitation and specialized services with innovative and upgraded service modules for high-end intelligent manufacturing industry.'
+                    }
                 },
                 {
                     imgs: [
@@ -119,10 +135,20 @@ export default {
                         'http://imttech.oss-cn-hangzhou.aliyuncs.com/case/imt_hexin_img_02_c.jpg',
                         'http://imttech.oss-cn-hangzhou.aliyuncs.com/case/imt_hexin_img_02_d.jpg'
                     ],
-                    title: '成熟的运营模式',
-                    sub: '集聚性、专业化、便利化',
-                    content:
-                        '产业园针对进口各种高精端加工及检验检测等设备，已形成集中的设备展示中心、仓储分拨中心、维修中心及检测中心，为客户提供保税展示与演示、展品物流、零部件分拨、贸易代理、仓储管理、物业租赁、检测认证、专业培训、技术交流等服务。'
+                    title: {
+                        chName: '成熟的运营模式',
+                        enName: 'Mature Business Model'
+                    },
+                    sub: {
+                        chName: '集聚性、专业化、便利化',
+                        enName: 'Agglomeration, Specialization, Facilitation'
+                    },
+                    content: {
+                        chName:
+                            '产业园针对进口各种高精端加工及检验检测等设备，已形成集中的设备展示中心、仓储分拨中心、维修中心及检测中心，为客户提供保税展示与演示、展品物流、零部件分拨、贸易代理、仓储管理、物业租赁、检测认证、专业培训、技术交流等服务。',
+                        enName:
+                            'We have set up integrated centralized display center, distribution center and inspection center for all kinds of imported high-end machining tools and testing equipments, providing comprehensive services including display and demonstration, exhibition logistics, trading agency, warehousing and distribution, premises rental, testing and certification, technical exchange, specialized training, etc.'
+                    }
                 },
                 {
                     imgs: [
@@ -134,29 +160,45 @@ export default {
                         'http://imttech.oss-cn-hangzhou.aliyuncs.com/case/imt_hexin_img_03_f.jpg',
                         'http://imttech.oss-cn-hangzhou.aliyuncs.com/case/imt_hexin_img_03_g.jpg'
                     ],
-                    title: '顶级机床及设备',
-                    sub: '高精密、智能化',
-                    content: '集聚了国际领先的精密数控机床、机床工具、智能机器人、3D 打印、高精密检测设备等企业入驻。'
+                    title: {
+                        chName: '顶级机床及设备',
+                        enName: 'Machine Tools and Equipment at the cutting edge of intelligent manufacturing industry'
+                    },
+                    sub: { chName: '高精密、智能化', enName: 'High precision and intelligent' },
+                    content: {
+                        chName:
+                            '集聚了国际领先的精密数控机床、机床工具、智能机器人、3D 打印、高精密检测设备等企业入驻。',
+                        enName:
+                            'Globally leading companies of precision CNC machine tools, cutting tools, intelligent robots, 3D printing and high precision measuring equipment have gathered here.'
+                    }
                 },
                 {
                     imgs: [
                         'http://imttech.oss-cn-hangzhou.aliyuncs.com/case/imt_hexin_img_04_a.jpg',
                         'http://imttech.oss-cn-hangzhou.aliyuncs.com/case/imt_hexin_img_04_b.jpg'
                     ],
-                    title: '行业协会、专业机构',
-                    sub: '国际化、专业化',
-                    content:
-                        '我们与国际化的行业协会和专业的服务机构合作，包括上海瑞士中心、美国机床协会、德国机械设备制造业联合会、机械工业机床产品质量检测中心、上海浦东智能制造协会等，共同为客户提专业、权威的综合服务。'
+                    title: { chName: '行业协会、专业机构', enName: 'Association and Institution' },
+                    sub: { chName: '国际化、专业化', enName: 'Internationalization, Specialization' },
+                    content: {
+                        chName:
+                            '我们与国际化的行业协会和专业的服务机构合作，包括上海瑞士中心、美国机床协会、德国机械设备制造业联合会、机械工业机床产品质量检测中心、上海浦东智能制造协会等，共同为客户提专业、权威的综合服务。',
+                        enName:
+                            'We have cooperated with international industry associations and professional service organizations, including Swiss Center Shanghai, Association for Manufacturing Technology, VDMA, Shanghai Inspecting & Testing Center of Machine Tool Products Quality of CMIF, Intelligent Manufacturing Association Shanghai, to provide professional and authoritative services for clients.'
+                    }
                 },
                 {
                     imgs: [
                         'http://imttech.oss-cn-hangzhou.aliyuncs.com/case/imt_hexin_img_05_a.jpg',
                         'http://imttech.oss-cn-hangzhou.aliyuncs.com/case/imt_hexin_img_05_b.jpg'
                     ],
-                    title: '特色平台',
-                    sub: '权威、专业',
-                    content:
-                        '瞄准科技前沿和高端产业，上海集中推出26个面积在3至5平方公里的特色产业园区，我们被评选为智能制造板块8个特色园区之一，将在上海市经信委智能制造产业推进处的专业指导下全力打造智能制造产业发展新高地。凭借着一直坚持为客户提供的长短结合的展示推广服务经验，我们获批成为中国国际进口博览会智能及高端设备板块中唯一“6天+365天”常年展示交易平台。'
+                    title: { chName: '特色平台', enName: 'Characteristic Platform' },
+                    sub: { chName: '权威、专业', enName: 'Authoritative and Specialized' },
+                    content: {
+                        chName:
+                            '瞄准科技前沿和高端产业，上海集中推出26个面积在3至5平方公里的特色产业园区，我们被评选为智能制造板块8个特色园区之一，将在上海市经信委智能制造产业推进处的专业指导下全力打造智能制造产业发展新高地。凭借着一直坚持为客户提供的长短结合的展示推广服务经验，我们获批成为中国国际进口博览会智能及高端设备板块中唯一“6天+365天”常年展示交易平台。',
+                        enName:
+                            'Aiming at the cutting edge technology and high-end industries, Shanghai has launched 26 characteristic industrial parks covering the area of 3 to 5 square kilometers. IMT has been selected as one of the eight characteristic parks in the intelligent manufacturing sector. Under the professional guidance of the Intelligent Manufacturing Industry Promotion Department of SHEITC, we will strive to create a new “highland” for the development of intelligent manufacturing industry.'
+                    }
                 }
             ],
             active: 0,

src/pagesNews/Detail.vue

@@ -124,12 +124,12 @@ export default {
             let options = {
                 visitors: {
                     img(node) {
-                        if (node.classStr === 'blockImg') {
-                            node.styleStr = 'display:block;width:100%;height:auto';
+                        if (node.classStr === 'none') {
+                            node.styleStr = `width:${node.attr.width}px;height:${node.attr.width}px;${
+                                node.attr.style ? node.attr.style.join(';') : ''
+                            }`;
                         } else {
-                            node.styleStr = `width:${node.attr.width}px;height:${
-                                node.attr.width
-                            }px;${node.attr.style.join(';')}`;
+                            node.styleStr = 'display:block;width:100%;height:auto';
                         }
 
                         _this.imgList.push(node.attr.src);

src/pagesNews/News.vue

@@ -94,7 +94,7 @@ export default {
         listQuery() {
             return {
                 query: { type: this.hotActive ? [...this.informations][this.hotActive - 1].key : '', status: 'PASS' },
-                sort: 'top,desc;auditTime,desc;sort,desc'
+                sort: 'top,desc;createdAt,desc;sort,desc'
             };
         },
         pageType() {

src/pagesProduct/Detail.vue

@@ -317,12 +317,12 @@ export default {
                     let options = {
                         visitors: {
                             img(node) {
-                                if (node.classStr === 'blockImg') {
-                                    node.styleStr = 'display:block;width:100%;height:auto';
+                                if (node.classStr === 'none') {
+                                    node.styleStr = `width:${node.attr.width}px;height:${node.attr.width}px;${
+                                        node.attr.style ? node.attr.style.join(';') : ''
+                                    }`;
                                 } else {
-                                    node.styleStr = `width:${node.attr.width}px;height:${
-                                        node.attr.width
-                                    }px;${node.attr.style.join(';')}`;
+                                    node.styleStr = 'display:block;width:100%;height:auto';
                                 }
                                 _this.imgList.push(node.attr.src);
                             },

src/pagesVendor/Case.vue

@@ -72,12 +72,12 @@ export default {
             let options = {
                 visitors: {
                     img(node) {
-                        if (node.classStr === 'blockImg') {
-                            node.styleStr = 'display:block;width:100%;height:auto';
+                        if (node.classStr === 'none') {
+                            node.styleStr = `width:${node.attr.width}px;height:${node.attr.width}px;${
+                                node.attr.style ? node.attr.style.join(';') : ''
+                            }`;
                         } else {
-                            node.styleStr = `width:${node.attr.width}px;height:${
-                                node.attr.width
-                            }px;${node.attr.style.join(';')}`;
+                            node.styleStr = 'display:block;width:100%;height:auto';
                         }
                         _this.imgList.push(node.attr.src);
                     }

src/utils/commont.js

@@ -19,7 +19,7 @@ function getBanner(key, isEN = false) {
         )
         .then(res => {
             let list = res.content.filter(item => {
-                return item.isEN === isEN;
+                return item.en === isEN;
             });
             return Promise.resolve(list.length > 0 ? list : res.content);
         });