Merge branch 'hcy_pcb_20181221-r' into development

public/js/PcbPurchaseList.js

@@ -111,11 +111,11 @@ function confirmOrder2(purchase_id,status) {
         timeout:10000,
         timeout:10000,
         success:function (res) {
         success:function (res) {
             if(res.err_code == 0){
             if(res.err_code == 0){
-                alert_succ(res.errmsg,function () {
+                alert_succ(res.err_msg,function () {
                    window.location.reload()
                    window.location.reload()
                 })
                 })
             }else{
             }else{
-                alert_err(res.errmsg)
+                alert_err(res.err_msg)
             }
             }
         }
         }
     })
     })