diff --git a/components/basisCellCard/basisCellCard.vue b/components/basisCellCard/basisCellCard.vue
index e6a6dd7..ab7bbf5 100644
--- a/components/basisCellCard/basisCellCard.vue
+++ b/components/basisCellCard/basisCellCard.vue
@@ -29,6 +29,9 @@
         <view class="" v-else-if="item.dict">
           {{getDictDataLabel(item.dict,item.value) || '— —'}}
         </view>
+        <view class="" v-else-if="item.mode === 'time'">
+          {{item.value.slice(0,-9)}}
+        </view>
 				<view class="" v-else>
 					{{item.value}}
 				</view>
diff --git a/components/popUpFillIn/popUpFillIn.vue b/components/popUpFillIn/popUpFillIn.vue
index e6bd41a..8f8f6e9 100644
--- a/components/popUpFillIn/popUpFillIn.vue
+++ b/components/popUpFillIn/popUpFillIn.vue
@@ -170,6 +170,9 @@
         console.log("close")
         this.show = false;
         this.model = {};
+        this.radiovalueDHWH = "";
+        this.radiovalueGCWH = "";
+        this.radiovalueYYWH = "";
       },
       handleIgnition(dict) {
         let dictArr = this.getDictDatas(dict);
@@ -240,7 +243,8 @@
           id: this.IgnitionID,
           ignCnfStatusCode: this.radiovalueDHWH === '是' ? 'Y' : 'N',
           nIgnRsn: this.model.nIgnRsn,
-          ignTime: this.model.ignTime + ' 00:00:00'
+          userCode:this.model.userCode,
+          ignTime: this.radiovalueDHWH === '是' ? this.model.ignTime + ' 00:00:00' : ''
         }
         console.log(this.radiovalueGCWH);
         console.log("点火数据", data);
@@ -257,8 +261,8 @@
         let data = {
           id: this.IgnitionID,
           isCompleted: this.radiovalueGCWH === '是' ? 'Y' : 'N',
-          assignmentTime: this.model.assignmentTime + ' 00:00:00',
-          completionTime: this.model.completionTime + ' 00:00:00',
+          assignmentTime: this.radiovalueGCWH === '是' ? this.model.assignmentTime + ' 00:00:00' : "",
+          completionTime: this.radiovalueGCWH === '是' ? this.model.completionTime + ' 00:00:00' : "",
           nonNcmpRsn: this.model.nonNcmpRsn
         }
         console.log(this.radiovalueGCWH);
@@ -276,8 +280,8 @@
         let data = {
           id: this.IgnitionID,
           gasConnMtrRis: this.radiovalueYYWH === '是' ? 'Y' : 'N',
-          assignmentTime: this.model.assignmentTime + ' 00:00:00',
-          gctMtrrisTime: this.model.gctMtrrisTime + ' 00:00:00',
+          assignmentTime: this.radiovalueYYWH === '是' ? this.model.assignmentTime + ' 00:00:00' : "",
+          gctMtrrisTime: this.radiovalueYYWH === '是' ? this.model.gctMtrrisTime + ' 00:00:00' : "",
           gctNcmpRsn: this.model.gctNcmpRsn
         }
         console.log("运营数据", data);
diff --git a/pages/charge/constructionMaintenance/detail.vue b/pages/charge/constructionMaintenance/detail.vue
index d24fba8..902c6a7 100644
--- a/pages/charge/constructionMaintenance/detail.vue
+++ b/pages/charge/constructionMaintenance/detail.vue
@@ -76,15 +76,18 @@
         }, {
           name: "市场派单时间",
           value: "",
-          key: "assignmentTime"
+          key: "assignmentTime",
+          mode:'time'
         }, {
           name: "是否竣工",
           value: "",
-          key: "isCompleted"
+          key: "isCompleted",
+          dict:'sys_yes_no'
         }, {
           name: "竣工时间",
           value: "",
-          key: "completionTime"
+          key: "completionTime",
+          mode:'time'
         }, {
           name: "未竣工原因",
           value: "",
@@ -96,11 +99,14 @@
         }, {
           name: "是否通气到表前/立管",
           value: "",
-          key: "gasConnMtrRis"
+          key: "gasConnMtrRis",
+          // dict:'sys_yes_no'
         }, {
           name: "是否通气到表前/立管时间",
           value: "",
-          key: "gctMtrrisTime"
+          key: "gctMtrrisTime",
+          mode:'time',
+          // dict:'sys_yes_no'
         }, {
           name: "未完成原因",
           value: "",
diff --git a/pages/charge/constructionMaintenance/index.vue b/pages/charge/constructionMaintenance/index.vue
index e7157b9..c0e55f2 100644
--- a/pages/charge/constructionMaintenance/index.vue
+++ b/pages/charge/constructionMaintenance/index.vue
@@ -1,7 +1,12 @@
 <template>
   <view class="app-container">
     <u-navbar :title="title" safeAreaInsetTop placeholder>
-      <view slot="left" class="text-red"></view>
+      <view class="flex justify-between" slot="left" @click="loginOut">
+        <u-icon size="15" name="/static/images/icon/login-out.png"></u-icon>
+        <view class="text-red margin-left-xs">
+          退出
+        </view>
+      </view>
     </u-navbar>
     <!-- <view class="">
 			<uv-drop-down ref="dropDown" sign="dropDown_1" :customStyle="{'justifyContent':'space-around'}"
@@ -121,7 +126,7 @@
         searchForm: {
           companyCode: "",
           isCompleted: "",
-          gasConnMtrRis:""
+          gasConnMtrRis: ""
         },
         model: {},
         currentName: "",
@@ -208,6 +213,9 @@
             this.list = rows;
           }
           this.total = total;
+          if(this.total < this.params.pageNum * this.params.pageSize){
+            this.status = "nomore"
+          }
           console.log('list', JSON.parse(JSON.stringify(this.list)));
         }
       },
@@ -288,14 +296,15 @@
         if (this.currentName === 'isCompleted') {
           this.searchForm.isCompleted = dataLabel;
           this.model.isCompleted = data;
-          this.params.isCompleted = data==='是'?'Y':'N';
-        }else if(this.currentName === 'gasConnMtrRis') {
+          this.params.isCompleted = data === '是' ? 'Y' : 'N';
+        } else if (this.currentName === 'gasConnMtrRis') {
           this.searchForm.gasConnMtrRis = dataLabel;
           this.model.gasConnMtrRis = data;
-          this.params.gasConnMtrRis = data==='是'?'Y':'N'
+          this.params.gasConnMtrRis = data === '是' ? 'Y' : 'N'
         }
         this.pickerShow = false;
         this.currentName = '';
+        this.list = [];
         this.initData()
       },
       selectCancel(e) {
@@ -311,6 +320,7 @@
         this.gsShow = false;
         this.searchForm.companyCode = this.model.companyName.slice(0, 5) + '...';
         this.params.companyCode = this.model.companyCode;
+        this.list = [];
         this.initData();
         this.currentName = '';
       },
@@ -328,6 +338,29 @@
         this.IgnitionID = item.id;
         this.btnType = type;
         this.$refs.popUpFillInRef.open();
+      },
+      loginOut() {
+        this.$modal.confirm('您当前确定要退出吗?', '退出登录').then(() => {
+          //钉钉直接退出微应用
+          if (this.$isDing) {
+            dd.biz.navigation.close({
+              onSuccess: function(result) {
+                console.log(result, 'result')
+              },
+              onFail: function(err) {
+                console.log(err, 'err')
+              }
+            });
+          } else {
+            this.$store.dispatch('Logout').then((res) => {
+              uni.reLaunch({
+                url: '/pages/login/mobile'
+              })
+            })
+          }
+        }).catch(() => {
+          console.log("取消");
+        });
       }
     }
   }
diff --git a/pages/charge/ignitionMaintenance/detail.vue b/pages/charge/ignitionMaintenance/detail.vue
index 8b23a07..fbbd889 100644
--- a/pages/charge/ignitionMaintenance/detail.vue
+++ b/pages/charge/ignitionMaintenance/detail.vue
@@ -93,7 +93,8 @@
         }, {
           name: "点火时间",
           value: "",
-          key: "ignTime"
+          key: "ignTime",
+          mode:'time'
         }, {
           name: "未点火原因",
           value: "",
diff --git a/pages/charge/ignitionMaintenance/index.vue b/pages/charge/ignitionMaintenance/index.vue
index ed3b8b4..d512aaf 100644
--- a/pages/charge/ignitionMaintenance/index.vue
+++ b/pages/charge/ignitionMaintenance/index.vue
@@ -1,7 +1,12 @@
 <template>
   <view class="app-container">
     <u-navbar :title="title" safeAreaInsetTop placeholder>
-      <view slot="left" class="text-red"></view>
+      <view class="flex justify-between" slot="left" @click="loginOut">
+        <u-icon size="15" name="/static/images/icon/login-out.png"></u-icon>
+        <view class="text-red margin-left-xs">
+          退出
+        </view>
+      </view>
     </u-navbar>
     <!-- <view class="">
       <uv-drop-down ref="dropDown" sign="dropDown_1" :customStyle="{'justifyContent':'space-around'}"
@@ -54,7 +59,7 @@
           <text class="text-grey margin-right-xs">地址:</text>{{item.userDetailedAddress || '--'}}
         </view>
         <view class="margin-top-sm">
-          <text class="text-grey margin-right-xs">点火时间:</text>{{item.ignTime || '--'}}
+          <text class="text-grey margin-right-xs">点火时间:</text>{{item.ignTime?item.ignTime.slice(0,-9):'--'}}
         </view>
       </view>
       <view class="flex justify-end margin-top">
@@ -207,6 +212,9 @@
           } else {
             this.list = rows;
           }
+          if(this.total < this.params.pageNum * this.params.pageSize){
+            this.status = "nomore"
+          }
           this.total = total;
           console.log('list', JSON.parse(JSON.stringify(this.list)));
         }
@@ -304,6 +312,7 @@
         }
         this.pickerShow = false;
         this.currentName = '';
+        this.list = [];
         this.initData()
       },
       selectCancel(e) {
@@ -319,6 +328,7 @@
         this.gsShow = false;
         this.searchForm.companyCode = this.model.companyName.slice(0, 5) + '...';
         this.params.companyCode = this.model.companyCode;
+        this.list = [];
         this.initData();
         this.currentName = '';
       },
@@ -326,6 +336,29 @@
         this.gsShow = false;
         this.currentName = '';
       },
+      loginOut() {
+        this.$modal.confirm('您当前确定要退出吗?', '退出登录').then(() => {
+          //钉钉直接退出微应用
+          if (this.$isDing) {
+            dd.biz.navigation.close({
+              onSuccess: function(result) {
+                console.log(result, 'result')
+              },
+              onFail: function(err) {
+                console.log(err, 'err')
+              }
+            });
+          } else {
+            this.$store.dispatch('Logout').then((res) => {
+              uni.reLaunch({
+                url: '/pages/login/mobile'
+              })
+            })
+          }
+        }).catch(() => {
+          console.log("取消");
+        });
+      }
     }
   }
 </script>
diff --git a/pages/charge/visitsAndFees/detail.vue b/pages/charge/visitsAndFees/detail.vue
index 81a88e5..99ebade 100644
--- a/pages/charge/visitsAndFees/detail.vue
+++ b/pages/charge/visitsAndFees/detail.vue
@@ -72,7 +72,8 @@
         }, {
           name: "入户时间",
           value: "— —",
-          key: "entryTime"
+          key: "entryTime",
+          mode:'time',
         }, {
           name: "项目公司/部门",
           value: "— —",
diff --git a/pages/charge/visitsAndFees/index.vue b/pages/charge/visitsAndFees/index.vue
index dc6559d..5502366 100644
--- a/pages/charge/visitsAndFees/index.vue
+++ b/pages/charge/visitsAndFees/index.vue
@@ -84,7 +84,7 @@
           <text class="text-grey margin-right-xs">用户:</text>{{item.userName|| "--"}}
         </view>
       </view>
-      <view class="flex justify-between margin-top">
+      <view class="flex justify-end margin-top">
         <view class="margin-right-xs">
           <zb-popover placement="bottom-start" theme="dark" ref="Popover1" class="item-popover">
             <view slot="content" class="popoverCss">
@@ -108,16 +108,16 @@
             <u-button shape="circle">更多操作</u-button>
           </zb-popover>
         </view>
-        <view class="margin-right-xs" @click="handleEdit(item)" v-if="editPermission(item)">
+        <view class="w25 margin-right-xs" @click="handleEdit(item)" v-if="editPermission(item)">
           <u-button shape="circle" color="#CF000D">修改</u-button>
         </view>
-        <view class="margin-right-xs" @click="handleDetail(item)">
+        <view class="w25 margin-right-xs" @click="handleDetail(item)">
           <u-button shape="circle">查看详情</u-button>
         </view>
-        <view class="margin-right-xs" @click="handleRefuse(item)" v-if="auditPermission(item)">
+        <view class="w22 margin-right-xs" @click="handleRefuse(item)" v-if="auditPermission(item)">
           <u-button shape="circle">拒绝</u-button>
         </view>
-        <view class="" @click="handleAgree(item)" v-if="auditPermission(item)">
+        <view class="w22" @click="handleAgree(item)" v-if="auditPermission(item)">
           <u-button shape="circle" color="#CF000D">同意</u-button>
         </view>
       </view>
@@ -559,6 +559,9 @@
           } else {
             this.list = rows;
           }
+          if(this.total < this.params.pageNum * this.params.pageSize){
+            this.status = "nomore"
+          }
           this.total = total;
           console.log('list', JSON.parse(JSON.stringify(this.list)));
         }
@@ -573,6 +576,7 @@
         console.log("搜索", e);
       },
       onClear() {
+        this.params.pageNum = 1;
         this.keyword = "";
         this.params.userName = "";
         this.initData()
diff --git a/pages/login/workbench.vue b/pages/login/workbench.vue
index 585a1d3..9576563 100644
--- a/pages/login/workbench.vue
+++ b/pages/login/workbench.vue
@@ -7,7 +7,7 @@
         <view class="text-xxl text-bold text-white">市场洞察平台</view>
         <u-icon name="arrow-right" color="#fff"></u-icon>
       </view>
-      <view class="chargeCss margin-tb-xl padding flex justify-between align-center" @click="handleClick('charge')">
+      <view class="chargeCss margin-tb-xl padding flex justify-between align-center" v-if="validate()" @click="handleClick('charge')">
         <u-image width="60rpx" height="60rpx" src="/static/images/icon/charge.png" shape="circle"></u-image>
         <view class="text-xxl text-bold text-white">市场化收费工具</view>
         <u-icon name="arrow-right" color="#fff"></u-icon>
@@ -34,6 +34,16 @@
 
     },
     methods: {
+      // 验证是否需要显示工具菜单
+      validate(){
+        let toolPermissions = ['schsf:mcVisit:list','schsf:mcIgnition:list','schsf:mcConstruction:list']
+        console.log(this);
+        // 假设 this.$checkPermi 是一个返回布尔值的方法
+        let hasPermission = toolPermissions.some(permission => {
+            return this.$checkPermi([permission]);
+        });
+        return hasPermission
+      },
       handleClick(workName) {
         console.log(workName);
         this.$store.dispatch('setTab', {data: workName});
diff --git a/store/mudules/tabBar.js b/store/mudules/tabBar.js
index bc4f18b..58ddc31 100644
--- a/store/mudules/tabBar.js
+++ b/store/mudules/tabBar.js
@@ -1,5 +1,5 @@
 import tabBars from '@/utils/tabbar.js'
-
+import { checkPermi } from '@/utils/permission'
 const tabbar = {
   state: {
     list: tabBars.insightTabList
@@ -10,7 +10,19 @@ const tabbar = {
       if(data === 'insight'){
         state.list = tabBars.insightTabList
       }else if(data === 'charge'){
-        state.list = tabBars.chargeTabList
+        let data = tabBars.chargeTabList;
+        let list = []
+        console.log("工具菜单",data);
+        if(checkPermi(['schsf:mcVisit:list'])){
+          list.push(data[0])
+        }
+        if(checkPermi(['schsf:mcIgnition:list'])){
+          list.push(data[1])
+        }
+        if(checkPermi(['schsf:mcConstruction:list'])){
+          list.push(data[2])
+        }
+        state.list =  list;
       }
     },
   },
diff --git a/utils/ruoyi.js b/utils/ruoyi.js
index c68a4dc..49ef97f 100644
--- a/utils/ruoyi.js
+++ b/utils/ruoyi.js
@@ -290,7 +290,8 @@ export function assignValues(obj, arr) {
 			name: item.name,
 			key: item.key,
 			value: Array.isArray(item.value) ? item.value : item.value === 0 ? 0 : item.value ? item.value : '— —',
-      dict:item.dict
+      dict:item.dict,
+      mode:item.mode
 		};
 	});
 	return updatedArr;
--
libgit2 0.21.2