From 6ef17079b9d40584efc89c82dfb0d9c6e1fb1274 Mon Sep 17 00:00:00 2001
From: BabyBoy <2019108827@qq.com>
Date: Thu, 14 Aug 2025 11:17:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=94=E4=BE=8B=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A3=E7=90=86=EF=BC=8C=E6=8E=A8=E8=8D=90=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/pms/product.js                  | 17 +++++
 src/api/system/tenant/index.ts          |  4 +-
 src/api/ums/member.js                   |  9 +++
 src/views/account/index.vue             | 20 +++++-
 src/views/login.vue                     |  2 +-
 src/views/oms/order/detail.vue          | 36 +++++-----
 src/views/oms/order/index.vue           | 42 ++++++-----
 src/views/pms/product/index.vue         | 78 +++++++--------------
 src/views/register.vue                  |  2 +-
 src/views/system/divide/index.vue       | 93 ++++++-------------------
 src/views/system/tenant/index.vue       |  8 ++-
 src/views/system/user/profile/index.vue |  4 +-
 src/views/ums/account/index.vue         | 71 ++++++++++++++++++-
 13 files changed, 217 insertions(+), 169 deletions(-)

diff --git a/src/api/pms/product.js b/src/api/pms/product.js
index 442b2cd..5c216be 100644
--- a/src/api/pms/product.js
+++ b/src/api/pms/product.js
@@ -9,6 +9,23 @@ export function listPmsProduct(query, pageReq) {
     params: pageReq
   });
 }
+// 查询商品分类数据
+export function getproductCategoryNameLike() {
+  return request({
+    url: '/pms/productCategory/list',
+    method: 'post',
+    data: {}
+  });
+}
+// 查询商品分类数据
+export function getbrand() {
+  return request({
+    url: '/pms/brand/page',
+    method: 'post',
+    data: {}
+  });
+}
+
 //审核
 export function productaudit(query, pageReq) {
   return request({
diff --git a/src/api/system/tenant/index.ts b/src/api/system/tenant/index.ts
index d4aa392..fb466d6 100644
--- a/src/api/system/tenant/index.ts
+++ b/src/api/system/tenant/index.ts
@@ -28,7 +28,7 @@ export function getTenant(id: string | number): AxiosPromise<TenantVO> {
 }
 
 // 新增租户
-export function addTenant(data: TenantForm) {
+export function addTenant(data: any) {
   return request({
     url: '/system/tenant/add',
     method: 'post',
@@ -41,7 +41,7 @@ export function addTenant(data: TenantForm) {
 }
 
 // 修改租户
-export function updateTenant(data: TenantForm) {
+export function updateTenant(data: any) {
   return request({
     url: '/system/tenant/update',
     method: 'post',
diff --git a/src/api/ums/member.js b/src/api/ums/member.js
index 512dc2f..be2d338 100644
--- a/src/api/ums/member.js
+++ b/src/api/ums/member.js
@@ -9,6 +9,15 @@ export function listUmsMember(query, pageReq) {
     params: pageReq
   });
 }
+// 查询会员账号钱详细
+export function listCurrent(query, pageReq) {
+  return request({
+    url: '/account/detail/current',
+    method: 'post',
+    data: query,
+    params: pageReq
+  });
+}
 
 // 查询会员信息详细
 export function getUmsMember(id) {
diff --git a/src/views/account/index.vue b/src/views/account/index.vue
index 5aba169..f0b0f2d 100644
--- a/src/views/account/index.vue
+++ b/src/views/account/index.vue
@@ -32,6 +32,11 @@
             {{ scope.row.type === 1 ? '商家' : scope.row.type === 2 ? '代理' : '平台' }}
           </template>
         </el-table-column>
+        <el-table-column label="操作" align="center" width="180">
+          <template #default="scope">
+            <el-button type="primary" @click="handleSeach(scope.row)">查看明细</el-button>
+          </template>
+        </el-table-column>
       </el-table>
       <div class="block">
         <pagination
@@ -42,6 +47,14 @@
           @pagination="getListList"
         />
       </div>
+      <el-dialog v-model="dialogVisible" title="明细" width="1200px" append-to-body>
+        <el-table :data="tableData" style="width: 100%">
+          <el-table-column label="序号" align="center" type="index" width="80" />
+          <el-table-column label="订单号" align="center" prop="orderNo" :show-overflow-tooltip="true" />
+          <el-table-column label="订单金额" align="center" prop="orderAmount" :show-overflow-tooltip="true" />
+          <el-table-column label="积分" align="center" prop="integralBalance" :show-overflow-tooltip="true" />
+        </el-table>
+      </el-dialog>
     </el-card>
   </div>
 </template>
@@ -74,7 +87,12 @@ const getListList = async () => {
 const handleQuery = () => {
   getListList();
 };
-const showRefuteDialog = ref(false);
+const tableData = ref([]);
+const dialogVisible = ref(false);
+// 查看明细
+const handleSeach = (row: any) => {
+  console.log(row);
+};
 const resetQuery = () => {
   queryParams.value = {
     current: 1,
diff --git a/src/views/login.vue b/src/views/login.vue
index c6ef39d..39ea39b 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -73,7 +73,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2018-2025 疯狂的狮子Li All Rights Reserved.</span>
+      <!-- <span>Copyright © 2018-2025 疯狂的狮子Li All Rights Reserved.</span> -->
     </div>
   </div>
 </template>
diff --git a/src/views/oms/order/detail.vue b/src/views/oms/order/detail.vue
index 926f3bc..9775f18 100644
--- a/src/views/oms/order/detail.vue
+++ b/src/views/oms/order/detail.vue
@@ -37,14 +37,14 @@
           <el-descriptions-item label="分佣信息">{{ getPayType(orderDetail) }}</el-descriptions-item>-->
         </el-descriptions>
       </el-card>
-      <el-card class="mt10">
+      <!-- <el-card class="mt10">
         <el-descriptions title="收货信息" :column="2" border label-class-name="my-label" contentClassName="my-content">
           <el-descriptions-item label="收货人姓名">{{ getHiddenName(addressInfo.name) }}</el-descriptions-item>
           <el-descriptions-item label="收货人手机号">{{ addressInfo.userPhone }}</el-descriptions-item>
           <el-descriptions-item label="收货区域">{{ addressInfo.area }}</el-descriptions-item>
           <el-descriptions-item label="详细地址">{{ getHiddenDetailAddress(addressInfo.address) }}</el-descriptions-item>
         </el-descriptions>
-      </el-card>
+      </el-card> -->
       <el-card class="mt10">
         <template v-slot:header>
           <div style="font-size: 16px; font-weight: bold">商品信息</div>
@@ -68,22 +68,22 @@
           </el-table-column>
         </el-table>
       </el-card>
-      <el-card class="mt10">
-        <el-descriptions title="物流信息" :column="3" border label-class-name="my-label" contentClassName="my-content">
-          <el-descriptions-item label="发货时间">{{ parseTime(orderDetail.deliveryTime, '') }}</el-descriptions-item>
-          <el-descriptions-item label="快递单号">{{ orderDetail.expressNo }}</el-descriptions-item>
-          <el-descriptions-item label="物流公司">{{ orderDetail.expressName }}</el-descriptions-item>
-          <!--                    <el-descriptions-item label="物流进度">-->
-          <!--                        <el-popover placement="top" width="300" trigger="hover" popper-class="popperOptions">-->
-          <!--                            <el-timeline-item v-for="(activity, index) in aliLogisticsInfoList" :key="index"-->
-          <!--                                :timestamp="activity.time">-->
-          <!--                                {{ activity.context }}-->
-          <!--                            </el-timeline-item>-->
-          <!--                            <span slot="reference">{{ orderDetail.logistics }}</span>-->
-          <!--                        </el-popover>-->
-          <!--                    </el-descriptions-item>-->
-        </el-descriptions>
-      </el-card>
+      <!-- <el-card class="mt10"> -->
+      <!-- <el-descriptions title="物流信息" :column="3" border label-class-name="my-label" contentClassName="my-content"> -->
+      <!-- <el-descriptions-item label="发货时间">{{ parseTime(orderDetail.deliveryTime, '') }}</el-descriptions-item> -->
+      <!-- <el-descriptions-item label="快递单号">{{ orderDetail.expressNo }}</el-descriptions-item> -->
+      <!-- <el-descriptions-item label="物流公司">{{ orderDetail.expressName }}</el-descriptions-item> -->
+      <!--                    <el-descriptions-item label="物流进度">-->
+      <!--                        <el-popover placement="top" width="300" trigger="hover" popper-class="popperOptions">-->
+      <!--                            <el-timeline-item v-for="(activity, index) in aliLogisticsInfoList" :key="index"-->
+      <!--                                :timestamp="activity.time">-->
+      <!--                                {{ activity.context }}-->
+      <!--                            </el-timeline-item>-->
+      <!--                            <span slot="reference">{{ orderDetail.logistics }}</span>-->
+      <!--                        </el-popover>-->
+      <!--                    </el-descriptions-item>-->
+      <!-- </el-descriptions> -->
+      <!-- </el-card> -->
     </el-main>
   </div>
 </template>
diff --git a/src/views/oms/order/index.vue b/src/views/oms/order/index.vue
index 8e58b05..32619c3 100644
--- a/src/views/oms/order/index.vue
+++ b/src/views/oms/order/index.vue
@@ -61,7 +61,7 @@
           <el-input v-model.trim="queryParams.userPhone" placeholder="请输入会员手机号" clearable @keyup.enter="handleQuery" />
         </el-form-item>
         <el-form-item label="省市区" prop="provinces">
-          <address-selector v-model="queryParams.provinces"></address-selector>
+          <address-selector v-model="queryParams.provinces" :style="{ width: '100%' }" />
         </el-form-item>
         <el-form-item class="flex_one tr">
           <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -131,26 +131,26 @@
         <!--      <el-table-column label="分佣信息" prop="couponAmount" width="80"> </el-table-column>-->
         <el-table-column label="订单类型" prop="couponAmount" width="100">
           <template v-slot="scope">
-            <el-tag type="primary">
-              {{ getEmulistLabelById(scope.row.type, orderTypeMap) }}
-            </el-tag>
+            <!-- <el-tag type="primary"> -->
+            {{ getEmulistLabelById(scope.row.type, orderTypeMap) }}
+            <!-- </el-tag> -->
           </template>
         </el-table-column>
         <el-table-column label="交易编号" prop="id" width="120" align="center">
           <template v-slot="scope">
-            <el-link type="primary" icon="Copy" link @click="copy(scope.row.id)" :underline="false">
-              {{ scope.row.id }}
-              <el-icon><CopyDocument /></el-icon>
-            </el-link>
+            <!-- <el-link type="primary" icon="Copy" link @click="copy(scope.row.id)" :underline="false"> -->
+            {{ scope.row.id }}
+            <!-- <el-icon><CopyDocument /></el-icon>
+            </el-link> -->
           </template>
         </el-table-column>
         <el-table-column label="订单编号" prop="orderSn" width="80"> </el-table-column>
         <el-table-column label="订单状态" prop="status" width="160">
           <template v-slot="scope">
             <div>
-              <el-tag style="margin-right: 10px">
-                {{ getEmulistLabelById(scope.row.status, orderStatusMap) }}
-              </el-tag>
+              <!-- <el-tag style="margin-right: 10px"> -->
+              {{ getEmulistLabelById(scope.row.status, orderStatusMap) }}
+              <!-- </el-tag> -->
             </div>
             <!-- <div v-if="scope.row.deliverySn">
               物流单号：{{ scope.row.deliverySn }}
@@ -161,19 +161,24 @@
         </el-table-column>
         <el-table-column label="退款状态" prop="aftersaleStatus" width="100">
           <template v-slot="scope">
-            <el-tag type="primary">
-              {{ getEmulistLabelById(scope.row.aftersaleStatus, orderAftersaleMap) }}
-            </el-tag>
+            <!-- <el-tag type="primary"> -->
+            {{ getEmulistLabelById(scope.row.aftersaleStatus, orderStatusMap) }}
+            <!-- </el-tag> -->
           </template>
         </el-table-column>
-        <el-table-column label="提现状态" prop="withdrawStatus" width="100">
+        <el-table-column label="核销状态" prop="status" width="100">
+          <template v-slot="scope">
+            {{ getEmulistLabelById(scope.row.status, orderWithdrawMap) }}
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="提现状态" prop="withdrawStatus" width="100">
           <template v-slot="scope">
             <el-tag type="primary">
               {{ getEmulistLabelById(scope.row.withdrawStatus, orderWithdrawMap) }}
             </el-tag>
           </template>
-        </el-table-column>
-        <el-table-column label="收件信息" prop="receiverName" width="280">
+        </el-table-column> -->
+        <!-- <el-table-column label="收件信息" prop="receiverName" width="280">
           <template v-slot="scope">
             <div>
               <span>{{ scope.row.decrypt ? scope.row.receiverName : getHiddenName(scope.row.receiverName) }} {{ scope.row.receiverPhone }}</span>
@@ -185,7 +190,7 @@
               <span>{{ scope.row.decrypt ? scope.row.receiverDetailAddress : getHiddenDetailAddress(scope.row.receiverDetailAddress) }}</span>
             </div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="备注留言" prop="note" width="160">
           <template v-slot="scope">
             <div>
@@ -223,6 +228,7 @@
             <el-button text size="small" type="primary" @click="goDetail(scope.row)" v-hasPermi="['oms:order:query']">详情 </el-button>
             <el-button text size="small" type="primary" @click="showLog(scope.row.id)" v-hasPermi="['oms:order:log']">记录 </el-button>
             <el-button text size="small" type="primary" @click="handleDelivery(scope.row)">核销 </el-button>
+            <el-button text size="small" type="primary">退款</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/pms/product/index.vue b/src/views/pms/product/index.vue
index 49f0a6a..5f02226 100644
--- a/src/views/pms/product/index.vue
+++ b/src/views/pms/product/index.vue
@@ -9,11 +9,15 @@
           <el-form-item label="名称" prop="name">
             <el-input v-model="queryParams.nameLike" placeholder="请输入商品名称" clearable @keyup.enter="handleQuery" />
           </el-form-item>
-          <el-form-item label="品牌" prop="brandName">
-            <el-input v-model="queryParams.brandNameLike" placeholder="请输入品牌名称" clearable @keyup.enter="handleQuery" />
+          <el-form-item label="品牌" prop="brandId">
+            <el-select v-model="queryParams.brandId" placeholder="请选择品牌" clearable @change="handleQuery">
+              <el-option v-for="item in getbrandList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
           </el-form-item>
-          <el-form-item label="分类" prop="productCategoryName">
-            <el-input v-model="queryParams.productCategoryNameLike" placeholder="请输入分类名称" clearable @keyup.enter="handleQuery" />
+          <el-form-item label="分类" prop="categoryId">
+            <el-select v-model="queryParams.categoryId" placeholder="请选择分类" clearable @change="handleQuery">
+              <el-option v-for="item in getCategoryNameLike" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
           </el-form-item>
           <el-form-item label="编码" prop="outProductId">
             <el-input v-model="queryParams.outProductId" placeholder="请输入商品编码" clearable @keyup.enter="handleQuery" />
@@ -35,18 +39,12 @@
         </template>
 
         <el-table v-loading="loading" :data="pmsProductList" border>
-          <!--        <el-table-column label="主图" prop="pic">
-          <template v-slot="{ row }">
-            <el-image v-if="row.pic" :src="row.pic" :preview-src-list="[row.pic]" class="small-img" />
-          </template>
-        </el-table-column>-->
           <el-table-column label="店铺名称" min-width="120" prop="contactUserName" align="center"> </el-table-column>
           <el-table-column label="店铺手机号" prop="contactPhone" min-width="115" align="center"> </el-table-column>
           <el-table-column label="配送方式" prop="distribution" align="center">
             <template v-slot="scope">{{ scope.row.distribution == 1 ? '到店核销' : scope.row.distribution == 2 ? '自提' : '配送' }} </template>
           </el-table-column>
           <el-table-column label="商品名称" prop="name" align="center"> </el-table-column>
-          <!-- <el-table-column label="商品描述" prop="describe"> </el-table-column> -->
           <el-table-column label="商品类型" prop="type" align="center">
             <template v-slot="scope">{{ scope.row.type == 1 ? '团购' : scope.row.type == 2 ? '拼团' : '秒杀' }} </template>
           </el-table-column>
@@ -91,45 +89,8 @@
           <el-table-column label="审核状态" prop="authFlag" fixed="right" min-width="110" align="center">
             <template v-slot="scope">
               {{ scope.row.authFlag == 1 ? '待审核' : scope.row.authFlag == 2 ? '审核通过' : '审核驳回' }}
-              <!-- <el-switch
-              :model-value="scope.row.authFlag"
-              :active-value="1"
-              :inactive-value="0"
-              active-text="通过"
-              inactive-text="驳回"
-              inline-prompt
-              :before-change="
-                () => {
-                  // return handleChangeUserStatus(scope.row);
-                }
-              "
-            >
-            </el-switch> -->
             </template></el-table-column
           >
-          <!--        <el-table-column label="名称/编码" min-width="200" prop="outProductId">
-          <template v-slot="{ row }">
-            <div>名称：{{ row.name }}</div>
-            <div v-if="row.outProductId">编码：{{ row.outProductId }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column label="品牌/分类" prop="brandName">
-          <template v-slot="{ row }">
-            <div v-if="row.brandName">品牌：{{ row.brandName }}</div>
-            <div v-if="row.productCategoryName">分类：{{ row.productCategoryName }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column label="价格/排序" prop="price">
-          <template v-slot="{ row }">
-            <div v-if="row.price">价格：{{ row.price }}</div>
-            <div v-if="row.sort">排序：{{ row.sort }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column label="上架状态" prop="publishStatus">
-          <template v-slot="{ row }">
-                        <dict-tag :value="row.publishStatus" prop-name="pms_publish_status" />
-          </template>
-        </el-table-column>-->
           <el-table-column label="操作" class-name="small-padding fixed-width" width="150" align="center" fixed="right">
             <template v-slot="scope">
               <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改 </el-button>
@@ -138,9 +99,6 @@
               <br />
               <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
             </template>
-            <!--          <template v-slot="scope">
-            <el-button  text type="primary" @click="showProductEditModal(scope.row)">编辑</el-button>
-          </template>-->
           </el-table-column>
         </el-table>
 
@@ -221,12 +179,11 @@
 </template>
 
 <script>
-import { delPmsProduct, listPmsProduct, productpublish, productaudit } from '@/api/pms/product';
+import { delPmsProduct, listPmsProduct, productpublish, productaudit, getproductCategoryNameLike, getbrand } from '@/api/pms/product';
 import { isStarRepo } from '@/utils/is-star-plugin';
 import { useUserStore } from '@/store/modules/user';
 import AddressSelector from '@/views/components/AddressSelector/index.vue';
 import { editUserData } from '@/api/ums/member.js';
-
 export default {
   name: 'PmsProduct',
   components: { AddressSelector },
@@ -273,6 +230,8 @@ export default {
         /*        email: [{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],*/
         phone: [{ required: true, pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '请输入正确的手机号码', trigger: 'blur' }]
       },
+      getCategoryNameLike: [],
+      getbrandList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -291,12 +250,15 @@ export default {
         detailHtml: null,
         detailMobileHtml: null,
         brandName: null,
-        productCategoryName: null
+        productCategoryName: null,
+        brandId: null
       }
     };
   },
   created() {
     this.getList();
+    this.getgetproductCategoryNameLike();
+    this.getbrand();
   },
   computed: {
     userId: {
@@ -306,6 +268,16 @@ export default {
     }
   },
   methods: {
+    // 查询商品分类列表
+    async getgetproductCategoryNameLike() {
+      const res = await getproductCategoryNameLike();
+      this.getCategoryNameLike = res.data;
+    },
+    // 查询商品分类列表
+    async getbrand() {
+      const res = await getbrand();
+      this.getbrandList = res.data;
+    },
     //审核
     async authInfoProduct() {
       const res = await productaudit(this.authInfo, this.authInfo);
diff --git a/src/views/register.vue b/src/views/register.vue
index 8b3d6dc..b705968 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -67,7 +67,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-register-footer">
-      <span>Copyright © 2018-2025 疯狂的狮子Li All Rights Reserved.</span>
+      <!-- <span>Copyright © 2018-2025 疯狂的狮子Li All Rights Reserved.</span> -->
     </div>
   </div>
 </template>
diff --git a/src/views/system/divide/index.vue b/src/views/system/divide/index.vue
index 4bcaf0d..2dc093d 100644
--- a/src/views/system/divide/index.vue
+++ b/src/views/system/divide/index.vue
@@ -237,37 +237,34 @@ const mul = ref<string>('');
 const isFuttl = ref<boolean>(false);
 //详情数据
 const funseach = (data: any) => {
-  getTenantPackage();
+  // getTenantPackage();
+  templateDetailList.value = [];
+  constdfrom.value = [];
   sexDialog.value.visible = true;
   secform.value.templateId = data.id;
   mul.value = data.templateType;
   sexDialog.value.title = '模板详情';
   getsections({ 'templateId': data.id }).then((res: any) => {
     if (res.code == 200) {
-      if (res.data.length > 0) {
-        console.log(res.data.length);
+      if (data.templateType == '1') {
+        // isFuttl.value = true;
 
-        isFuttl.value = true;
-        if (data.templateType == '1') {
-          res.data.forEach((item: any) => {
-            templateDetailList.value.push({
-              rateName: item.rateName,
-              rate: item.rate,
-              id: item.id
-            });
+        res.data.forEach((item: any) => {
+          templateDetailList.value.push({
+            rateName: item.rateName,
+            rate: item.rate,
+            id: item.id
           });
-        } else {
-          res.data.forEach((item: any) => {
-            constdfrom.value.push({
-              minAmount: item.minAmount,
-              maxAmount: item.maxAmount,
-              rate: item.rate,
-              id: item.id
-            });
-          });
-        }
+        });
       } else {
-        isFuttl.value = false;
+        res.data.forEach((item: any) => {
+          constdfrom.value.push({
+            minAmount: item.minAmount,
+            maxAmount: item.maxAmount,
+            rate: item.rate,
+            id: item.id
+          });
+        });
       }
     }
   });
@@ -276,51 +273,7 @@ const secformRef = ref<ElFormInstance>();
 const constdfromRef = ref<ElFormInstance>();
 //模板比例添加
 const addsectionasync = async () => {
-  //修改
-  if (isFuttl.value) {
-    if (mul.value == '1') {
-      secformRef.value?.validate(async (valid: boolean) => {
-        if (valid) {
-          // const valuefn = JSON.stringify(templateDetailList.value);
-          secform.value.templateList = JSON.stringify(templateDetailList.value);
-          const res = await putsections(secform.value);
-          if (res.code == 200) {
-            isFuttl.value = false;
-            ElMessage.success('修改成功');
-            sexDialog.value.visible = false;
-            getList();
-            secform.value = {
-              templateId: '',
-              templateList: ''
-            };
-            templateDetailList.value = [];
-          }
-        }
-      });
-    } else {
-      constdfromRef.value?.validate(async (valid: boolean) => {
-        if (valid) {
-          // const valuefn = JSON.stringify(constdfrom.value);
-          secform.value.templateList = JSON.stringify(constdfrom.value);
-          const res = await putsections(secform.value);
-          if (res.code == 200) {
-            isFuttl.value = false;
-            ElMessage.success('修改成功');
-            sexDialog.value.visible = false;
-            getList();
-            secform.value = {
-              templateId: '',
-              templateList: ''
-            };
-            constdfrom.value = [];
-          }
-        }
-      });
-    }
-  } else {
-    //添加
-    addsecfun();
-  }
+  addsecfun();
 };
 const addsecfun = () => {
   if (mul.value == '1') {
@@ -329,7 +282,6 @@ const addsecfun = () => {
         secform.value.templateList = JSON.stringify(templateDetailList.value);
         const res = await addsection(secform.value);
         if (res.code == 200) {
-          isFuttl.value = false;
           ElMessage.success('新增成功');
           sexDialog.value.visible = false;
           getList();
@@ -347,7 +299,6 @@ const addsecfun = () => {
         secform.value.templateList = JSON.stringify(constdfrom.value);
         const res = await addsection(secform.value);
         if (res.code == 200) {
-          isFuttl.value = false;
           ElMessage.success('新增成功');
           sexDialog.value.visible = false;
           getList();
@@ -448,7 +399,7 @@ const resetQuery = () => {
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
-  getTenantPackage();
+  // getTenantPackage();
   dialog.visible = true;
   dialog.title = '新增模板';
 };
@@ -456,7 +407,7 @@ const handleAdd = () => {
 /** 修改按钮操作 */
 const handleUpdate = async (row?: TenantVO) => {
   reset();
-  await getTenantPackage();
+  // await getTenantPackage();
   const _id = row?.id;
   // const res = await getTenant(_id);
   Object.assign(form.value, row);
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 3b34c9d..32ca7db 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -93,6 +93,11 @@
             <span>{{ proxy.parseTime(scope.row.expireTime, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column> -->
+         <el-table-column label="签约状态" align="center" prop="signStatus">
+          <template #default="scope">
+            {{ signList.filter((item) => item.value == scope.row.signStatus)[0]?.label }}
+          </template>
+        </el-table-column>
         <el-table-column label="租户状态" align="center" prop="status">
           <template #default="scope">
             <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
@@ -401,7 +406,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="签约状态" prop="signStatus" align="left">
+              <el-form-item label="签约状态" prop="signStatus" align="left" v-if="form.id">
                 <el-select v-model="form.signStatus" placeholder="请选择签约状态" clearable>
                   <el-option v-for="(item, index) in signList" :key="index" :label="item.label" :value="item.value" />
                 </el-select>
@@ -838,6 +843,7 @@ const data = reactive<PageData<TenantForm, TenantQuery>>({
   rules: {
     id: [{ required: true, message: 'id不能为空', trigger: 'blur' }],
     tenantId: [{ required: true, message: '租户编号不能为空', trigger: 'blur' }],
+    bankPhone: [{ required: true, message: '开户行预留手机号不能为空', trigger: 'blur' }],
     contactUserName: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
     contactPhone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
     contractAttachment: [{ required: true, message: '签约附件不能为空', trigger: 'blur' }],
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index 0fc542c..bb192c4 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -55,9 +55,9 @@
             <el-tab-pane label="修改密码" name="resetPwd">
               <resetPwd />
             </el-tab-pane>
-            <el-tab-pane label="第三方应用" name="thirdParty">
+            <!-- <el-tab-pane label="第三方应用" name="thirdParty">
               <thirdParty :auths="state.auths" />
-            </el-tab-pane>
+            </el-tab-pane> -->
             <el-tab-pane label="在线设备" name="onlineDevice">
               <onlineDevice :devices="state.devices" />
             </el-tab-pane>
diff --git a/src/views/ums/account/index.vue b/src/views/ums/account/index.vue
index 1586335..7139632 100644
--- a/src/views/ums/account/index.vue
+++ b/src/views/ums/account/index.vue
@@ -37,20 +37,69 @@
           <el-table-column label="积分余额" prop="integral" align="center">
             <template v-slot="scope"> ￥ {{ scope.row.integral || '0.00' }} </template>
           </el-table-column>
+
+          <el-table-column label="操作" align="center">
+            <template v-slot="scope">
+              <el-button v-hasPermi="['system:tenant:edit']" link type="primary" @click="showTenantBannedInfoModal(scope.row, true)">
+                查看明细
+              </el-button>
+            </template>
+          </el-table-column>
         </el-table>
         <pagination :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.size" @pagination="getList" />
       </el-card>
     </div>
+    <el-dialog v-model="isshow" title="明细" width="1200px" append-to-body>
+      <el-card shadow="hover">
+        <el-form :model="queryParams" ref="query" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
+          <el-form-item label="时间:" prop="date">
+            <el-date-picker
+              v-model="query.date"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+            />
+          </el-form-item>
+          <el-form-item label="类型:" prop="changeType">
+            <el-select v-model="query.changeType" placeholder="请选择类型" clearable size="default" style="width: 240px">
+              <el-option label="收入" value="1" />
+              <el-option label="支出" value="2" />
+            </el-select>
+          </el-form-item>
+          <el-form-item class="flex_one tr">
+            <el-button type="primary" icon="Search" @click="getFomg">搜索</el-button>
+          </el-form-item>
+        </el-form>
+      </el-card>
+      <el-table :data="tableData" border>
+        <el-table-column label="变动类型" prop="accountType" align="center" />
+        <el-table-column label="变动来源" prop="accountTypeDesc" align="center" />
+        <el-table-column label="用户类型" prop="userType" align="center" />
+        <el-table-column label="余额" prop="moneyBalance" align="center" />
+        <el-table-column label="变动前余额" prop="beforeBalance" align="center" />
+        <el-table-column label="变动后余额" prop="afterBalance" align="center" />
+        <el-table-column label="变动金额" prop="changeAmount" align="center" />
+        <el-table-column label="变动类型" prop="changeType" align="center" />
+        <el-table-column label="创建时间" prop="createTime" align="center" />
+        <el-table-column label="备注" prop="remark" align="center" />
+      </el-table>
+      <pagination :total="totals" v-model:page="query.current" v-model:limit="query.size" @pagination="getFomg" />
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { getUserAccountList } from '@/api/ums/member';
+import { getUserAccountList, listCurrent } from '@/api/ums/member';
 
 export default {
   name: 'UmeAccount',
   data() {
     return {
+      tableData: [],
+      isshow: false,
       show: false,
       // 遮罩层
       loading: true,
@@ -71,6 +120,14 @@ export default {
         name: null,
         phone: null,
         type: null
+      },
+      totals: 0,
+      query: {
+        current: 1,
+        size: 10,
+        accountld: null,
+        date: null,
+        changeType: null
       }
     };
   },
@@ -79,6 +136,18 @@ export default {
     this.getList();
   },
   methods: {
+    showTenantBannedInfoModal(row) {
+      this.query.accountld = row.id;
+      this.getFomg();
+    },
+    async getFomg() {
+      const res = await listCurrent(this.query);
+      if (res.code === 200) {
+        this.tableData = res.data.records;
+        this.totals = res.data.total;
+        this.isshow = true;
+      }
+    },
     /** 查询会员信息列表 */
     getList() {
       //  type:账户类型  1 用户 2 商家 3 代理 4 平台