云仓3.1.4提测

src/api/module/goodsgement.js

@@ -80,3 +80,11 @@ export function saveHotEditGoodsData(data) {
     data: data
   })
 }
+//商品导出
+export function exportExcel(data) {
+    return request({
+      url: '/system/goodsNew/excel',
+      method: 'post',
+      data: data
+    })
+  }

src/views/system/shop/brand.vue

@@ -49,7 +49,7 @@
         <el-table-column label="品牌名称" prop="brand_cn" align="center"></el-table-column>
         <el-table-column label="品牌经营类型" prop="brand_type" align="center">
           <template slot-scope="scope">
-            {{ scope.row.brand_type === 1 ? '自有品牌' : '品牌厂商授权' }}
+            {{ scope.row.brand_type === 1 ? '自有品牌' : '授权品牌' }}
           </template>
         </el-table-column>
         <el-table-column label="品牌商标注册号" prop="brand_number" align="center"></el-table-column>
@@ -101,7 +101,7 @@
             <el-form-item label="经营品牌类型：" prop="brand_type">
               <el-radio-group v-model="brandForm.brand_type" @change="chooseBrandType">
                 <el-radio :label="1">自有品牌</el-radio>
-                <el-radio :label="2">品牌厂商授权</el-radio>
+                <el-radio :label="2">授权品牌</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -177,8 +177,8 @@
                     action="#"
                     list-type="picture-card"
                     :http-request="uploadCertImgs"
-                    :limit="1"
-                    :on-exceed="limit1"
+                    :limit="5"
+                    :on-exceed="limitImg"
                     :before-upload="UpImgSizeTwoMb"
                     :on-preview="handlePreviewCert"
                     :on-remove="handleRemoveCert"
@@ -196,7 +196,7 @@
               </span>
                 </div>
                 <div style="width:380px;line-height: 24px;padding-top: 6px;">
-                  <span class="tips-text">图片大小在500KB以内，支持png/jpg，限一张，请确保图片清晰</span>
+                  <span class="tips-text">图片大小在500KB以内，支持png/jpg，限五张，请确保图片清晰</span>
                 </div>
               </div>
             </el-form-item>
@@ -251,8 +251,9 @@
                   <el-upload
                     class="uploadData"
                     action="#"
-                    :limit="1"
+                    :limit="5"
                     list-type="picture-card"
+                    :on-exceed="limitImg"
                     :http-request="uploadFactoryImgs"
                     :before-upload="UpImgSizeTwoMb"
                     :on-preview="handlePreviewFactory"
@@ -271,7 +272,7 @@
               </span>
                 </div>
                 <div style="width:380px;line-height: 24px;padding-top: 6px;">
-                  <span class="tips-text">图片大小在500KB以内，支持png/jpg，限一张，请确保图片清晰</span>
+                  <span class="tips-text">图片大小在500KB以内，支持png/jpg，限五张，请确保图片清晰</span>
                 </div>
               </div>
               <p class="brand-auth-tips">上传完整授权链路，品牌方给予企业的授权书，如果是多级授权，请上传各级授权证书</p>
@@ -287,7 +288,8 @@
                   <el-upload
                     class="uploadData"
                     action="#"
-                    :limit="1"
+                    :limit="5"
+                    :on-exceed="limitImg"
                     :http-request="uploadShopImgs"
                     list-type="picture-card"
                     :before-upload="UpImgSizeTwoMb"
@@ -307,7 +309,7 @@
               </span>
                 </div>
                 <div style="width:380px;line-height: 24px;padding-top: 6px;">
-                  <span class="tips-text">图片大小在500KB以内，支持png/jpg，限一张，请确保图片清晰</span>
+                  <span class="tips-text">图片大小在500KB以内，支持png/jpg，限五张，请确保图片清晰</span>
                 </div>
               </div>
             </el-form-item>
@@ -404,7 +406,7 @@
         brandTypeOptions: [
           {label: "全部品牌", value: '-1'},
           {label: "自有品牌", value: '1'},
-          {label: "品牌厂商授权", value: '2'},
+          {label: "授权品牌", value: '2'},
         ],
         statusOptions: [
           {label: '未审核', value: '0'},
@@ -828,6 +830,9 @@
       limit1() {
         this.$message({message: '最多上传1张图片', type: 'warning'});
       },
+      limitImg() {
+        this.$message({message: '最多上传5张图片', type: 'warning'});
+      },
       /** 时间格式化 */
       timeFormatter(timeVal) {
         return dateFormat(timeVal *1000, 'Y-m-d')