特殊订单添加预提交撤回功能

packageA/orderForm/detail.js

@@ -23,6 +23,7 @@ Page({
     },
     onLoad(options) {
         this.setData({
+            options: wx.getStorageSync('auth').worderform.options,
             sa_orderid: options.id,
             order_rebate_used: wx.getStorageSync('siteP').order_rebate_used,
             userrole: wx.getStorageSync('userrole')
@@ -398,26 +399,27 @@ Page({
         })
     },
     /* 特殊订单预提交 */
-    presubmission() {
+    presubmission(e) {
         let that = this;
+        let isrecheck = e.currentTarget.dataset.isrecheck == 1;
         wx.showModal({
             title: '提示',
-            content: '是否确认预提交订单？',
+            content: `是否确认${isrecheck?'预提交订单':'撤回预提交'}？`,
             complete: (res) => {
                 if (res.confirm) _Http.basic({
                     "id": 20230331152503,
                     "content": {
-                        isrecheck: true,
+                        isrecheck,
                         sa_orderid: that.data.sa_orderid
                     },
                 }).then(s => {
-                    console.log("提交订单", s)
+                    console.log("预提交订单", s)
                     wx.showToast({
-                        title: s.msg != '成功' ? s.msg : '预提交成功',
+                        title: s.msg != '成功' ? s.msg : isrecheck ? '预提交成功' : '撤回预提交成功',
                         icon: "none"
                     });
                     if (s.msg == '成功') that.setData({
-                        "detail.status": "预提交"
+                        "detail.status": isrecheck ? "预提交" : '新建'
                     })
                 })
             }

packageA/orderForm/detail.wxml

@@ -68,7 +68,7 @@
 <view class="footer">
 	<view class="price">
 		<view class="count">
-			{{handleHide.query(amount,hidePrice)}}元
+			{{handleHide.query(defaultamount,hidePrice)}}元
 		</view>
 		<view>
 			{{logistics}}
@@ -77,7 +77,8 @@
 	<view class="but-box">
 		<van-button custom-class='but delete' wx:if="{{detail.status=='新建'}}" bind:click="deleteItem">删除订单</van-button>
 		<block wx:if="{{detail.type=='特殊订单'}}">
-			<van-button custom-class='but' wx:if="{{detail.status=='新建'}}" bind:click="presubmission">预提交</van-button>
+			<van-button custom-class='but' wx:if="{{detail.status=='新建'}}" data-isrecheck="1" bind:click="presubmission">预提交</van-button>
+			<van-button custom-class='but' wx:if="{{detail.status=='预提交' && enable.query(options,'revocation')}}" data-isrecheck="0" bind:click="presubmission">撤回</van-button>
 			<van-button custom-class='but' wx:if="{{detail.status=='确认'}}" bind:click="submit">提交订单</van-button>
 		</block>
 		<block wx:else>
@@ -86,4 +87,5 @@
 	</view>
 </view>
 
-<wxs src="/utils/hidePrice.wxs" module="handleHide" />
+<wxs src="/utils/hidePrice.wxs" module="handleHide" />
+<wxs src="/utils/wxmlQueryPer.wxs" module="enable" />