Merge branch 'dev' of https://git.yidian-inc.com:8021/bp/op-web-service into pyq_goods

src/pages/Enterprise/components/enterpriseForm.vue

@@ -259,7 +259,7 @@ export default {
         name: null, // 企业名称(!)
         entterprise_image_url: null, // 金山云图片地址(!)
         /* *********身份认证信息********* */
-        record_id: null, // 企业认证id
+        enterprise_auth_record_id: null, // 企业认证id
         front_img: "", // 身份证正面照的金山云objectid(!)
         bak_img: "", // 身份证反面照的尖山云objeid(!)
         idcard_number: "", // 身份证号(!)
@@ -406,7 +406,7 @@ export default {
             };
             postBusiness(enterpriseQuery).then(res => {
               if (res.code !== 0) return this.$message.error(res.reason);
-              this.establishForm.enterprise_id =
+              this.establishForm.enterprise_auth_record_id =
                 res.result.enterprise_auth_record_id;
               // 提交法人信息
               this.uploadLegal();

src/pages/Goods/Detail/index.vue

@@ -627,7 +627,7 @@ import {
   checkGoodsName,
   getShopsList,
   postAddShop,
-  // editGoods
+  editGoods
 } from "@/service/Goods/goods";
 
 import { GOODS_URI } from "../../../../server/config.js";
@@ -1276,12 +1276,12 @@ export default {
 
       console.log(query);
 
-      // const res = await editGoods(query);
-      // if (res.code !== 0) {
-      //   return this.$message.error(res.reason);
-      // }
-      // this.$message.success("商品编辑成功!");
-      // this.$router.replace({ name: "GoodsList" });
+      const res = await editGoods(query);
+      if (res.code !== 0) {
+        return this.$message.error(res.reason);
+      }
+      this.$message.success("商品编辑成功!");
+      this.$router.replace({ name: "GoodsList" });
     }
   }
 };