feature:金山云上传功能完成

server/controllers/enterprise.js

@@ -70,17 +70,6 @@ exports.getRecordInfo = async ctx => {
   ctx.body = request;
 };
 
-exports.onUpload = async ctx => {
-  const url = `${API_INTERNAL_URI}/merchant/lifeinner/upload`;
-  const opts = {
-    url,
-    method: "POST",
-    json: true,
-    body: ctx.request.body
-  };
-  ctx.body = await req(ctx, opts);
-};
-
 // 历史提交审核日志详情页
 exports.getLog = async ctx => {
   const url = `${API_INTERNAL_URI}/merchant/inner/get_log`;
@@ -107,7 +96,7 @@ exports.postAudit = async ctx => {
 
 // 商户上传营业执照信息
 exports.postBusiness = async ctx => {
-  const url = `${API_INTERNAL_URI}/merchant/enterprise/business`;
+  const url = `${API_INTERNAL_URI}/merchant/inner/op_business_commit`;
   const opts = {
     url,
     method: "POST",

server/router.js

@@ -33,7 +33,6 @@ router.post(`${API_VERSION}/get_log`, enterprise.getLog);
 router.post(`${API_VERSION}/audit`, enterprise.postAudit);
 router.post(`${API_VERSION}/business`, enterprise.postBusiness)
 router.post(`${API_VERSION}/op_commit`, enterprise.opCommit);
-router.post(`${API_VERSION}/upload`, enterprise.onUpload);
 
 router.get(`${API_VERSION}/image/get_image_id`, image.get_obj_id)
 router.get(`${API_VERSION}/image/get_bucket`, image.get_bucket)

src/pages/Enterprise/Certification/index.vue

@@ -160,9 +160,9 @@
               :disabled="!permission.get('audit')"
               @click="goAuditPage('AUDIT', scope.row.enterprise_auth_record_id)"
             >审核</el-button>
-            <!-- || scope.row.audit_status !== 30 ? true : false -->
+
             <el-button
-              :disabled="!permission.get('edit') "
+              :disabled="!permission.get('edit') || scope.row.audit_status !== 30 ? true : false"
               size="mini"
               type="success"
               @click="goAuditPage('EDIT', scope.row.enterprise_auth_record_id)"
@@ -344,7 +344,7 @@ export default {
         };
         const res = await checkCode(parasm);
         console.log(res);
-        // if (res.code !== 0) return this.$message.error(res.reason);
+        if (res.code !== 0) return this.$message.error(res.reason);
         this.$message.success("验证码校验成功!");
         this.$router.push({
           name: "Audit",

src/pages/Enterprise/components/enterpriseForm.vue

@@ -33,19 +33,18 @@
         prop="businessLicense"
       >
         <el-image
-          v-if="establishForm.entterprise_image"
+          v-if="establishForm.entterpriseImage"
           style="width:100px;height:100px;border-radius:10px"
-          :src="establishForm.entterprise_image"
+          :src="establishForm.entterpriseImage"
           fit="cover"
         ></el-image>
         <el-upload
           :show-file-list="false"
-          action="http://bp-dev.ini.yidian-inc.com/merchant/lifeinner/upload"
+          :action="domainName"
           :limit="1"
           :accept="'image/*'"
           auto-upload
-          :on-success="handleSuccess"
-          :on-error="handleError"
+          :on-success="handleEnterpriseSuccess"
         >
           <el-button
             size="small"
@@ -67,6 +66,13 @@
       >
         <el-input v-model.trim="establishForm.code"></el-input>
       </el-form-item>
+      <!-- 企业代码 -->
+      <el-form-item
+        label="用户手机号："
+        prop="userMobile"
+      >
+        <el-input v-model.trim="establishForm.userMobile"></el-input>
+      </el-form-item>
       <!-- 数据来源 -->
       <el-form-item
         label="数据来源："
@@ -98,20 +104,18 @@
         prop="front_img"
       >
         <el-image
-          v-if="establishForm.front_img"
+          v-if="establishForm.frontImg"
           style="width:100px;height:100px;border-radius:10px"
-          :src="establishForm.front_img"
+          :src="establishForm.frontImg"
           fit="cover"
         ></el-image>
         <el-upload
-          action=""
-          multiple
-          show-file-list
+          :show-file-list="false"
+          :action="domainName"
           :limit="1"
-          :auto-upload="false"
-          :file-list="establishForm.idcardFontPhoto"
-          :on-change="onIdPhoneFontChange"
-          :on-remove="onIdPhoneRemove"
+          :accept="'image/*'"
+          auto-upload
+          :on-success="handleFontSuccess"
         >
           <el-button
             size="small"
@@ -125,20 +129,18 @@
         prop="bak_img"
       >
         <el-image
-          v-if="establishForm.bak_img"
+          v-if="establishForm.bakImg"
           style="width:100px;height:100px;border-radius:10px"
-          :src="establishForm.bak_img"
+          :src="establishForm.bakImg"
           fit="cover"
         ></el-image>
         <el-upload
-          action=""
-          multiple
-          show-file-list
+          :show-file-list="false"
+          :action="domainName"
           :limit="1"
-          :auto-upload="false"
-          :file-list="establishForm.idcardBackPhoto"
-          :on-change="onIdPhoneBackChange"
-          :on-remove="onIdPhoneRemove"
+          :accept="'image/*'"
+          auto-upload
+          :on-success="handleBackSuccess"
         >
           <el-button
             size="small"
@@ -248,20 +250,36 @@ export default {
         callback();
       }
     };
-    // 手机号校验规则
+    // 法人手机号校验规则
     const mobileRules = (rule, value, callback) => {
       const phoneReg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
       const { mobile } = this.establishForm;
       if (mobile.length === 0) {
-        callback(new Error("手机号码不可为空"));
+        callback(new Error("法人手机号不可为空!"));
       } else if (!phoneReg.test(mobile)) {
-        callback(new Error("手机号格式不正确"));
+        callback(new Error("法人手机号格式不正确!"));
+      }
+      callback();
+    };
+    // 用户手机号
+    const userMobileRules = (rule, value, callback) => {
+      const phoneReg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      const { userMobile } = this.establishForm;
+      if (userMobile.length === 0) {
+        callback(new Error("用户手机号不可为空!"));
+      } else if (!phoneReg.test(userMobile)) {
+        callback(new Error("用户手机号格式不正确!"));
       }
-      // if (!phoneReg.test(legal_mobile)) {
-      //   callback(new Error("手机号格式不正确"));
-      // }
       callback();
     };
+    // 区分测试或正常环境域名
+    const API_INTERNAL_URI = {
+      development: "http://bp-dev.ini.yidian-inc.com",
+      test: "http://bp-test.ini.yidian-inc.com",
+      production: "http://bp-test.go2yd.com"
+    };
+    const env = process.env.NODE_ENV || "development";
+    const API_INTERNAL_URL = API_INTERNAL_URI[env];
     return {
       // 表单输入项
       establishForm: {
@@ -275,13 +293,11 @@ export default {
         bak_img: "", // 身份证反面照的尖山云objeid(!)
         idcard_number: "", // 身份证号(!)
         userName: "", // 用户姓名(!)
-        mobile: null, // 用户手机号
-        data_type: null // 企业类型(!)
+        mobile: null, // 法人手机号
+        data_type: null, // 企业类型(!)
+        userMobile: null // 用户手机号
       },
 
-      // 表单回显信息
-      callbackForm: null,
-
       // 表单校验规则
       establishRules: {
         // 营业执照
@@ -320,10 +336,15 @@ export default {
           { required: true, message: "请填写经营者(法人姓名)", trigger: "blur" }
         ],
         // 法人手机号
-        mobile: [{ required: true, validator: mobileRules, trigger: "blur" }]
-        /* // 法人手机号
-        legal_mobile: [{ required: true, validator: mobileRules, trigger: "blur" }] */
-      }
+        mobile: [{ required: true, validator: mobileRules, trigger: "blur" }],
+        // 用户手机号
+        userMobile: [
+          { required: true, validator: userMobileRules, trigger: "blur" }
+        ]
+      },
+
+      // 域名选择
+      domainName: `${API_INTERNAL_URL}/merchant/lifeinner/upload`
     };
   },
 
@@ -346,33 +367,31 @@ export default {
       this.establishForm.idcard_number = val.legal_id_card;
       this.establishForm.userName = val.legal_person;
       this.establishForm.mobile = val.mobile;
+      this.establishForm.user_id = val.user_id;
+      this.establishForm.sensitiveWord = val.sensitiveWord;
     }
   },
 
   methods: {
     // 上传营业执照时
-    handleSuccess (res) {
+    handleEnterpriseSuccess (res) {
       if (res.code !== 0) return this.$message.error(res.reason);
-      this.establishForm.entterprise_image = `http://${res.result.file_url}`
-    },
-    handleError (error, file, fileList) {
-      console.log("error", error);
-      console.log("file", file);
-      console.log("fileList", fileList);
+      this.establishForm.entterpriseImage = `http://${res.result.file_url}`;
+      this.establishForm.entterprise_image = res.result.object_id;
     },
 
-    // 身份证正面照片更改时
-    onIdPhoneFontChange (file, fileList) {
-      this.establishForm.idcardFontPhoto = fileList;
-    },
-    // 身份证照片反面更改时
-    onIdPhoneBackChange (file, fileList) {
-      this.establishForm.idcardBackPhoto = fileList;
+    // 上传身份证前面
+    handleFontSuccess (res) {
+      if (res.code !== 0) return this.$message.error(res.reason);
+      this.establishForm.frontImg = `http://${res.result.file_url}`;
+      this.establishForm.front_img = res.result.object_id;
     },
 
-    // 删除上传的身份证照片
-    onIdPhoneRemove (file, fileList) {
-      this.establishForm.idcardFontPhoto = fileList;
+    // 上传身份证后面
+    handleBackSuccess (res) {
+      if (res.code !== 0) return this.$message.error(res.reason);
+      this.establishForm.bakImg = `http://${res.result.file_url}`;
+      this.establishForm.bak_img = res.result.object_id;
     },
 
     // 取消创建表单
@@ -382,6 +401,8 @@ export default {
 
     // 提交表单
     async handelSubmit () {
+      if (this.enterpriseId && !this.establishForm.sensitiveWord)
+        return this.$message.error("您无权限修改信息!!!");
       // 企业信息提交参数
       const {
         code,
@@ -393,18 +414,34 @@ export default {
         bak_img,
         idcard_number,
         userName,
-        mobile
+        mobile,
+        userMobile,
+        user_id
       } = this.establishForm;
+
+
+      /**
+       * 第一步 企业信息提交
+       * @param enterpriseQuery
+       */
+      // 1.设置提交参数
       const enterpriseQuery = {
         code,
         name,
         entterprise_image,
         data_from,
-        data_type
+        data_type,
+        mobile: parseInt(userMobile)
       };
+      const res = await postBusiness(enterpriseQuery);
+      if (res.code !== 0) return this.$message.error(res.reason);
+      this.establishForm.enterprise_id = res.result.enterprise_auth_record_id
+      /**
+       * 第二步 法人(经营者信息提交)
+       */
       // 法人信息提交参数
       const legalQuery = {
-        record_id: this.enterpriseId ? this.enterpriseId : "",
+        record_id: this.enterpriseId ? this.enterpriseId : this.establishForm.enterprise_id,
         front_img,
         bak_img,
         front_completeness: 0,
@@ -413,13 +450,9 @@ export default {
         name: userName,
         mobile,
         data_type,
-        user_id: parseInt(this.$store.state.userInfo.userid)
+        user_id: parseInt(user_id)
       };
-      const res = await postBusiness(enterpriseQuery);
       const result = await opCommit(legalQuery);
-      console.log("res", res);
-      console.log("result", result);
-      if (res.code !== 0) return this.$message.error(res.reason);
       if (result.code !== 0) return this.$message.error(result.reason);
       if (!this.enterpriseId) {
         this.$message.success("企业信息代提交成功!");

src/service/enterprise.js

@@ -58,7 +58,7 @@ export async function postAudit (params) {
 }
 
 /**
- * 商户上传营业执照信息
+ * 414-1商户营业执照代提交(op后台)
  * @param query 上传执照参数信息
  */
 export async function postBusiness (query) {
@@ -67,7 +67,7 @@ export async function postBusiness (query) {
 }
 
 /**
- * 提交法人信息
+ * 414-2商户信息代提交(op后台)
  * @param params 法人信息
  */
 export async function opCommit (params) {
@@ -75,7 +75,3 @@ export async function opCommit (params) {
   return res;
 }
 
-export async function onUpload (params) {
-  const res = await axios.post(`/api/v1/upload`, params);
-  return res;
-}