From 1b0f7569b5f7b2c0dc81fcfafeefba46d332f9d4 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 12 Jun 2024 09:59:38 +0800
Subject: [PATCH] 1

---
 src/views/store_order/components/orderInfo.vue |  7 ++++++-
 src/views/store_order/details.vue              |  6 ++++--
 src/views/store_order/index.vue                | 18 ++++++------------
 src/views/system_store/edit.vue                |  2 +-
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/views/store_order/components/orderInfo.vue b/src/views/store_order/components/orderInfo.vue
index e8eed672..1bd6827b 100644
--- a/src/views/store_order/components/orderInfo.vue
+++ b/src/views/store_order/components/orderInfo.vue
@@ -23,7 +23,7 @@
                 <div class="mt-4 w-1/3">优惠券金额：{{ datas.coupon_price }}</div>
                 <div class="mt-4 w-1/3">积分抵扣：{{ datas.deduction_price }}</div>
                 <div class="mt-4 w-1/3">支付时间：{{ datas.pay_time }}</div>
-                <div class="mt-4 w-1/3">支付方式：{{ datas.pay_type }}</div>
+                <div class="mt-4 w-1/3 flex">支付方式：<dict-value :options="dictData.pay_type" :value="datas.pay_type"></dict-value></div>
             </div>
         </div>
     </div>
@@ -31,10 +31,15 @@
 
 <script lang="ts" setup name="orderInfo">
 
+import type { PropType } from 'vue'
 const props = defineProps({
     datas: {
         type: Object,
         required: true
+    },
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
     }
 })
 
diff --git a/src/views/store_order/details.vue b/src/views/store_order/details.vue
index e8efd318..dd9cbc62 100644
--- a/src/views/store_order/details.vue
+++ b/src/views/store_order/details.vue
@@ -15,7 +15,9 @@
             </div>
             <div class="flex flex-col">
                 <div style="color: gray;">支付方式</div>
-                <div style="color: black;">{{ formData.pay_type || '-' }}</div>
+                <div style="color: black;">
+                    <dict-value :options="dictData.pay_type" :value="formData.pay_type"></dict-value>
+                </div>
             </div>
             <div class="flex flex-col flex-2">
                 <div style="color: gray;">支付时间</div>
@@ -25,7 +27,7 @@
         </div>
         <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" type="border-card">
             <el-tab-pane label="订单信息" name="first">
-                <orderInfo :datas="formData"></orderInfo>
+                <orderInfo :datas="formData" :dictData="dictData"></orderInfo>
             </el-tab-pane>
             <el-tab-pane label="商品信息" name="second">
                 <storeTable :oid="formData.id" ref="storeRef"></storeTable>
diff --git a/src/views/store_order/index.vue b/src/views/store_order/index.vue
index 33926a8c..121db77b 100644
--- a/src/views/store_order/index.vue
+++ b/src/views/store_order/index.vue
@@ -19,16 +19,6 @@
             </el-form>
         </el-card>
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <!-- <el-button v-perms="['store_order.store_order/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-新增
-</el-button>
-<el-button v-perms="['store_order.store_order/delete']" :disabled="!selectData.length"
-    @click="handleDelete(selectData)">
-    删除
-</el-button> -->
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
@@ -46,7 +36,11 @@
                     <el-table-column label="用户" prop="nickname" show-overflow-tooltip />
                     <el-table-column label="实际支付金额" prop="pay_price" show-overflow-tooltip />
                     <el-table-column label="支付时间" prop="pay_time" show-overflow-tooltip />
-                    <el-table-column label="支付方式" prop="pay_type" show-overflow-tooltip />
+                    <el-table-column label="支付方式" prop="pay_type" show-overflow-tooltip>
+                        <template #default="{row}">
+                            <dict-value :options="dictData.pay_type" :value="row.pay_type"></dict-value>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="订单状态" prop="status_name" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
@@ -68,7 +62,7 @@
             </div>
         </el-card>
         <!-- <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" /> -->
-        <details-popup v-if="showDetails" ref="detailsRef" @success="getLists" @close="showDetails = false" />
+        <details-popup v-if="showDetails" ref="detailsRef" @success="getLists" @close="showDetails = false" :dictData="dictData" />
     </div>
 </template>
 
diff --git a/src/views/system_store/edit.vue b/src/views/system_store/edit.vue
index 2891d954..cb4794c2 100644
--- a/src/views/system_store/edit.vue
+++ b/src/views/system_store/edit.vue
@@ -49,7 +49,7 @@
                     <el-switch v-model="formDataInfo.is_store" :active-value="1" :inactive-value="0" active-text="开启"
                         inactive-text="关闭" inline-prompt disabled />
                 </el-form-item>
-                <el-form-item label="快递配送" prop="is_send">
+                <el-form-item label="同城配送" prop="is_send">
                     <el-switch v-model="formDataInfo.is_send" :active-value="1" :inactive-value="0" active-text="开启"
                         inactive-text="关闭" inline-prompt />
                 </el-form-item>