panhui hace 5 años
padre
commit
d8b424d315

+ 124 - 1
src/locales/zh.json

@@ -150,5 +150,128 @@
   "pin-pai": "品牌",
   "pin-pai": "品牌",
   "fa-bu-shi-jian": "发布时间",
   "fa-bu-shi-jian": "发布时间",
   "bu-xian": "不限",
   "bu-xian": "不限",
-  "imt-zhan-ting-xian-xia-ti-yan": "IMT展厅线下体验"
+  "imt-zhan-ting-xian-xia-ti-yan": "IMT展厅线下体验",
+  "zan-wei-she-zhi-gai-lei-xing-re-men-shang-pin": "暂未设置该类型热门商品",
+  "cha-kan-geng-duo": "查看更多",
+  "wei-ni-tui-jian": "为你推荐",
+  "wei-xin-kuai-jie-deng-lu": "微信快捷登录",
+  "bian-ji-zi-liao": "编辑资料",
+  "wo-de-shou-cang": "我的收藏",
+  "liu-lan-ji-lu": "浏览记录",
+  "wo-de-huo-dong": "我的活动",
+  "chan-pin-xu-qiu-cheng-jiao-dan": "产品需求/成交单",
+  "zhang-hu-yu-an-quan": "账户与安全",
+  "wei-deng-lu": "未登录",
+  "chan-pin-fen-lei": "产品分类",
+  "cha-kan-quan-bu": "查看全部",
+  "zi-xun-xiao-xi": "咨询消息",
+  "qing-shou-quan-deng-lu": "请授权登录",
+  "qing-shou-quan-wei-xin-kuai-jie-deng-lu-bing-qie-bang-ding-shou-ji-hao": "请授权微信快捷登录并且绑定手机号",
+  "fan-hui": "返回",
+  "quan-bu-zhan-shang": "全部展商",
+  "jing-qing-qi-dai": "敬请期待",
+  "pai-she-ming-pian-zhao-pian": "拍摄名片照片",
+  "tou-xiang": "头像",
+  "ni-cheng": "昵称",
+  "wei-xuan-ze": "未选择",
+  "cheng-hu": "称呼",
+  "gong-si-ming-cheng": "公司名称",
+  "wei-tian-xie": "未填写",
+  "zhi-wei": "职位",
+  "suo-shu-hang-ye": "所属行业",
+  "gan-xing-qu-de-chan-pin": "感兴趣的产品",
+  "jiao-liu-yu-yan": "交流语言",
+  "you-xiang": "邮箱",
+  "bao-cun": "保存",
+  "zhong-zhi": "重置",
+  "shai-xuan": "筛选",
+  "sou-suo-no": "搜索",
+  "xiang-guan-de-chan-pin": "相关的产品",
+  "xiang-guan-de-zhan-shang": "相关的展商",
+  "xiang-guan-de-zi-xun": "相关的资讯",
+  "sou-suo-li-shi": "搜索历史",
+  "qing-kong-ji-lu": "清空记录",
+  "re-men-sou-suo": "热门搜索",
+  "ti-shi": "提示",
+  "que-ding-yao-qing-chu-quan-bu-sou-suo-ji-lu-ma": "确定要清除全部搜索记录吗?",
+  "xing-ming": "姓名",
+  "dian-hua": "电话",
+  "bei-zhu": "备注",
+  "gong-neng-xu-qiu": "功能需求",
+  "ji-hua-jia-gong": "计划加工",
+  "xu-qiu-miao-shu": "需求描述",
+  "yi-xiang-chan-pin": "意向产品",
+  "zi-xun-dan-xiang-qing": "咨询单详情",
+  "xi-tong-xiao-xi": "系统消息",
+  "fu-wu-guan-jia": "服务管家",
+  "jia-zai-zhong": "加载中",
+  "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": "您好,我是IMT服务管家 依靠我们的庞大的资源集群,为您提供专业的定制化一站式服务",
+  "xuan-ze-yi-xia-fu-wu-ran-hou-xiang-xi-miao-shu-nin-de-xu-qiu-wo-men-hui-jin-kuai-hui-fu-nin": "选择以下服务,然后详细描述您的需求,我们会尽快回复您!",
+  "qing-shu-ru-xu-yao-zi-xun-de-wen-ti": "请输入需要咨询的问题",
+  "tu-pian": "图片",
+  "qu-zhe-li": "去这里",
+  "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": "科技平台",
+  "gao-du-ji-ju-xing": "高度集聚性",
+  "gao-jing-mi-chan-pin-ji-shu": "高精密产品/技术",
+  "gao-du-zhuan-ye-hua": "高度专业化",
+  "id-zhang-hao": "ID账号",
+  "deng-lu-mi-ma": "登录密码",
+  "yi-she-zhi": "已设置",
+  "wei-she-zhi": "未设置",
+  "shou-ji-hao": "手机号",
+  "wei-bang-ding": "未绑定",
+  "zhu-zai-pc-duan-ke-yi-yong-id-hao-shou-ji-hao-you-xiang-jia-mi-ma-de-xing-shi-jin-hang-deng-lu": "注:在PC端可以用ID号/手机号/邮箱加密码的形式进行登录",
+  "zhang-hao-yu-an-quan": "账号与安全",
+  "wei-can-jia-ren-he-huo-dong-o": "未参加任何活动哦",
+  "bang-ding-you-xiang": "绑定邮箱",
+  "qing-shu-ru-you-xiang": "请输入邮箱",
+  "bang-ding-cheng-gong": "绑定成功",
+  "shu-ru-you-xiang": "输入邮箱",
+  "qing-shu-ru-you-xiang-zhang-hao": "请输入邮箱账号",
+  "xiu-gai-shou-ji-hao": "修改手机号",
+  "dang-qian-shou-ji-hao": "当前手机号",
+  "qing-shu-ru-bang-ding-shou-ji": "请输入绑定手机",
+  "qing-shu-ru-yan-zheng-ma": "请输入验证码",
+  "qing-shu-ru-shou-ji-hao": "请输入手机号",
+  "xiu-gai-cheng-gong": "修改成功",
+  "yan-zheng-cheng-gong": "验证成功",
+  "bang-ding-shou-ji-hao": "绑定手机号",
+  "zhang-hao-xin-xi-bu-quan": "账号信息不全",
+  "fa-song-cheng-gong": "发送成功",
+  "shu-ru-mi-ma": "输入密码",
+  "jian-yi-shi-yong-liang-zhong-huo-liang-zhong-yi-shang-zi-fu-zu-he-618-wei": "建议使用两种或两种以上字符组合,6-18位",
+  "qing-shu-ru-mi-ma": "请输入密码",
+  "mi-ma-ge-shi-guo-yu-jian-dan": "密码格式过于简单",
+  "liang-ci-mi-ma-shu-ru-bu-yi-zhi": "两次密码输入不一致",
+  "she-zhi-cheng-gong": "设置成功",
+  "she-zhi-mi-ma": "设置密码",
+  "qu-guang-guang": "去逛逛",
+  "dang-qian-zan-wu-shou-cango": "当前暂无收藏哦~",
+  "shan-chu": "删除",
+  "que-ren-yao-shan-chu-ma": "确认要删除吗?",
+  "shan-chu-cheng-gong": "删除成功",
+  "imt-ke-ji-ping-tai-zhan-shang-ru-zhu": "IMT科技平台展商入驻",
+  "imt-xie-shou-you-xiu-qi-ye-gong-tong-shi-xian-zhi-neng-zhi-zao-chan-ye-lian-xin-xi-ji-cheng-yu-gong-xiang": "IMT携手优秀企业共同实现智能制造产业链信息集成与共享",
+  "ru-zhu-liu-cheng": "入驻流程",
+  "qing-zai-pc-duan-jin-hang-ru-zhu": "请在PC端进行入驻",
+  "xiang-qing-zi-xun": "详情咨询",
+  "zhan-shang-ru-zhu": "展商入驻",
+  "qing-zai-pc-duan-fang-wen": "请在PC端访问",
+  "wo-zhi-dao-le": "我知道了",
+  "dang-qian-zan-wu-xiang-guan-ji-luo": "当前暂无相关记录哦~",
+  "xin-zeng": "新增",
+  "xuan-ze-xin-zeng-qing-dan-lei-xing": "选择新增清单类型",
+  "chan-pin-ming-cheng": "产品名称",
+  "qing-shu-ru-chan-pin-ming-cheng": "请输入产品名称",
+  "qing-shu-ru-pin-pai-ming-cheng": "请输入品牌名称",
+  "chan-pin-miao-shu": "产品描述",
+  "qing-jian-yao-miao-shu-nin-de-chan-pin-100-zi-yi-nei": "请简要描述您的产品,100字以内",
+  "ti-jiao": "提交",
+  "qing-xuan-ze-chan-pin-lei-bie": "请选择产品类别",
+  "qing-xuan-ze-ying-yong-ling-yu": "请选择应用领域",
+  "qing-shu-ru-chan-pin-miao-shu": "请输入产品描述",
+  "xin-zeng-cheng-gong": "新增成功"
 }
 }

+ 3 - 0
src/mixins/commont.js

@@ -16,6 +16,9 @@ export default {
     computed: {
     computed: {
         isLogin() {
         isLogin() {
             return this.$store.state.userInfo && this.$store.state.userInfo.chCompanyName;
             return this.$store.state.userInfo && this.$store.state.userInfo.chCompanyName;
+        },
+        isChinese() {
+            return this.$i18n.locale() === 'zh';
         }
         }
     },
     },
     methods: {
     methods: {

+ 3 - 0
src/pages/Chat.vue

@@ -40,6 +40,9 @@ export default {
         }
         }
     },
     },
     onLoad() {
     onLoad() {
+        wx.setNavigationBarTitle({
+            title: this.$t('zi-xun-xiao-xi')
+        });
         this.$http.post('/user/getAdmin').then(res => {
         this.$http.post('/user/getAdmin').then(res => {
             this.adminId = res;
             this.adminId = res;
         });
         });

+ 2 - 2
src/pages/Classify.vue

@@ -17,7 +17,7 @@
     <div class="container" :style="{ paddingTop: barHeight + 'px' }">
     <div class="container" :style="{ paddingTop: barHeight + 'px' }">
         <van-sticky :offset-top="0">
         <van-sticky :offset-top="0">
             <div class="navBar" :style="narStyle">
             <div class="navBar" :style="narStyle">
-                <div class="title">产品分类</div>
+                <div class="title">{{ $t('chan-pin-fen-lei') }}</div>
                 <van-search
                 <van-search
                     :value="search"
                     :value="search"
                     @search="confirm"
                     @search="confirm"
@@ -58,7 +58,7 @@
                     />
                     />
                     <div class="text">
                     <div class="text">
                         <img src="../static/imgs/quanqiu_icon_jixie.png" alt="" />
                         <img src="../static/imgs/quanqiu_icon_jixie.png" alt="" />
-                        <span>查看全部</span>
+                        <span>{{ $t('cha-kan-quan-bu') }}</span>
                     </div>
                     </div>
                 </div>
                 </div>
 
 

+ 4 - 4
src/pages/Home.vue

@@ -132,7 +132,7 @@
                         </div>
                         </div>
                     </div>
                     </div>
 
 
-                    <van-empty description="暂未设置该类型热门商品" v-else />
+                    <van-empty :description="$t('zan-wei-she-zhi-gai-lei-xing-re-men-shang-pin')" v-else />
                 </div>
                 </div>
                 <!-- <div class="datas">
                 <!-- <div class="datas">
                 <van-image
                 <van-image
@@ -159,7 +159,7 @@
 
 
                 <div class="van-content" v-if="vendorInfos.length > 0">
                 <div class="van-content" v-if="vendorInfos.length > 0">
                     <div class="title">
                     <div class="title">
-                        <h1>合作伙伴</h1>
+                        <h1>{{ $t('he-zuo-huo-ban') }}</h1>
                         <van-button
                         <van-button
                             size="small"
                             size="small"
                             :color="$colors.info"
                             :color="$colors.info"
@@ -167,7 +167,7 @@
                             @click="navigateTo('/pagesHome/Brand', false)"
                             @click="navigateTo('/pagesHome/Brand', false)"
                         >
                         >
                             <div class="btn_icon">
                             <div class="btn_icon">
-                                <span>查看更多</span>
+                                <span>{{ $t('cha-kan-geng-duo') }}</span>
                                 <van-icon name="arrow" :color="$colors.info" />
                                 <van-icon name="arrow" :color="$colors.info" />
                             </div>
                             </div>
                         </van-button>
                         </van-button>
@@ -200,7 +200,7 @@
 
 
                 <div class="tuiJian">
                 <div class="tuiJian">
                     <div class="title">
                     <div class="title">
-                        <h1>为你推荐</h1>
+                        <h1>{{ $t('wei-ni-tui-jian') }}</h1>
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>

+ 8 - 8
src/pages/My.vue

@@ -29,7 +29,7 @@
                     :color="$colors.warn"
                     :color="$colors.warn"
                     :radius="4"
                     :radius="4"
                     @getuserinfo="login"
                     @getuserinfo="login"
-                    >微信快捷登录</van-button
+                    >{{ $t('wei-xin-kuai-jie-deng-lu') }}</van-button
                 >
                 >
                 <van-button
                 <van-button
                     v-else
                     v-else
@@ -38,7 +38,7 @@
                     :radius="4"
                     :radius="4"
                     plain
                     plain
                     @click="navigateTo('/pagesHome/Edit', true, false)"
                     @click="navigateTo('/pagesHome/Edit', true, false)"
-                    >编辑资料</van-button
+                    >{{ $t('bian-ji-zi-liao') }}</van-button
                 >
                 >
             </div>
             </div>
 
 
@@ -67,7 +67,7 @@
             /> -->
             /> -->
             <van-cell
             <van-cell
                 custom-class="my-cell"
                 custom-class="my-cell"
-                title="我的收藏"
+                :title="$t('wo-de-shou-cang')"
                 icon="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/info_icon_collect.png"
                 icon="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/info_icon_collect.png"
                 is-link
                 is-link
                 @click="navigateTo('/pagesMine/Collect')"
                 @click="navigateTo('/pagesMine/Collect')"
@@ -75,7 +75,7 @@
 
 
             <van-cell
             <van-cell
                 custom-class="my-cell"
                 custom-class="my-cell"
-                title="浏览记录"
+                :title="$t('liu-lan-ji-lu')"
                 @click="navigateTo('/pagesMine/ReadRecords')"
                 @click="navigateTo('/pagesMine/ReadRecords')"
                 icon="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/info_icon_collect(2).png"
                 icon="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/info_icon_collect(2).png"
                 is-link
                 is-link
@@ -83,7 +83,7 @@
 
 
             <van-cell
             <van-cell
                 custom-class="my-cell"
                 custom-class="my-cell"
-                title="我的活动"
+                :title="$t('wo-de-huo-dong')"
                 @click="navigateTo('/pagesMine/Activity')"
                 @click="navigateTo('/pagesMine/Activity')"
                 icon="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/info_icon_collect(5).png"
                 icon="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/info_icon_collect(5).png"
                 is-link
                 is-link
@@ -91,7 +91,7 @@
 
 
             <van-cell
             <van-cell
                 custom-class="my-cell"
                 custom-class="my-cell"
-                title="产品需求/成交单"
+                :title="$t('chan-pin-xu-qiu-cheng-jiao-dan')"
                 @click="navigateTo('/pagesMine/Order')"
                 @click="navigateTo('/pagesMine/Order')"
                 icon="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/info_icon_collect(3).png"
                 icon="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/info_icon_collect(3).png"
                 is-link
                 is-link
@@ -99,7 +99,7 @@
 
 
             <van-cell
             <van-cell
                 custom-class="my-cell"
                 custom-class="my-cell"
-                title="账户与安全"
+                :title="$t('zhang-hu-yu-an-quan')"
                 @click="navigateTo('/pagesMine/Account')"
                 @click="navigateTo('/pagesMine/Account')"
                 icon="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/info_icon_collect(4).png"
                 icon="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/info_icon_collect(4).png"
                 is-link
                 is-link
@@ -139,7 +139,7 @@ export default {
                 : 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/info_img_touxiang_01.png';
                 : 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/info_img_touxiang_01.png';
         },
         },
         name() {
         name() {
-            return this.userInfo ? this.userInfo.nickname : '未登录';
+            return this.userInfo ? this.userInfo.nickname : this.$t('wei-deng-lu');
         }
         }
     },
     },
     onShow() {
     onShow() {

+ 18 - 10
src/pagesChat/ChatDetail.vue

@@ -27,7 +27,11 @@
                     <div class="chatInfo">
                     <div class="chatInfo">
                         <van-image class="left-icon" :src="otherInfo.img" :width="36" :height="36" fit="cover" />
                         <van-image class="left-icon" :src="otherInfo.img" :width="36" :height="36" fit="cover" />
                         <div class="chat-content">
                         <div class="chat-content">
-                            您好,我是IMT服务管家 依靠我们的庞大的资源集群,为您提供专业的定制化一站式服务
+                            {{
+                                $t(
+                                    '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'
+                                )
+                            }}
                         </div>
                         </div>
                         <van-image class="right-icon" :src="otherInfo.img" :width="36" :height="36" fit="cover" />
                         <van-image class="right-icon" :src="otherInfo.img" :width="36" :height="36" fit="cover" />
                     </div>
                     </div>
@@ -36,7 +40,11 @@
                         <van-image class="left-icon" :src="otherInfo.img" :width="36" :height="36" fit="cover" />
                         <van-image class="left-icon" :src="otherInfo.img" :width="36" :height="36" fit="cover" />
                         <div class="flex1">
                         <div class="flex1">
                             <div class="chat-content">
                             <div class="chat-content">
-                                选择以下服务,然后详细描述您的需求,我们会尽快回复您!
+                                {{
+                                    $t(
+                                        'xuan-ze-yi-xia-fu-wu-ran-hou-xiang-xi-miao-shu-nin-de-xu-qiu-wo-men-hui-jin-kuai-hui-fu-nin'
+                                    )
+                                }}
                             </div>
                             </div>
 
 
                             <div class="service-list">
                             <div class="service-list">
@@ -65,7 +73,7 @@
                 class="weui-input"
                 class="weui-input"
                 @input="value = $event.detail.value"
                 @input="value = $event.detail.value"
                 :value="value"
                 :value="value"
-                placeholder="请输入需要咨询的问题"
+                :placeholder="$t('qing-shu-ru-xu-yao-zi-xun-de-wen-ti')"
                 confirm-type="send"
                 confirm-type="send"
                 @confirm="confirm"
                 @confirm="confirm"
                 @focus="showImg = false"
                 @focus="showImg = false"
@@ -75,7 +83,7 @@
 
 
         <div class="upload" v-if="showImg">
         <div class="upload" v-if="showImg">
             <van-grid :gutter="16" :border="false">
             <van-grid :gutter="16" :border="false">
-                <van-grid-item icon="photo" text="图片" @click="choosePhoto" />
+                <van-grid-item icon="photo" :text="$t('tu-pian')" @click="choosePhoto" />
             </van-grid>
             </van-grid>
         </div>
         </div>
     </div>
     </div>
@@ -108,17 +116,17 @@ export default {
             if (this.type === 'system') {
             if (this.type === 'system') {
                 return {
                 return {
                     img: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/xiaoxi_icon_xitong.png',
                     img: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/xiaoxi_icon_xitong.png',
-                    name: '系统消息'
+                    name: this.$t('xi-tong-xiao-xi')
                 };
                 };
             } else if (this.type === 'admin') {
             } else if (this.type === 'admin') {
                 return {
                 return {
                     img: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/xiaoxi_icon_fuwuguanjia.png',
                     img: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/xiaoxi_icon_fuwuguanjia.png',
-                    name: '服务管家'
+                    name: this.$t('fu-wu-guan-jia')
                 };
                 };
             } else {
             } else {
                 return {
                 return {
                     img: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/xiaoxi_icon_xitong.png',
                     img: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/xiaoxi_icon_xitong.png',
-                    name: '系统消息'
+                    name: this.$t('xi-tong-xiao-xi')
                 };
                 };
             }
             }
         },
         },
@@ -160,7 +168,7 @@ export default {
         console.log(this.nowDate);
         console.log(this.nowDate);
         if (options.type === 'system') {
         if (options.type === 'system') {
             wx.setNavigationBarTitle({
             wx.setNavigationBarTitle({
-                title: '系统消息'
+                title: this.$t('xi-tong-xiao-xi')
             });
             });
             this.$http.get('/email/details').then(res => {
             this.$http.get('/email/details').then(res => {
                 this.list = res = res.map(item => {
                 this.list = res = res.map(item => {
@@ -185,7 +193,7 @@ export default {
             });
             });
         } else if (options.type === 'admin') {
         } else if (options.type === 'admin') {
             wx.setNavigationBarTitle({
             wx.setNavigationBarTitle({
-                title: '服务管家'
+                title: this.$t('fu-wu-guan-jia')
             });
             });
         } else if (options.name) {
         } else if (options.name) {
             wx.setNavigationBarTitle({
             wx.setNavigationBarTitle({
@@ -214,7 +222,7 @@ export default {
     methods: {
     methods: {
         upper() {},
         upper() {},
         getDetail(isAsk, first = false) {
         getDetail(isAsk, first = false) {
-            this.$loading('加载中');
+            this.$loading(this.$t('jia-zai-zhong'));
             this.$http
             this.$http
                 .post(
                 .post(
                     '/message/details',
                     '/message/details',

+ 20 - 11
src/pagesChat/ChatForm.vue

@@ -6,27 +6,31 @@
 <template>
 <template>
     <div class="pageBottom">
     <div class="pageBottom">
         <van-cell-group :border="false">
         <van-cell-group :border="false">
-            <van-cell :border="false" title="姓名" :value="info.nickname" />
-            <van-cell :border="false" title="称呼" v-if="sex" :value="sex" />
-            <van-cell :border="false" title="电话" :value="info.phone" />
-            <van-cell :border="false" title="邮箱" :value="info.email" />
-            <van-cell :border="false" title="公司名称" :value="info.chCompanyName || info.companyName" />
-            <van-cell :border="false" title="职位" :value="info.position" />
-            <van-cell :border="false" title="备注" v-if="info.remark" :value="info.remark" />
+            <van-cell :border="false" :title="$t('xing-ming')" :value="info.nickname" />
+            <van-cell :border="false" :title="$t('cheng-hu')" v-if="sex" :value="sex" />
+            <van-cell :border="false" :title="$t('dian-hua')" :value="info.phone" />
+            <van-cell :border="false" :title="$t('you-xiang')" :value="info.email" />
             <van-cell
             <van-cell
                 :border="false"
                 :border="false"
-                title="功能需求"
+                :title="$t('gong-si-ming-cheng')"
+                :value="info.chCompanyName || info.companyName"
+            />
+            <van-cell :border="false" :title="$t('zhi-wei')" :value="info.position" />
+            <van-cell :border="false" :title="$t('bei-zhu')" v-if="info.remark" :value="info.remark" />
+            <van-cell
+                :border="false"
+                :title="$t('gong-neng-xu-qiu')"
                 v-if="info.functionalRequirements"
                 v-if="info.functionalRequirements"
                 :value="info.functionalRequirements"
                 :value="info.functionalRequirements"
             />
             />
-            <van-cell :border="false" title="计划加工" v-if="info.artifact" :value="info.artifact" />
+            <van-cell :border="false" :title="$t('ji-hua-jia-gong')" v-if="info.artifact" :value="info.artifact" />
             <van-cell
             <van-cell
                 :border="false"
                 :border="false"
-                title="需求描述"
+                :title="$t('xu-qiu-miao-shu')"
                 v-if="info.otherProblems || info.problems"
                 v-if="info.otherProblems || info.problems"
                 :value="info.otherProblems || info.problems"
                 :value="info.otherProblems || info.problems"
             />
             />
-            <van-cell :border="false" title="意向产品" v-if="info.products">
+            <van-cell :border="false" :title="$t('yi-xiang-chan-pin')" v-if="info.products">
                 <div class="product-list">
                 <div class="product-list">
                     <product-row
                     <product-row
                         v-for="(item, index) in info.products"
                         v-for="(item, index) in info.products"
@@ -64,6 +68,11 @@ export default {
     },
     },
     components: {
     components: {
         ProductRow
         ProductRow
+    },
+    onLoad() {
+        wx.setNavigationBarTitle({
+            title: this.$t('zi-xun-dan-xiang-qing')
+        });
     }
     }
 };
 };
 </script>
 </script>

+ 7 - 7
src/pagesHome/Authorized.vue

@@ -8,18 +8,18 @@
     <div class="container">
     <div class="container">
         <div class="top">
         <div class="top">
             <van-icon name="warning" size="67" :color="$colors.warn" />
             <van-icon name="warning" size="67" :color="$colors.warn" />
-            <h2>请授权登录</h2>
-            <p>请授权微信快捷登录并且绑定手机号</p>
+            <h2>{{ $t('qing-shou-quan-deng-lu') }}</h2>
+            <p>{{ $t('qing-shou-quan-wei-xin-kuai-jie-deng-lu-bing-qie-bang-ding-shou-ji-hao') }}</p>
         </div>
         </div>
 
 
         <div class="btn-content">
         <div class="btn-content">
             <div>
             <div>
-                <van-button :color="$colors.warn" block :radius="4" open-type="getUserInfo" @getuserinfo="login"
-                    >微信快捷登录</van-button
-                >
+                <van-button :color="$colors.warn" block :radius="4" open-type="getUserInfo" @getuserinfo="login">{{
+                    $t('wei-xin-kuai-jie-deng-lu')
+                }}</van-button>
             </div>
             </div>
-            <div style="margin-top:20px">
-                <van-button block :radius="4" @click="navigateBack">返回</van-button>
+            <div style="margin-top: 20px;">
+                <van-button block :radius="4" @click="navigateBack">{{ $t('fan-hui') }}</van-button>
             </div>
             </div>
         </div>
         </div>
 
 

+ 9 - 3
src/pagesHome/Brand.vue

@@ -24,7 +24,7 @@
                     :value="searchKey"
                     :value="searchKey"
                     @change="searchKey = $event.detail"
                     @change="searchKey = $event.detail"
                     input-align="center"
                     input-align="center"
-                    placeholder="搜索..."
+                    :placeholder="$t('sou-suo')"
                     shape="round"
                     shape="round"
                     @search="submitSearch"
                     @search="submitSearch"
                     left-icon="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/search.png"
                     left-icon="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/search.png"
@@ -40,7 +40,7 @@
                 </div>
                 </div>
             </scroll-view>
             </scroll-view>
 
 
-            <h1>全部展商</h1>
+            <h1>{{ $t('quan-bu-zhan-shang') }}</h1>
         </div>
         </div>
         <div class="main" id="main">
         <div class="main" id="main">
             <van-sticky :container="main" :offset-top="barHeight">
             <van-sticky :container="main" :offset-top="barHeight">
@@ -76,7 +76,13 @@
                     </span>
                     </span>
                 </filter-sort-bar>
                 </filter-sort-bar>
             </van-sticky>
             </van-sticky>
-            <sort-list :empty="empty" emptyText="敬请期待" :loading="loading" :finish="finish" top="172rpx">
+            <sort-list
+                :empty="empty"
+                :emptyText="$t('jing-qing-qi-dai')"
+                :loading="loading"
+                :finish="finish"
+                top="172rpx"
+            >
                 <div>
                 <div>
                     <div class="grid-list" v-if="showType === 'grid'">
                     <div class="grid-list" v-if="showType === 'grid'">
                         <div class="col-2" v-for="item in list" :key="item.id">
                         <div class="col-2" v-for="item in list" :key="item.id">

+ 22 - 17
src/pagesHome/Edit.vue

@@ -9,36 +9,36 @@
             <van-image :src="carImg" v-if="carImg" :width="`calc(100vw - 40rpx)`" height="240rpx" fit="contain" />
             <van-image :src="carImg" v-if="carImg" :width="`calc(100vw - 40rpx)`" height="240rpx" fit="contain" />
             <template v-else>
             <template v-else>
                 <van-icon name="photograph" :color="$colors.warn" :size="34" />
                 <van-icon name="photograph" :color="$colors.warn" :size="34" />
-                <div class="text">拍摄名片照片</div>
+                <div class="text">{{ $t('pai-she-ming-pian-zhao-pian') }}</div>
             </template>
             </template>
         </div>
         </div>
         <van-cell-group class="edit">
         <van-cell-group class="edit">
-            <van-cell title="头像" is-link value-class="cellValue" @click="chooseImg">
+            <van-cell :title="$t('tou-xiang')" is-link value-class="cellValue" @click="chooseImg">
                 <van-image :src="myInfo.logo" :width="36" :height="36" fit="cover" :radius="4" />
                 <van-image :src="myInfo.logo" :width="36" :height="36" fit="cover" :radius="4" />
             </van-cell>
             </van-cell>
-            <van-cell title="昵称" is-link :value="myInfo.nickname" @click="change('nickname')" />
+            <van-cell :title="$t('ni-cheng')" is-link :value="myInfo.nickname" @click="change('nickname')" />
             <van-cell
             <van-cell
-                title="称呼"
+                :title="$t('cheng-hu')"
                 @click="chooseSex"
                 @click="chooseSex"
                 is-link
                 is-link
-                :value="sex || '未选择'"
+                :value="sex || $t('wei-xuan-ze')"
                 :value-class="sex ? '' : 'noValue'"
                 :value-class="sex ? '' : 'noValue'"
             />
             />
             <van-cell
             <van-cell
-                title="公司名称"
+                :title="$t('gong-si-ming-cheng')"
                 is-link
                 is-link
-                :value="myInfo.chCompanyName || '未填写'"
+                :value="myInfo.chCompanyName || $t('wei-tian-xie')"
                 :value-class="myInfo.chCompanyName ? '' : 'noValue'"
                 :value-class="myInfo.chCompanyName ? '' : 'noValue'"
                 @click="change('chCompanyName')"
                 @click="change('chCompanyName')"
             />
             />
             <van-cell
             <van-cell
-                title="职位"
+                :title="$t('zhi-wei')"
                 is-link
                 is-link
-                :value="myInfo.userPosition || '未填写'"
+                :value="myInfo.userPosition || $t('wei-tian-xie')"
                 :value-class="myInfo.userPosition ? '' : 'noValue'"
                 :value-class="myInfo.userPosition ? '' : 'noValue'"
                 @click="change('userPosition')"
                 @click="change('userPosition')"
             />
             />
-            <van-cell title="地址" is-link @click="$refs.country.show()">
+            <van-cell :title="$t('di-zhi')" is-link @click="$refs.country.show()">
                 <country-select
                 <country-select
                     size="small"
                     size="small"
                     ref="country"
                     ref="country"
@@ -48,35 +48,35 @@
                     :continent.sync="myInfo.continent"
                     :continent.sync="myInfo.continent"
                 ></country-select>
                 ></country-select>
             </van-cell>
             </van-cell>
-            <van-cell title="所属行业" is-link @click="$refs.industry.show()">
+            <van-cell :title="$t('suo-shu-hang-ye')" is-link @click="$refs.industry.show()">
                 <industry-select ref="industry" v-model="myInfo.industryId"></industry-select>
                 <industry-select ref="industry" v-model="myInfo.industryId"></industry-select>
             </van-cell>
             </van-cell>
 
 
-            <van-cell title="感兴趣的产品" is-link @click="$refs.interestedProCateId.show()">
+            <van-cell :title="$t('gan-xing-qu-de-chan-pin')" is-link @click="$refs.interestedProCateId.show()">
                 <product-category-select
                 <product-category-select
                     ref="interestedProCateId"
                     ref="interestedProCateId"
                     v-model="myInfo.interestedProCateId"
                     v-model="myInfo.interestedProCateId"
                 ></product-category-select>
                 ></product-category-select>
             </van-cell>
             </van-cell>
             <van-cell
             <van-cell
-                title="交流语言"
+                :aria-colcount="$t('jiao-liu-yu-yan')"
                 is-link
                 is-link
-                :value="languageOfCommunication || '未选择'"
+                :value="languageOfCommunication || $t('wei-xuan-ze')"
                 :value-class="languageOfCommunication ? '' : 'noValue'"
                 :value-class="languageOfCommunication ? '' : 'noValue'"
                 @click="chooseLanguage"
                 @click="chooseLanguage"
             />
             />
             <van-cell
             <van-cell
-                title="邮箱"
+                :title="$t('you-xiang')"
                 :border="false"
                 :border="false"
                 is-link
                 is-link
-                :value="myInfo.userEmail || '未填写'"
+                :value="myInfo.userEmail || $t('wei-tian-xie')"
                 :value-class="myInfo.userEmail ? '' : 'noValue'"
                 :value-class="myInfo.userEmail ? '' : 'noValue'"
                 @click="navigateTo('/pagesMine/ChangeEmail?type=edit', false)"
                 @click="navigateTo('/pagesMine/ChangeEmail?type=edit', false)"
             />
             />
         </van-cell-group>
         </van-cell-group>
 
 
         <fixed-button>
         <fixed-button>
-            <van-button :color="$colors.warn" block @click="save">保存</van-button>
+            <van-button :color="$colors.warn" block @click="save">{{ $t('bao-cun') }}</van-button>
         </fixed-button>
         </fixed-button>
         <change-text :show.sync="show" v-model="changeValue" @input="changeSubmit"></change-text>
         <change-text :show.sync="show" v-model="changeValue" @input="changeSubmit"></change-text>
     </div>
     </div>
@@ -132,6 +132,11 @@ export default {
             }
             }
         });
         });
     },
     },
+    onLoad() {
+        wx.setNavigationBarTitle({
+            title: this.$t('bian-ji-zi-liao')
+        });
+    },
     methods: {
     methods: {
         getbase64Data(file) {
         getbase64Data(file) {
             console.log(file);
             console.log(file);

+ 7 - 2
src/pagesHome/FilterPage.vue

@@ -21,8 +21,8 @@
         <offline-experience v-model="offlineExperience" v-if="pageType === 'product'"></offline-experience>
         <offline-experience v-model="offlineExperience" v-if="pageType === 'product'"></offline-experience>
 
 
         <fixed-button btnList>
         <fixed-button btnList>
-            <van-button type="default" block @click="restart">重置</van-button>
-            <van-button :color="$colors.warn" @click="submit" block>确定</van-button>
+            <van-button type="default" block @click="restart">{{ $t('zhong-zhi') }}</van-button>
+            <van-button :color="$colors.warn" @click="submit" block>{{ $t('que-ding') }}</van-button>
         </fixed-button>
         </fixed-button>
     </div>
     </div>
 </template>
 </template>
@@ -87,6 +87,11 @@ export default {
             }
             }
         }
         }
     },
     },
+    onLoad() {
+        wx.setNavigationBarTitle({
+            title: this.$t('shai-xuan')
+        });
+    },
     components: {
     components: {
         ProductCategoryFilter,
         ProductCategoryFilter,
         Country,
         Country,

+ 1 - 1
src/pagesHome/InformationList.vue

@@ -13,7 +13,7 @@
             <search-bar v-model="searchKey" :dark="false" :ratio="ratio" @search="submitSearch"></search-bar>
             <search-bar v-model="searchKey" :dark="false" :ratio="ratio" @search="submitSearch"></search-bar>
         </div>
         </div>
         <div class="main" id="main">
         <div class="main" id="main">
-            <sort-list :empty="empty" emptyText="敬请期待" :loading="loading" :finish="finish" top="0px">
+            <sort-list :empty="empty" :emptyText="$t('jing-qing-qi-dai')" :loading="loading" :finish="finish" top="0px">
                 <div class="product-list2">
                 <div class="product-list2">
                     <div class="item" v-for="item in list" :key="item.id">
                     <div class="item" v-for="item in list" :key="item.id">
                         <news-row :info="item"></news-row>
                         <news-row :info="item"></news-row>

+ 7 - 1
src/pagesHome/Product.vue

@@ -63,7 +63,13 @@
                 </filter-sort-bar>
                 </filter-sort-bar>
             </van-sticky>
             </van-sticky>
 
 
-            <sort-list emptyText="敬请期待" :empty="empty" :loading="loading" :finish="finish" :top="`44px - 172rpx`">
+            <sort-list
+                :emptyText="$t('jing-qing-qi-dai')"
+                :empty="empty"
+                :loading="loading"
+                :finish="finish"
+                :top="`44px - 172rpx`"
+            >
                 <div class="product-list" v-if="showType === 'grid'">
                 <div class="product-list" v-if="showType === 'grid'">
                     <div class="clo-2" v-for="item in list" :key="item.id">
                     <div class="clo-2" v-for="item in list" :key="item.id">
                         <product-grid :info="item"></product-grid>
                         <product-grid :info="item"></product-grid>

+ 7 - 1
src/pagesHome/ProductList.vue

@@ -42,7 +42,13 @@
                 </filter-sort-bar>
                 </filter-sort-bar>
             </van-sticky>
             </van-sticky>
 
 
-            <sort-list :empty="empty" emptyText="敬请期待" :loading="loading" :finish="finish" top="172rpx">
+            <sort-list
+                :empty="empty"
+                :emptyText="$t('jing-qing-qi-dai')"
+                :loading="loading"
+                :finish="finish"
+                top="172rpx"
+            >
                 <div class="product-list" v-if="showType === 'grid'">
                 <div class="product-list" v-if="showType === 'grid'">
                     <div class="clo-2" v-for="item in list" :key="item.id">
                     <div class="clo-2" v-for="item in list" :key="item.id">
                         <product-grid :info="item"></product-grid>
                         <product-grid :info="item"></product-grid>

+ 27 - 20
src/pagesHome/Search.vue

@@ -25,7 +25,7 @@
                     :value="search"
                     :value="search"
                     @search="confirm"
                     @search="confirm"
                     shape="round"
                     shape="round"
-                    placeholder="搜索..."
+                    :placeholder="$t('sou-suo')"
                     @change="changeSearch"
                     @change="changeSearch"
                     :maxlength="60"
                     :maxlength="60"
                     @focus="focus = true"
                     @focus="focus = true"
@@ -43,19 +43,19 @@
                     :style="`height: calc(100vh - ${barHeight}px + 30rpx)`"
                     :style="`height: calc(100vh - ${barHeight}px + 30rpx)`"
                 >
                 >
                     <div class="popuptext top" @click="goNext(searchKey)">
                     <div class="popuptext top" @click="goNext(searchKey)">
-                        搜索
+                        {{ $t('sou-suo-no') }}
                         <span> {{ searchKey }}</span>
                         <span> {{ searchKey }}</span>
-                        ”相关的产品
+                        ”{{ $t('xiang-guan-de-chan-pin') }}
                     </div>
                     </div>
                     <div class="popuptext top" @click="goVendor(searchKey)">
                     <div class="popuptext top" @click="goVendor(searchKey)">
-                        搜索
+                        {{ $t('sou-suo-no') }}
                         <span> {{ searchKey }}</span>
                         <span> {{ searchKey }}</span>
-                        ”相关的展商
+                        ”{{ $t('xiang-guan-de-zhan-shang') }}
                     </div>
                     </div>
                     <div class="popuptext top" @click="goInformation(searchKey)">
                     <div class="popuptext top" @click="goInformation(searchKey)">
-                        搜索
+                        {{ $t('sou-suo-no') }}
                         <span> {{ searchKey }}</span>
                         <span> {{ searchKey }}</span>
-                        ”相关的资讯
+                        ”{{ $t('xiang-guan-de-zi-xun') }}
                     </div>
                     </div>
                     <div
                     <div
                         class="popuptext"
                         class="popuptext"
@@ -70,8 +70,8 @@
         <div class="content">
         <div class="content">
             <div class="history" v-if="historys.length > 0">
             <div class="history" v-if="historys.length > 0">
                 <div class="histroy-title">
                 <div class="histroy-title">
-                    <div class="text">搜索历史</div>
-                    <van-button plain size="small" @click="del" color="#BCC1CC">清空记录</van-button>
+                    <div class="text">{{ $t('sou-suo-li-shi') }}</div>
+                    <van-button plain size="small" @click="del" color="#BCC1CC">{{ $t('qing-kong-ji-lu') }}</van-button>
                 </div>
                 </div>
 
 
                 <div class="history-list">
                 <div class="history-list">
@@ -82,7 +82,7 @@
             </div>
             </div>
             <div class="history">
             <div class="history">
                 <div class="histroy-title">
                 <div class="histroy-title">
-                    <div class="text">热门搜索</div>
+                    <div class="text">{{ $t('re-men-sou-suo') }}</div>
                 </div>
                 </div>
 
 
                 <div class="history-list">
                 <div class="history-list">
@@ -111,7 +111,7 @@ export default {
             left: null,
             left: null,
             historys: [],
             historys: [],
             focus: false,
             focus: false,
-            hots: ['信息通信', '3D打印', '机床', '机加工', '电子器件', '高精度打印机', '量具仪具'],
+            hots: [],
             matchList: [],
             matchList: [],
             ios: false
             ios: false
         };
         };
@@ -243,8 +243,8 @@ export default {
         },
         },
         del() {
         del() {
             Dialog.confirm({
             Dialog.confirm({
-                title: '提示',
-                message: '确定要清除全部搜索记录吗?',
+                title: this.$t('ti-shi'),
+                message: this.$t('que-ding-yao-qing-chu-quan-bu-sou-suo-ji-lu-ma'),
                 confirmButtonColor: this.$colors.warn
                 confirmButtonColor: this.$colors.warn
             })
             })
                 .then(() => {
                 .then(() => {
@@ -269,13 +269,20 @@ export default {
                 matchingName(e.detail).then(res => {
                 matchingName(e.detail).then(res => {
                     let searchstr = e.detail.toLowerCase();
                     let searchstr = e.detail.toLowerCase();
 
 
-                    this.matchList = res.map(item => {
-                        if (item.chName.toLowerCase().indexOf(searchstr) !== -1) {
-                            return item.chName;
-                        } else {
-                            return item.enName;
-                        }
-                    });
+                    this.matchList = [
+                        ...new Set(
+                            res.map(item => {
+                                if (
+                                    (this.isChinese && item.chName.toLowerCase().indexOf(searchstr) !== -1) ||
+                                    (!this.isChinese && item.enName.toLowerCase().indexOf(searchstr) === -1)
+                                ) {
+                                    return item.chName;
+                                } else {
+                                    return item.enName;
+                                }
+                            })
+                        )
+                    ];
                 });
                 });
             } else {
             } else {
                 this.matchList = [];
                 this.matchList = [];

+ 7 - 1
src/pagesHome/SearchList.vue

@@ -42,7 +42,13 @@
                 </filter-sort-bar>
                 </filter-sort-bar>
             </van-sticky>
             </van-sticky>
 
 
-            <sort-list :empty="empty" emptyText="敬请期待" :loading="loading" :finish="finish" top="172rpx">
+            <sort-list
+                :empty="empty"
+                :emptyText="$t('jing-qing-qi-dai')"
+                :loading="loading"
+                :finish="finish"
+                top="172rpx"
+            >
                 <div class="product-list" v-if="showType === 'grid'">
                 <div class="product-list" v-if="showType === 'grid'">
                     <div class="clo-2" v-for="item in list" :key="item.id">
                     <div class="clo-2" v-for="item in list" :key="item.id">
                         <product-grid :info="item"></product-grid>
                         <product-grid :info="item"></product-grid>

+ 7 - 1
src/pagesHome/VendorList.vue

@@ -47,7 +47,13 @@
                 </filter-sort-bar>
                 </filter-sort-bar>
             </van-sticky>
             </van-sticky>
 
 
-            <sort-list :empty="empty" emptyText="敬请期待" :loading="loading" :finish="finish" top="172rpx">
+            <sort-list
+                :empty="empty"
+                :emptyText="$t('jing-qing-qi-dai')"
+                :loading="loading"
+                :finish="finish"
+                top="172rpx"
+            >
                 <div class="product-list" v-if="showType === 'grid'">
                 <div class="product-list" v-if="showType === 'grid'">
                     <div class="clo-2" v-for="item in list" :key="item.id">
                     <div class="clo-2" v-for="item in list" :key="item.id">
                         <VendorGrid :info="item"></VendorGrid>
                         <VendorGrid :info="item"></VendorGrid>

+ 10 - 6
src/pagesImt/Connect.vue

@@ -2,7 +2,7 @@
     <div class="connect">
     <div class="connect">
         <map
         <map
             id="myMap"
             id="myMap"
-            style="width: 100%; height: 300px"
+            style="width: 100%; height: 300px;"
             latitude="31.298919"
             latitude="31.298919"
             longitude="121.629521"
             longitude="121.629521"
             :markers="markers"
             :markers="markers"
@@ -10,7 +10,7 @@
             @callouttap="goLocation"
             @callouttap="goLocation"
         >
         >
             <cover-view slot="callout">
             <cover-view slot="callout">
-                <cover-view marker-id="1" class="goHrea"> 去这里 </cover-view>
+                <cover-view marker-id="1" class="goHrea"> {{ $t('qu-zhe-li') }} </cover-view>
             </cover-view>
             </cover-view>
         </map>
         </map>
 
 
@@ -25,10 +25,14 @@
             </div>
             </div>
             <div class="connect-info" @click="goLocation">
             <div class="connect-info" @click="goLocation">
                 <van-icon name="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/footer_icon_dizhi.png" :size="20" />
                 <van-icon name="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/footer_icon_dizhi.png" :size="20" />
-                <h3 class="fontNormal link">中国(上海)自由贸易试验区富特东三路526号</h3>
+                <h3 class="fontNormal link">
+                    {{ $t('zhong-guo-shang-hai-zi-you-mao-yi-shi-yan-qu-fu-te-dong-san-lu-526-hao') }}
+                </h3>
             </div>
             </div>
             <div class="btn">
             <div class="btn">
-                <van-button :color="$colors.warn" block :radius="4" @click="takePhone">联系我们</van-button>
+                <van-button :color="$colors.warn" block :radius="4" @click="takePhone">{{
+                    $t('lian-xi-wo-men')
+                }}</van-button>
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>
@@ -60,8 +64,8 @@ export default {
             wx.openLocation({
             wx.openLocation({
                 latitude: 31.298919,
                 latitude: 31.298919,
                 longitude: 121.629521,
                 longitude: 121.629521,
-                name: '外高桥智能制造服务产业园',
-                address: '中国(上海)自由贸易试验区富特东三路526号'
+                name: this.$t('wai-gao-qiao-zhi-neng-zhi-zao-fu-wu-chan-ye-yuan'),
+                address: this.$t('zhong-guo-shang-hai-zi-you-mao-yi-shi-yan-qu-fu-te-dong-san-lu-526-hao')
             });
             });
         }
         }
     }
     }

+ 6 - 8
src/pagesImt/Index.vue

@@ -26,18 +26,16 @@
                 <div class="thirdbtn" @click="go3D">
                 <div class="thirdbtn" @click="go3D">
                     <img src="../static/imgs/imt_topbanner_icon_3d.png" alt="" />
                     <img src="../static/imgs/imt_topbanner_icon_3d.png" alt="" />
                     <div class="text">
                     <div class="text">
-                        <h4>点击观看 IMT 3D展厅</h4>
+                        <h4>{{ $t('dian-ji-guan-kan-imt-3d-zhan-ting') }}</h4>
                     </div>
                     </div>
                 </div>
                 </div>
 
 
                 <div class="introduce">
                 <div class="introduce">
                     <Title>
                     <Title>
                         <template slot="name">
                         <template slot="name">
-                            IMT·<span :style="`color:${$colors.warn}`">科技平台</span>
+                            IMT·<span :style="`color:${$colors.warn}`">{{ $t('ke-ji-ping-tai') }}</span>
                         </template>
                         </template>
-                        <template slot="sub"
-                            >智能制造产业链生态系统</template
-                        >
+                        <template slot="sub">{{ $t('zhi-neng-zhi-zao-chan-ye-lian-sheng-tai-xi-tong') }}</template>
                     </Title>
                     </Title>
 
 
                     <div class="p1">
                     <div class="p1">
@@ -50,19 +48,19 @@
                             <div class="img-box">
                             <div class="img-box">
                                 <img src="../static/imgs/imt_gaikuang_icon_01.png" alt="" />
                                 <img src="../static/imgs/imt_gaikuang_icon_01.png" alt="" />
                             </div>
                             </div>
-                            <div class="text">高度集聚性</div>
+                            <div class="text">{{ $t('gao-du-ji-ju-xing') }}</div>
                         </div>
                         </div>
                         <div class="introduce-img-item">
                         <div class="introduce-img-item">
                             <div class="img-box">
                             <div class="img-box">
                                 <img src="../static/imgs/imt_gaikuang_icon_02.png" alt="" />
                                 <img src="../static/imgs/imt_gaikuang_icon_02.png" alt="" />
                             </div>
                             </div>
-                            <div class="text">高精密产品/技术</div>
+                            <div class="text">{{ $t('gao-jing-mi-chan-pin-ji-shu') }}</div>
                         </div>
                         </div>
                         <div class="introduce-img-item">
                         <div class="introduce-img-item">
                             <div class="img-box">
                             <div class="img-box">
                                 <img src="../static/imgs/imt_gaikuang_icon_03.png" alt="" />
                                 <img src="../static/imgs/imt_gaikuang_icon_03.png" alt="" />
                             </div>
                             </div>
-                            <div class="text">高度专业化</div>
+                            <div class="text">{{ $t('gao-du-zhuan-ye-hua') }}</div>
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>

+ 13 - 8
src/pagesMine/Account.vue

@@ -7,33 +7,33 @@
 <template>
 <template>
     <div class="edit pageBottom">
     <div class="edit pageBottom">
         <van-cell-group :border="false">
         <van-cell-group :border="false">
-            <van-cell title="ID账号" :value="myInfo.id" />
+            <van-cell :title="$t('id-zhang-hao')" :value="myInfo.id" />
             <van-cell
             <van-cell
-                title="登录密码"
+                :title="$t('deng-lu-mi-ma')"
                 is-link
                 is-link
-                :value="setPassword ? '已设置' : '未设置'"
+                :value="setPassword ? $t('yi-she-zhi') : $t('wei-she-zhi')"
                 :value-class="setPassword ? '' : 'noValue'"
                 :value-class="setPassword ? '' : 'noValue'"
                 @click="navigateTo('/pagesMine/ChangePsd')"
                 @click="navigateTo('/pagesMine/ChangePsd')"
             />
             />
             <van-cell
             <van-cell
-                title="手机号"
+                :title="$t('shou-ji-hao')"
                 is-link
                 is-link
-                :value="myInfo.phone || '未绑定'"
+                :value="myInfo.phone || $t('wei-bang-ding')"
                 :value-class="myInfo.phone ? '' : 'noValue'"
                 :value-class="myInfo.phone ? '' : 'noValue'"
                 @click="navigateTo('/pagesMine/ChangePhone')"
                 @click="navigateTo('/pagesMine/ChangePhone')"
             />
             />
 
 
             <van-cell
             <van-cell
-                title="邮箱"
+                :title="$t('you-xiang')"
                 is-link
                 is-link
-                :value="myInfo.email || '未绑定'"
+                :value="myInfo.email || $t('wei-bang-ding')"
                 :value-class="myInfo.email ? '' : 'noValue'"
                 :value-class="myInfo.email ? '' : 'noValue'"
                 @click="navigateTo('/pagesMine/ChangeEmail')"
                 @click="navigateTo('/pagesMine/ChangeEmail')"
             />
             />
         </van-cell-group>
         </van-cell-group>
 
 
         <div class="tip">
         <div class="tip">
-            注:在PC端可以用ID号/手机号/邮箱加密码的形式进行登录
+            {{ $t('zhu-zai-pc-duan-ke-yi-yong-id-hao-shou-ji-hao-you-xiang-jia-mi-ma-de-xing-shi-jin-hang-deng-lu') }}
         </div>
         </div>
     </div>
     </div>
 </template>
 </template>
@@ -55,6 +55,11 @@ export default {
         this.$http.post('/user/password').then(res => {
         this.$http.post('/user/password').then(res => {
             this.setPassword = res;
             this.setPassword = res;
         });
         });
+    },
+    onLoad() {
+        wx.setNavigationBarTitle({
+            title: this.$t('zhang-hao-yu-an-quan')
+        });
     }
     }
 };
 };
 </script>
 </script>

+ 4 - 1
src/pagesMine/Activity.vue

@@ -7,7 +7,7 @@
     <div>
     <div>
         <sort-list
         <sort-list
             :empty="showListEmpty"
             :empty="showListEmpty"
-            emptyText="未参加任何活动哦"
+            :emptyText="$t('wei-can-jia-ren-he-huo-dong-o')"
             :loading="loading"
             :loading="loading"
             :finish="finish"
             :finish="finish"
             :top="`0px + ${barHeight}px`"
             :top="`0px + ${barHeight}px`"
@@ -65,6 +65,9 @@ export default {
     mixins: [searchList],
     mixins: [searchList],
     mounted() {
     mounted() {
         this.getData();
         this.getData();
+        wx.setNavigationBarTitle({
+            title: this.$t('wo-de-huo-dong')
+        });
     },
     },
     onReachBottom() {
     onReachBottom() {
         if (!this.loading && !this.finish) {
         if (!this.loading && !this.finish) {

+ 8 - 5
src/pagesMine/ChangeEmail.vue

@@ -7,7 +7,7 @@
 <template>
 <template>
     <div>
     <div>
         <div class="page-info">
         <div class="page-info">
-            <h3>输入邮箱</h3>
+            <h3>{{ $t('shu-ru-you-xiang') }}</h3>
             <div class="page-input">
             <div class="page-input">
                 <input
                 <input
                     type="text"
                     type="text"
@@ -16,7 +16,7 @@
                     @blur="email = $event.detail.value"
                     @blur="email = $event.detail.value"
                     :value="email"
                     :value="email"
                     class="text"
                     class="text"
-                    placeholder="请输入邮箱账号"
+                    :placeholder="$t('qing-shu-ru-you-xiang-zhang-hao')"
                     placeholder-class="pla-textarea"
                     placeholder-class="pla-textarea"
                 />
                 />
             </div>
             </div>
@@ -51,15 +51,18 @@ export default {
         if (options.type === 'edit') {
         if (options.type === 'edit') {
             this.isEdit = true;
             this.isEdit = true;
         }
         }
+        wx.setNavigationBarTitle({
+            title: this.$t('bang-ding-you-xiang')
+        });
     },
     },
     methods: {
     methods: {
         submit() {
         submit() {
             if (!this.email) {
             if (!this.email) {
-                this.toast('请输入邮箱');
+                this.toast(this.$t('qing-shu-ru-you-xiang'));
                 return;
                 return;
             }
             }
             if (!emailRule.test(this.email)) {
             if (!emailRule.test(this.email)) {
-                this.toast('邮箱格式错误');
+                this.toast(this.$t('you-xiang-ge-shi-cuo-wu'));
                 return;
                 return;
             }
             }
 
 
@@ -82,7 +85,7 @@ export default {
                         }
                         }
                     )
                     )
                     .then(res => {
                     .then(res => {
-                        this.toast('绑定成功', 'success');
+                        this.toast(this.$t('bang-ding-cheng-gong'), 'success');
                         this.$store.dispatch('getUserInfo').then(() => {
                         this.$store.dispatch('getUserInfo').then(() => {
                             this.navigateBack();
                             this.navigateBack();
                         });
                         });

+ 18 - 13
src/pagesMine/ChangePhone.vue

@@ -7,7 +7,7 @@
 <template>
 <template>
     <div>
     <div>
         <div class="page-info">
         <div class="page-info">
-            <h3>{{ isVer ? '修改手机号' : '当前手机号' }}</h3>
+            <h3>{{ isVer ? $t('xiu-gai-shou-ji-hao') : $t('dang-qian-shou-ji-hao') }}</h3>
             <div class="page-input">
             <div class="page-input">
                 <div class="phoenPre">
                 <div class="phoenPre">
                     CH +86
                     CH +86
@@ -19,7 +19,7 @@
                     @blur="phone = $event.detail.value"
                     @blur="phone = $event.detail.value"
                     :value="phone"
                     :value="phone"
                     class="text"
                     class="text"
-                    placeholder="请输入绑定手机"
+                    :placeholder="$t('qing-shu-ru-bang-ding-shou-ji')"
                     placeholder-class="pla-textarea"
                     placeholder-class="pla-textarea"
                     v-if="isVer"
                     v-if="isVer"
                 />
                 />
@@ -36,7 +36,7 @@
                     @blur="code = $event.detail.value"
                     @blur="code = $event.detail.value"
                     :value="code"
                     :value="code"
                     class="text"
                     class="text"
-                    placeholder="请输入验证码"
+                    :placeholder="$t('qing-shu-ru-yan-zheng-ma')"
                     placeholder-class="pla-textarea"
                     placeholder-class="pla-textarea"
                 />
                 />
                 <van-button v-if="isSend" color="#BCC1CC" size="small" plain>已发送({{ senNum }}S)</van-button>
                 <van-button v-if="isSend" color="#BCC1CC" size="small" plain>已发送({{ senNum }}S)</van-button>
@@ -80,17 +80,17 @@ export default {
         submit() {
         submit() {
             if (this.isVer) {
             if (this.isVer) {
                 if (!this.phone) {
                 if (!this.phone) {
-                    this.toast('请输入手机号');
+                    this.toast(this.$t('qing-shu-ru-shou-ji-hao'));
                     return;
                     return;
                 }
                 }
                 if (!phoneRegular.test(this.phone)) {
                 if (!phoneRegular.test(this.phone)) {
-                    this.toast('手机号格式错误');
+                    this.toast(this.$t('shou-ji-hao-ge-shi-cuo-wu'));
                     return;
                     return;
                 }
                 }
             }
             }
 
 
             if (!this.code) {
             if (!this.code) {
-                this.toast('请输入验证码');
+                this.toast(this.$t('qing-shu-ru-yan-zheng-ma'));
                 return;
                 return;
             }
             }
             if (this.isVer) {
             if (this.isVer) {
@@ -99,7 +99,7 @@ export default {
                         code: this.code
                         code: this.code
                     })
                     })
                     .then(res => {
                     .then(res => {
-                        this.toast('修改成功', 'success');
+                        this.toast(this.$t('xiu-gai-cheng-gong'), 'success');
                         this.$store.dispatch('getUserInfo').then(() => {
                         this.$store.dispatch('getUserInfo').then(() => {
                             this.navigateBack();
                             this.navigateBack();
                         });
                         });
@@ -110,9 +110,9 @@ export default {
             } else {
             } else {
                 this.verifySms(this.isVer ? this.phone : this.userInfo.phone, this.code).then(res => {
                 this.verifySms(this.isVer ? this.phone : this.userInfo.phone, this.code).then(res => {
                     this.isVer = true;
                     this.isVer = true;
-                    this.toast('验证成功', 'success');
+                    this.toast(this.$t('yan-zheng-cheng-gong'), 'success');
                     wx.setNavigationBarTitle({
                     wx.setNavigationBarTitle({
-                        title: '绑定手机号'
+                        title: this.$t('bang-ding-shou-ji-hao')
                     });
                     });
                     this.code = '';
                     this.code = '';
                     this.phone = '';
                     this.phone = '';
@@ -139,15 +139,15 @@ export default {
         sms() {
         sms() {
             if (this.isVer) {
             if (this.isVer) {
                 if (!this.phone) {
                 if (!this.phone) {
-                    this.toast('请输入手机号');
+                    this.toast(this.$t('qing-shu-ru-shou-ji-hao'));
                     return;
                     return;
                 }
                 }
                 if (!phoneRegular.test(this.phone)) {
                 if (!phoneRegular.test(this.phone)) {
-                    this.toast('手机号格式错误');
+                    this.toast(this.$t('shou-ji-hao-ge-shi-cuo-wu'));
                     return;
                     return;
                 }
                 }
             } else if (!this.userInfo) {
             } else if (!this.userInfo) {
-                this.toast('账号信息不全');
+                this.toast(this.$t('zhang-hao-xin-xi-bu-quan'));
                 return;
                 return;
             }
             }
             this.$http
             this.$http
@@ -155,7 +155,7 @@ export default {
                     phone: this.isVer ? this.phone : this.userInfo.phone
                     phone: this.isVer ? this.phone : this.userInfo.phone
                 })
                 })
                 .then(() => {
                 .then(() => {
-                    this.toast('发送成功', 'success');
+                    this.toast(this.$t('fa-song-cheng-gong'), 'success');
                     this.isSend = true;
                     this.isSend = true;
                     this.senNum = 61;
                     this.senNum = 61;
                     this.setTime();
                     this.setTime();
@@ -184,6 +184,11 @@ export default {
                 return num - 1;
                 return num - 1;
             }
             }
         }
         }
+    },
+    onLoad() {
+        wx.setNavigationBarTitle({
+            title: this.$t('xiu-gai-shou-ji-hao')
+        });
     }
     }
 };
 };
 </script>
 </script>

+ 12 - 7
src/pagesMine/ChangePsd.vue

@@ -7,7 +7,7 @@
 <template>
 <template>
     <div>
     <div>
         <div class="page-info">
         <div class="page-info">
-            <h3>输入密码</h3>
+            <h3>{{ $t('shu-ru-mi-ma') }}</h3>
             <div class="page-input">
             <div class="page-input">
                 <input
                 <input
                     type="password"
                     type="password"
@@ -16,7 +16,7 @@
                     @blur="password = $event.detail.value"
                     @blur="password = $event.detail.value"
                     :value="password"
                     :value="password"
                     class="text"
                     class="text"
-                    placeholder="建议使用两种或两种以上字符组合,6-18位"
+                    :placeholder="$t('jian-yi-shi-yong-liang-zhong-huo-liang-zhong-yi-shang-zi-fu-zu-he-618-wei')"
                     placeholder-class="pla-textarea"
                     placeholder-class="pla-textarea"
                 />
                 />
             </div>
             </div>
@@ -31,7 +31,7 @@
                     @blur="password2 = $event.detail.value"
                     @blur="password2 = $event.detail.value"
                     :value="password2"
                     :value="password2"
                     class="text"
                     class="text"
-                    placeholder="建议使用两种或两种以上字符组合,6-18位"
+                    :placeholder="$t('jian-yi-shi-yong-liang-zhong-huo-liang-zhong-yi-shang-zi-fu-zu-he-618-wei')"
                     placeholder-class="pla-textarea"
                     placeholder-class="pla-textarea"
                 />
                 />
             </div>
             </div>
@@ -62,15 +62,15 @@ export default {
     methods: {
     methods: {
         submit() {
         submit() {
             if (!this.password) {
             if (!this.password) {
-                this.toast('请输入密码');
+                this.toast(this.$t('qing-shu-ru-mi-ma'));
                 return;
                 return;
             }
             }
             if (this.password.length < 6) {
             if (this.password.length < 6) {
-                this.toast('密码格式过于简单');
+                this.toast(this.$t('mi-ma-ge-shi-guo-yu-jian-dan'));
                 return;
                 return;
             }
             }
             if (this.password2 != this.password) {
             if (this.password2 != this.password) {
-                this.toast('两次密码输入不一致');
+                this.toast(this.$t('liang-ci-mi-ma-shu-ru-bu-yi-zhi'));
                 return;
                 return;
             }
             }
 
 
@@ -79,7 +79,7 @@ export default {
                     password: this.password
                     password: this.password
                 })
                 })
                 .then(res => {
                 .then(res => {
-                    this.toast('设置成功', 'success');
+                    this.toast(this.$t('she-zhi-cheng-gong'), 'success');
                     this.$store.dispatch('getUserInfo').then(() => {
                     this.$store.dispatch('getUserInfo').then(() => {
                         this.navigateBack();
                         this.navigateBack();
                     });
                     });
@@ -88,6 +88,11 @@ export default {
                     this.toast(e.error);
                     this.toast(e.error);
                 });
                 });
         }
         }
+    },
+    onLoad() {
+        wx.setNavigationBarTitle({
+            title: this.$t('she-zhi-mi-ma')
+        });
     }
     }
 };
 };
 </script>
 </script>

+ 11 - 8
src/pagesMine/Collect.vue

@@ -23,9 +23,9 @@
 
 
                 <div class="flex1"></div>
                 <div class="flex1"></div>
                 <block v-if="isEdit">
                 <block v-if="isEdit">
-                    <van-button size="small" v-if="chooseList.length > 0" :color="$colors.warn" @click="del" plain
-                        >删除</van-button
-                    >
+                    <van-button size="small" v-if="chooseList.length > 0" :color="$colors.warn" @click="del" plain>{{
+                        $t('shan-chu')
+                    }}</van-button>
                     <van-button
                     <van-button
                         size="small"
                         size="small"
                         :color="$colors.info"
                         :color="$colors.info"
@@ -34,7 +34,7 @@
                             chooseList = [];
                             chooseList = [];
                         "
                         "
                         plain
                         plain
-                        >取消</van-button
+                        >{{ $t('qu-xiao') }}</van-button
                     >
                     >
                 </block>
                 </block>
                 <van-button size="small" v-else :color="$colors.warn" @click="isEdit = true" plain>编辑</van-button>
                 <van-button size="small" v-else :color="$colors.warn" @click="isEdit = true" plain>编辑</van-button>
@@ -42,7 +42,7 @@
         </van-sticky>
         </van-sticky>
         <sort-list
         <sort-list
             emptyImg="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/kong_img_shouchang.png"
             emptyImg="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/kong_img_shouchang.png"
-            emptyText="当前暂无收藏哦~"
+            :emptyText="$t('dang-qian-zan-wu-shou-cango')"
             :empty="empty"
             :empty="empty"
             :loading="loading"
             :loading="loading"
             :finish="finish"
             :finish="finish"
@@ -69,7 +69,7 @@
 
 
             <template slot="emptyButton">
             <template slot="emptyButton">
                 <van-button block :color="$colors.warn" @click="goHome">
                 <van-button block :color="$colors.warn" @click="goHome">
-                    去逛逛
+                    {{ $t('qu-guang-guang') }}
                 </van-button>
                 </van-button>
             </template>
             </template>
         </sort-list>
         </sort-list>
@@ -118,6 +118,9 @@ export default {
     },
     },
     onLoad() {
     onLoad() {
         this.getData();
         this.getData();
+        wx.setNavigationBarTitle({
+            title: this.$t('wo-de-shou-cang')
+        });
     },
     },
     methods: {
     methods: {
         chooseTab(type) {
         chooseTab(type) {
@@ -127,7 +130,7 @@ export default {
             }
             }
         },
         },
         del() {
         del() {
-            this.dialog('确认要删除吗?', true)
+            this.dialog(this.$t('que-ren-yao-shan-chu-ma'), true)
                 .then(() => {
                 .then(() => {
                     return this.$http.post('/collect/batchCancel', {
                     return this.$http.post('/collect/batchCancel', {
                         type: this.type,
                         type: this.type,
@@ -136,7 +139,7 @@ export default {
                     });
                     });
                 })
                 })
                 .then(res => {
                 .then(res => {
-                    this.toast('删除成功', 'success');
+                    this.toast(this.$t('shan-chu-cheng-gong'), 'success');
                     this.getData();
                     this.getData();
                 })
                 })
                 .catch(e => {
                 .catch(e => {

+ 20 - 7
src/pagesMine/Enter.vue

@@ -13,11 +13,17 @@
             />
             />
 
 
             <div class="top-text">
             <div class="top-text">
-                <div class="text1">IMT科技平台展商入驻</div>
-                <div class="text2">IMT携手优秀企业共同实现智能制造产业链信息集成与共享</div>
+                <div class="text1">{{ $t('imt-ke-ji-ping-tai-zhan-shang-ru-zhu') }}</div>
+                <div class="text2">
+                    {{
+                        $t(
+                            'imt-xie-shou-you-xiu-qi-ye-gong-tong-shi-xian-zhi-neng-zhi-zao-chan-ye-lian-xin-xi-ji-cheng-yu-gong-xiang'
+                        )
+                    }}
+                </div>
             </div>
             </div>
         </div>
         </div>
-        <h3>入驻流程</h3>
+        <h3>{{ $t('ru-zhu-liu-cheng') }}</h3>
         <scroll-view scroll-x style="width: 100%;">
         <scroll-view scroll-x style="width: 100%;">
             <div class="process-list">
             <div class="process-list">
                 <process
                 <process
@@ -36,7 +42,9 @@
         </scroll-view>
         </scroll-view>
 
 
         <fixed-button>
         <fixed-button>
-            <van-button :color="$colors.warn" @click="showDiloag" block>请在PC端进行入驻</van-button>
+            <van-button :color="$colors.warn" @click="showDiloag" block>{{
+                $t('qing-zai-pc-duan-jin-hang-ru-zhu')
+            }}</van-button>
         </fixed-button>
         </fixed-button>
 
 
         <van-popup :show="show" round position="bottom" @close="show = false">
         <van-popup :show="show" round position="bottom" @close="show = false">
@@ -50,7 +58,7 @@
         <van-dialog id="van-dialog">
         <van-dialog id="van-dialog">
             <div class="message">
             <div class="message">
                 <div class="text1">www.imttech.cn</div>
                 <div class="text1">www.imttech.cn</div>
-                <div class="text2">详情咨询:021-60797117</div>
+                <div class="text2">{{ $t('xiang-qing-zi-xun') }}:021-60797117</div>
             </div>
             </div>
         </van-dialog>
         </van-dialog>
     </div>
     </div>
@@ -146,14 +154,19 @@ export default {
     methods: {
     methods: {
         showDiloag() {
         showDiloag() {
             Dialog.confirm({
             Dialog.confirm({
-                title: '请在PC端访问',
+                title: this.$t('qing-zai-pc-duan-fang-wen'),
                 message: 'www.imttech.cn',
                 message: 'www.imttech.cn',
                 confirmButtonColor: this.$colors.warn,
                 confirmButtonColor: this.$colors.warn,
                 showCancelButton: false,
                 showCancelButton: false,
-                confirmButtonText: '我知道了',
+                confirmButtonText: this.$t('wo-zhi-dao-le'),
                 useSlot: true
                 useSlot: true
             });
             });
         }
         }
+    },
+    onLoad() {
+        wx.setNavigationBarTitle({
+            title: this.$t('zhan-shang-ru-zhu')
+        });
     }
     }
 };
 };
 </script>
 </script>

+ 7 - 2
src/pagesMine/Order.vue

@@ -30,14 +30,14 @@
             :loading="loading"
             :loading="loading"
             :finish="finish"
             :finish="finish"
             :top="`88rpx + ${barHeight} px`"
             :top="`88rpx + ${barHeight} px`"
-            emptyText="当前暂无相关记录哦~"
+            :emptyText="$t('dang-qian-zan-wu-xiang-guan-ji-luo')"
         >
         >
             <div class="order-list">
             <div class="order-list">
                 <order v-for="(item, index) in list" :index="index" :key="item.id" :info="item"></order>
                 <order v-for="(item, index) in list" :index="index" :key="item.id" :info="item"></order>
             </div>
             </div>
             <template slot="emptyButton">
             <template slot="emptyButton">
                 <van-button block :color="$colors.warn" @click="navigateTo('/pagesMine/OrderDetail?type=' + type)">
                 <van-button block :color="$colors.warn" @click="navigateTo('/pagesMine/OrderDetail?type=' + type)">
-                    新增
+                    {{ $t('xin-zeng') }}
                 </van-button>
                 </van-button>
             </template>
             </template>
         </sort-list>
         </sort-list>
@@ -95,6 +95,11 @@ export default {
             };
             };
         }
         }
     },
     },
+    onLoad() {
+        wx.setNavigationBarTitle({
+            title: this.$t('chan-pin-xu-qiu-cheng-jiao-dan')
+        });
+    },
     methods: {
     methods: {
         chooseTab(type) {
         chooseTab(type) {
             if (type !== this.type) {
             if (type !== this.type) {

+ 19 - 16
src/pagesMine/OrderDetail.vue

@@ -6,14 +6,14 @@
 <template>
 <template>
     <div>
     <div>
         <div class="page-info">
         <div class="page-info">
-            <h3>选择新增清单类型</h3>
+            <h3>{{ $t('xuan-ze-xin-zeng-qing-dan-lei-xing') }}</h3>
             <div class="page-input" @click="chooseType">
             <div class="page-input" @click="chooseType">
                 <span class="text">{{ typeName }}</span>
                 <span class="text">{{ typeName }}</span>
                 <van-icon name="arrow" color="#CACFDB" :size="24" />
                 <van-icon name="arrow" color="#CACFDB" :size="24" />
             </div>
             </div>
         </div>
         </div>
         <div class="page-info">
         <div class="page-info">
-            <h3>产品名称</h3>
+            <h3>{{ $t('chan-pin-ming-cheng') }}</h3>
             <div class="page-input">
             <div class="page-input">
                 <input
                 <input
                     type="text"
                     type="text"
@@ -22,14 +22,14 @@
                     @blur="form.name = $event.detail.value"
                     @blur="form.name = $event.detail.value"
                     :value="form.name"
                     :value="form.name"
                     class="text"
                     class="text"
-                    placeholder="请输入产品名称"
+                    :placeholder="$t('qing-shu-ru-chan-pin-ming-cheng')"
                     placeholder-class="pla-textarea"
                     placeholder-class="pla-textarea"
                 />
                 />
             </div>
             </div>
         </div>
         </div>
 
 
         <div class="page-info">
         <div class="page-info">
-            <h3>产品品牌</h3>
+            <h3>{{ $t('chan-pin-pin-pai') }}</h3>
             <div class="page-input">
             <div class="page-input">
                 <input
                 <input
                     type="text"
                     type="text"
@@ -38,14 +38,14 @@
                     @blur="form.brand = $event.detail.value"
                     @blur="form.brand = $event.detail.value"
                     :value="form.brand"
                     :value="form.brand"
                     class="text"
                     class="text"
-                    placeholder="请输入品牌名称"
+                    :placeholder="$t('qing-shu-ru-pin-pai-ming-cheng')"
                     placeholder-class="pla-textarea"
                     placeholder-class="pla-textarea"
                 />
                 />
             </div>
             </div>
         </div>
         </div>
 
 
         <div class="page-info">
         <div class="page-info">
-            <h3>产品类别</h3>
+            <h3>{{ $t('chan-pin-lei-bie') }}</h3>
             <div class="page-input" @click="$refs.productCategory.show()">
             <div class="page-input" @click="$refs.productCategory.show()">
                 <div class="text">
                 <div class="text">
                     <product-category-select
                     <product-category-select
@@ -58,7 +58,7 @@
         </div>
         </div>
 
 
         <div class="page-info">
         <div class="page-info">
-            <h3>应用领域</h3>
+            <h3>{{ $t('ying-yong-ling-yu') }}</h3>
             <div class="page-input" @click="$refs.applicationField.show()">
             <div class="page-input" @click="$refs.applicationField.show()">
                 <div class="text">
                 <div class="text">
                     <application-select v-model="form.applicationField" ref="applicationField"></application-select>
                     <application-select v-model="form.applicationField" ref="applicationField"></application-select>
@@ -68,7 +68,7 @@
         </div>
         </div>
 
 
         <div class="page-info">
         <div class="page-info">
-            <h3>产品描述</h3>
+            <h3>{{ $t('chan-pin-miao-shu') }}</h3>
             <textarea
             <textarea
                 @input="form.introduction = $event.detail.value"
                 @input="form.introduction = $event.detail.value"
                 @confirm="form.introduction = $event.detail.value"
                 @confirm="form.introduction = $event.detail.value"
@@ -76,7 +76,7 @@
                 :value="form.introduction"
                 :value="form.introduction"
                 auto-height
                 auto-height
                 class="textarea"
                 class="textarea"
-                placeholder="请简要描述您的产品,100字以内"
+                :placeholder="$t('qing-jian-yao-miao-shu-nin-de-chan-pin-100-zi-yi-nei')"
                 placeholder-class="pla-textarea"
                 placeholder-class="pla-textarea"
                 :maxlength="100"
                 :maxlength="100"
             />
             />
@@ -84,7 +84,7 @@
 
 
         <fixed-button>
         <fixed-button>
             <van-button block @click="submit" :color="$colors.warn" :disabled="!canNext">{{
             <van-button block @click="submit" :color="$colors.warn" :disabled="!canNext">{{
-                orderId ? '保存' : '提交'
+                orderId ? $t('bao-cun') : $t('ti-jiao')
             }}</van-button>
             }}</van-button>
         </fixed-button>
         </fixed-button>
     </div>
     </div>
@@ -168,23 +168,23 @@ export default {
         submit() {
         submit() {
             const form = { ...this.form };
             const form = { ...this.form };
             if (!form.name) {
             if (!form.name) {
-                this.toast('请输入产品名称');
+                this.toast(this.$t('qing-shu-ru-chan-pin-ming-cheng'));
                 return;
                 return;
             }
             }
             if (!form.brand) {
             if (!form.brand) {
-                this.toast('请输入品牌名称');
+                this.toast(this.$t('qing-shu-ru-pin-pai-ming-cheng'));
                 return;
                 return;
             }
             }
             if (!form.productCategoryId) {
             if (!form.productCategoryId) {
-                this.toast('请选择产品类别');
+                this.toast(this.$t('qing-xuan-ze-chan-pin-lei-bie'));
                 return;
                 return;
             }
             }
             if (form.applicationField.length === 0) {
             if (form.applicationField.length === 0) {
-                this.toast('请选择应用领域');
+                this.toast(this.$t('qing-xuan-ze-ying-yong-ling-yu'));
                 return;
                 return;
             }
             }
             if (!form.introduction) {
             if (!form.introduction) {
-                this.toast('请输入产品描述');
+                this.toast(this.$t('qing-shu-ru-chan-pin-miao-shu'));
                 return;
                 return;
             }
             }
             if (!form.id) {
             if (!form.id) {
@@ -197,7 +197,10 @@ export default {
                     }
                     }
                 })
                 })
                 .then(res => {
                 .then(res => {
-                    this.toast(this.orderId ? '修改成功' : '新增成功', 'success');
+                    this.toast(
+                        this.orderId ? this.$t('xiu-gai-cheng-gong') : this.$t('xin-zeng-cheng-gong'),
+                        'success'
+                    );
                     setTimeout(() => {
                     setTimeout(() => {
                         this.navigateBack();
                         this.navigateBack();
                     }, 500);
                     }, 500);

+ 11 - 3
src/pagesProduct/Detail.vue

@@ -277,11 +277,19 @@ export default {
         }
         }
     },
     },
     onLoad(options) {
     onLoad(options) {
-        if (options.id) {
+        var id = options.id || '';
+
+        if (options.q) {
+            let query = decodeURIComponent(options.q).split('?id=');
+            if (query.length > 1) {
+                id = query[1];
+            }
+        }
+        if (id) {
             this.$loading('加载中...');
             this.$loading('加载中...');
-            this.productId = options.id;
+            this.productId = Number(id);
             this.$http
             this.$http
-                .get(`/product/getDto/${options.id}`)
+                .get(`/product/getDto/${id}`)
                 .then(res => {
                 .then(res => {
                     // res.detailImg = new String(res.detailImg.getBytes('ISO-8859-1'), 'UTF-8');
                     // res.detailImg = new String(res.detailImg.getBytes('ISO-8859-1'), 'UTF-8');
                     this.productInfo = res;
                     this.productInfo = res;

+ 9 - 1
src/pagesVendor/Detail.vue

@@ -149,8 +149,16 @@ export default {
         }
         }
     },
     },
     onLoad(options) {
     onLoad(options) {
+        var id = options.id || '';
+
+        if (options.q) {
+            let query = decodeURIComponent(options.q).split('?id=');
+            if (query.length > 1) {
+                id = query[1];
+            }
+        }
         this.$loading('加载中');
         this.$loading('加载中');
-        this.$http.get('/vendorInfo/getHome/' + options.id).then(res => {
+        this.$http.get('/vendorInfo/getHome/' + id).then(res => {
             this.vendorInfo = res;
             this.vendorInfo = res;
             this.$loading.close();
             this.$loading.close();
             this.$nextTick(() => {
             this.$nextTick(() => {