Merge branch 'dev-market-20200813' of...

Merge branch 'dev-market-20200813' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-market-20200813

src/views/goods/goods-manage.vue

@@ -87,7 +87,7 @@
               <!-- <el-button @click="shelfOpt(scope.row,3)" type="text" size="small">删除</el-button> -->
             </div>
             <div v-if="scope.row.goodsStatus == 1">
-
+              <el-button @click="edit(scope.row)" type="text" size="small">编辑</el-button>
               <el-button @click="shelfOpt(scope.row,1)" type="text" size="small">下架</el-button>
 
             </div>