Merge remote-tracking branch 'origin/master'

pages/apply/approval/approval.wxml

@@ -101,7 +101,10 @@
         <van-icon slot="icon" name="https://636c-cloud1-8gya17a31667774d-1310628902.tcb.qcloud.la/icon_mb.png?sign=2a8bbe2cb4d4e0f28a99fddbe042d26c&t=1648620032" class="custom-icon" size="40" style="margin-right: 10px;" />
       </van-cell>
       <view slot="right" class="deleteBox" bindtap='deleteTemplate' data-index="{{index}}" data-id="{{item.id}}">
-        <image src="/image/apply/icon_end.png" style="width: 25px;height: 25px;margin: 0 auto;"></image>
+        <view>
+          <image src="/image/apply/icon_end.png" style="width: 25px;height: 25px;margin: 0 auto;"></image>
+          <text style="display: block;text-align: center;color: #e90000;">禁用</text>
+        </view>
       </view>
     </van-swipe-cell>
   </scroll-view>

pages/apply/approval/approval.wxss

@@ -214,6 +214,7 @@ text{display: block;}
     background: #F6F6F6;
     align-items: center;
     display: flex;
+    justify-content: center;
   }
   .van-action-sheet__header {
     background: #f2f2f2;

pages/apply/index.wxml

@@ -100,12 +100,18 @@
       </van-cell-group>
       <view slot="right" class="deleteBox">
 
-        <view style="flex: 1;height: 100%;display: flex;align-items: center;border-right: 1px solid #eee;">
-          <image src="../../image/apply/button_mr.png" style="width: 25px;height: 25px;margin: 0 auto;" data-id="{{item.id}}" data-index="{{index}}" bindtap="getMr"></image>
+        <view style="flex: 1;height: 100%;display: flex;align-items: center;border-right: 1px solid #eee;justify-content: center;">
+          <view>
+            <image src="../../image/apply/button_mr.png" style="width: 25px;height: 25px;margin: 0 auto;" data-id="{{item.id}}" data-index="{{index}}" bindtap="getMr"></image>
+            <text style="display: block;text-align: center;color: #fc9a55;">默认</text>
+          </view>
         </view>
 
-        <view style="flex: 1;height: 100%;display: flex;align-items: center;">
-          <image src="../../image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;" data-id="{{item.id}}" data-index="{{index}}" bindtap="delete"></image>
+        <view style="flex: 1;height: 100%;display: flex;align-items: center;justify-content: center;">
+          <view>
+            <image src="../../image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;" data-id="{{item.id}}" data-index="{{index}}" bindtap="delete"></image>
+            <text style="display: block;text-align: center;color: #e90000;">删除</text>
+          </view>
         </view>
 
       </view>

pages/apply/paymentTemplate/add/add.js

@@ -13,8 +13,6 @@ Page({
    * 页面的初始数据
    */
   data: {
-    minDate: new Date(2008, 5, 1).getTime(),
-    maxDate: new Date(2040, 0, 31).getTime(),
     isIPX: app.globalData.isIPX,
     radio:'1',
     active:0,
@@ -140,7 +138,7 @@ Page({
     QTimage: [],
     imgcount:0,
     activeNames: 0,
-    applyDate:''
+    applyDate:'',
   },
 
   /**

pages/apply/paymentTemplate/add/add.wxml

@@ -31,7 +31,7 @@
 
   <text>联系电话：{{form.approvalItemTemplate.telephone}}</text>
   <van-field required label="申请时间：" readonly is-link value="{{ applyDate }}" placeholder="请选择申请时间" border="{{ false }}" bind:change="onChangeTime" bindtap="openBox" data-name="showApplyDate" />
-  <van-calendar show="{{ showApplyDate }}" min-date="{{minDate}}" max-date="{{maxDate}}" bind:close="closeBox"  data-name="showApplyDate" bind:confirm="onConfirmTime" data-value="form.transfers[{{index}}].applyDate" show-confirm="{{ false }}" />
+  <van-calendar show="{{ showApplyDate }}" bind:close="closeBox"  data-name="showApplyDate" bind:confirm="onConfirmTime" data-value="form.transfers[{{index}}].applyDate" show-confirm="{{ false }}" />
 </view>
 
   <van-collapse accordion value="{{ activeNames }}" bind:change="onChangeBox" bind:open="onOpen" bind:close="onCloseSecond">

pages/index/index.wxml

@@ -188,8 +188,11 @@
                 </view>
             </view> 
             <view slot="right" class="deleteBox">
-              <view style="flex: 1;height: 100%;display: flex;align-items: center;">
-                <image src="../../image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;" data-id="{{item.id}}" data-index="{{index}}" bindtap="delete"></image>
+              <view style="flex: 1;height: 100%;display: flex;align-items: center;justify-content: center;">
+                <view>
+                  <image src="../../image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;" data-id="{{item.id}}" data-index="{{index}}" bindtap="delete"></image>
+                  <text style="display: block;text-align: center;color: #e90000;">删除</text>
+                </view>
               </view>
             </view>
         </van-swipe-cell>

project.private.config.json

@@ -149,5 +149,5 @@
   },
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "projectname": "WXMB",
-  "libVersion": "2.24.2"
+  "libVersion": "2.21.4"
 }