panhui vor 5 Jahren
Ursprung
Commit
d98c04b017

+ 1 - 1
project.config.json

@@ -83,7 +83,7 @@
                 {
                     "id": -1,
                     "name": "展商详情",
-                    "pathName": "pagesVendor/Detail",
+                    "pathName": "pagesVendor/Connect",
                     "query": "id=1421",
                     "scene": null
                 },

+ 4 - 0
src/components/Banner.vue

@@ -10,6 +10,7 @@
                         height="100%"
                         fit="cover"
                         :radius="radius"
+                        @click="goDetail"
                     />
                     <div class="video" v-else>
                         <video class="video-content" :src="item.img"></video>
@@ -118,6 +119,9 @@ export default {
             } else {
                 return false;
             }
+        },
+        goDetail() {
+            console.log(this.info.url);
         }
     },
     onPageScroll(e) {

+ 2 - 1
src/components/bar/SearchBar.vue

@@ -4,7 +4,8 @@
             <img class="logo" src="../../static/imgs/home_logo.png" alt="" />
             <div class="search">
                 <van-icon name="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/search.png" />
-                <span>搜索展商/产品/资讯</span>
+                <!-- <span>搜索展商/产品/资讯</span> -->
+                <span>搜索...</span>
             </div>
         </div>
     </div>

+ 8 - 1
src/components/product/Grid.vue

@@ -6,7 +6,14 @@
                 <h4>{{ name }}</h4>
                 <!-- <p>{{ info.model }}</p> -->
 
-                <van-image class="grid-logo" width="100%" :height="25" :src="info.logo1 + $oss.logo1" fit="contain" />
+                <van-image
+                    v-if="info.logo1"
+                    class="grid-logo"
+                    width="100%"
+                    :height="25"
+                    :src="info.logo1"
+                    fit="contain"
+                />
             </div>
         </div>
     </div>

+ 5 - 1
src/components/product/GridBig.vue

@@ -7,7 +7,7 @@
                 <p>{{ info.model }}</p>
             </div>
 
-            <van-image class="grid-logo" :height="45" :src="info.logo1 + $oss.logo1" fit="heightFix" />
+            <van-image v-if="info.logo1" class="grid-logo" :height="45" :src="info.logo1" fit="heightFix" />
         </div>
     </div>
 </template>
@@ -60,5 +60,9 @@ export default {
     &:active {
         background-color: darken(#fff, 5);
     }
+
+    .grid-logo {
+        flex-shrink: 0;
+    }
 }
 </style>

+ 1 - 1
src/components/product/GridNormal.vue

@@ -2,7 +2,7 @@
     <div class="grid" @click="navigateTo(`/pagesProduct/Detail?id=${info.id}`, false)">
         <van-image class="grid-img" width="100%" height="170px" :src="img" fit="cover" />
         <div class="content">
-            <van-image class="grid-logo" :height="42" :src="info.logo1 + $oss.logo1" fit="heightFix" />
+            <van-image v-if="info.logo1" class="grid-logo" :height="42" :src="info.logo1" fit="heightFix" />
             <div class="content-bottom">
                 <div class="text">
                     <h3 class="fontNormal">{{ name }}</h3>

+ 1 - 1
src/components/product/RowMini.vue

@@ -11,7 +11,7 @@
         <div class="info">
             <h3>{{ getName(info) }}</h3>
             <div class="sub">
-                <van-image :src="info.logo1 + $oss.logo1" v-if="info.logo1" :width="39" :height="17" fit="contain" />
+                <van-image :src="info.logo1" v-if="info.logo1" :width="39" :height="17" fit="contain" />
                 <p>{{ info.model }}</p>
             </div>
         </div>

+ 1 - 1
src/components/product/RowNormal.vue

@@ -11,7 +11,7 @@
         <div class="info">
             <h3>{{ getName(info) }}</h3>
             <div class="sub">
-                <van-image :src="info.logo1 + $oss.logo1" v-if="info.logo1" :width="39" :height="17" fit="contain" />
+                <van-image :src="info.logo1" v-if="info.logo1" :width="39" :height="17" fit="contain" />
                 <p>{{ info.model }}</p>
             </div>
             <div class="flex1"></div>

+ 5 - 1
src/components/vendor/Application.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="application" @click="goDetail">
-        <van-image :src="bgs[index % 8]" :radius="4" :width="100" :height="120" fit="cover" />
+        <van-image :src="img" :radius="4" :width="100" :height="120" fit="cover" />
         <div class="text">{{ name }}</div>
     </div>
 </template>
@@ -24,6 +24,10 @@ export default {
         id: {
             type: Number,
             default: 0
+        },
+        img: {
+            type: String,
+            default: ''
         }
     },
     data() {

+ 6 - 0
src/mixins/pages.js

@@ -8,6 +8,9 @@ export default {
     onReady() {
         this.setInfo();
     },
+    onShow() {
+        this.setInfo();
+    },
     methods: {
         setInfo() {
             this.$nextTick(() => {
@@ -15,6 +18,9 @@ export default {
                     isLogin: this.isLogin
                 });
             });
+        },
+        chatAdmin() {
+            this.navigateTo('/pagesChat/ChatDetail?toUserId=1&type=admin&isAsk=1');
         }
     }
 };

+ 22 - 18
src/mixins/searchList.js

@@ -22,7 +22,8 @@ export default {
             pushList: true, //是否往list后面push
             finish: false,
             searchTop: 0,
-            noSearch: false
+            noSearch: false,
+            filterStart: false
         };
     },
     computed: {
@@ -192,6 +193,7 @@ export default {
             const querys = Object.keys(_query).map(key => {
                 return key + '=' + _query[key];
             });
+            this.filterStart = true;
 
             this.navigateTo('/pagesHome/FilterPage?' + querys.join('&'), false);
         },
@@ -216,23 +218,25 @@ export default {
             this.getData();
         },
         filterInfo() {
-            if (this.filterQuery.pageType === 'vendor') {
-                this.categoryIds = this.filterInfo.categoryIds;
-                this.countries = this.filterInfo.countries;
-                this.continent = this.filterInfo.continent;
-                this.enterpriseType = this.filterInfo.enterpriseType;
-                this.applicationField = this.filterInfo.applicationField;
-                this.page = 1;
-                this.getData();
-            } else if (this.filterQuery.pageType === 'product') {
-                this.categoryIds = this.filterInfo.categoryIds;
-                this.countries = this.filterInfo.countries;
-                this.continent = this.filterInfo.continent;
-                this.brand = this.filterInfo.brand;
-                this.tagIds = this.filterInfo.tagIds;
-                this.applicationField = this.filterInfo.applicationField;
-                this.page = 1;
-                this.getData();
+            if (this.filterStart) {
+                if (this.filterQuery.pageType === 'vendor') {
+                    this.categoryIds = this.filterInfo.categoryIds;
+                    this.countries = this.filterInfo.countries;
+                    this.continent = this.filterInfo.continent;
+                    this.enterpriseType = this.filterInfo.enterpriseType;
+                    this.applicationField = this.filterInfo.applicationField;
+                    this.page = 1;
+                    this.getData();
+                } else if (this.filterQuery.pageType === 'product') {
+                    this.categoryIds = this.filterInfo.categoryIds;
+                    this.countries = this.filterInfo.countries;
+                    this.continent = this.filterInfo.continent;
+                    this.brand = this.filterInfo.brand;
+                    this.tagIds = this.filterInfo.tagIds;
+                    this.applicationField = this.filterInfo.applicationField;
+                    this.page = 1;
+                    this.getData();
+                }
             }
         }
     }

+ 1 - 24
src/native/robot/index.js

@@ -24,30 +24,7 @@ const componentOptions = {
     methods: {
         init() {},
         chatAdmin() {
-            console.log(this.data.isLogin);
-            if (!this.data.isLogin) {
-                wx.showModal({
-                    title: '提示',
-                    content: '需要补全资料方可使用此功能',
-                    confirmText: '立即补全',
-                    cancelText: '稍后再说',
-                    confirmColor: '#FFA526',
-                    cancelColor: '#BCC1CC',
-                    success(res) {
-                        if (res.confirm) {
-                            wx.navigateTo({
-                                url: '/pagesHome/Edit'
-                            });
-                        } else if (res.cancel) {
-                            console.log('用户点击取消');
-                        }
-                    }
-                });
-                return;
-            }
-            wx.navigateTo({
-                url: '/pagesChat/ChatDetail?toUserId=' + this.data.adminId + '&type=admin&isAsk=true'
-            });
+					this.triggerEvent('chatAdmin',{},{})
         }
     },
     // 组件生命周期

+ 1 - 1
src/pages/Classify.vue

@@ -70,7 +70,7 @@
             </scroll-view>
         </div>
 
-        <robot id="robot" />
+        <robot id="robot" @chatAdmin="chatAdmin"/>
     </div>
 </template>
 <script>

+ 17 - 3
src/pages/Home.vue

@@ -27,7 +27,14 @@
                 >
                     <block v-for="(item, index) in banners" :key="item.id">
                         <swiper-item :class="{ active: index === current }">
-                            <van-image :src="item.img" width="620rpx" height="280rpx" radius="3" fit="cover" />
+                            <van-image
+                                @click="goDetail(item)"
+                                :src="item.img"
+                                width="620rpx"
+                                height="280rpx"
+                                radius="3"
+                                fit="cover"
+                            />
                         </swiper-item>
                     </block>
                 </swiper>
@@ -216,11 +223,11 @@
             </block>
         </sort-list>
 
-        <robot id="robot" />
+        <robot id="robot" @chatAdmin="chatAdmin" />
     </div>
 </template>
 <script>
-import SearchBar from '../components/bar/SearchBar';
+import SearchBar from '../components/bar/SearchBar.vue';
 import { getBanner } from '../utils/commont';
 import { mapState } from 'vuex';
 import ProductGridBig from '../components/product/GridBig.vue';
@@ -339,6 +346,7 @@ export default {
         filterQuery() {
             return {
                 pageType: 'product',
+                firstCategory: '',
                 categoryIds: this.categoryIds,
                 countries: this.countries,
                 searchTop: this.searchTop,
@@ -386,6 +394,12 @@ export default {
     methods: {
         tabChange(e) {
             console.log(e);
+        },
+        goDetail(info) {
+            console.log(info.url);
+            if (info.url) {
+                this.navigateTo(info.url);
+            }
         }
     },
     onReachBottom() {

+ 1 - 1
src/pages/My.vue

@@ -108,7 +108,7 @@
 
         <auth-phone ref="auth" :info="wxInfo" :show.sync="showPhone"></auth-phone>
 
-        <robot id="robot" />
+        <robot id="robot" @chatAdmin="chatAdmin" />
     </div>
 </template>
 

+ 6 - 1
src/pagesChat/ChatForm.vue

@@ -20,7 +20,12 @@
                 :value="info.functionalRequirements"
             />
             <van-cell :border="false" title="计划加工" v-if="info.artifact" :value="info.artifact" />
-            <van-cell :border="false" title="需求描述" v-if="info.otherProblems" :value="info.otherProblems" />
+            <van-cell
+                :border="false"
+                title="需求描述"
+                v-if="info.otherProblems || info.problems"
+                :value="info.otherProblems || info.problems"
+            />
             <van-cell :border="false" title="意向产品" v-if="info.products">
                 <div class="product-list">
                     <product-row

+ 1 - 1
src/pagesHome/Brand.vue

@@ -91,7 +91,7 @@
                 </div>
             </sort-list>
         </div>
-        <robot id="robot" />
+        <robot id="robot" @chatAdmin="chatAdmin" />
     </div>
 </template>
 <script>

+ 1 - 1
src/pagesHome/ShowView.vue

@@ -4,7 +4,7 @@
 }
 </config>
 <template>
-    <web-view src="https://studio.realibox.com/public/f098d276e2e4995df14eac3854eb73789e15bae0"></web-view>
+    <web-view src="https://www.forjoygroup.com/3dvshow/demo/waigaoqiao/ifr.html"></web-view>
 </template>
 <script>
 export default {

+ 4 - 1
src/pagesImt/Index.vue

@@ -170,7 +170,10 @@ export default {
             return list[this.active];
         }
     },
-    onLoad() {
+    onLoad(options) {
+        if (options.active) {
+            this.active = Number(options.active);
+        }
         setTimeout(() => {
             this.showBottom = true;
         }, 1000);

+ 1 - 1
src/pagesImt/Service.vue

@@ -23,7 +23,7 @@ export default {
                 return {
                     icon: item.icon,
                     name: item.name,
-                    sub: item.content
+                    sub: item.sub
                 };
             });
         }

+ 110 - 43
src/pagesProduct/Detail.vue

@@ -12,7 +12,7 @@
         <banner :banners="banners" :height="375" :radius="0" :autoplay="false"></banner>
         <div class="main" id="main">
             <div class="info">
-                <div class="ad" @click="goLocation">
+                <div class="ad" @click="goLocation" v-if="productInfo.offlineExperience">
                     <span>可在IMT展厅线下体验,点击查看地址</span>
                     <img src="../static/imgs/iocn_dingwei.png" alt="" />
                 </div>
@@ -28,14 +28,14 @@
                             @click="collection"
                             :custom-class="animate ? 'my-icon iconAnimate' : 'my-icon'"
                             :name="isCollection ? 'icon-aixin' : 'icon-icon_collect'"
-                            :size="32"
+                            :size="36"
                             :color="isCollection ? $colors.warn : '#BCC1CC'"
                             class-prefix="iconfont"
                         />
                         <van-icon
                             custom-class="my-icon"
                             name="icon-icon_share"
-                            :size="32"
+                            :size="36"
                             color="#BCC1CC"
                             class-prefix="iconfont"
                         />
@@ -47,21 +47,36 @@
                     <van-cell :title="$t('chan-pin-pin-pai')" :border="false" :value="productInfo.brand" />
                     <van-cell :title="$t('ying-wen-pin-ming')" :border="false" :value="productInfo.enName" />
                     <van-cell :title="$t('chan-pin-lei-bie')" :border="false" :value="productCategoryName" />
-                    <van-cell title="平均交货周期" :border="false" :value="productInfo.averageLeadTime" />
-                    <van-cell title="产地" :border="false" :value="productInfo.origin" />
+                    <van-cell
+                        title="交货周期"
+                        :border="false"
+                        v-if="productInfo.averageLeadTime"
+                        :value="productInfo.averageLeadTime"
+                    />
+                    <van-cell title="产品产地" v-if="productInfo.origin" :border="false" :value="productInfo.origin" />
                     <van-cell title="应用领域" :border="false" :value="applicationField" />
                     <van-cell title="产品标签" :border="false">
                         <div>
-                            <van-tag plain v-for="(item, index) in tags" :key="index">{{ item }}</van-tag>
+                            <van-tag color="#000" plain v-for="(item, index) in tags" :key="index">{{ item }}</van-tag>
                         </div>
                     </van-cell>
                 </van-cell-group>
             </div>
 
             <div class="vendor" @click="navigateTo('/pagesVendor/Detail?id=' + vendorInfo.id)">
-                <van-icon :name="vendorInfo.logo" :size="60" />
+                <van-image class="logo" :radius="4" :src="vendorInfo.logo" :width="60" :height="60" />
                 <div class="vendor-info">
-                    <h3>{{ getName(vendorInfo, ['chCompanyName', 'enCompanyName']) }}</h3>
+                    <div class="vendor-title">
+                        <h3>
+                            {{ getName(vendorInfo, ['chCompanyName', 'enCompanyName']) }}
+                        </h3>
+                        <van-image
+                            :width="17"
+                            :height="19"
+                            src="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/icon_qiyerenzheng.png"
+                            fit="contain"
+                        />
+                    </div>
 
                     <div class="vendor-btn">
                         <van-button :color="$colors.warn" size="small">进入展商</van-button>
@@ -80,17 +95,16 @@
                 >
                     <van-tab title="图文详情">
                         <div class="detail-content first">
-                            <van-button
-                                class="imgList-btn"
-                                size="small"
-                                :color="$colors.warn"
-                                round
-                                icon="photo"
-                                plain
-                                v-if="showBtn && detailImgList.length > 0"
-                                @click="showImgs"
-                            ></van-button>
+                            <div class="imgList-btn" v-if="showBtn && detailImgList.length > 0" @click="showImgs">
+                                <van-image
+                                    :width="20"
+                                    :height="16"
+                                    src="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/icon_chakantupian.png"
+                                    fit="contain"
+                                />
+                            </div>
                             <div class="tips" v-html="introduction"></div>
+                            <van-divider />
                             <!-- <rich-text v-if="detailImg" :nodes="detailImg"></rich-text> -->
                             <div class="detailhtml">
                                 <div v-html="detailImg" v-if="detailImg"></div>
@@ -113,15 +127,18 @@
             <div class="fixed-bottom">
                 <div class="fixed-bottom-content">
                     <div class="btn-icon" @click="navigateTo('/pagesProduct/Contrast?productId=' + productId)">
-                        <van-icon name="icon-xiangqingye_iocn_vs" :size="24" class-prefix="iconfont" />
+                        <van-image
+                            src="https://imttech.oss-cn-hangzhou.aliyuncs.com/micro/xiangqingye_iocn_vs.png"
+                            :width="24"
+                            :height="24"
+                        />
                         <div class="text">对比</div>
                     </div>
                     <div class="btn-icon" @click="navigateTo('/pagesProduct/IntentionList')">
                         <van-icon
-                            name="icon-xiangqingye_iocn_yixiangdan"
+                            name="https://imttech.oss-cn-hangzhou.aliyuncs.com/micro/xiangqingye_iocn_yixiangdan.png"
                             :info="intentionList.length > 0 ? intentionList.length : ''"
                             :size="24"
-                            class-prefix="iconfont"
                         />
                         <div class="text">意向单</div>
                     </div>
@@ -368,11 +385,21 @@ export default {
                         return item.split('"')[0];
                     })
                     .filter(item => {
-                        return item;
+                        return item && this.checkImg(item);
                     });
             } else {
                 this.detailImgList = [];
             }
+            console.log(this.detailImgList);
+        },
+        checkImg(file) {
+            const imglist = ['png', 'PNG', 'jpg', 'JPG', 'jpeg', 'JPEG', 'bmp', 'BMP', 'gif', 'GIF'];
+            const _info = file.split('.');
+            if (imglist.indexOf(_info[_info.length - 1]) !== -1) {
+                return true;
+            } else {
+                return false;
+            }
         },
         showImgs() {
             if (this.detailImgList.length > 0) {
@@ -386,12 +413,14 @@ export default {
 };
 </script>
 <style lang="less">
+.van-cell {
+}
 .main {
     .tips {
         font-size: 14px;
-        color: #292c33;
+        color: #3d424d;
         line-height: 24px;
-        padding: 20px 16px;
+        // padding: 20px 16px;
         font-weight: bold;
     }
 }
@@ -403,7 +432,7 @@ export default {
         position: relative;
 
         .title {
-            font-size: 18px;
+            font-size: 20px;
             font-weight: bold;
             color: #292c33;
             line-height: 25px;
@@ -419,11 +448,11 @@ export default {
 
     .btn {
         position: absolute;
-        right: 0;
-        bottom: 12px;
+        right: 0px;
+        bottom: 0px;
 
         ._van-icon {
-            margin-left: 5px;
+            margin-left: 10px;
         }
     }
 
@@ -431,15 +460,26 @@ export default {
     --divider-margin: 10px 0px;
     --cell-vertical-padding: 8px;
     --cell-horizontal-padding: 0px;
-    --cell-text-color: #292c33;
     --cell-font-size: 13px;
-    --cell-value-color: #444444;
+    --cell-text-color: #292c33;
+    --cell-value-color: #000;
     .van-cell__title {
         font-weight: bold;
+        min-width: 52px;
+        margin-right: 46px;
+        flex-grow: 0;
     }
 
     .van-cell__value {
         flex-grow: 2;
+        text-align: left;
+        .van-tag {
+            font-size: 13px;
+            line-height: 22px;
+            &::before {
+                border: 1px solid #dcdfe6;
+            }
+        }
     }
 }
 .ad {
@@ -449,6 +489,7 @@ export default {
     align-items: center;
     padding: 0 10px;
     justify-content: space-between;
+    height: 30px;
     span {
         font-size: 12px;
         color: @warn;
@@ -462,7 +503,7 @@ export default {
 }
 
 .van-tag {
-    margin-left: 5px;
+    margin-right: 5px;
 }
 
 .vendor {
@@ -476,12 +517,30 @@ export default {
         flex-direction: column;
         justify-content: space-between;
         margin-left: 8px;
+        overflow: hidden;
+
+        .vendor-title {
+            display: flex;
+            align-items: center;
+            overflow: hidden;
+            .van-image {
+                margin-left: 4px;
+            }
+        }
 
         .vendor-btn {
             --button-small-height: 26px;
             --button-small-min-width: 70px;
         }
     }
+
+    ._van-image.logo {
+        flex-shrink: 0;
+
+        .van-image {
+            border: 1px solid #dcdfe6;
+        }
+    }
 }
 
 .van-tabs {
@@ -505,15 +564,15 @@ export default {
     box-sizing: border-box;
 
     &.first {
-        background-color: @bg;
-        padding: 0 0;
+        // background-color: @bg;
+        // padding: 0 0;
         .tips {
             background-color: @bgw;
-            margin-bottom: 16px;
+            // padding: 20px 0;
         }
         .detailhtml {
             background-color: @bgw;
-            padding: 20px 16px;
+            // padding: 20px 16px;
         }
     }
 }
@@ -540,9 +599,15 @@ export default {
 
 .fixed-bottom {
     height: 60px;
+    padding-bottom: calc(8px + constant(safe-area-inset-bottom));
+    padding-bottom: calc(8px + env(safe-area-inset-bottom));
+
     .fixed-bottom-content {
         background-color: @bgw;
         padding: 8px 16px;
+        padding-bottom: calc(8px + constant(safe-area-inset-bottom));
+        padding-bottom: calc(8px + env(safe-area-inset-bottom));
+
         position: fixed;
         left: 0;
         right: 0;
@@ -550,7 +615,7 @@ export default {
         height: 60px;
         display: flex;
         z-index: 200;
-        box-sizing: border-box;
+        // box-sizing: border-box;
         box-shadow: 0px -1px 2px 0px rgba(0, 0, 0, 0.04);
         align-items: center;
         .btn-icon {
@@ -590,12 +655,14 @@ export default {
     position: fixed;
     right: 10px;
     bottom: 15vh;
-    .van-button {
-        background-color: @bgw;
-        z-index: 200;
-        --button-small-min-width: 30px;
-        --button-border-width: 0px;
-        box-shadow: 2px 2px 2px 0px rgba(0, 0, 0, 0.1);
-    }
+    background-color: @bgw;
+    z-index: 200;
+    width: 40px;
+    height: 40px;
+    border-radius: 100%;
+    box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.1);
+    display: flex;
+    align-items: center;
+    justify-content: center;
 }
 </style>

+ 2 - 0
src/pagesProduct/Inquiry.vue

@@ -28,6 +28,7 @@
                 class="textarea"
                 @input="artifact = $event.detail.value"
                 @blur="artifact = $event.detail.value"
+                @change="artifact = $event.detail.value"
                 auto-height
                 placeholder="请输入计划加工的工件名称"
                 placeholder-class="pla-textarea"
@@ -39,6 +40,7 @@
                 class="textarea"
                 @input="otherProblems = $event.detail.value"
                 @blur="otherProblems = $event.detail.value"
+                @change="otherProblems = $event.detail.value"
                 auto-height
                 placeholder="请简要描述您的问题需求,100字以内"
                 placeholder-class="pla-textarea"

+ 1 - 0
src/pagesVendor/About.vue

@@ -55,6 +55,7 @@
                                 :id="item.id"
                                 :storeId="info.id"
                                 @goDetail="changeActive"
+                                :img="item.img"
                             ></application>
                         </block>
 

+ 7 - 0
src/pagesVendor/Connect.vue

@@ -27,6 +27,8 @@
             <h2>计划加工</h2>
             <textarea
                 class="textarea"
+                @input="artifact = $event.detail.value"
+                @confirm="artifact = $event.detail.value"
                 @blur="artifact = $event.detail.value"
                 auto-height
                 placeholder="请输入计划加工的工件名称"
@@ -37,6 +39,8 @@
             <h2>需求描述</h2>
             <textarea
                 class="textarea"
+                @input="otherProblems = $event.detail.value"
+                @confirm="otherProblems = $event.detail.value"
                 @blur="otherProblems = $event.detail.value"
                 auto-height
                 placeholder="请简要描述您的问题需求,100字以内"
@@ -155,6 +159,9 @@ export default {
         },
         changeValue(e) {
             console.log(e);
+        },
+        keyboardheightchange(e) {
+            console.log(e);
         }
     },
     components: {

+ 2 - 1
src/styles/fonts.less

@@ -18,7 +18,8 @@
     font-style: normal;
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
-    position: relative;
+		position: relative;
+		font-weight: normal;
 }
 .iconfont-icon-aixin:before {
     content: '\e8c3';

+ 6 - 6
src/utils/imtPageInfo.js

@@ -62,7 +62,7 @@ const services = [
     {
         name: '检测认证',
         icon: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/imt_fuwu_icon_03.png',
-        sub: '政策咨询、投资咨询、公司事务代理等',
+        sub: '进口机床现场法定检验及采信第三方检测报告',
         content:
             '行业专业检测机构,为客户提供进口机床法定检验、机床精度及性能检测等服务。实行进口机床现场法定检验及采信第三方检测报告。',
         cases: [
@@ -81,7 +81,7 @@ const services = [
     {
         name: '专业培训',
         icon: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/imt_fuwu_icon_04.png',
-        sub: '进口机床现场法定检验及采信第三方检测报告',
+        sub: '为企业输送智能制造高技能人才',
         content:
             '园区设立 “上海市智能制造高技能人才培养基地外高桥分基地”,是由上海市智能制造产业协会、上海浦东智能制造协共同组建的专业化培训平台,旨在服务更多智能制造优秀企业,以产业发展、企业需求为导向,加快为企业输送智能制造高技能人才。',
         cases: [
@@ -100,7 +100,7 @@ const services = [
     {
         name: '商务咨询',
         icon: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/imt_fuwu_icon_05.png',
-        sub: '行业展会、政企交流活动、研讨会、技术论坛',
+        sub: '政策咨询、投资咨询、公司事务代理等',
         content: '配备专业政策咨询及公司事务咨询团队,为客户提供政策咨询、投资咨询、公司事务代理等服务。',
         cases: [
             {
@@ -118,7 +118,7 @@ const services = [
     {
         name: '参展服务',
         icon: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/imt_fuwu_icon_06.png',
-        sub: '为企业输送智能制造高技能人才',
+        sub: '设备保税参展全流程服务',
         color: '#64776F',
         content: '为客户提供设备保税参展服务,从设备到港到设备进馆完成调试的全流程服务。',
         img: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/case/imt_fuwu_img_062x.jpg'
@@ -126,7 +126,7 @@ const services = [
     {
         name: '行业交流',
         icon: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/imt_fuwu_icon_07.png',
-        sub: '设备保税参展全流程服务',
+        sub: '行业展会、政企交流活动、研讨会、技术论坛',
         color: '#B3775B',
         content: '组织筹办国际性的行业展会、组织政企交流活动、举办研讨会、技术论坛等专业活动。',
         img: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/case/imt_fuwu_img_072x.jpg'
@@ -153,7 +153,7 @@ const services = [
         icon: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/imt_fuwu_icon_10.png',
         sub: '整合生产资源,提供产能供应与需求配置服务',
         color: '#88785B',
-        content: '整合生产资源,为客提供产能供应与需求的配置服务。',
+        content: '整合生产资源,为客提供产能供应与需求的配置服务。',
         img: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/case/imt_fuwu_img_102x.jpg'
     },
     {