Skip to content

Z
zhichan
Commit 28286884 by 刘泽奇
Options

123

parent 29e29822
Showing with 176 additions and 96 deletions
igirl-channel-web/app/front/entry/public/css/index.css
......@@ -76,9 +76,10 @@
}
.commonchannel-menu{
margin-left: 15px;
margin-left: 24px;
cursor: pointer;
color: #fff;
font-size: 14px;
}
.commonchannel-menu:hover{
......
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/vues/pages/bwselftmreg/bwselftmreg.js
......@@ -369,9 +369,9 @@
console.log(newVal.length, 1111111111111, oldVal.length);
newVal.map((item, index) => {
if (item.nclThree.length > 10) {
this.form.totalSum += Number(item.nclThree.length * 30);
this.form.totalSum += Number((item.nclThree.length - 10) * (this.dataList.publicExpense / 10) + this.dataList.proPrice)
} else {
this.form.totalSum += Number(300);
this.form.totalSum += Number(this.dataList.proPrice);
}
});
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
<div class="wrapper-bg">
<div class="jdindentlist-header" v-if="channelFrom == \'jd\'">
<div>京东云PLUS工商、商标注册平台</div>
<div v-if="user_Name">
<span v-if=s"user_Name"><i class="el-icon-user"></i></span>
<span>{{user_Name}}</span>
<span @click="loginOut" v-if="user_Name">退出</span>
</div>
<div v-else>
<a href="https://login.jdcloud.com/?returnUrl=http%3A%2F%2Ftm.plus.jdcloud.com%2F%23%2Fjd%2Fjdindentlist"
class="jdindentlist-header-login">登录</a>
<a href="https://user.jdcloud.com/register?source=jdcloud&ReturnUrl=https%3A%2F%2Fwww.jdcloud.com"
style="display:inline-block;color: #fff;padding: 0 15px;background:linear-gradient(80deg,#3171ff 0,#a14faf 100%);border-radius:13px;height: 26px;
<div>京东云PLUS工商、商标注册平台</div>
<div v-if="user_Name">
<span v-if=s"user_Name"><i class="el-icon-user"></i></span>
<span>{{user_Name}}</span>
<span @click="loginOut" v-if="user_Name">退出</span>
</div>
<div v-else>
<a href="https://login.jdcloud.com/?returnUrl=http%3A%2F%2Ftm.plus.jdcloud.com%2F%23%2Fjd%2Fjdindentlist"
class="jdindentlist-header-login">登录</a>
<a href="https://user.jdcloud.com/register?source=jdcloud&ReturnUrl=https%3A%2F%2Fwww.jdcloud.com" style="display:inline-block;color: #fff;padding: 0 15px;background:linear-gradient(80deg,#3171ff 0,#a14faf 100%);border-radius:13px;height: 26px;
line-height: 26px;">免费注册</a>
</div>
</div>
</div>
<div class="jdindentdetail-warpper">
<div class="jdindentdetail">
......@@ -43,8 +42,9 @@
<div class="jdindentdetail-main-step-col">
<el-steps :active="currentStep" align-center process-status="process" id="steps">
<el-step v-if="channelFrom == \'gsbhome\'" title="待付款" description="">
</el-step>
<!-- <el-step v-if="channelFrom == \'gsbhome\' || channelFrom == \'bw\'" title="待付款"
description="">
</el-step> -->
<el-step v-if="itemCode" title="待上传材料" description="">
</el-step>
<el-step v-if="!itemCode" title="待确认方案"></el-step>
......@@ -54,7 +54,8 @@
<el-step title="已递交"></el-step>
<el-step title="已完成"></el-step>
</el-steps>
<div class="jdindentdetail-flow-payment" @click="goPayment" v-if="channelFrom == \'gsbhome\'&& deliveryStatus ==\'dfk\'">
<div class="jdindentdetail-flow-payment" @click="goPayment"
v-if="(channelFrom == \'gsbhome\' || channelFrom == \'bw\')&& deliveryStatus ==\'dfk\'">
去支付
</div>
</div>
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.css
......@@ -263,7 +263,7 @@
.jdindentlist-tablecolumn-handle>.cell {
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2 !important;
-webkit-line-clamp: 3 !important;
overflow: hidden;
}
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html
<div class="jdindentlist-warpper">
<div class="jdindentlist-header" v-if="channelFrom == \'jd\'">
<div>京东云PLUS工商、商标注册平台</div>
......@@ -69,12 +68,13 @@
<el-input v-model="name" placeholder="请输入内容"></el-input>
</div>
<!-- <div><span>付款状态：</span>
<div><span>付款状态：</span>
<el-select v-model="paymentStatus" placeholder="请选择">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
<el-option v-for="item in paymentStatusList" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</div> -->
</div>
</div>
<div>
<el-button @click="find()" style="border: #3071fe;background: #3171ff; color: #fff;">查询
......@@ -166,6 +166,16 @@
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="channelFrom == \'bw\'" prop="payStatus" label="付款状态" class-name="dsqcl">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.payStatusName"
:disabled="scope.row.payStatusName ? false : true">
<p solt="content">
{{scope.row.payStatusName ? scope.row.payStatusName : \'---\'}}
</p>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="deliveryStatusName" label="交付状态" class-name="dsqcl">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.deliveryStatusName"
......@@ -203,6 +213,9 @@
<el-button v-show="showSelf(scope.$index, scope.row)"
style="border:0;color: #0F8EE9;width:100%;margin:0;" size="mini"
@click="uploadMaterials(scope.$index, scope.row)">上传材料</el-button>
<el-button v-show="showPayStatus(scope.$index, scope.row)"
style="border:0;color: #0F8EE9;width:100%;margin:0;" size="mini"
@click="goPayment(scope.$index, scope.row)">去付款</el-button>
<el-button v-show="showSup(scope.$index, scope.row)"
style="border:0;color: #0F8EE9;width:100%;margin:0;" size="mini"
@click="goScheme(scope.$index, scope.row)">确认注册方案</el-button>
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js
......@@ -68,6 +68,17 @@
],
paymentStatusList: [
{
value: 'yfk',
label: '已付款'
},
{
value: 'dfk',
label: '待付款'
},
],
indentInfo: {
"channelServiceNo": "",
"deliveryOrderNo": "",
......@@ -115,6 +126,7 @@
deliveryOrderNo: null,
tmName: null,
name: null,
paymentStatus: null,
itemName: null,
inputDate: null,
startTime: null,
......@@ -575,6 +587,14 @@
}
});
},
goPayment(index, row){
this.$router.push({
path: `/${this.channelFrom}/orderpay`,
query: {
orderNo: row.sourceOrderNo
}
});
},
showSelf(index, row){
/*
console.log(index, row);
......@@ -596,6 +616,13 @@
return false;
}
},
showPayStatus(index, row){
if (row.payStatus == "dfk" && this.channelFrom == "bw") {
return true;
} else {
return false;
}
},
showDetails(idx, row){
if (row.deliveryStatus == 'dfwsfw') {
return false;
......@@ -699,6 +726,7 @@
this.indentInfo.deliveryStatus = this.checkedStatus;
this.indentInfo.startTime = this.startTime || "";
this.indentInfo.entTime = this.entTime || "";
this.indentInfo.payStatus = this.paymentStatus;
this.handleSizeChange();
},
icbcReset(){
......
igirl-channel-web/app/front/vues/pages/jdtrademark/jdtrademark.css
......@@ -11,18 +11,17 @@ li {
.jdtrademark-banner {
min-height: 480px;
background: url(/imgs/jdcloud/jdtrademark/banner.png) center center no-repeat;
background-size: cover;
}
.jdtrademark-banner>div {
.jdtrademark-banner>div:nth-child(1) {
width: 1200px;
margin: 0 auto;
position: relative;
min-height: 480px;
}
.jdtrademark-banner>div>div {
.jdtrademark-banner>div>div:nth-child(1) {
padding: 10px 40px;
border: 1px solid rgba(207, 235, 252);
color: rgba(207, 235, 252);
......@@ -33,6 +32,18 @@ li {
font-size: 16px;
}
.jdtrademark-banner>div>div:nth-child(2) {
position: absolute;
left: 0%;
text-align: right;
top: 37.2%;
font-size: 40px;
font-weight: 300;
width: 216px;
color: #fff;
background: rgb(3, 0, 75)
}
/* .jdtrademark-banner>div:hover {
background: rgba(207, 235, 252);
color: #fff;
......
igirl-channel-web/app/front/vues/pages/jdtrademark/jdtrademark.html
<div class="jdtrademark">
<div class="jdtrademark-banner">
<div class="jdtrademark-banner" :style="channelBanner">
<div>
<div @click="goIndentList">我的订单</div>
</div>
......@@ -14,7 +14,8 @@
</div>
<div @mouseleave="typeListShow = false">
<input type="text" v-model="searchValue" placeholder="请输入您想检索的商标名称，申请号，申请人等信息">
<div @mouseenter="typeListShow = true" class="jdtrademark-search-alltype">全部类别 <i class="el-icon-arrow-down"></i></div>
<div @mouseenter="typeListShow = true" class="jdtrademark-search-alltype">全部类别 <i
class="el-icon-arrow-down"></i></div>
<transition name="showncllist">
<div class="jdtrademark-typelist" v-if="typeListShow">
<el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">
......
igirl-channel-web/app/front/vues/pages/jdtrademark/jdtrademark.js
......@@ -121,10 +121,12 @@
],
showArrows: false,
searchValue: "",
channelBanner: "",
}
},
mounted: function() {
this.$root.loading = true;
this.getChannerBanner();
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;
......@@ -155,6 +157,19 @@
},
methods: {
getChannerBanner(){
switch (this.$root.channelName) {
case 'jd':
this.channelBanner = "background: url(/imgs/jdcloud/jdtrademark/banner.png) center center no-repeat";
break;
case 'bw':
this.channelBanner = "background: url(/imgs/jdcloud/jdtrademark/bwbanner.png) center center no-repeat";
break;
default:
this.channelBanner = "background: url(/imgs/jdcloud/jdtrademark/banner.png) center center no-repeat";
break;
}
},
goIndentList(){
switch (this.$root.channelName) {
case "jd":
......
igirl-channel-web/app/front/vues/pages/nowbuy/nowbuy.html
......@@ -27,7 +27,7 @@
</el-table-column>
</el-table>
</div>
<div style="width:100%;height:1px;background:#f3f3f3;transform: translateX(-30px);margin-bottom: 30px;">
<div style="width:100%;height:1px;background:#f3f3f3;transform: translateX(0px);margin-bottom: 30px;">
</div>
<div class="nowbuy-title">
......
igirl-channel-web/app/front/vues/pages/orderpay/orderpay.html
......@@ -54,14 +54,14 @@
</el-button>
</div>
<div class="el5">
<el-button style="font-size:14px;
<!-- <el-button style="font-size:14px;
font-family:PingFangSC-Regular;
font-weight:400;
color:rgba(130,130,130,1);" :class="{\'order-menu-btnhide\':currentPay2}" @click="toOfflinePay">
<img style="float: left;
margin-right: 10px;" src="imgs/icon_yinlian.png" alt="">
银行卡支付
</el-button>
</el-button> -->
</div>
<div class="el5">
<!-- <el-button style="font-size:14px;
......@@ -151,16 +151,16 @@
<div>
<div v-loading="loading">
<div
style="width:252px;border: 1px solid #E6E6E6;text-align: center;margin-top: 20px;padding-bottom: 20px;">
style="width:300px;border: 1px solid #E6E6E6;text-align: center;margin-top: 20px;padding-bottom: 20px;">
<img width="120px" height="120px" style="border:2px dashed #e9e9e9;margin-top: 25px;" :src="qrcode" />
<div style="color:#828282;width:100%;font-size: 14px;width: 100%;">
<div style="color:#828282;width:100%;font-size: 12.5px;width: 100%;margin-top: 17px;">
请使用微信扫描二维码支付，请在5分钟内完成支付，过期请刷新支付码
</div>
</div>
</div>
<div style="width:250px; margin-left: 270px;margin-top: -35px;">
<div style="width:250px; margin-left: 328px;margin-top: -35px;">
<!-- <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;"
......@@ -175,14 +175,14 @@
</div>
<!-- <h4 style="text-align:left;margin-left:2%;">微信支付</h4> -->
<div>
<div style="width:252px;border: 1px solid #E6E6E6;text-align: center;margin-top: 20px;padding-bottom: 20px;">
<div style="width:300px;border: 1px solid #E6E6E6;text-align: center;margin-top: 20px;padding-bottom: 20px;">
<img width="120px" height="120px" style="border:2px dashed #e9e9e9;margin-top: 25px;" :src="qrcode" />
<div style="color:#828282;width:100%;font-size: 14px;width: 100%;">
<div style="color:#828282;width:100%;font-size: 12.5px;width: 100%;margin-top:17px;">
请使用支付宝扫描二维码支付，请在5分钟内完成支付，过期请刷新支付码
</div>
</div>
<div style="width:250px; margin-left: 270px;margin-top: -35px;">
<div style="width:250px; margin-left: 328px;margin-top: -35px;">
<!-- <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;"
......
igirl-channel-web/app/front/vues/pages/servicedetails/servicedetails.css
.sds-img{
width:400px;
height:340px;
.sds-img {
width: 400px;
height: 340px;
float: left;
background-color: #e1e1e1;
}
.sds-info{
.sds-info {
float: left;
width:780px;
height:340px;
width: 780px;
height: 340px;
margin-left: 20px;
}
.sds-info h3{
color:#333;
.sds-info h3 {
color: #333;
font-weight: bold;
font-size: 24px;
margin: 10px 0;
}
.sds-info h5{
color:#666;
font-size:14px;
.sds-info h5 {
color: #666;
font-size: 14px;
margin: 0;
}
.sds-info p{
.sds-info p {
font-size: 12px;
color:#999;
color: #999;
}
.sds-t{
width:758px;
height:60px;
.sds-t {
width: 758px;
height: 60px;
line-height: 60px;
border:1px dashed #666;
border: 1px dashed #666;
margin-top: 20px;
background-image: url("/imgs/sds_t.png");
background-size: 100% 100%;
}
.sds-operate span{
.sds-operate span {
margin-top: 30px;
margin-right: 16px;
display: inline-block;
width:200px;
height:38px;
width: 200px;
height: 38px;
line-height: 40px;
text-align: center;
background-color: #ff5135;
border:1px solid #ff5135;
color:#fff;
font-size:16px;
border: 1px solid #ff5135;
color: #fff;
font-size: 16px;
cursor: pointer;
}
.sds-operate .sds-op2{
.sds-operate,
.sds-operate+p {
display: inline-block;
}
.sds-operate .sds-op2 {
background-color: #fff;
color:#ff5135;
color: #ff5135;
}
.sds-main-t{
width:107px;
height:3px;
.sds-main-t {
width: 107px;
height: 3px;
background-color: #2f95fc;
margin-top:30px;
margin-top: 30px;
}
.sds-productdetails{
width:1200px;
min-height:800px;
border:1px solid #ededed;
.sds-productdetails {
width: 1200px;
min-height: 800px;
border: 1px solid #ededed;
}
.sds-productdetails h3{
.sds-productdetails h3 {
background-color: #f1f1f1;
margin: 0;
height:30px;
border-top:1px solid #ededed;
height: 30px;
border-top: 1px solid #ededed;
}
.sds-productdetails i{
.sds-productdetails i {
display: inline-block;
width:1091px;
height:28px;
border:1px solid #eee;
width: 1091px;
height: 28px;
border: 1px solid #eee;
}
.sds-productdetails span{
.sds-productdetails span {
display: inline-block;
width:107px;
height:30px;
width: 107px;
height: 30px;
line-height: 30px;
text-align: center;
font-size: 14px;
color:#666;
color: #666;
background-color: #fff;
border:none;
border: none;
vertical-align: top;
}
.sds-productdetails img{
width:1180px;
margin:0 10px;
.sds-productdetails img {
width: 1200px;
vertical-align: top;
}
.sds-container .el-form-item__error{
.sds-container .el-form-item__error {
margin-left: 110px;
}
.sds-container .el-input-number{
.sds-container .el-input-number {
margin-left: 41px;
}
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/servicedetails/servicedetails.html
......@@ -9,7 +9,7 @@
</div>
<div class="sds-info">
<h3>{{serviceItem.itemName}}</h3>
<h5>{{serviceItem.shortDesc}}</h5>
<h5>{{serviceItem.itemName=="专家辅助申请"?"由专业代理人帮您检索分析商标，为您优化注册方案，全方位保护。":"专业代理人精准评估，风险共担，注册不成功，全额退款。"}} </h5>
<div class="sds-t">
<span style="color:#999;font-size:12px;margin:12px">服务费：</span> <b
style="color:#ff5135;font-size:18px">&yen;&nbsp;{{serviceItem.serviceCharge?serviceItem.serviceCharge.toFixed(2):0}}</b>
......@@ -36,13 +36,7 @@
<h3><span>产品详情</span><i></i></h3>
<!-- <div style="height:400px;background-color: #e1e1e1;margin:10px">
</div> -->
<img v-if="serviceItem.mobileContentImg" :src="serviceItem.mobileContentImg" alt="" style="margin-top:10px">
<img v-if="serviceItem.mobileContentImg1" :src="serviceItem.mobileContentImg1" alt="">
<img v-if="serviceItem.mobileContentImg2" :src="serviceItem.mobileContentImg2" alt="">
<img v-if="serviceItem.mobileContentImg3" :src="serviceItem.mobileContentImg3" alt="">
<img v-if="serviceItem.mobileContentImg4" :src="serviceItem.mobileContentImg4" alt="">
<img v-if="serviceItem.mobileContentImg5" :src="serviceItem.mobileContentImg5" alt="">
<img v-if="serviceItem.mobileContentImg6" :src="serviceItem.mobileContentImg6" alt="">
<img v-if="serviceItem.descUrl" :src="serviceItem.descUrl" alt="">
</div>
</div>
......
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