Skip to content

Z
zhichan
Commit bda3a5b6 by 刘泽奇
Options

123

parent 69e1799d
Showing with 67 additions and 25 deletions
igirl-channel-jdweb/app/front/entry/index.ejs
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<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="selfFooterShow"></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/entry/public/js/index.js
...@@ -158,6 +158,8 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -158,6 +158,8 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
channelUserId: "", channelUserId: "",
headerHidden: null, headerHidden: null,
channelName: '', channelName: '',
selfFooterShow: true,
}; };
}, },
created() { created() {
...@@ -175,15 +177,20 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -175,15 +177,20 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
mounted() { mounted() {
setTimeout(() => { setTimeout(() => {
if (location.hash.split('/')[1] == "jd") { if (location.hash.split('/')[1] == "jd") {
console.log("zzzzzzzzzzzzzzz", location.hash.split('/')[1], this.headerHidden); console.log("zzzzzzzzzzzzzzz", location.hash.split('/'), this.headerHidden);
this.headerHidden = true; this.headerHidden = true;
var find = location.hash.indexOf('/selftmreg');
if (find == -1) {
this.selfFooterShow = true;
} else {
this.selfFooterShow = false;
}
} else { } else {
this.headerHidden = false; this.headerHidden = false;
this.selfFooterShow = false;
console.log("zzzzzzzzzzzzzzz", location.hash.split('/')[1], this.headerHidden); console.log("zzzzzzzzzzzzzzz", location.hash.split('/')[1], this.headerHidden);
} }
}, 500); }, 500);
var self = this; var self = this;
if (!this.currentUser) { if (!this.currentUser) {
this.logins.push({ "icon": "el-icon-location-outline", "title": "登录", "type": "text", key: "login", "isOnGrid": true }); this.logins.push({ "icon": "el-icon-location-outline", "title": "登录", "type": "text", key: "login", "isOnGrid": true });
......
igirl-channel-jdweb/app/front/vues/pages/jdbycquerytm/jdbycquerytm.css
...@@ -3195,10 +3195,10 @@ var { ...@@ -3195,10 +3195,10 @@ var {
font-size: 12px; font-size: 12px;
} }
.search-warp-row01 .nianfen-warp { /* .search-warp-row01 .nianfen-warp {
border-bottom: none; border-bottom: none;
padding-bottom: 0; padding-bottom: 0;
} } */
.falv-warp .item var, .falv-warp .item var,
.falv-warp span, .falv-warp span,
......
igirl-channel-jdweb/app/front/vues/pages/jdbycquerytm/jdbycquerytm.html
<gsb-pcpage> <gsb-pcpage>
<div class="bycquerytm"> <div class="bycquerytm">
<div class="jdindentdetail-nav" style="width:1200px;margin:12px auto;padding: 0;height:24px;">
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="listPath">商标注册服务
</el-breadcrumb-item>
<el-breadcrumb-item>商标检索</el-breadcrumb-item>
</el-breadcrumb>
</div>
<el-dialog width="30%" :visible.sync="showLargePic"> <el-dialog width="30%" :visible.sync="showLargePic">
<img style="width:100%;height:auto" :src="largePicUrl"> <img style="width:100%;height:auto" :src="largePicUrl">
</el-dialog> </el-dialog>
...@@ -373,7 +380,7 @@ ...@@ -373,7 +380,7 @@
<!--申请类别--> <!--申请类别-->
<gsb-collapse2 class="shenqing-warp"> <gsb-collapse2 class="shenqing-warp">
<el-row slot="desc"> <el-row slot="desc">
<el-col :span="2" style="padding:3px 0;color: #828282"> <el-col :span="2" style="margin-top:3px;padding:3px 0;color: #828282">
<span>申请类别:</span> <span>申请类别:</span>
</el-col> </el-col>
<el-col class="item" v-for="o in sqlbdata.slice(0,5)" :key="o" :span="3"> <el-col class="item" v-for="o in sqlbdata.slice(0,5)" :key="o" :span="3">
......
igirl-channel-jdweb/app/front/vues/pages/jdbycquerytm/jdbycquerytm.js
...@@ -7,6 +7,13 @@ ...@@ -7,6 +7,13 @@
props: ["title"], props: ["title"],
data: function () { data: function () {
return { return {
listPath: {
path: `/${this.$root.channelName}/jdtrademark`,
query: {
channelUserId: this.$route.query.channelUserId,
deliveryOrderNo: this.deliveryOrderNo,
}
},
showLargePic: false, showLargePic: false,
largePicUrl: "", largePicUrl: "",
dialogFormVisible: false, dialogFormVisible: false,
...@@ -1545,8 +1552,19 @@ ...@@ -1545,8 +1552,19 @@
if (this.activeName == "six") { if (this.activeName == "six") {
this.nclFuwusearch(); this.nclFuwusearch();
} }
this.toTop();
} }
, ,
toTop(){
var scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
if (scrollTop != 0) {
let timer = setInterval(() => {
window.scrollTo(0, scrollTop -= 20);
console.log(scrollTop);
if (scrollTop <= 0) clearInterval(timer);
}, 0);
};
},
handleCurrentChange(val) handleCurrentChange(val)
{ {
this.page = val; this.page = val;
...@@ -2599,13 +2617,13 @@ ...@@ -2599,13 +2617,13 @@
} else { } else {
console.log(d.msg); console.log(d.msg);
} }
}).then(()=>{ }).then(() => {
}).catch(function (e) { }).catch(function (e) {
console.log(e); console.log(e);
}); });
}); });
if (this.activeName == "five") { if (this.activeName == "five") {
this.a = false; this.a = false;
this.b = true; this.b = true;
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/index.css
...@@ -485,6 +485,7 @@ ...@@ -485,6 +485,7 @@
font-family: PingFangSC; font-family: PingFangSC;
font-weight: 400; font-weight: 400;
color: rgba(83, 83, 83, 1); color: rgba(83, 83, 83, 1);
margin-bottom: 15px;
} }
/* sss */ /* sss */
...@@ -630,9 +631,9 @@ ...@@ -630,9 +631,9 @@
} }
.step2-footer>button { .step2-footer>button {
background: #FFFFFF; background: rgb(81, 210, 183);
border: 1px solid #0989C5; border: 0px solid #0989C5;
color: #0989C5; color: #fff;
border-radius: 0; border-radius: 0;
} }
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.html
<div id="selftmreg" style="background-color:white;"> <div id="selftmreg" style="background-color:white;">
<div class="jdindentdetail-nav" style="width:1200px;margin:12px auto;padding: 0;height:24px;"> <div class="jdindentdetail-nav" style="width:1200px;margin:12px auto;padding: 0;height:24px;">
<span>当前位置：</span>
<el-breadcrumb separator-class="el-icon-arrow-right"> <el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="listPath">商标注册 <el-breadcrumb-item :to="listPath">商标注册服务
</el-breadcrumb-item> </el-breadcrumb-item>
<el-breadcrumb-item>自助商标注册</el-breadcrumb-item> <el-breadcrumb-item>自助商标注册</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
...@@ -237,7 +236,7 @@ ...@@ -237,7 +236,7 @@
style="color:#E50778;font-style: normal;">￥{{form.totalPublicExpense}}</i></span> --> style="color:#E50778;font-style: normal;">￥{{form.totalPublicExpense}}</i></span> -->
<span style="margin-right:30px;text-align: center;color: #03004C;">应付总额：<i <span style="margin-right:30px;text-align: center;color: #03004C;">应付总额：<i
style="color:#E50778;font-style: normal;font-size: 24px;">￥{{totalPrices?totalPrices:0}}</i></span> style="color:#E50778;font-style: normal;font-size: 24px;">￥{{totalPrices?totalPrices:0}}</i></span>
<el-button type="primary" style=" background: #0989C5;border-radius:0;color:#fff;" <el-button type="primary" style=" background: rgb(81, 210, 183);border-radius:0;color:#fff;border:0;"
@click="submitForm(\'form\')">下一步</el-button> @click="submitForm(\'form\')">下一步</el-button>
</div> </div>
</div> </div>
...@@ -528,7 +527,8 @@ ...@@ -528,7 +527,8 @@
</div> </div>
<div style="text-align:center;padding-bottom:50px;" class="step2-footer"> <div style="text-align:center;padding-bottom:50px;" class="step2-footer">
<el-button @click="tobefore">上一步</el-button> <el-button @click="tobefore">上一步</el-button>
<el-button type="primary" @click="submitForm(\'apply\')">下一步</el-button> <el-button style="" type="primary" @click="submitForm(\'apply\')">
下一步</el-button>
</div> </div>
</el-form> </el-form>
<!-- page3 --> <!-- page3 -->
...@@ -693,7 +693,8 @@ ...@@ -693,7 +693,8 @@
<label style="cursor: pointer;">我已阅读 <span style="color:#0F8EE9">《商标服务合同》</span>且同意该合同内容</label> <label style="cursor: pointer;">我已阅读 <span style="color:#0F8EE9">《商标服务合同》</span>且同意该合同内容</label>
</div> </div>
<el-button type="primary" @click="submitForm(\'order\')" :disabled="!isRead">提交订单</el-button> <el-button type="primary" style="background:rgb(81, 210, 183);border:0; " @click="submitForm(\'order\')"
:disabled="!isRead">提交订单</el-button>
</div> </div>
</div> </div>
...@@ -788,11 +789,11 @@ ...@@ -788,11 +789,11 @@
{{message.info}} {{message.info}}
</div> </div>
</transition> </transition>
<el-dialog title="提示" :visible.sync="showConfrim" width="30%" style="z-Index:9999;"> <el-dialog title="提示" :visible.sync="showConfrim" width="30%" style="z-Index:9999;">
<div v-for="(item, index) in nclOne" :key="index" style="margin-bottom:10px;"> <div v-for="(item, index) in nclOne" :key="index" style="margin-bottom:10px;">
{{item.code}}类{{item.name}}，商品/服务项目<span {{item.code}}类{{item.name}}，商品/服务项目<span
style="color:red;">不足10项</span>，已选{{item.checked}}项，还可选{{10-item.checked}}个小项</span> style="color:red;">不足10项</span>，已选{{item.checked}}项，还可选{{10-item.checked}}个小项</span>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button style="background:#66b1ff;border-color: #66b1ff;color: #FFF;" @click="closeConfrim()">修 改</el-button> <el-button style="background:#66b1ff;border-color: #66b1ff;color: #FFF;" @click="closeConfrim()">修 改</el-button>
<el-button style="background:#fff;border-color: #DCDFE6;color: #606266;" type="primary" <el-button style="background:#fff;border-color: #DCDFE6;color: #606266;" type="primary"
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.js
...@@ -306,7 +306,7 @@ ...@@ -306,7 +306,7 @@
nclSelectedList: null, nclSelectedList: null,
orderSubInfo: null, orderSubInfo: null,
totalPrices: null, totalPrices: null,
dataList:[], dataList: [],
} }
}, },
computed: Vuex.mapState({ computed: Vuex.mapState({
...@@ -406,6 +406,7 @@ ...@@ -406,6 +406,7 @@
} }
}, },
mounted: function() { mounted: function() {
this.$root.selfFooterShow = false;
this.getItemCode(); this.getItemCode();
var that = this; var that = this;
console.log(this.tm_form_type); console.log(this.tm_form_type);
...@@ -433,6 +434,13 @@ ...@@ -433,6 +434,13 @@
console.log(this.$route.query, this.channelInfo, `xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx`); console.log(this.$route.query, this.channelInfo, `xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
} }
}, },
destroyed() {
/*
console.log(this.$root.selfFooterShow);
this.$root.selfFooterShow = true;
*/
},
methods: { methods: {
getItemCode(){ getItemCode(){
var obj = this.$root.copyParams({ channelUserId: "", itemCode: "sbfu" }, "getProductListByTypeOneCode", "/action/tmOrder/springBoard"); var obj = this.$root.copyParams({ channelUserId: "", itemCode: "sbfu" }, "getProductListByTypeOneCode", "/action/tmOrder/springBoard");
...@@ -1275,7 +1283,7 @@ ...@@ -1275,7 +1283,7 @@
that.$message.warning("操作成功"); that.$message.warning("操作成功");
location.href = d.data.payUrl; location.href = d.data.payUrl;
} else { } else {
console.log(d,"subTmOrder..........",); console.log(d, "subTmOrder..........");
that.$message.warning(d.msg); that.$message.warning(d.msg);
} }
}).catch(function (e) { }).catch(function (e) {
......
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