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

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

@@ -450,6 +450,10 @@ let vm = new Vue({
                 return;
             }
             $('#myModal').modal('show')
+            // 每次点击提交订单的时候清空姓名和身份证信息
+            vm.$refs.customName.value = "";
+            vm.$refs.customIDCard.value = "";
+
         },
         submitOrder:function(){
             $('#payCode').unbind('keydown').keydown(function(event){});
@@ -517,8 +521,14 @@ let vm = new Vue({
                         return ;
                     }
                     var data = JSON.parse(r.info);
-                    vm.$refs.customName.value = data.rows[0].data.name;
-                    vm.$refs.customIDCard.value = data.rows[0].data.id_no;
+                    if(data.code=="0"){
+                        vm.$refs.customName.value = data.rows[0].data.name;
+                        vm.$refs.customIDCard.value = data.rows[0].data.id_no;
+                    }else{
+                        alert(data.msg);
+                        return ;
+                    }
+
                 }else{
                     alter("请连接设备或设备有问题，请联系管理员！");
                 }