Skip to content

Z
zhichan
Commit 328c2b23 by 宋毅
Options

Merge branch 'igirl-channel-jdweb' of gitlab.gongsibao.com:jiangyong/zhichan… 

Merge branch 'igirl-channel-jdweb' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-channel-jdweb
parents 2a356e75 d0911541
Showing with 40 additions and 26 deletions
igirl-channel-jdweb/app/front/entry/index.ejs
......@@ -59,7 +59,6 @@
<router-view></router-view>
</transition>
<div class="jdc-footer" v-show="headerHidden"></div>
</div>
<script src="/js/cropper/index.js"></script>
......
igirl-channel-jdweb/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-jdweb/app/front/vues/pages/bycnoticeindex/bycnoticeindex.js
......@@ -293,7 +293,7 @@
console.log(url);
*/
this.$router.push({
path: "jdbycnoticedetailtm", query: {
path: `/${this.$root.channelName}/jdbycnoticedetailtm`, query: {
name:row.sbmc,
sbqh:row.ggqh,
imgurl:row.linkurl,
......@@ -301,15 +301,9 @@
});
},
backbycnoticetm(){
var localurl = location.href;
console.log(localurl);
var base = localurl.split("bycnoticeindex");
var url = base[0] + "/bycnoticetm";
console.log(base);
console.log(url);
this.$root.pushx({
title: "",
name: "/jdbycnoticetm"
name: `/${this.$root.channelName}/jdbycnoticetm`
});
}
},
......
igirl-channel-jdweb/app/front/vues/pages/jdbycdetailtm/jdbycdetailtm.css
......@@ -387,3 +387,7 @@
font-size: 16px;
color:#62b5db;
}
.bycdirectsearch .el-tabs__content{
background: none;
}
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/jdbycdetailtm/jdbycdetailtm.js
......@@ -101,7 +101,7 @@
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
var obj = this.$root.copyParams(obj,"getCompanyInfoNoUser","/action/tmQuery/springBoard");
var obj = this.$root.copyParams(obj, "getCompanyInfoNoUser", "/action/tmQuery/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
loading.close();
if (d.status == 0) {
......@@ -113,7 +113,7 @@
that.companyInfo.name = name;
that.showMask = true;
}
}else{
} else {
that.$message.warning(d.msg);
}
}).catch(function (e) {
......@@ -134,7 +134,8 @@
zcggqh: row.zcgg
};
var that = this;
this.$root.postReq("/web/bytmqueryCtl/noticezcggsearch", obj).then(function (d) {
var obj = this.$root.copyParams(obj, "noticezcggsearch", "/action/tmQuery/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
if (d.status == 0) {
console.log(d);
that.sbmc = d.data.sbmc;
......@@ -166,7 +167,8 @@
csggqh: row.csgg
};
var that = this;
this.$root.postReq("/web/bytmqueryCtl/noticesearch", obj).then(function (d) {
var obj = this.$root.copyParams(obj, "noticesearch", "/action/tmQuery/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
if (d.status == 0) {
console.log(d);
that.sbmc = d.data.sbmc;
......
igirl-channel-jdweb/app/front/vues/pages/jdbycquerytm/jdbycquerytm.html
......@@ -250,7 +250,7 @@
</el-button>
</div>
</el-tab-pane>
<el-tab-pane label="商品/服务项" name="six" style="width: 620px;">
<!-- <el-tab-pane label="商品/服务项" name="six" style="width: 620px;">
<div style="position: relative;float:left">
<el-input class="input-input" v-model="nclfuwu"
style="width: 518px;height: 100%;border:1px solid #bbbbbb;border-right:none;"
......@@ -264,11 +264,7 @@
accept="image/png, image/jpeg, image/gif, image/jpg"
@change="uploadImg($event, 1)">
</div>
<!-- <el-button class="leibie-btn" slot="append" @click="checkClick">全部类别
<i class="iconfont cqtm-down">
&#xe664;
</i>
</el-button> -->
</el-input>
</div>
<div>
......@@ -276,7 +272,7 @@
@click="nclFuwusearchClick" style="margin-left: 0px !important;">检索
</el-button>
</div>
</el-tab-pane>
</el-tab-pane> -->
</el-tabs>
<div class="search-navArr">
<div @click="showznfx" v-if="0">批量检索</div>
......
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.js
......@@ -109,8 +109,8 @@
inputDate: null,
startTime: null,
entTime: null,
icbcStartTime:null,
icbcEntTime:null,
icbcStartTime: null,
icbcEntTime: null,
checkedStatus: null,
/**$ */
CreateDate: null,
......@@ -593,7 +593,7 @@
if (d.status == 0 && d.data) {
this.tableData = d.data;
/* 没有分页参数 需要重新改*/
this.countPage = 30 || d.data.length;
this.countPage = d.dataCount;
d.data.map((item, index) => {
if (item.submitTime) {
item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false });
......
igirl-channel-jdweb/app/front/vues/pages/jdtrademark/jdtrademark.js
......@@ -202,7 +202,8 @@
case "fzsbzc":
case "dbsbzc":
let productId = code.channelItemCode.split('-')[code.channelItemCode.split('-').length - 1];
let productId = code.channelItemCode.split('-')[1];
console.log(code.channelItemCode.split('-'),"xxxxxxxxxxxxxx");
window.open(`https://market.jdcloud.com/service/details/${productId}`);
break;
default:
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.js
......@@ -306,6 +306,7 @@
nclSelectedList: null,
orderSubInfo: null,
totalPrices: null,
dataList:[],
}
},
computed: Vuex.mapState({
......@@ -405,6 +406,7 @@
}
},
mounted: function() {
this.getItemCode();
var that = this;
console.log(this.tm_form_type);
var obj = this.$root.copyParams("", "getOssConfig", "/action/tmTools/springBoard");
......@@ -432,7 +434,20 @@
}
},
methods: {
getItemCode(){
var obj = this.$root.copyParams({ channelUserId: "", itemCode: "sbfu" }, "getProductListByTypeOneCode", "/action/tmOrder/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
this.$root.loading = false;
console.log(d, "cccccccccccccccccc");
if (d.status == 0) {
this.dataList = d.data;
this.dataList.map((item, index) => {
console.log(item.productDesc);
item.productDesc = JSON.parse(item.productDesc);
});
}
});
},
pointsRuleColor(i) {
if (i < parseInt(this.step)) {
return 'color: #FFFFFF;'
......@@ -1221,6 +1236,7 @@
return false;
}
if (!this.showConfrim) {
console.log(that.toTop);
that.toTop();
that.step = Number(that.step) + 1;
}
......@@ -1241,7 +1257,7 @@
tm: that.form,
apply: that.apply,
nclones: that.nclOne,
itemCode: that.itemCode,
itemCode: that.dataList[0].channelItemCode,
channelUser: {
channelUserId: that.$route.query.channelUserId
},
......@@ -1498,6 +1514,7 @@
if (scrollTop != 0) {
let timer = setInterval(() => {
window.scrollTo(0, scrollTop -= 20);
console.log(scrollTop);
if (scrollTop <= 0) clearInterval(timer);
}, 0);
};
......
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