Skip to content

Z
zhichan
Commit 9e17a2c8 by 宋毅
Options

Merge branch 'igirl-channel-jdweb' of gitlab.gongsibao.com:jiangyong/zhichan… 

Merge branch 'igirl-channel-jdweb' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-channel-jdweb
parents fda4caf3 8d709950
Showing with 142 additions and 26 deletions
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
......@@ -183,7 +183,10 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
if (find == -1) {
this.selfFooterShow = true;
} else {
$('.jdc-footer').hide();
this.selfFooterShow = false;
console.log(find,'...........................',this.selfFooterShow)
}
} else {
this.headerHidden = false;
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/index.css
......@@ -6,10 +6,10 @@
}
.selftmreg_shu {
width: 100%;
width: 1143px;
height: 1px;
background-color: #eeeeee;
margin: 10px auto 20px;
margin: 20px 0 ;
}
.selftmreg_main1 {
......@@ -41,6 +41,8 @@
#selftmreg .el-tag {
margin: 5px 0px;
background:none;
border-radius:0;
}
#selftmreg .el-tree-node__content .el-tree-node__label {
......@@ -68,7 +70,7 @@
width: 100%;
height: 65px;
line-height: 50px;
z-index: 999;
z-index: 298;
}
.selftmreg_Stickie .el-input__inner {
......@@ -120,7 +122,7 @@
box-sizing: border-box;
border-left: 1px solid #E1E1E1;
background-color: #EFF0F7;
z-index: 999;
z-index: 298;
font-family: PingFangSC-Regular;
letter-spacing: 0;
}
......@@ -223,16 +225,17 @@
.tabButtomPrcie {
width: 100%;
height: 60px;
line-height: 53px;
line-height: 60px;
font-size: 16px;
color: #828282;
text-align: right;
box-sizing: border-box;
background: #F7F8FC;
position: absolute;
background: #EFF0F7;
z-index: 299;
position: fixed;
bottom: 0;
left: 0;
padding-right: 20px;
padding-right: 159px;
}
.selftmregType {
......@@ -459,7 +462,7 @@
bottom: 0;
left: 0;
width: 100%;
height: 70px;
height: 0;
line-height: 70px;
background-color: #F7F8FC;
}
......@@ -467,8 +470,15 @@
.step3-submit-main {
width: 1200px;
margin: 0 auto;
float: right;
}
.step3-submit-main::after{
content:" ";
clear:both;
}
.step3-submit-main .is-disabled{
opacity:.5 ;
}
#selftmreg .el-form-item__error {
color: #f56c6c;
font-size: 12px;
......@@ -640,10 +650,15 @@
border: 0px solid #0989C5;
color: #fff;
border-radius: 0;
padding:8px 20px;
width:170px;
}
.step2-footer>button:nth-child(1) {
transform: translateX(-10px);
background: #fff;
color: #51d2b7;
border: 1px solid;
}
.step3-indent .el-textarea__inner {
......@@ -719,4 +734,8 @@
.fade-leave-active below version 2.1.8 */
{
opacity: 0;
}
.selftmreg .el-dialog__wrapper .el-dialog__header {
text-align:center;
}
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.js
......@@ -252,7 +252,7 @@
{ type: 'string', required: true, message: '请选择申请类型', trigger: 'change' }
],
name: [
{ message: '请输入公司/申请人名称' },
{ required: true ,message: '请输入公司/申请人名称',trigger: 'blur' },
{ validator: validateIdConmpany, trigger: 'blur' }
],
code: [
......@@ -316,15 +316,15 @@
orderSubInfo: null,
totalPrices: null,
dataList: [],
options: []
options: [],
}
},
computed: Vuex.mapState({
count: state => state.count,
headStyle: function () {
return { "background-color": "white" };
}
}),
computed:{
},
created: function() {
var that = this;
var itemCode = this.$router.history.current.query.itemCode || 'zzsbzc';
......@@ -364,7 +364,7 @@
watch: {
nclOne: {
handler(newVal, oldVal){
this.totalPrices = newVal.length * 300;
this.totalPrices = (newVal.length * 300).toFixed(2);
if (newVal.length > 0) {
if (newVal.length > 1) {
this.$refs.tree.setChecked(newVal[1], false);
......@@ -452,7 +452,17 @@
*/
},
methods: {
maxZipCode(){
if(this.apply.zipCode.length>6){
console.log(this.apply.zipCode);
this.apply.zipCode = this.apply.zipCode.substring(0,6);
}
},
maxPhoneNumber(){
if(this.apply.mobile.length>11){
this.apply.mobile = this.apply.mobile.substring(0,11);
}
},
getItemCode(){
var obj = this.$root.copyParams({ channelUserId: "", itemCode: "sbfu" }, "getProductListByTypeOneCode", "/action/tmOrder/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
......@@ -473,7 +483,7 @@
} else if (i == parseInt(this.step)) {
return 'color: #FFFFFF;'
} else if (i > parseInt(this.step)) {
return 'color: #FFFFFF;'
return 'color: #BBB;'
}
},
pointsRuleBackColor(i) {
......@@ -482,7 +492,7 @@
} else if (i == parseInt(this.step)) {
return 'background: #51d2b7;z-index: ' + Math.abs(i - 5)
} else if (i > parseInt(this.step)) {
return 'background: #eee;z-index: ' + Math.abs(i - 5)
return 'background:#EFF0F7;z-index: ' + Math.abs(i - 5)
}
},
toViewImg(src) {
......@@ -1194,10 +1204,6 @@
},
submitForm(formName, agree) {
console.log(document.documentElement.scrollTop, "llllllllllllllllllllll");
/*
*/
var that = this;
if (this.nclOne.length > 0) {
......
igirl-channel-jdweb/package-lock.json
......@@ -1726,6 +1726,11 @@
"resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz",
"integrity": "sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ=="
},
"date-format": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/date-format/-/date-format-3.0.0.tgz",
"integrity": "sha512-eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w=="
},
"dateformat": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
......@@ -3328,6 +3333,11 @@
"integrity": "sha1-Tnmumy6zi/hrO7Vr8+ClaqX8q9c=",
"dev": true
},
"flatted": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
"integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg=="
},
"follow-redirects": {
"version": "1.9.0",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz",
......@@ -6082,6 +6092,33 @@
"chalk": "^1.0.0"
}
},
"log4js": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/log4js/-/log4js-6.1.0.tgz",
"integrity": "sha512-fSCHMYsMJbHwfNTuMlopVVcfkKwIRLh5mpNZGB2oBbnSmr3yUTo4tL4xGBA0/q29xowlu96eTXGghJFNhPXMnA==",
"requires": {
"date-format": "^3.0.0",
"debug": "^4.1.1",
"flatted": "^2.0.1",
"rfdc": "^1.1.4",
"streamroller": "^2.2.3"
},
"dependencies": {
"debug": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"requires": {
"ms": "^2.1.1"
}
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
}
}
},
"logalot": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/logalot/-/logalot-2.1.0.tgz",
......@@ -7975,6 +8012,11 @@
"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
"dev": true
},
"rfdc": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz",
"integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug=="
},
"rimraf": {
"version": "2.6.2",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
......@@ -8942,6 +8984,51 @@
"resolved": "https://registry.npmjs.org/stream-wormhole/-/stream-wormhole-1.1.0.tgz",
"integrity": "sha512-gHFfL3px0Kctd6Po0M8TzEvt3De/xu6cnRrjlfYNhwbhLPLwigI2t1nc6jrzNuaYg5C4YF78PPFuQPzRiqn9ew=="
},
"streamroller": {
"version": "2.2.3",
"resolved": "https://registry.npmjs.org/streamroller/-/streamroller-2.2.3.tgz",
"integrity": "sha512-AegmvQsscTRhHVO46PhCDerjIpxi7E+d2GxgUDu+nzw/HuLnUdxHWr6WQ+mVn/4iJgMKKFFdiUwFcFRDvcjCtw==",
"requires": {
"date-format": "^2.1.0",
"debug": "^4.1.1",
"fs-extra": "^8.1.0"
},
"dependencies": {
"date-format": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz",
"integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA=="
},
"debug": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"requires": {
"ms": "^2.1.1"
}
},
"fs-extra": {
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
"integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
"requires": {
"graceful-fs": "^4.2.0",
"jsonfile": "^4.0.0",
"universalify": "^0.1.0"
}
},
"graceful-fs": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
"integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
}
}
},
"streamsearch": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz",
......
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