取消补贴余额

src/views/authentication/authentication.vue

@@ -90,7 +90,7 @@
           @click="resetInput"
           ><el-icon> <Refresh /> </el-icon><span>重置</span></el-button
         >
-        <!-- <el-button
+        <el-button
           style="margin-left: 20px"
           color="rgba(61, 81, 232, 1)"
           class="import"
@@ -102,7 +102,7 @@
             alt=""
           />
           <span>导出表单</span></el-button
-        > -->
+        >
       </div>
     </div>
     <!-- 暖心认证 -->
@@ -128,7 +128,7 @@
             style="width: 200px"
           />
         </div>
-        <div class="condition">
+        <!-- <div class="condition">
           <span>手机号码 : </span>
           <el-input
             clearable
@@ -137,7 +137,7 @@
             placeholder="请输入手机号码"
             style="width: 200px"
           />
-        </div>
+        </div> -->
         <!-- <div class="condition">
           <span>审核结果 : </span>
           <el-select
@@ -178,19 +178,19 @@
           @click="resetInputHZ"
           ><el-icon> <Refresh /> </el-icon><span>重置</span></el-button
         >
-        <!-- <el-button
+        <el-button
           style="margin-left: 20px"
           color="rgba(61, 81, 232, 1)"
           class="import"
           type="primary"
-          @click="downLoad"
+          @click="downLoad2"
           ><img
             src="@/assets/import.png"
             style="width: 14px; height: 14px; margin-right: 4px"
             alt=""
           />
           <span>导出表单</span></el-button
-        > -->
+        >
       </div>
     </div>
     <!-- 审核 -->
@@ -335,12 +335,7 @@
           </el-table-column>
           <el-table-column align="center" label="审核结果">
             <template #default="scope">
-              <div
-                v-if="scope.row.state == 0"
-                style="color: rgba(67, 207, 124, 1)"
-              >
-                待审核
-              </div>
+              <div v-if="scope.row.state == 0">待审核</div>
               <div
                 v-if="scope.row.state == 1"
                 style="color: rgba(67, 207, 124, 1)"
@@ -416,11 +411,29 @@
         >
           <el-table-column align="center" prop="username" label="姓名" />
           <el-table-column align="center" prop="cardNumber" label="学号" />
-          <el-table-column align="center" prop="college" label="所在院系">
+          <el-table-column align="center" prop="cardNumber" label="匹配结果">
+            <template #default="scope">
+              <div v-if="scope.row.state == 0">待审核</div>
+              <div
+                v-if="scope.row.state == 1"
+                style="color: rgba(67, 207, 124, 1)"
+              >
+                通过
+              </div>
+              <div
+                v-if="scope.row.state == 2"
+                style="color: rgba(212, 48, 48, 1)"
+              >
+                拒绝
+              </div>
+            </template>
           </el-table-column>
-          <el-table-column align="center" prop="instructor" label="辅导员姓名" />
-          <el-table-column align="center" prop="mobile" label="手机号" />
-          <el-table-column
+          <el-table-column align="center" prop="remark" label="原因描述" />
+          <el-table-column align="center" prop="createTime" label="申请时间" />
+          <!-- <el-table-column align="center" prop="college" label="所在院系"/> -->
+          <!-- <el-table-column align="center" prop="instructor" label="辅导员姓名" /> -->
+          <!-- <el-table-column align="center" prop="mobile" label="手机号" /> -->
+          <!-- <el-table-column
             align="center"
             prop="car_number"
             label="证件信息"
@@ -460,18 +473,6 @@
                   :src="scope.row.file2"
                   alt=""
                 />
-                <!-- <el-image
-                  style="width: 100px; height: 60px"
-                  :src="scope.row.file1"
-                  show-progress
-                  fit="cover"
-                /> 
-                 <el-image
-                  style="width: 100px; height: 60px"
-                  :src="scope.row.file2"
-                  show-progress
-                  fit="cover"
-                /> -->
               </div>
             </template>
           </el-table-column>
@@ -480,7 +481,7 @@
             width="100"
             prop="createTime"
             label="申请时间"
-          />
+          /> -->
           <el-table-column align="center" label="操作">
             <template #default="scope">
               <el-button link type="danger" @click="del(scope.row)"
@@ -636,8 +637,6 @@ const getList = async (message) => {
     data.append("rows", pageSize2.value);
     data.append("username", searchInputHZ.username);
     data.append("cardNumber", searchInputHZ.cardNumber);
-    data.append("mobile", searchInputHZ.mobile);
-    // data.append("state", searchInputHZ.state);
     if (searchInputHZ.time) {
       data.append("createStart", searchInputHZ.time[0]);
       data.append("createEnd", searchInputHZ.time[1]);
@@ -682,7 +681,7 @@ const resetInputHZ = lodash.debounce(() => {
   searchInputHZ.username = "";
   searchInputHZ.cardNumber = "";
   searchInputHZ.mobile = "";
-  searchInputHZ.time =""
+  searchInputHZ.time = "";
   getList();
 }, 300);
 
@@ -823,25 +822,76 @@ const del = (row) => {
 // 导出按钮
 const downLoad = lodash.debounce(async () => {
   let data = new FormData();
-  if (searchInput.car_number) {
-    data.set("car_number", searchInput.car_number);
+  data.append("username", searchInput.username);
+  data.append("cardNumber", searchInput.cardNumber);
+  data.append("mobile", searchInput.mobile);
+  data.append("state", searchInput.state);
+  if (searchInput.time) {
+    data.append("createStart", searchInput.time[0]);
+    data.append("createEnd", searchInput.time[1]);
   }
-  if (searchInput.yy_date) {
-    data.set("yy_date", searchInput.yy_date);
-  }
-  if (searchInput.createTime) {
-    data.set("startTime", searchInput.createTime[0]);
-    data.set("endTime", searchInput.createTime[1]);
+  data.append("type", 1); // 1教师认真,2暖心卡认真
+  let res = await axios({
+    method: "post",
+    url: api.value + "/vertifytoExcel1.action",
+    headers: {
+      token: sessionStorage.getItem("token"),
+    },
+    data: data,
+  });
+  console.log(res);
+  if (res.data.code == 200) {
+    // const elt = document.createElement("a");
+    // elt.setAttribute(
+    //   "href",
+    //   "https://car.meiyishuoo.com/ride-sharing" + res.data.downurl
+    // );
+    // elt.setAttribute("download", "file.png");
+    // elt.style.display = "none";
+    // document.body.appendChild(elt);
+    // elt.click();
+
+    var downloadPath =
+      "https://car.meiyishuoo.com/ride-sharing" + res.data.downurl;
+    console.log("获得地址数据:", downloadPath);
+    var downloadLink = document.createElement("a");
+    downloadLink.style.display = "none"; // 使其隐藏
+    downloadLink.href = downloadPath;
+    downloadLink.download = "";
+    downloadLink.click();
+    document.body.appendChild(downloadLink);
+    document.body.removeChild(downloadLink);
+    ElMessage({
+      type: "success",
+      showClose: true,
+      message: res.data.message,
+      center: true,
+    });
+  } else {
+    ElMessage({
+      type: "error",
+      showClose: true,
+      message: res.data.message,
+      center: true,
+    });
   }
-  if (searchInput.route) {
-    data.set("route", searchInput.route);
+}, 300);
+
+const downLoad2 = lodash.debounce(async () => {
+  let data = new FormData();
+  data.append("page", currentPage2.value);
+  data.append("rows", pageSize2.value);
+  data.append("username", searchInputHZ.username);
+  data.append("cardNumber", searchInputHZ.cardNumber);
+  // data.append("state", searchInputHZ.state);
+  if (searchInputHZ.time) {
+    data.append("createStart", searchInputHZ.time[0]);
+    data.append("createEnd", searchInputHZ.time[1]);
   }
-  data.set("mobile", searchInput.mobile);
-  data.set("state", searchInput.state);
-  // data.set("yy_date", searchInput.yy_date);
+  data.append("type", 2); // 1教师认真,2暖心卡认真
   let res = await axios({
     method: "post",
-    url: api.value + "/carBook/brectoExcel.action",
+    url: api.value + "/vertifytoExcel2.action",
     headers: {
       token: sessionStorage.getItem("token"),
     },
@@ -858,6 +908,7 @@ const downLoad = lodash.debounce(async () => {
     // elt.style.display = "none";
     // document.body.appendChild(elt);
     // elt.click();
+
     var downloadPath =
       "https://car.meiyishuoo.com/ride-sharing" + res.data.downurl;
     console.log("获得地址数据:", downloadPath);

src/views/busDetail/busDetail.vue

@@ -37,16 +37,16 @@
             placeholder="请选择消费类型"
             style="width: 200px"
           >
-            <el-option label="充值" value="1" />
-            <el-option label="消费" value="2" />
-            <el-option label="补贴" value="3" />
-            <el-option label="退款" value="4" />
+            <el-option label="充值" :value="1" />
+            <el-option label="消费" :value="2" />
+            <!-- <el-option label="补贴" :value="3" /> -->
+            <el-option label="退款" :value="4" />
           </el-select>
         </div>
-        <div class="condition">
+        <!-- <div class="condition">
           <span>审核结果 : </span>
           <el-select
-            v-model="searchInput.vertifyState"
+            v-model="searchInput.type"
             class="m-2"
             placeholder="请选择审核结果"
             style="width: 200px"
@@ -55,7 +55,7 @@
             <el-option label="通过" :value="1" />
             <el-option label="拒绝" :value="2" />
           </el-select>
-        </div>
+        </div> -->
         <div class="condition">
           <span>订单时间 : </span>
           <el-date-picker
@@ -95,7 +95,7 @@
           ><el-icon> <Refresh /> </el-icon><span>重置</span></el-button
         >
       </div>
-      <!-- <el-button
+      <el-button
         color="rgba(61, 81, 232, 1)"
         class="import"
         type="primary"
@@ -106,7 +106,7 @@
           alt=""
         />
         <span>导出表单</span></el-button
-      > -->
+      >
     </div>
 
     <el-dialog
@@ -129,9 +129,9 @@
         label-position="left"
         status-icon
       >
-        <el-form-item label="审核结果 :" prop="vertifyState">
+        <el-form-item label="审核结果 :" prop="type">
           <el-select
-            v-model="ruleForm.vertifyState"
+            v-model="ruleForm.type"
             class="m-2"
             placeholder="请选择审核结果"
             style="width: 280px"
@@ -192,7 +192,7 @@
                 充值
               </div>
               <div v-if="scope.row.consumeType == 2">消费</div>
-              <div v-if="scope.row.consumeType == 3">补贴</div>
+              <!-- <div v-if="scope.row.consumeType == 3">补贴</div> -->
               <div style="color: red" v-if="scope.row.consumeType == 4">
                 退款
               </div>
@@ -200,8 +200,14 @@
           </el-table-column>
           <el-table-column align="center" prop="account4" label="交易金额">
           </el-table-column>
-          <el-table-column align="center" prop="account1" label="主余额" />
-          <el-table-column align="center" prop="account2" label="补贴余额" />
+          <!-- <el-table-column align="center" prop="account1" label="主余额" /> -->
+          <!-- <el-table-column align="center" prop="account2" label="补贴余额" /> -->
+          <el-table-column
+            width="100"
+            align="center"
+            prop="createTime"
+            label="订单时间"
+          />
           <el-table-column align="center" prop="account3" label="可用余额" />
           <el-table-column align="center" prop="by_num" label="交通卡类型">
             <template #default="scope">
@@ -212,34 +218,36 @@
           </el-table-column>
           <el-table-column align="center" prop="mobile" label="手机号码" />
           <el-table-column align="center" prop="username" label="用户名" />
-          <el-table-column align="center" prop="car_number" label="审核结果">
+          <!-- <el-table-column align="center" prop="car_number" label="审核结果">
             <template #default="scope">
-              <div v-if="scope.row.vertifyState == 0">待审核</div>
-              <div style="color: #67c23a" v-if="scope.row.vertifyState == 1">
+              <div v-if="scope.row.type == 0">待审核</div>
+              <div style="color: #67c23a" v-if="scope.row.type == 1">
                 通过
               </div>
-              <div style="color: red" v-if="scope.row.vertifyState == 2">
+              <div style="color: red" v-if="scope.row.type == 2">
                 拒绝
               </div>
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip align="center" prop="remark" label="审核理由" />
           <el-table-column
-            width="100"
+            show-overflow-tooltip
             align="center"
-            prop="createTime"
-            label="创建时间"
-          />
-          <el-table-column align="center" label="操作" width="150">
+            prop="remark"
+            label="审核理由"
+          /> -->
+
+          <!-- <el-table-column align="center" label="操作" width="150">
             <template #default="scope">
-              <el-button v-if="scope.row.vertifyState == 0" link type="primary" @click="info(scope.row)">
+              <el-button
+                v-if="scope.row.type == 0"
+                link
+                type="primary"
+                @click="info(scope.row)"
+              >
                 <div class="look">审核</div>
               </el-button>
-              <!-- <el-button link type="danger" @click="del(scope.row)">
-                <div class="del">删除</div>
-              </el-button> -->
             </template>
-          </el-table-column>
+          </el-table-column> -->
         </el-table>
       </div>
       <div class="pagination">
@@ -272,8 +280,8 @@
                 <span style="color: red">{{ sumMoney.recharge }}</span> 元 ;
                 消费汇总:
                 <span style="color: red">{{ sumMoney.consume }}</span> 元 ;
-                补贴汇总:
-                <span style="color: red">{{ sumMoney.allowance }}</span> 元 ;
+                <!-- 补贴汇总:
+                <span style="color: red">{{ sumMoney.allowance }}</span> 元 ; -->
                 退款汇总:
                 <span style="color: red">{{ sumMoney.refund }}</span> 元
               </div>
@@ -306,6 +314,7 @@ const searchInput = reactive({
   consumeType: "", // 消费类型 // 1充值,2消费,3补贴,4退款
   username: "", // 用户名
   orderTime: "", // 订单时间
+  type: "", // 0普通用户,1教师,2贫困生
 });
 
 // 表格数据
@@ -334,12 +343,12 @@ const ruleFormRef = ref();
 
 const ruleForm = reactive({
   id: "",
-  vertifyState: "",
+  type: "",
   remark: "",
 });
 // 表单验证
 const rules = reactive({
-  vertifyState: [
+  type: [
     {
       required: true,
       message: "审核结果不能为空",
@@ -370,17 +379,15 @@ const getList = async () => {
     data.createStart = searchInput.orderTime[0];
     data.createEnd = searchInput.orderTime[1];
   }
-  data.vertifyState = searchInput.vertifyState;
-  if (searchInput.consumeType) {
-    data.consumeType = searchInput.consumeType;
-  }
+  data.type = searchInput.type;
+  data.consumeType = searchInput.consumeType;
   if (searchInput.username) {
     data.username = searchInput.username;
   }
   data.page = currentPage.value;
   data.rows = pageSize.value;
   let res = await axios({
-    method: "post",
+    method: "get",
     url: api.value + "/cardlist.action",
     headers: {
       token: sessionStorage.getItem("token"),
@@ -414,13 +421,8 @@ const getMoney = async () => {
     data.createStart = searchInput.orderTime[0];
     data.createEnd = searchInput.orderTime[1];
   }
-  if (searchInput.type) {
-    data.type = searchInput.type;
-  }
-  data.vertifyState = searchInput.vertifyState;
-  if (searchInput.consumeType) {
-    data.consumeType = searchInput.consumeType;
-  }
+  data.type = searchInput.type;
+  data.consumeType = searchInput.consumeType;
   if (searchInput.username) {
     data.username = searchInput.username;
   }
@@ -435,10 +437,10 @@ const getMoney = async () => {
   console.log(res, "交通卡明细流水");
   if (res.data.code == 200) {
     let s = res.data.data;
-    sumMoney.recharge = s.recharge.money;
-    sumMoney.consume = s.consume.money;
-    sumMoney.allowance = s.allowance.money;
-    sumMoney.refund = s.refund.money;
+    sumMoney.recharge = s.recharge.money.toFixed(2);
+    sumMoney.consume = s.consume.money.toFixed(2);
+    sumMoney.allowance = s.allowance.money.toFixed(2);
+    sumMoney.refund = s.refund.money.toFixed(2);
   } else {
     ElMessage({
       type: "error",
@@ -462,7 +464,7 @@ const search = lodash.debounce(() => {
 const resetInput = lodash.debounce(() => {
   searchInput.orderNum = "";
   searchInput.type = "";
-  searchInput.vertifyState = "";
+  searchInput.type = "";
   searchInput.consumeType = "";
   searchInput.orderTime = "";
   searchInput.username = "";
@@ -479,9 +481,9 @@ const handleSelectionChange = (val) => {
 const info = (row) => {
   console.log(row);
   centerDialogVisible.value = true;
-  ruleForm.vertifyState=""
-  ruleForm.remark=""
-  ruleForm.id=row.id
+  ruleForm.type = "";
+  ruleForm.remark = "";
+  ruleForm.id = row.id;
 };
 const editClose = () => {
   centerDialogVisible.value = false;
@@ -493,7 +495,7 @@ const submitAdd = async (formEl) => {
     if (valid) {
       let data = new FormData();
       data.set("id", ruleForm.id);
-      data.set("vertifyState", ruleForm.vertifyState); //前面的key记得对应！
+      data.set("type", ruleForm.type); //前面的key记得对应！
       data.set("remark", ruleForm.remark);
       let res = await axios({
         method: "post",
@@ -506,6 +508,7 @@ const submitAdd = async (formEl) => {
       // console.log(res, "添加账号");
       if (res.data.code == 200) {
         getList();
+        getMoney();
         ElMessage({
           type: "success",
           showClose: true,
@@ -572,30 +575,26 @@ const del = (row) => {
 
 // 导出按钮
 const downLoad = lodash.debounce(async () => {
-  let data = new FormData();
-  if (searchInput.car_number) {
-    data.set("car_number", searchInput.car_number);
-  }
-  if (searchInput.yy_date) {
-    data.set("yy_date", searchInput.yy_date);
+  let data = {};
+  if (searchInput.orderNum) {
+    data.orderNum = searchInput.orderNum;
   }
-  if (searchInput.createTime) {
-    data.set("startTime", searchInput.createTime[0]);
-    data.set("endTime", searchInput.createTime[1]);
+  if (searchInput.orderTime) {
+    data.createStart = searchInput.orderTime[0];
+    data.createEnd = searchInput.orderTime[1];
   }
-  if (searchInput.route) {
-    data.set("route", searchInput.route);
+  data.type = searchInput.type;
+  data.consumeType = searchInput.consumeType;
+  if (searchInput.username) {
+    data.username = searchInput.username;
   }
-  data.set("mobile", searchInput.mobile);
-  data.set("state", searchInput.state);
-  // data.set("yy_date", searchInput.yy_date);
   let res = await axios({
-    method: "post",
-    url: api.value + "/carBook/brectoExcel.action",
+    method: "get",
+    url: api.value + "/cardtoExcel.action",
     headers: {
       token: sessionStorage.getItem("token"),
     },
-    data: data,
+    params: data,
   });
   console.log(res);
   if (res.data.code == 200) {
@@ -608,6 +607,7 @@ const downLoad = lodash.debounce(async () => {
     // elt.style.display = "none";
     // document.body.appendChild(elt);
     // elt.click();
+
     var downloadPath =
       "https://car.meiyishuoo.com/ride-sharing" + res.data.downurl;
     console.log("获得地址数据:", downloadPath);

src/views/busManagement/busManagement.vue

@@ -57,7 +57,7 @@
           ><el-icon> <Refresh /> </el-icon><span>重置</span></el-button
         >
       </div>
-      <div class="gongneng">
+      <!-- <div class="gongneng">
         <el-button
           color="rgba(61, 81, 232, 1)"
           class="import"
@@ -66,7 +66,7 @@
         >
           一键发放补助</el-button
         >
-      </div>
+      </div> -->
     </div>
 
     <el-dialog
@@ -121,7 +121,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="主余额 :" prop="account1">
+        <!-- <el-form-item label="充值余额 :" prop="account1">
           <el-input
             v-model="ruleForm.account1"
             placeholder="请输入主余额"
@@ -136,11 +136,11 @@
             clearable
             style="width: 280px"
           />
-        </el-form-item>
-        <el-form-item label="可用余额 :" prop="account3">
+        </el-form-item> -->
+        <el-form-item label="余额 :" prop="account1">
           <el-input
-            v-model="ruleForm.account3"
-            placeholder="请输入可用余额"
+            v-model="ruleForm.account1"
+            placeholder="请输入余额"
             clearable
             style="width: 280px"
           />
@@ -240,9 +240,9 @@
               <div v-if="scope.row.type == 2">暖心卡</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="account1" label="主余额" />
-          <el-table-column align="center" prop="account2" label="补贴余额" />
-          <el-table-column align="center" prop="account3" label="可用余额" />
+          <!-- <el-table-column align="center" prop="account1" label="充值余额" />
+          <el-table-column align="center" prop="account2" label="补贴余额" /> -->
+          <el-table-column align="center" prop="account1" label="余额" />
           <el-table-column align="center" label="操作" width="150">
             <template #default="scope">
               <el-button link type="primary" @click="info(scope.row)">
@@ -280,11 +280,11 @@
               <div
                 style="display: inline-block; width: 600px; margin-left: 20px"
               >
-                主余额汇总:
+                <!-- 主余额汇总:
                 <span style="color: red">{{ sumMoney.mainBalance }}</span>
                 元 ; 补贴余额汇总:
-                <span style="color: red">{{ sumMoney.allowanceBalance }}</span> 元 ;
-                可用余额汇总:
+                <span style="color: red">{{ sumMoney.allowanceBalance }}</span> 元 ; -->
+                余额汇总:
                 <span style="color: red">{{ sumMoney.freeBalance }}</span> 元
               </div>
             </div>
@@ -341,7 +341,7 @@ const ruleForm = reactive({
   username: "",
   mobile: "",
   type: "",
-  account1: "", // 主余额
+  account1: "", // 充值余额
   account2: "", // 补贴余额
   account3: "", // 可用余额
   id: "",
@@ -372,8 +372,8 @@ const rules = reactive({
   account1: [
     {
       required: true,
-      message: "主余额不能为空",
-      trigger: "change",
+      message: "余额不能为空",
+      trigger: "blur",
     },
     {
       pattern: /^(0|([1-9]\d*)(\.\d{1,2})?)$|^(0\.\d{1,2})$/,
@@ -491,9 +491,9 @@ const getMoney = async (message) => {
   console.log(res, "交通卡余额");
   if (res.data.code == 200) {
     let s = res.data.data;
-    sumMoney.allowanceBalance = s.allowanceBalance.money;
-    sumMoney.freeBalance = s.freeBalance.money;
-    sumMoney.mainBalance = s.mainBalance.money;
+    sumMoney.allowanceBalance = s.allowanceBalance.money.toFixed(2);
+    sumMoney.freeBalance = s.freeBalance.money.toFixed(2);
+    sumMoney.mainBalance = s.mainBalance.money.toFixed(2);
   } else {
     ElMessage({
       type: "error",
@@ -535,8 +535,8 @@ const info = (row) => {
   ruleForm.mobile = row.mobile;
   ruleForm.type = row.type;
   ruleForm.account1 = row.account1;
-  ruleForm.account2 = row.account2;
-  ruleForm.account3 = row.account3;
+  // ruleForm.account2 = row.account2;
+  // ruleForm.account3 = row.account3;
   ruleForm.id = row.id;
 };
 
@@ -551,8 +551,8 @@ const submitAdd = async (formEl) => {
       let data = {
         id: ruleForm.id,
         account1: ruleForm.account1,
-        account2: ruleForm.account2,
-        account3: ruleForm.account3,
+        // account2: ruleForm.account2,
+        // account3: ruleForm.account3,
       };
       let res = await axios({
         method: "post",
@@ -565,6 +565,7 @@ const submitAdd = async (formEl) => {
       // console.log(res, "添加账号");
       if (res.data.code == 200) {
         getList();
+        getMoney()
         ElMessage({
           type: "success",
           showClose: true,

src/views/busSet/busSet.vue

@@ -14,7 +14,7 @@
             <div class="cardRules">
               <span>优行卡规则内容 : </span>
               <div class="upload">
-                <div class="img">
+                <div class="img" v-viewer>
                   <img
                     style="
                       object-fit: cover;
@@ -42,7 +42,7 @@
             <div class="cardRules">
               <span>教师卡规则内容 : </span>
               <div class="upload">
-                <div class="img">
+                <div class="img" v-viewer>
                   <img
                     style="
                       object-fit: cover;
@@ -70,7 +70,7 @@
             <div class="cardRules">
               <span>暖心卡规则内容 : </span>
               <div class="upload">
-                <div class="img">
+                <div class="img" v-viewer>
                   <img
                     style="
                       object-fit: cover;
@@ -102,7 +102,7 @@
             </el-dialog> -->
           </div>
         </div>
-        <div class="condition">
+        <!-- <div class="condition">
           <h3>补贴余额释放配置</h3>
           <div>
             <span>用户使用电子交通卡支付金额</span>
@@ -157,9 +157,7 @@
             />
             <span>&nbsp;&nbsp;元票价 【注：从补贴余额中扣除，减完为止】</span>
           </div>
-        </div>
-      </div>
-      <div class="filters">
+        </div> -->
         <div class="condition">
           <div style="display: flex; align-items: center">
             <h3>充值套餐配置</h3>
@@ -169,7 +167,7 @@
               @click="addRecharge"
               style="margin-left: 20px"
             >
-              <span style="color: #fff; font-size: 16px">新增</span>
+              <span style="color: #fff; font-size: 16px; margin: 0">新增</span>
             </el-button>
           </div>
           <div class="footer">
@@ -190,11 +188,11 @@
                 prop="account3"
                 label="充值金额"
               />
-              <el-table-column
+              <!-- <el-table-column
                 align="center"
                 prop="account4"
                 label="补贴金额"
-              />
+              /> -->
               <el-table-column
                 align="center"
                 show-overflow-tooltip
@@ -218,6 +216,9 @@
           </div>
         </div>
       </div>
+      <!-- <div class="filters">
+        
+      </div> -->
       <el-dialog
         class="addStaff"
         v-model="addDialogVisible"
@@ -252,13 +253,13 @@
               placeholder="请输入充值金额"
             />
           </el-form-item>
-          <el-form-item label="补贴金额 :" prop="account4">
+          <!-- <el-form-item label="补贴金额 :" prop="account4">
             <el-input
               clearable
               v-model="rechargeForm.account4"
               placeholder="请输入补贴金额"
             />
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="套餐描述 :" prop="remark">
             <el-input
               clearable
@@ -322,12 +323,12 @@ const ruleForm = reactive({
   teacherPrice: "", // 教师支付金额
   commonPrice: "", // 正常金额
   poorReduce: "", // 贫困生立减金额
-  refundRule:"",
+  refundRule: "",
   id: "",
 });
-const dataList=reactive({
+const dataList = reactive({
   list: [],
-})
+});
 
 const getTimeList = async () => {
   let res = await axios({
@@ -347,7 +348,7 @@ const getTimeList = async () => {
     ruleForm.teacherPrice = resData.teacherPrice;
     ruleForm.commonPrice = resData.commonPrice;
     ruleForm.poorReduce = resData.poorReduce;
-    ruleForm.refundRule=resData.refundRule;
+    ruleForm.refundRule = resData.refundRule;
     ruleForm.id = resData.id;
   } else {
     ElMessage({
@@ -436,7 +437,7 @@ const pictureImportChange = async (file, fileLists) => {
   console.log(res, "导入照片");
   if (res.data.code == 200) {
     ruleForm.img = res.data.data.url;
-    getImg()
+    getImg();
     ElMessage({
       type: "success",
       showClose: true,
@@ -472,7 +473,7 @@ const pictureImportChange2 = async (file, fileLists) => {
   console.log(res, "导入照片");
   if (res.data.code == 200) {
     ruleForm.img2 = res.data.data.url;
-    getImg()
+    getImg();
     ElMessage({
       type: "success",
       showClose: true,
@@ -508,7 +509,7 @@ const pictureImportChange3 = async (file, fileLists) => {
   console.log(res, "导入照片");
   if (res.data.code == 200) {
     ruleForm.img3 = res.data.data.url;
-    getImg()
+    getImg();
     ElMessage({
       type: "success",
       showClose: true,
@@ -633,7 +634,7 @@ const submitAdd = async (formEl) => {
         let data = {
           name: rechargeForm.name,
           account3: rechargeForm.account3, // 充值金额
-          account4: rechargeForm.account4, // 补贴金额
+          account4: 0, // 补贴金额
           remark: rechargeForm.remark,
         };
         // let res = await admin.adminAdd(data);
@@ -669,7 +670,7 @@ const submitAdd = async (formEl) => {
         let data = {
           name: rechargeForm.name,
           account3: rechargeForm.account3, // 充值金额
-          account4: rechargeForm.account4, // 补贴金额
+          account4: 0, // 补贴金额
           remark: rechargeForm.remark,
           id: rechargeForm.id,
         };
@@ -771,12 +772,12 @@ const timeVerify = (val) => {
 };
 
 const timeUpdata = async () => {
-  dataList.list.toPay= Number(ruleForm.toPay) // 支付满多少金额
-  dataList.list.toRelease= Number(ruleForm.toRelease) // 补贴释放多少金额
-  dataList.list.teacherPrice= Number(ruleForm.teacherPrice) // 教师支付金额
-  dataList.list.commonPrice= Number(ruleForm.commonPrice) // 正常金额
-  dataList.list.poorReduce= Number(ruleForm.poorReduce) // 贫困生立减金额, // 贫困生立减金额
-dataList.list.refundRule= JSON.stringify(ruleForm.refundRule)
+  dataList.list.toPay = Number(ruleForm.toPay); // 支付满多少金额
+  dataList.list.toRelease = Number(ruleForm.toRelease); // 补贴释放多少金额
+  dataList.list.teacherPrice = Number(ruleForm.teacherPrice); // 教师支付金额
+  dataList.list.commonPrice = Number(ruleForm.commonPrice); // 正常金额
+  dataList.list.poorReduce = Number(ruleForm.poorReduce); // 贫困生立减金额, // 贫困生立减金额
+  dataList.list.refundRule = JSON.stringify(ruleForm.refundRule);
   // let data = {
   //   toPay: Number(ruleForm.toPay), // 支付满多少金额
   //   toRelease: Number(ruleForm.toRelease), // 补贴释放多少金额
@@ -820,7 +821,7 @@ dataList.list.refundRule= JSON.stringify(ruleForm.refundRule)
 onBeforeMount(() => {
   api.value = store.state.user.api;
   getList();
-  getTimeList();
+  // getTimeList();
   getImg();
 });
 onUnmounted(() => {});
@@ -862,7 +863,7 @@ onUnmounted(() => {});
 
     // border-bottom: 1px solid rgb(231, 231, 231);
     .filter {
-      width: 50%;
+      width: 100%;
       height: 100%;
       display: flex;
       // flex-wrap: wrap;
@@ -895,10 +896,10 @@ onUnmounted(() => {});
         }
       }
     }
-    .filters {
-      width: 50%;
-      height: 100%;
-    }
+    // .filters {
+    //   width: 50%;
+    //   height: 100%;
+    // }
     .gongneng {
       margin: 10px 0;
     }
@@ -1008,8 +1009,8 @@ onUnmounted(() => {});
       align-items: center;
       justify-content: center;
       .img {
-        width: 128px;
-        height: 128px;
+        width: 132px;
+        height: 132px;
         border: 1px dotted #ccc;
       }
       .el-button {

src/views/refund/refund.vue

@@ -198,9 +198,9 @@
               <div v-if="scope.row.type == 2">暖心卡</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="account1" label="主余额" />
-          <el-table-column align="center" prop="account2" label="补贴余额" />
-          <el-table-column align="center" prop="account3" label="可用余额" />
+          <!-- <el-table-column align="center" prop="account1" label="主余额" />
+          <el-table-column align="center" prop="account2" label="补贴余额" /> -->
+          <el-table-column align="center" prop="account3" label="余额" />
           <el-table-column
             align="center"
             prop="createTime"