Merge branch 'master' of http://39.101.133.168:8807/donghaolin/gold-system

vue/gold-system/src/views/consume/addConsume.vue

@@ -192,12 +192,11 @@ const getUserGold = async function (jwcode) {
     userGold.value = result.data[0];
     if (result.data.code === 0) {
       ElMessage.error("查询失败，请检查精网号是否正确");
-    } else {
-      ElMessage.success("查询成功");
     }
   } catch (error) {
     console.log("请求失败", error);
-    ElMessage.error("查询失败，请检查精网号是否正确");
+    ElMessage.error("无此精网号");
+    addConsume.value.jwcode = "";
     // 在这里可以处理错误逻辑，比如显示错误提示等
   }
 };
@@ -352,7 +351,7 @@ function calculateCoins() {
     <el-form
       :model="user"
       label-width="auto"
-      style="max-width: 1000px"
+      style="max-width: 1200px"
       label-position="left"
     >
       <el-text size="large" style="margin-left: 20px">客户信息</el-text>
@@ -468,6 +467,11 @@ p {
   float: left;
 }
 .form-style2 {
-  max-width: 50%;
+  max-width: 60%;
+}
+
+p {
+  font-size: 13px;
+  transform: scale(1);
 }
 </style>

vue/gold-system/src/views/managerecharge/activity.vue

@@ -108,7 +108,7 @@ const openAddActivityVisible = function () {
   addActivityVisible.value = true;
 };
 //关闭新增窗口弹出框
-const closeAddActivityVisible = function () {
+const closeAddActivityVisible = function (done) {
   addActivityVisible.value = false;
 };
 //添加活动按钮
@@ -284,12 +284,22 @@ onMounted(async function () {
         <div class="head-card">
           <div class="head-card-element">
             <el-text class="mx-1" size="large">活动名称：</el-text>
-            <el-input v-model="activity.activityName" style="width: 240px" placeholder="请输入活动名称" clearable />
+            <el-input
+              v-model="activity.activityName"
+              style="width: 240px"
+              placeholder="请输入活动名称"
+              clearable
+            />
           </div>
           <div class="head-card-element">
             <el-text class="mx-1" size="large">添加时间：</el-text>
-            <el-date-picker v-model="getTime" type="datetimerange" range-separator="至" start-placeholder="起始时间"
-              end-placeholder="结束时间" />
+            <el-date-picker
+              v-model="getTime"
+              type="datetimerange"
+              range-separator="至"
+              start-placeholder="起始时间"
+              end-placeholder="结束时间"
+            />
           </div>
           <div class="head-card-btn">
             <el-button @click="reset()">重置</el-button>
@@ -303,7 +313,12 @@ onMounted(async function () {
     <el-col>
       <el-card>
         <div>
-          <el-button plain @click="addActicity()" style="color: #048efb; border: 1px solid #048efb">新增活动</el-button>
+          <el-button
+            plain
+            @click="addActicity()"
+            style="color: #048efb; border: 1px solid #048efb"
+            >新增活动</el-button
+          >
         </div>
         <div>
           <el-table :data="tableData" :height="tableHeight" style="width: 100%">
@@ -353,7 +368,10 @@ onMounted(async function () {
             </el-table-column>
             <el-table-column prop="operation" label="操作">
               <template #default="scope">
-                <el-popconfirm title="确定将此条活动删除吗？" @confirm="delConfirm">
+                <el-popconfirm
+                  title="确定将此条活动删除吗？"
+                  @confirm="delConfirm"
+                >
                   <template #reference>
                     <el-button type="primary" text @click="del(scope.row)">
                       删除
@@ -373,17 +391,42 @@ onMounted(async function () {
 
         <!-- 分页 -->
         <div class="pagination" style="margin-top: 20px">
-          <el-pagination background :page-size="getObj.pageSize" layout="slot" :total="total">
+          <el-pagination
+            background
+            :page-size="getObj.pageSize"
+            layout="slot"
+            :total="total"
+          >
             <div>共{{ total }}条,每页</div>
-            <el-select v-model="getObj.pageSize" class="page-size" @change="get()" style="width: 80px">
-              <el-option v-for="item in [5, 10, 20, 50, 100]" :key="item" :label="item" :value="item"></el-option>
+            <el-select
+              v-model="getObj.pageSize"
+              class="page-size"
+              @change="get()"
+              style="width: 80px"
+            >
+              <el-option
+                v-for="item in [5, 10, 20, 50, 100]"
+                :key="item"
+                :label="item"
+                :value="item"
+              ></el-option>
             </el-select>
             <div>条</div>
           </el-pagination>
-          <el-pagination background layout="prev, pager, next, slot" :page-size="getObj.pageSize" :total="total"
-            :current-page="getObj.pageNum" @current-change="get">
+          <el-pagination
+            background
+            layout="prev, pager, next, slot"
+            :page-size="getObj.pageSize"
+            :total="total"
+            :current-page="getObj.pageNum"
+            @current-change="get()"
+          >
             <div>跳至</div>
-            <el-input v-model="getObj.pageNum" style="width: 40px" @change="checkNumber" />
+            <el-input
+              v-model="getObj.pageNum"
+              style="width: 40px"
+              @change="checkNumber"
+            />
             <div>页</div>
           </el-pagination>
         </div>
@@ -391,33 +434,63 @@ onMounted(async function () {
     </el-col>
   </el-row>
 
-  <el-dialog v-model="addActivityVisible" title="新增活动" width="500" :before-close="closeAddActivityVisible">
+  <el-dialog
+    v-model="addActivityVisible"
+    title="新增活动"
+    width="500"
+    :before-close="closeAddActivityVisible"
+    :close-on-click-modal="false"
+  >
     <template #footer>
-      <el-form ref="Ref" :model="addObj" :rules="rules" label-width="auto" style="max-width: 600px">
+      <el-form
+        ref="Ref"
+        :model="addObj"
+        :rules="rules"
+        label-width="auto"
+        style="max-width: 600px"
+      >
         <el-form-item prop="activityName" label="活动名称:">
-          <el-input v-model="addObj.activityName" placeholder="请输入活动名称" style="width: 220px" />
+          <el-input
+            v-model="addObj.activityName"
+            placeholder="请输入活动名称"
+            style="width: 220px"
+          />
         </el-form-item>
 
         <el-form-item prop="freeGold" label="免费金币:">
           <el-radio-group v-model="addObj.freeGold">
-            <el-radio value="0" @change="addObj.rechargeRatio = '0'">无赠送</el-radio>
+            <el-radio value="0" @change="addObj.rechargeRatio = '0'"
+              >无赠送</el-radio
+            >
             <el-radio value="1">有赠送</el-radio>
           </el-radio-group>
         </el-form-item>
 
         <el-form-item prop="rechargeRatio" label="免费金币兑换比:">
-          <el-input v-model="addObj.rechargeRatio" :disabled="addObj.freeGold === '0' ? true : false" placeholder="请输入"
-            style="width: 80px" />：1
+          <el-input
+            v-model="addObj.rechargeRatio"
+            :disabled="addObj.freeGold === '0' ? true : false"
+            placeholder="请输入"
+            style="width: 80px"
+          />：1
           <div style="color: grey">(提示：当前规则每10新币可兑换1免费金币)</div>
         </el-form-item>
 
         <el-form-item prop="startTime" label="开始时间:">
-          <el-date-picker v-model="addObj.startTime" type="datetime" placeholder="请选择开始时间"
-            @change="handleStartTimeChange" />
+          <el-date-picker
+            v-model="addObj.startTime"
+            type="datetime"
+            placeholder="请选择开始时间"
+            @change="handleStartTimeChange"
+          />
         </el-form-item>
 
         <el-form-item prop="endTime" label="结束时间:">
-          <el-date-picker v-model="addObj.endTime" type="datetime" placeholder="请选择结束时间" />
+          <el-date-picker
+            v-model="addObj.endTime"
+            type="datetime"
+            placeholder="请选择结束时间"
+          />
         </el-form-item>
 
         <el-form-item label="添加人:">

vue/gold-system/src/views/managerecharge/rate.vue

@@ -429,7 +429,7 @@ const checkNumber = function () {
               style="width: 80px"
             >
               <el-option
-                v-for="item in [5, 6, 7, 8, 9, 10]"
+                v-for="item in [5, 10, 20, 50, 100]"
                 :key="item"
                 :label="item"
                 :value="item"
@@ -459,7 +459,12 @@ const checkNumber = function () {
   </el-row>
 
   <!-- 这是添加弹窗 -->
-  <el-dialog v-model="regeAdd" title="新增汇率" width="500">
+  <el-dialog
+    v-model="regeAdd"
+    title="新增汇率"
+    width="500"
+    :close-on-click-modal="false"
+  >
     <template #footer>
       <el-form
         ref="Ref"
@@ -523,7 +528,12 @@ const checkNumber = function () {
   </el-dialog>
 
   <!-- 这是编辑弹窗 -->
-  <el-dialog v-model="regeEdit" title="修改汇率" width="500">
+  <el-dialog
+    v-model="regeEdit"
+    title="修改汇率"
+    width="500"
+    :close-on-click-modal="false"
+  >
     <template #footer>
       <el-form
         ref="ruleFormRef"

vue/gold-system/src/views/recharge/addRecharge.vue

@@ -198,8 +198,6 @@ const getCurrency = async function () {
 };
 getCurrency();
 
-
-
 // 上传图片成功的回调函数
 const handleAvatarSuccess = (response, uploadFile) => {
   imageUrl.value = URL.createObjectURL(uploadFile.raw);
@@ -737,7 +735,12 @@ const batchAdd = function () {
         :before-upload="beforeAvatarUpload"
         style="width: 100px; height: 115px"
       >
-        <img v-if="imageUrl" :src="imageUrl" class="avatar" />
+        <img
+          v-if="imageUrl"
+          :src="imageUrl"
+          class="avatar"
+          style="width: 100px; height: 115px"
+        />
         <el-icon
           v-else
           class="avatar-uploader-icon"
@@ -775,12 +778,17 @@ const batchAdd = function () {
   </el-form>
 
   <!-- 客户信息栏 -->
-  <el-card style="width: 1200px; float: right" class="customer-info">
+  <el-card
+    style="width: 1200px; float: right"
+    class="customer-info"
+    width="3000px"
+  >
     <el-form
       :model="user"
       label-width="auto"
-      style="max-width: 1000px"
+      style="max-width: 1200px"
       label-position="left"
+      width="1000px"
     >
       <el-text size="large" style="margin-left: 20px">客户信息</el-text>
       <el-row style="margin-top: 20px">
@@ -1121,6 +1129,6 @@ p {
 }
 
 .customer-info {
-  max-width: 50%;
+  max-width: 60%;
 }
 </style>

vue/gold-system/src/views/refund/addRefund.vue

@@ -324,7 +324,11 @@ const handleSelectionChange = (value) => {
     </el-form-item>
     <div style="display: flex; align-items: center">
       <el-form-item prop="taskCoin" label="充值金币" style="float: left">
-        <el-input v-model="addRefund.rechargeCoin" style="width: 100px" disabled />
+        <el-input
+          v-model="addRefund.rechargeCoin"
+          style="width: 100px"
+          disabled
+        />
         <p>个</p>
       </el-form-item>
       <el-form-item
@@ -499,6 +503,10 @@ p {
   float: left;
 }
 .form-style2 {
-  max-width: 50%;
+  max-width: 60%;
+}
+p {
+  font-size: 13px;
+  transform: scale(1);
 }
 </style>