h5端19开头手机号录入bug

app/common/js/common.js

@@ -69,7 +69,7 @@ export default {
     // 正则验证是否为手机号
     isPhone(str) {
         str = str + '';
-        if ((/^1[345678]\d{9}$/.test(str))) {
+        if ((/^1[3456789]\d{9}$/.test(str))) {
             return true;
         }
         return false;

app/manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "场站管理系统",
-    "appid" : "__UNI__8AC923A",
+    "appid" : "__UNI__734EF1A",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -89,7 +89,7 @@
             "mode" : "history"
         },
         "devServer" : {
-            "https" : false
+            "https" : true
         }
     }
 }

app/utils/request.js

@@ -1,5 +1,5 @@
-// const server = 'http://127.0.0.1:8099/pro';
-const server = 'https://pco.aseanbusiness.cn/pro';
+const server = 'http://127.0.0.1:8099/pro';
+// const server = 'https://pco.aseanbusiness.cn/pro';
 // const server = 'https://dxkaa1.bgigc.com/pro';
 
 import common from '../common/js/common.js';

sp-admin/index.html

@@ -62,7 +62,7 @@
 <!-- js本地库 -->
 <script src="sa-frame/index/admin-util.js"></script>
 <script src="sa-frame/index/index.js"></script>
-<script src="sa-frame/menu-list.js?v=111111"></script>
+<script src="sa-frame/menu-list.js?v=12344"></script>
 <script src="sa-frame/menu-list-sp.js"></script>
 <script src="static/sa.js"></script>
 <script src="sa-frame/sa-code.js"></script>

sp-admin/sa-view/tb-fee-statistics/tb-fee-details-list.html

@@ -533,6 +533,10 @@
 							this.selectTimeRange.beginTime = this.selectTime[0];
 							this.selectTimeRange.endTime = this.selectTime[1];
 						}
+						if(!this.selectTime){
+							this.selectTimeRange.beginTime = '';
+							this.selectTimeRange.endTime = '';
+						}
 						sa.ajax('/TbFeeDetails/getList?beginTime=' + this.selectTimeRange.beginTime + '&endTime=' +
 							this.selectTimeRange.endTime,
 							sa.removeNull(this.p),

sp-server/src/main/java/com/pj/api/open/service/OpenService.java

@@ -291,15 +291,16 @@ public class OpenService {
                         && !pay) {
                     RedisUtil.setByMINUTES(channel, carNo, 1);
                     businessMoney = businessMoney.add(tbBusiness.getItemPrice());
-                    log.error("请求返回：请缴纳业务费用:{}", carNo);
+                    log.error("需要缴纳业务费用:{},{}", carNo,businessMoney.toString());
                     // return ResultJson.error("请缴纳业务费用");
                 }
             }
         }
         BigDecimal total = businessMoney.add(carMoney);
         if (total.doubleValue() > 0) {
-            log.error("请求返回：请缴费用:{}，{}元", carNo, total.doubleValue());
-            return ResultJson.error("请缴费用" + total.doubleValue() + "元");
+            String desc = "请缴业务费" + businessMoney.toString() + "元,停车费" + carMoney.toString()+"元";
+            log.error("请求返回：{},{}", carNo, desc);
+            return ResultJson.error(desc);
         }
         //离场直接解绑
         tbDeductionBindService.autoUnbindCar(tbBusinessCar.getCarNo());

sp-server/src/main/java/com/pj/project/tb_account/AutomaticPay.java

@@ -153,6 +153,7 @@ public class AutomaticPay {
         BigDecimal parkingMoneyBig = new BigDecimal(0);
         BigDecimal totalMoneyBig = new BigDecimal(totalMoney);
         BigDecimal balance = totalMoneyBig.subtract(tbBusiness.getItemPrice());
+        //是否离场支付
         boolean isOut = (TbGoods.DeductionTypeEnum.OUT_KK.getCode().equals(tbBusiness.getAutoDeductionType())) &&
                 this.feeType == 3;
         if (isOut) {

sp-server/src/main/java/com/pj/project/tb_account/TbAccount.java

@@ -57,7 +57,7 @@ public class TbAccount extends Model<TbAccount> implements Serializable {
     /**
      * 冻结金额
      */
-    private String lockMoney = AesUtil.encryptECB("0");;
+    private String lockMoney = AesUtil.encryptECB("0");
 
     /**
      * 可用金额

sp-server/src/main/java/com/pj/project/tb_account/TbAccountService.java

@@ -200,4 +200,6 @@ public class TbAccountService extends ServiceImpl<TbAccountMapper, TbAccount> im
     public String getIdByNow(){
         return DateUtil.format(new Date(), "yyyyMMddHHmmss") + RandomUtil.randomNumbers(4);
     }
+
+
 }

sp-server/src/main/resources/logback.xml

@@ -3,7 +3,7 @@
     <contextName>pco</contextName>
     <property name="LOG_PATH" value="logs"/>
     <property name="APP_DIR" value="pco"/>
-    <property name="log.maxFileSize" value="10MB"/>
+    <property name="log.maxFileSize" value="1MB"/>
     <property name="log.maxFileCnt" value="30"/>
     <property name="log.totalSizeCap" value="5GB"/>