.env

@@ -7,4 +7,4 @@ VITE_APP_TITLE = 借还柜
 VITE_ROUTER_HISTORY = hash
 
 ## 是否开启 console 调试工具
-VITE_CONSOLE = false
+VITE_CONSOLE = true

src/App.vue

@@ -3,14 +3,10 @@ import Layout from "@/layout/index.vue"
 import { useUserStore } from "@/pinia/stores/user"
 import { useDark } from "@@/composables/useDark"
 import { useWxStore } from "@/pinia/stores/wx"
-import { tokenLogin } from '@/common/apis/ab98'
-import { useAb98UserStore } from '@/pinia/stores/ab98-user'
 
 // const userStore = useUserStore()
 const wxStore = useWxStore()
 const route = useRoute()
-const router = useRouter()
-const ab98UserStore = useAb98UserStore()
 
 const { isDark, initDark } = useDark()
 
@@ -35,25 +31,6 @@ onMounted(() => {
   const state = urlParams.get('state') || undefined;
   const corpid = urlParams.get('corpid') || undefined;
   const isAdmin = urlParams.get('isAdmin') || undefined;
-  
-  if (state && state.indexOf('token') !== -1) {
-    const token = state.split('token_')[1];
-    if (token) {
-      ab98UserStore.setTokenLogin(token);
-
-      tokenLogin(token).then(res => {
-        if (res && res.code == 0) {
-          if (res.data.success) {
-            ab98UserStore.setTel(res.data.tel)
-            ab98UserStore.setUserInfo(res.data)
-            ab98UserStore.setIsLogin(true)
-            router.push('/')
-          }
-        } 
-      })
-    }
-  }
-
   if (isAdmin == '1') {
     wxStore.setIsCabinetAdmin(true); 
   }

src/common/apis/ab98/index.ts

@@ -53,12 +53,3 @@ export function logoutApi(token: string) {
     params: { token }
   })
 }
-
-/** ab98Token登录 */
-export function tokenLogin(token: string) {
-  return request<ApiResponseData<LoginData>>({
-    url: '/wx/login/tokenLogin',
-    method: 'get',
-    params: { token }
-  })
-}

src/common/apis/approval/type.ts

@@ -61,14 +61,6 @@ export interface ReturnApprovalEntity {
   goodsName: string
   /** 封面图URL */
   coverImg: string
-  /** 手机号 */
-  mobile: string
-  /** 用户id */
-  userid: string
-  /** 用户姓名 */
-  name: string
-  /** 是否内部用户（0否 1汇邦云用户 2企业微信用户） */
-  isInternal: number
 }
 
 export type SubmitApprovalResponseData = ApiResponseMsgData<{

src/common/apis/shop/index.ts

@@ -4,7 +4,7 @@ import { GetOpenIdRequestParams } from './type'
 
 
 
-/** 获取商品列表 */
+/** 获取当前登录用户详情 */
 export function getShopGoodsApi() {
   return request<ShopGoodsResponseData>({
     url: "shop/goods",

src/common/apis/shop/type.ts

@@ -6,8 +6,7 @@ export type Goods = {
     stock: number,
     status: number,
     coverImg: string,
-    goodsDetail: string,
+    goodsDetail: string
-    cellId: number
 }
 
 export type category = {
@@ -27,8 +26,6 @@ export interface SubmitOrderRequestData {
   paymentType: 'wechat' | 'balance';
   /** 联系电话 */
   mobile: string;
-  /** 用户姓名 */
-  name: string;
   /** 企业微信用户ID或汇邦云用户ID */
   qyUserid: string;
   /** 是否内部订单 0否 1汇邦云用户 2企业微信用户 */
@@ -37,7 +34,6 @@ export interface SubmitOrderRequestData {
   goodsList: Array<{
     goodsId: number
     quantity: number
-    cellId: number
   }>
 }
 

src/pages/approval/handle.vue

@@ -1,10 +1,23 @@
 <script setup lang="ts">
 import { ref } from 'vue'
-import { showConfirmDialog, showSuccessToast, showFailToast, showToast, UploaderFileListItem, Popup, Picker } from 'vant'
+import { showConfirmDialog, showSuccessToast, showToast, UploaderFileListItem, Popup, Picker } from 'vant'
 
+const showStatusPicker = ref(false)
+const showPreview = ref(false)
+const currentPreviewImage = ref('')
+const statusMap: { [key: number]: string } = {
+    1: '待审核',
+    2: '已通过',
+    3: '已驳回'
+}
+
+const statusOptions = [
+    { text: '待审核', value: 1 },
+    { text: '通过', value: 2 },
+    { text: '驳回', value: 3 }
+]
 import axios from "axios"
 import { handleApprovalApi } from '@/common/apis/approval'
-import { openCabinetApi } from '@/common/apis/shop'
 import type { HandleApprovalRequestData } from '@/common/apis/approval/type'
 import { useRoute, useRouter } from 'vue-router'
 import { useApprovalStore } from '@/pinia/stores/approval'
@@ -25,22 +38,7 @@ const formData = ref<HandleApprovalRequestData>({
 const submitting = ref(false)
 const fileList = ref<UploaderFileListItem[]>([])
 const uploading = ref(false)
-const isButtonDisabled = ref(false)
 
-const showStatusPicker = ref(false)
-const showPreview = ref(false)
-const currentPreviewImage = ref('')
-const statusMap: { [key: number]: string } = {
-    1: '待审核',
-    2: '已通过',
-    3: '已驳回'
-}
-
-const statusOptions = [
-    { text: '待审核', value: 1 },
-    { text: '通过', value: 2 },
-    { text: '驳回', value: 3 }
-]
 const validateForm = () => {
     if (!formData.value.approvalId || isNaN(formData.value.approvalId)) {
         showConfirmDialog({ title: '错误', message: '审批单ID参数错误' })
@@ -155,32 +153,6 @@ onMounted(() => {
     }
 })
 
-const handleOpenCabinet = async () => {
-    if (!approvalStore.currentApproval?.orderId || !approvalStore.currentApproval?.orderGoodsId) {
-        showFailToast('缺少订单信息')
-        return
-    }
-
-    isButtonDisabled.value = true
-    try {
-        const result = await openCabinetApi(
-            approvalStore.currentApproval.orderId,
-            approvalStore.currentApproval.orderGoodsId
-        )
-        if (result.code !== 0) {
-            showFailToast(result.msg || '开启失败')
-            return
-        }
-        showSuccessToast('柜口已开启')
-    } catch (error) {
-        showFailToast('请求失败')
-    } finally {
-        setTimeout(() => {
-            isButtonDisabled.value = false
-        }, 5000)
-    }
-}
-
 const handleSubmit = async () => {
     if (!validateForm()) return
 
@@ -220,13 +192,16 @@ const handleSubmit = async () => {
 
         <div class="content-wrapper">
             <van-cell-group>
-                <van-cell title="姓名" :value="approvalStore.currentApproval?.name" />
-                <van-cell title="手机号" :value="approvalStore.currentApproval?.mobile" />
-                <van-cell title="用户id" :value="approvalStore.currentApproval?.userid" />
                 <van-cell title="商品名称" :value="approvalStore.currentApproval?.goodsName" />
                 <van-cell title="商品封面" v-if="approvalStore.currentApproval?.coverImg">
-                    <van-image :src="approvalStore.currentApproval.coverImg" fit="cover" width="80" height="80"
+                  <van-image 
-                        @click="previewImage(approvalStore.currentApproval.coverImg)" style="margin-top: 8px" />
+                    :src="approvalStore.currentApproval.coverImg"
+                    fit="cover"
+                    width="80"
+                    height="80"
+                    @click="previewImage(approvalStore.currentApproval.coverImg)"
+                    style="margin-top: 8px"
+                  />
                 </van-cell>
                 <van-cell title="退还数量" :value="approvalStore.currentApproval?.returnQuantity" />
                 <van-cell title="商品单价" :value="`¥${approvalStore.currentApproval?.goodsPrice}`" />
@@ -247,17 +222,30 @@ const handleSubmit = async () => {
 
             <van-cell-group>
                 <!-- 原有表单字段保持不变 -->
-                <van-button type="primary" size="small"
+                <van-field 
-                    @click="handleOpenCabinet" :disabled="isButtonDisabled" style="margin-bottom: 12px">
+                  v-model="formData.returnAmount" 
-                    打开柜子
+                  :readonly="approvalStore.currentApproval?.status !== 1" 
-                </van-button>
+                  label="退款金额" 
-                <van-field v-model="formData.returnAmount" :readonly="approvalStore.currentApproval?.status !== 1"
+                  type="number" 
-                    label="退款金额" type="number" class="audit-remark-field" :min="0" />
+                  class="audit-remark-field"
-                <van-field :model-value="statusOptions.find(opt => opt.value === formData.status)?.text || ''"
+                  :min="0" 
-                    label="审批结果" readonly @click="showStatusPicker = true"
+                />
-                    :disabled="approvalStore.currentApproval?.status !== 1" class="clickable-status-field" />
+                <van-field
-                <van-field v-model="formData.auditRemark" label="审核说明" type="textarea" rows="2" autosize
+                  :model-value="statusOptions.find(opt => opt.value === formData.status)?.text || ''"
-                    class="audit-remark-field" />
+                  label="审批结果"
+                  readonly
+                  @click="showStatusPicker = true"
+                  :disabled="approvalStore.currentApproval?.status !== 1"
+                  class="clickable-status-field"
+                />
+                <van-field 
+                  v-model="formData.auditRemark" 
+                  label="审核说明" 
+                  type="textarea" 
+                  rows="2" 
+                  autosize
+                  class="audit-remark-field"
+                />
             </van-cell-group>
 
             <van-popup v-model:show="showStatusPicker" position="bottom">
@@ -279,8 +267,15 @@ const handleSubmit = async () => {
                 </van-cell>
             </van-cell-group>
 
-            <div class="submit-bar" v-if="approvalStore.currentApproval?.status !== 2">
+            <div class="submit-bar"
-                <van-button type="primary" block :loading="submitting" loading-text="提交中..." @click="handleSubmit">
+                  v-if="approvalStore.currentApproval?.status !== 2">
+                <van-button 
+                  type="primary" 
+                  block 
+                  :loading="submitting" 
+                  loading-text="提交中..." 
+                  @click="handleSubmit"
+                >
                     提交审批
                 </van-button>
             </div>
@@ -340,24 +335,24 @@ const handleSubmit = async () => {
 }
 
 .audit-remark-field::v-deep .van-field__control {
-    background-color: #fffbe6;
+  background-color: #fffbe6;
-    padding: 8px;
+  padding: 8px;
-    border-radius: 4px;
+  border-radius: 4px;
 }
 
 .clickable-status-field:not(:disabled)::v-deep .van-field__control {
-    cursor: pointer;
+  cursor: pointer;
-    transition: all 0.3s ease;
+  transition: all 0.3s ease;
-    background-color: #f7f8fa;
+  background-color: #f7f8fa;
 }
 
 .clickable-status-field:not(:disabled):hover::v-deep .van-field__control {
-    background-color: #f2f3f5;
+  background-color: #f2f3f5;
-    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
 }
 
 .clickable-status-field:not(:disabled):active::v-deep .van-field__control {
-    background-color: #ebedf0;
+  background-color: #ebedf0;
-    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
 }
 </style>

src/pages/order/index.vue

@@ -1,10 +1,7 @@
 <script setup lang="ts">
 import { onMounted } from 'vue'
-import { OrderGoods, useOrderStore } from '@/pinia/stores/order'
+import { useOrderStore } from '@/pinia/stores/order'
 import { useRoute, useRouter } from 'vue-router'
-import { openCabinetApi } from '@/common/apis/shop'
-import { showSuccessToast, showFailToast } from 'vant'
-import { ref } from 'vue'
 
 const orderStore = useOrderStore()
 const route = useRoute()
@@ -58,27 +55,6 @@ onMounted(() => {
     // 订单不存在处理
   }
 })
-
-const isButtonDisabled = ref<Record<number, boolean>>({})
-
-async function handleOpenCabinet(item: OrderGoods) {
-  const orderGoodsId = item.orderGoods.orderGoodsId
-  isButtonDisabled.value[orderGoodsId] = true
-  try {
-    const result = await openCabinetApi(orderId.value, orderGoodsId)
-    if (result.code !== 0) {
-      showFailToast(result.msg || '开启失败，请稍后重试')
-      return
-    }
-    showSuccessToast('柜口已成功开启')
-  } catch (error) {
-    showFailToast('开启失败，请稍后重试')
-  } finally {
-    setTimeout((currentId) => {
-      delete isButtonDisabled.value[currentId]
-    }, 5000, orderGoodsId)
-  }
-}
 </script>
 
 <template>
@@ -118,26 +94,16 @@ async function handleOpenCabinet(item: OrderGoods) {
           <div class="action-row">
             <p>数量: {{ item.orderGoods.quantity }}</p>
             <p>小计: ¥{{ (item.orderGoods.price * item.orderGoods.quantity).toFixed(2) }}</p>
-            <div class="button-group">
+            <template v-if="item.orderGoods.status === 1">
-              <van-button 
+            <van-button 
-                v-if="[1,5].includes(item.orderGoods.status)"
+              type="primary"
-                type="primary"
+              size="mini"
-                size="small"
+              class="refund-btn"
-                @click="handleOpenCabinet(item)"
+              @click="handleRefund(item)"
-                :disabled="isButtonDisabled[item.orderGoods.orderGoodsId]"
+            >
-              >
+              退还
-                打开柜子
+            </van-button>
-              </van-button>
+          </template>
-              <van-button 
-                v-if="item.orderGoods.status === 1"
-                type="primary"
-                size="small"
-                @click="handleRefund(item)"
-              >
-                退还商品
-              </van-button>
-            </div>
-          </div>
           <span 
             v-if="[2,5,6].includes(item.orderGoods.status)"
             class="status-text"
@@ -145,6 +111,7 @@ async function handleOpenCabinet(item: OrderGoods) {
           >
             {{ getOrderGoodsStatusText(item.orderGoods.status) }}
           </span>
+          </div>
         </div>
       </van-cell>
     </van-cell-group>
@@ -216,17 +183,20 @@ goods-info {
   color: #999;
 }
 
-.button-group {
+.refund-btn {
-  display: flex;
+  margin-left: auto;
-  justify-content: flex-end;
+  color: #fff;
-  gap: 8px;
+  background: #ee0a24;
-  width: 100%;
+  border-radius: 15px;
+  padding: 8px 20px;
+  font-size: 14px;
+  min-width: 80px;
 }
 
 .action-row {
   display: flex;
   flex-direction: column;
+  gap: 8px;
   align-items: flex-end;
-  gap: 4px;
 }
 </style>

src/pages/product/ProductList.vue

@@ -123,7 +123,7 @@ function handleCheckout() {
 <template>
   <div class="shop">
     <div class="shop-header" :style="{ height: `${headerHeight}px` }">
-      <van-image :src="`${publicPath}cover.png`" class="shop-cover" fit="cover" />
+      <van-image :src="`${publicPath}c63.jpg`" class="shop-cover" fit="cover" />
     </div>
     <div class="product-container">
       <!-- 左侧分类导航 -->

src/pages/product/components/checkout.vue

@@ -17,7 +17,7 @@ const wxStore = useWxStore()
 const { openid, balance, corpidLogin, userid: qyUserid } = storeToRefs(wxStore)
 
 const ab98UserStore = useAb98UserStore()
-const { tel, userid: ab98Userid, name } = storeToRefs(ab98UserStore)
+const { tel, userid: ab98Userid } = storeToRefs(ab98UserStore)
 
 const selectedPayment = ref<'wechat' | 'balance'>('wechat')
 const contact = ref("")
@@ -72,13 +72,7 @@ async function handleSubmit() {
     })
   }
 
-  // 在handleSubmit函数开头添加验证
+  // 移除原有的支付方式选择弹窗代码
-  if (!/^1[3-9]\d{9}$/.test(tel.value)) {
-    return showConfirmDialog({
-      title: "格式错误",
-      message: "请输入有效的手机号码"
-    });
-  }
 
   submitting.value = true
   try {
@@ -97,12 +91,10 @@ async function handleSubmit() {
       corpid: wxStore.corpid,
       goodsList: cartItems.value.map(item => ({
         goodsId: item.product.id,
-        quantity: item.quantity,
+        quantity: item.quantity
-        cellId: item.product.cellId,
       })),
       paymentType: selectedPayment.value,
       mobile: tel.value,
-      name: name.value,
       qyUserid: isInternal === 2 ? qyUserid.value : ab98Userid.value,
       isInternal: isInternal
     }
@@ -173,40 +165,23 @@ async function handleSubmit() {
             </div>
           </div>
         </van-cell>
-        <van-cell>
-          <van-field
-            v-model="tel"
-            label="手机号"
-            placeholder="请输入联系电话"
-            required
-            class="tel-input"
-          />
-        </van-cell>
       </van-cell-group>
 
       <van-cell-group class="contact-form">
-        <van-cell  v-if="!corpidLogin"
+        <van-field label="支付方式" :model-value="selectedPayment" readonly>
-          :class="['payment-option', { selected: selectedPayment === 'wechat' }]"
+          <template #input>
-          @click="selectedPayment = 'wechat'"
+            <van-radio-group v-model="selectedPayment" direction="horizontal">
-        >
+              <van-radio name="wechat" v-if="!corpidLogin">
-          <van-icon name="wechat" class="method-icon" />
+                <van-icon name="wechat" class="method-icon" />
-          <span class="method-label">微信支付</span>
+                微信支付
-          <div class="empty"></div>
+              </van-radio>
-          <van-icon v-if="selectedPayment === 'wechat'" name="success" class="check-icon" />
+              <van-radio name="balance" :disabled="balance < totalPrice">
-        </van-cell>
+                <van-icon name="balance-o" class="method-icon" />
-
+                余额支付（当前：¥{{ balance.toFixed(2) }}）
-        <van-cell
+              </van-radio>
-          :class="['payment-option', { selected: selectedPayment === 'balance', disabled: balance < totalPrice }]"
+            </van-radio-group>
-          @click="selectedPayment = 'balance'"
+          </template>
-        >
+        </van-field>
-          <van-icon name="balance-o" class="method-icon" />
-          <span class="method-label">
-            余额支付
-            <span class="balance-amount">（当前：¥{{ balance.toFixed(2) }}）</span>
-          </span>
-          <div class="empty"></div>
-          <van-icon v-if="selectedPayment === 'balance'" name="success" class="check-icon" />
-        </van-cell>
       </van-cell-group>
 
       <!-- 提交订单栏 -->
@@ -222,7 +197,7 @@ async function handleSubmit() {
   </div>
 </template>
 
-<style lang="scss" scoped>
+<style scoped>
 .van-nav-bar {
   position: fixed;
   top: 0;
@@ -278,6 +253,15 @@ async function handleSubmit() {
   font-size: 13px;
 }
 
+.method-icon {
+  font-size: 24px;
+  margin-right: 10px;
+}
+
+.method-label {
+  font-size: 15px;
+}
+
 .submit-bar {
   position: fixed;
   bottom: 0;
@@ -296,67 +280,4 @@ async function handleSubmit() {
   color: #e95d5d;
   font-weight: bold;
 }
-
-.payment-option {
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-  margin: 8px 0;
-  border: 1px solid #ebedf0;
-  border-radius: 8px;
-  transition: all 0.2s;
-
-  :deep(.van-cell__value) {
-    display: flex;
-  }
-}
-
-
-.check-icon {
-  font-size: 18px;
-}
-
-.payment-option.selected {
-  border-color: #07c160;
-  background-color: #f6ffed;
-}
-
-.payment-option.disabled {
-  opacity: 0.6;
-  filter: grayscale(1);
-  pointer-events: none;
-}
-
-.method-icon {
-  vertical-align: middle;
-  margin-right: 12px;
-  font-size: 24px;
-}
-
-.method-label {
-  vertical-align: middle;
-  font-size: 15px;
-}
-
-.empty {
-  flex-grow: 1;
-  margin-right: 20px;
-}
-
-.balance-amount {
-  font-size: 13px;
-  color: #666;
-}
-
-.tel-input {
-  background-color: #f5f5f5;
-  border-radius: 4px;
-  padding: 8px 12px;
-}
-
-.check-icon {
-  margin-left: auto;
-  color: #07c160;
-  font-size: 18px;
-}
 </style>

src/pinia/stores/ab98-user.ts

@@ -36,9 +36,7 @@ export const useAb98UserStore = defineStore("ab98User", () => {
   const tel = ref<string>(storedTel ? decodeURIComponent(storedTel) : "")
   // 用户认证令牌
   const storedToken = localStorage.getItem(STORAGE_KEYS.TOKEN)
-  const token = ref<string>(storedToken ? decodeURIComponent(storedToken) : "");
+  const token = ref<string>(storedToken ? decodeURIComponent(storedToken) : "")
-
-  const tokenLogin = ref<string>("");
   // 用户登录状态
   const isLogin = ref<boolean>(false);
   isLogin.value = tel.value ? true : false;
@@ -100,10 +98,6 @@ export const useAb98UserStore = defineStore("ab98User", () => {
     isLogin.value = value;
   }
 
-  const setTokenLogin = (value: string) => {
-    tokenLogin.value = value;
-  }
-
   return { 
     face_img,
     sex,
@@ -113,13 +107,11 @@ export const useAb98UserStore = defineStore("ab98User", () => {
     tel,
     token,
     isLogin,
-    tokenLogin,
     setUserInfo,
     setToken,
     setTel,
     setIsLogin,
-    clearUserInfo,
+    clearUserInfo
-    setTokenLogin
   }
 })
 

src/pinia/stores/order.ts

@@ -3,12 +3,10 @@ import { getOrdersByOpenIdApi } from "@@/apis/shop"
 import type { ShopOrderEntity, ShopOrderGoodsEntity, Goods } from "@@/apis/shop/type"
 
 export interface Order extends ShopOrderEntity {
-  goodsList: Array<OrderGoods>
+  goodsList: Array<{
-}
+    goodsInfo: Goods
-
+    orderGoods: ShopOrderGoodsEntity
-export interface OrderGoods {
+  }>
-  goodsInfo: Goods
-  orderGoods: ShopOrderGoodsEntity
 }
 
 export const useOrderStore = defineStore("order", () => {

src/pinia/stores/product.ts

@@ -9,7 +9,6 @@ export interface Product {
   description: string // 商品描述
   image: string // 商品图片URL
   label: number // 商品标签
-  cellId: number // 商品所在的格子ID
 }
 
 export const useProductStore = defineStore("product", () => {
@@ -35,8 +34,7 @@ export const useProductStore = defineStore("product", () => {
         stock: g.stock,
         description: g.goodsDetail || "暂无描述",
         image: g.coverImg,
-        label: g.categoryId,
+        label: g.categoryId
-        cellId: g.cellId
       }))
     } catch (error) {
       console.error("获取商品数据失败:", error)

src/router/guard.ts

@@ -26,9 +26,8 @@ export function registerNavigationGuard(router: Router) {
       return true;
     }
 
-    // useAb98UserStore位置不能放在外面，否则会导致路由守卫无法正常工作
+    const userStore = useAb98UserStore()
-    const ab98UserStore = useAb98UserStore();
+    if (!userStore.isLogin) {
-    if (!ab98UserStore.isLogin) {
         // 如果在免登录的白名单中，则直接进入
         if (isWhiteList(to)) return true
         // 其他没有访问权限的页面将被重定向到登录页面

types/auto/components.d.ts

@@ -27,6 +27,8 @@ declare module 'vue' {
     VanNavBar: typeof import('vant/es')['NavBar']
     VanPicker: typeof import('vant/es')['Picker']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanSidebar: typeof import('vant/es')['Sidebar']
     VanSidebarItem: typeof import('vant/es')['SidebarItem']
     VanTabbar: typeof import('vant/es')['Tabbar']