diff --git a/java-mall-app-shop-admin/App.vue b/java-mall-app-shop-admin/App.vue
index 188211e..fb1b355 100644
--- a/java-mall-app-shop-admin/App.vue
+++ b/java-mall-app-shop-admin/App.vue
@@ -205,11 +205,11 @@ export default {
@import "@/static/font/iconfont.css";
-/deep/.uni-tabbar-bottom {
+::v-deep.uni-tabbar-bottom {
display: none;
}
-/deep/.uni-navbar {
+::v-deep.uni-navbar {
min-height: 110rpx;
}
diff --git a/java-mall-app-shop-admin/api/audit.js b/java-mall-app-shop-admin/api/audit.js
index 2bc54ab..4e1db99 100644
--- a/java-mall-app-shop-admin/api/audit.js
+++ b/java-mall-app-shop-admin/api/audit.js
@@ -83,7 +83,7 @@ export function GetBaiduSuggestion(params = {}) {
* @param { "mobile": "13128997057" }
* @returns { approval_invalid_col:[] ,approval_status":4, approval_remark:'', id:'' }
* approval_invalid_col 重新审核 映射需要用到 由B段admin 传过来
- * approval_status 1-已通过;2-未通过;3-待审核;4 -未申请
+ * approval_status 1-已通过;2-未通过;3-待审核;4 -未申请 ;5 提交到拉卡拉 ; 21 拉卡拉审核失败
* approval_remark 驳回备注
* @see https://mall.gpxscs.cn/mobile/shop/merch/fresh/approval/status
*/
diff --git a/java-mall-app-shop-admin/components/t-chat-bar/t-chat-bar.vue b/java-mall-app-shop-admin/components/t-chat-bar/t-chat-bar.vue
index 7b8273a..c961474 100644
--- a/java-mall-app-shop-admin/components/t-chat-bar/t-chat-bar.vue
+++ b/java-mall-app-shop-admin/components/t-chat-bar/t-chat-bar.vue
@@ -837,7 +837,7 @@ export default {
}
.tui-chat-input {
- /deep/ {
+ ::v-deep {
.ql-editor {
min-height: 56rpx;
}
diff --git a/java-mall-app-shop-admin/components/tabbar/tabbar.vue b/java-mall-app-shop-admin/components/tabbar/tabbar.vue
index f2812b7..34a5283 100644
--- a/java-mall-app-shop-admin/components/tabbar/tabbar.vue
+++ b/java-mall-app-shop-admin/components/tabbar/tabbar.vue
@@ -186,7 +186,7 @@ export default {
font-weight: bold;
}
- /deep/.u-tabbar__content__item-wrapper {
+ ::v-deep.u-tabbar__content__item-wrapper {
height: 116rpx;
.u-tabbar-item__icon {
@@ -195,7 +195,7 @@ export default {
}
}
-/deep/.uni-tabbar-bottom {
+::v-deep.uni-tabbar-bottom {
display: none;
}
diff --git a/java-mall-app-shop-admin/pages/IM/IMmsgContent.vue b/java-mall-app-shop-admin/pages/IM/IMmsgContent.vue
index 1dadc98..0e131e0 100644
--- a/java-mall-app-shop-admin/pages/IM/IMmsgContent.vue
+++ b/java-mall-app-shop-admin/pages/IM/IMmsgContent.vue
@@ -1117,7 +1117,7 @@ export default {
/*chatbox*/
- .tui-chatbox /deep/ {
+ .tui-chatbox ::v-deep {
.chat-bubble-box {
display: flex;
align-items: center;
@@ -1250,7 +1250,7 @@ export default {
flex-direction: row-reverse;
}
- ._root /deep/ {
+ ._root ::v-deep {
.chat-bubble-box {
display: flex;
align-items: center;
diff --git a/java-mall-app-shop-admin/pages/audit/businessType.vue b/java-mall-app-shop-admin/pages/audit/businessType.vue
index e7e7980..8d514bf 100644
--- a/java-mall-app-shop-admin/pages/audit/businessType.vue
+++ b/java-mall-app-shop-admin/pages/audit/businessType.vue
@@ -7,7 +7,7 @@
> -->
主营品类
- 分割比例
+ 到账比例
@@ -869,12 +869,12 @@ export default {
break;
// 银行
case "bankcard_item":
- const currentBankFile = {
+ this.currentBankFile = {
file: fileImg,
path: imgUrl,
};
- this.setFromItemWithOcr(currentBankFile);
+ this.setFromItemWithOcr(this.currentBankFile);
break;
}
},
@@ -891,7 +891,7 @@ export default {
if (item.key == "bankcard_item") {
this.form.account_number = "";
- this.form.branch_name = "";
+ this.form.bank_name = "";
this.branchSearchText = "";
this.currentBank = {};
this.bankCardOcrLoaded = false;
@@ -899,7 +899,7 @@ export default {
if (this.auditInfo.entity_type == 2) {
this.auditInfo.approval_invalid_col.forEach((item) => {
if (
- ["account_holder_name", "account_number", "branch_name"].includes(
+ ["account_holder_name", "account_number", "bank_name"].includes(
item.key
)
) {
@@ -1061,6 +1061,9 @@ export default {
}, 2000);
});
},
+ async onBankOcrretryClick() {
+ this.setFromItemWithOcr(this.currentBankFile);
+ },
handleCancel() {
this.showPicker = false;
},
@@ -1127,6 +1130,7 @@ export default {
clearing_bank_code: clear_no,
};
this.form.branch_name = branch_bank_name;
+ this.form.bank_name = branch_bank_name;
this.showBankDialog = false;
},
onBranchDialogOpen() {
@@ -1149,7 +1153,7 @@ export default {
if (ocr && ocr.card_number) {
this.auditInfo.approval_invalid_col.forEach((item) => {
if (
- ["account_holder_name", "account_number", "branch_name"].includes(
+ ["account_holder_name", "account_number", "bank_name"].includes(
item.key
) &&
this.auditInfo.entity_type == 2
@@ -1361,7 +1365,7 @@ export default {
margin: 48rpx 0;
}
- /deep/.upload-1 {
+ ::v-deep.upload-1 {
.u-upload__button {
// background: url("../../static/shenhe-bg1.png");
background-image: url("../../static/shenhe-bg1.png");
@@ -1369,7 +1373,7 @@ export default {
}
}
- /deep/.upload-2 {
+ ::v-deep.upload-2 {
.u-upload__button {
// background: url("../../static/shenhe-bg1.png");
background-image: url("../../static/shenhe-bg2.png");
@@ -1377,7 +1381,7 @@ export default {
}
}
- /deep/.upload-3 {
+ ::v-deep.upload-3 {
.u-upload__button {
// background: url("../../static/shenhe-bg1.png");
background-image: url("../../static/business-license-bg.png");
@@ -1385,7 +1389,7 @@ export default {
}
}
- /deep/.upload-4 {
+ ::v-deep.upload-4 {
.u-upload__button {
// background: url("../../static/shenhe-bg1.png");
background-image: url("../../static/permit-bg.png");
@@ -1393,7 +1397,7 @@ export default {
}
}
- /deep/.upload-5 {
+ ::v-deep.upload-5 {
.u-upload__button {
// background: url("../../static/shenhe-bg1.png");
background-image: url("../../static/id-bg-1.png");
@@ -1401,7 +1405,7 @@ export default {
}
}
- /deep/.upload-6 {
+ ::v-deep.upload-6 {
.u-upload__button {
// background: url("../../static/shenhe-bg1.png");
background-image: url("../../static/id-bg-2.png");
@@ -1419,7 +1423,7 @@ export default {
margin: 24rpx;
background: rgba(238, 238, 238, 0.5);
border-radius: 100rpx;
- /deep/ .input-placeholder {
+ ::v-deep .input-placeholder {
color: #666 !important;
}
}
diff --git a/java-mall-app-shop-admin/pages/audit/contractSigning.vue b/java-mall-app-shop-admin/pages/audit/contractSigning.vue
index 188044e..8dd403b 100644
--- a/java-mall-app-shop-admin/pages/audit/contractSigning.vue
+++ b/java-mall-app-shop-admin/pages/audit/contractSigning.vue
@@ -17,6 +17,7 @@ export default {
time: null,
};
},
+
onLoad(options) {
if (options) {
clearTimeout(this.time);
diff --git a/java-mall-app-shop-admin/pages/audit/formConfig.js b/java-mall-app-shop-admin/pages/audit/formConfig.js
index 14f264e..ca46714 100644
--- a/java-mall-app-shop-admin/pages/audit/formConfig.js
+++ b/java-mall-app-shop-admin/pages/audit/formConfig.js
@@ -245,12 +245,7 @@ const formConfig = [
uploadIconColor: "#fe4119",
uploadText: "点击上传银行卡正面",
},
- {
- key: "account_holder_name",
- label: "开户名称",
- placeholder: "请输入开户名称",
- show: false,
- },
+
{
key: "account_number",
label: "银行卡号",
diff --git a/java-mall-app-shop-admin/pages/audit/shop1.vue b/java-mall-app-shop-admin/pages/audit/shop1.vue
index e64e63c..b5f3f8b 100644
--- a/java-mall-app-shop-admin/pages/audit/shop1.vue
+++ b/java-mall-app-shop-admin/pages/audit/shop1.vue
@@ -373,7 +373,7 @@ export default {
background: #fff;
border-top: 1px solid #f2f2f2;
- /deep/.shop1-from-item {
+ ::v-deep.shop1-from-item {
.u-form-item__body__right {
.uni-input-wrapper {
font-size: 24rpx;
@@ -381,7 +381,7 @@ export default {
}
}
- /deep/.shop1-upload {
+ ::v-deep.shop1-upload {
.u-upload__button {
// background: url("../../static/shenhe-bg1.png");
background-image: url("../../static/shenhe-bg1.png");
@@ -389,21 +389,21 @@ export default {
}
}
- /deep/.shop1-upload-item {
+ ::v-deep.shop1-upload-item {
.u-upload__wrap {
flex-direction: column !important;
flex-wrap: nowrap !important;
}
}
- /deep/.shop2-upload-item {
+ ::v-deep.shop2-upload-item {
.u-upload__wrap {
flex-direction: column !important;
flex-wrap: nowrap !important;
}
}
- /deep/.shop2-upload {
+ ::v-deep.shop2-upload {
.u-upload__button {
// background: url("../../static/shenhe-bg1.png");
background-image: url("../../static/shenhe-bg2.png");
diff --git a/java-mall-app-shop-admin/pages/audit/shop2.vue b/java-mall-app-shop-admin/pages/audit/shop2.vue
index d9028dd..4e7722d 100644
--- a/java-mall-app-shop-admin/pages/audit/shop2.vue
+++ b/java-mall-app-shop-admin/pages/audit/shop2.vue
@@ -1129,7 +1129,7 @@ page {
}
}
- /deep/.shop2-2-upload {
+ ::v-deep.shop2-2-upload {
.u-upload__button {
// background: url("../../static/shenhe-bg1.png");
// background: url("../../static/business-license-bg.png");
@@ -1137,7 +1137,7 @@ page {
}
}
- /deep/.shop2-3-upload {
+ ::v-deep.shop2-3-upload {
.u-upload__button {
// background: url("../../static/shenhe-bg1.png");
background-image: url("../../static/permit-bg.png");
@@ -1145,7 +1145,7 @@ page {
}
}
- /deep/.shop2-4-upload {
+ ::v-deep.shop2-4-upload {
.u-upload__button {
// background: url("../../static/shenhe-bg1.png");
background-image: url("../../static/id-bg-1.png");
@@ -1153,7 +1153,7 @@ page {
}
}
- /deep/.shop2-5-upload {
+ ::v-deep.shop2-5-upload {
.u-upload__button {
// background: url("../../static/shenhe-bg1.png");
background-image: url("../../static/id-bg-2.png");
diff --git a/java-mall-app-shop-admin/pages/audit/shop3.vue b/java-mall-app-shop-admin/pages/audit/shop3.vue
index ce82a7e..247d5cc 100644
--- a/java-mall-app-shop-admin/pages/audit/shop3.vue
+++ b/java-mall-app-shop-admin/pages/audit/shop3.vue
@@ -442,11 +442,11 @@ export default {