0408

.env.development

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

project.config.json

@@ -73,9 +73,8 @@
       "list": [
         {
           "id": -1,
-          "name": "我的",
-          "pathName": "pages/Home",
-          "query": "local=en",
+          "name": "imt",
+          "pathName": "/pagesImt/Index",
           "scene": null
         },
         {

src/App.vue

@@ -9,6 +9,13 @@ export default {
         }
         wx.login({
             success: res => {
+                wx.uma.init({
+                    appKey: '60583fdab8c8d45c13a99cc4',
+                    useOpenid: true,
+                    autoGetOpenid: true,
+                    uploadUserInfo: true,
+                    debug: false
+                });
                 console.log(res);
                 this.$http.post('/auth/maLogin', { code: res.code }).then(res => {
                     this.$http.setToken(res.token);
@@ -51,15 +58,11 @@ export default {
         };
     },
     umengConfig: {
-        appKey: '60583fdab8c8d45c13a99cc4', //由友盟分配的APP_KEY
-        // 使用Openid进行统计，此项为false时将使用友盟+uuid进行用户统计。
-        // 使用Openid来统计微信小程序的用户，会使统计的指标更为准确，对系统准确性要求高的应用推荐使用Openid。
+        appKey: '60583fdab8c8d45c13a99cc4',
         useOpenid: true,
-        // 使用openid进行统计时，是否授权友盟自动获取Openid，
-        // 如若需要，请到友盟后台"设置管理-应用信息"(https://mp.umeng.com/setting/appset)中设置appId及secret
-        autoGetOpenid: false,
-        debug: true, //是否打开调试模式
-        uploadUserInfo: true // 自动上传用户信息，设为false取消上传，默认为false
+        autoGetOpenid: true,
+        uploadUserInfo: true,
+        debug: true
     }
 };
 </script>

src/components/bar/CustomBar.vue

@@ -96,6 +96,11 @@ export default {
             return this.ratio || !this.dark ? '#000' : '#fff';
         }
     },
+    watch: {
+        ratio() {
+            this.$emit('update:nowRatio', this.ratio);
+        }
+    },
     mounted() {
         this.menuButtonInfo = wx.getMenuButtonBoundingClientRect();
     },

src/components/bar/SearchBar.vue

@@ -1,7 +1,7 @@
 <template>
     <div :style="{ height: fixedHieght + 'px' }">
         <div class="navBar" :style="narStyle">
-            <img class="logo" src="../../static/imgs/home_logo.png" alt="" />
+            <img class="logo" src="../../static/imgs/logo.png" alt="" />
             <div class="search" @click="navigateTo('/pagesHome/Search', false)">
                 <van-icon name="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/search.png" />
                 <span>{{ $t('sou-suo-zhan-shang-chan-pin-zi-xun') }}</span>
@@ -55,10 +55,10 @@ export default {
     right: 0;
     z-index: 99;
     .logo {
-        width: 48px;
-        height: 100%;
+        width: 78px;
+        height: 28px;
         transform: translateY(-3px);
-        min-width: 48px;
+        min-width: 78px;
     }
 
     .search {

src/components/imt/Bottom.vue

@@ -1,10 +1,9 @@
 <template>
     <div class="imt-bottom">
-        <div class="bottom">
+        <div class="bottom" :style="narStyle" v-show="ratio || value !== 0">
             <van-grid column-num="4" :border="false">
                 <block v-for="(item, index) in navigations" :key="index">
                     <van-grid-item
-                        :icon="value === index ? item.img2 : item.img1"
                         :text="$t(item.text)"
                         :custom-class="`grid-info ${index === value ? 'active' : ''}`"
                         @click="choose(index)"
@@ -20,10 +19,15 @@ export default {
         value: {
             type: Number,
             default: 0
+        },
+        ratio: {
+            type: Number,
+            default: 0
         }
     },
     data() {
         return {
+            menuButtonInfo: {},
             navigations: [
                 {
                     img1: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/imt_icon_gaikuang.png',
@@ -52,6 +56,28 @@ export default {
             ]
         };
     },
+    computed: {
+        narStyle() {
+            let style = {};
+            if (this.value === 0) {
+                style.background = 'rgba(255, 255, 255,' + this.ratio + ')';
+            } else {
+                style.background = 'rgba(255, 255, 255)';
+            }
+            style.top = this.fixedHieght + 'px';
+            return style;
+        },
+        fixedHieght() {
+            if (this.menuButtonInfo.top) {
+                return this.menuButtonInfo.top + this.menuButtonInfo.height + 15;
+            } else {
+                return 71;
+            }
+        }
+    },
+    mounted() {
+        this.menuButtonInfo = wx.getMenuButtonBoundingClientRect();
+    },
     methods: {
         choose(index) {
             this.$emit('input', index);
@@ -85,37 +111,31 @@ export default {
 <style lang="less" scoped>
 .imt-bottom {
     height: 48px;
-    margin-top: 20px;
-    padding-bottom: calc(8px + constant(safe-area-inset-bottom));
-    padding-bottom: calc(8px + env(safe-area-inset-bottom));
-    background-color: @bgw;
 
     .bottom {
         position: fixed;
-        bottom: 0;
         left: 0;
         z-index: 200;
         width: 100%;
         min-width: 375px;
         height: 48px;
         right: 0;
-        padding-bottom: calc(8px + constant(safe-area-inset-bottom));
-        padding-bottom: calc(8px + env(safe-area-inset-bottom));
-        background-color: @bgw;
     }
 }
 </style>
 <style lang="less">
 .grid-info {
     .van-grid-item__content {
-        padding: 8px 8px;
+        --grid-item-content-background-color: #ffffff00;
+        padding: 12px 8px;
         .van-grid-item__text {
             font-size: 12px;
-            color: #878d99;
+            color: #292c33;
             line-height: 24px;
             margin-top: 0;
         }
         .van-grid-item__icon {
+            display: none;
             line-height: 16px;
             height: 16px;
             .van-icon {
@@ -128,6 +148,19 @@ export default {
         .van-grid-item__content {
             .van-grid-item__text {
                 color: @warn;
+                position: relative;
+
+                &::after {
+                    content: '';
+                    bottom: 0px;
+                    left: 50%;
+                    transform: translateX(-50%);
+                    position: absolute;
+                    background-color: @warn;
+                    width: 24px;
+                    height: 2px;
+                    border-radius: 1px;
+                }
             }
         }
     }

src/locales/en.json

@@ -67,7 +67,7 @@
   "yi-zhan-shi-fu-wu": "One-stop Service",
   "xin-yu-bao-zhang": "Reputation Guarantee",
   "da-pin-pai-xin-lai": "Top Brands",
-  "imt-ke-ji-ping-tai": "IMT Tech",
+  "imt-ke-ji-ping-tai": "IMT",
   "wo-men-de-fu-wu": "Services",
   "lian-xi-wo-men": "Contact",
   "ru-zhu-ping-tai": "Join Us",
@@ -180,7 +180,7 @@
   "wai-gao-qiao-zhi-neng-zhi-zao-fu-wu-chan-ye-yuan": "IMT",
   "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": "Tech",
+  "ke-ji-ping-tai": "IMT",
   "gao-du-ji-ju-xing": "Industry Agglomeration",
   "gao-jing-mi-chan-pin-ji-shu": "Cutting-edge Technologies",
   "gao-du-zhuan-ye-hua": "Specialized Services",
@@ -453,4 +453,4 @@
   "qing-xuan-ze-jiao-yi-shi-jian": "Pls select date of the deal",
   "chan-pin-xu-qiu-qing-dan": "Requirement List",
   "qing-shu-ru-18-wei-jin-jing-bei-an-dan-hao": "Format error for Entry record No."
-}
+}

src/locales/zh.json

@@ -6,7 +6,7 @@
   "ji-shu-fu-wu-shang": "技术服务商",
   "xin-pin-fa-bu": "新品发布",
   "hang-ye-xin-wen": "行业资讯",
-  "ji-shu-zi-xun": "技术资讯",
+  "ji-shu-zi-xun": "科技资讯",
   "hang-ye-huo-dong": "活动",
   "zheng-ce-xin-xi": "政策信息",
   "zong-he": "综合",
@@ -27,9 +27,9 @@
   "ying-yong-ling-yu": "应用领域",
   "chan-pin-biao-qian": "产品标签",
   "chan-di": "产地",
-  "quan-qiu-chan-pin": "全球产品",
-  "zhan-shang-zong-lan": "会员总览",
-  "imt-ping-tai": "IMT平台",
+  "quan-qiu-chan-pin": "产品信息",
+  "zhan-shang-zong-lan": "会员企业",
+  "imt-ping-tai": "外高桥 IMT",
   "xin-xi-zi-xun": "信息资讯",
   "zi-xun-re-xian": "咨询热线",
   "cha-kan-xiang-qing": "查看详情",
@@ -45,7 +45,7 @@
   "fen-xiang-zhan-shang": "分享会员",
   "guan-yu": "关于",
   "chan-pin-mu-lu": "产品目录",
-  "xin-wen-zi-xun": "信息资讯",
+  "xin-wen-zi-xun": "科技资讯",
   "di-zhi": "地址",
   "chang-ci": "场次",
   "bao-ming-jie-shu": "报名结束",
@@ -71,7 +71,7 @@
   "yi-zhan-shi-fu-wu": "一站式服务",
   "xin-yu-bao-zhang": "信誉保障",
   "da-pin-pai-xin-lai": "大品牌信赖",
-  "imt-ke-ji-ping-tai": "IMT科技平台",
+  "imt-ke-ji-ping-tai": "外高桥智能制造服务产业园  ·  IMT",
   "wo-men-de-fu-wu": "我们的服务",
   "lian-xi-wo-men": "联系我们",
   "ru-zhu-ping-tai": "入驻平台",
@@ -213,7 +213,7 @@
   "wai-gao-qiao-zhi-neng-zhi-zao-fu-wu-chan-ye-yuan": "外高桥智能制造服务产业园",
   "dian-ji-guan-kan-imt-3d-zhan-ting": "点击观看 IMT 3D展厅",
   "zhi-neng-zhi-zao-chan-ye-lian-sheng-tai-xi-tong": "智能制造产业链生态系统",
-  "ke-ji-ping-tai": "科技平台",
+  "ke-ji-ping-tai": "外高桥智能制造服务产业园  ·  IMT",
   "gao-du-ji-ju-xing": "行业集聚",
   "gao-jing-mi-chan-pin-ji-shu": "产品精尖",
   "gao-du-zhuan-ye-hua": "服务专业",
@@ -453,4 +453,4 @@
   "jin-jing-bei-an-dan-hao": "进境备案单号",
   "chan-pin-xu-qiu-qing-dan": "产品交易登记",
   "qing-shu-ru-18-wei-jin-jing-bei-an-dan-hao": "进境备案单号格式错误"
-}
+}

src/pagesImt/Index.vue

@@ -15,8 +15,11 @@
             :topHide="active === 0"
             :fixed="false"
             :barTop="300"
+            :nowRatio.sync="nowRatio"
         ></custom-bar>
 
+        <bottom v-model="active" :ratio="nowRatio"></bottom>
+
         <template v-if="active === 0">
             <div class="banner">
                 <banner :banners="banners" fixed :height="300" :radius="0" :scrollTop="scrollTop"></banner>
@@ -33,7 +36,7 @@
                 <div class="introduce">
                     <Title>
                         <template slot="name">
-                            IMT·<span :style="`color:${$colors.warn}`">{{ $t('ke-ji-ping-tai') }}</span>
+                            <span :style="`color:${$colors.warn}`">{{ $t('ke-ji-ping-tai') }}</span>
                         </template>
                         <template slot="sub">{{ $t('zhi-neng-zhi-zao-chan-ye-lian-sheng-tai-xi-tong') }}</template>
                     </Title>
@@ -76,8 +79,6 @@
         <service v-if="active === 2"></service>
 
         <connect v-if="active === 3"></connect>
-
-        <bottom v-model="active" v-show="showBottom"></bottom>
     </div>
 </template>
 <script>
@@ -95,6 +96,7 @@ export default {
             barTop: 100,
             showBottom: false,
             scrollTop: 0,
+            nowRatio: 0,
             banners: [
                 {
                     img: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/imt_top_banner.jpg'
@@ -102,9 +104,9 @@ export default {
             ],
             introduce: {
                 chName:
-                    'IMT科技平台，是外高桥智能制造服务产业园（IMT）推出的在线贸易服务平台，依托IMT行业高度集聚性、高度专业化的优势，引进全球制造业高精密机械设备及先进技术，打破物理空间局限性，拓宽功能服务，构建活跃的智能制造生态圈，使企业在资源整合的生态中共同发展。从设备供应商到采购商，从国外工厂到国内用户，实现智能制造产业链各企业间 “纵向+横向”的信息集成，为制造商、经销商、买家和服务商之间开展国际和国内贸易拓宽渠道、消除壁垒。',
+                    '外高桥智能制造服务产业园（IMT）上线智羿园区（T-PARK），推出在线贸易服务，依托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.'
+                    'Waigaoqiao Intelligent Manufacturing Trading Center (IMT), the first industry  park on T-PARK, introduces  high-precision  equipment  and  advanced technologies of global manufacturing industry relying on the advantages of industry agglomeration and specialization, and 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, broaden channels and eliminate barriers for international and domestic trade among manufacturers, distributors, buyers and service providers. '
             },
             modulars: [
                 {
@@ -181,9 +183,9 @@ export default {
                     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.'
+                            'We have cooperated with international industry associations and professional service organizations, including Swiss Center Shanghai, Association for Manufacturing Technology, VDM, Shanghai Inspecting & Testing Center of Machine Tool Products Quality of CMIF, Intelligent Manufacturing Association Shanghai, to provide professional and authoritative services for clients.'
                     }
                 },
                 {

src/utils/appState.js

@@ -49,7 +49,7 @@ const languageModels = new Map([['ch', 'zhong-wen'], ['en', 'ying-wen'], ['both'
 
 const InformationType = new Map([
     [
-        'INDUSTRY_NEWS',
+        'INDUSTRY_NEWS,POLICY_INFORMATION,INDUSTRY_ACTIVITIES',
         {
             name: 'hang-ye-xin-wen'
         }
@@ -67,20 +67,20 @@ const InformationType = new Map([
             name: 'ji-shu-zi-xun',
             type: 'bigImg'
         }
-    ],
-    [
-        'POLICY_INFORMATION',
-        {
-            name: 'zheng-ce-xin-xi'
-        }
-    ],
-    [
-        'INDUSTRY_ACTIVITIES',
-        {
-            name: 'hang-ye-huo-dong',
-            type: 'bigImg'
-        }
     ]
+    // [
+    //     'POLICY_INFORMATION',
+    //     {
+    //         name: 'zheng-ce-xin-xi'
+    //     }
+    // ],
+    // [
+    //     'INDUSTRY_ACTIVITIES',
+    //     {
+    //         name: 'hang-ye-huo-dong',
+    //         type: 'bigImg'
+    //     }
+    // ]
 ]);
 
 const emailRule = /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/;