From aea2bcd259ee0c2f97b39bfe413388dc1945893b Mon Sep 17 00:00:00 2001
From: mixtan <424491071@qq.com>
Date: Thu, 15 May 2025 18:55:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0myui=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9B=BE=E6=A0=87?=
=?UTF-8?q?=E9=A2=98=E5=92=8C=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E6=B3=A8?=
=?UTF-8?q?=E9=87=8A=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=BA=97=E9=93=BA=E5=9C=B0?=
=?UTF-8?q?=E5=9B=BE=E7=9C=81=E5=B8=82=E5=8C=BA=E6=96=87=E6=A1=88UI?=
=?UTF-8?q?=E4=BA=A4=E4=BA=92=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BA=97=E9=93=BA?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=B5=84=E6=96=99=E6=B5=81=E7=A8=8B=EF=BC=8C?=
=?UTF-8?q?=E4=BC=98=E5=8C=96=E8=90=A5=E4=B8=9A=E4=BF=A1=E6=81=AF=E8=B5=84?=
=?UTF-8?q?=E6=96=99=E6=B5=81=E7=A8=8B=EF=BC=8C=E4=BC=98=E5=8C=96=E8=B5=84?=
=?UTF-8?q?=E9=87=91=E7=BB=93=E7=AE=97=E4=BF=A1=E6=81=AF=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=EF=BC=8C=E7=BB=9F=E4=B8=80=E6=B7=BB=E5=8A=A0=E4=B8=8A=E4=B8=80?=
=?UTF-8?q?=E6=AD=A5=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
java-mall-app-shop-admin/main.js | 1 +
java-mall-app-shop-admin/pages.json | 20 +-
.../pages/audit/mapAddress.vue | 12 +-
.../pages/audit/shop1.vue | 23 +-
.../pages/audit/shop2.vue | 354 +++++++++---------
.../pages/audit/shop3.vue | 28 +-
java-mall-app-shop-admin/styles/myui.scss | 10 +
7 files changed, 214 insertions(+), 234 deletions(-)
create mode 100644 java-mall-app-shop-admin/styles/myui.scss
diff --git a/java-mall-app-shop-admin/main.js b/java-mall-app-shop-admin/main.js
index d35b642..783b7c0 100644
--- a/java-mall-app-shop-admin/main.js
+++ b/java-mall-app-shop-admin/main.js
@@ -6,6 +6,7 @@ import './uni.promisify.adaptor'
import tui from './utils/httpRequest'
import Socket from './utils/socket.js'
import "@/static/reset.css"
+import "@/styles/myui.scss"
// import Utils from './utils/http'
// import "@/static/font/iconfont.css"
diff --git a/java-mall-app-shop-admin/pages.json b/java-mall-app-shop-admin/pages.json
index 8fd03a3..769a758 100644
--- a/java-mall-app-shop-admin/pages.json
+++ b/java-mall-app-shop-admin/pages.json
@@ -45,7 +45,7 @@
{
"path": "pages/audit/mapAddress",
"style": {
- "navigationBarTitleText": "选择地图地址"
+ "navigationBarTitleText": "填写地区信息"
}
},
{
@@ -188,13 +188,6 @@
"fontSize":"14px",
"height": "58px",
"spacing":"5px",
- // "midButton":{
- // "text":"视图中心",
- // "height": "80px",
- // "width": "60px",
- // "iconPath": "/static/shituzhongxin.png",
- // "iconWidth": "40px"
- // },
"list": [
{
"pagePath": "pages/order/order",
@@ -229,17 +222,6 @@
},
"text": "视图中心"
},
- // {
- // "pagePath": "pages/manage/manage",
- // "iconfont": {
- // "text": "\ue606",
- // "selectedText": "\ue606",
- // "selectedColor": "#4b71ff",
- // "color":"#000",
- // "fontSize":"24px"
- // },
- // "text": "经营"
- // },
{
"pagePath": "pages/my/my",
"iconfont": {
diff --git a/java-mall-app-shop-admin/pages/audit/mapAddress.vue b/java-mall-app-shop-admin/pages/audit/mapAddress.vue
index f0e9685..770e0ac 100644
--- a/java-mall-app-shop-admin/pages/audit/mapAddress.vue
+++ b/java-mall-app-shop-admin/pages/audit/mapAddress.vue
@@ -2,7 +2,7 @@
-
+
请单击选择下面地址单击地址确定
退出登录
@@ -51,7 +51,7 @@
/>
+
- 下一步
+ 检查并确认店铺信息无误
+
+
@@ -329,11 +332,9 @@ export default {
}
.form {
- padding: 0 36rpx;
+ padding: 0 24rpx 0 30rpx;
background: #fff;
border-top: 1px solid #f2f2f2;
- .u-form-item__body__right {
- }
/deep/.shop1-from-item {
.u-form-item__body__right {
@@ -375,15 +376,7 @@ export default {
}
.btn-content {
- bottom: 40rpx;
- width: 94%;
- padding: 48rpx 24rpx;
- }
-
- .btn-next {
- border-radius: 24rpx;
- background: #4b71ff;
- color: #fff;
+ padding: 30rpx 48rpx 88rpx;
}
.btn-login-out {
diff --git a/java-mall-app-shop-admin/pages/audit/shop2.vue b/java-mall-app-shop-admin/pages/audit/shop2.vue
index 42e5b06..2892755 100644
--- a/java-mall-app-shop-admin/pages/audit/shop2.vue
+++ b/java-mall-app-shop-admin/pages/audit/shop2.vue
@@ -1,10 +1,6 @@
-
+
退出登录
@@ -18,27 +14,89 @@
>
-
- 营业执照 （必传项）
-
-
+ 营业执照信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- 法人身份证正反面（{{ fileList3.length + fileList4.length }} /2）
- （必传项）
-
+ 法人信息
+
+
+
+
+
-
-
- 许可证(最大上传{{ fileList2.length }}/5)
-
-
- （可传项）
-
-
-
+
-
- 法人身份证正反面（{{ fileList5.length + fileList6.length }} /2）（必传项）
-
+ 个人信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
- 下一步
+ 检查并确认营业证件信息无误
+
+
+
+
import { mapActions } from "vuex";
-import {
- UploadFilePromise,
- batchNoApi,
- imgOcrResultApi,
-} from "../../api/upload";
+import { UploadFilePromise, batchNoApi, imgOcrResultApi } from "../../api/upload";
const orcImgTypeConf = {
FR_ID_CARD_FRONT: "FR_ID_CARD_FRONT",
@@ -288,15 +264,16 @@ export default {
showPicker: false,
list: [
{
- name: "企业",
+ name: "企业类型",
},
{
- name: "个人",
+ name: "个人类型",
},
],
form: {
+ license_type: 1, // 所属行业
license_image: "", // 许可证路径
- biz_license_number: "", //营业执照编号
+ biz_license_number: "", //注册号
biz_license_company: "", // 公司真实名字
biz_license_image: "", // 营业执照路径
legal_person_name: "", //法人姓名
@@ -304,12 +281,15 @@ export default {
legal_person_id_number: "", //法人身份证号
legal_person_id_images: "", //身份证图片正面路径
legal_person_id_images2: "", // 身份证图片反面路径
+ businessLicenseFiles: [],
+ specialLicenseFiles: [],
},
form2: {
individual_id_number: "",
individual_id_images: "",
individual_id_images2: "",
},
+ license_type_name: "",
action: "",
fileList: [],
fileList2: [],
@@ -321,28 +301,28 @@ export default {
[
{
id: 1,
- name: "许可证",
+ name: "无需特殊资质",
},
{
id: 2,
- name: "特许证件",
+ name: "需许可证资质",
},
{
id: 3,
- name: "其他证件",
+ name: "需特许证件资质",
},
],
],
rules: {
entity_type: {
required: true,
- trigger: ["blur"],
+ trigger: ["change", "blur"],
message: "请选择您的许可证类型",
},
biz_license_company: {
required: true,
message: "请输入公司名称",
- trigger: ["blur"],
+ trigger: ["change", "blur"],
},
legal_person_name: {
required: true,
@@ -389,7 +369,7 @@ export default {
individual_id_number: [
{
required: true,
- message: "请输入身份证号",
+ message: "请输入个人身份证号",
trigger: ["change", "blur"],
},
{
@@ -407,8 +387,13 @@ export default {
};
},
onReady() {
- this.$refs["uForm"].setRules(this.rules);
- this.$refs["uForm2"].setRules(this.rules2);
+ this.$refs["uForm"]?.setRules(this.rules);
+ this.$refs["uForm2"]?.setRules(this.rules2);
+ },
+ mounted() {
+ this.license_type_name = this.columns?.[0].filter(
+ (item) => item.id == this.form.license_type
+ )?.[0].name;
},
methods: {
getOcrText(filePath, file, type) {
@@ -428,8 +413,7 @@ export default {
if (formDataStr !== "") {
formDataStr += "&";
}
- formDataStr +=
- encodeURIComponent(key) + "=" + encodeURIComponent(value);
+ formDataStr += encodeURIComponent(key) + "=" + encodeURIComponent(value);
});
const imgOcrRes = await imgOcrResultApi(formDataStr);
@@ -450,10 +434,11 @@ export default {
switch (type) {
case "businessLicense":
- this.fileList.push(group);
+ this.form.businessLicenseFiles.push(group);
break;
case "licenseNumber":
this.fileList2.push(group);
+ this.form.specialLicenseFiles.push(group);
break;
case "idFront":
this.fileList3.push(group);
@@ -500,36 +485,34 @@ export default {
switch (type) {
case "businessLicense":
- var ocr = await this.getOcrText(
- imgUrl,
- item,
- orcImgTypeConf.BUSINESS_LICENCE
- );
+ var ocr = await this.getOcrText(imgUrl, item, orcImgTypeConf.BUSINESS_LICENCE);
this.form.biz_license_company = ocr.bizLicenseCompanyName;
this.form.legal_person_name = ocr.bizLicenseOwnerName;
+ this.form.biz_license_number = ocr.bizLicenseCreditCode;
console.log("BUSINESS_LICENCE", ocr);
break;
case "licenseNumber":
break;
case "idFront":
- var ocr = await this.getOcrText(
- imgUrl,
- item,
- orcImgTypeConf.ID_CARD_FRONT
- );
+ var ocr = await this.getOcrText(imgUrl, item, orcImgTypeConf.ID_CARD_FRONT);
this.form.legal_person_name = ocr.name;
this.form.legal_person_id_number = ocr.idNumber;
console.log("ID_CARD_FRONT", ocr);
break;
+ case "personIdFront":
+ var ocr = await this.getOcrText(imgUrl, item, orcImgTypeConf.ID_CARD_FRONT);
+ this.form2.individual_id_number = ocr.idNumber;
+ console.log("personIdFront", ocr);
+ break;
}
},
deletePic(e, type) {
switch (type) {
case "businessLicense":
- this.fileList.splice(0, 1);
+ this.form.businessLicenseFiles.splice(0, 1);
break;
case "licenseNumber":
- this.fileList2.splice(e.index, 1);
+ this.form.specialLicenseFiles.splice(e.index, 1);
let arr = this.form.license_image.split(",");
arr.splice(e.index, 1);
this.form.license_image = arr.join(",");
@@ -550,8 +533,8 @@ export default {
},
handleSubsection(e) {
this.active = e;
- // this.fileList = [];
- // this.fileList2 = [];
+ // this.form.businessLicenseFiles = [];
+ // this.form.specialLicenseFiles = [];
// this.fileList3 = [];
// this.fileList4 = [];
// this.fileList5 = [];
@@ -612,7 +595,7 @@ export default {
auditItem.entity_type = this.active + 1;
// auditItem.license_type = this.licenseType.id;
- // auditItem.license_image = JSON.stringify(this.fileList2.join(","));
+ // auditItem.license_image = JSON.stringify(this.form.specialLicenseFiles.join(","));
uni.setStorageSync("auditItem", auditItem);
@@ -658,11 +641,18 @@ export default {
});
}
},
+
+ handlePrev() {
+ uni.navigateBack();
+ },
+
handleCancel() {
this.showPicker = false;
},
+
handleConfirm(e) {
- this.form.license_type = e.value[0].name;
+ this.form.license_type = e.value[0].id;
+ this.license_type_name = e.value[0].name;
this.licenseType = e.value[0];
this.showPicker = false;
@@ -674,9 +664,12 @@ export default {
};
-
\ No newline at end of file
+
diff --git a/java-mall-app-shop-admin/pages/audit/shop3.vue b/java-mall-app-shop-admin/pages/audit/shop3.vue
index 2e6af26..6609cb3 100644
--- a/java-mall-app-shop-admin/pages/audit/shop3.vue
+++ b/java-mall-app-shop-admin/pages/audit/shop3.vue
@@ -1,11 +1,13 @@
-
+
退出登录
-
+
+
+
@@ -55,6 +57,8 @@
>
+
+
- 提交审核
+ 检查并确认资金结算信息无误
+
+
@@ -208,6 +214,10 @@ export default {
this.firstBranchBankLoad = true;
},
+ handlePrev() {
+ uni.navigateBack()
+ },
+
async handleSubmit() {
let valid = this.$refs.uForm.validate().then((valid) => {
return valid;
@@ -310,8 +320,6 @@ export default {