d

fb1438b4 · 蒋勇 · 5cfd7b0c · fb1438b4 · fb1438b4 · fb1438b4
Commit fb1438b4 authored Jul 29, 2022 by 蒋勇
19 changed files
--- a/zhiquanquan/app/base/controller/impl/transfer/tradetransferCtl.js
+++ b/zhiquanquan/app/base/controller/impl/transfer/tradetransferCtl.js
@@ -38,7 +38,7 @@ class TradetransferCtl extends CtlBase {
          result = await this.service.posttransfermatereial(p)
      }
      if (p.transfer_status == "BUYER_PROVIDE_MATERIAL") {
-        p.aliorder_status = "6",
+          p.aliorder_status = "6",
          result = await this.service.receivedtransfermaterail(p)
      }
      if (p.transfer_status == "SUBMIT_TO_SBJ") {

--- a/zhiquanquan/app/base/db/metadata/app/platform.js
+++ b/zhiquanquan/app/base/db/metadata/app/platform.js
@@ -41,7 +41,7 @@ module.exports = {
                "TRANSFER_FAIL": "交易失败",
                "TRANSFER_SUCCESS": "交易成功",
                "CLOSE_ORDER_REFUND":"订单关闭",
-                "REFUSE_ORDER":"取消订单"
+                "REFUSE_ORDER":"取消订单",
            },
            "transfer_statusshow": {
                "READY_ORDER": "订单准备",
@@ -57,7 +57,11 @@ module.exports = {
                "TRANSFER_FAIL": "交易失败",
                "TRANSFER_SUCCESS": "交易成功",
                "CLOSE_ORDER_REFUND":"订单关闭",
-                "REFUSE_ORDER":"取消订单"
+                "REFUSE_ORDER":"取消订单",
+                "MATERIALS_TO_BE_SUBMITTED":"待服务商重新提交材料",
+                "PASS_ALIYUN_VERIFY":"阿里云审核通过",
+                "ALIYUN_VERFIY":"阿里云审核"
+
            },
            "aliorder_status": {
                "1": "确认商标状态",
@@ -71,7 +75,10 @@ module.exports = {
                "8": "官文转达(受通）",
                "9": "官文转达(补正）",
                "10": "退款",
-                "12": "订单完成"
+                "12": "订单完成",
+                "26":"待服务商重新提交材料",
+                "25":"阿里云审核通过",
+                "27":"阿里云审核"
            },
            "tranferperson_type": {
                "person": "个人",

--- a/zhiquanquan/app/base/db/models/transfer/tradetransfer.js
+++ b/zhiquanquan/app/base/db/models/transfer/tradetransfer.js
@@ -31,6 +31,8 @@ module.exports = (db, DataTypes) => {
    seller_proxy: DataTypes.STRING,//代理委托书
    seller_apply:DataTypes.STRING,//申请书

+    transfer_receive_ack: DataTypes.STRING,//商标局受理回执
+
    ncl_one: DataTypes.STRING,    //尼斯大类
    price: DataTypes.STRING,    //价格
    fq_ordernum: DataTypes.STRING,    //合作方订单号

--- a/zhiquanquan/app/front/entry/public/css/chunk-60e0b3f4.634b739a.css
+++ b/zhiquanquan/app/front/entry/public/css/chunk-60e0b3f4.634b739a.css
-.brand_indentlist[data-v-05c6832e]{width:100%}.brand_indentlist .brand_header[data-v-05c6832e]{margin-bottom:10px}.brand_indentlist .brand_header button[data-v-05c6832e]{margin-right:10px}.brand_indentlist[data-v-05c6832e] .ivu-btn>span{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.brand_indentlist[data-v-05c6832e] .ivu-table-body .ivu-btn-primary{color:#2d8cf0!important;background-color:transparent;border-color:transparent}.brand_indentlist[data-v-05c6832e] thead .ivu-table-cell{white-space:nowrap}.ivu-checkbox-group{display:-webkit-box;display:-ms-flexbox;display:flex;width:226px;-ms-flex-wrap:wrap;flex-wrap:wrap}.ivu-table-filter-list-item .ivu-checkbox-wrapper+.ivu-checkbox-wrapper{margin-right:10px}
\ No newline at end of file
+.brand_indentlist[data-v-69362dc0]{width:100%}.brand_indentlist .brand_header[data-v-69362dc0]{margin-bottom:10px}.brand_indentlist .brand_header button[data-v-69362dc0]{margin-right:10px}.brand_indentlist[data-v-69362dc0] .ivu-btn>span{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.brand_indentlist[data-v-69362dc0] .ivu-table-body .ivu-btn-primary{color:#2d8cf0!important;background-color:transparent;border-color:transparent}.brand_indentlist[data-v-69362dc0] thead .ivu-table-cell{white-space:nowrap}.ivu-checkbox-group{display:-webkit-box;display:-ms-flexbox;display:flex;width:226px;-ms-flex-wrap:wrap;flex-wrap:wrap}.ivu-table-filter-list-item .ivu-checkbox-wrapper+.ivu-checkbox-wrapper{margin-right:10px}
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/index.html
+++ b/zhiquanquan/app/front/entry/public/index.html
-<!DOCTYPE html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/ccc.png"><title></title><link href="/css/chunk-148cd3a8.0676f2ca.css" rel="prefetch"><link href="/css/chunk-14b9857b.0dc416de.css" rel="prefetch"><link href="/css/chunk-1ce03049.80459bac.css" rel="prefetch"><link href="/css/chunk-2c359864.0dc416de.css" rel="prefetch"><link href="/css/chunk-3385141a.0dc416de.css" rel="prefetch"><link href="/css/chunk-356a65ce.a35226dc.css" rel="prefetch"><link href="/css/chunk-605962ce.d38c164f.css" rel="prefetch"><link href="/css/chunk-60e0b3f4.634b739a.css" rel="prefetch"><link href="/css/chunk-635bdee9.1e75f0e2.css" rel="prefetch"><link href="/css/chunk-6ab78853.938207ad.css" rel="prefetch"><link href="/css/chunk-a2c78c42.992e1c54.css" rel="prefetch"><link href="/js/chunk-148cd3a8.0f3799ee.js" rel="prefetch"><link href="/js/chunk-14b9857b.3aebcae3.js" rel="prefetch"><link href="/js/chunk-1ce03049.174d7bf6.js" rel="prefetch"><link href="/js/chunk-2c359864.13a5f6bb.js" rel="prefetch"><link href="/js/chunk-3385141a.a56dd4c4.js" rel="prefetch"><link href="/js/chunk-356a65ce.399fb968.js" rel="prefetch"><link href="/js/chunk-4fe8dd4f.cb8ca135.js" rel="prefetch"><link href="/js/chunk-605962ce.52e77608.js" rel="prefetch"><link href="/js/chunk-60e0b3f4.02b1ca43.js" rel="prefetch"><link href="/js/chunk-635bdee9.8f52cf9b.js" rel="prefetch"><link href="/js/chunk-6ab78853.6713f816.js" rel="prefetch"><link href="/js/chunk-a2c78c42.391028e0.js" rel="prefetch"><link href="/css/app.11089a5f.css" rel="preload" as="style"><link href="/css/chunk-vendors.1d90d08d.css" rel="preload" as="style"><link href="/js/app.d1e809d2.js" rel="preload" as="script"><link href="/js/chunk-vendors.7eaa5557.js" rel="preload" as="script"><link href="/css/chunk-vendors.1d90d08d.css" rel="stylesheet"><link href="/css/app.11089a5f.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.7eaa5557.js"></script><script src="/js/app.d1e809d2.js"></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/ccc.png"><title></title><link href="/css/chunk-148cd3a8.0676f2ca.css" rel="prefetch"><link href="/css/chunk-14b9857b.0dc416de.css" rel="prefetch"><link href="/css/chunk-1ce03049.80459bac.css" rel="prefetch"><link href="/css/chunk-2c359864.0dc416de.css" rel="prefetch"><link href="/css/chunk-3385141a.0dc416de.css" rel="prefetch"><link href="/css/chunk-356a65ce.a35226dc.css" rel="prefetch"><link href="/css/chunk-605962ce.d38c164f.css" rel="prefetch"><link href="/css/chunk-635bdee9.1e75f0e2.css" rel="prefetch"><link href="/css/chunk-6ab78853.938207ad.css" rel="prefetch"><link href="/css/chunk-a2c78c42.992e1c54.css" rel="prefetch"><link href="/css/chunk-f05181d8.7506003e.css" rel="prefetch"><link href="/js/chunk-148cd3a8.463e2745.js" rel="prefetch"><link href="/js/chunk-14b9857b.895daf31.js" rel="prefetch"><link href="/js/chunk-1ce03049.a9f950da.js" rel="prefetch"><link href="/js/chunk-2c359864.282825b7.js" rel="prefetch"><link href="/js/chunk-3385141a.a39e80b7.js" rel="prefetch"><link href="/js/chunk-356a65ce.7300ccfd.js" rel="prefetch"><link href="/js/chunk-4fe8dd4f.75072a0c.js" rel="prefetch"><link href="/js/chunk-605962ce.16754883.js" rel="prefetch"><link href="/js/chunk-635bdee9.96060bb3.js" rel="prefetch"><link href="/js/chunk-6ab78853.2d4b7ac1.js" rel="prefetch"><link href="/js/chunk-a2c78c42.fe470163.js" rel="prefetch"><link href="/js/chunk-f05181d8.136c7fea.js" rel="prefetch"><link href="/css/app.11089a5f.css" rel="preload" as="style"><link href="/css/chunk-vendors.1d90d08d.css" rel="preload" as="style"><link href="/js/app.186092ff.js" rel="preload" as="script"><link href="/js/chunk-vendors.6953e2d6.js" rel="preload" as="script"><link href="/css/chunk-vendors.1d90d08d.css" rel="stylesheet"><link href="/css/app.11089a5f.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.6953e2d6.js"></script><script src="/js/app.186092ff.js"></script></body></html>
\ No newline at end of file
--- a/zhiquanquan/app/front/entry/public/js/app.d1e809d2.js
+++ b/zhiquanquan/app/front/entry/public/js/app.d1e809d2.js
--- a/zhiquanquan/app/front/entry/public/js/chunk-148cd3a8.0f3799ee.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-148cd3a8.0f3799ee.js
--- a/zhiquanquan/app/front/entry/public/js/chunk-14b9857b.3aebcae3.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-14b9857b.3aebcae3.js
--- a/zhiquanquan/app/front/entry/public/js/chunk-1ce03049.174d7bf6.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-1ce03049.174d7bf6.js
--- a/zhiquanquan/app/front/entry/public/js/chunk-2c359864.13a5f6bb.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-2c359864.13a5f6bb.js
--- a/zhiquanquan/app/front/entry/public/js/chunk-3385141a.a56dd4c4.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-3385141a.a56dd4c4.js
--- a/zhiquanquan/app/front/entry/public/js/chunk-356a65ce.399fb968.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-356a65ce.399fb968.js
--- a/zhiquanquan/app/front/entry/public/js/chunk-4fe8dd4f.cb8ca135.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-4fe8dd4f.cb8ca135.js
--- a/zhiquanquan/app/front/entry/public/js/chunk-605962ce.52e77608.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-605962ce.52e77608.js
--- a/zhiquanquan/app/front/entry/public/js/chunk-635bdee9.8f52cf9b.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-635bdee9.8f52cf9b.js
--- a/zhiquanquan/app/front/entry/public/js/chunk-6ab78853.6713f816.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-6ab78853.6713f816.js
--- a/zhiquanquan/app/front/entry/public/js/chunk-a2c78c42.391028e0.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-a2c78c42.391028e0.js
--- a/zhiquanquan/app/front/entry/public/js/chunk-60e0b3f4.02b1ca43.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-60e0b3f4.02b1ca43.js
--- a/zhiquanquan/app/front/entry/public/js/chunk-vendors.7eaa5557.js
+++ b/zhiquanquan/app/front/entry/public/js/chunk-vendors.7eaa5557.js