Merge branch 'master' of xwh/kmall-pt-general into master

kmall-admin/src/main/java/com/kmall/admin/controller/OrderController.java

@@ -996,9 +996,11 @@ public class OrderController {
                 return R.error((String) resultObj.get("errmsg"));
             }
             return R.ok().put("resultObj", resultObj);
-        } catch (Exception e) {
+        }catch (Exception e) {
+            if (e.getMessage().contains("java.lang.IllegalStateException: invalid auth_code!")){
+                return R.error("付款码异常，请重新输入!");
+            }
             return R.error(e.getMessage());
-
         }
 
     }

kmall-admin/src/main/webapp/js/sale/sale.js

@@ -542,9 +542,9 @@ let vm = new Vue({
             }
             $('#myModal').modal('show')
             // 每次点击提交订单的时候清空姓名和身份证信息和手机号
-            vm.$refs.customName.value = "";
-            vm.$refs.customIDCard.value = "";
-            vm.$refs.customPhone.value = "";
+            // vm.$refs.customName.value = "";
+            // vm.$refs.customIDCard.value = "";
+            // vm.$refs.customPhone.value = "";
             if(vm.$refs.couponSn)
                 vm.$refs.couponSn.value = "";
             this.userInfo.couponSn = "";
@@ -590,6 +590,8 @@ let vm = new Vue({
             vm.totalPrice = 0;
             vm.discountedPrice = 0;
             vm.actualPrice = 0;
+            vm.goods={};
+            vm.goodsDetail = false;
             // 买一送一
             vm.mysy = [];
             vm.newMysy = new Map();