Merge branch 'master' of hyq/kmall-pt into master

wx-mall/pages/shopping/checkout/checkout.js

@@ -118,9 +118,11 @@ Page({
             addressVo: res.data.addressVo
           });
         } 
-        that.setData({
-          idNoM: that.formatidcard(that.data.idNo)
-        });
+        if (that.data.idNo) {
+          that.setData({
+            idNoM: that.formatidcard(that.data.idNo)
+          });
+        }
         if(that.data.idNo){
           that.setData({
             idNoDisabled: true
@@ -321,7 +323,7 @@ Page({
           checkStore: true
         });
       } else{
-        console.log(res.errmsg);
+        // console.log(res.errmsg);
         // util.showErrorToast(res.errmsg);
         that.setData({
           checkStore: false