0416

src/components/bar/SearchBar.vue

@@ -57,7 +57,7 @@ export default {
     .logo {
         width: 78px;
         height: 28px;
-        transform: translateY(-3px);
+        transform: translateY(0px);
         min-width: 78px;
     }
 

src/native/svgs/leibie_icon_celiang.svg

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="30px" height="30px" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>leibie_icon_celiang</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#A3A3FF" offset="0%"></stop>
+            <stop stop-color="#6A6AE6" offset="100%"></stop>
+        </linearGradient>
+        <path d="M12.4544156,22.6367532 L10.7573593,24.3338095 L6.51471863,23.4852814 L5.66619049,19.2426407 L7.36324676,17.5455844 L12.4544156,22.6367532 Z M22.6367532,12.4544156 L13.3029437,21.7882251 L8.2117749,16.6970563 L17.5455844,7.36324676 L22.6367532,12.4544156 Z M25.6066017,19.6669048 L19.6669048,25.6066017 L18.3941125,24.3338095 L20.939697,21.7882251 L19.6669048,20.5154329 L17.1213203,23.0610173 L15.4242641,21.363961 L21.363961,15.4242641 L25.6066017,19.6669048 Z M14.5757359,8.63603897 L8.63603897,14.5757359 L6.93898269,12.8786797 L9.48456711,10.3330952 L8.2117749,9.06030304 L5.66619049,11.6058875 L4.39339828,10.3330952 L10.3330952,4.39339828 L14.5757359,8.63603897 Z M25.1823376,9.90883118 L23.4852814,11.6058875 L18.3941125,6.51471863 L20.0911688,4.81766235 L25.1823376,9.90883118 Z" id="path-2"></path>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="产品" transform="translate(-210.000000, -119.000000)">
+            <g id="编组-44" transform="translate(152.000000, 99.000000)">
+                <g id="形状" transform="translate(58.000000, 20.000000)">
+                    <use fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+                    <use fill="#FFFFFF" xlink:href="#path-2"></use>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/native/svgs/leibie_icon_jichuang.svg

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="30px" height="30px" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>leibie_icon_jichuang</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#FFCB7D" offset="0%"></stop>
+            <stop stop-color="#D6993C" offset="100%"></stop>
+        </linearGradient>
+        <path d="M22.8,9.3 L22.8,24.9 L10.8,24.9 L10.8,18.9 L14.4,18.9 L14.4,21.3 L19.2,21.3 L19.2,12.9 L13.8,12.9 L13.8,14.7 L15.6,14.7 L15.6,17.1 L9.6,17.1 L9.6,14.7 L11.4,14.7 L11.4,12.9 L7.2,12.9 L7.2,9.3 L11.4,9.3 L11.4,7.5 L8.4,7.5 L8.4,5.1 L16.8,5.1 L16.8,7.5 L13.8,7.5 L13.8,9.3 L22.8,9.3 Z" id="path-2"></path>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="产品" transform="translate(-210.000000, -119.000000)">
+            <g id="编组-44" transform="translate(152.000000, 99.000000)">
+                <g id="形状结合" transform="translate(58.000000, 20.000000)">
+                    <use fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+                    <use fill="#FFFFFF" xlink:href="#path-2"></use>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/native/svgs/leibie_icon_jixie.svg

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="30px" height="30px" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>leibie_icon_jixie</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="99.3111275%" id="linearGradient-1">
+            <stop stop-color="#669EFF" offset="0%"></stop>
+            <stop stop-color="#3D77DB" offset="99.9656883%"></stop>
+        </linearGradient>
+        <path d="M10.5,17.4 L10.5,19.2 L20.7,19.2 L20.7,21.6 L10.5,21.6 L10.5,23.4 L6.9,23.4 L6.9,17.4 L10.5,17.4 Z M23.1,17.4 L23.1,23.4 L20.7,23.4 L20.7,17.4 L23.1,17.4 Z M8.7,6.6 L8.7,16.2 L5.1,16.2 L5.1,6.6 L8.7,6.6 Z M24.9,6.6 L24.9,16.2 L21.3,16.2 L21.3,6.6 L24.9,6.6 Z M20.1,6.6 L20.1,16.2 L9.9,16.2 L9.9,6.6 L20.1,6.6 Z M17.7,9 L12.3,9 L12.3,12 L17.7,12 L17.7,9 Z" id="path-2"></path>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="产品" transform="translate(-210.000000, -119.000000)">
+            <g id="形状结合" transform="translate(210.000000, 119.000000)">
+                <use fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+                <use fill="#FFFFFF" xlink:href="#path-2"></use>
+            </g>
+        </g>
+    </g>
+</svg>

src/native/svgs/leibie_icon_qita.svg

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="30px" height="30px" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>leibie_icon_qita</title>
+    <defs>
+        <linearGradient x1="50%" y1="2.15899493%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#F0B08B" offset="0%"></stop>
+            <stop stop-color="#C27142" offset="100%"></stop>
+        </linearGradient>
+        <path d="M15,3.6 L24.8726896,9.3 L24.8726896,20.7 L15,26.4 L5.1273104,20.7 L5.1273104,9.3 L15,3.6 Z M16.8,9 L16.8,13.2 L13.2,13.2 L13.2,9 L10.2,10.8 L10.2,16.2 L13.2,18 L13.2,21 L16.8,21 L16.8,18 L19.8,16.2 L19.8,10.8 L16.8,9 Z" id="path-2"></path>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="产品" transform="translate(-210.000000, -119.000000)">
+            <g id="编组-44" transform="translate(152.000000, 99.000000)">
+                <g id="形状结合" transform="translate(58.000000, 20.000000)">
+                    <use fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+                    <use fill="#FFFFFF" xlink:href="#path-2"></use>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/native/svgs/leibie_icon_shebei.svg

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="30px" height="30px" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>leibie_icon_shebei</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#FF8066" offset="0%"></stop>
+            <stop stop-color="#E65A3E" offset="100%"></stop>
+        </linearGradient>
+        <path d="M17.7775183,5.1 L22.1224817,7.62696045 L21.3301243,9.67393254 C21.933768,10.4011526 22.4162188,11.2339637 22.7461961,12.1408557 L24.9,12.4730396 L24.9,17.5269604 L22.7461961,17.8591443 C22.4162188,18.7660363 21.933768,19.5988474 21.3301243,20.3260675 L22.1224817,22.3730396 L17.7775183,24.9 L16.4148493,23.1862866 C15.9551477,23.2663422 15.4824106,23.3080633 15,23.3080633 C14.5175894,23.3080633 14.0448523,23.2663422 13.5851507,23.1862866 L12.2224817,24.9 L7.87751828,22.3730396 L8.66987571,20.3260675 C8.06623204,19.5988474 7.58378121,18.7660363 7.25380395,17.8591443 L5.1,17.5269604 L5.1,12.4730396 L7.25380395,12.1408557 C7.58378121,11.2339637 8.06623204,10.4011526 8.66987571,9.67393254 L7.87751828,7.62696045 L12.2224817,5.1 L13.5851507,6.81371337 C14.0448523,6.73365776 14.5175894,6.69193667 15,6.69193667 C15.4824106,6.69193667 15.9551477,6.73365776 16.4148493,6.81371337 L17.7775183,5.1 Z M15,11.1655092 C12.8976849,11.1655092 11.1934218,12.8822692 11.1934218,15 C11.1934218,17.1177308 12.8976849,18.8344908 15,18.8344908 C17.1023151,18.8344908 18.8065782,17.1177308 18.8065782,15 C18.8065782,12.8822692 17.1023151,11.1655092 15,11.1655092 Z" id="path-2"></path>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="产品" transform="translate(-210.000000, -119.000000)" fill-rule="nonzero">
+            <g id="编组-44" transform="translate(152.000000, 99.000000)">
+                <g id="形状结合" transform="translate(58.000000, 20.000000)">
+                    <use fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+                    <use fill="#FFFFFF" xlink:href="#path-2"></use>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/pages/Classify.vue

@@ -50,14 +50,9 @@
                         )
                     "
                 >
-                    <van-image
-                        src="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/quanqiu_img_jixie.jpg"
-                        fit="widthFix"
-                        width="100%"
-                        :radius="4"
-                    />
+                    <van-image :src="imgs[activeKey]" fit="widthFix" width="100%" :radius="4" />
                     <div class="text">
-                        <img src="../static/imgs/quanqiu_icon_jixie.png" alt="" />
+                        <img :src="icons[activeKey]" alt="" />
                         <span>{{ $t('cha-kan-quan-bu') }}</span>
                     </div>
                 </div>
@@ -94,7 +89,21 @@ export default {
             search: '',
             activeKey: 0,
             categories: [],
-            left: null
+            left: null,
+            imgs: [
+                '/native/svgs/leibie_img_celiang.jpg',
+                '/native/svgs/leibie_img_jichuang.jpg',
+                '/native/svgs/leibie_img_jixie.jpg',
+                '/native/svgs/leibie_img_qita.jpg',
+                '/native/svgs/leibie_img_shebei.jpg'
+            ],
+            icons: [
+                '/native/svgs/leibie_icon_celiang.svg',
+                '/native/svgs/leibie_icon_jichuang.svg',
+                '/native/svgs/leibie_icon_jixie.svg',
+                '/native/svgs/leibie_icon_qita.svg',
+                '/native/svgs/leibie_icon_shebei.svg'
+            ]
         };
     },
     mixins: [pages],

src/pages/Home.vue

@@ -226,7 +226,12 @@
             </block>
         </sort-list>
 
-        <robot id="robot" @chatAdmin="chatAdmin" />
+        <van-dialog use-slot :show="showTips" @close="showTips = false" confirm-button-color="#FFA526">
+            <div class="tips">
+                <div class="tips-title">{{ tipInfo.desc }}</div>
+                <div class="content" v-html="tipInfo.value"></div>
+            </div>
+        </van-dialog>
     </div>
 </template>
 <script>
@@ -276,7 +281,9 @@ export default {
             tagIds: '',
             applicationField: '',
             offlineExperience: '',
-            tDurl: ''
+            tDurl: '',
+            tipInfo: {},
+            showTips: false
         };
     },
     components: {
@@ -406,6 +413,17 @@ export default {
                 this.vendorInfos = [..._list.values()];
             });
             this.getData();
+
+            this.$nextTick(() => {
+                let nameChange = wx.getStorageSync('nameChange');
+                if (!nameChange) {
+                    wx.setStorageSync('nameChange', 'true');
+                    this.$http.get(`/sysConfig/get/${this.isChinese ? 'CHECK_RULE' : 'CHECK_RULE_EN'}`).then(res => {
+                        this.tipInfo = res;
+                        this.showTips = true;
+                    });
+                }
+            });
         });
     },
     onShow() {
@@ -495,6 +513,19 @@ export default {
         box-sizing: border-box;
     }
 }
+
+.tips {
+    padding: 20px 30px;
+    .tips-title {
+        font-size: 16px;
+        text-align: center;
+    }
+
+    .content {
+        font-size: 14px;
+        padding: 30px 0 15px;
+    }
+}
 </style>
 <style lang="less">
 .home {

src/pagesMine/Enter.vue

@@ -185,8 +185,7 @@ export default {
                     },
                     text2: {
                         chName: '平台是否已经存在本企业，进行企业认领',
-                        enName:
-                            'Already a T-PARK member? Contact your colleague to maintain Online Showroom together!'
+                        enName: 'Already a T-PARK member? Contact your colleague to maintain Online Showroom together!'
                     }
                 },
                 {

src/pagesNews/News.vue

@@ -110,7 +110,6 @@ export default {
             if (options.type) {
                 index = [...this.informations].findIndex(item => {
                     return item.key.split(',').includes(options.type);
-
                 });
             }
             this.changeTab(index, true);