Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general

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

@@ -1023,22 +1023,22 @@ public class OrderController {
         return R.ok().put("resultObj", result);
     }
 
-    @RequestMapping("/getIdCardInfo")
-    public R getIdCardInfo() throws IOException {
-
-        Map map = new HashMap();
-        String ssl = OkHttpUtils.post(map,"http://192.168.1.68:8000/idcard/read", "SSL");
-        Pattern pattern = Pattern.compile("(\\\\u(\\p{XDigit}{4}))");
-        Matcher matcher = pattern.matcher(ssl);
-        char ch;
-        while (matcher.find()) {
-            ch = (char) Integer.parseInt(matcher.group(2), 16);
-            ssl = ssl.replace(matcher.group(1), ch + "");
-        }
-
-        return R.ok().put("info",ssl);
-
-    }
+//    @RequestMapping("/getIdCardInfo")
+//    public R getIdCardInfo() throws IOException {
+//
+//        Map map = new HashMap();
+//        String ssl = OkHttpUtils.post(map,"http://127.0.0.1:8000/idcard/read", "SSL");
+//        Pattern pattern = Pattern.compile("(\\\\u(\\p{XDigit}{4}))");
+//        Matcher matcher = pattern.matcher(ssl);
+//        char ch;
+//        while (matcher.find()) {
+//            ch = (char) Integer.parseInt(matcher.group(2), 16);
+//            ssl = ssl.replace(matcher.group(1), ch + "");
+//        }
+//
+//        return R.ok().put("info",ssl);
+//
+//    }
 
 
     @RequestMapping("/purchaseSalesInStockDetail")

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 = "";
+            vm.$refs.customPhone.value = "";
         },
         submitOrder:function(){
             $('#payCode').unbind('keydown').keydown(function(event){});
@@ -509,18 +513,54 @@ let vm = new Vue({
             // 优惠券
             vm.coupons = new Map();
         },
+        // getIDCardInfo: function(){
+        //     $.get("../order/getIdCardInfo", function (r){
+        //         if(r.code === 0){
+        //             if(!r.info){
+        //                 alert("请连接设备或设备有问题，请联系管理员！");
+        //                 return ;
+        //             }
+        //             var data = JSON.parse(r.info);
+        //             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("请连接设备或设备有问题，请联系管理员！");
+        //         }
+        //     });
+        //
+        // },
         getIDCardInfo: function(){
-            $.get("../order/getIdCardInfo", function (r){
-                if(r.code === 0){
-                    if(!r.info){
-                        alert("请连接设备或设备有问题，请联系管理员！");
-                        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;
+            $.post("http://127.0.0.1:8000/idcard/read", function (r){
+                // var dataR = JSON.parse(r);
+                // console.log(dataR)
+                console.log(r)
+                console.log(r.code)
+
+                if(r.code == "0"){
+                    // if(!r.info){
+                    //     alert("请连接设备或设备有问题，请联系管理员！");
+                    //     return ;
+                    // }
+                    // var data = JSON.parse(r.info);
+                    // if(data.code=="0"){
+                    vm.$refs.customName.value = r.rows[0].data.name;
+                    vm.$refs.customIDCard.value = r.rows[0].data.id_no;
+                    // }else{
+                    //     alert(data.msg);
+                    //     return ;
+                    // }
+
+                }else if(r.code=="-1"){
+                    alert(r.msg);
+                    return;
                 }else{
-                    alter("请连接设备或设备有问题，请联系管理员！");
+                    alert("请连接设备或设备有问题，请联系管理员！");
                 }
             });
 

kmall-admin/src/main/webapp/userLogin.html

@@ -121,7 +121,7 @@
             // TODO 调用接口获取机器码
 
                 $.ajax({
-                    url:"http://127.0.0.1:8000/api/reg/gen",
+                    url:"http://127.0.0.1:21600/api/reg/gen",
                     success:function(r){
                         if(r.code == "0"){
                             vm.machineCode = r.rows[0].data.code;