Skip to content

Z
zhichan
Commit 5e3f0eb6 by 刘泽奇
Options

123

parent a05e4671
Showing with 258 additions and 107 deletions
igirl-channel-web/app/front/entry/index.ejs
......@@ -75,8 +75,9 @@
{{user_Name}}<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item icon="el-icon-plus">黄金糕</el-dropdown-item>
<el-dropdown-item icon="el-icon-circle-plus">狮子头</el-dropdown-item>
<el-dropdown-item icon="el-icon-plus">我的订单</el-dropdown-item>
<el-dropdown-item icon="el-icon-circle-plus">我的账号</el-dropdown-item>
<el-dropdown-item icon="el-icon-circle-plus">退出登录</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<span @click="loginOut" v-if="user_Name">退出</span>
......
igirl-channel-web/app/front/entry/public/css/index.css
......@@ -19,13 +19,19 @@
line-height: 24px;
}
.commonchannel>div:nth-child(1)>span {
vertical-align: middle;
}
.commonchannel>div:nth-child(1)>div {
height: 40px;
display: inline-block;
}
.commonchannel>div:nth-child(1)>div>img{
.commonchannel>div:nth-child(1)>div>img {
height: 100%;
}
.commonchannel-login {
color: #fff;
margin-right: 13px;
......@@ -63,7 +69,7 @@
cursor: pointer;
}
.commonchannel .el-dropdown-link{
.commonchannel .el-dropdown-link {
color: #fff;
cursor: pointer;
}
\ 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/vues/pages/jdtrademark/jdtrademark.css
......@@ -14,12 +14,14 @@ li {
background: url(/imgs/jdcloud/jdtrademark/banner.png) center center no-repeat;
background-size: cover;
}
.jdtrademark-banner>div{
.jdtrademark-banner>div {
width: 1200px;
margin: 0 auto;
position: relative;
min-height: 480px;
}
.jdtrademark-banner>div>div {
padding: 10px 40px;
border: 1px solid rgba(207, 235, 252);
......@@ -189,7 +191,7 @@ li {
text-align: center;
margin-right: 0 !important;
transition: all .1s;
box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.1);
box-shadow: inset 1px -1px 4px 0px rgba(0, 0, 0, 0.1);
border-radius: 1px;
}
......@@ -463,5 +465,4 @@ li {
.showncllist-enter-to,
.showncllist-leave {
opacity: 1;
}
}
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/jdtrademark/jdtrademark.js
......@@ -78,7 +78,7 @@
{
img: "imgs/jdcloud/jdtrademark/services2.png",
name: "简化流程高效注册",
text: "京东云提供商标自助申报系统，可自定义选择注册类别，同事利用工商大数据查询企业信息功能，提高申请效率",
text: "京东云提供商标自助申报系统，可自定义选择注册类别，同时利用工商大数据查询企业信息功能，提高申请效率",
},
{
img: "imgs/jdcloud/jdtrademark/services3.png",
......
igirl-channel-web/app/front/vues/pages/login/login.html
......@@ -3,7 +3,7 @@
<div style="z-index:1;position:relative;background-color:#31373b">
<img style="width:100%;height:100%" :src="loginUrl" />
<div class="login-div" v-if="a">
<div class="login-div" v-show="a">
<div class="login-content" id="baoguo" style="height:auto;">
<div style="margin-top: 30px;
......@@ -74,7 +74,7 @@
</div>
</div>
<!-- 重置密码 -->
<div class="login-div" v-if="b">
<div class="login-div" v-show="b">
<div class="login-content">
<div class="login-content-title">
重置密码
......@@ -104,7 +104,7 @@
</div>
</div>
<!-- 用户注册 -->
<div class="login-div" v-if="c">
<div class="login-div" v-show="c">
<div class="login-content">
<div class="login-content-title">
欢迎注册{{ this.$root.currentCompany?this.$root.currentCompany.sitename:"知圈圈"}}
......
igirl-channel-web/app/front/vues/pages/nowbuy/nowbuy.css
......@@ -6,21 +6,27 @@
.nowbuy-nav {
height: 60px;
box-sizing: border-box;
padding: 21px 0;
padding: 20px 0;
border-bottom: 1px solid #CECECE;
}
.nowbuy-main {
padding-left: 54px;
padding: 0 20px;
box-sizing: border-box;
margin-top: 30px;
width: 1203px;
background: rgba(255, 255, 255, 1);
border: 1px solid rgba(214, 214, 214, 1);
margin-bottom: 80px;
}
.nowbuy-title>div {
border-left: 5px solid #1EAFFF;
line-height: 16px;
height: 16px;
border-left: 3px solid #1EAFFF;
padding-left: 12px;
font-size: 18px;
font-size: 14px;
margin: 20px 0;
}
......@@ -41,21 +47,33 @@
border: 1px solid rgba(102, 201, 255, 1);
} */
.nowbuy-form {
width: 35%;
width: 100%;
background: rgba(243, 247, 253, 1);
padding: 30px 0;
margin-bottom: 27px;
}
.nowbuy-form .el-input {
width: 348px;
}
.nowbuy .el-form-item__label {
text-align: right;
}
.nowbuy-footer-warpper{
border-top:1px solid #C1C1C1;
height: 170px;
padding-top: 17px;
.nowbuy-footer-warpper {
height: 60px;
padding-top: 10px;
background: #E6F0FF;
box-sizing: border-box;
position: fixed;
bottom: 0;
left: 0;
width: 100%;
}
.nowbuy-footer {
box-sizing: border-box;
padding-left: 54px;
width: 1200px;
margin: 0 auto;
}
......@@ -70,28 +88,32 @@
.nowbuy-footer-img {
display: inline-block;
vertical-align: middle;
width: 26px;
height: 26px;
margin-left: 278px;
width: 18px;
height: 18px;
margin-bottom: 3px;
cursor: pointer;
margin-right: 15px;
margin-left: 647px;
}
.nowbuy-footer-img>img {
width: 100%;
height: 100%;
}
.nowbuy-footer>div>button {
margin-left: 80px;
margin-left: 30px;
border-radius: 0;
color: aquamarine;
width: 120px;
height: 40px;
}
.nowbuy .nowbuy-tableheader {
background: #F3F3F3;
font-size:14px;
font-family:Microsoft YaHei;
font-weight:400;
color:rgba(34,34,34,1);
background: #F3F7FD;
font-size: 14px;
font-family: Microsoft YaHei;
font-weight: 400;
color: rgba(34, 34, 34, 1);
}
.nowbuy .el-table th,
......
igirl-channel-web/app/front/vues/pages/nowbuy/nowbuy.html
<div class="nowbuy-warpper">
<div class="nowbuy">
<div class="nowbuy-nav">
<div class="tm-body-breadcrumb" style="margin-bottom: 15px;"><span @click="tiaozhuan(\'/\',\'首页\')"
style="cursor: pointer;">首页</span>
<i class="el-icon-arrow-right"></i>
<span style="font-weight:600;cursor: pointer;font-weight: 300;"
@click="tiaozhuan( \'/servicedetails\',\'服务详情\',)">{{serviceName||\'担保商标注册\'}}</span>
<i class="el-icon-arrow-right">下单</i>
</div>
</div>
<div class="nowbuy-main">
<div class="nowbuy-nav">
<div class="tm-body-breadcrumb" style="margin-bottom: 15px;"><span @click="tiaozhuan(\'/\',\'首页\')"
style="cursor: pointer;">首页</span>
<i class="el-icon-arrow-right"></i>
<span style="font-weight:600;cursor: pointer;font-weight: 300;"
@click="tiaozhuan( \'/servicedetails\',\'服务详情\',)">{{serviceName||\'担保商标注册\'}}</span>
<i class="el-icon-arrow-right">下单</i>
</div>
</div>
<div class="nowbuy-title">
<div>
购买服务
......@@ -64,7 +65,7 @@
<div class="nowbuy-footer-img" @click="checkImg = !checkImg">
<img :src="checkImg?\'/imgs/nowbuy/xuanzhong2.png\':\'/imgs/nowbuy/xuanzhong.png\'" alt="">
</div>
<span style="font-size: 20px;color:#999999; ">
<span style="font-size: 14px;color:#161529; ">
我已阅读 <span style="color:#1EAFFF;">《商标服务合同》</span> ,且同意该合同内容
</span>
<el-button type="primary" @click="goOrder()" :disabled="!checkImg">去支付</el-button>
......
igirl-channel-web/app/front/vues/pages/orderpay/orderpay.css
.orderpay_input .el-input.is-disabled .el-input__inner {
height: 30px;
}
.orderpay-card {
background-color: #eee;
}
.el5 {
float: left;
width: 168px;
margin-right: 40px;
}
.el5>button {
border-radius: 0;
}
.el5 .el-button span {
line-height: 35px;
line-height: 35px;
}
.payType_wxzf {
margin-left: 15px;
margin-top: 15px;
width:764px;
height:auto;
width: 764px;
height: auto;
min-height: 267px;
background:rgba(255,255,255,1);
box-shadow:0px 0px 8px 0px rgba(0,0,0,0.1);
border:1px solid rgba(225,225,225,1);
text-align: center;
background: rgba(255, 255, 255, 1);
text-align: left;
position: relative;
}
.kailong{
.kailong {
display: none;
position: absolute;
top: -10px;
left: 60px;
......@@ -32,9 +38,10 @@
height: 0;
border-right: 10px solid transparent;
border-left: 10px solid transparent;
border-bottom: 10px solid rgba(225,225,225,1);
border-bottom: 10px solid rgba(225, 225, 225, 1);
}
.kailong span{
.kailong span {
display: block;
width: 0;
height: 0;
......@@ -45,7 +52,9 @@
left: -8px;
top: 2px;
}
.kailong1{
.kailong1 {
display: none;
position: absolute;
top: -10px;
left: 270px;
......@@ -53,9 +62,10 @@
height: 0;
border-right: 10px solid transparent;
border-left: 10px solid transparent;
border-bottom: 10px solid rgba(225,225,225,1);
border-bottom: 10px solid rgba(225, 225, 225, 1);
}
.kailong1 span{
.kailong1 span {
display: block;
width: 0;
height: 0;
......@@ -67,7 +77,8 @@
top: 2px;
}
.kailong2{
.kailong2 {
display: none;
position: absolute;
top: -10px;
left: 470px;
......@@ -75,9 +86,10 @@
height: 0;
border-right: 10px solid transparent;
border-left: 10px solid transparent;
border-bottom: 10px solid rgba(225,225,225,1);
border-bottom: 10px solid rgba(225, 225, 225, 1);
}
.kailong2 span{
.kailong2 span {
display: block;
width: 0;
height: 0;
......@@ -87,4 +99,15 @@
position: absolute;
left: -8px;
top: 2px;
}
.orderpay-header {
margin: 0 auto !important;
background: #FFFFFF;
width: 1200px;
padding: 20px 0;
}
.order-menu-btnhide {
border-bottom: none;
}
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/orderpay/orderpay.html
<gsb-pcpage>
<el-card :style="imgHeight" class="orderpay-card">
<div style="width: 1200px;margin: 20px auto;background-color: #fff;padding: 50px;">
<el-row :gutter="20">
<el-col :span="2">
<img src="imgs/icon-payform.png" style="width:60px;" />
</el-col>
<el-col :span="20" style="text-align:left;">
<div style="font-weight:600;font-size:20px;">
订单提交成功，应付金额：
<span style="color:#f50">{{orderInfo.totalSum}}</span>
</div>
<div style="font-size:13px;color:#828282;margin-top:10px;">
支付编号：
<span style="color:#2F2F2F;margin-right: 10px;">{{orderInfo.code}}</span>
服务项目：
<span style="color:#2F2F2F;margin-right: 10px;">{{orderInfo.sveItemName}}</span>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="orderpay-header">
<el-col :span="2">
<img src="imgs/icon-payform.png" style="width:60px;" />
</el-col>
<el-col :span="20" style="text-align:left;">
<div style="font-weight:600;font-size:20px;">
订单提交成功，应付金额：
<span style="color:#f50">{{orderInfo.totalSum}}</span>
</div>
<div style="font-size:13px;color:#828282;margin-top:10px;">
支付编号：
<span style="color:#2F2F2F;margin-right: 10px;">{{orderInfo.code}}</span>
服务项目：
<span style="color:#2F2F2F;margin-right: 10px;">{{orderInfo.sveItemName}}</span>
</div>
</el-col>
</el-row>
<div style="width: 1200px;margin: 20px auto;background-color: #fff;padding: 50px;box-sizing: border-box;">
<div>
<el-row style="margin-top:30px;line-height: 16px;">
<div style="width:2px;height:16px;background-color:#f08c2f;float:left">
......@@ -32,7 +33,7 @@
<div style="clear:both;width: 100%;height: 20px;"></div>
<el-row :gitter="20" style="margin-top:20px;font-size: 12px;font-weight:400;padding-left: 15px;">
<div class="el5">
<el-button @click="toWxPay" style="font-size:14px;
<el-button :class="{\'order-menu-btnhide\':currentPay}" @click="toWxPay(1)" style="font-size:14px;
font-family:PingFangSC-Regular;
font-weight:400;
color:rgba(130,130,130,1);">
......@@ -42,7 +43,7 @@
</el-button>
</div>
<div class="el5">
<el-button @click="toAliPay" style="font-size:14px;
<el-button @click="toAliPay" :class="{\'order-menu-btnhide\':currentPay1}" style="font-size:14px;
font-family:PingFangSC-Regular;
font-weight:400;
color:rgba(130,130,130,1);">
......@@ -55,7 +56,7 @@
<el-button style="font-size:14px;
font-family:PingFangSC-Regular;
font-weight:400;
color:rgba(130,130,130,1);" @click="toOfflinePay">
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="">
银行卡支付
......@@ -65,7 +66,7 @@
<el-button style="font-size:14px;
font-family:PingFangSC-Regular;
font-weight:400;
color:rgba(130,130,130,1);" @click="toOtherPeoplePay">
color:rgba(130,130,130,1);" :class="{\'order-menu-btnhide\':currentPay3}" @click="toOtherPeoplePay">
<img style="float: left;
margin-right: 10px;" src="imgs/icon_daifu.png" alt="">
他人代付
......@@ -148,14 +149,19 @@
<!-- <h4 style="text-align:left;margin-left:2%;">微信支付</h4> -->
<div>
<div v-loading="loading">
<img width="120px" height="120px" style="border:2px dashed #e9e9e9;margin-top: 25px;" :src="qrcode" />
</div>
<div style="color:#828282;width:100%;text-align: center;margin: 8px auto;font-size: 14px;">
请使用微信扫一扫，扫描二维码支付，请在5分钟内完成支付，过期请刷新支付码。
<div
style="width:252px;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%;">
请使用微信扫描二维码支付，请在5分钟内完成支付，过期请刷新支付码
</div>
</div>
</div>
<div style="padding:10px 0;width:250px;text-align: center;margin: 0 auto;">
<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" type="primary" plain @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 style="clear:both"></div>
......@@ -166,15 +172,16 @@
</div>
<!-- <h4 style="text-align:left;margin-left:2%;">微信支付</h4> -->
<div>
<div v-loading="loading">
<div style="width:252px;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%;">
请使用支付宝扫描二维码支付，请在5分钟内完成支付，过期请刷新支付码
</div>
</div>
<div style="color:#828282;width:100%;text-align: center;margin: 8px auto;font-size: 14px;">
请使用支付宝扫一扫，扫描二维码支付，请在5分钟内完成支付，过期请刷新支付码。
</div>
<div style="padding:10px 0;width:250px;text-align: center;margin: 0 auto;">
<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" type="primary" plain @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 style="clear:both"></div>
......
igirl-channel-web/app/front/vues/pages/orderpay/orderpay.js
......@@ -27,6 +27,10 @@
Deparment: "",
industry: "",
period: "3个月",
currentPay: true,
currentPay1: false,
currentPay2: false,
currentPay3: false,
}
},
mounted: function () {
......@@ -183,10 +187,18 @@
toOfflinePay() {
this.payType = "offline";
this.closePayConfirm();
this.currentPay3 = false;
this.currentPay2 = true;
this.currentPay1 = false;
this.currentPay = false;
},
toOtherPeoplePay() {
this.payType = "otherPeople";
this.closePayConfirm();
this.currentPay3 = true;
this.currentPay2 = false;
this.currentPay1 = false;
this.currentPay = false;
},
offlinePaySubmit() {
var that = this;
......@@ -236,11 +248,19 @@
}
},
toWxPay() {
this.currentPay3 = false;
this.currentPay2 = false;
this.currentPay1 = false;
this.currentPay = true;
this.payType = "wx";
this.closePayConfirm();
this.getPayQrCode();
},
toAliPay() {
this.currentPay3 = false;
this.currentPay2 = false;
this.currentPay1 = true;
this.currentPay = false;
this.payType = "alipay";
this.closePayConfirm();
this.getPayQrCode();
......
igirl-channel-web/app/front/vues/pages/paysuccess/paysuccess.css
.common-paysuccess{
.common-paysuccess {
width: 1200px;
margin: 0 auto;
}
.common-paysuccess-main{
.common-paysuccess-main {
margin-left: 195px;
}
.common-paysuccess-img{
.common-paysuccess-main h1 {
width: 128px;
height: 45px;
font-size: 32px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(48, 113, 254, 1);
}
.common-paysuccess-main h1+p {
margin-top: 24px;
font-size: 14px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: rgba(51, 51, 51, 1);
line-height: 20px;
}
.common-paysuccess-main h1+p>span:nth-child(1) {
color: #FF5B00;
font-size: 14px;
margin-right: 10px;
}
.common-paysuccess-main h1+p+p {
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(153, 153, 153, 1);
line-height: 22px;
}
.common-paysuccess-img {
width: 140px;
height: 140px;
display: inline-block;
margin-right: 37px;
}
.common-paysuccess-img>img{
.common-paysuccess-img>img {
width: 100%;
vertical-align: bottom;
height: 100%;
}
.common-paysuccess-main{
.common-paysuccess-main {
margin-top: 120px;
}
.common-paysuccess-main>div:nth-child(2){
.common-paysuccess-main>div:nth-child(2) {
display: inline-block;
height: 140px;
vertical-align: top;
}
.common-paysuccess-footer {
margin: 66px auto 0;
text-align: center;
}
.common-paysuccess-footer>button {
border-radius: 0;
width: 134px;
height: 36px;
padding: 0;
text-align: center;
line-height: 36px;
}
.common-paysuccess-footer>button:nth-child(1) {
border: 1px solid rgba(48, 113, 254, 1);
color: #3071FE;
}
.common-paysuccess-footer>button:nth-child(2) {
background: #3071FE;
color: #FFFFFF;
}
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/paysuccess/paysuccess.html
......@@ -4,10 +4,14 @@
<div class="common-paysuccess-img"> <img src="/imgs/paysuccess.png" alt=""> </div>
<div>
<h1>支付成功</h1>
<p>您已成功支付¥798.00元 订单编号：<span>订单编号：11114012410250810824</span></p>
<p></p>
<p>您已成功支付 <span>¥798.00元</span> <span>订单编号：11114012410250810824</span></p>
<p>我们会尽快给您审核订单信息，提交到商标局！材料信息如有问题我们客服会及时与您联系。</p>
</div>
</div>
<div class="common-paysuccess-footer">
<el-button>在下一单</el-button>
<el-button>查看订单详情</el-button>
</div>
<div class="common-paysuccess-footer"></div>
</div>
</div>
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/register/register.css
......@@ -21,7 +21,6 @@ margin-left: 0px;
margin-top: 4px;
}
.logins-title{
width:320px;
height:89px;
line-height:89px;
text-align:center;
......
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