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 46 additions and 32 deletions
igirl-channel-jdweb/app/front/entry/index.ejs
...@@ -54,12 +54,11 @@ ...@@ -54,12 +54,11 @@
<div id="app" v-loading.fullscreen.lock="loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="app-main" <div id="app" v-loading.fullscreen.lock="loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="app-main"
style="visibility:hidden"> style="visibility:hidden">
<div class="jc_hd" v-show="headerHidden"></div> <div class="jc_hd" v-show="headerHidden"></div>
<transition name="slide-fade"> <transition name="slide-fade">
<router-view></router-view> <router-view></router-view>
</transition> </transition>
<div class="jdc-footer" v-show="headerHidden"></div> <div class="jdc-footer" v-show="headerHidden"></div>
</div> </div>
<script src="/js/cropper/index.js"></script> <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 @@ ...@@ -293,7 +293,7 @@
console.log(url); console.log(url);
*/ */
this.$router.push({ this.$router.push({
path: "jdbycnoticedetailtm", query: { path: `/${this.$root.channelName}/jdbycnoticedetailtm`, query: {
name:row.sbmc, name:row.sbmc,
sbqh:row.ggqh, sbqh:row.ggqh,
imgurl:row.linkurl, imgurl:row.linkurl,
...@@ -301,15 +301,9 @@ ...@@ -301,15 +301,9 @@
}); });
}, },
backbycnoticetm(){ 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({ this.$root.pushx({
title: "", title: "",
name: "/jdbycnoticetm" name: `/${this.$root.channelName}/jdbycnoticetm`
}); });
} }
}, },
......
igirl-channel-jdweb/app/front/vues/pages/jdbycdetailtm/jdbycdetailtm.css
...@@ -386,4 +386,8 @@ ...@@ -386,4 +386,8 @@
.jdbycdetailtm-breadcrumb .el-breadcrumb__item .el-breadcrumb__inner{ .jdbycdetailtm-breadcrumb .el-breadcrumb__item .el-breadcrumb__inner{
font-size: 16px; font-size: 16px;
color:#62b5db; 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 @@ ...@@ -101,7 +101,7 @@
spinner: 'el-icon-loading', spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)' 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) { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
loading.close(); loading.close();
if (d.status == 0) { if (d.status == 0) {
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
that.companyInfo.name = name; that.companyInfo.name = name;
that.showMask = true; that.showMask = true;
} }
}else{ } else {
that.$message.warning(d.msg); that.$message.warning(d.msg);
} }
}).catch(function (e) { }).catch(function (e) {
...@@ -134,7 +134,8 @@ ...@@ -134,7 +134,8 @@
zcggqh: row.zcgg zcggqh: row.zcgg
}; };
var that = this; 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) { if (d.status == 0) {
console.log(d); console.log(d);
that.sbmc = d.data.sbmc; that.sbmc = d.data.sbmc;
...@@ -166,7 +167,8 @@ ...@@ -166,7 +167,8 @@
csggqh: row.csgg csggqh: row.csgg
}; };
var that = this; 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) { if (d.status == 0) {
console.log(d); console.log(d);
that.sbmc = d.data.sbmc; that.sbmc = d.data.sbmc;
...@@ -229,7 +231,7 @@ ...@@ -229,7 +231,7 @@
background: 'rgba(0, 0, 0, 0.7)' background: 'rgba(0, 0, 0, 0.7)'
}); });
var obj = this.$root.copyParams(obj, "tradeMarkDetail", "/action/tmQuery/springBoard"); var obj = this.$root.copyParams(obj, "tradeMarkDetail", "/action/tmQuery/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
loading.close(); loading.close();
if (d.data.detaildata[0]) { if (d.data.detaildata[0]) {
......
igirl-channel-jdweb/app/front/vues/pages/jdbycquerytm/jdbycquerytm.html
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
</el-button> </el-button>
</div> </div>
</el-tab-pane> </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"> <div style="position: relative;float:left">
<el-input class="input-input" v-model="nclfuwu" <el-input class="input-input" v-model="nclfuwu"
style="width: 518px;height: 100%;border:1px solid #bbbbbb;border-right:none;" style="width: 518px;height: 100%;border:1px solid #bbbbbb;border-right:none;"
...@@ -264,11 +264,7 @@ ...@@ -264,11 +264,7 @@
accept="image/png, image/jpeg, image/gif, image/jpg" accept="image/png, image/jpeg, image/gif, image/jpg"
@change="uploadImg($event, 1)"> @change="uploadImg($event, 1)">
</div> </div>
<!-- <el-button class="leibie-btn" slot="append" @click="checkClick">全部类别
<i class="iconfont cqtm-down">
&#xe664;
</i>
</el-button> -->
</el-input> </el-input>
</div> </div>
<div> <div>
...@@ -276,7 +272,7 @@ ...@@ -276,7 +272,7 @@
@click="nclFuwusearchClick" style="margin-left: 0px !important;">检索 @click="nclFuwusearchClick" style="margin-left: 0px !important;">检索
</el-button> </el-button>
</div> </div>
</el-tab-pane> </el-tab-pane> -->
</el-tabs> </el-tabs>
<div class="search-navArr"> <div class="search-navArr">
<div @click="showznfx" v-if="0">批量检索</div> <div @click="showznfx" v-if="0">批量检索</div>
......
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.js
...@@ -109,8 +109,8 @@ ...@@ -109,8 +109,8 @@
inputDate: null, inputDate: null,
startTime: null, startTime: null,
entTime: null, entTime: null,
icbcStartTime:null, icbcStartTime: null,
icbcEntTime:null, icbcEntTime: null,
checkedStatus: null, checkedStatus: null,
/**$ */ /**$ */
CreateDate: null, CreateDate: null,
...@@ -593,7 +593,7 @@ ...@@ -593,7 +593,7 @@
if (d.status == 0 && d.data) { if (d.status == 0 && d.data) {
this.tableData = d.data; this.tableData = d.data;
/* 没有分页参数 需要重新改*/ /* 没有分页参数 需要重新改*/
this.countPage = 30 || d.data.length; this.countPage = d.dataCount;
d.data.map((item, index) => { d.data.map((item, index) => {
if (item.submitTime) { if (item.submitTime) {
item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false }); item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false });
......
igirl-channel-jdweb/app/front/vues/pages/jdtrademark/jdtrademark.js
...@@ -202,7 +202,8 @@ ...@@ -202,7 +202,8 @@
case "fzsbzc": case "fzsbzc":
case "dbsbzc": 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}`); window.open(`https://market.jdcloud.com/service/details/${productId}`);
break; break;
default: default:
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.js
...@@ -306,6 +306,7 @@ ...@@ -306,6 +306,7 @@
nclSelectedList: null, nclSelectedList: null,
orderSubInfo: null, orderSubInfo: null,
totalPrices: null, totalPrices: null,
dataList:[],
} }
}, },
computed: Vuex.mapState({ computed: Vuex.mapState({
...@@ -405,6 +406,7 @@ ...@@ -405,6 +406,7 @@
} }
}, },
mounted: function() { mounted: function() {
this.getItemCode();
var that = this; var that = this;
console.log(this.tm_form_type); console.log(this.tm_form_type);
var obj = this.$root.copyParams("", "getOssConfig", "/action/tmTools/springBoard"); var obj = this.$root.copyParams("", "getOssConfig", "/action/tmTools/springBoard");
...@@ -432,7 +434,20 @@ ...@@ -432,7 +434,20 @@
} }
}, },
methods: { 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) { pointsRuleColor(i) {
if (i < parseInt(this.step)) { if (i < parseInt(this.step)) {
return 'color: #FFFFFF;' return 'color: #FFFFFF;'
...@@ -1221,6 +1236,7 @@ ...@@ -1221,6 +1236,7 @@
return false; return false;
} }
if (!this.showConfrim) { if (!this.showConfrim) {
console.log(that.toTop);
that.toTop(); that.toTop();
that.step = Number(that.step) + 1; that.step = Number(that.step) + 1;
} }
...@@ -1241,7 +1257,7 @@ ...@@ -1241,7 +1257,7 @@
tm: that.form, tm: that.form,
apply: that.apply, apply: that.apply,
nclones: that.nclOne, nclones: that.nclOne,
itemCode: that.itemCode, itemCode: that.dataList[0].channelItemCode,
channelUser: { channelUser: {
channelUserId: that.$route.query.channelUserId channelUserId: that.$route.query.channelUserId
}, },
...@@ -1498,6 +1514,7 @@ ...@@ -1498,6 +1514,7 @@
if (scrollTop != 0) { if (scrollTop != 0) {
let timer = setInterval(() => { let timer = setInterval(() => {
window.scrollTo(0, scrollTop -= 20); window.scrollTo(0, scrollTop -= 20);
console.log(scrollTop);
if (scrollTop <= 0) clearInterval(timer); if (scrollTop <= 0) clearInterval(timer);
}, 0); }, 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