Skip to content

Z
zhichan
Commit 3f847d53 by 刘泽奇
Options

123

parent cb7616af
Showing with 46 additions and 27 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/entry/public/js/index.js
......@@ -74,7 +74,6 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
});
router.beforeEach((to, from, next) => {
console.log(from, to, '~~~~~~~~~~~~~~~~~~~~~~');
next();
});
Vue.use(window['vue-cropper']);
......@@ -156,7 +155,9 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
showWxrm: false,
showPhoneNum: false,
rsData: [],
channelPath: ""
channelPath: "",
channelUserId:"123",
channelUserToken:"123",
};
},
created() {
......@@ -165,7 +166,6 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
});
$("#app").css("visibility", 'visible');
this.loading = false;
},
updated() {
......@@ -181,7 +181,6 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
this.checkLogin();
},
methods: {
// 返回当前接入渠道标识
getChannelPath() {
var from = this.$route.path;
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
......@@ -22,12 +22,13 @@
商标流程
</div>
<div class="jdindentdetail-main-step-col">
<el-steps :active="6" align-center>
<el-step title="待付款" description=""></el-step>
<el-step title="已付款"></el-step>
<el-step title="待上传材料"></el-step>
<el-steps :active="3" align-center>
<el-step title="待上传材料" description=""></el-step>
<el-step title="待确认方案"></el-step>
<el-step title="方案不通过"></el-step>
<el-step title="待审核"></el-step>
<el-step title="待递交"></el-step>
<el-step title="已递交"></el-step>
<el-step title="已完成"></el-step>
</el-steps>
</div>
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.css
......@@ -134,7 +134,7 @@
text-align: center;
}
.jdindentlist-list .el-table .el-table_1_column_11{
padding-right: 21px;
padding-right: 25px;
}
.jdindentlist-null{
width: 34.57%;
......@@ -148,10 +148,7 @@
.jdindentlist-list .demo-ruleForm{
.jdindentlist-warpper .demo-ruleForm{
display: flex;
justify-content: space-around;
}
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html
......@@ -91,8 +91,10 @@
<el-button style="border:0;color: #0F8EE9;" size="mini"
@click="viewDetails(scope.$index, scope.row)">&nbsp;&nbsp;&nbsp;详情&nbsp;&nbsp;&nbsp;&nbsp;
</el-button>
<el-button v-show="showBtn(scope.$index, scope.row)" style="border:0;color: #0F8EE9;margin:0;"
<el-button v-show="showSelf(scope.$index, scope.row)" style="border:0;color: #0F8EE9;margin:0;"
size="mini" @click="showUploadStuff = true">上传材料</el-button>
<el-button v-show="showSup(scope.$index, scope.row)" style="border:0;color: #0F8EE9;margin:0;"
size="mini" @click="goScheme(scope.$index, scope.row) = true">确认注册方案</el-button>
</template>
</el-table-column>
</el-table>
......@@ -124,7 +126,8 @@
<gsb-upload flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error">
<el-button style="padding:12px 14px;" type="" @click="loadingKey = 0">营业执照上传</el-button>
<el-button style="padding:12px 14px;" type="" @click="loadingKey = 0">营业执照上传
</el-button>
</gsb-upload>
</el-form-item>
<el-form-item style="float:left;width:25%;text-align:center"
......@@ -139,7 +142,8 @@
<gsb-upload flag="sfz" ref="sfz" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error">
<el-button style="padding:12px 14px;" type="" @click="loadingKey = 1">身份证明上传</el-button>
<el-button style="padding:12px 14px;" type="" @click="loadingKey = 1">身份证明上传
</el-button>
</gsb-upload>
</el-form-item>
<el-form-item style="float:left;width:25%;text-align:center" label="">
......@@ -153,7 +157,8 @@
<gsb-upload flag="wts" ref="wts" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error">
<el-button style="padding:12px 14px;" type="" @click="loadingKey = 2">代理委托书上传</el-button>
<el-button style="padding:12px 14px;" type="" @click="loadingKey = 2">代理委托书上传
</el-button>
</gsb-upload>
</el-form-item>
<el-form-item style="float:left;width:25%;text-align:center" label="">
......@@ -166,7 +171,8 @@
<gsb-upload flag="yxq" ref="yxq" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error">
<el-button style="padding:12px 14px;" type="" @click="loadingKey = 3">优先权文件上传</el-button>
<el-button style="padding:12px 14px;" type="" @click="loadingKey = 3">优先权文件上传
</el-button>
</gsb-upload>
</el-form-item>
<div style="clear:both;"></div>
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js
......@@ -216,10 +216,15 @@
orderId: "",
stuff: {},
showUploadStuff: false,
}
},
created: function() {
if (this.$route.query.channelUserId != "") {
this.$root.channelUserId = this.$route.query.channelUserId;
}
},
mounted: function() {
var that = this;
var obj = this.$root.copyParams("", "getOssConfig", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
......@@ -233,11 +238,12 @@
that.action = d.data.url;
console.log(that.action, `oooooooooooooooooooooooooooo`);
});
this.handleSizeChange();
},
created: function() {
console.log(new Date(), new Date().toLocaleString('chinese', { hour12: false }));
if (this.$root.channelUserId != "" && this.$root.channelUserToken != "") {
this.handleSizeChange();
}
},
methods: {
tableRowClassName({ row, rowIndex }) {
if (rowIndex === 1) {
......@@ -251,16 +257,26 @@
console.log(index, row);
this.$router.push({ path: "/1688/jdindentdetail", query: { deliveryOrderNo: row.deliveryOrderNo } });
},
showBtn(index, row){
if (row.deliveryStatusName == "待上传材料") {
showSelf(index, row){
if (row.itemName == "商标自助注册" || row.itemName == "商标自主注册") {
return true;
} else {
return false;
}
},
showSup(index, row){
if (row.itemName == "专家辅助注册") {
return true;
} else {
return false;
}
},
goScheme(index, row){
},
handleSizeChange(){
console.log(this.currentPage);
if (this.currentPage) {
if (this.currentPage && this.$root.channelUserId != "") {
this.indentInfo.pageIndex = this.currentPage;
}
var obj = this.$root.copyParams(this.indentInfo, "getTmOrderList", "/action/tmOrder/springBoard");
......
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