123

igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.css

@@ -112,7 +112,12 @@
     border-color: #C0C4CC;
     border-color: #C0C4CC;
 
 
 }
 }
-
+.jdindentdetail-flow {
+    padding: 10px;
+    margin-top: 12px;
+    box-sizing: border-box;
+    border: 1px solid #E3E3E3;
+}
 .jdindentdetail-main-step-col .el-step__icon-inner {
 .jdindentdetail-main-step-col .el-step__icon-inner {
     color: #fff;
     color: #fff;
     font-size: 14px;
     font-size: 14px;

igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html

@@ -17,10 +17,11 @@
 			</el-breadcrumb>
 			</el-breadcrumb>
 		</div>
 		</div>
 		<div class="jdindentdetail-main">
 		<div class="jdindentdetail-main">
+			<div class="jdindentdetail-main-title">
+				交付流程
+			</div>
 			<div class="jdindentdetail-flow">
 			<div class="jdindentdetail-flow">
-				<div class="jdindentdetail-main-title">
-					交付流程
-				</div>
+
 				<div class="jdindentdetail-main-step-col">
 				<div class="jdindentdetail-main-step-col">
 					<el-steps :active="currentStep" align-center process-status="process">
 					<el-steps :active="currentStep" align-center process-status="process">
 						<el-step v-if="itemName" title="待上传材料" description=""></el-step>
 						<el-step v-if="itemName" title="待上传材料" description=""></el-step>

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

@@ -1202,35 +1202,27 @@
           console.log(that.orderSubInfo, '............................................');
           console.log(that.orderSubInfo, '............................................');
           var subInfo = that.$root.copyParams(that.orderSubInfo, "subExistTmOrder", "/action/tmOrder/springBoard", "yes", "yes");
           var subInfo = that.$root.copyParams(that.orderSubInfo, "subExistTmOrder", "/action/tmOrder/springBoard", "yes", "yes");
           that.$root.postReq("/web/trademark/tmqueryCtl/doPost", subInfo).then(function (d) {
           that.$root.postReq("/web/trademark/tmqueryCtl/doPost", subInfo).then(function (d) {
+
             console.log('nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn0', d);
             console.log('nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn0', d);
-            if (d.data.status == 0) {
+            if (d.status == 0) {
               var order = d.data;
               var order = d.data;
               that.toTop();
               that.toTop();
               that.$router.push({
               that.$router.push({
                 path: "/1688/jdindentlist",
                 path: "/1688/jdindentlist",
                 query: {
                 query: {
-                  channelUserId: this.$route.query.channelUserId,
+                  channelUserId: that.$route.query.channelUserId,
                 }
                 }
               });
               });
               that.$message.warning("订单提交成功");
               that.$message.warning("订单提交成功");
-              /*
-              that.$root.pushx({
-                title: "订单支付",
-                name: "/orderpay",
-                params: {
-                  orderNum: order.code
-                }
-              });
-              */
+             
             } else {
             } else {
               that.$message.warning(d.msg);
               that.$message.warning(d.msg);
             }
             }
 
 
           }).catch(function (e) {
           }).catch(function (e) {
-            that.$message.warning("操作失败");
+            that.$message.warning("操作失败",e);
+            console.log(e);
           });
           });
-
-
         })
         })
 
 
       }
       }