123

igirl-channel-jdweb/app/config/proxy.js

-var proxy = require('http-proxy-middleware')

igirl-channel-jdweb/app/front/vues/pages/OAjdlist/OAjdlist.html

@@ -310,7 +310,7 @@
 
 
         </el-tab-pane>
         </el-tab-pane>
 
 
-        <el-tab-pane label="工商订单" name="second">
+        <el-tab-pane label="工商订单" name="second" v-if="0">
             <div class="jdindentlist">
             <div class="jdindentlist">
                 <div class="jdindentlist-inquire">
                 <div class="jdindentlist-inquire">
                     <div class="jdindentlist-inquire-form">
                     <div class="jdindentlist-inquire-form">

igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.js

@@ -1269,20 +1269,19 @@
           this.$root.loading = true;
           this.$root.loading = true;
           var jdObj = that.$root.copyParams(obj, "subTmOrder", "/action/tmOrder/springBoard", "yes", "yes");
           var jdObj = that.$root.copyParams(obj, "subTmOrder", "/action/tmOrder/springBoard", "yes", "yes");
           that.$root.postReq("/web/trademark/tmqueryCtl/doPost", jdObj).then(function (d) {
           that.$root.postReq("/web/trademark/tmqueryCtl/doPost", jdObj).then(function (d) {
-            this.$root.loading = false;
+            that.$root.loading = false;
             console.log(`///////////////////////////////`, d);
             console.log(`///////////////////////////////`, d);
             if (d.status == 0) {
             if (d.status == 0) {
               that.$message.warning("操作成功");
               that.$message.warning("操作成功");
               location.href = d.data.payUrl;
               location.href = d.data.payUrl;
             } else {
             } else {
-              console.log(d, "subTmOrder..........");
+              console.log(d,"subTmOrder..........",);
               that.$message.warning(d.msg);
               that.$message.warning(d.msg);
             }
             }
           }).catch(function (e) {
           }).catch(function (e) {
-            this.$root.loading = false;
+            that.$root.loading = false;
             that.$message.warning("操作失败");
             that.$message.warning("操作失败");
           });
           });
-
         } else if (this.$root.channelName == "1688") {
         } else if (this.$root.channelName == "1688") {
           console.log(this.$route.query.channelOrderNo, ">>>>>>>>>>>>>>>>>>>>>>>");
           console.log(this.$route.query.channelOrderNo, ">>>>>>>>>>>>>>>>>>>>>>>");
           that.orderSubInfo = {
           that.orderSubInfo = {