0202

project.config.json

@@ -123,7 +123,7 @@
                 {
                     "id": -1,
                     "name": "清单",
-                    "pathName": "pagesMine/Order",
+                    "pathName": "pagesMine/ProductsTransactionEdit",
                     "query": "",
                     "scene": null
                 },

src/components/Process.vue

@@ -184,9 +184,9 @@ background-color:fade(@value,10%);
 });
 
 .isEn {
-    .process-3 {
-        width: 720rpx;
-    }
+    // .process-3 {
+    //     width: 720rpx;
+    // }
 }
 // @for $indexi from 1 through 4 {
 //     .process-#{$i} {

src/components/bar/FilterSortBar.vue

@@ -310,4 +310,17 @@ export default {
         }
     }
 }
+
+.isEn {
+    .filter-list .col2 {
+        width: 33.3%;
+    }
+    .filter-list .col4 {
+        width: 33.3%;
+    }
+
+    .filterInfo.filter--small .filter-btn ._h3 {
+        font-size: 10px;
+    }
+}
 </style>

src/components/bar/SearchBar.vue

@@ -58,6 +58,7 @@ export default {
         width: 48px;
         height: 100%;
         transform: translateY(-3px);
+        min-width: 48px;
     }
 
     .search {

src/components/select/Industry.vue

@@ -19,24 +19,26 @@
                 <h3>{{ $t('xuan-ze-suo-shu-hang-ye') }}</h3>
                 <van-button :color="$colors.warn" plain @click="submit">{{ $t('que-ding') }}</van-button>
             </div>
-            <van-cell-group :border="false">
-                <block v-for="item in showList" :key="item.id">
-                    <van-cell
-                        @click="chooseList(item)"
-                        :border="false"
-                        :custom-class="nowChooseList.includes(item.id) ? 'active' : ''"
-                        :is-link="item.children && item.children.length > 0"
-                    >
-                        <h3 @click.stop="chooseList(item)" class="fontNormal" slot="title">{{ getName(item) }}</h3>
-                        <van-icon
-                            slot="right-icon"
-                            :size="24"
-                            v-if="nowChooseList.includes(item.id)"
-                            name="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/icon_oudlined_xuanzhong.png"
-                        />
-                    </van-cell>
-                </block>
-            </van-cell-group>
+            <scroll-view scroll-x scroll-y class="industry-bottom">
+                <van-cell-group :border="false">
+                    <block v-for="item in showList" :key="item.id">
+                        <van-cell
+                            @click="chooseList(item)"
+                            :border="false"
+                            :custom-class="nowChooseList.includes(item.id) ? 'active' : ''"
+                            :is-link="item.children && item.children.length > 0"
+                        >
+                            <h3 @click.stop="chooseList(item)" class="fontNormal" slot="title">{{ getName(item) }}</h3>
+                            <van-icon
+                                slot="right-icon"
+                                :size="24"
+                                v-if="nowChooseList.includes(item.id)"
+                                name="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/icon_oudlined_xuanzhong.png"
+                            />
+                        </van-cell>
+                    </block>
+                </van-cell-group>
+            </scroll-view>
         </van-popup>
     </div>
 </template>
@@ -252,4 +254,11 @@ export default {
         }
     }
 }
+
+.industry-bottom {
+    height: 300px;
+    width: 100%;
+    padding-bottom: calc(8px + constant(safe-area-inset-bottom));
+    padding-bottom: calc(8px + env(safe-area-inset-bottom));
+}
 </style>

src/locales/en.json

@@ -11,7 +11,7 @@
   "zong-he": "General",
   "ren-qi": "Trend",
   "vip-tui-jian-qi-ye": "Recommended ",
-  "shi-jian": "Time",
+  "shi-jian": "Date",
   "da-tu": "Pic",
   "lie-biao": "List",
   "chang-shang": "Company",
@@ -44,7 +44,7 @@
   "fen-xiang-zhan-shang": "Share",
   "guan-yu": "About",
   "chan-pin-mu-lu": "Catalog",
-  "xin-wen-zi-xun": "News",
+  "xin-wen-zi-xun": "Information",
   "di-zhi": "Address",
   "chang-ci": "Session",
   "bao-ming-jie-shu": "Closed",
@@ -56,17 +56,17 @@
   "ping-jun-jiao-huo-zhou-qi": "Average LT",
   "ke-zai-mt-zhan-ting-xian-xia-ti-yan-dian-ji-cha-kan-di-zhi": "Visit IMT to explore this product, click for location.",
   "te-dian-biao-qian": "Tag",
-  "tian-jia-yi-xiang-dan": "Add Willing List",
+  "tian-jia-yi-xiang-dan": "Add to Wish List",
   "ping-jun-jiao-huo-shi-jian": "Average LT",
   "qing-xuan-ze-guo-jia-he-di-qu": "Select Country/Region",
   "dian-ji-shang-chuan": "Upload",
   "qu-xiao": "Cancel",
   "que-ding": "Confirm",
-  "zhuan-ye-ping-tai": "Specialized",
-  "zi-yuan-ji-qun-pang-da": "Resource",
-  "yi-zhan-shi-fu-wu": "One-stop",
-  "xin-yu-bao-zhang": "Reputation",
-  "da-pin-pai-xin-lai": "Top",
+  "zhuan-ye-ping-tai": "Specialized Platform",
+  "zi-yuan-ji-qun-pang-da": "Resource Agglomeration",
+  "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",
   "wo-men-de-fu-wu": "Services",
   "lian-xi-wo-men": "Contact",
@@ -153,12 +153,12 @@
   "zhong-zhi": "Clear all",
   "shai-xuan": "Filter",
   "sou-suo-no": "Search",
-  "xiang-guan-de-chan-pin": "related product",
-  "xiang-guan-de-zhan-shang": "related company",
-  "xiang-guan-de-zi-xun": "related Information",
+  "xiang-guan-de-chan-pin": "",
+  "xiang-guan-de-zhan-shang": "",
+  "xiang-guan-de-zi-xun": "",
   "sou-suo-li-shi": "Search history",
   "qing-kong-ji-lu": "Clear",
-  "re-men-sou-suo": "Hot searches",
+  "re-men-sou-suo": "Hot",
   "ti-shi": "Tip",
   "que-ding-yao-qing-chu-quan-bu-sou-suo-ji-lu-ma": "Are you sure to clear all history?",
   "xing-ming": "Name",
@@ -168,16 +168,16 @@
   "ji-hua-jia-gong": "Workpiece to machine",
   "xu-qiu-miao-shu": "Demand description",
   "yi-xiang-chan-pin": "Product to ask",
-  "zi-xun-dan-xiang-qing": "Detail of message card",
+  "zi-xun-dan-xiang-qing": "Message Card",
   "xi-tong-xiao-xi": "System message",
   "fu-wu-guan-jia": "IMT Demand Assistant",
   "jia-zai-zhong": "Loading",
   "nin-hao-wo-shi-imt-fu-wu-guan-jia-yi-kao-wo-men-de-pang-da-de-zi-yuan-ji-qun-wei-nin-ti-gong-zhuan-ye-de-ding-zhi-hua-yi-zhan-shi-fu-wu": "This is IMT Demand Assistant, I will provide you with professional and customized one-stop service relying on the integrate resources according to your specific needs.",
-  "xuan-ze-yi-xia-fu-wu-ran-hou-xiang-xi-miao-shu-nin-de-xu-qiu-wo-men-hui-jin-kuai-hui-fu-nin": "Pls select your demand and leave brief description, I'll get back to you ASAP.",
+  "xuan-ze-yi-xia-fu-wu-ran-hou-xiang-xi-miao-shu-nin-de-xu-qiu-wo-men-hui-jin-kuai-hui-fu-nin": "Pls select your demand and leave brief description, I'll get back to you as soon as I can.",
   "qing-shu-ru-xu-yao-zi-xun-de-wen-ti": "Pls input your question/requirement.",
   "tu-pian": "Image",
   "qu-zhe-li": "Direction",
-  "wai-gao-qiao-zhi-neng-zhi-zao-fu-wu-chan-ye-yuan": "Waigaoqiao Intelligent Manufacturing Trading Center",
+  "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",
@@ -206,7 +206,7 @@
   "yan-zheng-cheng-gong": "Succeeds",
   "fa-song-cheng-gong": "Succeeds",
   "shu-ru-mi-ma": "Password",
-  "jian-yi-shi-yong-liang-zhong-huo-liang-zhong-yi-shang-zi-fu-zu-he-618-wei": "8-16 characters, character combination of two or more is recommended.",
+  "jian-yi-shi-yong-liang-zhong-huo-liang-zhong-yi-shang-zi-fu-zu-he-618-wei": "Pls input",
   "qing-shu-ru-mi-ma": "Pls input password",
   "mi-ma-ge-shi-guo-yu-jian-dan": "Password format is too simple",
   "liang-ci-mi-ma-shu-ru-bu-yi-zhi": "Confirmed password and new password do not match",
@@ -239,19 +239,19 @@
   "qing-shu-ru-chan-pin-miao-shu": "Pls input product description",
   "xin-zeng-cheng-gong": "Succeeds",
   "qing-shu-ru-chan-pin-lei-bie": "Pls input product category",
-  "huo-dong-xiang-qing": "Event detail",
-  "xin-wen-xiang-qing": "News detail",
+  "huo-dong-xiang-qing": "Event detail ",
+  "xin-wen-xiang-qing": "News  detail ",
   "xin-wen": "News",
   "huo-dong": "Event",
-  "xiang-qing": "Detail",
+  "xiang-qing": " Detail",
   "cha-kan-bao-ming-xin-xi": "Check the detail",
   "que-ding-yao-qu-xiao-bao-ming-ma": "Are your sure to cancel this schedule?",
   "qu-xiao-cheng-gong": "Succeeds",
   "zui-duo-ke-xuan-ze-liang-ge-chan-pin-jin-hang-dui-bi": "Up to two products to compare",
   "zai-dui-bi-shi-ke-yi-sui-shi-qie-huan-qi-ta-chan-pin": "You can switch product when comparing",
-  "chan-pin-dui-bi-jin-xian-tong-lei-bie-chan-pin-jin-hang-dui-bi": "Only products under same category can be compared.",
+  "chan-pin-dui-bi-jin-xian-tong-lei-bie-chan-pin-jin-hang-dui-bi": "Only products under the same category can be compared.",
   "shi-fou-li-ji-qing-kong-dang-qian-dui-bi-lie-biao": "Whether to clear current compare list",
-  "tian-jia-dang-qian-shang-pin-dui-bi": "and add current product to compare.",
+  "tian-jia-dang-qian-shang-pin-dui-bi": "and add current product to compare?",
   "tian-jia-chan-pin": "Add product",
   "kai-shi-dui-bi": "Compare",
   "xian-xia-ti-yan": "At IMT",
@@ -266,8 +266,8 @@
   "pdf-zi-liao": "PDF",
   "cha-kan-pdf-wen-jian": "View PDF ",
   "dui-bi": "Compare",
-  "yi-xiang-dan": "WishList",
-  "yi-tian-jia": "In WishList",
+  "yi-xiang-dan": "Wish List",
+  "yi-tian-jia": "In Wish List",
   "xun-jia": "Contact",
   "tian-jia-cheng-gong": "Succeeds",
   "chan-pin-xiang-qing": "Product detail",
@@ -305,7 +305,7 @@
   "tong-lei-bie-tui-jian": "Recommended to compare",
   "dang-qian-lei-bie": "Current category: ",
   "dang-qian-zan-wu-ke-dui-bi-chan-pino": "Compare list is empty.",
-  "chan-pin-dui-bi-jin-xian-tong-lei-bie-chan-pin-jin-hang-dui-bi-ruo-yao-geng-huan-lei-bie-qing-xian-jiang-lie-biao-zhong-de-chan-pin-shan-chu-zai-ci-tian-jia-chan-pin-ze-hui-bian-wei-xin-chan-pin-de-lei-bie": "Only products under same category can be compared. Remove current products if you would like to change category to compare.",
+  "chan-pin-dui-bi-jin-xian-tong-lei-bie-chan-pin-jin-hang-dui-bi-ruo-yao-geng-huan-lei-bie-qing-xian-jiang-lie-biao-zhong-de-chan-pin-shan-chu-zai-ci-tian-jia-chan-pin-ze-hui-bian-wei-xin-chan-pin-de-lei-bie": "Only products under the same category can be compared. Remove current products if you would like to change category to compare.",
   "li-ji-tian-jia": "Add",
   "que-ren-yao-shan-chu-gai-shang-pin-ma": "Are you sure to delete this product?",
   "zhan-shang": "Company",
@@ -338,7 +338,7 @@
   "xuan-ze-qi-ye-lei-xing": "Company Type",
   "fen-lei": "Category",
   "xuan-ze-lei-bie": "Select category",
-  "lei-bie": "Category",
+  "lei-bie": "",
   "quan-bu": "All ",
   "mu-lu": "Catalog",
   "biao-qian": "Tag",
@@ -347,7 +347,7 @@
   "bao-ming-zhong": "Signed up",
   "huo-dong-bao-ming": "Sign up",
   "xuan-ze-ying-yong-ling-yu": "Select application",
-  "di-qu": "area",
+  "di-qu": "",
   "xuan-ze-suo-shu-hang-ye": "Pls select industry",
   "xuan-ze-gan-xing-qu-de-chan-pin": "Pls select products you are interested in",
   "qing-xuan-ze-lei-bie": "Pls select category",
@@ -363,39 +363,39 @@
   "zhong-ying": "CN/EN",
   "qi-ta": "Other",
   "huo-qu-ni-de-shou-ji-hao": "get your mobile phone",
-  "wo-de": "Mine",
+  "wo-de": "My IMT",
   "bian-ji": "Edit",
   "guan-zhu-cheng-gong": "Followed!",
   "qu-xiao-guan-zhu-cheng-gong": "Unfollow successfully",
-  "cha-kan-ji-lu": "View records",
+  "cha-kan-ji-lu": "Check messages",
   "que-ren": "Confirm",
-  "imt-xian-xia-zhan-ting-ti-yan": "IMT offline showroom experience",
+  "imt-xian-xia-zhan-ting-ti-yan": "At IMT",
   "shi": "Yes",
   "fou": "no",
-  "zai-ci-shu-ru": "re-enter",
+  "zai-ci-shu-ru": "Re-enter",
   "fa-song-yan-zheng-ma": "Send  code",
-  "yi-fa-song": "Has been sent",
+  "yi-fa-song": "Sent",
   "yan-zheng-ma": "Verification code",
   "an-li": "Case ",
   "bang-ding-shou-ji-hao": "Bind mobile phone number",
   "chname": "chName",
   "dai-shen-he": "Pending",
   "fu-lei-ming": "Parent class name",
-  "fu-wu": "service",
+  "fu-wu": "Service",
   "gai-kuang": "Overview",
   "ge-qi-ye": "Companies",
   "ge-shang-pin": "Products",
   "guo-qi": "State-owned enterprise",
   "he-zi": "joint venture",
-  "imt-fu-wu": "IMT service",
-  "imt-gai-kuang": "IMT overview",
-  "imt-you-shi": "IMT advantage",
+  "imt-fu-wu": "IMT Services",
+  "imt-gai-kuang": "IMT Overview",
+  "imt-you-shi": "IMT Advantage",
   "imt-zhan-ting-xian-xia-ti-yan": "Offline experience in IMT showroom",
   "jian-jie": "Introduction",
   "jin-ri": "today",
-  "li-ji-bu-quan": "Complete now",
-  "li-ji-deng-lu": "log in immediately",
-  "lian-xi": "contact",
+  "li-ji-bu-quan": "Go and Complete",
+  "li-ji-deng-lu": "Log in",
+  "lian-xi": "Contact",
   "min-ying": "Private",
   "qing-shu-ru-bang-ding-shou-ji": "Please enter the binding phone",
   "quan-bu-biao-qian": "All tags",
@@ -403,20 +403,20 @@
   "quan-bu-lei-bie": "All categories",
   "quan-bu-lei-xing": "All types",
   "quan-bu-ling-yu": "All areas",
-  "quan-bu-xin-wen": "All information",
-  "que-ding-yao-shan-chu-gai-zi-xun-xiao-xi-ma": "Are you sure you want to delete this advisory message?",
+  "quan-bu-xin-wen": "All",
+  "que-ding-yao-shan-chu-gai-zi-xun-xiao-xi-ma": "Are you sure to delete this message?",
   "ru-zhu-chang-shang": "Resident members",
   "shang-jia-zhong": "Now on shelf",
-  "shao-hou-zai-shuo": "talk about it later",
+  "shao-hou-zai-shuo": "Later",
   "shen-he-shi-bai": "Audit failure",
   "shen-he-zhong": "under review",
   "shen-mi-yong-hu": "Mystery user",
   "shi-fou-zai-zhong-guo-she-li-gong-si-ban-shi-chu": "Whether to set up a company/office in China",
   "shi-mo-du-mei-you-o": "Nothing",
   "wai-zi": "foreign investment",
-  "wei-deng-lu-yong-hu-zhi-you-wu-ci-cha-kan-quan-xian": "Unlogged users only have five viewing permissions!",
+  "wei-deng-lu-yong-hu-zhi-you-wu-ci-cha-kan-quan-xian": "Five pages available if not logged in.",
   "wen-zhang": "article",
-  "xu-yao-bu-quan-zi-liao-fang-ke-shi-yong-ci-gong-neng": "Need to complete the information to use this function",
+  "xu-yao-bu-quan-zi-liao-fang-ke-shi-yong-ci-gong-neng": "Complete your account information to use this feature.",
   "yi-xia-jia": "Has been removed",
   "you-shi": "Advantage",
   "zan-shi-mei-you-shu-juo": "No data for now!",
@@ -427,5 +427,10 @@
   "zhu-lei-ming": "Main class name",
   "zi-xun-ren-shu": "Number of consultations",
   "zong-ji": "total",
-  "zuo-tian": "yesterday"
+  "zuo-tian": "yesterday",
+  "lei-bie1": "Category",
+  "sou-suo-no-1": "Search related product of ",
+  "sou-suo-no-2": "Search related company of ",
+  "sou-suo-no-3": "Search related information of ",
+  "xin-zeng-xu-qiu-cheng-jiao-dan": "Requirement List/Deal Edit"
 }

src/locales/zh.json

@@ -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": "报名结束",
@@ -372,9 +372,9 @@
   "xian-sheng": "先生",
   "nv-shi": "女士",
   "sou-suo-zhan-shang-chan-pin-zi-xun": "搜索会员/产品/资讯",
-  "guo-jia-he-di-qu": "国家和地区",
+  "guo-jia-he-di-qu": "国家/地区",
   "xuan-ze-qi-ye-lei-xing": "选择企业类型",
-  "fen-lei": "分类",
+  "fen-lei": "产品类别",
   "xuan-ze-lei-bie": "选择类别",
   "lei-bie": "类别",
   "quan-bu": "全部",
@@ -427,5 +427,14 @@
   "gai-kuang": "概况",
   "you-shi": "优势",
   "fu-wu": "服务",
-  "lian-xi": "联系"
+  "lian-xi": "联系",
+  "lei-bie1": "类别",
+  "chan-pin-jiao-yi-deng-ji": "产品交易登记",
+  "qing-shu-ru-chan-pin-xing-hao": "请输入产品型号",
+  "jiao-yi-gong-si": "交易公司",
+  "qing-shu-ru-jiao-yi-gong-si": "请输入交易公司",
+  "sou-suo-no-1": "搜索",
+  "sou-suo-no-2": "搜索",
+  "sou-suo-no-3": "搜索",
+  "xin-zeng-xu-qiu-cheng-jiao-dan": "产品需求/成交单编辑"
 }

src/main.js

@@ -41,7 +41,7 @@ Vue.i18n.set('zh');
 
 Vue.prototype.$store = store;
 
-Vue.prototype.$toast = function(title, icon) {
+Vue.prototype.$toast = function (title, icon) {
     if (!icon) {
         icon = 'none';
     }
@@ -107,7 +107,8 @@ export default {
                     'ChangePsd',
                     'ChangePhone',
                     'ChangeEmail',
-                    'Enter'
+                    'Enter',
+                    'ProductsTransactionEdit'
                 ]
             },
             {

src/mixins/commont.js

@@ -38,7 +38,7 @@ export default {
             }
         },
         getName(info, labels = ['chName', 'enName'], isFalse = false) {
-            if (!info || !info.hasOwnProperty(labels[1])) {
+            if (!info || !info.hasOwnProperty(labels[0])) {
                 return '';
             } else if (
                 (this.$i18n.locale() === 'zh' && !isFalse) ||
@@ -204,7 +204,7 @@ export default {
             });
             wx.setTabBarItem({
                 index: 1,
-                text: this.$t('lei-bie')
+                text: this.$t('lei-bie1')
             });
             wx.setTabBarItem({
                 index: 2,

src/pages/Chat.vue

@@ -159,6 +159,14 @@ export default {
 };
 </script>
 <style lang="less">
+page {
+    width: 100%;
+    overflow-x: hidden;
+}
+.pageBottom {
+    width: 100%;
+    overflow: hidden;
+}
 .van-divider {
     --divider-margin: 0 0;
     --divider-border-color: @bg;

src/pages/Classify.vue

@@ -14,7 +14,7 @@
 }
 </config>
 <template>
-    <div class="container" :style="{ paddingTop: barHeight + 'px' }">
+    <div class="container" :class="{ isEn: !isChinese }" :style="{ paddingTop: barHeight + 'px' }">
         <van-sticky :offset-top="0">
             <div class="navBar" :style="narStyle">
                 <div class="title">{{ $t('chan-pin-fen-lei') }}</div>
@@ -264,4 +264,16 @@ h3 {
         width: 140px;
     }
 }
+
+.isEn {
+    .right {
+        .van-button {
+            padding: 5px;
+            white-space: initial;
+            min-height: 50px;
+            height: auto;
+            font-size: 12px;
+        }
+    }
+}
 </style>

src/pages/Home.vue

@@ -85,13 +85,7 @@
                         />
                     </van-grid>
                     <div class="pathImg">
-                        <van-image
-                            width="100%"
-                            height="90px"
-                            :radius="4"
-                            src="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/home_img_3dimt.jpg"
-                            @click="go3D"
-                        />
+                        <van-image width="100%" height="90px" :radius="4" :src="getName(thirdImg)" @click="go3D" />
                     </div>
                 </div>
                 <div class="hot" v-if="hotProductsList.length > 0">
@@ -260,6 +254,10 @@ export default {
             hotLoading: false,
             hotProducts: [],
             hotSwiperIndex: 0,
+            thirdImg: {
+                chName: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/home_img_3dimt.jpg',
+                enName: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/home_img_3dimt_en.png'
+            },
             options: {
                 useEasing: true,
                 useGrouping: true,
@@ -680,5 +678,17 @@ export default {
         text-align: center;
         line-height: 15px;
     }
+    .menus .text {
+        width: 25%;
+        white-space: initial;
+        text-align: center;
+        padding: 0 10px;
+
+        &:not(:first-child) {
+            &::before {
+                top: 10px;
+            }
+        }
+    }
 }
 </style>

src/pages/My.vue

@@ -17,14 +17,7 @@
                 fit="cover"
                 :radius="4"
             />
-            <van-button
-                class="btn1"
-                v-if="nodeEnv"
-                color="#0F264D"
-                plain
-                @click="choose"
-                :style="{ top: barTop + 'px' }"
-            >
+            <van-button class="btn1" color="#0F264D" plain @click="choose" :style="{ top: barTop + 'px' }">
                 {{ getName(language) }}
                 <van-icon name="arrow-down" size="10px" color="#0F264D" />
             </van-button>
@@ -56,12 +49,7 @@
         </div>
 
         <div class="ad" @click="navigateTo('/pagesMine/Enter')">
-            <van-image
-                src="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/info_zhanshangruzhu_new.png"
-                fit="widthFix"
-                width="100%"
-                :radius="4"
-            />
+            <van-image :src="getName(enterImg)" fit="widthFix" width="100%" :radius="4" />
         </div>
 
         <van-cell-group :border="false">
@@ -134,7 +122,11 @@ export default {
             },
             locale: 'zh',
             showPhone: false,
-            wxInfo: {}
+            wxInfo: {},
+            enterImg: {
+                chName: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/info_zhanshangruzhu_new.png',
+                enName: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/info_zhanshangruzhu_eln.png'
+            }
         };
     },
     mixins: [pages],

src/pagesHome/Search.vue

@@ -43,17 +43,17 @@
                     :style="`height: calc(100vh - ${barHeight}px + 30rpx)`"
                 >
                     <div class="popuptext top" @click="goNext(searchKey)">
-                        {{ $t('sou-suo-no') }}“
+                        {{ $t('sou-suo-no-1') }}“
                         <span> {{ searchKey }}</span>
                         ”{{ $t('xiang-guan-de-chan-pin') }}
                     </div>
                     <div class="popuptext top" @click="goVendor(searchKey)">
-                        {{ $t('sou-suo-no') }}“
+                        {{ $t('sou-suo-no-2') }}“
                         <span> {{ searchKey }}</span>
                         ”{{ $t('xiang-guan-de-zhan-shang') }}
                     </div>
                     <div class="popuptext top" @click="goInformation(searchKey)">
-                        {{ $t('sou-suo-no') }}“
+                        {{ $t('sou-suo-no-3') }}“
                         <span> {{ searchKey }}</span>
                         ”{{ $t('xiang-guan-de-zi-xun') }}
                     </div>

src/pagesImt/Connect.vue

@@ -2,7 +2,7 @@
     <div class="connect">
         <map
             id="myMap"
-            style="width: 100%; height: 300px;"
+            style="width: 100%; height: 300px"
             latitude="31.298919"
             longitude="121.629521"
             :markers="markers"
@@ -82,9 +82,14 @@ export default {
 
     .connect-info {
         display: flex;
-        align-items: center;
+        align-items: flex-start;
         .van-icon {
             margin-right: 10px;
+            margin-top: 2px;
+        }
+
+        h3 {
+            white-space: initial;
         }
 
         // .link {

src/pagesImt/Index.vue

@@ -197,7 +197,7 @@ export default {
                         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.'
+                            '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.We are licensed to be the only "6+ 365" permanent exhibition and trade platform of intelligent manufacturing by Shanghai Municipal Commission of Commerce relying on our years of experience on the combination of long-term and short-term exhibition and promotion services.'
                     }
                 }
             ],

src/pagesImt/Service.vue

@@ -52,6 +52,10 @@ export default {
         margin-left: 10px;
         overflow: hidden;
         flex-grow: 1;
+
+        h2 {
+            white-space: initial;
+        }
     }
 
     // &:active {

src/pagesImt/ServiceDetail.vue

@@ -121,6 +121,7 @@ export default {
         font-size: 18px;
         margin-top: 26px;
         line-height: 28px;
+        white-space: initial;
     }
 
     p {

src/pagesMine/ChangePsd.vue

@@ -5,7 +5,7 @@
 }
 </config>
 <template>
-    <div>
+    <div :class="{ isEn: !isChinese }">
         <div class="page-info">
             <h3>{{ $t('shu-ru-mi-ma') }}</h3>
             <div class="page-input">
@@ -37,6 +37,8 @@
             </div>
         </div>
 
+        <div class="tips" v-if="!isChinese">8-16 characters, character combination of two or more is recommended.</div>
+
         <div class="submit">
             <van-button :color="$colors.warn" @click="submit" block :disabled="!canNext">确定</van-button>
         </div>
@@ -144,4 +146,17 @@ export default {
 .submit {
     padding: 80px 67px 30px;
 }
+
+.isEn {
+    .page-info .page-input .text {
+        font-size: 10px;
+    }
+}
+
+.tips {
+    color: @info;
+    font-size: 12px;
+    line-height: 44rpx;
+    padding: 40rpx 32rpx;
+}
 </style>

src/pagesMine/Enter.vue

@@ -149,7 +149,7 @@ export default {
                 {
                     icon: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/ruzhu_icon_jieduan03.png',
                     preTitle: { chName: '阶段三', enName: 'NO.3' },
-                    title: { chName: '功能开通', enName: 'Open the Function of Online Showroom ' },
+                    title: { chName: '功能开通', enName: 'Activate Online Showroom' },
                     steps: [
                         {
                             text: {
@@ -195,9 +195,9 @@ export default {
                         enName: 'Areas: '
                     },
                     text2: {
-                        chName: '企业生产或经营的产品包含于IMT平台产品类别范围内',
+                        chName: '企业生产或经营的产品包含于IMT平台产品类别范围内,请访问PC端查看。',
                         enName:
-                            " Products/Services shall be included in the scope of IMT Tech member's area. Click for detail."
+                            " Products/Services shall be included in the scope of IMT Tech member's area. Visit PC website for detail."
                     }
                 }
             ]

src/pagesMine/OrderDetail.vue

@@ -178,6 +178,10 @@ export default {
         if (options.type) {
             this.form.type = options.type;
         }
+
+        wx.setNavigationBarTitle({
+            title: this.$t('xin-zeng-xu-qiu-cheng-jiao-dan')
+        });
     },
     methods: {
         chooseType() {

src/pagesMine/ProductsTransactionEdit.vue

@@ -0,0 +1,371 @@
+<config>
+{
+'navigationBarTitleText': '新增需求/成交单',
+ "usingComponents": {
+  "van-datetime-picker": "../native/vant/datetime-picker/index"
+}
+}
+</config>
+<template>
+    <div>
+        <div class="page-info">
+            <h3>{{ $t('xuan-ze-xin-zeng-qing-dan-lei-xing') }}</h3>
+            <div class="page-input">
+                <span class="text">{{ $t('chan-pin-jiao-yi-deng-ji') }}</span>
+                <!-- <van-icon v-if="!form.id" name="arrow" color="#CCD0DC" :size="24" /> -->
+            </div>
+        </div>
+        <div class="page-info">
+            <h3>{{ $t('chan-pin-ming-cheng') }}</h3>
+            <div class="page-input">
+                <input
+                    type="text"
+                    @input="form.name = $event.detail.value"
+                    @confirm="form.name = $event.detail.value"
+                    @blur="form.name = $event.detail.value"
+                    :value="form.name"
+                    class="text"
+                    :placeholder="$t('qing-shu-ru-chan-pin-ming-cheng')"
+                    placeholder-class="pla-textarea"
+                />
+            </div>
+        </div>
+
+        <div class="page-info">
+            <h3>{{ $t('chan-pin-pin-pai') }}</h3>
+            <div class="page-input">
+                <input
+                    type="text"
+                    @input="form.brand = $event.detail.value"
+                    @confirm="form.brand = $event.detail.value"
+                    @blur="form.brand = $event.detail.value"
+                    :value="form.brand"
+                    class="text"
+                    :placeholder="$t('qing-shu-ru-pin-pai-ming-cheng')"
+                    placeholder-class="pla-textarea"
+                />
+            </div>
+        </div>
+
+        <div class="page-info">
+            <h3>{{ $t('chan-pin-xing-hao') }}</h3>
+            <div class="page-input">
+                <input
+                    type="text"
+                    @input="form.model = $event.detail.value"
+                    @confirm="form.model = $event.detail.value"
+                    @blur="form.model = $event.detail.value"
+                    :value="form.model"
+                    class="text"
+                    :placeholder="$t('qing-shu-ru-chan-pin-xing-hao')"
+                    placeholder-class="pla-textarea"
+                />
+            </div>
+        </div>
+
+        <div class="page-info">
+            <h3>{{ $t('chan-pin-lei-bie') }}</h3>
+            <div class="page-input">
+                <input
+                    type="text"
+                    @input="form.customCategory = $event.detail.value"
+                    @confirm="form.customCategory = $event.detail.value"
+                    @blur="form.customCategory = $event.detail.value"
+                    :value="form.customCategory"
+                    class="text"
+                    :placeholder="$t('qing-shu-ru-chan-pin-lei-bie')"
+                    placeholder-class="pla-textarea"
+                />
+            </div>
+        </div>
+
+        <div class="page-info">
+            <h3>{{ $t('ying-yong-ling-yu') }}</h3>
+            <div class="page-input" @click="$refs.applicationField.show()">
+                <div class="text">
+                    <application-select v-model="form.applicationField" ref="applicationField"></application-select>
+                </div>
+                <van-icon name="arrow" color="#CCD0DC" :size="24" />
+            </div>
+        </div>
+
+        <div class="page-info">
+            <h3>{{ $t('chan-pin-miao-shu') }}</h3>
+            <textarea
+                @input="form.introduction = $event.detail.value"
+                @confirm="form.introduction = $event.detail.value"
+                @blur="form.introduction = $event.detail.value"
+                :value="form.introduction"
+                auto-height
+                class="textarea"
+                :placeholder="$t('qing-jian-yao-miao-shu-nin-de-chan-pin-100-zi-yi-nei')"
+                placeholder-class="pla-textarea"
+                :maxlength="100"
+            />
+        </div>
+
+        <div class="del-btn" v-if="orderId">
+            <van-button block plain size="small" :color="$colors.info" @click="del">删除</van-button>
+        </div>
+
+        <div class="page-info">
+            <h3>{{ $t('jiao-yi-gong-si') }}</h3>
+            <div class="page-input">
+                <input
+                    type="text"
+                    @input="form.transactionCompany = $event.detail.value"
+                    @confirm="form.transactionCompany = $event.detail.value"
+                    @blur="form.transactionCompany = $event.detail.value"
+                    :value="form.transactionCompany"
+                    class="text"
+                    :placeholder="$t('qing-shu-ru-jiao-yi-gong-si')"
+                    placeholder-class="pla-textarea"
+                />
+            </div>
+        </div>
+
+        <fixed-button>
+            <van-button block @click="submit" :color="$colors.warn" :disabled="!canNext">{{
+                orderId ? $t('bao-cun') : $t('ti-jiao')
+            }}</van-button>
+        </fixed-button>
+        <van-dialog id="van-dialog" />
+
+        <van-popup :show="showTime" round position="bottom">
+            <div class="bar">
+                <van-icon color="#5E636D" :size="24" name="cross" @click="showTime = false" />
+                <h3></h3>
+                <van-button :color="$colors.warn" plain @click="changeTime">{{ $t('que-ding') }}</van-button>
+            </div>
+            <van-datetime-picker :show-toolbar="false" type="datetime" :value="nowTime" @input="changeTime" />
+        </van-popup>
+    </div>
+</template>
+<script>
+import { productListType } from '../utils/appState';
+import ProductCategorySelect from '../components/select/ProductCategoryOnly.vue';
+import ApplicationSelect from '../components/select/Application.vue';
+import FixedButton from '../components/FixedButton.vue';
+import dayjs from 'dayjs';
+export default {
+    data() {
+        return {
+            orderId: 0,
+            form: {
+                type: 'OWN_PRODUCT',
+                name: '',
+                brand: '',
+                model: '',
+                customCategory: '',
+                productCategoryId: '',
+                applicationField: [],
+                introduction: ''
+            },
+            isVendor: false,
+            showTime: true,
+            nowTime: ''
+        };
+    },
+    computed: {
+        typeName() {
+            if (this.form.type && productListType.has(this.form.type)) {
+                return this.$t(productListType.get(this.form.type));
+            } else {
+                return '';
+            }
+        },
+        canNext() {
+            if (
+                this.form.type &&
+                this.form.name &&
+                this.form.brand &&
+                this.form.productCategoryId &&
+                this.form.introduction &&
+                this.form.applicationField.length > 0
+            ) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+    },
+    onLoad(options) {
+        if (this.$store.state.userInfo && this.$store.state.userInfo.identity !== 'BUYERS') {
+            this.isVendor = true;
+        } else {
+            this.isVendor = false;
+        }
+        if (options.id) {
+            this.orderId = options.id;
+            this.$http
+                .get('/productList/get/' + options.id)
+                .then(res => {
+                    delete res.productCategory;
+                    this.form = res;
+                    this.loading = false;
+                })
+                .catch(() => {
+                    this.loading = false;
+                });
+        }
+
+        if (options.type) {
+            this.form.type = options.type;
+        }
+    },
+    methods: {
+        chooseType() {
+            if (this.form.id) {
+                return;
+            }
+            const types = [...productListType].filter(item => {
+                if (this.isVendor && item[0] === 'OWN_PRODUCT') {
+                    return false;
+                } else {
+                    return true;
+                }
+            });
+            const _list = [...types].map(item => {
+                console.log(item);
+
+                return this.$t(item[1]);
+            });
+            wx.showActionSheet({
+                itemList: _list,
+                success: res => {
+                    this.form.type = [...types][res.tapIndex][0];
+                },
+                fail: res => {
+                    console.log(res.errMsg);
+                }
+            });
+        },
+        submit() {
+            const form = { ...this.form };
+            if (!form.name) {
+                this.toast(this.$t('qing-shu-ru-chan-pin-ming-cheng'));
+                return;
+            }
+            if (!form.brand) {
+                this.toast(this.$t('qing-shu-ru-pin-pai-ming-cheng'));
+                return;
+            }
+            if (this.form.type === 'OWN_PRODUCT' && !form.customCategory) {
+                this.toast(this.$t('qing-shu-ru-chan-pin-lei-bie'));
+                return;
+            }
+            if (this.form.type !== 'OWN_PRODUCT' && !form.productCategoryId) {
+                this.toast(this.$t('qing-xuan-ze-chan-pin-lei-bie'));
+                return;
+            }
+            if (form.applicationField.length === 0) {
+                this.toast(this.$t('qing-xuan-ze-ying-yong-ling-yu'));
+                return;
+            }
+            if (!form.introduction) {
+                this.toast(this.$t('qing-shu-ru-chan-pin-miao-shu'));
+                return;
+            }
+            if (!form.id) {
+                form.userId = this.$store.state.userInfo.id;
+            }
+            this.$http
+                .post('/productList/save', form, {
+                    header: {
+                        'Content-Type': 'application/json'
+                    }
+                })
+                .then(res => {
+                    this.toast(
+                        this.orderId ? this.$t('xiu-gai-cheng-gong') : this.$t('xin-zeng-cheng-gong'),
+                        'success'
+                    );
+                    setTimeout(() => {
+                        this.navigateBack();
+                    }, 500);
+                })
+                .catch(e => {
+                    this.$toast(e.error);
+                });
+        },
+        del() {
+            this.dialog(this.$t('que-ren-yao-shan-chu-gai-qing-dan-ma'), true, false, this.$t('li-ji-shan-chu'))
+                .then(() => {
+                    return this.$http.post(`/productList/del/${this.orderId}`);
+                })
+                .then(() => {
+                    this.toast(this.$t('shan-chu-cheng-gong'), 'success');
+                    setTimeout(() => {
+                        this.navigateBack();
+                    }, 1000);
+                })
+                .catch(e => {
+                    if (e.error) {
+                        this.toast(e.error);
+                    }
+                });
+        },
+        changeTime(e) {
+            console.log(e);
+            this.nowTime = new Date(e.detail);
+        }
+    },
+    components: {
+        ApplicationSelect,
+        FixedButton
+    }
+};
+</script>
+<style lang="less">
+.page-info {
+    padding: 24px 16px 0;
+
+    .page-input {
+        height: 50px;
+        background: @bg;
+        border-radius: 4px;
+        padding: 0 12px;
+        display: flex;
+        align-items: center;
+        margin-top: 10px;
+        overflow: hidden;
+        // &:active {
+        //     background: darken(@bg, 5);
+        // }
+        .text {
+            flex-grow: 1;
+            font-size: 14px;
+            color: #000000;
+            line-height: 22px;
+            overflow: hidden;
+        }
+    }
+
+    .pla-textarea {
+        font-size: 14px;
+        color: #bcc1cc;
+        line-height: 22px;
+    }
+    .textarea {
+        background: @bg;
+        border-radius: 4px;
+        min-height: 100px;
+        margin-top: 10px;
+        width: 100%;
+        display: block;
+        padding: 12px;
+        box-sizing: border-box;
+        font-size: 14px;
+        line-height: 22px;
+        color: #000;
+    }
+}
+
+.del-btn {
+    margin: 16px;
+    --button-border-width: 0px;
+}
+
+.bar {
+}
+</style>

src/pagesMine/ReadRecords.vue

@@ -56,6 +56,9 @@ export default {
     mixins: [searchList],
     mounted() {
         this.getData();
+        wx.setNavigationBarTitle({
+            title: this.$t('liu-lan-ji-lu')
+        });
     },
     onReachBottom() {
         if (!this.loading && !this.finish) {

src/pagesProduct/Detail.vue

@@ -70,8 +70,13 @@
                             :value="productInfo.averageLeadTime"
                         />
                         <van-cell :title="$t('chan-pin-chan-di')" v-if="origin" :border="false" :value="origin" />
-                        <van-cell :title="$t('ying-yong-ling-yu')" :border="false" :value="applicationField" />
-                        <van-cell :title="$t('chan-pin-biao-qian')" :border="false">
+                        <van-cell
+                            :title="$t('ying-yong-ling-yu')"
+                            v-if="applicationField"
+                            :border="false"
+                            :value="applicationField"
+                        />
+                        <van-cell :title="$t('chan-pin-biao-qian')" :border="false" v-if="tags.length > 0">
                             <div>
                                 <van-tag color="#000" plain v-for="(item, index) in tags" :key="index">{{
                                     item
@@ -84,7 +89,13 @@
                 <div class="vendor" @click="navigateTo('/pagesVendor/Detail?id=' + vendorInfo.id)">
                     <image
                         :src="vendorInfo.logo"
-                        style="width: 60px; height: 60px; border-radius: 4px; border: 1px solid #f2f4f5"
+                        style="
+                            width: 60px;
+                            min-width: 60px;
+                            height: 60px;
+                            border-radius: 4px;
+                            border: 1px solid #f2f4f5;
+                        "
                     />
                     <!-- <van-image class="logo" :radius="4" :src="vendorInfo.logo" :width="60" :height="60" /> -->
                     <div class="vendor-info">
@@ -859,11 +870,11 @@ export default {
     .fixed-bottom .fixed-bottom-content .btn-icon {
         padding: 0 5px;
         .text {
-            font-size: 18rpx;
+            font-size: 8px;
         }
     }
     .fixed-bottom .fixed-bottom-content .btn-list .van-button {
-        font-size: 10px !important;
+        font-size: 12px !important;
     }
 }
 </style>

src/pagesVendor/Connect.vue

@@ -28,7 +28,7 @@
             </van-button>
         </div>
         <div class="form">
-            <h2>计划加工</h2>
+            <h2>{{ $t('ji-hua-jia-gong') }}</h2>
             <textarea
                 class="textarea"
                 @input="artifact = $event.detail.value"

src/pagesVendor/Detail.vue

@@ -35,7 +35,7 @@
                         <div class="text1">{{ vendorInfo.chCompanyName }}</div>
                         <div class="text2">{{ vendorInfo.enCompanyName }}</div>
                     </block>
-                    <div class="text3" v-else>{{ vendorInfo.enCompanyName }}</div>
+                    <div class="text3" v-else>{{ vendorInfo.enCompanyName || vendorInfo.chCompanyName }}</div>
                 </div>
                 <div class="collect" @click="collection">
                     <van-icon

src/store/index.js

@@ -177,11 +177,11 @@ export default new Vuex.Store({
                 context.commit('updateAreaList', res);
             });
 
-            http.http.get('http://imttech.oss-cn-hangzhou.aliyuncs.com/utils/en/area.json').then(res => {
+            http.http.get('https://imttech.oss-cn-hangzhou.aliyuncs.com/utils/areaEn.json').then(res => {
                 Vue.i18n.add('en', res);
             });
 
-            http.http.get('http://imttech.oss-cn-hangzhou.aliyuncs.com/utils/zh/area.json').then(res => {
+            http.http.get('https://imttech.oss-cn-hangzhou.aliyuncs.com/utils/areaZh.json').then(res => {
                 Vue.i18n.add('zh', res);
             });
         },

src/utils/chat.js

@@ -7,7 +7,7 @@ function adminAutoReply(userId, isChinese = true) {
             if (isChinese) {
                 return Promise.resolve({ id: res[0], content: res[1].value });
             } else {
-                return http.http.get('/sysConfig/get/IMT_DEMAND_BACK_EN').then(res2 => {
+                return http.http.get('/sysConfig/get/IMT_DEMAND_BACK _EN').then(res2 => {
                     return Promise.resolve({ id: res[0], content: res2.value });
                 });
             }

src/utils/imtPageInfo.js

@@ -1,6 +1,6 @@
 const services = [
     {
-        name: { chaName: '综合物流', enName: 'Integrated Supply Chain Service' },
+        name: { chName: '综合物流', enName: 'Integrated Supply Chain Service' },
         icon: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/imt_fuwu_icon_01.png',
         sub: { chName: '全面的贸易物流与进出口业务解决方案', enName: 'Comprehensive trade and logistics solutions' },
         content: {