Authored by 郝肖肖

Merge branch 'feature/customerService' of git.yoho.cn:fe/yohobuy-node into feature/customerService

@@ -15,7 +15,9 @@ @@ -15,7 +15,9 @@
15 <p class="star-text">非常满意</p> 15 <p class="star-text">非常满意</p>
16 </div> 16 </div>
17 <div class="detail-reason"> 17 <div class="detail-reason">
18 - <div class="discontent"></div> 18 + <div class="dis-wrap">
  19 + <div class="discontent"></div>
  20 + </div>
19 <textarea class="other-reason" maxlength="50" placeholder="请您输入不满意的其他原因" spellcheck="false"></textarea> 21 <textarea class="other-reason" maxlength="50" placeholder="请您输入不满意的其他原因" spellcheck="false"></textarea>
20 </div> 22 </div>
21 </div> 23 </div>
@@ -694,6 +694,7 @@ function pageInit() { @@ -694,6 +694,7 @@ function pageInit() {
694 .last().find('.reconnect'); 694 .last().find('.reconnect');
695 695
696 if (!$reconnect.length) { 696 if (!$reconnect.length) {
  697 + socketChat.clear();
697 offlineTip(); 698 offlineTip();
698 } 699 }
699 }, 700 },
@@ -1069,49 +1069,52 @@ $color-3a3a3a: #3a3a3a; @@ -1069,49 +1069,52 @@ $color-3a3a3a: #3a3a3a;
1069 .detail-reason { 1069 .detail-reason {
1070 display: none; 1070 display: none;
1071 1071
1072 - .discontent { 1072 + .dis-wrap {
  1073 + margin-left: 8px;
1073 max-height: 155px; 1074 max-height: 155px;
1074 overflow-y: scroll; 1075 overflow-y: scroll;
1075 overflow-x: hidden; 1076 overflow-x: hidden;
1076 - margin-bottom: 30px;  
1077 1077
1078 - .dis-row {  
1079 - font-size: 0;  
1080 - text-align: center;  
1081 - margin-bottom: 13px; 1078 + .discontent {
  1079 + margin-bottom: 30px;
1082 1080
1083 - .type {  
1084 - position: relative;  
1085 - display: inline-block;  
1086 - width: 155px;  
1087 - height: 40px;  
1088 - padding: 0 2px;  
1089 - font-size: 12px;  
1090 - text-align: center;  
1091 - line-height: 40px;  
1092 - border: 1px #999999 solid;  
1093 - border-radius: 5px;  
1094 - cursor: pointer;  
1095 - text-overflow: ellipsis;  
1096 - white-space: nowrap;  
1097 - overflow: hidden; 1081 + .dis-row {
  1082 + font-size: 0;
  1083 + margin-bottom: 13px;
1098 1084
1099 - &.chosen {  
1100 - &:after {  
1101 - position: absolute;  
1102 - top: 13px;  
1103 - right: -2px;  
1104 - content: '';  
1105 - display: inline-block;  
1106 - height: 27px;  
1107 - width: 27px;  
1108 - background-image: resolve('service/btn-chosen.png'); 1085 + .type {
  1086 + position: relative;
  1087 + display: inline-block;
  1088 + width: 155px;
  1089 + height: 40px;
  1090 + padding: 0 2px;
  1091 + font-size: 12px;
  1092 + text-align: center;
  1093 + line-height: 40px;
  1094 + border: 1px #999999 solid;
  1095 + border-radius: 5px;
  1096 + cursor: pointer;
  1097 + text-overflow: ellipsis;
  1098 + white-space: nowrap;
  1099 + overflow: hidden;
  1100 +
  1101 + &.chosen {
  1102 + &:after {
  1103 + position: absolute;
  1104 + top: 13px;
  1105 + right: -2px;
  1106 + content: '';
  1107 + display: inline-block;
  1108 + height: 27px;
  1109 + width: 27px;
  1110 + background-image: resolve('service/btn-chosen.png');
1109 1111
  1112 + }
1110 } 1113 }
1111 - }  
1112 1114
1113 - &:first-child {  
1114 - margin-right: 15px; 1115 + &:first-child {
  1116 + margin-right: 15px;
  1117 + }
1115 } 1118 }
1116 } 1119 }
1117 } 1120 }