From a2eaa00117cc8ba531f9ba7db2abf93cc7a9b816 Mon Sep 17 00:00:00 2001
From: admin <>
Date: Fri, 7 Jun 2024 09:35:36 +0800
Subject: [PATCH] =?UTF-8?q?update:=201.=E6=94=AF=E4=BB=98=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=20=E6=94=B6=E5=85=A5=E6=98=8E=E7=BB=86=20=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=8F=AF=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=202.=E5=87=BA=E8=B4=A7=E6=89=B9=E9=87=8F=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pagesApp/incomeDetail.vue            |   1 +
 src/pagesApp/paymentDetail.vue           |   1 +
 src/pagesShipment/shipmentSettlement.vue | 103 ++++++++++++++++++-----
 src/utils/http.ts                        |   1 -
 4 files changed, 83 insertions(+), 23 deletions(-)

diff --git a/src/pagesApp/incomeDetail.vue b/src/pagesApp/incomeDetail.vue
index 26b6368..81b9460 100644
--- a/src/pagesApp/incomeDetail.vue
+++ b/src/pagesApp/incomeDetail.vue
@@ -50,6 +50,7 @@
         <u-swipe-action-item
           :options="options1"
           v-for="(item, index) in pageList.list"
+          :disabled="[1].indexOf(item.paymentType) === -1"
           :key="index"
           @click="handleItem(item)"
         >
diff --git a/src/pagesApp/paymentDetail.vue b/src/pagesApp/paymentDetail.vue
index ac66eaf..4835b19 100644
--- a/src/pagesApp/paymentDetail.vue
+++ b/src/pagesApp/paymentDetail.vue
@@ -45,6 +45,7 @@
         <u-swipe-action-item
           :options="options1"
           v-for="(item, index) in pageList.list"
+          :disabled="[2,3].indexOf(item.paymentType) === -1"
           :key="index"
           @click="handleItem(item)"
         >
diff --git a/src/pagesShipment/shipmentSettlement.vue b/src/pagesShipment/shipmentSettlement.vue
index eb858a1..e642f8a 100644
--- a/src/pagesShipment/shipmentSettlement.vue
+++ b/src/pagesShipment/shipmentSettlement.vue
@@ -37,7 +37,12 @@
       "
       :noMoreData="pageList.noMoreData"
       :list="pageList.list"
-      :height="ScaleStatus.ShipmentPaid === currentTab ? 160 : 240"
+      :height="
+        ScaleStatus.ShipmentPaid === currentTab ||
+        ScaleStatus.ToBeShipmentReview === currentTab
+          ? 160
+          : 240
+      "
       :isLoading="pageList.isLoading"
     >
       <block v-for="(item, index) in pageList.list" :key="index">
@@ -45,7 +50,6 @@
           <view style="min-width: 20px"
             ><checkbox
               v-if="
-                ScaleStatus.ToBeShipmentReview === currentTab ||
                 ScaleStatus.ToBeShipmentPay === currentTab
               "
               :color="'#00D2E3'"
@@ -102,10 +106,7 @@
       </block>
     </page-view>
   </view>
-  <view
-    class="btn-box"
-    v-if="(currentTab === 2 || currentTab === 3) && pageList.list.length > 0"
-  >
+  <view class="btn-box" v-if="currentTab === 3 && pageList.list.length > 0">
     <u-button
       text="全选/取消"
       color="#fff"
@@ -114,10 +115,21 @@
     ></u-button>
     <u-button
       type="primary"
-      :text="`${currentTab === 2 ? '批量审核' : '批量支付'}`"
-      @click="handleReviewOrPay(currentTab)"
+      :text="`批量支付`"
+      @click="handleReviewOrPay()"
     ></u-button>
   </view>
+
+  <block>
+    <u-action-sheet
+      :actions="contrlModalParams.select.list"
+      :title="contrlModalParams.select.title"
+      :show="contrlModalParams.select.isShow"
+      @select="(v: any) => handleSelect1('select', v)"
+      @close="contrlModalParams.select.isShow = false"
+      :closeOnClickAction="true"
+    ></u-action-sheet>
+  </block>
 </template>
 <script setup lang="ts">
 import { ShipmentApi } from "@/services/index";
@@ -125,6 +137,43 @@ import { ScaleStatus, ScaleStatusBtnType } from "@/utils/enum";
 import { onLoad } from "@dcloudio/uni-app";
 import { onShow } from "@dcloudio/uni-app";
 import PageView from "@/components/PageView/index.vue";
+import type { ComType } from "@/types/global";
+
+const contrlModalParams = reactive<ComType>({
+  select: {
+    isShow: false,
+    title: "标题",
+    list: [
+      {
+        name: "微信",
+        key: 3,
+      },
+      {
+        name: "现金",
+        key: 1,
+      },
+      {
+        name: "支付宝",
+        key: 4,
+      },
+      {
+        name: "转账",
+        key: 2,
+      },
+    ],
+  },
+});
+
+const payState = reactive({
+  paymentMethodName: "",
+  paymentMethod: "",
+});
+const handleSelect1 = (key: string, v: any) => {
+  contrlModalParams.select.isShow = false;
+  payState.paymentMethodName = v.name;
+  payState.paymentMethod = v.key;
+  updateStatus(ScaleStatus.ShipmentPaid);
+};
 // scaleStatus
 const pageList: PageResult<Shipment> = reactive({
   isLoading: false,
@@ -173,24 +222,34 @@ const handleReview = (id: string, scaleStatus: number) => {
     type = ScaleStatusBtnType.ShipmentPay;
   }
   uni.navigateTo({
-    url: "/pagesShipment/review/index?id=" + id + `&scaleStatusBtnType=${type}&scaleStatus=${scaleStatus}`, // 要跳转到的页面路径
+    url:
+      "/pagesShipment/review/index?id=" +
+      id +
+      `&scaleStatusBtnType=${type}&scaleStatus=${scaleStatus}`, // 要跳转到的页面路径
   });
 };
 
-const handleReviewOrPay = (status: number) => {
-  // 批量审核
-  if (ScaleStatus.ToBeShipmentReview === status) {
-    updateStatus(ScaleStatus.ToBeShipmentPay);
-  } else if (ScaleStatus.ToBeShipmentPay === status) {
-    // 批量支付
-    updateStatus(ScaleStatus.ShipmentPaid);
+const handleReviewOrPay = () => {
+  const list = pageList.list
+    .filter((item) => item.isChecked)
+  if (list.length === 0) {
+    uni.showToast({ icon: "none", title: "请至少选择一个出货单" });
+    return;
   }
+  // 批量支付
+  contrlModalParams.select.isShow = true;
+  contrlModalParams.select.title = "结算方式";
 };
 const updateStatus = (status: number) => {
   const list = pageList.list
     .filter((item) => item.isChecked)
     .map((item) => {
-      return { ...item, scaleStatus: status };
+      return {
+        ...item,
+        scaleStatus: status,
+        paymentMethodName: payState.paymentMethodName,
+        paymentMethod: payState.paymentMethod,
+      };
     });
   if (list.length === 0) {
     uni.showToast({ icon: "none", title: "请至少选择一个出货单" });
@@ -244,16 +303,16 @@ const getList = (v?: boolean) => {
       //   return { ...item, isChecked: false };
       // });
       pageList.list = pageList.list.concat(
-          res.data.list.map((item: any) => {
-            return { ...item, isChecked: false };
-          })
-        );
+        res.data.list.map((item: any) => {
+          return { ...item, isChecked: false };
+        })
+      );
       pageList.total = (res.data as any).total;
     }
   });
 };
 onShow(() => {
-  resetPageList()
+  resetPageList();
   getList();
 });
 onLoad((option) => {
diff --git a/src/utils/http.ts b/src/utils/http.ts
index 4f6cb8d..413e588 100644
--- a/src/utils/http.ts
+++ b/src/utils/http.ts
@@ -63,7 +63,6 @@ export const http = <T>(options: UniApp.RequestOptions) => {
         quality: 80, // 压缩质量
         success: (compressRes) => {
           const compressedTempFilePath = compressRes.tempFilePath;
-          console.log('******* 压缩啦', compressedTempFilePath)
           uni.uploadFile({
             header: {
               "x-userToken": store.profile?.token,