panhui преди 5 години
родител
ревизия
3bce4f4018
променени са 65 файла, в които са добавени 290 реда и са изтрити 240 реда
  1. 12 1
      src/App.vue
  2. 2 7
      src/components/Banner.vue
  3. 1 1
      src/components/ChangeText.vue
  4. 6 48
      src/components/ChatInfo.vue
  5. 2 2
      src/components/FixedButton.vue
  6. 1 1
      src/components/News/Grid.vue
  7. 1 1
      src/components/News/Row.vue
  8. 24 5
      src/components/Process.vue
  9. 1 1
      src/components/SortList.vue
  10. 29 14
      src/components/bar/FilterSortBar.vue
  11. 1 1
      src/components/filter/Application.vue
  12. 1 1
      src/components/filter/Country.vue
  13. 1 1
      src/components/filter/EnterpriseType.vue
  14. 1 1
      src/components/filter/ProductBrand.vue
  15. 1 1
      src/components/filter/ProductCategory.vue
  16. 1 1
      src/components/filter/ProductTags.vue
  17. 2 0
      src/components/imt/Bottom.vue
  18. 5 9
      src/components/product/Grid.vue
  19. 6 10
      src/components/product/GridBig.vue
  20. 4 2
      src/components/product/GridNormal.vue
  21. 3 1
      src/components/product/Row.vue
  22. 4 3
      src/components/product/RowMini.vue
  23. 6 6
      src/components/product/RowNormal.vue
  24. 1 1
      src/components/select/Application.vue
  25. 3 3
      src/components/select/Country.vue
  26. 1 1
      src/components/select/Industry.vue
  27. 1 1
      src/components/select/ProductCategory.vue
  28. 1 1
      src/components/select/ProductCategoryOnly.vue
  29. 2 0
      src/components/vendor/Grid.vue
  30. 5 5
      src/components/vendor/Row.vue
  31. 10 1
      src/main.js
  32. 2 2
      src/pages/Chat.vue
  33. 3 2
      src/pages/Classify.vue
  34. 17 14
      src/pages/Home.vue
  35. 4 2
      src/pages/My.vue
  36. 6 19
      src/pagesChat/ChatDetail.vue
  37. 1 1
      src/pagesHome/Brand.vue
  38. 2 2
      src/pagesHome/ChatPage.vue
  39. 1 1
      src/pagesHome/FilterPage.vue
  40. 1 1
      src/pagesHome/Product.vue
  41. 1 1
      src/pagesHome/ProductList.vue
  42. 10 3
      src/pagesHome/Search.vue
  43. 2 2
      src/pagesImt/Service.vue
  44. 3 3
      src/pagesMine/ChangeEmail.vue
  45. 3 3
      src/pagesMine/ChangePhone.vue
  46. 3 3
      src/pagesMine/ChangePsd.vue
  47. 2 2
      src/pagesMine/Collect.vue
  48. 50 8
      src/pagesMine/Enter.vue
  49. 2 2
      src/pagesMine/Order.vue
  50. 3 3
      src/pagesMine/OrderDetail.vue
  51. 3 3
      src/pagesProduct/Contrast.vue
  52. 2 2
      src/pagesProduct/ContrastDetail.vue
  53. 2 2
      src/pagesProduct/Detail.vue
  54. 2 2
      src/pagesProduct/FilterProduct.vue
  55. 3 3
      src/pagesProduct/FilterVendor.vue
  56. 2 2
      src/pagesProduct/Inquiry.vue
  57. 2 2
      src/pagesProduct/IntentionList.vue
  58. 5 9
      src/pagesVendor/About.vue
  59. 2 2
      src/pagesVendor/Connect.vue
  60. 1 1
      src/pagesVendor/Detail.vue
  61. 2 2
      src/pagesVendor/FilterProduct.vue
  62. 1 1
      src/pagesVendor/News.vue
  63. 2 2
      src/pagesVendor/Product.vue
  64. 1 1
      src/store/index.js
  65. 5 1
      src/styles/common.less

+ 12 - 1
src/App.vue

@@ -125,7 +125,7 @@ page {
 }
 
 .bg-white {
-    background-color: #fff;
+    background-color: @bgw;
 }
 
 .flex1 {
@@ -179,4 +179,15 @@ page {
 .iconAnimate {
     animation: iconAnimate ease-in-out 0.3s;
 }
+
+.btn_icon {
+    display: flex;
+    align-items: center;
+    .van-icon {
+        margin-left: 2px;
+    }
+}
+.van-icon {
+    font-weight: bold;
+}
 </style>

+ 2 - 7
src/components/Banner.vue

@@ -1,16 +1,11 @@
 <template>
     <div class="banner-content" :style="{ height: `${height * 2}rpx` }">
-        <div class="fixedIMgContent" v-if="imgInfo && fixed && scrollTop < height / 3">
-            <div class="fixedIMg" :style="{ height: `${height * 2}rpx` }">
-                <van-image :src="imgInfo" width="100%" :height="`${height * 2}rpx`" fit="cover" :radius="radius" />
-            </div>
-        </div>
         <div class="swiperContent" :style="bannerStyle">
             <swiper :autoplay="autoplay" :style="scale" @change="current = $event.detail.current" :current="current">
                 <swiper-item v-for="(item, index) in banners" :key="index">
                     <van-image
                         v-if="checkImg(item.img)"
-                        :src="item.img"
+                        :src="item.img + $oss.normal"
                         width="100%"
                         height="100%"
                         fit="cover"
@@ -196,7 +191,7 @@ export default {
     &::after {
         content: '';
         height: 70%;
-        background-color: #fff;
+        background-color: @bgw;
         position: absolute;
         bottom: 0;
         left: 0;

+ 1 - 1
src/components/ChangeText.vue

@@ -60,7 +60,7 @@ export default {
 </script>
 <style lang="less">
 .popup-content {
-    background-color: #fff;
+    background-color: @bgw;
     padding: 16px;
 
     .weui-input {

+ 6 - 48
src/components/ChatInfo.vue

@@ -2,14 +2,7 @@
     <div>
         <div class="chatTime" v-if="time">{{ time }}</div>
         <div class="chatInfo" :class="{ right: isMine }" v-if="isInquiry && !isService" @click="goDetail">
-            <van-image
-                class="left-icon"
-                :src="logo + '?x-oss-process=image/resize,m_fill,h_100,w_100'"
-                :width="36"
-                :height="36"
-                :radius="4"
-                fit="cover"
-            />
+            <van-image class="left-icon" :src="logo + $oss.mini" :width="36" :height="36" :radius="4" fit="cover" />
 
             <div class="order">
                 <van-image
@@ -25,56 +18,21 @@
                     <div class="btn">查看详情</div>
                 </div>
             </div>
-            <van-image
-                class="right-icon"
-                :src="logo + '?x-oss-process=image/resize,m_fill,h_100,w_100'"
-                :width="36"
-                :height="36"
-                :radius="4"
-                fit="cover"
-            />
+            <van-image class="right-icon" :src="logo + $oss.mini" :width="36" :height="36" :radius="4" fit="cover" />
         </div>
         <div class="chatInfo" :class="{ right: isMine }">
-            <van-image
-                class="left-icon"
-                :src="logo + '?x-oss-process=image/resize,m_fill,h_100,w_100'"
-                :width="36"
-                :height="36"
-                :radius="4"
-                fit="cover"
-            />
+            <van-image class="left-icon" :src="logo + $oss.mini" :width="36" :height="36" :radius="4" fit="cover" />
             <van-image :src="content" v-if="isImg" :width="100" fit="widthFix" @click="previewImg" />
             <div class="chat-content" v-else>{{ content }}</div>
 
-            <van-image
-                class="right-icon"
-                :src="logo + '?x-oss-process=image/resize,m_fill,h_100,w_100'"
-                :width="36"
-                :height="36"
-                :radius="4"
-                fit="cover"
-            />
+            <van-image class="right-icon" :src="logo + $oss.mini" :width="36" :height="36" :radius="4" fit="cover" />
         </div>
 
         <div class="chatInfo" :class="{ right: isMine }" v-if="otherProblems">
-            <van-image
-                class="left-icon"
-                :src="logo + '?x-oss-process=image/resize,m_fill,h_100,w_100'"
-                :width="36"
-                :height="36"
-                :radius="4"
-                fit="cover"
-            />
+            <van-image class="left-icon" :src="logo + $oss.mini" :width="36" :height="36" :radius="4" fit="cover" />
             <div class="chat-content">{{ otherProblems }}</div>
 
-            <van-image
-                class="right-icon"
-                :src="logo + '?x-oss-process=image/resize,m_fill,h_100,w_100'"
-                :width="36"
-                :height="36"
-                :radius="4"
-                fit="cover"
-            />
+            <van-image class="right-icon" :src="logo + $oss.mini" :width="36" :height="36" :radius="4" fit="cover" />
         </div>
     </div>
 </template>

+ 2 - 2
src/components/FixedButton.vue

@@ -29,7 +29,7 @@ export default {
     }
     .btn-list {
         position: fixed;
-        background-color: #fff;
+        background-color: @bgw;
         left: 0;
         right: 0;
         bottom: 0;
@@ -56,7 +56,7 @@ export default {
 
     .btn {
         position: fixed;
-        background-color: #fff;
+        background-color: @bgw;
         left: 0;
         right: 0;
         bottom: 0;

+ 1 - 1
src/components/News/Grid.vue

@@ -58,7 +58,7 @@ export default {
 .news-grid {
     border-radius: 4px;
     overflow: hidden;
-    background-color: #fff;
+    background-color: @bgw;
     .text1 {
         padding: 12px;
         display: -webkit-box;

+ 1 - 1
src/components/News/Row.vue

@@ -25,7 +25,7 @@ export default {
 <style lang="less" scoped>
 .news {
     display: flex;
-    background-color: #fff;
+    background-color: @bgw;
     border-radius: 4px;
     overflow: hidden;
     .news-info {

+ 24 - 5
src/components/Process.vue

@@ -10,7 +10,15 @@
 
         <div class="content">
             <div class="stepInfo" v-for="(item, index) in steps" :key="index">
-                {{ item.text }}
+                <span>{{ item.text }}</span>
+                <van-icon
+                    @click="show"
+                    name="question-o"
+                    class="tips"
+                    v-if="item.tips"
+                    :size="18"
+                    :color="$colors.warn"
+                />
             </div>
         </div>
     </div>
@@ -59,6 +67,11 @@ export default {
             position: [''],
             colors: ['#2a90a0', '#3b5996', '#ca923a', '#c66152']
         };
+    },
+    methods: {
+        show() {
+            this.$emit('show');
+        }
     }
 };
 </script>
@@ -68,8 +81,8 @@ export default {
 .process {
     width: 280px;
     height: 360px;
-		flex-shrink: 0;
-		margin: 0 8px;
+    flex-shrink: 0;
+    margin: 0 8px;
 
     .process-top {
         display: flex;
@@ -92,7 +105,7 @@ export default {
                 font-size: 14px;
                 font-weight: bold;
                 color: #ffffff;
-line-height: 20px;
+                line-height: 20px;
                 display: flex;
                 align-items: center;
 
@@ -109,7 +122,7 @@ line-height: 20px;
                 font-size: 18px;
                 font-weight: bold;
                 color: #ffffff;
-line-height: 25px;
+                line-height: 25px;
             }
         }
     }
@@ -119,6 +132,8 @@ line-height: 25px;
 
         .stepInfo {
             // max-width: 270px;
+            display: flex;
+            align-items: center;
             position: relative;
             font-size: 14px;
             color: #292c33;
@@ -187,4 +202,8 @@ background-color:fade(@value,10%);
 //         }
 //     }
 // }
+
+.tips {
+    margin-left: 5px;
+}
 </style>

+ 1 - 1
src/components/SortList.vue

@@ -53,7 +53,7 @@ export default {
 
 <style lang="less">
 .list-row {
-    background: #f5f7fa;
+    background: @bg;
     padding: 6px 0;
     box-sizing: border-box;
 

+ 29 - 14
src/components/bar/FilterSortBar.vue

@@ -12,16 +12,14 @@
 
                         <div class="right" v-if="item.list">
                             <van-icon
-                                name="icon-arrow-up-filling"
+                                name="arrow-up"
                                 :size="10"
-                                :color="checkChoose('TIME_SEQUENCE') ? $colors.warn : $colors.info"
-                                class-prefix="iconfont"
+                                :color="checkChoose('TIME_SEQUENCE') ? $colors.warn : $colors.text"
                             />
                             <van-icon
-                                name="icon-arrow-down-filling"
+                                name="arrow-down"
                                 :size="10"
-                                :color="checkChoose('TIME') ? $colors.warn : $colors.info"
-                                class-prefix="iconfont"
+                                :color="checkChoose('TIME') ? $colors.warn : $colors.text"
                             />
                         </div>
                     </div>
@@ -29,11 +27,19 @@
             </div>
 
             <div class="showType" @click="changeShowType">
-                <van-icon :size="16" :color="showType === 'grid' ? $colors.warn : '#000'" name="apps-o" />
+                <van-icon :size="16" v-if="showType === 'grid'" :color="$colors.text" name="apps-o" />
+                <van-icon
+                    :size="16"
+                    v-else
+                    name="https://imttech.oss-cn-hangzhou.aliyuncs.com/micro/iocn_liebiao.png"
+                ></van-icon>
             </div>
             <div class="shaixuan" @click="showFilter">
                 <span>筛选</span>
-                <van-icon :size="16" name="filter-o" />
+                <van-icon
+                    :size="16"
+                    mame="https://imttech.oss-cn-hangzhou.aliyuncs.com/micro/iocn_shaixuan.png"
+                ></van-icon>
             </div>
         </div>
         <div class="filter-list" v-if="hasbottom">
@@ -156,7 +162,7 @@ export default {
     font-family: PingFangSC-Regular, PingFang SC;
     line-height: 24px;
     color: #000;
-    background-color: #fff;
+    background-color: @bgw;
 }
 .sort-top {
     display: flex;
@@ -170,7 +176,7 @@ export default {
             margin-right: 4px;
         }
         &:active {
-            background-color: overlay(#f5f7fa, #000);
+            background-color: overlay(@bg, #000);
         }
     }
     .showType {
@@ -178,7 +184,7 @@ export default {
         align-self: center;
         line-height: 16px;
         &:active {
-            background-color: overlay(#f5f7fa, #000);
+            background-color: overlay(@bg, #000);
         }
     }
 
@@ -187,7 +193,7 @@ export default {
         flex-grow: 1;
         padding-left: 12px;
         .sort-item {
-            padding: 0 12px;
+            padding: 0 20px;
 
             &.active {
                 color: @warn;
@@ -218,11 +224,20 @@ export default {
                 justify-content: center;
                 align-items: center;
                 line-height: 8px;
-                margin-left: 5px;
                 position: absolute;
-                right: 0px;
+                right: 6px;
                 top: 50%;
                 transform: translateY(-50%);
+
+                .van-icon {
+                    font-weight: bold;
+                    &.van-icon-arrow-up {
+                        transform: translateY(1px);
+                    }
+                    &.van-icon-arrow-down {
+                        transform: translateY(-1px);
+                    }
+                }
             }
         }
     }

+ 1 - 1
src/components/filter/Application.vue

@@ -9,7 +9,7 @@
                 <van-button
                     :custom-class="chooseList.includes(item.id) ? 'chooseActive' : 'choose'"
                     type="default"
-                    :color="chooseList.includes(item.id) ? '#FFF4E5' : '#F5F7FA'"
+                    :color="chooseList.includes(item.id) ? '#FFF4E5' : '@bg'"
                     @click="choose(item.id)"
                 >
                     {{ getName(item) }}

+ 1 - 1
src/components/filter/Country.vue

@@ -259,7 +259,7 @@ export default {
         padding: 14px 0;
     }
     .filter-btn {
-        background: #f5f7fa;
+        background: @bg;
         border-radius: 4px;
         display: flex;
         align-items: center;

+ 1 - 1
src/components/filter/EnterpriseType.vue

@@ -215,7 +215,7 @@ export default {
         padding: 14px 0;
     }
     .filter-btn {
-        background: #f5f7fa;
+        background: @bg;
         border-radius: 4px;
         display: flex;
         align-items: center;

+ 1 - 1
src/components/filter/ProductBrand.vue

@@ -195,7 +195,7 @@ export default {
         padding: 14px 0;
     }
     .filter-btn {
-        background: #f5f7fa;
+        background: @bg;
         border-radius: 4px;
         display: flex;
         align-items: center;

+ 1 - 1
src/components/filter/ProductCategory.vue

@@ -242,7 +242,7 @@ export default {
         padding: 14px 0;
     }
     .filter-btn {
-        background: #f5f7fa;
+        background: @bg;
         border-radius: 4px;
         display: flex;
         align-items: center;

+ 1 - 1
src/components/filter/ProductTags.vue

@@ -226,7 +226,7 @@ export default {
         padding: 14px 0;
     }
     .filter-btn {
-        background: #f5f7fa;
+        background: @bg;
         border-radius: 4px;
         display: flex;
         align-items: center;

+ 2 - 0
src/components/imt/Bottom.vue

@@ -88,6 +88,7 @@ export default {
     margin-top: 20px;
     padding-bottom: calc(8px + constant(safe-area-inset-bottom));
     padding-bottom: calc(8px + env(safe-area-inset-bottom));
+    background-color: @bgw;
 
     .bottom {
         position: fixed;
@@ -100,6 +101,7 @@ export default {
         right: 0;
         padding-bottom: calc(8px + constant(safe-area-inset-bottom));
         padding-bottom: calc(8px + env(safe-area-inset-bottom));
+        background-color: @bgw;
     }
 }
 </style>

+ 5 - 9
src/components/product/Grid.vue

@@ -6,13 +6,7 @@
                 <h4>{{ name }}</h4>
                 <!-- <p>{{ info.model }}</p> -->
 
-                <van-image
-                    class="grid-logo"
-                    width="100%"
-                    :height="25"
-                    :src="info.logo1 + '?x-oss-process=image/resize,h_100,m_lfit'"
-                    fit="contain"
-                />
+                <van-image class="grid-logo" width="100%" :height="25" :src="info.logo1 + $oss.logo1" fit="contain" />
             </div>
         </div>
     </div>
@@ -36,7 +30,7 @@ export default {
         },
         img() {
             if (this.getList(this.info.img)) {
-                return this.getList(this.info.img) + '?x-oss-process=image/resize,m_fill,h_300,w_300';
+                return this.getList(this.info.img) + this.$oss.normal;
             } else {
                 return '';
             }
@@ -47,6 +41,8 @@ export default {
 
 <style lang="less" scoped>
 .grid {
+    border-radius: @radius;
+    overflow: hidden;
     .content {
         padding: 6px 8px;
         overflow: hidden;
@@ -54,7 +50,7 @@ export default {
             overflow: hidden;
         }
     }
-    background-color: #fff;
+    background-color: @bgw;
     &:active {
         background-color: darken(#fff, 5);
     }

+ 6 - 10
src/components/product/GridBig.vue

@@ -1,19 +1,13 @@
 <template>
     <div class="grid" @click="navigateTo(`/pagesProduct/Detail?id=${info.id}`, false)">
-        <van-image class="grid-img" width="100%" height="170px" :src="img" fit="cover" />
+        <van-image class="grid-img" width="100%" :height="170" :src="img" fit="contain" />
         <div class="content">
             <div class="text">
                 <h3>{{ name }}</h3>
                 <p>{{ info.model }}</p>
             </div>
 
-            <van-image
-                class="grid-logo"
-                :width="105"
-                :height="45"
-                :src="info.logo1 + '?x-oss-process=image/resize,h_135,m_lfit'"
-                fit="contain"
-            />
+            <van-image class="grid-logo" :height="45" :src="info.logo1 + $oss.logo1" fit="heightFix" />
         </div>
     </div>
 </template>
@@ -36,7 +30,7 @@ export default {
         },
         img() {
             if (this.getList(this.info.img)) {
-                return this.getList(this.info.img) + '?x-oss-process=image/resize,m_fill,h_750,w_750';
+                return this.getList(this.info.img) + this.$oss.big;
             } else {
                 return '';
             }
@@ -47,6 +41,8 @@ export default {
 
 <style lang="less" scoped>
 .grid {
+    border-radius: @radius;
+    overflow: hidden;
     .content {
         display: flex;
         align-items: center;
@@ -59,7 +55,7 @@ export default {
             overflow: hidden;
         }
     }
-    background-color: #fff;
+    background-color: @bgw;
 
     &:active {
         background-color: darken(#fff, 5);

+ 4 - 2
src/components/product/GridNormal.vue

@@ -2,7 +2,7 @@
     <div class="grid" @click="navigateTo(`/pagesProduct/Detail?id=${info.id}`, false)">
         <van-image class="grid-img" width="100%" height="170px" :src="img" fit="cover" />
         <div class="content">
-            <van-image class="grid-logo" width="56" height="24" :src="info.logo" fit="cover" />
+            <van-image class="grid-logo" width="56" height="24" :src="info.logo1 + $oss.logo1" fit="cover" />
             <div class="text">
                 <h3 class="fontNormal">{{ name }}</h3>
                 <p>{{ info.model }}</p>
@@ -54,6 +54,8 @@ export default {
 
 <style lang="less" scoped>
 .grid {
+    border-radius: @radius;
+    overflow: hidden;
     .content {
         padding: 12px;
         overflow: hidden;
@@ -68,7 +70,7 @@ export default {
             }
         }
     }
-    background-color: #fff;
+    background-color: @bgw;
 
     .tags {
         display: flex;

+ 3 - 1
src/components/product/Row.vue

@@ -20,7 +20,7 @@ export default {
     computed: {
         img() {
             if (this.getList(this.info.img)) {
-                return this.getList(this.info.img) + '?x-oss-process=image/resize,m_fill,h_200,w_200';
+                return this.getList(this.info.img) + this.$oss.normal;
             } else {
                 return '';
             }
@@ -38,6 +38,8 @@ export default {
     overflow: hidden;
     width: 100%;
     box-sizing: border-box;
+    border-radius: @radius;
+    overflow: hidden;
     .info {
         flex-grow: 1;
         margin-left: 8px;

+ 4 - 3
src/components/product/RowMini.vue

@@ -5,13 +5,13 @@
             :name="checked ? 'checked' : 'circle'"
             :color="checked ? $colors.warn : '#BCC1CC'"
             :size="16"
-            style="margin-right:12px"
+            style="margin-right: 12px;"
         />
         <van-image :src="img" :width="62" :height="62" fit="cover" />
         <div class="info">
             <h3>{{ getName(info) }}</h3>
             <div class="sub">
-                <van-image :src="info.logo" v-if="info.logo" :width="39" :height="17" fit="contain" />
+                <van-image :src="info.logo1 + $oss.logo1" v-if="info.logo1" :width="39" :height="17" fit="contain" />
                 <p>{{ info.model }}</p>
             </div>
         </div>
@@ -57,7 +57,7 @@ export default {
     computed: {
         img() {
             if (this.getList(this.info[this.imgKey])) {
-                return this.getList(this.info[this.imgKey]) + '?x-oss-process=image/resize,m_fill,h_300,w_300';
+                return this.getList(this.info[this.imgKey]) + this.$oss.normal;
             } else {
                 return '';
             }
@@ -76,6 +76,7 @@ export default {
 <style lang="less" scoped>
 .product {
     display: flex;
+    border-radius: @radius;
     overflow: hidden;
     .info {
         flex-grow: 1;

+ 6 - 6
src/components/product/RowNormal.vue

@@ -5,13 +5,13 @@
             :name="checked ? 'checked' : 'circle'"
             :color="checked ? $colors.warn : '#BCC1CC'"
             :size="16"
-            style="margin-right:12px"
+            style="margin-right: 12px;"
         />
         <van-image :src="img" :width="110" :height="110" fit="cover" />
         <div class="info">
             <h3>{{ getName(info) }}</h3>
             <div class="sub">
-                <van-image :src="info.logo" v-if="info.logo" :width="39" :height="17" fit="contain" />
+                <van-image :src="info.logo1 + $oss.logo1" v-if="info.logo1" :width="39" :height="17" fit="contain" />
                 <p>{{ info.model }}</p>
             </div>
             <div class="flex1"></div>
@@ -46,7 +46,7 @@ export default {
     computed: {
         img() {
             if (this.getList(this.info.img)) {
-                return this.getList(this.info.img) + '?x-oss-process=image/resize,m_fill,h_200,w_200';
+                return this.getList(this.info.img) + this.$oss.normal;
             } else {
                 return '';
             }
@@ -87,14 +87,14 @@ export default {
 <style lang="less" scoped>
 .product {
     display: flex;
-    overflow: hidden;
     box-sizing: border-box;
-    border-radius: 4px;
+    border-radius: @radius;
+    overflow: hidden;
     .info {
         flex-grow: 1;
         padding: 12px;
         overflow: hidden;
-        background-color: #fff;
+        background-color: @bgw;
         height: 110px;
         box-sizing: border-box;
         display: flex;

+ 1 - 1
src/components/select/Application.vue

@@ -210,7 +210,7 @@ export default {
         padding: 14px 0;
     }
     .filter-btn {
-        background: #f5f7fa;
+        background: @bg;
         border-radius: 4px;
         display: flex;
         align-items: center;

+ 3 - 3
src/components/select/Country.vue

@@ -254,7 +254,7 @@ export default {
     &.filter--small {
         .filter-btn {
             height: 28px;
-            background-color: #fff;
+            background-color: @bgw;
             h3 {
                 font-size: 14px;
                 color: #000000;
@@ -272,8 +272,8 @@ export default {
         padding: 14px 0;
     }
     .filter-btn {
-        // background: #f5f7fa;
-        background-color: #fff;
+        // background: @bg;
+        background-color: @bgw;
 
         border-radius: 4px;
         display: flex;

+ 1 - 1
src/components/select/Industry.vue

@@ -222,7 +222,7 @@ export default {
         padding: 14px 0;
     }
     .filter-btn {
-        background: #f5f7fa;
+        background: @bg;
         border-radius: 4px;
         display: flex;
         align-items: center;

+ 1 - 1
src/components/select/ProductCategory.vue

@@ -229,7 +229,7 @@ export default {
         padding: 14px 0;
     }
     .filter-btn {
-        background: #f5f7fa;
+        background: @bg;
         border-radius: 4px;
         display: flex;
         align-items: center;

+ 1 - 1
src/components/select/ProductCategoryOnly.vue

@@ -223,7 +223,7 @@ export default {
         padding: 14px 0;
     }
     .filter-btn {
-        background: #f5f7fa;
+        background: @bg;
         border-radius: 4px;
         display: flex;
         align-items: center;

+ 2 - 0
src/components/vendor/Grid.vue

@@ -22,6 +22,8 @@ export default {
 </script>
 <style lang="less">
 .bg-white {
+    border-radius: @radius;
+    overflow: hidden;
     &:active {
         background-color: darken(#fff, 5);
         .van-image {

+ 5 - 5
src/components/vendor/Row.vue

@@ -5,17 +5,17 @@
             :name="checked ? 'checked' : 'circle'"
             :color="checked ? $colors.warn : '#BCC1CC'"
             :size="16"
-            style="margin-right:12px"
+            style="margin-right: 12px;"
         />
         <van-image :width="110" :height="110" :src="logo" fit="cover" />
         <div class="content">
             <h3>{{ getName(info, ['chCompanyName', 'enCompanyName']) }}</h3>
             <div class="info">
-                <van-icon :size="20" name="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/icon_leibie.png" />
+                <van-icon :size="20" name="https://imttech.oss-cn-hangzhou.aliyuncs.com/micro/icon_leibie.png" />
                 <p>{{ categories }}</p>
             </div>
             <div class="info">
-                <van-icon :size="20" name="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/icon_weizhi.png" />
+                <van-icon :size="20" name="https://imttech.oss-cn-hangzhou.aliyuncs.com/micro/icon_weizhi.png" />
                 <p>{{ country }}</p>
             </div>
         </div>
@@ -72,7 +72,7 @@ export default {
 <style lang="less" scoped>
 .vendor {
     display: flex;
-    border-radius: 4px;
+    border-radius: @radius;
     overflow: hidden;
     ._van-icon {
         align-self: center;
@@ -82,7 +82,7 @@ export default {
         flex-grow: 1;
         padding: 12px;
         overflow: hidden;
-        background-color: #fff;
+        background-color: @bgw;
         h3 {
             margin-bottom: 8px;
         }

+ 10 - 1
src/main.js

@@ -14,7 +14,16 @@ Vue.mixin(commont);
 Vue.prototype.$colors = {
     prim: '#0F264D',
     warn: '#FFA526',
-    info: '#BCC1CC'
+    info: '#BCC1CC',
+    text: '#292C33'
+};
+
+Vue.prototype.$oss = {
+    logo1: '?x-oss-process=image/resize,m_fill,h_280,w_120',
+    normal: '?x-oss-process=image/resize,m_fill,h_500,w_500',
+    mini: '?x-oss-process=image/resize,m_fill,h_300,w_300',
+    big: '?x-oss-process=image/resize,m_fill,h_1080,w_1080',
+    hotPro: '?x-oss-process=image/resize,m_fill,h_998,w_490'
 };
 
 Vue.use(Vuex);

+ 2 - 2
src/pages/Chat.vue

@@ -69,8 +69,8 @@ export default {
 <style lang="less">
 .van-divider {
     --divider-margin: 0 0;
-    --divider-border-color: #f5f7fa;
+    --divider-border-color: @bg;
     height: 5px;
-    background-color: #f5f7fa;
+    background-color: @bg;
 }
 </style>

+ 3 - 2
src/pages/Classify.vue

@@ -47,6 +47,7 @@
                         src="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/quanqiu_img_jixie.jpg"
                         fit="widthFix"
                         width="100%"
+                        :radius="4"
                     />
                     <div class="text">
                         <img src="../static/imgs/quanqiu_icon_jixie.png" alt="" />
@@ -64,7 +65,7 @@
                     >{{ getName(item) }}</van-button
                 >
 
-                <div style="height:20px"></div>
+                <div style="height: 20px;"></div>
             </scroll-view>
         </div>
 
@@ -160,7 +161,7 @@ export default {
         .left {
             width: 140px;
             flex-shrink: 0;
-            background-color: #f5f7fa;
+            background-color: @bg;
             position: relative;
 
             .van-sidebar {

+ 17 - 14
src/pages/Home.vue

@@ -1,7 +1,7 @@
 <config>
 {
 'backgroundColorTop': '#0F264D',
-'backgroundColorBottom': '#F5F7FA',
+'backgroundColorBottom': '#f5f7fa',
 'backgroundColor': '#fff',
 'navigationStyle':'custom',
 'navigationBarBackgroundColor':'#0F264D',
@@ -31,7 +31,7 @@
                         </swiper-item>
                     </block>
                 </swiper>
-                <div class="dots">
+                <div class="dots" v-if="banners.length > 1">
                     <div
                         class="dot"
                         :class="{ active: index === current }"
@@ -49,7 +49,7 @@
                     <div class="text">{{ $t('xin-yu-bao-zhang') }}</div>
                 </div>
 
-                <van-grid icon-size="40" :border="false">
+                <van-grid clickable icon-size="40" :border="false" click>
                     <van-grid-item
                         content-class="menu-info"
                         icon="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/home_icon_zhanshang.png"
@@ -80,6 +80,7 @@
                     width="100%"
                     height="90px"
                     class="pathImg"
+                    :radius="4"
                     src="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/home_img_3dimt.jpg"
                     @click="navigateTo('/pagesHome/ShowView', false)"
                 />
@@ -112,7 +113,7 @@
                             </swiper-item>
                         </swiper>
 
-                        <div class="dots">
+                        <div class="dots" v-if="swiperProduct.length > 1">
                             <div
                                 class="dot"
                                 :class="{ active: index === hotSwiperIndex }"
@@ -152,8 +153,10 @@
                 <div class="title">
                     <h1>合作伙伴</h1>
                     <van-button size="small" :color="$colors.info" plain @click="navigateTo('/pagesHome/Brand', false)">
-                        查看更多
-                        <van-icon name="arrow" :color="$colors.info" />
+                        <div class="btn_icon">
+                            <span>查看更多</span>
+                            <van-icon name="arrow" :color="$colors.info" />
+                        </div>
                     </van-button>
                 </div>
                 <swiper
@@ -172,7 +175,7 @@
                     </block>
                 </swiper>
 
-                <div class="dots">
+                <div class="dots" v-if="vendorInfos.length > 1">
                     <div
                         class="dot"
                         :class="{ active: index === vendorSwiper }"
@@ -197,7 +200,7 @@
                 @changeSort="changeSort"
                 @changeShowType="changeShowType"
                 :hasbottom="false"
-                background="linear-gradient(180deg, #F5F7FA 0%, #FFFFFF 100%)"
+                background="linear-gradient(180deg, @bg 0%, #FFFFFF 100%)"
             >
             </filter-sort-bar>
         </van-sticky>
@@ -396,7 +399,7 @@ export default {
 <style lang="less" scoped>
 .van-content {
     padding: 16px;
-    background-color: #f5f7fa;
+    background-color: @bg;
     position: relative;
     .dots {
         .dot {
@@ -516,7 +519,7 @@ export default {
         width: 8px;
         height: 2px;
         background-color: rgba(255, 255, 255, 0.6);
-        margin: 0 4px;
+        margin: 0 2px;
 
         &.active {
             background-color: @warn;
@@ -552,7 +555,7 @@ export default {
     }
 }
 .title-content {
-    background-color: #fff;
+    background-color: @bgw;
     padding: 15px;
 }
 .title {
@@ -573,7 +576,7 @@ export default {
 
 .datas {
     padding: 20px 16px;
-    background: #f5f7fa;
+    background: @bg;
 
     position: relative;
     .datas-content {
@@ -603,11 +606,11 @@ export default {
 
 .tuiJian {
     padding: 20px 16px;
-    background: #f5f7fa;
+    background: @bg;
 }
 
 .van-empty {
-    background-color: #f5f7fa;
+    background-color: @bg;
 }
 
 .product {

+ 4 - 2
src/pages/My.vue

@@ -15,11 +15,12 @@
                 :height="70 + barHeight + 'px'"
                 src="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/info_top_bg.jpg"
                 fit="cover"
+                :radius="4"
             />
-            <van-button class="btn1" color="#0F264D" plain @click="choose" :style="{ top: barTop + 'px' }">
+            <!-- <van-button class="btn1" color="#0F264D" plain @click="choose" :style="{ top: barTop + 'px' }">
                 {{ getName(language) }}
                 <van-icon name="arrow-down" size="10px" color="#0F264D" />
-            </van-button>
+            </van-button> -->
 
             <div class="btn-content">
                 <van-button
@@ -52,6 +53,7 @@
                 src="http://imttech.oss-cn-hangzhou.aliyuncs.com/micro/info_zhanshangruzhu.png"
                 fit="widthFix"
                 width="100%"
+                :radius="4"
             />
         </div>
 

+ 6 - 19
src/pagesChat/ChatDetail.vue

@@ -72,7 +72,7 @@
             <van-icon name="plus" :class="{ showImg }" color="#0F264D" @click="showImg = !showImg" :size="20" />
         </div>
 
-        <div class="upload">
+        <div class="upload" v-if="showImg">
             <van-grid clickable :gutter="16" :border="false">
                 <van-grid-item icon="photo" text="图片" @click="choosePhoto" />
             </van-grid>
@@ -92,23 +92,7 @@ export default {
             list: [],
             toUserId: 0,
             value: '',
-            services: [
-                '进出口代理服务',
-                '技术培训',
-                '融资租赁',
-                '维修',
-                '商务租赁',
-                '仓储与分拨(保税/非保)',
-                '商务咨询',
-                '产能共享',
-                '保税参展服务',
-                '检测认证',
-                '数据统计',
-                '综合物流',
-                '安装调试',
-                '技术集成',
-                '二手设备交易'
-            ],
+            services: [],
             nowDate: '',
             total: '100vh',
             showImg: false,
@@ -162,6 +146,9 @@ export default {
         }
     },
     onLoad(options) {
+        this.$http.get('/sysConfig/get/DEMAND_SERVCE').then(res => {
+            this.services = res.value.split(',');
+        });
         this.nowDate = dayjs();
         if (options.type === 'system') {
             wx.setNavigationBarTitle({
@@ -341,7 +328,7 @@ export default {
 
     .weui-input {
         height: 44px;
-        background: #f5f7fa;
+        background: @bg;
         padding: 0 12px;
         margin-right: 10px;
         font-size: 16px;

+ 1 - 1
src/pagesHome/Brand.vue

@@ -3,7 +3,7 @@
 'navigationBarTitleText': '',
 'navigationStyle':'custom',
 'navigationBarTextStyle':'white',
-'backgroundColorBottom': '#F5F7FA',
+'backgroundColorBottom': '#f5f7fa',
 'backgroundColorTop': '#0F264D',
 }
 </config>

+ 2 - 2
src/pagesHome/ChatPage.vue

@@ -33,8 +33,8 @@ export default {
 <style lang="less">
 .van-divider {
     --divider-margin: 0 0;
-    --divider-border-color: #f5f7fa;
+    --divider-border-color: @bg;
     height: 5px;
-    background-color: #f5f7fa;
+    background-color: @bg;
 }
 </style>

+ 1 - 1
src/pagesHome/FilterPage.vue

@@ -119,7 +119,7 @@ export default {
     align-items: center;
     padding: 0 8px;
     box-shadow: 0px -1px 2px 0px rgba(0, 0, 0, 0.04);
-    background-color: #fff;
+    background-color: @bgw;
     .btn-block {
         flex-grow: 1;
         margin: 0 6px;

+ 1 - 1
src/pagesHome/Product.vue

@@ -2,7 +2,7 @@
 {
 'navigationBarTitleText': '全球产品',
 'backgroundColorTop': '#0F264D',
-'backgroundColorBottom': '#F5F7FA',
+'backgroundColorBottom': '#f5f7fa',
 'navigationBarTextStyle':'white',
 'navigationBarBackgroundColor':'#0F264D',
 }

+ 1 - 1
src/pagesHome/ProductList.vue

@@ -3,7 +3,7 @@
 'navigationBarTitleText': '',
 'navigationStyle':'custom',
 'navigationBarTextStyle':'black',
-'backgroundColorBottom': '#F5F7FA',
+'backgroundColorBottom': '#f5f7fa',
 'backgroundColorTop': '#fff',
 }
 </config>

+ 10 - 3
src/pagesHome/Search.vue

@@ -19,7 +19,7 @@
             <div class="navBar" :style="narStyle">
                 <van-icon name="arrow-left" @click="navigateBack" :size="24" color="#000" />
 
-                <van-search :value="search" @search="confirm" shape="round" placeholder="搜索..." />
+                <van-search :focus="focus" :value="search" @search="confirm" shape="round" placeholder="搜索..." />
             </div>
         </van-sticky>
         <div class="content">
@@ -62,6 +62,7 @@ export default {
             categories: [],
             left: null,
             historys: [],
+            focus: false,
             hots: ['信息通信', '3D打印', '机床', '机加工', '电子器件', '高精度打印机', '量具仪具']
         };
     },
@@ -93,6 +94,12 @@ export default {
     },
     onLoad() {
         this.getHistory();
+        this.$http.get('/sysConfig/get/SEARCH_HOT').then(res => {
+            this.hots = res.value.split(',');
+        });
+        this.$nextTick(() => {
+            this.focus = true;
+        });
     },
     onReady() {
         this.left = wx.createSelectorQuery().select('#left');
@@ -214,7 +221,7 @@ export default {
     display: flex;
     flex-wrap: wrap;
     .tags {
-        background: #f5f7fa;
+        background: @bg;
         border-radius: 3px;
         font-size: 12px;
         color: #565b66;
@@ -224,7 +231,7 @@ export default {
         margin-bottom: 8px;
 
         &:active {
-            background-color: darken(#f5f7fa, 5);
+            background-color: darken(@bg, 5);
         }
     }
 }

+ 2 - 2
src/pagesImt/Service.vue

@@ -33,12 +33,12 @@ export default {
 
 <style lang="less" scoped>
 .services {
-    background: #f5f7fa;
+    background: @bg;
     padding: 12px 16px;
 }
 .service-item {
     display: flex;
-    background-color: #fff;
+    background-color: @bgw;
     padding: 23px 14px;
     border-radius: 4px;
     .servce-info {

+ 3 - 3
src/pagesMine/ChangeEmail.vue

@@ -86,7 +86,7 @@ export default {
 
     .page-input {
         height: 50px;
-        background: #f5f7fa;
+        background: @bg;
         border-radius: 4px;
         padding: 0 12px;
         display: flex;
@@ -94,7 +94,7 @@ export default {
         margin-top: 10px;
         overflow: hidden;
         &:active {
-            background: darken(#f5f7fa, 5);
+            background: darken(@bg, 5);
         }
         .text {
             flex-grow: 1;
@@ -111,7 +111,7 @@ export default {
         line-height: 22px;
     }
     .textarea {
-        background: #f5f7fa;
+        background: @bg;
         border-radius: 4px;
         min-height: 100px;
         margin-top: 10px;

+ 3 - 3
src/pagesMine/ChangePhone.vue

@@ -193,7 +193,7 @@ export default {
 
     .page-input {
         height: 50px;
-        background: #f5f7fa;
+        background: @bg;
         border-radius: 4px;
         padding: 0 12px;
         display: flex;
@@ -201,7 +201,7 @@ export default {
         margin-top: 10px;
         overflow: hidden;
         &:active {
-            background: darken(#f5f7fa, 5);
+            background: darken(@bg, 5);
         }
         .text {
             flex-grow: 1;
@@ -218,7 +218,7 @@ export default {
         line-height: 22px;
     }
     .textarea {
-        background: #f5f7fa;
+        background: @bg;
         border-radius: 4px;
         min-height: 100px;
         margin-top: 10px;

+ 3 - 3
src/pagesMine/ChangePsd.vue

@@ -97,7 +97,7 @@ export default {
 
     .page-input {
         height: 50px;
-        background: #f5f7fa;
+        background: @bg;
         border-radius: 4px;
         padding: 0 12px;
         display: flex;
@@ -105,7 +105,7 @@ export default {
         margin-top: 10px;
         overflow: hidden;
         &:active {
-            background: darken(#f5f7fa, 5);
+            background: darken(@bg, 5);
         }
         .text {
             flex-grow: 1;
@@ -122,7 +122,7 @@ export default {
         line-height: 22px;
     }
     .textarea {
-        background: #f5f7fa;
+        background: @bg;
         border-radius: 4px;
         min-height: 100px;
         margin-top: 10px;

+ 2 - 2
src/pagesMine/Collect.vue

@@ -2,7 +2,7 @@
 {
 'navigationBarTitleText': '我的收藏',
 'backgroundColorTop': '#fff',
-'backgroundColor':'#F5F7FA'
+'backgroundColor':'#f5f7fa'
 }
 </config>
 <template>
@@ -198,7 +198,7 @@ export default {
 }
 
 page {
-    background-color: #f5f7fa;
+    background-color: @bg;
 }
 
 .product-list {

+ 50 - 8
src/pagesMine/Enter.vue

@@ -18,7 +18,7 @@
             </div>
         </div>
         <h3>入驻流程</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"
@@ -28,15 +28,25 @@
                     :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>
 
         <fixed-button>
             <van-button :color="$colors.warn" block>请在PC端进行入驻</van-button>
         </fixed-button>
+
+        <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>
+            </div>
+        </van-popup>
     </div>
 </template>
 <script>
@@ -54,7 +64,16 @@ export default {
                     steps: [
                         {
                             text: '查询确认入驻资格',
-                            isRight: true
+                            tips: [
+                                {
+                                    text1: '查看企业:',
+                                    text2: '平台是否已经存在本企业,进行企业认领'
+                                },
+                                {
+                                    text1: '查看类别:',
+                                    text2: '企业生产或经营的产品包含于IMT平台产品类别范围内'
+                                }
+                            ]
                         },
                         {
                             text: '填写账号/企业信息进行注册'
@@ -83,11 +102,7 @@ export default {
                     title: '选择套餐',
                     steps: [
                         {
-                            text:
-                                '审核通过后,需要选择开通的展商套餐,普通免费版或者VIP套餐,具体资费及功能对比见下方“资费标准”'
-                        },
-                        {
-                            text: '选择免费版本后续可随时升级为VIP版本'
+                            text: '审核通过后,开通展商功能'
                         }
                     ]
                 },
@@ -107,6 +122,17 @@ export default {
                         }
                     ]
                 }
+            ],
+            show: false,
+            tips: [
+                {
+                    text1: '查看企业:',
+                    text2: '平台是否已经存在本企业,进行企业认领'
+                },
+                {
+                    text1: '查看类别:',
+                    text2: '企业生产或经营的产品包含于IMT平台产品类别范围内'
+                }
             ]
         };
     },
@@ -150,4 +176,20 @@ h3 {
         }
     }
 }
+
+.tips-content {
+    padding: 6px 16px;
+    .tips-item {
+        padding: 10px 0;
+        .text1 {
+            font-size: 14px;
+        }
+
+        .text2 {
+            font-size: 12px;
+            color: #878d99;
+            padding-top: 6px;
+        }
+    }
+}
 </style>

+ 2 - 2
src/pagesMine/Order.vue

@@ -2,7 +2,7 @@
 {
 'navigationBarTitleText': '产品需求/成交单',
 'backgroundColorTop': '#fff',
-'backgroundColor':'#F5F7FA'
+'backgroundColor':'#f5f7fa'
 }
 </config>
 <template>
@@ -155,7 +155,7 @@ export default {
 }
 
 page {
-    background-color: #f5f7fa;
+    background-color: @bg;
 }
 
 .order-list {

+ 3 - 3
src/pagesMine/OrderDetail.vue

@@ -220,7 +220,7 @@ export default {
 
     .page-input {
         height: 50px;
-        background: #f5f7fa;
+        background: @bg;
         border-radius: 4px;
         padding: 0 12px;
         display: flex;
@@ -228,7 +228,7 @@ export default {
         margin-top: 10px;
         overflow: hidden;
         &:active {
-            background: darken(#f5f7fa, 5);
+            background: darken(@bg, 5);
         }
         .text {
             flex-grow: 1;
@@ -245,7 +245,7 @@ export default {
         line-height: 22px;
     }
     .textarea {
-        background: #f5f7fa;
+        background: @bg;
         border-radius: 4px;
         min-height: 100px;
         margin-top: 10px;

+ 3 - 3
src/pagesProduct/Contrast.vue

@@ -10,7 +10,7 @@
                 left-icon="volume-o"
                 wrapable
                 color="#565B66"
-                background="#F5F7FA"
+                background="@bg"
                 :scrollable="false"
                 custom-class="my-notice"
                 text="产品对比仅限同类别产品进行对比,若要更换类别,请先将列表中的产品删除,再次添加产品则会变为新产品的类别"
@@ -252,7 +252,7 @@ export default {
 
 .notice {
     padding: 16px 0 6px;
-    background: #f5f7fa;
+    background: @bg;
     --notice-bar-wrapable-padding: 0 16px;
     --button-border-width: 0px;
     .van-button {
@@ -302,7 +302,7 @@ export default {
             left: 28px;
             right: 0px;
             height: 1px;
-            background: #f5f7fa;
+            background: @bg;
         }
     }
 }

+ 2 - 2
src/pagesProduct/ContrastDetail.vue

@@ -418,7 +418,7 @@ export default {
     }
     &.secondLevel {
         .td {
-            background: #f5f7fa;
+            background: @bg;
         }
     }
 
@@ -466,7 +466,7 @@ export default {
             left: 28px;
             right: 0px;
             height: 1px;
-            background: #f5f7fa;
+            background: @bg;
         }
     }
 }

+ 2 - 2
src/pagesProduct/Detail.vue

@@ -332,7 +332,7 @@ export default {
 </script>
 <style lang="less">
 .main {
-    background-color: #fff;
+    background-color: @bgw;
 }
 .info {
     padding: 12px 16px 30px;
@@ -467,7 +467,7 @@ export default {
 .fixed-bottom {
     height: 60px;
     .fixed-bottom-content {
-        background-color: #fff;
+        background-color: @bgw;
         padding: 8px 16px;
         position: fixed;
         left: 0;

+ 2 - 2
src/pagesProduct/FilterProduct.vue

@@ -114,7 +114,7 @@ export default {
     --button-plain-background-color: #ffa52612;
     --button-border-width: 0px;
     z-index: 20;
-    background-color: #fff;
+    background-color: @bgw;
     --button-default-height: 40px;
 }
 .product-list {
@@ -131,7 +131,7 @@ export default {
             left: 28px;
             right: 0px;
             height: 1px;
-            background: #f5f7fa;
+            background: @bg;
         }
     }
 }

+ 3 - 3
src/pagesProduct/FilterVendor.vue

@@ -113,7 +113,7 @@ export default {
     --button-plain-background-color: #ffa52612;
     --button-border-width: 0px;
     z-index: 20;
-    background-color: #fff;
+    background-color: @bgw;
     --button-default-height: 40px;
 }
 .header {
@@ -127,8 +127,8 @@ export default {
     --cell-line-height: 60px;
     --cell-text-color: #292c33;
     --cell-vertical-padding: 6px;
-    --index-anchor-active-background-color: #f5f7fa;
-    --index-anchor-background-color: #f5f7fa;
+    --index-anchor-active-background-color: @bg;
+    --index-anchor-background-color: @bg;
     --index-anchor-text-color: #878d99;
     --index-anchor-line-height: 24px;
     .van-cell__left-icon-wrap {

+ 2 - 2
src/pagesProduct/Inquiry.vue

@@ -188,7 +188,7 @@ h2 {
             left: 28px;
             right: 0px;
             height: 1px;
-            background: #f5f7fa;
+            background: @bg;
         }
     }
 }
@@ -208,7 +208,7 @@ h2 {
     padding: 0px 0 20px;
     .textarea {
         margin: 16px 16px 0;
-        background: #f5f7fa;
+        background: @bg;
         border-radius: 4px;
         min-height: 100px;
         width: calc(100% - 32px);

+ 2 - 2
src/pagesProduct/IntentionList.vue

@@ -104,7 +104,7 @@ export default {
 
 .notice {
     padding: 16px 0 6px;
-    background: #f5f7fa;
+    background: @bg;
     --notice-bar-wrapable-padding: 0 16px;
     --button-border-width: 0px;
     .van-button {
@@ -154,7 +154,7 @@ export default {
             left: 28px;
             right: 0px;
             height: 1px;
-            background: #f5f7fa;
+            background: @bg;
         }
     }
 }

+ 5 - 9
src/pagesVendor/About.vue

@@ -3,23 +3,19 @@
         <banner v-if="vendorInfo.img" :banners="banners" :height="180" :autoplay="false"></banner>
 
         <div class="auto-content">
-            <div class="box" style="order:0">
+            <div class="box" style="order: 0;">
                 <div class="introduce">
                     {{ vendorInfo.introduction }}
                 </div>
             </div>
 
-            <div
-                style="background: #f5f7fa;"
-                v-if="productList.length > 0"
-                :style="{ order: decorationInfo.popularOrder }"
-            >
+            <div style="background: @bg;" v-if="productList.length > 0" :style="{ order: decorationInfo.popularOrder }">
                 <scroll-view :scroll-x="true">
                     <div class="product-list">
                         <div class="product-item" v-for="item in productList" :key="item.id">
                             <product-grid :info="item"></product-grid>
                         </div>
-                        <div style="min-width:16px"></div>
+                        <div style="min-width: 16px;"></div>
                     </div>
                 </scroll-view>
             </div>
@@ -80,7 +76,7 @@
             <van-image :src="item" fit="widthFix" />
         </block>
 
-        <div style="height:100px"></div>
+        <div style="height: 100px;"></div>
     </div>
 </template>
 <script>
@@ -174,7 +170,7 @@ export default {
     display: flex;
     flex-wrap: no-wrap;
     padding: 36px 14px;
-    background: #f5f7fa;
+    background: @bg;
     .product-item {
         width: 110px;
         flex-shrink: 0;

+ 2 - 2
src/pagesVendor/Connect.vue

@@ -184,7 +184,7 @@ h2 {
             left: 28px;
             right: 0px;
             height: 1px;
-            background: #f5f7fa;
+            background: @bg;
         }
     }
 }
@@ -217,7 +217,7 @@ h2 {
     padding: 0px 0 20px;
     .textarea {
         margin: 16px 16px 0;
-        background: #f5f7fa;
+        background: @bg;
         border-radius: 4px;
         min-height: 100px;
         width: calc(100% - 32px);

+ 1 - 1
src/pagesVendor/Detail.vue

@@ -213,7 +213,7 @@ export default {
 .main {
     --tabs-nav-background-color: @prim;
     --tab-text-color: #ffffffaa;
-    background-color: #fff;
+    background-color: @bgw;
 }
 
 .fixed-top {

+ 2 - 2
src/pagesVendor/FilterProduct.vue

@@ -93,7 +93,7 @@ export default {
     --button-plain-background-color: #ffa52612;
     --button-border-width: 0px;
     z-index: 20;
-    background-color: #fff;
+    background-color: @bgw;
     --button-default-height: 40px;
 }
 .product-list {
@@ -110,7 +110,7 @@ export default {
             left: 28px;
             right: 0px;
             height: 1px;
-            background: #f5f7fa;
+            background: @bg;
         }
     }
 }

+ 1 - 1
src/pagesVendor/News.vue

@@ -73,7 +73,7 @@ export default {
     }
 }
 .list-row {
-    background-color: #f5f7fa;
+    background-color: @bg;
 }
 </style>
 <style lang="less">

+ 2 - 2
src/pagesVendor/Product.vue

@@ -93,7 +93,7 @@ export default {
     --sidebar-padding: 20px;
     --sidebar-selected-border-color: transparent;
     --sidebar-selected-font-weight: bolder;
-    background: #f5f7fa;
+    background: @bg;
     flex-shrink: 0;
     .van-sidebar-item {
         width: 121px;
@@ -115,7 +115,7 @@ export default {
 }
 
 .list-row {
-    background-color: #fff;
+    background-color: @bgw;
 }
 
 .right {

+ 1 - 1
src/store/index.js

@@ -142,7 +142,7 @@ export default new Vuex.Store({
             }
         },
         getArea(context) {
-            http.http.get('http://imttech.oss-cn-hangzhou.aliyuncs.com/utils/area.json').then(res => {
+            http.http.get('https://imttech.oss-cn-hangzhou.aliyuncs.com/utils/area.json').then(res => {
                 console.log(res);
                 context.commit('updateAreaList', res);
             });

+ 5 - 1
src/styles/common.less

@@ -12,8 +12,12 @@
 @border3: #ebeef5;
 @border4: #f2f6fc;
 @border5: #dee6ef;
-@bg: #f2f4f5;
+@bgw:#fff;
+// @bgw:black;
+@bg: #f5f7fa;
+// @bg:black;
 @bg2: #f8faff;
+@radius:4px;
 
 @text-color: #000000;
 @border-color: #ebedf0;