Merge branch 'master' of https://gitea.lihaink.cn/weipengfei/moreShopAdmin

src/views/system_store/details.vue

@@ -1,31 +1,24 @@
 <template>
     <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            title="详情"
-            :async="true"
-            width="550px"
-            :cancelButtonText="false"
-            :confirmButtonText="false"
-        >
+        <popup ref="popupRef" title="详情" :async="true" width="550px" :cancelButtonText="false" :confirmButtonText="false">
             <el-form ref="formRef" :model="formData" label-width="90px">
                 <el-form-item label="门店名称" prop="name">
-                    <el-input v-model="formData.name" clearable placeholder="请输入门店名称" :readonly="true"/>
+                    <el-input v-model="formData.name" clearable placeholder="请输入门店名称" :readonly="true" />
                 </el-form-item>
                 <el-form-item label="简介" prop="introduction">
-                    <el-input v-model="formData.introduction" clearable placeholder="请输入简介" :readonly="true"/>
+                    <el-input v-model="formData.introduction" clearable placeholder="请输入简介" :readonly="true" />
                 </el-form-item>
                 <el-form-item label="手机号码" prop="phone">
-                    <el-input v-model="formData.phone" clearable placeholder="请输入手机号码" :readonly="true"/>
+                    <el-input v-model="formData.phone" clearable placeholder="请输入手机号码" :readonly="true" />
                 </el-form-item>
                 <el-form-item label="详细地址" prop="detailed_address">
-                    <el-input v-model="formData.detailed_address" clearable placeholder="请输入详细地址" :readonly="true"/>
+                    <el-input v-model="formData.detailed_address" clearable placeholder="请输入详细地址" :readonly="true" />
                 </el-form-item>
                 <el-form-item label="门店logo" prop="image">
-                    <el-input v-model="formData.image" clearable placeholder="请输入门店logo" :readonly="true"/>
+                    <el-input v-model="formData.image" clearable placeholder="请输入门店logo" :readonly="true" />
                 </el-form-item>
                 <el-form-item label="是否显示" prop="is_show">
-                    <el-input v-model="formData.is_show" clearable placeholder="请输入是否显示" :readonly="true"/>
+                    <el-input v-model="formData.is_show" clearable placeholder="请输入是否显示" :readonly="true" />
                 </el-form-item>
             </el-form>
         </popup>

src/views/user/components/balance.vue

@@ -1,9 +1,12 @@
 <template>
     <div>
         <el-table :data="pager.lists">
-                <el-table-column label="" prop="label_id" show-overflow-tooltip />
-                <el-table-column label="标签名称" prop="label_name" show-overflow-tooltip />
-            </el-table>
+            <!-- <el-table-column label="id" prop="lab" show-overflow-tooltip /> -->
+            <el-table-column label="订单号" prop="order_sn" show-overflow-tooltip />
+            <el-table-column label="金额" prop="amount" show-overflow-tooltip />
+            <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
+            <el-table-column label="备注" prop="mark" show-overflow-tooltip />
+        </el-table>
         <div class="flex mt-4 justify-end">
             <pagination v-model="pager" @change="getLists" />
         </div>
@@ -37,7 +40,7 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
     params: queryParams
 })
 
-const getList = (e:any)=>{
+const getList = (e: any) => {
     queryParams.id = e.id;
     getLists();
 }

src/views/user/components/merchandise.vue

@@ -1,9 +1,11 @@
 <template>
     <div>
         <el-table :data="pager.lists">
-                <el-table-column label="" prop="label_id" show-overflow-tooltip />
-                <el-table-column label="标签名称" prop="label_name" show-overflow-tooltip />
-            </el-table>
+            <el-table-column label="订单号" prop="order_id" show-overflow-tooltip />
+            <el-table-column label="金额" prop="number" show-overflow-tooltip />
+            <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
+            <el-table-column label="备注" prop="title" show-overflow-tooltip />
+        </el-table>
         <div class="flex mt-4 justify-end">
             <pagination v-model="pager" @change="getLists" />
         </div>
@@ -37,7 +39,7 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
     params: queryParams
 })
 
-const getList = (e:any)=>{
+const getList = (e: any) => {
     queryParams.id = e.id;
     getLists();
 }

src/views/user/components/purchase.vue

@@ -1,9 +1,11 @@
 <template>
     <div>
         <el-table :data="pager.lists">
-                <el-table-column label="" prop="label_id" show-overflow-tooltip />
-                <el-table-column label="标签名称" prop="label_name" show-overflow-tooltip />
-            </el-table>
+            <el-table-column label="订单号" prop="order_sn" show-overflow-tooltip />
+            <el-table-column label="金额" prop="amount" show-overflow-tooltip />
+            <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
+            <el-table-column label="备注" prop="mark" show-overflow-tooltip />
+        </el-table>
         <div class="flex mt-4 justify-end">
             <pagination v-model="pager" @change="getLists" />
         </div>
@@ -37,7 +39,7 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
     params: queryParams
 })
 
-const getList = (e:any)=>{
+const getList = (e: any) => {
     queryParams.id = e.id;
     getLists();
 }

src/views/user/components/returnMoney.vue

@@ -1,9 +1,11 @@
 <template>
     <div>
         <el-table :data="pager.lists">
-                <el-table-column label="ID" prop="id" min-width="55" />
-                <el-table-column label="标签名称" prop="label_name" show-overflow-tooltip />
-            </el-table>
+            <el-table-column label="订单号" prop="order_sn" show-overflow-tooltip />
+            <el-table-column label="金额" prop="number" show-overflow-tooltip />
+            <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
+            <el-table-column label="备注" prop="" show-overflow-tooltip />
+        </el-table>
         <div class="flex mt-4 justify-end">
             <pagination v-model="pager" @change="getLists" />
         </div>
@@ -37,7 +39,7 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
     params: queryParams
 })
 
-const getList = (e:any)=>{
+const getList = (e: any) => {
     queryParams.id = e.id;
     getLists();
 }

src/views/user/details.vue

@@ -22,7 +22,7 @@
                             <dict-value :options="dictData.sex" :value="formData.sex" />
                         </el-descriptions-item>
                         <el-descriptions-item label="注册渠道">
-                            {{formData.channel}}
+                            {{ formData.channel }}
                         </el-descriptions-item>
                         <el-descriptions-item label="用户类型">
                             {{ formData.vip_name }}
@@ -36,16 +36,16 @@
                     </el-descriptions>
                 </el-tab-pane>
                 <el-tab-pane label="采购款明细" name="second">
-                    <purchase ref="purchaseRef" :user_id="formData.id" :key="key+'a'" />
+                    <purchase ref="purchaseRef" :user_id="formData.id" :key="key + 'a'" />
                 </el-tab-pane>
                 <el-tab-pane label="余额明细" name="three">
-                    <balance ref="balanceRef" :user_id="formData.id" :key="key+'b'"  />
+                    <balance ref="balanceRef" :user_id="formData.id" :key="key + 'b'" />
                 </el-tab-pane>
                 <el-tab-pane label="礼品券明细" name="four">
-                    <merchandise ref="merchandiseRef" :user_id="formData.id" :key="key+'c'"  />
+                    <merchandise ref="merchandiseRef" :user_id="formData.id" :key="key + 'c'" />
                 </el-tab-pane>
                 <el-tab-pane label="返还金明细" name="five">
-                    <returnMoney ref="returnMoneyRef" :user_id="formData.id" :key="key+'d'"  />
+                    <returnMoney ref="returnMoneyRef" :user_id="formData.id" :key="key + 'd'" />
                 </el-tab-pane>
             </el-tabs>
 
@@ -81,10 +81,10 @@ const emit = defineEmits(['success', 'close'])
 const isOpen = ref(false);
 const activeName = ref('first');
 const handleClick = (tab: any) => {
-    if (tab.paneName == "second") purchaseRef.value?.getList({id:formData.id});
-    if (tab.paneName == "three") balanceRef.value?.getList({id:formData.id});
-    if (tab.paneName == "four") merchandiseRef.value?.getList({id:formData.id});
-    if (tab.paneName == "five") returnMoneyRef.value?.getList({id:formData.id});
+    if (tab.paneName == "second") purchaseRef.value?.getList({ id: formData.id });
+    if (tab.paneName == "three") balanceRef.value?.getList({ id: formData.id });
+    if (tab.paneName == "four") merchandiseRef.value?.getList({ id: formData.id });
+    if (tab.paneName == "five") returnMoneyRef.value?.getList({ id: formData.id });
 };
 
 // 表单数据