update 驳回审核页面

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;
 }
 </style>

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
  */

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;
     }

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;
 }
 </style>

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;

java-mall-app-shop-admin/pages/audit/businessType.vue

@@ -7,7 +7,7 @@
     ></u-subsection> -->
     <view class="title">
       <view class="">主营品类</view>
-      <view class="">分割比例</view>
+      <view class="">到账比例</view>
     </view>
 
     <scroll-view

java-mall-app-shop-admin/pages/audit/checkAudit.vue

@@ -58,7 +58,7 @@
       <view
         class=""
         v-if="
-          [3, 5].includes(auditInfo.approval_status) &&
+          [3].includes(auditInfo.approval_status) &&
           !auditInfo.lkl_ec_result_url
         "
       >
@@ -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;
     }
   }

java-mall-app-shop-admin/pages/audit/contractSigning.vue

@@ -17,6 +17,7 @@ export default {
       time: null,
     };
   },
+  
   onLoad(options) {
     if (options) {
       clearTimeout(this.time);

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: "银行卡号",

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");

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");

java-mall-app-shop-admin/pages/audit/shop3.vue

@@ -442,11 +442,11 @@ export default {
 
 <style lang="scss" scoped>
 @import "@/styles/variables.scss";
-/deep/ .u-form-item__body {
+::v-deep .u-form-item__body {
   padding: 0 0 20rpx;
 }
-/deep/ .u-upload__wrap__preview,
+::v-deep .u-upload__wrap__preview,
-/deep/ .u-upload__button {
+::v-deep .u-upload__button {
   margin: 0;
 }
 
@@ -464,7 +464,7 @@ export default {
     }
   }
 
-  /deep/ .u-popup__content__close {
+  ::v-deep .u-popup__content__close {
     top: -90rpx;
     right: auto;
     left: 50%;
@@ -483,7 +483,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;
     }
   }
@@ -550,7 +550,7 @@ export default {
     margin: auto;
     align-items: center;
   }
-  /deep/ .u-form-item__body__right {
+  ::v-deep .u-form-item__body__right {
     position: relative;
   }
   .retry_ocr {

java-mall-app-shop-admin/pages/login/launch.vue

@@ -123,7 +123,7 @@ export default {
   height: 100vh;
 }
 
-/deep/ .u-popup__content {
+::v-deep .u-popup__content {
   margin: 40rpx;
   width: 86%;
   border-radius: 24rpx;

java-mall-app-shop-admin/pages/my/printer/printerList.vue

@@ -539,12 +539,12 @@ export default {
         background: red;
       }
 
-      /deep/.printer-radio-item {
+      ::v-deep.printer-radio-item {
         margin-right: 20rpx;
       }
     }
 
-    /deep/.u-form-item__body__right__content__slot {
+    ::v-deep.u-form-item__body__right__content__slot {
       .u-radio-group {
         .printer-radio-item {
           margin-right: 56rpx;
@@ -552,7 +552,7 @@ export default {
       }
     }
 
-    /deep/.u-form-item__body__left {
+    ::v-deep.u-form-item__body__left {
       // min-width: 200rpx;
     }
   }
@@ -610,7 +610,7 @@ export default {
   }
 
   .u-printer-picker {
-    /deep/.u-transition {
+    ::v-deep.u-transition {
       z-index: 10075 !important;
     }
   }

java-mall-app-shop-admin/pages/my/shopInfo.vue

@@ -32,7 +32,7 @@
         />
       </u-form-item>
 
-      <u-form-item label="分账比例" prop="split_ratio">
+      <u-form-item label="到账比例" prop="split_ratio">
         <u-input
           class="form-input"
           disabled

java-mall-app-shop-admin/pages/order/order.vue

@@ -1234,7 +1234,7 @@ export default {
       }
 
       .steps-item-1 {
-        /deep/.u-text__value--tips {
+        ::v-deep.u-text__value--tips {
           margin: 40rpx 0;
         }
       }

java-mall-app-shop-admin/store/modules/user.js

@@ -194,10 +194,19 @@ const actions = {
         }
       }
 
-      let { approval_status, signed_status, store_status } = res.data;
+      let { 
+        approval_status, 
+        store_status , 
+        has_ec_signed,
+        has_apply_mer,
+        has_apply_split,
+        has_apply_receiver,
+        has_bind_receiver
+      } 
+      = res.data;
 
-      //2-未通过；3-待审核；4-未申请过；5-已提交审核；'
+      //2-未通过；3-待审核；4-未申请过；5-已提交审核; 21 拉卡拉审核未通过
-      if ([2, 3, 5].includes(approval_status)) {
+      if ([2, 3, 5, 21].includes(approval_status)) {
         uni.navigateTo({
           url: "/pages/audit/checkAudit",
         });
@@ -211,19 +220,76 @@ const actions = {
         return;
       }
 
-      // 合同签署状态：
+      // 1.
-      // -1：预备数据阶段；0-等待签署；1-已部分签署；
+      // 合同签署待办
-      // 2 - 已完成（所有签署方完成签署）3 - 已撤销（发起方撤销签署任务）
+      // 触发条件：approval_status=5 且 has_ec_signed=2 且 lkl_ec_result_url 非空
-      // 5 - 已过期（签署截止日到期后触发）7 - 已拒签（签署方拒绝签署）',
+      // 页面显示：
-      if (signed_status != 2) {
+      // 操作按钮：签署合同（跳转至拉卡拉签约页）
+      // 提示信息："您的入驻材料已通过审核，请于 24 小时内完成合同签署（超时需重新提交），以便继续完成入驻流程"
+
+      // 2.
+      // 合同签署结果
+      // 成功状态：approval_status=5 且 has_ec_signed=1 且 has_apply_mer=2
+      // 提示信息："合同签署完成，商家信息正在提交审核，请耐心等待"
+      // 失败状态：approval_status=21||2 且 has_ec_signed=2
+      // 操作按钮：联系管理员（IM）
+      // 提示信息："合同签署异常，请联系客服协助处理"
+
+      // 3.
+      // 商家进件审核结果
+      // 成功状态：approval_status=5 且 has_apply_mer=1 且 store_status=2
+      // 操作按钮：创建店铺
+      // 提示信息："商家资质审核通过，系统正在初始化店铺，请稍后操作"
+      // 失败状态：approval_status=21||2 且 has_apply_mer=2 且 has_ec_signed=1
+      // 操作按钮：联系管理员（IM）
+      // 提示信息："商家进件审核未通过，请联系客服获取详情"
+
+      // 4.
+      // 店铺创建结果
+      // 成功状态：approval_status=5 且 has_apply_mer=1 且 store_status=1 且 has_apply_split=2
+      // 提示信息："店铺创建成功，系统正在处理分账业务申请"
+      // 失败状态：approval_status=21/2 且 has_apply_mer=1 且 store_status=2
+      // 操作按钮：联系管理员（IM）
+      // 提示信息："店铺初始化失败，请联系客服处理"
+
+      // 5.
+      // 分账业务申请结果
+      // 成功状态：approval_status=5 且 store_status=1 且 has_apply_split=1 且 has_bind_receiver=2
+      // 提示信息："分账业务申请已通过，系统正在处理接收方绑定"
+      // 失败状态：approval_status=21||2 且 has_apply_split=2 且 store_status=1
+      // 操作按钮：联系管理员（IM）
+      // 提示信息："分账业务审核未通过，请联系客服获取详情"
+
+      // 6.
+      // 分账接收方绑定结果
+      // 成功状态：approval_status=1||5 且 has_apply_split=1 且 has_bind_receiver=1
+      // 提示信息："分账接收方绑定成功，入驻流程即将完成"
+      // 失败状态：approval_status=21||2 且 has_bind_receiver=2 且 has_apply_split=1
+      // 操作按钮：联系管理员（IM）
+      // 提示信息："分账接收方审核未通过，请联系客服处理"
+
+      // 7.
+      // 入驻完成
+      // 触发条件：approval_status=1 且 has_ec_signed=1 且 has_apply_mer=1 且 store_status=1 且 has_apply_split=1 且 has_bind_receiver=1
+      // 提示信息："恭喜您，入驻流程已全部完成！"
+
+      if(store_status == 2 
+        || has_ec_signed == 2 
+        || has_apply_mer == 2
+        || has_apply_split == 2
+        || has_apply_receiver == 2
+        || has_bind_receiver == 2 
+        && approval_status == 1
+      ){
         uni.navigateTo({
           url: "/pages/audit/checkAudit",
         });
         return;
       }
+      
 
       //  store_status int   '店铺创建状态：1-已启用（入驻已审批，合同已生成）；2-未启用',
-      if (approval_status == 1 && signed_status == 2 && store_status == 1) {
+      if (approval_status == 1 && store_status == 1 && has_ec_signed == 1&& has_apply_mer == 1&& has_apply_split == 1&& has_ec_signed == 1&&has_apply_receiver==1&&has_bind_receiver==1) {
         let result = await GetAuditInfo({ mobile: mobile });
 
         uni.setStorageSync(

java-mall-app-shop-admin/uni_modules/uview-ui/components/u-input/props.js

@@ -50,7 +50,7 @@ export default {
 			type: String,
 			default: uni.$u.props.input.placeholder
 		},
-		// 指定placeholder的样式类，注意页面或组件的style中写了scoped时，需要在类名前写/deep/
+		// 指定placeholder的样式类，注意页面或组件的style中写了scoped时，需要在类名前写::v-deep
 		placeholderClass: {
 			type: String,
 			default: uni.$u.props.input.placeholderClass

java-mall-app-shop-admin/uni_modules/uview-ui/components/u-input/u-input.vue

@@ -89,7 +89,7 @@ import props from "./props.js";
  * @property {Boolean}			password				是否密码类型 （ 默认 false ）
  * @property {String | Number}	maxlength				最大输入长度，设置为 -1 的时候不限制最大长度 （ 默认 -1 ）
  * @property {String}			placeholder				输入框为空时的占位符
- * @property {String}			placeholderClass		指定placeholder的样式类，注意页面或组件的style中写了scoped时，需要在类名前写/deep/ （ 默认 'input-placeholder' ）
+ * @property {String}			placeholderClass		指定placeholder的样式类，注意页面或组件的style中写了scoped时，需要在类名前写::v-deep （ 默认 'input-placeholder' ）
  * @property {String | Object}	placeholderStyle		指定placeholder的样式，字符串/对象形式，如"color: red;"
  * @property {Boolean}			showWordLimit			是否显示输入字数统计，只在 type ="text"或type ="textarea"时有效 （ 默认 false ）
  * @property {String}			confirmType				设置右下角按钮的文字，兼容性详见uni-app文档 （ 默认 'done' ）

java-mall-app-shop-admin/uni_modules/uview-ui/components/u-textarea/props.js

@@ -10,7 +10,7 @@ export default {
 			type: [String, Number],
 			default: uni.$u.props.textarea.placeholder
 		},
-		// 指定placeholder的样式类，注意页面或组件的style中写了scoped时，需要在类名前写/deep/
+		// 指定placeholder的样式类，注意页面或组件的style中写了scoped时，需要在类名前写::v-deep
 		placeholderClass: {
 			type: String,
 			default: uni.$u.props.input.placeholderClass

java-mall-app-shop-admin/uni_modules/uview-ui/components/u-textarea/u-textarea.vue

@@ -49,7 +49,7 @@ import props from "./props.js";
  *
  * @property {String | Number} 		value					输入框的内容
  * @property {String | Number}		placeholder				输入框为空时占位符
- * @property {String}			    placeholderClass		指定placeholder的样式类，注意页面或组件的style中写了scoped时，需要在类名前写/deep/ （ 默认 'input-placeholder' ）
+ * @property {String}			    placeholderClass		指定placeholder的样式类，注意页面或组件的style中写了scoped时，需要在类名前写::v-deep （ 默认 'input-placeholder' ）
  * @property {String | Object}	    placeholderStyle		指定placeholder的样式，字符串/对象形式，如"color: red;"
  * @property {String | Number}		height					输入框高度（默认 70 ）
  * @property {String}				confirmType				设置键盘右下角按钮的文字，仅微信小程序，App-vue和H5有效（默认 'done' ）