0205

project.config.json

@@ -136,7 +136,7 @@
                 },
                 {
                     "id": -1,
-                    "name": "新闻资讯",
+                    "name": "资讯资讯",
                     "pathName": "pagesNews/News",
                     "query": "type=INDUSTRY_NEWS",
                     "scene": null

src/components/filter/ProductBrand.vue

@@ -31,8 +31,9 @@
                 <h3>{{ $t('xuan-ze-pin-pai') }}</h3>
                 <van-button :color="$colors.warn" plain @click="backChoose">{{ $t('que-ding') }}</van-button>
             </div>
-            <van-cell-group :border="false">
-                <!-- <van-cell
+            <scroll-view scroll-x scroll-y class="industry-bottom">
+                <van-cell-group :border="false">
+                    <!-- <van-cell
                     @click="backChoose(headerInfo.id)"
                     v-if="headerInfo"
                     :border="false"
@@ -47,22 +48,23 @@
                         name="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/icon_oudlined_xuanzhong.png"
                     />
                 </van-cell> -->
-                <block v-for="item in showList" :key="item.id">
-                    <van-cell
-                        @click="choose(item)"
-                        :border="false"
-                        :custom-class="chooseList.includes(item.chName) ? 'active' : ''"
-                    >
-                        <h3 class="fontNormal" slot="title">{{ getName(item) }}</h3>
-                        <van-icon
-                            slot="right-icon"
-                            :size="24"
-                            v-if="chooseList.includes(item.chName)"
-                            name="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/icon_oudlined_xuanzhong.png"
-                        />
-                    </van-cell>
-                </block>
-            </van-cell-group>
+                    <block v-for="item in showList" :key="item.id">
+                        <van-cell
+                            @click="choose(item)"
+                            :border="false"
+                            :custom-class="chooseList.includes(item.chName) ? 'active' : ''"
+                        >
+                            <h3 class="fontNormal" slot="title">{{ getName(item) }}</h3>
+                            <van-icon
+                                slot="right-icon"
+                                :size="24"
+                                v-if="chooseList.includes(item.chName)"
+                                name="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/icon_oudlined_xuanzhong.png"
+                            />
+                        </van-cell>
+                    </block>
+                </van-cell-group>
+            </scroll-view>
         </van-popup>
     </div>
 </template>

src/components/filter/ProductCategory.vue

@@ -31,39 +31,41 @@
                 <h3>{{ $t('xuan-ze-lei-bie') }}</h3>
                 <van-icon color="#5E636D" :size="24" name="cross" @click="showPopup = false" />
             </div>
-            <van-cell-group :border="false">
-                <van-cell
-                    @click="backChoose(headerInfo.id)"
-                    v-if="headerInfo"
-                    :border="false"
-                    :custom-class="valueId === headerInfo.id ? 'active' : ''"
-                >
-                    <h3 class="fontNormal" slot="title">
-                        {{ $t('quan-bu') }}{{ getName(headerInfo) }}{{ $t('lei-bie') }}
-                    </h3>
-                    <van-icon
-                        slot="right-icon"
-                        :size="24"
-                        v-if="valueId === headerInfo.id"
-                        name="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/icon_oudlined_xuanzhong.png"
-                    />
-                </van-cell>
-                <block v-for="item in showList" :key="item.id">
+            <scroll-view scroll-x scroll-y class="industry-bottom">
+                <van-cell-group :border="false">
                     <van-cell
-                        @click="chooseList(item)"
+                        @click="backChoose(headerInfo.id)"
+                        v-if="headerInfo"
                         :border="false"
-                        :custom-class="valueId === item.id ? 'active' : ''"
+                        :custom-class="valueId === headerInfo.id ? 'active' : ''"
                     >
-                        <h3 class="fontNormal" slot="title">{{ getName(item) }}</h3>
+                        <h3 class="fontNormal" slot="title">
+                            {{ $t('quan-bu') }}{{ getName(headerInfo) }}{{ $t('lei-bie') }}
+                        </h3>
                         <van-icon
                             slot="right-icon"
                             :size="24"
-                            v-if="valueId === item.id"
+                            v-if="valueId === headerInfo.id"
                             name="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/icon_oudlined_xuanzhong.png"
                         />
                     </van-cell>
-                </block>
-            </van-cell-group>
+                    <block v-for="item in showList" :key="item.id">
+                        <van-cell
+                            @click="chooseList(item)"
+                            :border="false"
+                            :custom-class="valueId === item.id ? 'active' : ''"
+                        >
+                            <h3 class="fontNormal" slot="title">{{ getName(item) }}</h3>
+                            <van-icon
+                                slot="right-icon"
+                                :size="24"
+                                v-if="valueId === item.id"
+                                name="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/icon_oudlined_xuanzhong.png"
+                            />
+                        </van-cell>
+                    </block>
+                </van-cell-group>
+            </scroll-view>
         </van-popup>
     </div>
 </template>

src/components/filter/ProductCustomCateId.vue

@@ -31,23 +31,25 @@
                 <h3>{{ $t('chan-pin-mu-lu') }}</h3>
                 <van-icon color="#5E636D" :size="24" name="cross" @click="showPopup = false" />
             </div>
-            <van-cell-group :border="false">
-                <block v-for="item in showList" :key="item.id">
-                    <van-cell
-                        @click="chooseList(item)"
-                        :border="false"
-                        :custom-class="chooseId === item.id ? 'active' : ''"
-                    >
-                        <h3 class="fontNormal" slot="title">{{ getName(item) }}</h3>
-                        <van-icon
-                            slot="right-icon"
-                            :size="24"
-                            v-if="chooseId === item.id"
-                            name="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/icon_oudlined_xuanzhong.png"
-                        />
-                    </van-cell>
-                </block>
-            </van-cell-group>
+            <scroll-view scroll-x scroll-y class="industry-bottom">
+                <van-cell-group :border="false">
+                    <block v-for="item in showList" :key="item.id">
+                        <van-cell
+                            @click="chooseList(item)"
+                            :border="false"
+                            :custom-class="chooseId === item.id ? 'active' : ''"
+                        >
+                            <h3 class="fontNormal" slot="title">{{ getName(item) }}</h3>
+                            <van-icon
+                                slot="right-icon"
+                                :size="24"
+                                v-if="chooseId === item.id"
+                                name="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/icon_oudlined_xuanzhong.png"
+                            />
+                        </van-cell>
+                    </block>
+                </van-cell-group>
+            </scroll-view>
         </van-popup>
     </div>
 </template>

src/components/filter/ProductTags.vue

@@ -31,8 +31,9 @@
                 <h3>{{ $t('xuan-ze-biao-qian') }}</h3>
                 <van-icon color="#5E636D" :size="24" name="cross" @click="showPopup = false" />
             </div>
-            <van-cell-group :border="false">
-                <!-- <van-cell
+            <scroll-view scroll-x scroll-y class="industry-bottom">
+                <van-cell-group :border="false">
+                    <!-- <van-cell
                     @click="backChoose(headerInfo.id)"
                     v-if="headerInfo"
                     :border="false"
@@ -47,22 +48,23 @@
                         name="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/icon_oudlined_xuanzhong.png"
                     />
                 </van-cell> -->
-                <block v-for="item in showList" :key="item.id">
-                    <van-cell
-                        @click="chooseList(item)"
-                        :border="false"
-                        :custom-class="chooseId === item.id ? 'active' : ''"
-                    >
-                        <h3 class="fontNormal" slot="title">{{ getName(item) }}</h3>
-                        <van-icon
-                            slot="right-icon"
-                            :size="24"
-                            v-if="chooseId === item.id"
-                            name="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/icon_oudlined_xuanzhong.png"
-                        />
-                    </van-cell>
-                </block>
-            </van-cell-group>
+                    <block v-for="item in showList" :key="item.id">
+                        <van-cell
+                            @click="chooseList(item)"
+                            :border="false"
+                            :custom-class="chooseId === item.id ? 'active' : ''"
+                        >
+                            <h3 class="fontNormal" slot="title">{{ getName(item) }}</h3>
+                            <van-icon
+                                slot="right-icon"
+                                :size="24"
+                                v-if="chooseId === item.id"
+                                name="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/icon_oudlined_xuanzhong.png"
+                            />
+                        </van-cell>
+                    </block>
+                </van-cell-group>
+            </scroll-view>
         </van-popup>
     </div>
 </template>

src/components/product/Grid.vue

@@ -4,7 +4,7 @@
         <div class="content">
             <div class="text">
                 <h4>{{ name }}</h4>
-                <!-- <p>{{ info.model }}</p> -->
+                <!-- <p>{{ getName(info, ['model', 'enModel']) }}</p> -->
 
                 <van-image
                     v-if="info.logo1"

src/components/product/GridBig.vue

@@ -4,7 +4,7 @@
         <div class="content">
             <div class="text">
                 <h3>{{ name }}</h3>
-                <p>{{ info.model }}</p>
+                <p>{{ getName(info, ['model', 'enModel']) }}</p>
             </div>
 
             <van-image v-if="info.logo1" class="grid-logo" :height="45" :src="info.logo1" fit="heightFix" />

src/components/product/GridNormal.vue

@@ -6,7 +6,7 @@
             <div class="content-bottom">
                 <div class="text">
                     <h3 class="fontNormal">{{ name }}</h3>
-                    <p>{{ info.model }}</p>
+                    <p>{{ getName(info, ['model', 'enModel']) }}</p>
                 </div>
                 <div class="tags">
                     <van-tag v-for="(item, index) in tag" :key="index" custom-class="mini" plain :color="$colors.info">

src/components/product/Row.vue

@@ -3,7 +3,7 @@
         <van-image :src="img" width="124rpx" height="124rpx" fit="cover" />
         <div class="info">
             <h3>{{ getName(info) }}</h3>
-            <p>{{ info.model }}</p>
+            <p>{{ getName(info, ['model', 'enModel']) }}</p>
         </div>
     </div>
 </template>

src/components/product/RowMini.vue

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

src/components/product/RowNormal.vue

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

src/locales/en.json

@@ -436,7 +436,7 @@
   "bian-hao": "Serial number",
   "chan-pin-jiao-yi-deng-ji": "Deal record",
   "chu-jing-bei-an-dan-hao": "Exit record No.",
-  "hai-guan-bian-ma": "Format error for HS code",
+  "hai-guan-bian-ma": "HS code of Customs",
   "hai-guan-bian-ma-ge-shi-cuo-wu": "Format error for HS code",
   "jiao-yi-gong-si": "Deal partner",
   "jiao-yi-jia-ge": "Value",

src/locales/zh.json

@@ -5,7 +5,7 @@
   "jing-xiao-shang": "经销商",
   "ji-shu-fu-wu-shang": "技术服务商",
   "xin-pin-fa-bu": "新品发布",
-  "hang-ye-xin-wen": "行业新闻",
+  "hang-ye-xin-wen": "行业资讯",
   "ji-shu-zi-xun": "技术资讯",
   "hang-ye-huo-dong": "活动",
   "zheng-ce-xin-xi": "政策信息",
@@ -276,8 +276,8 @@
   "xin-zeng-cheng-gong": "新增成功",
   "qing-shu-ru-chan-pin-lei-bie": "请输入产品类别",
   "huo-dong-xiang-qing": "活动详情",
-  "xin-wen-xiang-qing": "新闻详情",
-  "xin-wen": "新闻",
+  "xin-wen-xiang-qing": "资讯详情",
+  "xin-wen": "资讯",
   "huo-dong": "活动",
   "xiang-qing": "详情",
   "cha-kan-bao-ming-xin-xi": "查看报名信息",

src/pages/Chat.vue

@@ -18,6 +18,7 @@
                     @change="touchMoveEvent($event, item.otherUserId)"
                     @touchend="touchEndEvent($event, item.otherUserId)"
                     :x="moveInfo[item.otherUserId]"
+                    :animation="startMove"
                     class="move-view"
                     inertia
                 >
@@ -41,7 +42,8 @@ export default {
             timeChange: null,
             touchMap: new Map(),
             moveInfo: {},
-            moveX: 60
+            moveX: 60,
+            startMove: false
         };
     },
     computed: {
@@ -92,6 +94,7 @@ export default {
     },
     methods: {
         setMove(extraId) {
+            this.startMove = false;
             const info = {};
             [...this.showList].forEach(item => {
                 if (extraId !== item.otherUserId) {
@@ -103,6 +106,10 @@ export default {
             this.moveInfo = {
                 ...info
             };
+
+            setTimeout(() => {
+                this.startMove = true;
+            }, 100);
         },
         loginMethods() {
             this.$store.dispatch('getUnreadNumber');

src/pages/Home.vue

@@ -372,7 +372,6 @@ export default {
         }
     },
     onLoad(options) {
-       
         this.$nextTick(() => {
             getBanner('HOME', !this.isChinese).then(res => {
                 console.log(res);

src/pagesMine/ProductsTransactionEdit.vue

@@ -253,7 +253,10 @@ export default {
                 model: '',
                 applicationField: [],
                 introduction: '',
-                price: ''
+                price: '',
+                transactionTime: '',
+                transactionCompany: '',
+                customsHsCode: ''
             },
             isVendor: false,
             showTime: false,
@@ -272,13 +275,13 @@ export default {
             if (
                 this.form.chName &&
                 this.form.brand &&
-                this.form.introduction &&
+                this.form.model &&
                 this.form.productCategoryId &&
-                this.form.applicationField.length > 0 &&
-                this.form.customsHsCode &&
-                this.form.price &&
+                this.form.introduction &&
+                this.form.transactionCompany &&
                 this.form.transactionTime &&
-                this.form.transactionCompany
+                this.form.applicationField.length > 0 &&
+                this.form.customsHsCode
             ) {
                 return true;
             } else {
@@ -405,7 +408,7 @@ export default {
         },
         changePrice(e) {
             console.log(e.detail);
-            this.form.price = Number(e.detail.value);
+            this.form.price = (Number(e.detail.value) || 0).toFixed(2);
         },
         sureTime() {
             this.form.transactionTime = dayjs(new Date(this.nowTime)).format('YYYY-MM-DD HH:mm:ss');

src/pagesProduct/Detail.vue

@@ -28,7 +28,7 @@
                         <div class="title">
                             {{ getName(productInfo) }}
                         </div>
-                        <div class="sub">{{ productInfo.model }}</div>
+                        <div class="sub">{{ getName(productInfo, ['model', 'enModel']) }}</div>
 
                         <div class="btn">
                             <div :class="animate ? 'my-icon iconAnimate' : 'my-icon'" @click="collection">
@@ -311,7 +311,11 @@ export default {
         if (options.q) {
             let query = decodeURIComponent(options.q).split('?id=');
             if (query.length > 1) {
-                id = query[1];
+                let q = query[1].split('&local=');
+                id = q[0];
+                if (q.length > 1 && q[1] === 'en') {
+                    this.$i18n.set('en');
+                }
             }
         }
         if (id) {

src/pagesVendor/Detail.vue

@@ -189,7 +189,11 @@ export default {
         if (options.q) {
             let query = decodeURIComponent(options.q).split('?id=');
             if (query.length > 1) {
-                id = query[1];
+                let q = query[1].split('&local=');
+                id = q[0];
+                if (q.length > 1 && q[1] === 'en') {
+                    this.$i18n.set('en');
+                }
             }
         }
         this.$loading(this.$t('jia-zai-zhong'));

src/styles/common.less

@@ -2,7 +2,7 @@
 @success: #07c160;
 @danger: #ee0a24;
 @warn: #ffa526;
-@info: #BCC1CC;
+@info: #bcc1cc;
 @text1: #292c33;
 @text2: #606266;
 @text3: #909399;
@@ -12,12 +12,12 @@
 @border3: #ebeef5;
 @border4: #f2f6fc;
 @border5: #dee6ef;
-@bgw:#fff;
+@bgw: #fff;
 // @bgw:black;
 @bg: #f5f7fa;
 // @bg:black;
 @bg2: #f8faff;
-@radius:4px;
+@radius: 4px;
 
 @text-color: #000000;
 @border-color: #ebedf0;
@@ -51,10 +51,20 @@
     -webkit-line-clamp: @line;
 }
 
+.industry-bottom {
+    height: 300px;
+    width: 100%;
+    padding-bottom: calc(8px + constant(safe-area-inset-bottom));
+    padding-bottom: calc(8px + env(safe-area-inset-bottom));
+    box-sizing: border-box;
+}
+
+.van-popup {
+    box-sizing: content-box !important;
+}
+
 image {
     width: 100%;
     height: 100%;
     display: block;
 }
-
-