Skip to content

施宇 / icsales

Go to a project
Commit 8823e059 by 施宇
Options

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

# Conflicts:
#	Application/Home/View/Chat/index.html
parents b89a323c 21884d80
Expand all
Inline Side-by-side
Showing with 76 additions and 10 deletions
Application/Home/View/Chat/index.html
......@@ -359,8 +359,8 @@
// open，登录;
var options = {
apiUrl: WebIM.config.apiURL,
user: "18271408717",
pwd: "123456",
user: "myy5",
pwd: "m",
appKey: WebIM.config.appkey
};
try {
......@@ -376,7 +376,11 @@
var msg = new WebIM.message('txt', id);
msg.set({
msg: content, // 消息内容;
<<<<<<< .mine
to: userId, // 接收消息对象;
=======
to: 'myy4', // 接收消息对象;
>>>>>>> .theirs
roomType: false,
success: function (id, serverMsgId) {
......
dist/css/account.css
......@@ -133,6 +133,9 @@
color: #fff;
background-color: #0D84D1;
}
.release_inquiry_content .inquiry_form .form_content .form_left .btn_div span.fb:hover {
background-color: #61A0F2 !important;
}
.release_inquiry_content .inquiry_form .form_content .form_left .btn_div span.cz {
color: #515559;
border: 1px solid #E6ECF2;
......
dist/css/account.css.map
{"version":3,"sources":["account.less"],"names":[],"mappings":"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","file":"account.css"}
\ No newline at end of file
{"version":3,"sources":["account.less"],"names":[],"mappings":"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","file":"account.css"}
\ No newline at end of file
dist/css/account.less
......@@ -159,7 +159,12 @@
&.fb {
color: #fff;
background-color: #0D84D1
background-color: #0D84D1;
&:hover {
background-color: #61A0F2 !important;
}
}
&.cz {
......
dist/css/bulkupload.css
......@@ -41,7 +41,7 @@
margin: 31px 148px 0;
background-color: #F5F9FC;
height: 200px;
border: 1px solid #D8DFE6;
border: 1px dashed #D8DFE6;
text-align: center;
cursor: pointer;
}
......@@ -65,6 +65,9 @@
.upload_bulk_content .inquiry_form .btn_div a.xz {
margin-left: 60px;
}
.upload_bulk_content .inquiry_form .btn_div a.xz:hover {
background: none !important;
}
.upload_bulk_content .inquiry_form .upload_text {
margin-top: 20px;
color: #8A9299;
......@@ -74,3 +77,4 @@
.upload_bulk_content .inquiry_form .upload_text p {
margin-top: 10px;
}
/*# sourceMappingURL=bulkupload.css.map */
\ No newline at end of file
dist/css/bulkupload.css.map 0 → 100644
{"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"}
\ No newline at end of file
dist/css/bulkupload.less
......@@ -48,7 +48,7 @@
margin: 31px 148px 0;
background-color: #F5F9FC;
height: 200px;
border: 1px solid #D8DFE6;
border: 1px dashed #D8DFE6;
text-align: center;
cursor: pointer;
......@@ -73,7 +73,9 @@
&.xz{
margin-left:60px;
}
&.xz:hover{
background:none !important;
}
}
}
......
dist/css/chat.css
......@@ -166,3 +166,4 @@
color: #ADB6BF;
padding: 10px 15px;
}
/*# sourceMappingURL=chat.css.map */
\ No newline at end of file
dist/css/chat.css.map 0 → 100644
{"version":3,"sources":["chat.less"],"names":[],"mappings":"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","file":"chat.css"}
\ No newline at end of file
dist/css/common/base.css
......@@ -393,6 +393,9 @@ body {
height: 40px;
line-height: 40px;
}
.btn:hover {
background-color: #61A0F2 !important;
}
.btn.btn_48 {
height: 48px;
line-height: 48px;
......@@ -407,6 +410,9 @@ body {
.btn.btn_yellow {
background-color: #EAAD37;
}
.btn.btn_yellow:hover {
background-color: #F2BF61 !important;
}
.btn.btn_green {
background-color: #52CCA8;
}
......@@ -815,3 +821,4 @@ body {
color: #ADB6BF;
cursor: pointer;
}
/*# sourceMappingURL=base.css.map */
\ No newline at end of file
dist/css/common/base.less
......@@ -490,6 +490,10 @@ body {
height: 40px;
line-height: 40px;
&:hover{
background-color: #61A0F2 !important;
}
&.btn_48 {
height: 48px;
line-height: 48px;
......@@ -506,6 +510,9 @@ body {
&.btn_yellow {
background-color: #EAAD37;
&:hover{
background-color: #F2BF61 !important;
}
}
&.btn_green {
......
dist/css/home.css
......@@ -185,6 +185,7 @@
color: #ADB6BF;
font-size: 14px;
line-height: 60px;
transition: all 0.2s ease-in-out;
}
.home_content .new_xj .new_xj_list .new_xj_item > div {
padding-right: 10px;
......@@ -233,4 +234,7 @@
margin: 0;
cursor: pointer;
}
.home_content .new_xj .new_xj_list .new_xj_item:hover {
box-shadow: 0px 5px 10px 0px rgba(216, 223, 230, 0.5);
}
/*# sourceMappingURL=home.css.map */
\ No newline at end of file
dist/css/home.css.map
{"version":3,"sources":["home.less"],"names":[],"mappings":"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","file":"home.css"}
\ No newline at end of file
{"version":3,"sources":["home.less"],"names":[],"mappings":"AAAA,aACI;EACI,aAAA;EACA,sBAAA;EACA,6BAAA;EACA,eAAA;;AALR,aACI,WAMI;EACI,gBAAA;EACA,OAAO,kBAAP;EACA,mBAAA;;AAVZ,aACI,WAMI,aAKI;EACI,aAAA;EACA,YAAA;EACA,sBAAA;EACA,kBAAA;;AAhBhB,aACI,WAMI,aAYI;EACI,cAAA;EACA,OAAO,kBAAP;;AArBhB,aACI,WAMI,aAYI,WAII;EACI,eAAA;;AAxBpB,aACI,WAMI,aAYI,WASI;EACI,gBAAA;EACA,eAAA;EACA,mBAAA;;AA/BpB,aACI,WAMI,aAYI,WAeI;EACI,cAAA;EACA,eAAA;EACA,gBAAA;;AArCpB,aACI,WAMI,aAYI,WAeI,YAKI;EACI,kBAAA;;AAxCxB,aACI,WAMI,aAYI,WAeI,YAKI,OAGI;EACI,cAAA;;AA3C5B,aACI,WAiDI;EACI,gBAAA;EACA,kBAAA;EACA,YAAA;;AArDZ,aACI,WAiDI,YAKI;EACI,cAAA;;AAxDhB,aACI,WAiDI,YASI;EACI,eAAA;;AAEA,aA7DZ,WAiDI,YASI,KAGK;EACG,cAAA;;AAGJ,aAjEZ,WAiDI,YASI,KAOK;EACG,cAAA;;AAGJ,aArEZ,WAiDI,YASI,KAWK;EACG,cAAA;;AAvEpB,aACI,WAiDI,YAyBI;EACI,eAAA;EACA,cAAA;;AA7EhB,aAkFI;EACI,YAAA;EACA,mBAAA;;AApFR,aAkFI,gBAII;EACI,YAAA;EACA,sBAAA;EACA,qDAAA;EACA,YAAA;;AA1FZ,aAkFI,gBAII,YAMI;EACI,YAAA;EACA,YAAA;EACA,8BAAA;EACA,kBAAA;EACA,sBAAA;;AAjGhB,aAkFI,gBAII,YAMI,WAOI;EACI,eAAA;EACA,kBAAA;EACA,SAAA;EACA,cAAA;EACA,UAAA;;AAxGpB,aAkFI,gBAII,YAMI,WAeI;EACI,YAAA;EACA,WAAA;EACA,eAAA;EACA,cAAA;EACA,iBAAA;;AAhHpB,aAkFI,gBAII,YA+BI;EACI,YAAA;EACA,8BAAA;;AAvHhB,aAkFI,gBA0CI;EACI,gBAAA;EACA,eAAA;;AA9HZ,aAkFI,gBA0CI,gBAII;EACI,cAAA;EACA,gBAAA;EACA,WAAA;;AAnIhB,aAkFI,gBA0CI,gBAUI;EACI,cAAA;EACA,YAAA;;AAxIhB,aAkFI,gBA0CI,gBAUI,cAII;EACI,iBAAA;EACA,eAAA;EACA,gCAAA;;AAEA,aA7DhB,gBA0CI,gBAUI,cAII,IAKK;AAAS,aA7D1B,gBA0CI,gBAUI,cAII,IAKe;EACP,cAAA;;AAhJxB,aAwJI;EACI,kBAAA;;AAzJR,aAwJI,UAGI;EACI,YAAA;EACA,UAAA;EACA,yBAAA;EACA,mBAAA;EACA,kBAAA;;AAhKZ,aAwJI,UAWI;EACI,cAAA;EACA,eAAA;;AArKZ,aAyKI;EACI,gBAAA;;AA1KR,aAyKI,OAGI;EACI,iBAAA;EACA,gBAAA;;AA9KZ,aAyKI,OAGI,YAGI,YACI,UACI;EACI,WAAA;EACA,YAAA;EACA,eAAA;EACA,WAAA;EACA,iBAAA;EACA,kBAAA;EACA,kBAAA;;AAEA,aAjBpB,OAGI,YAGI,YACI,UACI,MASK;EACG,yBAAA;;AAIJ,aAtBpB,OAGI,YAGI,YACI,UACI,MAcK;EACG,yBAAA;;AAhM5B,aAyKI,OAGI,YAGI,YACI,UAqBI;EACI,iBAAA;EACA,OAAO,iBAAP;;AAvMxB,aAgNI;EACI,gBAAA;;AAjNR,aAgNI,QAGI;EACI,kBAAA;;AApNZ,aAgNI,QAGI,cAGI;EACI,eAAA;EACA,eAAA;EACA,cAAA;EACA,kBAAA;EACA,WAAA;EACA,UAAA;;AA5NhB,aAgNI,QAgBI;EACI,eAAA;EACA,gBAAA;;AAlOZ,aAgNI,QAgBI,aAII;EACI,YAAA;EACA,sBAAA;EACA,gBAAA;EACA,eAAA;EACA,cAAA;EACA,eAAA;EACA,iBAAA;EACA,gCAAA;;AAEA,aA9BZ,QAgBI,aAII,aAUK;EACG,mBAAA;;AA/OpB,aAgNI,QAgBI,aAII,aAcI;EACI,cAAA;EACA,eAAA;EACA,UAAA;;AArPpB,aAgNI,QAgBI,aAII,aAoBI;EACI,UAAA;;AAzPpB,aAgNI,QAgBI,aAII,aAoBI,OAGI;EACI,cAAA;;AA5PxB,aAgNI,QAgBI,aAII,aA4BI;EACI,UAAA;;AAjQpB,aAgNI,QAgBI,aAII,aA4BI,KAGI;EACI,cAAA;;AApQxB,aAgNI,QAgBI,aAII,aAoCI;EACI,UAAA;;AAzQpB,aAgNI,QAgBI,aAII,aAoCI,SAGI;EACI,eAAA;EACA,cAAA;EACA,yCAAA;EACA,8BAAA;EACA,gBAAA;EACA,kBAAA;;AAEA,aAnEpB,QAgBI,aAII,aAoCI,SAGI,MAQK;EACG,yCAAA;EACA,cAAA;;AArR5B,aAgNI,QAgBI,aAII,aAoCI,SAiBI;EACI,cAAA;;AA1RxB,aAgNI,QAgBI,aAII,aA0DI;EACI,UAAA;;AA/RpB,aAgNI,QAgBI,aAII,aA+DI;EACI,WAAA;EACA,cAAA;EACA,SAAA;EACA,eAAA;;AAGJ,aA1FZ,QAgBI,aAII,aAsEK;EACG,qDAAA","file":"home.css"}
\ No newline at end of file
dist/css/home.less
......@@ -234,6 +234,7 @@
color: #ADB6BF;
font-size: 14px;
line-height: 60px;
transition: all 0.2s ease-in-out;
&>div {
padding-right: 10px;
......@@ -294,6 +295,10 @@
margin: 0;
cursor: pointer;
}
&:hover{
box-shadow: 0px 5px 10px 0px rgba(216, 223, 230, 0.5);
}
}
}
}
......
dist/css/inquirydetail.css
......@@ -301,6 +301,10 @@
font-size: 20px;
margin-right: 5px;
}
.inquiry_detail_content .bj_detail .bj_lists .bj_item .item_right .bottom div .iconjuxing23,
.quote_detail_content .bj_detail .bj_lists .bj_item .item_right .bottom div .iconjuxing23 {
color: #adb6bf;
}
.inquiry_detail_content .bj_detail .bj_lists .bj_item .item_right .bottom .gt_div,
.quote_detail_content .bj_detail .bj_lists .bj_item .item_right .bottom .gt_div {
width: 110px;
......@@ -309,6 +313,11 @@
.quote_detail_content .bj_detail .bj_lists .bj_item .item_right .bottom .phone_div {
width: 140px;
margin-left: 15px;
color: #8a9299;
}
.inquiry_detail_content .bj_detail .bj_lists .bj_item .item_right .bottom .phone_div:hover,
.quote_detail_content .bj_detail .bj_lists .bj_item .item_right .bottom .phone_div:hover {
background: none !important;
}
.inquiry_detail_content .bj_detail .bj_lists .bj_item .item_right .time,
.quote_detail_content .bj_detail .bj_lists .bj_item .item_right .time {
......
dist/css/inquirydetail.less
......@@ -293,6 +293,9 @@
font-size: 20px;
margin-right: 5px;
}
.iconjuxing23{
color: #adb6bf;
}
}
.gt_div {
......@@ -302,6 +305,10 @@
.phone_div {
width: 140px;
margin-left: 15px;
color: #8a9299;
&:hover{
background: none !important;
}
}
}
......
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