Skip to content

施宇 / icsales

Go to a project
Commit 7351b98f by 施宇
Options

Merge branch 'master' of http://119.23.72.7/shiyu/icsales

parents 21d075a1 c9146632
Expand all
Inline Side-by-side
Showing with 25 additions and 18 deletions
dist/css/bulkupload.css
...@@ -78,3 +78,4 @@ ...@@ -78,3 +78,4 @@
.upload_bulk_content .inquiry_form .upload_text p { .upload_bulk_content .inquiry_form .upload_text p {
margin-top: 10px; margin-top: 10px;
} }
/*# sourceMappingURL=bulkupload.css.map */
\ No newline at end of file
dist/css/bulkupload.css.map
{"version":3,"sources":["bulkupload.less"],"names":[],"mappings":"AAAA;EACI,eAAA;;AADJ,oBAGI;EACI,eAAA;;AAJR,oBAOI;EACI,sBAAA;EACA,oBAAA;;AATR,oBAOI,cAII;EACI,oBAAA;;AAZZ,oBAOI,cAII,WAGI;EACI,eAAA;EACA,cAAA;EACA,iBAAA;;AAjBhB,oBAOI,cAII,WASI;EACI,eAAA;EACA,WAAA;EACA,YAAA;EACA,iBAAA;EACA,eAAA;EACA,kBAAA;EACA,yBAAA;;AA3BhB,oBAOI,cAyBI;EACI,YAAA;EACA,iBAAA;EACA,yBAAA;EACA,wBAAA;EACA,cAAA;EACA,eAAA;;AAtCZ,oBAOI,cAyBI,IAQI;EACI,eAAA;EACA,oBAAA;;AA1ChB,oBAOI,cAuCI;EACI,oBAAA;EACA,yBAAA;EACA,aAAA;EACA,0BAAA;EACA,kBAAA;EACA,eAAA;;AApDZ,oBAOI,cAuCI,gBAQI;EACI,cAAA;EACA,eAAA;EACA,iBAAA;;AAzDhB,oBAOI,cAuCI,gBAcI;EACI,eAAA;EACA,cAAA;EACA,gBAAA;;AA/DhB,oBAOI,cA4DI;EACI,kBAAA;EACA,gBAAA;;AArEZ,oBAOI,cA4DI,SAGI;EACI,YAAA;;AACA,oBAjEZ,cA4DI,SAGI,EAEK;EACG,iBAAA;;AAEJ,oBApEZ,cA4DI,SAGI,EAKK,GAAG;EACF,2BAAA;;AA5ElB,oBAOI,cA0EI;EACI,gBAAA;EACA,cAAA;EACA,mBAAA;EACA,eAAA;;AArFZ,oBAOI,cA0EI,aAKI;EACI,gBAAA","file":"bulkupload.css"} {"version":3,"sources":["bulkupload.less"],"names":[],"mappings":"AAAA;EACI,eAAA;;AADJ,oBAGI;EACI,eAAA;;AAJR,oBAOI;EACI,sBAAA;EACA,oBAAA;EACA,kBAAA;;AAVR,oBAOI,cAKI;EACI,oBAAA;;AAbZ,oBAOI,cAKI,WAGI;EACI,eAAA;EACA,cAAA;EACA,iBAAA;;AAlBhB,oBAOI,cAKI,WASI;EACI,eAAA;EACA,WAAA;EACA,YAAA;EACA,iBAAA;EACA,eAAA;EACA,kBAAA;EACA,yBAAA;;AA5BhB,oBAOI,cA0BI;EACI,YAAA;EACA,iBAAA;EACA,yBAAA;EACA,wBAAA;EACA,cAAA;EACA,eAAA;;AAvCZ,oBAOI,cA0BI,IAQI;EACI,eAAA;EACA,oBAAA;;AA3ChB,oBAOI,cAwCI;EACI,oBAAA;EACA,yBAAA;EACA,aAAA;EACA,0BAAA;EACA,kBAAA;EACA,eAAA;;AArDZ,oBAOI,cAwCI,gBAOI;EACI,cAAA;EACA,eAAA;EACA,iBAAA;;AAzDhB,oBAOI,cAwCI,gBAaI;EACI,eAAA;EACA,cAAA;EACA,gBAAA;;AA/DhB,oBAOI,cA2DI;EACI,kBAAA;EACA,gBAAA;;AApEZ,oBAOI,cA2DI,SAGI;EACI,YAAA;;AACA,oBAhEZ,cA2DI,SAGI,EAEK;EACG,iBAAA;;AAEJ,oBAnEZ,cA2DI,SAGI,EAKK,GAAG;EACF,2BAAA;;AA3ElB,oBAOI,cAyEI;EACI,gBAAA;EACA,cAAA;EACA,mBAAA;EACA,eAAA;;AApFZ,oBAOI,cAyEI,aAKI;EACI,gBAAA","file":"bulkupload.css"}
\ No newline at end of file \ No newline at end of file
dist/css/person.css
...@@ -175,6 +175,7 @@ body { ...@@ -175,6 +175,7 @@ body {
font-size: 16px; font-size: 16px;
line-height: 40px; line-height: 40px;
text-indent: 1em; text-indent: 1em;
height: 40px;
} }
.person .wrap .verify-code .input-wrap .w.w1 { .person .wrap .verify-code .input-wrap .w.w1 {
width: 255px; width: 255px;
...@@ -271,6 +272,7 @@ body { ...@@ -271,6 +272,7 @@ body {
font-size: 16px; font-size: 16px;
line-height: 40px; line-height: 40px;
text-indent: 1em; text-indent: 1em;
height: 40px;
} }
.person .wrap .login .input-wrap .w.w1 { .person .wrap .login .input-wrap .w.w1 {
width: 255px; width: 255px;
...@@ -360,6 +362,7 @@ body { ...@@ -360,6 +362,7 @@ body {
font-size: 16px; font-size: 16px;
line-height: 40px; line-height: 40px;
text-indent: 1em; text-indent: 1em;
height: 40px;
} }
.person .wrap .register .input-wrap .w.w1 { .person .wrap .register .input-wrap .w.w1 {
width: 255px; width: 255px;
......
dist/css/person.less
...@@ -208,6 +208,7 @@ body { ...@@ -208,6 +208,7 @@ body {
font-size: 16px; font-size: 16px;
line-height: 40px; line-height: 40px;
text-indent: 1em; text-indent: 1em;
height: 40px;
&.w1 { &.w1 {
width: 255px; width: 255px;
...@@ -287,7 +288,7 @@ body { ...@@ -287,7 +288,7 @@ body {
} }
} }
.iconiconxiantiaoshouji,.iconjuxing27 { .iconiconxiantiaoshouji, .iconjuxing27 {
font-size: 20px; font-size: 20px;
color: #adb6bf; color: #adb6bf;
width: 112px; width: 112px;
...@@ -321,6 +322,7 @@ body { ...@@ -321,6 +322,7 @@ body {
font-size: 16px; font-size: 16px;
line-height: 40px; line-height: 40px;
text-indent: 1em; text-indent: 1em;
height: 40px;
&.w1 { &.w1 {
width: 255px; width: 255px;
...@@ -397,7 +399,7 @@ body { ...@@ -397,7 +399,7 @@ body {
} }
} }
.iconjuxing27,.iconiconxiantiaoshouji{ .iconjuxing27, .iconiconxiantiaoshouji {
font-size: 20px; font-size: 20px;
color: #adb6bf; color: #adb6bf;
width: 112px; width: 112px;
...@@ -422,7 +424,7 @@ body { ...@@ -422,7 +424,7 @@ body {
font-size: 16px; font-size: 16px;
line-height: 40px; line-height: 40px;
text-indent: 1em; text-indent: 1em;
height: 40px;
&.w1 { &.w1 {
width: 255px; width: 255px;
} }
...@@ -449,7 +451,7 @@ body { ...@@ -449,7 +451,7 @@ body {
} }
} }
.codepic{ .codepic {
cursor: pointer; cursor: pointer;
} }
......
dist/js/global/global.min.js
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
init: function () { init: function () {
this.mounted(this).handleBind(this); this.mounted(this).handleBind(this);
}, },
getData: function (url, type, param, callback,isload,isheader) { getData: function (url, type, param, callback, isload, isheader) {
//是否启动loadin效果 //是否启动loadin效果
if(isload == undefined){ if (isload == undefined) {
var index = layer.load(1, { var index = layer.load(1, {
offset: ['50%', "50%"], offset: ['50%', "50%"],
shade: false shade: false
...@@ -24,18 +24,18 @@ ...@@ -24,18 +24,18 @@
dataTypeXpx = "jsonp"; dataTypeXpx = "jsonp";
} }
// if(isheader){ // if(isheader){
$.ajaxSetup({ $.ajaxSetup({
headers:{ headers: {
Authorization:'Bearer '+Util.getCookie('token') Authorization: 'Bearer ' + Util.getCookie('token')
}, },
}); });
// }; // };
$.ajax({ $.ajax({
type: type, type: type,
url: url, url: url,
data: params, data: params,
dataType: 'json', dataType: 'json',
xhrFields: { xhrFields: {
withCredentials: true withCredentials: true
}, },
...@@ -125,11 +125,11 @@ ...@@ -125,11 +125,11 @@
* @param name * @param name
*/ */
delCookie: function (name, domain) { delCookie: function (name, domain) {
domain = domain ? ";domain=" + domain : "";
var exp = new Date(); var exp = new Date();
exp.setTime(exp.getTime() - 1); exp.setTime(exp.getTime() - 10000);
var cval = this.getCookie(name); document.cookie = name + "=" + '' + ";expires=" + exp.toGMTString() + ";path=/" + domain;
if (cval != null) return true;
document.cookie = name + "=" + cval + ";expires=" + exp.toGMTString() + ";path=/" + domain;
}, },
/** /**
* 获取参数 * 获取参数
......
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 sign in to comment