优化又优化

src/api/settlement/index.ts

@@ -32,6 +32,12 @@ export function jiesuanManageJiesuanListTixian(params: object) {
 export function jiesuanManageBankAccountAddCompanyCard(params: object) {
   return http.post(`/jiesuanManage/bankAccount/addCompanyCard`, params);
 }
+/**
+ * 银行卡账号-添加、修改
+ */
+export function jiesuanManageBankAccountDelCompanyCard(params: object) {
+  return http.post(`/jiesuanManage/bankAccount/delCompanyCard`, params);
+}
 
 /**
  * 银行列表

src/layout/components/header/index.vue

@@ -76,15 +76,23 @@ const isShowNavData = computed(() => {
     navData.value.advertiser = navDataArr.value[0]
     isAdverDisabled.value = true;
     miniPrograms.value = navDataArr.value[0]?.miniPrograms
-    // miniPrograms.value = [{
-    //   app_name: "weixin",
-    //   id: 13,
-    //   name: "三个十千短剧", type: 1
-    // }, ...miniPrograms.value]
   }
   return userStore.getRoles?.some(el => (el?.identify == 'optimizer'))
 })
 const appChange = (e) => {
+  initPer()
+  console.log(e, 'appChange', userStore.roles, navData.value, 'appChange.valappChangeappChangeue');
+  Cache.set('nav_data', JSON.stringify(navData.value));
+
+  // router.push('/')
+  // let timer = setTimeout(() => {
+  //   location.reload()
+  //   clearTimeout(timer)
+  // }, 100)
+  searchMenuVisiable.value = false
+}
+
+const initPer = () => {
   userStore.getUserInfo().then(res => {
     const {
       id,
@@ -106,15 +114,6 @@ const appChange = (e) => {
     userStore.setAvatar(avatar);
     userStore.setPermissions(permissions);
   })
-  console.log(e, 'appChange', userStore.roles, navData.value, 'appChange.valappChangeappChangeue');
-  Cache.set('nav_data', JSON.stringify(navData.value));
-
-  // router.push('/')
-  // let timer = setTimeout(() => {
-  //   location.reload()
-  //   clearTimeout(timer)
-  // }, 100)
-  searchMenuVisiable.value = false
 }
 
 const init = (params?: object) => {
@@ -130,9 +129,10 @@ onMounted(() => {
       navData.value = JSON.parse(Cache.get('nav_data')) || {}
       miniPrograms.value = JSON.parse(Cache.get('nav_data'))?.advertiser?.miniPrograms || []
     } else {
-      if (miniPrograms.value.length == 1) {
+      if (miniPrograms.value.length > 0) {
         navData.value.app = miniPrograms.value[0].app_name
         Cache.set('nav_data', JSON.stringify(navData.value));
+        initPer()
       }
     }
     clearTimeout(timer)

src/views/appletManage/index.vue

@@ -23,7 +23,7 @@
         </template>
       </Search>
       <div class="table-default">
-        <Operate :show="open" v-action="'manage.MinprogramManage.MinprogramManageAdd'" />
+        <Operate :show="open" v-action="'manage.miniprogram.store'" />
         <el-table :data="tableData" class="mt-3" v-loading="loading">
           <el-table-column prop="id" label="ID" />
           <el-table-column prop="name" label="小程序名称">
@@ -42,9 +42,9 @@
           <el-table-column label="操作" width="200">
             <template #default="scope">
               <el-button link type="primary" size="small" @click="opendepots(scope.row)"
-                v-action="'manage.MinprogramManage.MinprogramManageAllocation'">分配</el-button>
+                v-action="'manage.miniprogram.allocationStore'">分配</el-button>
               <el-button link type="primary" size="small" @click="open(scope.row.id)"
-                v-action="'manage.MinprogramManage.MinprogramManageEdit'">编辑</el-button>
+                v-action="'manage.miniprogram.update'">编辑</el-button>
             </template>
           </el-table-column>
         </el-table>

src/views/chargeManage/chargeTemplate/form/createGears.vue

@@ -30,7 +30,7 @@
             </el-input>
           </div>
         </el-form-item>
-        <el-form-item>
+        <el-form-item v-if="!isShowBi">
           <div class="mt-4 text-sm text-gray-400">1元=100k币，充送看币不能超过当前价格的3倍</div>
         </el-form-item>
         <el-form-item label="默认项" prop="is_default">

src/views/chargeManage/chargeTemplate/index.vue

@@ -9,11 +9,11 @@
     </Search>
     <div class="table-default">
       <div class="pt-5 pl-2">
-        <Add @click="openForm(null)" v-action="'manage.payTemplate.store'" />
+        <Add @click="openForm(null)" v-action="'channel.payTemplate.store'" />
       </div>
       <el-table :data="tableData" class="mt-3" v-loading="loading">
         <el-table-column prop="name" label="模板名称" />
-        <el-table-column label="状态" v-action="'manage.payTemplate.updateStatus'">
+        <el-table-column label="状态" v-action="'channel.payTemplate.updateStatus'">
           <template #default="scope">
             <el-switch v-model="scope.row.status" @change="statusChange($event, scope.row)" :active-value="1"
               :inactive-value="0" />
@@ -22,7 +22,7 @@
         <el-table-column label="操作" width="200">
           <template #default="scope">
             <el-button link type="primary" size="small" @click="openForm(scope.row)"
-              v-action="'manage.payTemplate.update'">编辑</el-button>
+              v-action="'channel.payTemplate.update'">编辑</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/ordersManage/tabs/rechargeList/index.vue

@@ -97,7 +97,8 @@
         </el-table-column>
         <el-table-column label="操作" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" size="small" @click="openType('userDetailVisible', scope.row)">用户详情</el-button>
+            <el-button v-action="'channel.orders.userDetails'" link type="primary" size="small"
+              @click="openType('userDetailVisible', scope.row)">用户详情</el-button>
             <br />
             <el-button v-if="scope.row.status == 'PAID'" link type="primary" size="small"
               v-action="'orderRefund.RefundOrder.applyRefund'"

src/views/promotion/promotionList/index.vue

@@ -67,7 +67,7 @@
                       :content="scope.row.promotion_path">
                       <template #reference>
                         <copy-button :text="scope.row.promotion_path">
-                          <el-link :underline="false">点击复制</el-link>
+                          <el-link type="primary" :underline="false">点击复制</el-link>
                         </copy-button>
                       </template>
                     </el-popover>
@@ -92,7 +92,7 @@
                       :content="scope.row.track_url">
                       <template #reference>
                         <copy-button :text="scope.row.track_url">
-                          <el-link :underline="false">点击复制</el-link>
+                          <el-link type="primary" :underline="false">点击复制</el-link>
                         </copy-button>
                       </template>
                     </el-popover>

src/views/settleManage/paymentAccountInfo/tabs/paymentInfo/index.vue

@@ -38,12 +38,15 @@
         </el-table-column>
         <el-table-column prop="remark" label="备注" show-overflow-tooltip min-width="200px">
         </el-table-column>
-        <!-- <el-table-column label="操作" width="200">
+        <el-table-column label="操作" width="200">
           <template #default="scope">
-            <el-button link type="primary" size="small" @click="open(scope.row)"
+            <el-button link type="primary" v-if="scope.row.status == 1" size="small" @click="open(scope.row)"
               v-action="'jiesuan.BankAccount.addCompanyCard'">编辑</el-button>
+            <el-button link type="primary" size="small" @click="deletePromotion(scope.row)"
+              v-action="'jiesuan.BankAccount.addCompanyCard'" v-if="scope.row.status != 2">删除</el-button>
+            <br />
           </template>
-        </el-table-column> -->
+        </el-table-column>
       </el-table>
       <Paginate />
     </div>
@@ -60,7 +63,7 @@ import { useRouter, useRoute } from 'vue-router'
 import { InfoFilled } from '@element-plus/icons-vue';
 import { useGetList } from '@/hook/curd/useGetList';
 import { useOpen } from '@/hook/curd/useOpen';
-import { jiesuanManageJiesuanAccountInfo, jiesuanManageBankAccountListShangwu } from '@/api/settlement/index'
+import { jiesuanManageBankAccountListShangwu, jiesuanManageBankAccountDelCompanyCard } from '@/api/settlement/index'
 import moment from 'moment';
 const start_date = moment().startOf('month').format('YYYY-MM-DD')
 const end_date = moment().endOf('month').format('YYYY-MM-DD')
@@ -89,6 +92,28 @@ const colorType = (data: object) => {
   }
 }
 
+const deletePromotion = (row: object) => {
+  ElMessageBox.confirm(
+    `确定要删除此列表吗?`,
+    '提示',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  )
+    .then(() => {
+      jiesuanManageBankAccountDelCompanyCard({ id: row.id }).then(res => {
+        ElMessage.success(res.message)
+        search()
+        console.log(res);
+      })
+    })
+    .catch(() => {
+
+    })
+}
+
 const closeUserDetail = () => { }
 
 const orderTimeChange = (e: object) => {
@@ -122,7 +147,6 @@ const tableData = computed(() => data.value?.data);
 onMounted(() => {
   jiesuanManageBankAccountListShangwu().then(res => {
     businessList.value = res.data;
-    console.log(res, 'jiesuanManageJiesuanAccountInfo');
   })
   console.log(rolesIdentify, 'rolesIdentifyrolesIdentify');
   search();

src/views/settleManage/settlementCenter/tabs/rechargeSettle/orderDetail/tabs/refundList/index.vue

@@ -28,8 +28,8 @@ const props = defineProps({
 });
 if (props.primary) {
   query.value.puser_id = props.primary.company_uid
-  query.value.created_at_start = props.primary.jiesuan_date + ' 00:00:00'
-  query.value.created_at_end = props.primary.jiesuan_date + ' 23:59:59'
+  query.value.pay_end_at_start = props.primary.jiesuan_date + ' 00:00:00'
+  query.value.pay_end_at_end = props.primary.jiesuan_date + ' 23:59:59'
 }
 const tableData = computed(() => data.value?.data);