Skip to content

Z
zhichan
Commit a07c4127 by 刘泽奇
Options

123

parent 04eeb435
Showing with 34 additions and 13 deletions
igirl-channel-jdweb/app/front/entry/public/css/pagecom.css 100644 → 100755
This source diff could not be displayed because it is too large. You can view the blob instead.
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.html
...@@ -22,9 +22,7 @@ ...@@ -22,9 +22,7 @@
</div> </div>
<el-tabs v-model="navActive" @tab-click="navClick"> <el-tabs v-model="navActive" @tab-click="navClick">
<el-tab-pane label="商标订单" name="first"> <el-tab-pane label="商标订单" name="first">
<div class="jdindentlist-nav">
</div>
<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/jdregscheme/jdregscheme.css
...@@ -66,3 +66,10 @@ ...@@ -66,3 +66,10 @@
margin-left: 11px; margin-left: 11px;
} }
.jdregscheme h4{
margin: 15px 0 ;
}
.jdregscheme .demo-ruleForm{
}
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/jdregscheme/jdregscheme.html
...@@ -2,17 +2,25 @@ ...@@ -2,17 +2,25 @@
<el-form ref="form" :rules="rules" :model="form" class="demo-ruleForm" <el-form ref="form" :rules="rules" :model="form" class="demo-ruleForm"
style="background:rgba(249,249,249,1);padding: 30px" label-width="120px"> style="background:rgba(249,249,249,1);padding: 30px" label-width="120px">
<div class="selftmreg_main" style="width: 96%;margin: 0 auto;padding:0 50px;background: #fff"> <div class="selftmreg_main" style="width: 1320px;margin: 0 auto;background: #fff">
<div class="jdregscheme-nav" style="padding-top: 20px"> <div class="jdregscheme-nav" style="padding-top: 20px">
<!-- <span style="float: left;line-height: 22px;color:rgba(130,130,130,1);">当前位置：</span> --> <!-- <span style="float: left;line-height: 22px;color:rgba(130,130,130,1);">当前位置：</span> -->
<!-- <el-breadcrumb separator-class="el-icon-arrow-right" style="float: left;line-height:22px"> <div class="jdindentdetail-nav">
<el-breadcrumb-item><a style="color:rgba(130,130,130,1);">我的订单</a></el-breadcrumb-item> <div style="background:#ffffff;
<el-breadcrumb-item :to="{ path: \'/1688/jdindentlist\' }"> border:3px solid #3071fe;
<a style="font-weight:800">确认注册方案</a> width:6px;
height:6px;
border-radius:100%;
margin: 0 10px 0 0;
display: inline-block;">
</div>
<span>当前位置：</span>
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="listPath">交付中心
</el-breadcrumb-item> </el-breadcrumb-item>
</el-breadcrumb> --> <el-breadcrumb-item>确认注册方案</el-breadcrumb-item>
<a style="font-weight:800">确认注册方案</a> </el-breadcrumb>
<div style="clear:both"></div> </div>
<div class="selftmreg_shu"></div> <div class="selftmreg_shu"></div>
</div> </div>
<div style="display:inline-block;margin-right:10px;"> <div style="display:inline-block;margin-right:10px;">
......
igirl-channel-jdweb/app/front/vues/pages/jdregscheme/jdregscheme.js
...@@ -64,6 +64,13 @@ ...@@ -64,6 +64,13 @@
}; };
return { return {
ldms: [], ldms: [],
listPath: {
path: `/${this.$root.channelName}/jdindentlist`,
query: {
channelUserId: this.$route.query.channelUserId,
deliveryOrderNo: this.deliveryOrderNo,
}
},
form: { form: {
tmFormType: 3, tmFormType: 3,
name: "", name: "",
...@@ -136,7 +143,7 @@ ...@@ -136,7 +143,7 @@
methods: { methods: {
submitForm(){ submitForm(){
this.apply.centerDialogVisible = false; this.apply.centerDialogVisible = false;
console.log(this.values, `zzzzzzzzzzzzzzzzzzzzzzzz`); console.log(this.values,this.$route.query.channelUserId,`zzzzzzzzzzzzzzzzzzzzzzzz`);
var obj = {}; var obj = {};
obj.deliveryOrderNo = this.deliveryOrderNo; obj.deliveryOrderNo = this.deliveryOrderNo;
obj.channelUserId = this.$root.channelUserId; obj.channelUserId = this.$root.channelUserId;
...@@ -149,7 +156,7 @@ ...@@ -149,7 +156,7 @@
}); });
return; return;
} }
var obj = this.$root.copyParams(obj, "tmConfirm", "/action/tmOrder/springBoard"); var obj = this.$root.copyParams(obj, "tmConfirm", "/action/tmOrder/springBoard","yes","yes");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
if (d.status == 0) { if (d.status == 0) {
this.$router.push({ this.$router.push({
...@@ -172,7 +179,7 @@ ...@@ -172,7 +179,7 @@
obj.deliveryOrderNo = this.deliveryOrderNo; obj.deliveryOrderNo = this.deliveryOrderNo;
obj.channelUserId = this.$root.channelUserId; obj.channelUserId = this.$root.channelUserId;
obj.isConfirm = "1"; obj.isConfirm = "1";
var obj = this.$root.copyParams(obj, "tmConfirm", "/action/tmOrder/springBoard"); var obj = this.$root.copyParams(obj, "tmConfirm", "/action/tmOrder/springBoard","yes","yes");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
if (d.status == 0) { if (d.status == 0) {
this.$message({ this.$message({
......
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