Skip to content

Z
zhichan
Commit 253f4011 by 宋毅
Options

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

parents 33e3687d b379db68
Showing with 94 additions and 41 deletions
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/OAjdcompany/OAjdcompany.js
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
created: function() { created: function() {
document.cookie.split('; ').map((item, index) => { document.cookie.split('; ').map((item, index) => {
if (item.includes('pin=')) { if (item.includes('pin=')) {
this.user_Name = item.substring(4); this.user_Name = decodeURIComponent(item.substring(4));
} }
}); });
this.getChannelFrom(); this.getChannelFrom();
......
igirl-channel-web/app/front/vues/pages/OAjddetails/OAjddetails.js
...@@ -391,7 +391,7 @@ ...@@ -391,7 +391,7 @@
} }
document.cookie.split('; ').map((item, index) => { document.cookie.split('; ').map((item, index) => {
if (item.includes('pin=')) { if (item.includes('pin=')) {
this.user_Name = item.substring(4); this.user_Name = decodeURIComponent(item.substring(4));
} }
}); });
this.getChannelFrom(); this.getChannelFrom();
......
igirl-channel-web/app/front/vues/pages/OAjdlist/OAjdlist.html
...@@ -299,7 +299,7 @@ ...@@ -299,7 +299,7 @@
<el-form-item class="gsb_items"> <el-form-item class="gsb_items">
<div class="title special">上传材料：代理委托书 <div class="title special">上传材料：代理委托书
<a href="http://gsb-zc.oss-cn-beijing.aliyuncs.com/igirl_channel_tmwtsdemo001.doc" <a href="http://gsb-zc.oss-cn-beijing.aliyuncs.com/igirl_channel_tmwtsdemo001.doc"
style="color:#0F8EE9;font-size:13px;cursor:pointer;position: absolute;top: 70%;left: 51%;line-height: 0px;border-bottom: 1px solid #0F8EE9;height: 5px;">生成委托书</a> style="color:#0F8EE9;font-size:13px;cursor:pointer;position: absolute;top: 70%;left: 51%;line-height: 0px;border-bottom: 1px solid #0F8EE9;height: 5px;">下载委托书模板</a>
</div> </div>
<div class="upload-box" v-loading="loading2" @mouseover="mouseOverDemo(2,\'b\')" <div class="upload-box" v-loading="loading2" @mouseover="mouseOverDemo(2,\'b\')"
@mouseleave="mouseLeaveDemo(2,\'b\')"> @mouseleave="mouseLeaveDemo(2,\'b\')">
......
igirl-channel-web/app/front/vues/pages/OAjdlist/OAjdlist.js
...@@ -450,7 +450,7 @@ ...@@ -450,7 +450,7 @@
} }
document.cookie.split('; ').map((item, index) => { document.cookie.split('; ').map((item, index) => {
if (item.includes('pin=')) { if (item.includes('pin=')) {
this.user_Name = item.substring(4); this.user_Name = decodeURIComponent(item.substring(4));
} }
}); });
this.getChannelFrom(); this.getChannelFrom();
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.css
...@@ -532,9 +532,12 @@ ...@@ -532,9 +532,12 @@
.jdindentdetail-diag .el-drawer__open .el-drawer.rtl { .jdindentdetail-diag .el-drawer__open .el-drawer.rtl {
width: 66%; width: 66%;
} }
.jdindentdetail-drawer{
.jdindentdetail-drawer {
overflow-y: auto; overflow-y: auto;
padding-bottom: 100px;
} }
.jdindentdetail-drawer .selftmreg_main .el-form-item { .jdindentdetail-drawer .selftmreg_main .el-form-item {
margin-bottom: 20px !important; margin-bottom: 20px !important;
} }
...@@ -561,9 +564,8 @@ ...@@ -561,9 +564,8 @@
.btnBottom>span { .btnBottom>span {
position: absolute; position: fixed;
bottom: 0px; bottom: 0px;
left: 0px;
padding: 10px 20px 20px; padding: 10px 20px 20px;
background: #fff; background: #fff;
margin-top: 5px; margin-top: 5px;
...@@ -585,4 +587,51 @@ ...@@ -585,4 +587,51 @@
margin: 5px 0px; margin: 5px 0px;
background: none; background: none;
border-radius: 0; border-radius: 0;
}
.jdindentdetail-drawer .gsb_items>.el-form-item__content>div:nth-child(1) {
margin-left: 10px;
}
.jdindentdetail-drawer .gsb_items>.el-form-item__content>.title {
line-height: 1;
min-height: 30px;
}
.jdindentdetail-drawer .gsb_items>.el-form-item__content>.text {
width: max-content;
padding-left: 51px;
line-height: 21px;
}
.jdindentdetail-drawer .editTips {
margin-top: 25px;
padding-left: 51px;
width: max-content;
text-align: left;
line-height: 21px;
font-size: 12px;
font-family: PingFangSC;
font-weight: 400;
color: rgba(136, 136, 136, 1);
position: relative;
}
.jdindentdetail-drawer .editTips>span {
color: #0f8ee9;
}
.jdindentdetail-drawer .headerTips {
margin-top: 25px;
padding-left: 51px;
width: max-content;
text-align: left;
line-height: 21px;
font-size: 12px;
font-family: PingFangSC;
font-weight: 400;
color: rgba(136, 136, 136, 1);
position: absolute;
top: -10px;
left: 80px;
} }
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
...@@ -469,6 +469,10 @@ ...@@ -469,6 +469,10 @@
</div> </div>
<div v-show="headerInfo==\'交官文件\'"> <div v-show="headerInfo==\'交官文件\'">
<div class="headerTips"> <i class="el-icon-warning"></i>
格式为<span>PDF</span> 或
<span>JPG</span>，大小不能超过<span>10M</span>
</div>
<!-- <h4 style="color:#535353"><i class="selftmreg_shuxian"></i>交官文件</h4> --> <!-- <h4 style="color:#535353"><i class="selftmreg_shuxian"></i>交官文件</h4> -->
<el-form label-position="left" ref="apply" :rules="applyrules" :model="editApply" <el-form label-position="left" ref="apply" :rules="applyrules" :model="editApply"
class="demo-ruleForm" label-width="120px"> class="demo-ruleForm" label-width="120px">
...@@ -567,15 +571,12 @@ ...@@ -567,15 +571,12 @@
@click="toViewImg(\'/imgs/sbzc/sfzD.png\')"> @click="toViewImg(\'/imgs/sbzc/sfzD.png\')">
查看大图</div> 查看大图</div>
</div> </div>
<div class="text"> <i class="el-icon-warning"></i>
格式为<span>PDF</span> 或
<span>JPG</span>，大小不能超过<span>10M</span>
</div>
</el-form-item> </el-form-item>
<el-form-item class="gsb_items"> <el-form-item class="gsb_items">
<div class="title special">上传材料：代理委托书 <div class="title special">上传材料：代理委托书
<a href="http://gsb-zc.oss-cn-beijing.aliyuncs.com/igirl_channel_tmwtsdemo001.doc" <a href="http://gsb-zc.oss-cn-beijing.aliyuncs.com/igirl_channel_tmwtsdemo001.doc"
style="color:#0F8EE9;font-size:13px;cursor:pointer;position: absolute;top: 70%;left: 51%;line-height: 0px;border-bottom: 1px solid #0F8EE9;height: 5px;">生成委托书</a> style="color:#0F8EE9;font-size:13px;cursor:pointer;position: absolute;top: 90%;left: 38%;line-height: 0px;border-bottom: 1px solid #0F8EE9;height: 5px;width: max-content;">下载委托书模板</a>
</div> </div>
<div class="upload-box" v-loading="loading2" @mouseover="mouseOverDemo(2,\'b\')" <div class="upload-box" v-loading="loading2" @mouseover="mouseOverDemo(2,\'b\')"
@mouseleave="mouseLeaveDemo(2,\'b\')"> @mouseleave="mouseLeaveDemo(2,\'b\')">
...@@ -615,9 +616,9 @@ ...@@ -615,9 +616,9 @@
</el-form-item> </el-form-item>
<el-form-item class="gsb_items" label=""> <el-form-item class="gsb_items" label="">
<div class="title">上传材料：优先权证明 <div class="title">&nbsp;&nbsp;&nbsp;上传材料：优先权证明
<a href="http://gsb-zc.oss-cn-beijing.aliyuncs.com/yzq_201908281849646526xujnsedjnqwdoni.doc" <a href="http://gsb-zc.oss-cn-beijing.aliyuncs.com/yzq_201908281849646526xujnsedjnqwdoni.doc"
style="width:95px;color:#0F8EE9;font-size:13px;cursor:pointer;position: absolute;top: 70%;left: 37%;line-height: 0px;border-bottom: 1px solid #0F8EE9;height: 5px;">下载优先权证明</a> style="width:95px;color:#0F8EE9;font-size:13px;cursor:pointer;position: absolute;top: 90%;left: 37%;line-height: 0px;border-bottom: 1px solid #0F8EE9;height: 5px;">下载优先权证明</a>
</div> </div>
<div class="upload-box" v-loading="loading3" @mouseover="mouseOverDemo(3,\'c\')" <div class="upload-box" v-loading="loading3" @mouseover="mouseOverDemo(3,\'c\')"
@mouseleave="mouseLeaveDemo(3,\'c\')"> @mouseleave="mouseLeaveDemo(3,\'c\')">
...@@ -670,7 +671,7 @@ ...@@ -670,7 +671,7 @@
class="demo-ruleForm" label-width="120px"> class="demo-ruleForm" label-width="120px">
<div class="selftmreg_main"> <div class="selftmreg_main">
<div style="clear:both;"></div> <div style="clear:both;"></div>
<div style="width:100%;box-sizing: border-box;"> <div style="width:100%;box-sizing: border-box;margin-bottom: 5px;">
<!-- <h4 style="color:#535353"><i class="selftmreg_shuxian"></i>申请人信息</h4> --> <!-- <h4 style="color:#535353"><i class="selftmreg_shuxian"></i>申请人信息</h4> -->
<el-form-item label-width="140px" label="申请人类型" <el-form-item label-width="140px" label="申请人类型"
style="width:493px;float:left;padding-right:50px;" prop="customerType"> style="width:493px;float:left;padding-right:50px;" prop="customerType">
...@@ -788,6 +789,7 @@ ...@@ -788,6 +789,7 @@
重新上传</div> 重新上传</div>
</gsb-upload> </gsb-upload>
</div> </div>
</div> </div>
<div class="upload-img" @mouseover="mouseOverDemo(1)" @mouseleave="mouseLeaveDemo(1)"> <div class="upload-img" @mouseover="mouseOverDemo(1)" @mouseleave="mouseLeaveDemo(1)">
<img <img
...@@ -796,7 +798,10 @@ ...@@ -796,7 +798,10 @@
@click="toViewImg(editApply.customerType == \'ent\' ? \'/imgs/sbzc/yyzzD1.png\' : \'imgs/sbzc/yyzzD.png\')"> @click="toViewImg(editApply.customerType == \'ent\' ? \'/imgs/sbzc/yyzzD1.png\' : \'imgs/sbzc/yyzzD.png\')">
查看大图</div> 查看大图</div>
</div> </div>
<div class="editTips"> <i class="el-icon-warning"></i>
格式为<span>PDF</span> 或
<span>JPG</span>，大小不能超过<span>10M</span>
</div>
</el-form-item> </el-form-item>
<el-form-item class="gsb_items" v-if="editApply.customerType==\'person\'" label=""> <el-form-item class="gsb_items" v-if="editApply.customerType==\'person\'" label="">
<div class="title special">上传材料：身份证明</div> <div class="title special">上传材料：身份证明</div>
...@@ -833,7 +838,7 @@ ...@@ -833,7 +838,7 @@
查看大图 查看大图
</div> </div>
</div> </div>
<div class="text"> <i class="el-icon-warning"></i> <div class="editTips"> <i class="el-icon-warning"></i>
格式为<span>PDF</span> 或 格式为<span>PDF</span> 或
<span>JPG</span>，大小不能超过<span>10M</span> <span>JPG</span>，大小不能超过<span>10M</span>
</div> </div>
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
...@@ -311,7 +311,7 @@ ...@@ -311,7 +311,7 @@
editNcl: {}, editNcl: {},
editDeliveryInfo: {}, editDeliveryInfo: {},
editApply: { editApply: {
customerType:'ent', customerType: 'ent',
}, },
message: { message: {
info: "", info: "",
...@@ -331,8 +331,8 @@ ...@@ -331,8 +331,8 @@
popupValue: "", popupValue: "",
/**订单付款信息 */ /**订单付款信息 */
receiptVoucher: {}, receiptVoucher: {},
user_Name:"", user_Name: "",
channelFrom:"", channelFrom: "",
} }
}, },
mounted: function() { mounted: function() {
...@@ -380,8 +380,8 @@ ...@@ -380,8 +380,8 @@
default: default:
break; break;
} }
};
}
}, },
created: function() { created: function() {
...@@ -390,8 +390,8 @@ ...@@ -390,8 +390,8 @@
console.log(this.$route.query.channelUserId, "11111111111"); console.log(this.$route.query.channelUserId, "11111111111");
} }
document.cookie.split('; ').map((item, index) => { document.cookie.split('; ').map((item, index) => {
if(item.includes('pin=')){ if (item.includes('pin=')) {
this.user_Name = item.substring(4); this.user_Name = decodeURIComponent(item.substring(4));
} }
}); });
this.getChannelFrom(); this.getChannelFrom();
...@@ -436,6 +436,7 @@ ...@@ -436,6 +436,7 @@
}, },
methods: { methods: {
loginOut(){ loginOut(){
/* /*
var url = encodeURIComponent("http://tm.plus.jdcloud.com/#/jd/jdtrademark") ; var url = encodeURIComponent("http://tm.plus.jdcloud.com/#/jd/jdtrademark") ;
...@@ -552,7 +553,7 @@ ...@@ -552,7 +553,7 @@
showDialog(from, index){ showDialog(from, index){
this.nclIndex = index; this.nclIndex = index;
console.log(this.nclInfo); console.log(this.nclInfo);
this.nclOne = this.nclInfo.slice(index,index+1); this.nclOne = this.nclInfo.slice(index, index + 1);
console.log(this.nclOne); console.log(this.nclOne);
console.log(this.nclIndex); console.log(this.nclIndex);
this.dialogTableVisible = true; this.dialogTableVisible = true;
...@@ -581,8 +582,8 @@ ...@@ -581,8 +582,8 @@
break; break;
default: default:
break; break;
} };
}, },
pointsRuleColor(i) { pointsRuleColor(i) {
if (i < parseInt(this.step)) { if (i < parseInt(this.step)) {
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.css
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
.jdindentlist-header>div:nth-child(1) { .jdindentlist-header>div:nth-child(1) {
font-family: JDLANGZHENGTI--GB1-0; font-family: JDLANGZHENGTI--GB1-0;
font-size: 20px; font-size: 20px;
color: #ffffff; color: #ffffff;
...@@ -235,11 +234,11 @@ ...@@ -235,11 +234,11 @@
width: 100%; width: 100%;
text-align: left; text-align: left;
padding: 10px 20px 20px; padding: 10px 20px 20px;
position: absolute; position: fixed;
bottom: 0; bottom: 0;
left: 0;
box-sizing: border-box; box-sizing: border-box;
border-top: 1px solid #dee0eb; border-top: 1px solid #dee0eb;
background: #fff;
} }
.dailogButton>button { .dailogButton>button {
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html
...@@ -214,8 +214,7 @@ ...@@ -214,8 +214,7 @@
</el-table> </el-table>
<div class="jdindentlist-list-page"> <div class="jdindentlist-list-page">
<el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage" <el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage"
:page-sizes="[10, 20, 30, 40]" :page-size="10" layout="prev, pager, next,jumper" :page-size="20" layout="prev, pager, next,jumper" :total="countPage">
:total="countPage">
</el-pagination> </el-pagination>
</div> </div>
...@@ -223,7 +222,8 @@ ...@@ -223,7 +222,8 @@
</div> </div>
<el-drawer title="上传材料" custom-class="jdindentdetail-drawer" size="58.3333%" <el-drawer title="上传材料" custom-class="jdindentdetail-drawer" size="58.3333%"
:visible.sync="showUploadStuff"> :visible.sync="showUploadStuff">
<div class="headerTips"> <i class="el-icon-warning"></i> 格式为<span>PDF</span> 或
<span>JPG</span>，大小不能超过<span>10M</span></div>
<div style="padding:20px 0;text-align: center"> <div style="padding:20px 0;text-align: center">
<el-form label-position="left" ref="stuff" :model="stuff" class="demo-ruleForm" label-width="120px"> <el-form label-position="left" ref="stuff" :model="stuff" class="demo-ruleForm" label-width="120px">
...@@ -308,13 +308,12 @@ ...@@ -308,13 +308,12 @@
<div v-if="toViewImgKey == 4" class="toViewImg" <div v-if="toViewImgKey == 4" class="toViewImg"
@click="toViewImg(\'/imgs/sbzc/sfzD.png\')">查看大图</div> @click="toViewImg(\'/imgs/sbzc/sfzD.png\')">查看大图</div>
</div> </div>
<div class="text"> <i class="el-icon-warning"></i> 格式为<span>PDF</span> 或
<span>JPG</span>，大小不能超过<span>10M</span></div>
</el-form-item> </el-form-item>
<el-form-item class="gsb_items"> <el-form-item class="gsb_items">
<div class="title special">上传材料：代理委托书 <div class="title special">上传材料：代理委托书
<a href="http://gsb-zc.oss-cn-beijing.aliyuncs.com/igirl_channel_tmwtsdemo001.doc" <a href="http://gsb-zc.oss-cn-beijing.aliyuncs.com/igirl_channel_tmwtsdemo001.doc"
style="color:#0F8EE9;font-size:13px;cursor:pointer;position: absolute;top: 70%;left: 51%;line-height: 0px;border-bottom: 1px solid #0F8EE9;height: 5px;">生成委托书</span> style="color:#0F8EE9;font-size:13px;cursor:pointer;position: absolute;top: 90%;left: 38%;line-height: 0px;border-bottom: 1px solid #0F8EE9;height: 5px;width: max-content;">下载委托书模板</span>
</div> </div>
<div class="upload-box" v-loading="loading2" @mouseover="mouseOverDemo(2,\'b\')" <div class="upload-box" v-loading="loading2" @mouseover="mouseOverDemo(2,\'b\')"
@mouseleave="mouseLeaveDemo(2,\'b\')"> @mouseleave="mouseLeaveDemo(2,\'b\')">
...@@ -505,8 +504,7 @@ ...@@ -505,8 +504,7 @@
</el-table> </el-table>
<div class="jdindentlist-list-page"> <div class="jdindentlist-list-page">
<el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage" <el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage"
:page-sizes="[10, 20, 30, 40]" :page-size="10" layout="prev, pager, next,jumper" :page-size="20" layout="prev, pager, next,jumper" :total="countPage">
:total="countPage">
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
"startTime": "", "startTime": "",
"entTime": "", "entTime": "",
"pageIndex": 1, "pageIndex": 1,
"pageSize": 30 "pageSize": 20
}, },
pickerOptions: { pickerOptions: {
shortcuts: [{ shortcuts: [{
...@@ -453,8 +453,8 @@ ...@@ -453,8 +453,8 @@
} }
document.cookie.split('; ').map((item, index) => { document.cookie.split('; ').map((item, index) => {
if (item.includes('pin=')) { if (item.includes('pin=')) {
this.user_Name = item.substring(4); this.user_Name = decodeURIComponent(item.substring(4));
} }
}); });
}, },
mounted: function() { mounted: function() {
......
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.html
...@@ -457,7 +457,7 @@ ...@@ -457,7 +457,7 @@
<el-form-item class="gsb_items"> <el-form-item class="gsb_items">
<div class="title special">上传材料：代理委托书<a <div class="title special">上传材料：代理委托书<a
href="http://gsb-zc.oss-cn-beijing.aliyuncs.com/igirl_channel_tmwtsdemo001.doc" href="http://gsb-zc.oss-cn-beijing.aliyuncs.com/igirl_channel_tmwtsdemo001.doc"
style="color:#0F8EE9;font-size:13px;cursor:pointer;position: absolute;top: 70%;left: 51%;line-height: 0px;border-bottom: 1px solid #0F8EE9;height: 5px;">生成委托书</a> style="color:#0F8EE9;font-size:13px;cursor:pointer;position: absolute;top: 70%;left: 51%;line-height: 0px;border-bottom: 1px solid #0F8EE9;height: 5px;">下载委托书模板</a>
</div> </div>
<div class="upload-box" v-loading="loading2" @mouseover="mouseOverDemo(2,\'b\')" <div class="upload-box" v-loading="loading2" @mouseover="mouseOverDemo(2,\'b\')"
@mouseleave="mouseLeaveDemo(2,\'b\')"> @mouseleave="mouseLeaveDemo(2,\'b\')">
......
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