panhui %!s(int64=5) %!d(string=hai) anos
pai
achega
851a4a2273

+ 1 - 1
.env.development

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

+ 2 - 2
src/components/AuthPhone.vue

@@ -20,7 +20,7 @@
                     {{ $t('imt-ke-ji-ping-tai') }} <span>{{ $t('shen-qing-shi-yong') }}</span>
                 </h3>
             </div>
-            <h2>{{ $t('huo-qu-ni-de-ni-cheng-tou-xiang-di-qu-ji-xing-bie') }}</h2>
+            <h2>{{ $t('huo-qu-ni-de-shou-ji-hao') }}</h2>
 
             <div class="userinfo">
                 <van-image :width="40" :height="40" round :src="info.avatarUrl" fit="cover" />
@@ -31,7 +31,7 @@
             </div>
 
             <div class="btn-list">
-                <van-button :radius="4" style="margin-right: 20px;" @click="refus">{{ $t('ju-jue') }}</van-button>
+                <van-button :radius="4" style="margin-right: 20px" @click="refus">{{ $t('ju-jue') }}</van-button>
                 <van-button open-type="getPhoneNumber" @getphonenumber="bindPhone" :radius="4" type="primary">{{
                     $t('yun-xu')
                 }}</van-button>

+ 1 - 1
src/components/Process.vue

@@ -10,7 +10,7 @@
 
         <div class="content">
             <div class="stepInfo" v-for="(item, index) in steps" :key="index">
-                <span>{{ item.text }}</span>
+                <span>{{ getName(item.text) }}</span>
                 <van-icon
                     @click="show"
                     name="question-o"

+ 2 - 1
src/locales/zh.json

@@ -401,5 +401,6 @@
   "mei-you-geng-duo-le": "没有更多了~",
   "zhong-ying": "中/英",
   "qi-ta": "其他",
-  "quan-bu-xin-wen": "全部资讯"
+  "quan-bu-xin-wen": "全部资讯",
+  "huo-qu-ni-de-shou-ji-hao": "获取你的手机号"
 }

+ 11 - 4
src/pages/My.vue

@@ -17,10 +17,17 @@
                 fit="cover"
                 :radius="4"
             />
-            <!-- <van-button class="btn1" color="#0F264D" plain @click="choose" :style="{ top: barTop + 'px' }">
+            <van-button
+                v-if="nodeEnv"
+                class="btn1"
+                color="#0F264D"
+                plain
+                @click="choose"
+                :style="{ top: barTop + 'px' }"
+            >
                 {{ getName(language) }}
                 <van-icon name="arrow-down" size="10px" color="#0F264D" />
-            </van-button> -->
+            </van-button>
 
             <div class="btn-content">
                 <van-button
@@ -114,7 +121,7 @@
 
 <script>
 import { mapState } from 'vuex';
-import AuthPhone from '../components/AuthPhone';
+import AuthPhone from '../components/AuthPhone.vue';
 import pages from '../mixins/pages';
 export default {
     data() {
@@ -132,7 +139,7 @@ export default {
     },
     mixins: [pages],
     computed: {
-        ...mapState(['userInfo', 'barTop', 'barHeight']),
+        ...mapState(['userInfo', 'barTop', 'barHeight', 'nodeEnv']),
         icon() {
             return this.userInfo && this.userInfo.avatar
                 ? this.userInfo.avatar

+ 13 - 4
src/pagesHome/Edit.vue

@@ -6,7 +6,13 @@
 <template>
     <div class="pageBottom">
         <div class="takePhoto" @click="choosePhoto">
-            <van-image :src="carImg" v-if="carImg" :width="`calc(100vw - 40rpx)`" height="240rpx" fit="contain" />
+            <van-image
+                :src="myInfo.card"
+                v-if="myInfo.card"
+                :width="`calc(100vw - 40rpx)`"
+                height="240rpx"
+                fit="contain"
+            />
             <template v-else>
                 <van-icon name="photograph" :color="$colors.warn" :size="34" />
                 <div class="text">{{ $t('pai-she-ming-pian-zhao-pian') }}</div>
@@ -261,7 +267,7 @@ export default {
                 sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机,默认二者都有
                 success: res => {
                     const src = res.tempFilePaths[0];
-                    this.navigateTo('/pagesMine/Upload?src=' + src);
+                    this.navigateTo('/pagesMine/Upload?src=' + src, false);
                 }
             });
         },
@@ -274,16 +280,19 @@ export default {
                     const src = res.tempFilePaths[0];
                     this.$http.uploadFile(src).then(res => {
                         this.carImg = res;
+                        this.myInfo.card = res;
                         this.$http
                             .post('/auth/businessCard', {
                                 url: res
                             })
                             .then(res => {
                                 const result = res.words_result || {};
-                                this.myInfo.nickname = result.NAME[0];
+                                if (result.NAME.join('')) {
+                                    this.myInfo.nickname = result.NAME.join('');
+                                }
                                 this.myInfo.userEmail = result.EMAIL[0];
                                 this.myInfo.chCompanyName = result.COMPANY[0];
-                                this.myInfo.userPosition = result.TITLE[0];
+                                this.myInfo.userPosition = result.TITLE.join('');
                             });
                     });
                 }

+ 1 - 2
src/pagesHome/FilterPage.vue

@@ -100,8 +100,7 @@ export default {
         EnterpriseType,
         ProductBrand,
         ProductCustomCateIdFilter,
-        FixedButton,
-        OfflineExperience
+        FixedButton
     },
     methods: {
         restart() {

+ 83 - 31
src/pagesMine/Enter.vue

@@ -24,20 +24,20 @@
             </div>
         </div>
         <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">
                 <process
                     v-for="(item, index) in processes"
                     :icon="item.icon"
-                    :preTitle="item.preTitle"
-                    :title="item.title"
+                    :preTitle="getName(item.preTitle)"
+                    :title="getName(item.title)"
                     :steps="item.steps"
                     :index="index"
                     :key="index"
                     @show="show = true"
                 ></process>
 
-                <div style="min-width: 8px;"></div>
+                <div style="min-width: 8px"></div>
             </div>
         </scroll-view>
 
@@ -50,8 +50,8 @@
         <van-popup :show="show" round position="bottom" @close="show = false">
             <div class="tips-content">
                 <div class="tips-item" v-for="(item, index) in tips" :key="index">
-                    <div class="text1">{{ item.text1 }}</div>
-                    <div class="text2">{{ item.text2 }}</div>
+                    <div class="text1">{{ getName(item.text1) }}</div>
+                    <div class="text2">{{ getName(item.text2) }}</div>
                 </div>
             </div>
         </van-popup>
@@ -74,66 +74,104 @@ export default {
             processes: [
                 {
                     icon: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/ruzhu_icon_jieduan01.png',
-                    preTitle: '阶段一',
-                    title: '入驻申请',
+                    preTitle: {
+                        chName: '阶段一',
+                        enName: 'NO'
+                    },
+                    title: {
+                        chName: '入驻申请',
+                        enName: 'Membership Application'
+                    },
                     steps: [
                         {
-                            text: '查询确认入驻资格',
+                            text: {
+                                chName: '查询确认入驻资格',
+                                enName: 'Check Areas of Member'
+                            },
                             tips: [
                                 {
-                                    text1: '查看企业:',
-                                    text2: '平台是否已经存在本企业,进行企业认领'
+                                    text1: {
+                                        chName: '查看类别:',
+                                        enName: 'Areas: '
+                                    },
+                                    text2: {
+                                        chName: '企业生产或经营的产品包含于IMT平台产品类别范围内',
+                                        enName:
+                                            " Products/Services shall be included in the scope of IMT Tech member's area. Click for detail."
+                                    }
                                 },
                                 {
-                                    text1: '查看类别:',
-                                    text2: '企业生产或经营的产品包含于IMT平台产品类别范围内'
+                                    text1: {
+                                        chName: '查看企业:',
+                                        enName: 'Check:'
+                                    },
+                                    text2: {
+                                        chName: '平台是否已经存在本企业,进行企业认领',
+                                        enName:
+                                            'Already an IMT Tech member? Contact your colleague to maintain Online Showroom together!'
+                                    }
                                 }
                             ]
                         },
                         {
-                            text: '填写账号/企业信息进行注册'
+                            text: {
+                                chName: '填写账号/企业信息进行注册',
+                                enName: 'Create company profile for registration'
+                            }
                         },
                         {
-                            text: '确认在线服务协议'
+                            text: {
+                                chName: '确认在线服务协议',
+                                enName: 'Confirm and agree with the Membership Agreement'
+                            }
                         }
                     ]
                 },
                 {
                     icon: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/ruzhu_icon_jieduan02.png',
-                    preTitle: '阶段二',
-                    title: '信息审核',
+                    preTitle: { chName: '阶段二', enName: 'Step Two' },
+                    title: { chName: '信息审核', enName: 'Qualification Review' },
                     steps: [
                         {
-                            text: '平台人工审核企业资质,并于7个工作日内反馈'
+                            text: {
+                                chName: '平台人工审核企业资质,并于7个工作日内反馈',
+                                enName: 'Qualification reviewed by IMT. Up to 7 working days for result.'
+                            }
                         },
                         {
-                            text: '商家可随时在个人中心查询入驻审核进度'
+                            text: {
+                                chName: '商家可随时在个人中心查询入驻审核进度',
+                                enName: 'Review progress could be checked through Management Center'
+                            }
                         }
                     ]
                 },
                 {
                     icon: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/ruzhu_icon_jieduan03.png',
-                    preTitle: '阶段三',
-                    title: '功能开通',
+                    preTitle: { chName: '阶段三', enName: 'Step Three' },
+                    title: { chName: '功能开通', enName: 'Open the Function of Online Showroom ' },
                     steps: [
                         {
-                            text: '审核通过后,开通会员功能'
+                            text: {
+                                chName: '审核通过后,开通会员功能',
+                                enName: 'Function and feature will be unlocked after passing the review.'
+                            }
                         }
                     ]
                 },
                 {
                     icon: 'http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/ruzhu_icon_jieduan04.png',
-                    preTitle: '阶段四',
-                    title: '店铺上线',
+                    preTitle: { chName: '阶段四', enName: 'Step Four' },
+                    title: { chName: '店铺上线', enName: 'Online Showroom Launching' },
                     steps: [
                         {
-                            text: '装修店铺'
+                            text: { chName: '装修店铺', enName: 'Online Showroom Management' }
                         },
                         {
-                            text: '管理产品类别'
+                            text: { chName: '管理产品类别', enName: 'Products Series Management' }
                         },
                         {
-                            text: '上传产品'
+                            text: { chName: '上传产品', enName: 'Product Management' }
                         }
                     ]
                 }
@@ -141,12 +179,26 @@ export default {
             show: false,
             tips: [
                 {
-                    text1: '查看企业:',
-                    text2: '平台是否已经存在本企业,进行企业认领'
+                    text1: {
+                        chName: '查看类别:',
+                        enName: 'Areas: '
+                    },
+                    text2: {
+                        chName: '企业生产或经营的产品包含于IMT平台产品类别范围内',
+                        enName:
+                            " Products/Services shall be included in the scope of IMT Tech member's area. Click for detail."
+                    }
                 },
                 {
-                    text1: '查看类别:',
-                    text2: '企业生产或经营的产品包含于IMT平台产品类别范围内'
+                    text1: {
+                        chName: '查看企业:',
+                        enName: 'Check:'
+                    },
+                    text2: {
+                        chName: '平台是否已经存在本企业,进行企业认领',
+                        enName:
+                            'Already an IMT Tech member? Contact your colleague to maintain Online Showroom together!'
+                    }
                 }
             ]
         };

+ 5 - 0
src/store/index.js

@@ -24,6 +24,7 @@ export default new Vuex.Store({
         messageList: [],
         barInfo: {},
         rpx: 2,
+        nodeEnv: false,
         chatForm:
             '{"phone":"13365135976","sex":"male","nickname":"蒋耀忠","position":"总经理","chCompanyName":"NE洛阳新能轴承制造有限公司","email":"11@qq.com.cn","products":[{"chName":"MS22-8多轴数控机床","enName":"MultiLine MS22-8","id":6296,"mainPicture":"https://imt.oss-cn-hangzhou.aliyuncs.com/image/2020-11-26-18-08-34MaKXCzxH.png"}]}'
     },
@@ -87,6 +88,9 @@ export default new Vuex.Store({
         },
         updateRpx(state, rpx) {
             state.rpx = rpx;
+        },
+        updateNodeEnv(state, nodeEnv) {
+            state.nodeEnv = nodeEnv;
         }
     },
     actions: {
@@ -160,6 +164,7 @@ export default new Vuex.Store({
             }
         },
         getSystemInfo(context) {
+            context.commit('updateNodeEnv', process.env.NODE_ENV === 'development');
             wx.getSystemInfo({
                 success: res => {
                     context.commit('updateRpx', Math.ceil((res.windowWidth / 750) * 100) / 100);