Merge remote-tracking branch 'origin/master'

mall4m/pages/editAddress/editAddress.js

@@ -308,7 +308,8 @@ Page({
       })
       return;
     }
-    if (mobile.length != 11) {
+    var regexp = /^[1]([3-9])[0-9]{9}$/;
+    if (!regexp.test(mobile)) {
       wx.showToast({
         title: '请输入正确的手机号码',
         icon: "none"

mall4m/pages/index/index.wxss

@@ -276,7 +276,7 @@ line-height:44rpx;
   font-size: 28rpx;
   overflow: hidden;
   margin: 10rpx 0;
-  height: 75rpx;
+  height: 68rpx;
   display: -webkit-box;
   word-break: break-all;
   display: -webkit-box;