outsource/JewelryMall
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

后台

Browse Source
This commit is contained in:
18631081161 2026-03-05 20:26:19 +08:00
parent 6e2d306608
commit ea7994e017
4 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
admin/src/views/order/OrderList.vue
View File

@ -85,9 +85,10 @@
</el-table-column>
<el-table-column prop="id" label="ID" width="60" align="center" />
<el-table-column prop="order_no" label="订单号" min-width="200" show-overflow-tooltip />
<el-table-column prop="user_nickname" label="用户" width="100" align="center">
<el-table-column prop="user_nickname" label="用户" width="140" align="center">
<template #default="{ row }">
{{ row.user_nickname || `用户${row.user_id}` }}
<div>{{ row.user_nickname || `用户${row.user_id}` }}</div>
<div v-if="row.user_uid" style="font-size:11px;color:#999">{{ row.user_uid }}</div>
</template>
</el-table-column>
<el-table-column label="收货信息" min-width="200">
@ -288,7 +289,7 @@
<el-form-item label="取消原因" required>
<el-input v-model="cancelForm.cancelReason" type="textarea" :rows="3" placeholder="请填写取消原因" />
</el-form-item>
<el-form-item label="退款凭证">
<el-form-item label="退款凭证" required>
<el-upload
:action="uploadUrl"
:headers="uploadHeaders"

34
admin/src/views/product/ProductForm.vue
View File

@ -248,32 +248,32 @@
<el-table-column prop="ringSize" label="手寸" width="70" align="center" />
</el-table-column>
<el-table-column label="金料信息" align="center">
<el-table-column prop="goldTotalWeight" label="总重" width="80" align="right" />
<el-table-column prop="goldNetWeight" label="净重" width="80" align="right" />
<el-table-column prop="loss" label="损耗" width="70" align="right" />
<el-table-column prop="goldLoss" label="金耗" width="70" align="right" />
<el-table-column prop="goldPrice" label="金价" width="80" align="right" />
<el-table-column prop="goldValue" label="金值" width="80" align="right" />
<el-table-column prop="goldTotalWeight" label="总重" width="80" align="center" />
<el-table-column prop="goldNetWeight" label="净重" width="80" align="center" />
<el-table-column prop="loss" label="损耗" width="70" align="center" />
<el-table-column prop="goldLoss" label="金耗" width="70" align="center" />
<el-table-column prop="goldPrice" label="金价" width="80" align="center" />
<el-table-column prop="goldValue" label="金值" width="80" align="center" />
</el-table-column>
<el-table-column label="主石信息" align="center">
<el-table-column prop="mainStoneCount" label="数量" width="60" align="center" />
<el-table-column prop="mainStoneWeight" label="石重" width="75" align="right" />
<el-table-column prop="mainStoneUnitPrice" label="单价" width="75" align="right" />
<el-table-column prop="mainStoneAmount" label="金额" width="75" align="right" />
<el-table-column prop="mainStoneWeight" label="石重" width="75" align="center" />
<el-table-column prop="mainStoneUnitPrice" label="单价" width="75" align="center" />
<el-table-column prop="mainStoneAmount" label="金额" width="75" align="center" />
</el-table-column>
<el-table-column label="副石信息" align="center">
<el-table-column prop="sideStoneCount" label="数量" width="60" align="center" />
<el-table-column prop="sideStoneWeight" label="石重" width="75" align="right" />
<el-table-column prop="sideStoneUnitPrice" label="单价" width="75" align="right" />
<el-table-column prop="sideStoneAmount" label="金额" width="75" align="right" />
<el-table-column prop="sideStoneWeight" label="石重" width="75" align="center" />
<el-table-column prop="sideStoneUnitPrice" label="单价" width="75" align="center" />
<el-table-column prop="sideStoneAmount" label="金额" width="75" align="center" />
</el-table-column>
<el-table-column label="工费信息" align="center">
<el-table-column prop="accessoryAmount" label="配件" width="70" align="right" />
<el-table-column prop="processingFee" label="加工" width="70" align="right" />
<el-table-column prop="settingFee" label="镶石" width="70" align="right" />
<el-table-column prop="totalLaborCost" label="总工费" width="75" align="right" />
<el-table-column prop="accessoryAmount" label="配件" width="70" align="center" />
<el-table-column prop="processingFee" label="加工" width="70" align="center" />
<el-table-column prop="settingFee" label="镶石" width="70" align="center" />
<el-table-column prop="totalLaborCost" label="总工费" width="75" align="center" />
</el-table-column>
<el-table-column prop="totalPrice" label="总价" width="90" fixed="right" align="right">
<el-table-column prop="totalPrice" label="总价" width="90" fixed="right" align="center">
<template #default="{ row }">
<span style="color:#e4393c;font-weight:700;font-size:14px">{{ row.totalPrice }}</span>
</template>

4
miniprogram/utils/request.ts
View File

@ -1,6 +1,6 @@
// 手动切换后端地址，部署时改成线上域名即可
const BASE_URL = 'http://localhost:3000'
// const BASE_URL = 'http://115.190.188.216:2850'
// const BASE_URL = 'http://localhost:3000'
const BASE_URL = 'http://115.190.188.216:2850'
export { BASE_URL }

2
server/src/controllers/adminOrder.ts
View File

@ -64,7 +64,7 @@ export async function adminGetOrders(req: Request, res: Response): Promise<void>
const total = countRows[0].total
const [rows] = await pool.execute<RowDataPacket[]>(
`SELECT o.id, o.order_no, o.user_id, u.nickname as user_nickname, o.status,
`SELECT o.id, o.order_no, o.user_id, u.nickname as user_nickname, u.uid as user_uid, o.status,
o.total_price, o.receiver_name, o.receiver_phone, o.receiver_address,
o.payment_time, o.payment_proof, o.shipping_company, o.shipping_no,
o.cancel_reason, o.refund_proof, o.refund_time,