Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/uas/platform/b2b/service/impl/SOAPConsoleServiceImpl.java

@@ -13,8 +13,6 @@ import com.uas.sso.common.encrypt.base64.Base64;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
-import sun.misc.BASE64Decoder;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -1201,9 +1199,10 @@ public class SOAPConsoleServiceImpl implements SOAPConsoleService {
         byte[] b = null;
         String result = null;
         if (s != null) {
-            BASE64Decoder decoder = new BASE64Decoder();
+            //BASE64Decoder decoder = new BASE64Decoder();
             try {
-                b = decoder.decodeBuffer(s);
+                //b = decoder.decodeBuffer(s);
+                b = Base64.decode(s);
                 result = new String(b, "GB2312");
             } catch (Exception e) {
                 e.printStackTrace();

src/main/webapp/resources/tpl/index/sale/change.html

@@ -319,7 +319,7 @@
 					<a ng-click="change.$editing=!change.$editing">取消</a>
 				</div> <br>
 				<div>
-					<a ng-click="onReplyClick(change)" class="text-inverse">确认回复</a>
+					<a ng-click="onReplyClick(change);setOrdersRead(change.id)" class="text-inverse">确认回复</a>
 				</div> <br></td>
 		</tr>
 		<tr class="order-bd" ng-repeat="item in ::change.orderChangeItems">