Skip to content

Z
zhichan
Commit edfd39b4 by 刘泽奇
Options

123

parent dba31c31
Showing with 72 additions and 24 deletions
igirl-channel-web/app/front/entry/public/css/pagecom.css
This source diff could not be displayed because it is too large. You can view the blob instead.
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.css
...@@ -105,6 +105,7 @@ ...@@ -105,6 +105,7 @@
.jdindentdetail-main-step-col { .jdindentdetail-main-step-col {
margin-top: 24px; margin-top: 24px;
position: relative;
} }
.jdindentdetail-main-step-col .el-step__icon.is-text { .jdindentdetail-main-step-col .el-step__icon.is-text {
...@@ -633,4 +634,13 @@ ...@@ -633,4 +634,13 @@
position: absolute; position: absolute;
top: -10px; top: -10px;
left: 80px; 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 @@ ...@@ -44,6 +44,8 @@
<div class="jdindentdetail-main-step-col"> <div class="jdindentdetail-main-step-col">
<el-steps :active="currentStep" align-center process-status="process" id="steps"> <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 v-if="itemCode" title="待上传材料" description="">
</el-step> </el-step>
<el-step v-if="!itemCode" title="待确认方案"></el-step> <el-step v-if="!itemCode" title="待确认方案"></el-step>
...@@ -53,6 +55,9 @@ ...@@ -53,6 +55,9 @@
<el-step title="已递交"></el-step> <el-step title="已递交"></el-step>
<el-step title="已完成"></el-step> <el-step title="已完成"></el-step>
</el-steps> </el-steps>
<div class="jdindentdetail-flow-payment" @click="goPayment" v-if="channelFrom == \'gsb\'">
去支付
</div>
</div> </div>
<div class="jdindentdetail-main-hr"> <div class="jdindentdetail-main-hr">
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
...@@ -352,34 +352,63 @@ ...@@ -352,34 +352,63 @@
if (this.$route.query.deliveryOrderNo != "" && this.$route.query.channelUserId != "") { if (this.$route.query.deliveryOrderNo != "" && this.$route.query.channelUserId != "") {
this.deliveryOrderNo = this.$route.query.deliveryOrderNo; this.deliveryOrderNo = this.$route.query.deliveryOrderNo;
this.channelUserId = this.$root.channelUserId = this.$route.query.channelUserId; this.channelUserId = this.$root.channelUserId = this.$route.query.channelUserId;
this.initIndent(); this.initIndent();
} }
if (this.$route.query.deliveryStatus != "") { if (this.$route.query.deliveryStatus != "") {
this.deliveryStatus = this.$route.query.deliveryStatus; this.deliveryStatus = this.$route.query.deliveryStatus;
console.log(this.deliveryStatus, this.currentStep, `llllllllllllllllllll`); console.log(this.deliveryStatus, this.currentStep, `llllllllllllllllllll`);
switch (this.deliveryStatus) { if (this.channelFrom != "gsb") {
case "dsccl": switch (this.deliveryStatus) {
this.currentStep = 0; case "dsccl":
break; this.currentStep = 0;
case "dqrfa": break;
this.currentStep = 0; case "dqrfa":
break; this.currentStep = 0;
case "dsh": break;
this.currentStep = 1; case "dsh":
break; this.currentStep = 1;
case "ddj": break;
this.currentStep = 2; case "ddj":
break; this.currentStep = 2;
case "ydj": break;
this.currentStep = 3; case "ydj":
break; this.currentStep = 3;
case "ywc": break;
this.currentStep = 4; case "ywc":
break; this.currentStep = 4;
default: break;
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 @@ ...@@ -436,7 +465,10 @@
}, },
methods: { methods: {
goPayment(){
console.log(this.$route.query);
location.href = `https://icompany.gongsibao.com/cashier?order_no=${this.$route.query.order_no}`
},
loginOut(){ loginOut(){
/* /*
var url = encodeURIComponent("http://tm.plus.jdcloud.com/#/jd/jdtrademark") ; var url = encodeURIComponent("http://tm.plus.jdcloud.com/#/jd/jdtrademark") ;
...@@ -583,7 +615,7 @@ ...@@ -583,7 +615,7 @@
default: default:
break; break;
}; };
}, },
pointsRuleColor(i) { pointsRuleColor(i) {
if (i < parseInt(this.step)) { if (i < parseInt(this.step)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment