src/common/apis/approval/type.ts

@@ -36,8 +36,6 @@ export interface SearchApiReturnApprovalQuery {
   endTime?: string
   approvalType?: number
   corpid?: string
-  handleStatus?: number;
-  searchStr?: string;
 }
 
 export interface ApiResponsePageData<T> {

src/common/utils/maps/payment.ts

@@ -1,14 +0,0 @@
-export const paymentMethodOptions = [
-  { label: '微信支付', value: 0, type: 'primary' },
-  { label: '借呗支付', value: 1, type: 'success' },
-  { label: '要呗支付', value: 2, type: 'info' },
-  { label: '余额支付', value: 3, type: 'warning' },
-];
-
-export const modeToPaymentMethodMap: Record<number, number[]> = {
-  0: [0],
-  1: [0, 1],
-  2: [0, 1],
-  3: [0],
-  4: [2],
-};

src/pages/approval/list.vue

@@ -1,13 +1,40 @@
 <template>
     <div class="approval-list-container">
-        <!-- 状态切换标签页 -->
-        <van-tabs v-model:active="activeTab" @change="handleTabChange">
-            <van-tab title="待处理"></van-tab>
-            <van-tab title="已处理"></van-tab>
-        </van-tabs>
         <!-- 搜索表单 -->
         <van-form @submit="handleSearch">
-            <van-search v-model="searchParams.searchStr" placeholder="请输入搜索内容" />
+            <van-field v-model="searchParams.approvalId" label="审批单号" type="number" placeholder="请输入审批单号" />
+
+            <van-field v-model="searchParams.orderId" label="订单编号" type="number" placeholder="请输入订单编号" />
+
+            <van-field v-model="searchParams.goodsId" label="商品ID" type="number" placeholder="请输入商品ID" />
+
+            <van-field name="status" label="审批状态" readonly clickable v-model="statusText" placeholder="请选择状态"
+                @click="showStatusPicker = true" />
+            <van-popup v-model:show="showStatusPicker" position="bottom">
+                <van-picker :columns="statusOptions" @confirm="onStatusConfirm" @cancel="showStatusPicker = false" />
+            </van-popup>
+
+            <!-- <van-field
+        readonly
+        clickable
+        name="date"
+        :value="dateRangeText"
+        label="申请时间"
+        placeholder="选择时间范围"
+        @click="showDatePicker = true"
+      />
+      <van-popup v-model:show="showDatePicker" position="bottom">
+        <van-datetime-picker
+          type="daterange"
+          @confirm="onDateConfirm"
+          @cancel="showDatePicker = false"
+        />
+      </van-popup> -->
+
+            <div style="margin: 16px;">
+                <van-button block type="primary" native-type="submit">搜索</van-button>
+                <van-button block plain type="primary" style="margin-top: 10px;" @click="handleReset">重置</van-button>
+            </div>
         </van-form>
 
         <!-- 审批列表 -->
@@ -33,18 +60,14 @@ import type { SearchApiReturnApprovalQuery, ReturnApprovalEntity } from '@/commo
 import type { PickerConfirmEventParams } from 'vant/es';
 import { useApprovalStore } from '@/pinia/stores/approval';
 import { useWxStore } from '@/pinia/stores/wx';
-import { debounce } from 'lodash-es';
 
 const router = useRouter();
 const wxStore = useWxStore();
 
 // 搜索参数
-const activeTab = ref(0);
 const searchParams = reactive<SearchApiReturnApprovalQuery>({
     corpid: wxStore.corpid,
     approvalType: 0,
-    handleStatus: activeTab.value,
-    searchStr: '',
     pageNum: 1,
     pageSize: 10,
 })
@@ -103,12 +126,6 @@ const onStatusConfirm = (e: PickerConfirmEventParams) => {
     statusText.value = String(selectedOptions[0]?.text || '');
 }
 
-// 标签页切换处理
-const handleTabChange = (tabIndex: number) => {
-    searchParams.handleStatus = tabIndex;
-    handleSearch();
-};
-
 // 处理时间选择
 const onDateConfirm = (values: Date[]) => {
     const [start, end] = values
@@ -120,23 +137,10 @@ const onDateConfirm = (values: Date[]) => {
 
 // 搜索处理
 const handleSearch = () => {
-    list.value = [];
+    list.value = []
-    searchParams.pageNum = 1;
+    searchParams.pageNum = 1
-    finished.value = false;
+    onLoad()
-    onLoad();
 }
-const debouncedHandleSearch = debounce(() => {
-    handleSearch();
-}, 500);
-
-// 监听搜索字符串变化触发搜索
-watch(() => searchParams.searchStr, (newVal) => {
-    debouncedHandleSearch();
-});
-
-onUnmounted(() => {
-    debouncedHandleSearch.cancel();
-});
 
 // 重置表单
 const handleReset = () => {

src/pages/approvalAsset/list.vue

@@ -167,10 +167,9 @@ const handleTabChange = (tabIndex: number) => {
 
 // 搜索处理
 const handleSearch = () => {
-    list.value = [];
+    list.value = []
-    searchParams.pageNum = 1;
+    searchParams.pageNum = 1
-    finished.value = false;
+    onLoad()
-    onLoad();
 }
 
 const debouncedHandleSearch = debounce(() => {

src/pages/product/ProductList.vue

@@ -61,7 +61,6 @@ const showAb98BindPopup = ref(false);
 function handleShopSelect(selectedShopId: number) {
   shopId.value = selectedShopId;
   showShopList.value = false;
-  productStore.setSelectedShop(shopList.value.find(shop => shop.shopId === selectedShopId)!);
   productStore.getGoods(selectedShopId);
   cartStore.clearCart();
   activeCategory.value = 0;

src/pages/product/components/checkout.vue

@@ -1,42 +1,25 @@
 <script setup lang="ts">
-import { useCartStore } from "@/pinia/stores/cart";
+import { useCartStore } from "@/pinia/stores/cart"
-import { useWxStore } from "@/pinia/stores/wx";
+import { useWxStore } from "@/pinia/stores/wx"
-import { useAb98UserStore } from '@/pinia/stores/ab98-user';
+import { useAb98UserStore } from '@/pinia/stores/ab98-user'
-import { storeToRefs } from "pinia";
+import { storeToRefs } from "pinia"
-import { showConfirmDialog } from "vant";
+import { showConfirmDialog } from "vant"
-import { submitOrderApi } from "@/common/apis/shop";
+import { submitOrderApi } from "@/common/apis/shop"
-import type { SubmitOrderRequestData, WxJsApiPreCreateResponse } from "@/common/apis/shop/type";
+import type { SubmitOrderRequestData, WxJsApiPreCreateResponse } from "@/common/apis/shop/type"
-import { useRouter } from 'vue-router';
+import { useRouter } from 'vue-router'
-import { useProductStore } from "@/pinia/stores/product";
-// 导入支付方式映射
-import { paymentMethodOptions, modeToPaymentMethodMap } from "@/common/utils/maps/payment";
 
-const router = useRouter();
+const router = useRouter()
 
-const cartStore = useCartStore();
+const cartStore = useCartStore()
-const { cartItems, totalPrice } = storeToRefs(cartStore);
+const { cartItems, totalPrice } = storeToRefs(cartStore)
 
-const wxStore = useWxStore();
+const wxStore = useWxStore()
-const { openid, balance, corpidLogin, userid: qyUserid, name: qyName } = storeToRefs(wxStore);
+const { openid, balance, corpidLogin, userid: qyUserid, name: qyName } = storeToRefs(wxStore)
 
-const ab98UserStore = useAb98UserStore();
+const ab98UserStore = useAb98UserStore()
-const { tel, userid: ab98Userid, name } = storeToRefs(ab98UserStore);
+const { tel, userid: ab98Userid, name } = storeToRefs(ab98UserStore)
 
-const productStore = useProductStore();
+const selectedPayment = ref<'wechat' | 'balance' | 'approval'>('wechat');
-
-// 根据店铺模式计算支持的支付方式
-const supportedPayments = computed(() => {
-  const shopMode = productStore.selectedShop?.mode || 0;
-  const allowedValues = modeToPaymentMethodMap[shopMode] || [];
-  // 筛选条件：
-  // 1. 支付方式值必须在店铺模式允许的列表中
-  // 2. 微信支付(值为0)仅当非企业微信登录时才显示
-  return paymentMethodOptions.filter(option => allowedValues.includes(option.value)
-  && (option.value !== 0 || !corpidLogin.value));
-});
-
-// 初始化选中的支付方式为第一个支持的选项
-const selectedPayment = ref<string>(supportedPayments.value[0]?.value.toString() || '0');
 const contact = ref("");
 const applyRemark = ref("");
 const submitting = ref(false);
@@ -45,13 +28,28 @@ const isApproval = computed(() => {
   return cartItems.value.some(item => item.product.belongType == 1);
 });
 
-// 支付方式value到类型的映射
+watch(corpidLogin, (newValue) => {
-const paymentValueToType: Record<string, 'wechat' | 'balance' | 'approval'> = {
+  if (isApproval.value) {
-  '0': 'wechat',
+    selectedPayment.value = 'approval';
-  '1': 'balance',
+  } else {
-  '2': 'approval',
+    if (newValue) {
-  '3': 'balance'
+      selectedPayment.value = 'balance';
-};
+    } else {
+      selectedPayment.value = 'wechat';
+    }
+  }
+}, { immediate: true });
+watch(isApproval, (newValue) => {
+  if (newValue) {
+    selectedPayment.value = 'approval';
+  } else {
+    if (corpidLogin.value) {
+      selectedPayment.value = 'balance';
+    } else {
+      selectedPayment.value = 'wechat';
+    }
+  }
+})
 
 function callWxJsApi(paymentInfo: WxJsApiPreCreateResponse) {
   return new Promise((resolve, reject) => {
@@ -129,8 +127,7 @@ async function handleSubmit() {
         quantity: item.quantity,
         cellId: item.product.cellId,
       })),
-      // 根据选中的支付方式value获取对应的类型
+      paymentType: selectedPayment.value,
-      paymentType: paymentValueToType[selectedPayment.value] || 'wechat',
       mobile: tel.value,
       name: isInternal === 2 ? qyName.value : name.value,
       applyRemark: applyRemark.value,
@@ -144,35 +141,28 @@ async function handleSubmit() {
       throw new Error("订单提交失败")
     }
 
-    if (selectedPayment.value == '0') { // 微信支付
+    if (selectedPayment.value === 'wechat') {
       if (data.paymentInfo) {
         await callWxJsApi(data.paymentInfo);
       }
-    } else if (selectedPayment.value == '1') { // 借呗支付
+    } else if (selectedPayment.value === 'balance') {
-      wxStore.setBalance(data.newBalance || 0);
+      // 余额支付成功处理
-      try {
-        await showConfirmDialog({
-          title: "支付成功",
-          message: `借呗支付成功，剩余余额：¥${data.newBalance?.toFixed(2)}`
-        })
-      } catch (error) {}
-    } else if (selectedPayment.value == '2') { // 要呗支付
-      try {
-        await showConfirmDialog({
-          title: "提交领用申请成功",
-          message: `请等待管理员审批`
-        })
-      } catch (error) {}
-    } else if (selectedPayment.value == '3') { // 余额支付
       wxStore.setBalance(data.newBalance || 0);
       try {
         await showConfirmDialog({
           title: "支付成功",
           message: `余额支付成功，剩余余额：¥${data.newBalance?.toFixed(2)}`
         })
-      } catch (error) {}
+      } catch (error) {
-    } else { // 新增支付方式
+      }
-      // 处理逻辑
+    } else if (selectedPayment.value === 'approval') {
+      // 审批支付成功处理
+      try {
+        await showConfirmDialog({
+          title: "提交领用申请成功",
+          message: `请等待管理员审批`
+        })
+      } catch (error) { }
     }
 
     router.push({
@@ -235,24 +225,25 @@ async function handleSubmit() {
         <van-field v-model="applyRemark" label="领用说明" type="textarea" rows="2" autosize />
       </van-cell-group> -->
 
-      <!-- 支付方式 -->
       <van-cell-group v-if="!isApproval" class="contact-form">
-        <van-cell 
+        <van-cell v-if="!corpidLogin" :class="['payment-option', { selected: selectedPayment === 'wechat' }]"
-          v-for="method in supportedPayments" 
+          @click="selectedPayment = 'wechat'">
-          :key="method.value"
+          <van-icon name="wechat" class="method-icon" />
-          :class="['payment-option', { selected: selectedPayment === method.value.toString(), disabled: method.value === 1 && (balance < totalPrice) }]"
+          <span class="method-label">微信支付</span>
-          @click="selectedPayment = method.value.toString()"
+          <div class="empty"></div>
-        >
+          <van-icon v-if="selectedPayment === 'wechat'" name="success" class="check-icon" />
-          <van-icon 
+        </van-cell>
-            :name="method.value === 0 ? 'wechat' : method.value === 1 ? 'balance-o' : method.value === 2 ? 'credit-card' : 'wallet'"
+
-            class="method-icon"
+        <van-cell v-if="balance && balance > 0"
-          />
+          :class="['payment-option', { selected: selectedPayment === 'balance', disabled: balance < totalPrice }]"
+          @click="selectedPayment = 'balance'">
+          <van-icon name="balance-o" class="method-icon" />
           <span class="method-label">
-            {{ method.label }}
+            借呗支付
-            <span v-if="method.value === 1" class="balance-amount">（当前：¥{{ balance.toFixed(2) }}）</span>
+            <span class="balance-amount">（当前：¥{{ balance.toFixed(2) }}）</span>
           </span>
           <div class="empty"></div>
-          <van-icon v-if="selectedPayment === method.value.toString()" name="success" class="check-icon" />
+          <van-icon v-if="selectedPayment === 'balance'" name="success" class="check-icon" />
         </van-cell>
       </van-cell-group>
 

src/pinia/stores/product.ts

@@ -1,4 +1,3 @@
-import { ShopEntity } from "@/common/apis/shop/type"
 import { pinia } from "@/pinia"
 import { getShopGoodsApi } from "@@/apis/shop"
 
@@ -20,11 +19,6 @@ export const useProductStore = defineStore("product", () => {
   const labels = ref<{ id: number, name: string }[]>([]);
   const categories = ref<Product[]>([]);
   const shopId = ref<number|null>(null);
-  const selectedShop = ref<ShopEntity|null>(null);
-
-  const setSelectedShop = (shop: ShopEntity) => {
-    selectedShop.value = shop;
-  }
 
   const getGoods = async (shopId_?: number) => {
     if (shopId_ && shopId_ > 0) {
@@ -64,8 +58,7 @@ export const useProductStore = defineStore("product", () => {
       console.error("获取商品数据失败:", error)
     }
   }
-  return { labels, categories, shopId, selectedShop, 
+  return { labels, categories, shopId, getGoods }
-    getGoods, setSelectedShop }
 })
 
 /**