123

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

@@ -105,6 +105,7 @@
 
 .jdindentdetail-main-step-col {
     margin-top: 24px;
+    position: relative;
 }
 
 .jdindentdetail-main-step-col .el-step__icon.is-text {
@@ -633,4 +634,13 @@
     position: absolute;
     top: -10px;
     left: 80px;
+}
+
+.jdindentdetail-flow-payment {
+    position: absolute;
+    background: rgb(255, 85, 0);
+    right: 5%;
+    top: 5px;
+    padding: 8px 28px;
+    color: #fff;
 }
\ No newline at end of file

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

@@ -44,6 +44,8 @@
 
 					<div class="jdindentdetail-main-step-col">
 						<el-steps :active="currentStep" align-center process-status="process" id="steps">
+							<el-step v-if="channelFrom == \'gsb\'" title="待付款" description="">
+							</el-step>
 							<el-step v-if="itemCode" title="待上传材料" description="">
 							</el-step>
 							<el-step v-if="!itemCode" title="待确认方案"></el-step>
@@ -53,6 +55,9 @@
 							<el-step title="已递交"></el-step>
 							<el-step title="已完成"></el-step>
 						</el-steps>
+						<div class="jdindentdetail-flow-payment" @click="goPayment" v-if="channelFrom == \'gsb\'">
+							去支付
+						</div>
 					</div>
 					<div class="jdindentdetail-main-hr">
 

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

@@ -352,34 +352,63 @@
         if (this.$route.query.deliveryOrderNo != "" && this.$route.query.channelUserId != "") {
             this.deliveryOrderNo = this.$route.query.deliveryOrderNo;
             this.channelUserId = this.$root.channelUserId = this.$route.query.channelUserId;
-
             this.initIndent();
         }
         if (this.$route.query.deliveryStatus != "") {
             this.deliveryStatus = this.$route.query.deliveryStatus;
             console.log(this.deliveryStatus, this.currentStep, `llllllllllllllllllll`);
-            switch (this.deliveryStatus) {
-                case "dsccl":
-                    this.currentStep = 0;
-                    break;
-                case "dqrfa":
-                    this.currentStep = 0;
-                    break;
-                case "dsh":
-                    this.currentStep = 1;
-                    break;
-                case "ddj":
-                    this.currentStep = 2;
-                    break;
-                case "ydj":
-                    this.currentStep = 3;
-                    break;
-                case "ywc":
-                    this.currentStep = 4;
-                    break;
-                default:
-                    break;
+            if (this.channelFrom != "gsb") {
+                switch (this.deliveryStatus) {
+                    case "dsccl":
+                        this.currentStep = 0;
+                        break;
+                    case "dqrfa":
+                        this.currentStep = 0;
+                        break;
+                    case "dsh":
+                        this.currentStep = 1;
+                        break;
+                    case "ddj":
+                        this.currentStep = 2;
+                        break;
+                    case "ydj":
+                        this.currentStep = 3;
+                        break;
+                    case "ywc":
+                        this.currentStep = 4;
+                        break;
+                    default:
+                        break;
+                }
+            } else {
+                switch (this.deliveryStatus) {
+                    case "dfk":
+                        this.currentStep = 0;
+                        break;
+                    case "dsccl":
+                        this.currentStep = 1;
+                        break;
+                    case "dqrfa":
+                        this.currentStep = 1;
+                        break;
+                    case "dsh":
+                        this.currentStep = 2;
+                        break;
+                    case "ddj":
+                        this.currentStep = 3;
+                        break;
+                    case "ydj":
+                        this.currentStep = 4;
+                        break;
+                    case "ywc":
+                        this.currentStep = 5;
+                        break;
+                    default:
+                        break;
+                }
             }
+
+
         };
 
 
@@ -436,7 +465,10 @@
 
     },
     methods: {
-        
+        goPayment(){
+            console.log(this.$route.query);
+            location.href = `https://icompany.gongsibao.com/cashier?order_no=${this.$route.query.order_no}`
+        },
         loginOut(){
             /*
             var url = encodeURIComponent("http://tm.plus.jdcloud.com/#/jd/jdtrademark") ;
@@ -583,7 +615,7 @@
                 default:
                     break;
             };
-            
+
         },
         pointsRuleColor(i) {
             if (i < parseInt(this.step)) {