Browse Source

Merge remote-tracking branch 'origin/feature/201812-wangcz' into feature/201812-wangcz

shenjj 7 years ago
parent
commit
9039e1953f
3 changed files with 7 additions and 4 deletions
  1. 2 1
      assets/scss/mobileCommon.scss
  2. 4 2
      components/provider/Suppliers.vue
  3. 1 1
      nuxt.config.js

+ 2 - 1
assets/scss/mobileCommon.scss

@@ -470,7 +470,8 @@ html {
       font-size: .3rem;
       font-size: .3rem;
       margin-top: .06rem;
       margin-top: .06rem;
       img {
       img {
-        width: .31rem;
+        height: .25rem;
+        margin-top: -.02rem;
         margin-right: .05rem;
         margin-right: .05rem;
       }
       }
     }
     }

+ 4 - 2
components/provider/Suppliers.vue

@@ -69,7 +69,8 @@ export default {
         page: 1,
         page: 1,
         count: 10,
         count: 10,
         keyword: '',
         keyword: '',
-        types: this.types
+        type: this.types,
+        field: ''
       }
       }
     }
     }
   },
   },
@@ -93,7 +94,8 @@ export default {
     search (obj) {
     search (obj) {
       this.pageParams.page = 1
       this.pageParams.page = 1
       this.pageParams.keyword = obj.keyword === '' ? null : obj.keyword
       this.pageParams.keyword = obj.keyword === '' ? null : obj.keyword
-      this.$store.dispatch('provider/findSimilarStoreList', this.pageParams)
+      this.pageParams.field = obj.type ? 'similar' : null
+      this.pageCommodity(this.pageParams)
     },
     },
     showLittleDescription (description) {
     showLittleDescription (description) {
       if (!description || description === '') {
       if (!description || description === '') {

+ 1 - 1
nuxt.config.js

@@ -3,7 +3,7 @@ const isProdMode = Object.is(process.env.NODE_ENV, 'production')
 // b2c后台
 // b2c后台
 const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://api.usoftmall.com/' : 'http://192.168.253.121:9090/platform-b2c')
 const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://api.usoftmall.com/' : 'http://192.168.253.121:9090/platform-b2c')
 // 公共询价
 // 公共询价
-const commonUrl = process.env.COMMON_URL || (isProdMode ? 'https://api-inquiry.usoftmall.com/' : 'http://10.1.51.82:24002/')
+const commonUrl = process.env.COMMON_URL || (isProdMode ? 'https://api-inquiry.usoftmall.com/' : 'http://218.17.158.219:24000/')
 // 公共物料
 // 公共物料
 const materialUrl = process.env.MATERIAL_URL || (isProdMode ? 'https://api-product.usoftmall.com/' : 'http://218.17.158.219:24000/')
 const materialUrl = process.env.MATERIAL_URL || (isProdMode ? 'https://api-product.usoftmall.com/' : 'http://218.17.158.219:24000/')