Merge remote-tracking branch 'origin/master'

components/common/upload/upload.vue

@@ -41,7 +41,10 @@
         this.$http.post('/api/images', param, config)
           .then(response => {
             this.qualifications.url = response.data[0].path
-            this.$emit('uploadAction', response.data[0].path)
+            this.$emit('uploadAction', this.qualifications.url)
+          }, err => {
+            console.log(err)
+            this.$message.error('图片上传失败，请重试')
           })
       },
       showImg (imgUrl) {
@@ -50,6 +53,7 @@
       },
       deleteImg () {
         this.qualifications.url = ''
+        this.$emit('uploadAction', this.qualifications.url)
       }
     }
   }

components/default/Header.vue

@@ -218,7 +218,7 @@
               margin-left: -1px;
               border: $border;
               border-top: none;
-              padding: .5em;
+              padding: 1em;
               margin:0;
               border: none;
               border-radius: 0;

components/default/MessageBoard.vue

@@ -55,19 +55,19 @@
           <p>&nbsp;&nbsp;&nbsp;添加图片：</p>
           <div class="img-warp">
             <div class="img-item">
-              <upload/>
+              <upload @uploadAction="listenUpload($event, 0)"/>
             </div>
             <div class="img-item">
-              <upload/>
+              <upload @uploadAction="listenUpload($event, 1)"/>
             </div>
             <div class="img-item">
-              <upload/>
+              <upload @uploadAction="listenUpload($event, 2)"/>
             </div>
             <div class="img-item">
-              <upload/>
+              <upload @uploadAction="listenUpload($event, 3)"/>
             </div>
             <div class="img-item">
-              <upload/>
+              <upload @uploadAction="listenUpload($event, 4)"/>
             </div>
           </div>
           <p class="tip clearfix">提示：最多可上传五张图片，每张大小不超过500KB,仅支持JPG、PNG、GIF格式.</p>
@@ -142,7 +142,8 @@
         txtVal: 0,
         isMobile: true,
         isEmail: true,
-        messageBoard: {}
+        messageBoard: {},
+        dialogImageUrl: ['', '', '', '', '']
       }
     },
     components: {
@@ -173,6 +174,9 @@
       }
     },
     methods: {
+      listenUpload: function (url, index) {
+        this.dialogImageUrl[index] = url
+      },
       listenPage (page) {
         this.pageParams.page = page
         this.$emit('pageEvent', page)
@@ -227,6 +231,7 @@
               this.isOpendMessage()
               this.$message.info('感谢您的宝贵意见')
               this.messageBoard = {}
+              this.dialogImageUrl = ['', '', '', '', '']
             }
           }
         } else {
@@ -248,6 +253,7 @@
             this.isOpendMessage()
             this.$message.info('感谢您的宝贵意见')
             this.messageBoard = {}
+            this.dialogImageUrl = ['', '', '', '', '']
           }
         }
       }

components/product/ComponentGoods.vue

@@ -46,9 +46,9 @@
           <div class="from" v-if="compGoods.reserve > 0">
             起拍：<span>{{compGoods.minBuyQty}}</span>
           </div>
-          <div class="multiple" v-if="compGoods.reserve > 0">
+          <!--<div class="multiple" v-if="compGoods.reserve > 0">
             倍数：<span>{{compGoods.minPackQty}}</span>
-          </div>
+          </div>-->
         </td>
         <td>
           <div v-if="!compGoods.prices">

components/search/GoodList.vue

@@ -83,9 +83,9 @@
               <div class="from" v-if="item.reserve > 0">
                 起拍：<span v-text="item.minBuyQty"></span>
               </div>
-              <div class="multiple" v-if="item.reserve > 0">
+             <!-- <div class="multiple" v-if="item.reserve > 0">
                 倍数：<span v-text="item.minPackQty"></span>
-              </div>
+              </div>-->
             </td>
             <td>
               <div v-show="!item.prices">

components/store/CommodityList.vue

@@ -63,9 +63,9 @@
               <div class="from">
                 起拍：<span v-text="commodity.minBuyQty">300</span>
               </div>
-              <div class="multiple">
+              <!--<div class="multiple">
                 倍数：<span>1</span>
-              </div>
+              </div>-->
             </td>
             <td>
               <div v-for="price in commodity.prices" v-text="price.start + '+'"></div>

nuxt.config.js

@@ -106,5 +106,5 @@ module.exports = {
     ssr: false
   }],
   /* TODO 暂时代理到商城测试版，之后再做出调整 */
-  proxyTable: ['/api/**', '/search/**', '/user/**', '/login/**', '/register/**', '/logout/**', '/static/**', '/vendor**', '/user**', '/trade/**', '/recommendation/**', '/store-service/**', '/basic/**', '/logout**', '/operation/**', '/help**', '/product**', '/store**', '/order/proxy**', '/report/**', '/store/**#/**', '/kdn/**', '/product/**Submit', '/admin**', '/product/**Submit/**', '/release**']
+  proxyTable: ['/api/**', '/search/**', '/user/**', '/login/**', '/register/**', '/logout/**', '/static/**', '/vendor**', '/user**', '/trade/**', '/recommendation/**', '/store-service/**', '/basic/**', '/logout**', '/operation/**', '/help**', '/product**', '/store**', '/order/proxy**', '/report/**', '/store/**#/**', '/kdn/**', '/product/**Submit', '/admin**', '/product/**Submit/**', '/release**', '/auth/store/**']
 }

pages/provider/list.vue

@@ -12,7 +12,7 @@ export default {
   layout: 'main',
   fetch ({ store }) {
     return Promise.all([
-      store.dispatch('provider/loadRecommendStores'),
+      store.dispatch('provider/loadRecommendStores', { types: 'AGENCY-DISTRIBUTION', num: 5 }),
       store.dispatch('provider/findStoreList', { page: 1, count: 10, types: 'AGENCY-DISTRIBUTION' })
     ])
   },