1

1

src/views/businessManager/shopManager/shopList.vue

@@ -29,10 +29,13 @@
                  :on-success="handleSuccess">
         <el-button class="btn-primary">商品导出</el-button>
       </el-upload> -->
+      <el-button v-permission="'export/goods'" class="btn-primary" @click="exportShopList">商品导出</el-button>
       <el-button class="btn-primary"
+
                  @click="onDownload"
                  v-permission="'import/downloadTemplate'">下载模板</el-button>
       <el-button class="btn-primary"
+
                  permission="'goods/update'"
                  @click="onShopComAdd">添加组合商品</el-button>
       <!-- 搜索类型 -->
@@ -989,6 +992,14 @@ export default {
         fileName: '商品导入模板.xlsx'
       })
     },
+    exportShopList(){
+         Export(this, {
+        url: "/api-web/export/goods",
+        params: cleanDeep(this.searchForm) ,
+        fileName: '商品导出.xlsx',
+        method:'post'
+      }, '确定导出商品')
+    },
     onFormClose (formName) {
       // 关闭弹窗重置验证
       this.$refs[formName].resetFields();

src/views/categroyManager/insideSetting/addressManager.vue

@@ -233,6 +233,9 @@
                         :key="index"
                         :position="marker"></el-amap-marker>
       </el-amap>
+            <el-button @click="mapStatus=false">取 消</el-button>
+        <!-- <el-button type="primary"
+                   @click="setAddr('ruleForm')">确 定</el-button> -->
     </el-dialog>
   </div>
 </template>