Skip to content

Z
zhichan
Commit bf571b0a by 宋毅
Options

Merge branch 'igirl-channel-web' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-channel-web

parents 04b71da8 40391928
Showing with 72 additions and 39 deletions
igirl-channel-web/app/front/entry/index.ejs
...@@ -65,10 +65,11 @@ ...@@ -65,10 +65,11 @@
<!-- 启服通公共头 --> <!-- 启服通公共头 -->
<div class="commonchannel" v-if="channelName == 'bw' && !isLogin"> <div class="commonchannel" v-if="channelName == 'bw' && !isLogin">
<div> <div>
<div> <div @click="goHome">
<img src="/imgs/pt.jpg" alt=""> <img :src="logoImg" alt="">
</div> </div>
<span>{{channelMessage}}工商、商标注册平台</span> <!-- <span>{{channelMessage}}工商、商标注册平台</span> -->
<router-link :to="homeUrl" class="commonchannel-menu">首页</router-link>
</div> </div>
<div v-if="user_Name"> <div v-if="user_Name">
<el-dropdown @command="headerMenu"> <el-dropdown @command="headerMenu">
......
igirl-channel-web/app/front/entry/public/css/index.css
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
.commonchannel>div:nth-child(1)>div { .commonchannel>div:nth-child(1)>div {
height: 40px; height: 40px;
display: inline-block; display: inline-block;
cursor: pointer;
} }
.commonchannel>div:nth-child(1)>div>img { .commonchannel>div:nth-child(1)>div>img {
...@@ -72,4 +73,14 @@ ...@@ -72,4 +73,14 @@
.commonchannel .el-dropdown-link { .commonchannel .el-dropdown-link {
color: #fff; color: #fff;
cursor: pointer; cursor: pointer;
}
.commonchannel-menu{
margin-left: 15px;
cursor: pointer;
color: #fff;
}
.commonchannel-menu:hover{
color:#32b6e7;
} }
\ No newline at end of file
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
...@@ -172,6 +172,8 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -172,6 +172,8 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
user_Name: "", user_Name: "",
channelMessage: "", channelMessage: "",
isLogin: false, isLogin: false,
logoImg: null,
homeUrl: "",
}; };
}, },
created() { created() {
...@@ -223,6 +225,8 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -223,6 +225,8 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
break; break;
case 'bw': case 'bw':
title.innerText = "百望商标注册服务"; title.innerText = "百望商标注册服务";
this.logoImg = '/imgs/bwlogo.png';
this.homeUrl = "/bw/jdtrademark";
break; break;
case '1688': case '1688':
title.innerText = "1688商标注册服务"; title.innerText = "1688商标注册服务";
...@@ -235,6 +239,9 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -235,6 +239,9 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
break; break;
} }
}, },
goHome() {
this.$router.push(this.homeUrl);
},
headerMenu(key) { headerMenu(key) {
console.log(key); console.log(key);
switch (key) { switch (key) {
......
igirl-channel-web/app/front/vues/pages/bwselftmreg/bwselftmreg.html
...@@ -729,7 +729,6 @@ ...@@ -729,7 +729,6 @@
border: 0px;" @click="submitForm(\'order\')" :disabled="!isRead">提交订单</el-button> border: 0px;" @click="submitForm(\'order\')" :disabled="!isRead">提交订单</el-button>
</div> </div>
</div> </div>
</div> </div>
<div class="step3-submit"> <div class="step3-submit">
......
igirl-channel-web/app/front/vues/pages/bwselftmreg/bwselftmreg.js
...@@ -450,17 +450,14 @@ ...@@ -450,17 +450,14 @@
} }
}, },
getItemCode(){ getItemCode(){
var obj = this.$root.copyParams({ channelUserId: "", itemCode: "sbfu" }, "getProductListByTypeOneCode", "/action/tmOrder/springBoard"); var obj = this.$root.copyParams({ channelUserId: "", channelItemCode: this.$route.query.sdsId }, "getProductDetail", "/action/tmOrder/springBoard");
this.$root.loading = true;
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
this.$root.loading = false; this.$root.loading = false;
console.log(d, "cccccccccccccccccc"); console.log(d, "cccccccccccccccccc");
if (d.status == 0) { if (d.status == 0) {
this.form.totalPrices = d.data[0].proPrice; this.form.totalPrices = d.data.proPrice;
this.dataList = d.data; this.dataList = d.data;
this.dataList.map((item, index) => {
console.log(item.productDesc);
item.productDesc = JSON.parse(item.productDesc);
});
} }
}); });
}, },
...@@ -1277,7 +1274,7 @@ ...@@ -1277,7 +1274,7 @@
tm: that.form, tm: that.form,
apply: that.apply, apply: that.apply,
nclones: that.nclOne, nclones: that.nclOne,
itemCode: that.dataList[0].channelItemCode, itemCode: that.dataList.channelItemCode,
channelUser: { channelUser: {
channelUserId: that.$route.query.channelUserId channelUserId: that.$route.query.channelUserId
}, },
...@@ -1310,7 +1307,7 @@ ...@@ -1310,7 +1307,7 @@
tm: that.form, tm: that.form,
apply: that.apply, apply: that.apply,
nclones: that.nclOne, nclones: that.nclOne,
itemCode: that.dataList[0].channelItemCode, itemCode: that.dataList.channelItemCode,
channelUser: { channelUser: {
channelUserId: that.$route.query.channelUserId channelUserId: that.$route.query.channelUserId
}, },
...@@ -1385,7 +1382,7 @@ ...@@ -1385,7 +1382,7 @@
tm: that.form, tm: that.form,
apply: that.apply, apply: that.apply,
nclones: that.nclOne, nclones: that.nclOne,
itemCode: that.dataList[0].channelItemCode, itemCode: that.dataList.channelItemCode,
channelUser: { channelUser: {
channelUserId: that.$route.query.channelUserId channelUserId: that.$route.query.channelUserId
}, },
...@@ -1419,7 +1416,7 @@ ...@@ -1419,7 +1416,7 @@
tm: that.form, tm: that.form,
apply: that.apply, apply: that.apply,
nclones: that.nclOne, nclones: that.nclOne,
itemCode: that.dataList[0].channelItemCode, itemCode: that.dataList.channelItemCode,
channelUser: { channelUser: {
channelUserId: that.$route.query.channelUserId channelUserId: that.$route.query.channelUserId
}, },
......
igirl-channel-web/app/front/vues/pages/jdtrademark/jdtrademark.js
...@@ -244,7 +244,6 @@ ...@@ -244,7 +244,6 @@
} }
break; break;
case "bw": case "bw":
if (code.channelItemCode) { if (code.channelItemCode) {
switch (code.itemCode) { switch (code.itemCode) {
case "zzsbzc": case "zzsbzc":
......
igirl-channel-web/app/front/vues/pages/orderpay/orderpay.css
...@@ -110,4 +110,15 @@ ...@@ -110,4 +110,15 @@
.order-menu-btnhide { .order-menu-btnhide {
border-bottom: none; border-bottom: none;
}
.payType_wxzf .avatar-uploader{
width: 60px;
height: 60px;
text-align: center;
border: 1px solid;
line-height: 60px;
}
.payType_wxzf .avatar-uploader .avatar-uploader-icon{
font-size: 20px;
} }
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/orderpay/orderpay.html
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<div style="display: inline-block;margin-left:5px;font-size: 16px;clor: #555;">请选择支付方式</div> <div style="display: inline-block;margin-left:5px;font-size: 16px;clor: #555;">请选择支付方式</div>
<div style="display: inline-block;margin-left:10px;font-size:12px;color:rgba(130,130,130,1);"> <img <div style="display: inline-block;margin-left:10px;font-size:12px;color:rgba(130,130,130,1);"> <img
style="vertical-align: middle;margin-bottom: 2px;" src="imgs/exclamation-circle-o.png" alt=""> style="vertical-align: middle;margin-bottom: 2px;" src="imgs/exclamation-circle-o.png" alt="">
<i class="el-icon-warning-outline" style="color:#3071FE;"></i> <i class="el-icon-warning-outline" style="color:#3071FE;"></i>
付款账户为公司账户，则可以为付款的公司账户开具发票；如果是个人账户，则只能为付款人或申请人开具发票，请选择合适的付款账户。</div> 付款账户为公司账户，则可以为付款的公司账户开具发票；如果是个人账户，则只能为付款人或申请人开具发票，请选择合适的付款账户。</div>
</el-row> </el-row>
</div> </div>
...@@ -64,14 +64,14 @@ ...@@ -64,14 +64,14 @@
</el-button> </el-button>
</div> </div>
<div class="el5"> <div class="el5">
<el-button style="font-size:14px; <!-- <el-button style="font-size:14px;
font-family:PingFangSC-Regular; font-family:PingFangSC-Regular;
font-weight:400; font-weight:400;
color:rgba(130,130,130,1);" :class="{\'order-menu-btnhide\':currentPay3}" @click="toOtherPeoplePay"> color:rgba(130,130,130,1);" :class="{\'order-menu-btnhide\':currentPay3}" @click="toOtherPeoplePay">
<img style="float: left; <img style="float: left;
margin-right: 10px;" src="imgs/icon_daifu.png" alt=""> margin-right: 10px;" src="imgs/icon_daifu.png" alt="">
他人代付 他人代付
</el-button> </el-button> -->
</div> </div>
</el-row> </el-row>
</div> </div>
...@@ -162,7 +162,9 @@ ...@@ -162,7 +162,9 @@
<div style="width:250px; margin-left: 270px;margin-top: -35px;"> <div style="width:250px; margin-left: 270px;margin-top: -35px;">
<!-- <el-button size="mini" plain @click="function(){payType=\'\';closePayConfirm()}" >取消支付</el-button> --> <!-- <el-button size="mini" plain @click="function(){payType=\'\';closePayConfirm()}" >取消支付</el-button> -->
<el-button style="padding: 0;height: 36px;width: 100px;border-radius: 0;color: #3071FE;border-color: #3071FE;" @click="toWxPay">刷新支付码</el-button> <el-button
style="padding: 0;height: 36px;width: 100px;border-radius: 0;color: #3071FE;border-color: #3071FE;"
@click="toWxPay">刷新支付码</el-button>
</div> </div>
</div> </div>
<div style="clear:both"></div> <div style="clear:both"></div>
...@@ -182,7 +184,9 @@ ...@@ -182,7 +184,9 @@
<div style="width:250px; margin-left: 270px;margin-top: -35px;"> <div style="width:250px; margin-left: 270px;margin-top: -35px;">
<!-- <el-button size="mini" plain @click="function(){payType=\'\';closePayConfirm()}" >取消支付</el-button> --> <!-- <el-button size="mini" plain @click="function(){payType=\'\';closePayConfirm()}" >取消支付</el-button> -->
<el-button style="padding: 0;height: 36px;width: 100px;border-radius: 0;color: #3071FE;border-color: #3071FE;" @click="toWxPay">刷新支付码</el-button> <el-button
style="padding: 0;height: 36px;width: 100px;border-radius: 0;color: #3071FE;border-color: #3071FE;"
@click="toWxPay">刷新支付码</el-button>
</div> </div>
</div> </div>
<div style="clear:both"></div> <div style="clear:both"></div>
...@@ -196,18 +200,15 @@ ...@@ -196,18 +200,15 @@
<div style="width:100%;padding: 30px;box-sizing: border-box;"> <div style="width:100%;padding: 30px;box-sizing: border-box;">
<el-row> <el-row>
<el-col :span="24">付款账户: <el-col :span="24">付款账户:
<el-select @change="bankchange" v-model="account_index" placeholder="请选择付款账户"> <span>招商银行股份有限公司北京青年路支行</span>
<el-option v-for="(item,index) in accounts" :key="index" :label="item.name" :value="index">
</el-option>
</el-select>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="accountinfo && accountinfo.id" :gitter="20" style="margin-top:10px;font-size: 14px;"> <el-row :gitter="20" style="margin-top:10px;font-size: 14px;">
<el-col style="line-height: 40px" :span="24"><span <el-col style="line-height: 40px" :span="24"><span
style="color:#828282;">收款人：</span>{{accountinfo.payeeName}}</el-col> style="color:#828282;">收款人：</span>北京创知厚德科技有限公司</el-col>
<el-col style="line-height: 40px" :span="24"><span style="color:#828282;">开户行：</span>{{accountinfo.name}} <el-col style="line-height: 40px" :span="24"><span style="color:#828282;">开户行：</span>招商银行股份有限公司北京青年路支行
</el-col> </el-col>
<el-col style="line-height: 40px" :span="24"><span style="color:#828282;">帐号：</span>{{accountinfo.code}} <el-col style="line-height: 40px" :span="24"><span style="color:#828282;">帐号：</span>1109 2357 7310 301
</el-col> </el-col>
<!-- <el-col :span="8">帐户类型：<el-input style="width:70%;" disabled v-model="accountinfo.accountTypeName" placeholder=""></el-input></el-col> <!-- <el-col :span="8">帐户类型：<el-input style="width:70%;" disabled v-model="accountinfo.accountTypeName" placeholder=""></el-input></el-col>
<el-col :span="8">开户行：<el-input style="width:70%;" disabled v-model="accountinfo.name" placeholder=""></el-input></el-col> <el-col :span="8">开户行：<el-input style="width:70%;" disabled v-model="accountinfo.name" placeholder=""></el-input></el-col>
......
igirl-channel-web/app/front/vues/pages/paysuccess/paysuccess.css
.common-paysuccess-warpper {
padding: 30px 0;
width: 100%;
background: rgba(245, 245, 247, 1);
height: 90vh;
box-sizing: border-box;
}
.common-paysuccess { .common-paysuccess {
width: 1200px; width: 1200px;
margin: 0 auto; margin: 0 auto;
padding: 100px 0 165px 0;
background: #FFFFFF;
} }
.common-paysuccess-main { .common-paysuccess-main {
...@@ -52,9 +62,7 @@ ...@@ -52,9 +62,7 @@
height: 100%; height: 100%;
} }
.common-paysuccess-main {
margin-top: 120px;
}
.common-paysuccess-main>div:nth-child(2) { .common-paysuccess-main>div:nth-child(2) {
display: inline-block; display: inline-block;
......
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.js
...@@ -489,17 +489,14 @@ ...@@ -489,17 +489,14 @@
} }
}, },
getItemCode(){ getItemCode(){
var obj = this.$root.copyParams({ channelUserId: "", itemCode: "sbfu" }, "getProductListByTypeOneCode", "/action/tmOrder/springBoard"); var obj = this.$root.copyParams({ channelUserId: "", channelItemCode: this.$route.query.sdsId }, "getProductDetail", "/action/tmOrder/springBoard");
this.$root.loading = true;
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
this.$root.loading = false; this.$root.loading = false;
console.log(d, "cccccccccccccccccc"); console.log(d, "cccccccccccccccccc");
if (d.status == 0) { if (d.status == 0) {
this.form.totalPrices = d.data[0].proPrice; this.form.totalPrices = d.data.proPrice;
this.dataList = d.data; this.dataList = d.data;
this.dataList.map((item, index) => {
console.log(item.productDesc);
item.productDesc = JSON.parse(item.productDesc);
});
} }
}); });
}, },
...@@ -1309,7 +1306,7 @@ ...@@ -1309,7 +1306,7 @@
tm: that.form, tm: that.form,
apply: that.apply, apply: that.apply,
nclones: that.nclOne, nclones: that.nclOne,
itemCode: that.dataList[0].channelItemCode, itemCode: that.dataList.channelItemCode,
channelUser: { channelUser: {
channelUserId: that.$route.query.channelUserId channelUserId: that.$route.query.channelUserId
}, },
......
igirl-channel-web/app/front/vues/pages/servicedetails/servicedetails.html
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
style="color:#ff5135;font-size:18px">&yen;&nbsp;{{serviceItem.price?serviceItem.price.toFixed(2):0}}</b> style="color:#ff5135;font-size:18px">&yen;&nbsp;{{serviceItem.price?serviceItem.price.toFixed(2):0}}</b>
</div> </div>
<div class="sds-operate"> <div class="sds-operate">
<span class="sds-op2" @click="showneed()">提交需求</span> <!-- <span class="sds-op2" @click="showneed()">提交需求</span> -->
<span class="sds-op1" @click="sdsOp2()">立即购买</span> <span class="sds-op1" @click="sdsOp2()">立即购买</span>
</div> </div>
<p>服务承诺：全流程服务 全程公开透明</p> <p>服务承诺：全流程服务 全程公开透明</p>
......
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