Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_wechat

pages/contract/contract.wxml

@@ -44,7 +44,7 @@
       <view class="detail_box">
         <view style="width: 60%;">
           <image src="/image/icon/clock_icon.png" style="width: 15px;height: 15px;border-radius:5px;margin-right: 5px;"></image>
-          <text>{{item.startTime}}-{{item.endTime}}</text>
+          <text>{{item.startTime}}~{{item.endTime}}</text>
         </view>
         <view style="width: 40%;text-align: right;">
           合同金额:

pages/inCome/inCome.js

@@ -32,8 +32,10 @@ Page({
     qtPics:[],  //其他图片列表数据
     //收入时间弹窗显隐
     srShow:false,
-    minDate: new Date(2008, 5, 1).getTime(),
-    maxDate: new Date(2023, 0, 31).getTime(),
+    // minDate: new Date(202, 5, 1).getTime(),
+    // maxDate: new Date(2023, 0, 31).getTime(),
+    minDate:new Date().getTime() - 180* 24 * 60 * 60 * 1000,
+    maxDate:new Date().getTime() + 180* 24 * 60 * 60 * 1000,
     crzhShow:false,
     accountListOptions:[], //存入账户类型选项
     crlxShow:false, //收入类型弹窗显隐

utils/API.js

@@ -358,7 +358,6 @@ export {
     URL_GET_CONTRACTDELETE,
     URL_GET_ATTACHMENTLIST,
     URL_GET_MONEYORDERADD,
-    URL_GET_PROJECTADD,
     URL_GET_PERMANENTLIST,
     URL_GET_PERMANENTDELETE,
     URL_GET_PERMANENTDETAIL,