diff --git a/vue/gold-system/src/views/recharge/addRecharge.vue b/vue/gold-system/src/views/recharge/addRecharge.vue
index 311b636..c827f00 100644
--- a/vue/gold-system/src/views/recharge/addRecharge.vue
+++ b/vue/gold-system/src/views/recharge/addRecharge.vue
@@ -635,6 +635,7 @@ const handleBatchAvatarSuccess = (response, uploadFile) => {
 //批量充值确认按钮
 const batchAdd = async function () {
   console.log("batchData===", batchData.value);
+  let msg = '';
   if (batchData.value.length == 0) {
     ElMessage({
       type: "error",
@@ -648,24 +649,40 @@ const batchAdd = async function () {
     batchData.value[i].rechargeWay = "客服充值";
     if (
       batchData.value[i].jwcode == "" ||
-      batchData.value[i].jwcode == null ||
+      batchData.value[i].jwcode == null) {
+      msg += `精网号不能为空！ <br/>`;
+    }
+    if (
       batchData.value[i].activityId == "" ||
-      batchData.value[i].activityId == null ||
+      batchData.value[i].activityId == null) {
+      msg += `活动不能为空！ <br/>`;
+    }
+    if (
       batchData.value[i].paidGold == "" ||
-      batchData.value[i].paidGold == null ||
+      batchData.value[i].paidGold == null) {
+      msg += `充值金币不能为空！ <br/>`;
+    }
+    if (
       batchData.value[i].rechargeGold == "" ||
-      batchData.value[i].rechargeGold == null ||
+      batchData.value[i].rechargeGold == null) {
+      msg += `充值金额不能为空！ <br/>`;
+    }
+    if (
       batchData.value[i].payWay == "" ||
-      batchData.value[i].payWay == null ||
+      batchData.value[i].payWay == null) {
+      msg += `收款方式不能为空！ <br/>`;
+    }
+    if (
       batchData.value[i].rechargeTime == "" ||
-      batchData.value[i].rechargeTime == null
-    ) {
-      ElMessage({
-        type: "error",
-        message: "信息不能为空！请检查输入内容！",
-      });
-      return;
+      batchData.value[i].rechargeTime == null) {
+      msg += `交款时间不能为空！ <br/>`;
     }
+    ElMessage({
+      dangerouslyUseHTMLString: true,
+      type: "error",
+      message: msg,
+    });
+    return;
   }
   console.log("batchData===", batchData.value);
 
@@ -803,36 +820,14 @@ onMounted(async function () {
     <el-button type="primary" plain @click="batchInit()">批量充值</el-button>
   </div>
 
-  <el-form
-    :model="addRecharge"
-    ref="Ref"
-    :rules="rules"
-    label-width="auto"
-    style="max-width: 600px"
-    class="add-form"
-  >
+  <el-form :model="addRecharge" ref="Ref" :rules="rules" label-width="auto" style="max-width: 600px" class="add-form">
     <el-form-item prop="jwcode" label="精网号">
       <el-input v-model="addRecharge.jwcode" style="width: 220px" />
-      <el-button
-        type="primary"
-        @click="getUser(addRecharge.jwcode)"
-        style="margin-left: 20px"
-        >查询</el-button
-      >
+      <el-button type="primary" @click="getUser(addRecharge.jwcode)" style="margin-left: 20px">查询</el-button>
     </el-form-item>
     <el-form-item prop="activityId" label="活动名称">
-      <el-select
-        v-model="addRecharge.activityId"
-        placeholder="请选择"
-        style="width: 300px"
-        @change="handleActivityChange"
-      >
-        <el-option
-          v-for="item in activity"
-          :key="item.value"
-          :label="item.activityName"
-          :value="item.activityId"
-        />
+      <el-select v-model="addRecharge.activityId" placeholder="请选择" style="width: 300px" @change="handleActivityChange">
+        <el-option v-for="item in activity" :key="item.value" :label="item.activityName" :value="item.activityId" />
       </el-select>
     </el-form-item>
     <el-form-item prop="paidGold" label="充值金币">
@@ -843,66 +838,24 @@ onMounted(async function () {
       <p>个</p>
     </el-form-item>
     <el-form-item prop="rechargeGold" label="充值金额">
-      <el-select
-        prop="rechargeGold"
-        v-model="Rate"
-        placeholder="货币名称"
-        style="width: 95px; margin-right: 5px"
-      >
-        <el-option
-          v-for="item in currency"
-          :key="item.value"
-          :label="item.currency"
-          :value="item.exchangeRate"
-        />
+      <el-select prop="rechargeGold" v-model="Rate" placeholder="货币名称" style="width: 95px; margin-right: 5px">
+        <el-option v-for="item in currency" :key="item.value" :label="item.currency" :value="item.exchangeRate" />
       </el-select>
       <el-input v-model="addRecharge.rechargeGold" style="width: 200px" />
     </el-form-item>
     <el-form-item prop="payWay" label="收款方式">
-      <el-select
-        v-model="addRecharge.payWay"
-        placeholder="请选择"
-        style="width: 300px"
-      >
-        <el-option
-          v-for="item in options"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        />
+      <el-select v-model="addRecharge.payWay" placeholder="请选择" style="width: 300px">
+        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
       </el-select>
     </el-form-item>
     <el-form-item prop="rechargeTime" label="交款时间">
-      <el-date-picker
-        v-model="addRecharge.rechargeTime"
-        type="date"
-        style="width: 300px"
-      />
+      <el-date-picker v-model="addRecharge.rechargeTime" type="date" style="width: 300px" />
     </el-form-item>
-    <el-form-item
-      prop="rechargeVoucher"
-      label="交款凭证"
-      style="margin-bottom: 5px"
-    >
-      <el-upload
-        action="http://192.168.8.93:10010/upload"
-        class="avatar-uploader"
-        :show-file-list="false"
-        :on-success="handleAvatarSuccess"
-        :before-upload="beforeAvatarUpload"
-        style="width: 100px; height: 115px"
-      >
-        <img
-          v-if="imageUrl"
-          :src="imageUrl"
-          class="avatar"
-          style="width: 100px; height: 115px"
-        />
-        <el-icon
-          v-else
-          class="avatar-uploader-icon"
-          style="width: 100px; height: 100px"
-        >
+    <el-form-item prop="rechargeVoucher" label="交款凭证" style="margin-bottom: 5px">
+      <el-upload action="http://192.168.8.93:10010/upload" class="avatar-uploader" :show-file-list="false"
+        :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload" style="width: 100px; height: 115px">
+        <img v-if="imageUrl" :src="imageUrl" class="avatar" style="width: 100px; height: 115px" />
+        <el-icon v-else class="avatar-uploader-icon" style="width: 100px; height: 100px">
           <Plus />
         </el-icon>
       </el-upload>
@@ -911,41 +864,19 @@ onMounted(async function () {
       </p>
     </el-form-item>
     <el-form-item prop="remark" label="备注">
-      <el-input
-        v-model="addRecharge.remark"
-        style="width: 300px"
-        :rows="2"
-        maxlength="100"
-        show-word-limit
-        type="textarea"
-      />
+      <el-input v-model="addRecharge.remark" style="width: 300px" :rows="2" maxlength="100" show-word-limit
+        type="textarea" />
     </el-form-item>
     <el-form-item prop="submitter" label="提交人">
-      <el-input
-        style="width: 300px"
-        :value="adminData.name"
-        disabled
-        placeholder="提交人姓名"
-      />
+      <el-input style="width: 300px" :value="adminData.name" disabled placeholder="提交人姓名" />
     </el-form-item>
-    <el-button @click="deleteRecharge" style="margin-left: 280px"
-      >重置</el-button
-    >
+    <el-button @click="deleteRecharge" style="margin-left: 280px">重置</el-button>
     <el-button type="primary" @click="addBefore"> 提交 </el-button>
   </el-form>
 
   <!-- 客户信息栏 -->
-  <el-card
-    style="width: 1200px; float: right"
-    class="customer-info"
-    width="3000px"
-  >
-    <el-form
-      :model="user"
-      label-width="auto"
-      style="max-width: 1200px"
-      label-position="left"
-    >
+  <el-card style="width: 1200px; float: right" class="customer-info" width="3000px">
+    <el-form :model="user" label-width="auto" style="max-width: 1200px" label-position="left">
       <el-text size="large" style="margin-left: 20px">客户信息</el-text>
       <el-row style="margin-top: 20px">
         <el-col :span="10">
@@ -968,13 +899,10 @@ onMounted(async function () {
             <span style="color: #2fa1ff; margin-right: 5px" v-if="user.buyJb">{{
               user.buyJb + user.free6 + user.free12 + user.coreJb
             }}</span>
-            <span
-              style="display: inline; white-space: nowrap; color: #b1b1b1"
-              v-if="user.buyJb"
-              >(充值金币:{{ user.buyJb }};免费金币:{{
+            <span style="display: inline; white-space: nowrap; color: #b1b1b1" v-if="user.buyJb">(充值金币:{{ user.buyJb
+              }};免费金币:{{
                 user.free6 + user.free12
-              }};任务金币:{{ user.coreJb }})</span
-            >
+              }};任务金币:{{ user.coreJb }})</span>
           </el-form-item>
         </el-col>
         <el-col :span="10">
@@ -1015,50 +943,26 @@ onMounted(async function () {
     </el-form>
   </el-card>
 
-  <el-dialog
-    v-model="batchRechargeVisible"
-    title="批量充值"
-    width="1800px"
-    style="height: 700px"
-    :close-on-click-modal="false"
-  >
+  <el-dialog v-model="batchRechargeVisible" title="批量充值" width="1800px" style="height: 700px"
+    :close-on-click-modal="false">
     <el-row style="margin-bottom: 10px">
       <!-- <el-button type="primary" @click="addLine()" style="margin-right: 10px">新增一行</el-button> -->
       <div style="font-weight: bold; font-size: 20px">
         <span>添加</span>
         <el-input style="width: 60px" v-model="addLineObj"></el-input>
         <span>行</span>
-        <el-button type="primary" @click="addLines()" style="margin-right: 10px"
-          >添加</el-button
-        >
+        <el-button type="primary" @click="addLines()" style="margin-right: 10px">添加</el-button>
       </div>
-      <el-button
-        type="warning"
-        @click="batchSettingInit()"
-        style="margin-right: 10px"
-        >批量设置</el-button
-      >
+      <el-button type="warning" @click="batchSettingInit()" style="margin-right: 10px">批量设置</el-button>
       <!-- <el-upload :ref="(el) => handleSetUploadRefMap(el)" action="" :http-request="httpExcelRequest" :limit="1" :show-file-list="false"
         class="uploadExcelContent" :data={} style="margin-right: auto">
         <el-button type="success" >导入jwcode</el-button>
       </el-upload> -->
-      <el-button
-        type="danger"
-        plain
-        @click="batchDel()"
-        style="margin-right: 10px; width: 130px"
-        >批量删除</el-button
-      >
+      <el-button type="danger" plain @click="batchDel()" style="margin-right: 10px; width: 130px">批量删除</el-button>
     </el-row>
     <el-row>
-      <el-table
-        v-loading="loading"
-        :data="batchData"
-        border
-        max-height="540px"
-        style="height: 540px"
-        @selection-change="handleSelectionChangebatch"
-      >
+      <el-table v-loading="loading" :data="batchData" border max-height="540px" style="height: 540px"
+        @selection-change="handleSelectionChangebatch">
         <el-table-column type="selection" width="50px" />
         <el-table-column property="index" label="序号" width="55px">
           <template #default="scope">
@@ -1079,20 +983,10 @@ onMounted(async function () {
         </el-table-column>
         <el-table-column property="activityName" label="活动名称" width="150px">
           <template #default="scope">
-            <el-select
-              v-if="scope.row.showInput"
-              filterable
-              clearable
-              v-model="scope.row.activityId"
-              placeholder="请选择活动名称"
-              @change="changeActivity(scope.row)"
-            >
-              <el-option
-                v-for="item in activity"
-                :key="item.activityId"
-                :label="item.activityName"
-                :value="item.activityId"
-              >
+            <el-select v-if="scope.row.showInput" filterable clearable v-model="scope.row.activityId"
+              placeholder="请选择活动名称" @change="changeActivity(scope.row)">
+              <el-option v-for="item in activity" :key="item.activityId" :label="item.activityName"
+                :value="item.activityId">
               </el-option>
             </el-select>
             <span v-else>{{ scope.row.activityName }}</span>
@@ -1100,41 +994,23 @@ onMounted(async function () {
         </el-table-column>
         <el-table-column property="paidGold" label="充值金币" width="110px">
           <template #default="scope">
-            <el-input
-              v-if="scope.row.showInput"
-              v-model="scope.row.paidGold"
-              style="width: 70px"
-              @change="changePaidGold(scope.row)"
-            />
+            <el-input v-if="scope.row.showInput" v-model="scope.row.paidGold" style="width: 70px"
+              @change="changePaidGold(scope.row)" />
             <span v-else>{{ scope.row.paidGold }}</span>
           </template>
         </el-table-column>
         <el-table-column property="freeGold" label="免费金币" width="110px">
           <template #default="scope">
-            <el-input
-              v-if="scope.row.showInput"
-              v-model="scope.row.freeGold"
-              style="width: 70px"
-            />
+            <el-input v-if="scope.row.showInput" v-model="scope.row.freeGold" style="width: 70px" />
             <span v-else>{{ scope.row.paidGold }}</span>
           </template>
         </el-table-column>
         <el-table-column property="rate" label="货币名称">
           <template #default="scope">
-            <el-select
-              v-if="scope.row.showInput"
-              filterable
-              clearable
-              v-model="scope.row.rate"
-              placeholder="请选择币种"
-              @change="changeRate(scope.row)"
-            >
-              <el-option
-                v-for="item in currency"
-                :key="item.exchangeRate"
-                :label="item.currency"
-                :value="item.exchangeRate"
-              >
+            <el-select v-if="scope.row.showInput" filterable clearable v-model="scope.row.rate" placeholder="请选择币种"
+              @change="changeRate(scope.row)">
+              <el-option v-for="item in currency" :key="item.exchangeRate" :label="item.currency"
+                :value="item.exchangeRate">
               </el-option>
             </el-select>
             <span v-else>{{ scope.row.rate }}</span>
@@ -1147,19 +1023,8 @@ onMounted(async function () {
         </el-table-column>
         <el-table-column property="payWay" label="收款方式" width="130px">
           <template #default="scope">
-            <el-select
-              v-if="scope.row.showInput"
-              filterable
-              clearable
-              v-model="scope.row.payWay"
-              placeholder="请选择收款方式"
-            >
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+            <el-select v-if="scope.row.showInput" filterable clearable v-model="scope.row.payWay" placeholder="请选择收款方式">
+              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
             <span v-else>{{ scope.row.payWay }}</span>
@@ -1167,13 +1032,8 @@ onMounted(async function () {
         </el-table-column>
         <el-table-column property="rechargeTime" label="交款时间" width="150px">
           <template #default="scope">
-            <el-date-picker
-              v-if="scope.row.showInput"
-              type="date"
-              v-model="scope.row.rechargeTime"
-              style="width: 120px"
-              placeholder="请选择交款时间"
-            >
+            <el-date-picker v-if="scope.row.showInput" type="date" v-model="scope.row.rechargeTime" style="width: 120px"
+              placeholder="请选择交款时间">
             </el-date-picker>
             <span v-else>{{
               moment(scope.row.rechargeTime).format("YYYY-MM-DD HH:mm:ss")
@@ -1182,19 +1042,9 @@ onMounted(async function () {
         </el-table-column>
         <el-table-column property="rechargeVoucher" label="充值凭证">
           <template #default="scope">
-            <el-upload
-              action="http://192.168.8.93:10010/upload"
-              class="avatar-uploader"
-              :show-file-list="false"
-              :on-success="handleBatchAvatarSuccess"
-              v-if="scope.row.showInput"
-              @change="changeVoucher(scope.row)"
-            >
-              <img
-                v-if="scope.row.imageUrl"
-                :src="scope.row.imageUrl"
-                class="avatar"
-              />
+            <el-upload action="http://192.168.8.93:10010/upload" class="avatar-uploader" :show-file-list="false"
+              :on-success="handleBatchAvatarSuccess" v-if="scope.row.showInput" @change="changeVoucher(scope.row)">
+              <img v-if="scope.row.imageUrl" :src="scope.row.imageUrl" class="avatar" />
               <el-icon v-else class="avatar-uploader-icon">
                 <Plus />
               </el-icon>
@@ -1204,32 +1054,18 @@ onMounted(async function () {
         </el-table-column>
         <el-table-column property="remark" label="备注" width="130px">
           <template #default="scope">
-            <el-input
-              type="textarea"
-              v-if="scope.row.showInput"
-              v-model="scope.row.remark"
-              style="max-width: 90px"
-              :rows="1"
-              cols="12"
-            ></el-input>
+            <el-input type="textarea" v-if="scope.row.showInput" v-model="scope.row.remark" style="max-width: 90px"
+              :rows="1" cols="12"></el-input>
             <span v-else>{{ scope.row.remark }}</span>
           </template>
         </el-table-column>
         <el-table-column property="submitter" label="提交人">
           <el-input :value="adminData.name" disabled />
         </el-table-column>
-        <el-table-column
-          fixed="right"
-          prop="operation"
-          label="操作"
-          width="150px"
-        >
+        <el-table-column fixed="right" prop="operation" label="操作" width="150px">
           <template #default="scope">
             <div style="display: flex">
-              <el-popconfirm
-                title="确定将此条信息删除吗？"
-                @confirm="delConfirm"
-              >
+              <el-popconfirm title="确定将此条信息删除吗？" @confirm="delConfirm">
                 <template #reference>
                   <el-button type="danger" text @click="del(scope.row)">
                     删除
@@ -1242,10 +1078,7 @@ onMounted(async function () {
                   </el-button>
                 </template>
               </el-popconfirm>
-              <el-popconfirm
-                title="确定将此条信息重置吗？"
-                @confirm="resetConfirm"
-              >
+              <el-popconfirm title="确定将此条信息重置吗？" @confirm="resetConfirm">
                 <template #reference>
                   <el-button type="primary" text @click="reset(scope.row)">
                     重置
@@ -1271,114 +1104,55 @@ onMounted(async function () {
     </el-row>
   </el-dialog>
 
-  <el-dialog
-    v-model="batchSettingVisible"
-    title="批量设置"
-    :close-on-click-modal="false"
-    style="width: 550px"
-  >
+  <el-dialog v-model="batchSettingVisible" title="批量设置" :close-on-click-modal="false" style="width: 550px">
     <el-form label-position="left" label-width="auto">
       <el-form-item label="活动名称">
-        <el-select
-          v-model="batchSettingObj.activityId"
-          placeholder="请选择活动名称"
-          clearable
-        >
-          <el-option
-            v-for="item in activity"
-            :key="item.activityId"
-            :label="item.activityName"
-            :value="item.activityId"
-          >
+        <el-select v-model="batchSettingObj.activityId" placeholder="请选择活动名称" clearable>
+          <el-option v-for="item in activity" :key="item.activityId" :label="item.activityName"
+            :value="item.activityId">
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="充值金币">
-        <el-input
-          v-model="batchSettingObj.paidGold"
-          placeholder="请输入充值金币"
-        ></el-input>
+        <el-input v-model="batchSettingObj.paidGold" placeholder="请输入充值金币"></el-input>
       </el-form-item>
       <el-form-item label="免费金币">
         <el-input v-model="batchSettingObj.freeGold"></el-input>
       </el-form-item>
       <el-form-item label="充值金额">
         <div style="display: flex">
-          <el-select
-            v-model="batchSettingObj.rate"
-            placeholder="请选择币种"
-            style="width: 120px; margin-right: 10px"
-            clearable
-          >
-            <el-option
-              v-for="item in currency"
-              :key="item.exchangeRate"
-              :label="item.currency"
-              :value="item.exchangeRate"
-            ></el-option>
+          <el-select v-model="batchSettingObj.rate" placeholder="请选择币种" style="width: 120px; margin-right: 10px"
+            clearable>
+            <el-option v-for="item in currency" :key="item.exchangeRate" :label="item.currency"
+              :value="item.exchangeRate"></el-option>
           </el-select>
-          <el-input
-            v-model="batchSettingObj.rechargeGold"
-            placeholder="请输入充值金额"
-          ></el-input>
+          <el-input v-model="batchSettingObj.rechargeGold" placeholder="请输入充值金额"></el-input>
         </div>
       </el-form-item>
       <el-form-item prop="payWay" label="收款方式">
-        <el-select
-          v-model="batchSettingObj.payWay"
-          placeholder="请选择收款方式"
-          clearable
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          ></el-option>
+        <el-select v-model="batchSettingObj.payWay" placeholder="请选择收款方式" clearable>
+          <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item prop="rechargeTime" label="交款时间">
-        <el-date-picker
-          v-model="batchSettingObj.rechargeTime"
-          type="date"
-          placeholder="请选择交款时间"
-        ></el-date-picker>
+        <el-date-picker v-model="batchSettingObj.rechargeTime" type="date" placeholder="请选择交款时间"></el-date-picker>
       </el-form-item>
       <el-form-item prop="rechargeVoucher" label="交款凭证">
-        <el-upload
-          action="http://192.168.8.93:10010/upload"
-          class="avatar-uploader"
-          :show-file-list="false"
-          :on-success="batchSettingHandleAvatarSuccess"
-          :before-upload="beforeAvatarUpload"
-          style="width: 100px; height: 115px"
-        >
-          <img
-            v-if="batchSettingObj.imageUrl"
-            :src="batchSettingObj.imageUrl"
-            class="avatar"
-            style="width: 100px; height: 115px"
-          />
-          <el-icon
-            v-else
-            class="avatar-uploader-icon"
-            style="width: 100px; height: 100px"
-          >
+        <el-upload action="http://192.168.8.93:10010/upload" class="avatar-uploader" :show-file-list="false"
+          :on-success="batchSettingHandleAvatarSuccess" :before-upload="beforeAvatarUpload"
+          style="width: 100px; height: 115px">
+          <img v-if="batchSettingObj.imageUrl" :src="batchSettingObj.imageUrl" class="avatar"
+            style="width: 100px; height: 115px" />
+          <el-icon v-else class="avatar-uploader-icon" style="width: 100px; height: 100px">
             <Plus />
           </el-icon>
         </el-upload>
       </el-form-item>
       <el-form-item prop="remark" label="备注">
-        <el-input
-          type="textarea"
-          v-model="batchSettingObj.remark"
-          placeholder="请输入备注"
-        />
+        <el-input type="textarea" v-model="batchSettingObj.remark" placeholder="请输入备注" />
       </el-form-item>
     </el-form>
-    <el-button @click="cancelBatchSetting()" style="margin-left: 370px"
-      >取消</el-button
-    >
+    <el-button @click="cancelBatchSetting()" style="margin-left: 370px">取消</el-button>
     <el-button type="primary" @click="batchSettingConfirm()"> 确认 </el-button>
   </el-dialog>
 </template>