董浩霖的一系列修改

5 months ago · 42f89448db
6 changed files with 100 additions and 64 deletions
--- a/vue/gold-system/src/views/audit/rechargeAudit.vue
+++ b/vue/gold-system/src/views/audit/rechargeAudit.vue
@ -128,6 +128,7 @@ const search = function () {
 // 重置
 const reset = function () {
  rechargeVo.value.activityId = "";
+  rechargeVo.value.jwcode = "";
  rechargeVo.value.payWay = "";
  rechargeVo.value.area = "";
  rechargeVo.value.startDate = "";
@ -412,7 +413,19 @@ onMounted(async function () {
    <el-col>
      <el-card style="margin-bottom: 20px">
        <el-row style="margin-bottom: 10px">
-          <el-col :span="8">
+          <el-col :span="6">
+            <div class="head-card-element">
+              <el-text class="mx-1" size="large">精网号：</el-text>
+              <el-input
+                v-model="rechargeVo.jwcode"
+                placeholder="请输入精网号"
+                size="large"
+                style="width: 240px"
+                clearable
+              />
+            </div>
+          </el-col>
+          <el-col :span="6">
            <div class="head-card-element">
              <el-text class="mx-1" size="large">活动名称：</el-text>
              <el-select
@ -431,7 +444,7 @@ onMounted(async function () {
              </el-select>
            </div>
          </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
            <div class="head-card-element">
              <el-text class="mx-1" size="large">充值方式：</el-text>
              <el-select
@ -450,7 +463,7 @@ onMounted(async function () {
              </el-select>
            </div>
          </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
            <div class="head-card-element">
              <el-text class="mx-1" size="large">所属地区：</el-text>
              <el-select
@ -514,9 +527,16 @@ onMounted(async function () {
        </el-tabs>
        <div>
          <el-table :data="tableData" :height="tableHeight" style="width: 100%">
-            <el-table-column type="index" label="序号" width="100px" fixed="left">
+            <el-table-column
+              type="index"
+              label="序号"
+              width="100px"
+              fixed="left"
+            >
              <template #default="scope">
-                <span>{{ scope.$index + 1+(getObj.pageNum-1)*getObj.pageSize }}</span>
+                <span>{{
+                  scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
+                }}</span>
              </template>
            </el-table-column>
            <el-table-column prop="username" label="姓名" width="100px" />
--- a/vue/gold-system/src/views/audit/refundAudit.vue
+++ b/vue/gold-system/src/views/audit/refundAudit.vue
@ -113,6 +113,7 @@ const search = function () {
 // 重置
 const reset = function () {
  detail.value.area = "";
+  detail.value.jwcode = "";
  detail.value.refundType = "";
  detail.value.refundGoods = "";
  detail.value.startDate = "";
@ -388,7 +389,19 @@ onMounted(async function () {
    <el-col>
      <el-card style="margin-bottom: 20px">
        <el-row style="margin-bottom: 10px">
-          <el-col :span="8">
+          <el-col :span="6">
+            <div class="head-card-element">
+              <el-text class="mx-1" size="large">精网号：</el-text>
+              <el-input
+                v-model="detail.jwcode"
+                placeholder="请输入精网号"
+                size="large"
+                style="width: 240px"
+                clearable
+              />
+            </div>
+          </el-col>
+          <el-col :span="6">
            <div class="head-card-element">
              <el-text class="mx-1" size="large">退款类型：</el-text>
              <el-select
@ -407,7 +420,7 @@ onMounted(async function () {
              </el-select>
            </div>
          </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
            <div class="head-card-element">
              <el-text class="mx-1" size="large">退款商品：</el-text>
              <el-select
@ -426,7 +439,7 @@ onMounted(async function () {
              </el-select>
            </div>
          </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
            <div class="head-card-element">
              <el-text class="mx-1" size="large">所属地区：</el-text>
              <el-select
@ -490,9 +503,16 @@ onMounted(async function () {
        </el-tabs>
        <div>
          <el-table :data="tableData" :height="tableHeight" style="width: 100%">
-            <el-table-column type="index" label="序号" width="100px" fixed="left">
+            <el-table-column
+              type="index"
+              label="序号"
+              width="100px"
+              fixed="left"
+            >
              <template #default="scope">
-                <span>{{ scope.$index + 1+(getObj.pageNum-1)*getObj.pageSize }}</span>
+                <span>{{
+                  scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
+                }}</span>
              </template>
            </el-table-column>
            <el-table-column prop="userName" label="姓名" width="150px" />
--- a/vue/gold-system/src/views/consume/addConsume.vue
+++ b/vue/gold-system/src/views/consume/addConsume.vue
@ -31,7 +31,7 @@ const addConsume = ref({
  freeCoin: 0,
  rechargeCoin: 0,
  taskCoin: 0,
-  updateType: "消费",
+  updateType: "1",
 });
 // 这是添加消费信息的接口
 const add = async function () {
@ -51,7 +51,7 @@ const add = async function () {
    addConsume.value = {};
    addConsume.value.adminId = adminData.value.adminId;
    addConsume.value.adminName = adminData.value.adminName;
-    addConsume.value.updateType = "消费";
+    addConsume.value.updateType = "1";
    addConsume.value.freeCoin = 0;
    addConsume.value.rechargeCoin = 0;
    addConsume.value.taskCoin = 0;
@ -124,7 +124,7 @@ const delteConsume = function () {
  addConsume.value = {};
  addConsume.value.adminId = adminData.value.adminId;
  addConsume.value.adminName = adminData.value.adminName;
-  addConsume.value.updateType = "消费";
+  addConsume.value.updateType = "1";
  addConsume.value.freeCoin = 0;
  addConsume.value.rechargeCoin = 0;
  addConsume.value.taskCoin = 0;
@ -192,7 +192,7 @@ const getUserGold = async function (jwcode) {
    // 将响应结果存储到响应式数据中
    console.log("请求成功", result);
    // 存储表格数据
-    userGold.value = result.data[0];
+    userGold.value = result.data;
    if (result.data.code === 0) {
      ElMessage.error("查询失败，请检查精网号是否正确");
    }
--- a/vue/gold-system/src/views/managerecharge/rate.vue
+++ b/vue/gold-system/src/views/managerecharge/rate.vue
@ -369,6 +369,14 @@ const delConfirm = async function (row) {
    // 在这里可以处理错误逻辑，比如显示错误提示等
  }
 };
+
+//这是限制输入小数不超过七位的限制方法
+function handleInput(value) {
+  // 限制小数点后7位，这里使用正则表达式来实现
+  rateAdd.value.exchangeRate = value
+    .replace(/(\.\d{7})\d+/, "$1")
+    .replace(/^(\d+)(\.\d{0,7})?$/, "$1$2");
+}
 </script>

 <template>
@ -426,9 +434,16 @@ const delConfirm = async function (row) {
            :height="tableHeight"
            style="width: 100%"
          >
-          <el-table-column type="index" label="序号" width="100px" fixed="left">
+            <el-table-column
+              type="index"
+              label="序号"
+              width="100px"
+              fixed="left"
+            >
              <template #default="scope">
-                <span>{{ scope.$index + 1+(getObj.pageNum-1)*getObj.pageSize }}</span>
+                <span>{{
+                  scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
+                }}</span>
              </template>
            </el-table-column>
            <el-table-column prop="currency" label="货币名称" :span="2" />
@ -585,7 +600,11 @@ const delConfirm = async function (row) {
          </el-select>
        </el-form-item>
        <el-form-item prop="exchangeRate" label="汇率:">
-          <el-input v-model="rateAdd.exchangeRate" style="width: 120px" />
+          <el-input
+            v-model="rateAdd.exchangeRate"
+            @update:modelValue="handleInput"
+            style="width: 120px"
+          />
          <p class="unit">:1</p>
          <p>
            (提示：当前规则每 {{ rateAdd.exchangeRate }}
--- a/vue/gold-system/src/views/usergold/index.vue
+++ b/vue/gold-system/src/views/usergold/index.vue
@ -270,23 +270,34 @@ onMounted(async function () {
          }}，任务金币：{{ Math.abs(taskCoin) }}
        </div>
        <div>
-          <el-table :data="tableData" :height="tableHeight" style="width: 100%" >
-            <el-table-column type="index" label="序号" width="100px" fixed="left">
+          <el-table :data="tableData" :height="tableHeight" style="width: 100%">
+            <el-table-column
+              type="index"
+              label="序号"
+              width="100px"
+              fixed="left"
+            >
              <template #default="scope">
-                <span>{{ scope.$index + 1+(getObj.pageNum-1)*getObj.pageSize }}</span>
+                <span>{{
+                  scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
+                }}</span>
              </template>
            </el-table-column>
            <el-table-column prop="uname" label="姓名" width="130" />
            <el-table-column prop="jwcode" label="精网号" width="170" />
            <el-table-column prop="area" label="所属地区" width="170" />
-            <el-table-column prop="platform" label="平台信息" width="170" />
+            <el-table-column
+              prop="consumePlatform"
+              label="平台信息"
+              width="170"
+            />
            <el-table-column prop="gold" label="更新数量" width="160">
              <template #default="scope">
                <span>{{
                  Math.abs(
                    scope.row.rechargeCoin +
-                    scope.row.freeCoin +
-                    scope.row.taskCoin
+                      scope.row.freeCoin +
+                      scope.row.taskCoin
                  )
                }}</span>
              </template>
--- a/vue/gold-system/src/views/usergoldInfo/index.vue
+++ b/vue/gold-system/src/views/usergoldInfo/index.vue
@ -214,63 +214,29 @@ onMounted(async function () {
      <el-card>
        <div>
          <el-table :data="tableData" :height="tableHeight" style="width: 100%">
+            <el-table-column prop="" label="序号" width="130" />
            <el-table-column prop="uname" label="姓名" width="130" />
            <el-table-column prop="jwcode" label="精网号" width="170" />
            <el-table-column prop="area" label="所属地区" width="170" />
            <el-table-column prop="platform" label="平台信息" width="170" />
-            <el-table-column prop="gold" label="更新数量" width="160">
-              <template #default="scope">
-                <span>{{
-                  Math.abs(
-                    scope.row.rechargeCoin +
-                      scope.row.freeCoin +
-                      scope.row.taskCoin
-                  )
-                }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="updateType" label="更新类型" width="150">
-              <!-- 模板内容 -->
-              <template #default="scope">
-                <span v-if="scope.row.updateType == 1">
-                  <span>消费</span>
-                </span>
-                <span v-if="scope.row.updateType == 0">
-                  <span>充值</span>
-                </span>
-                <span v-if="scope.row.updateType == 2">
-                  <span>退款</span>
-                </span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="freeCoin" label="免费金币" width="130">
+            <el-table-column prop="platform" label="总金币" width="130" />
+            <el-table-column prop="freeCoin" label="免费金币" width="110">
              <template #default="scope">
                <span>{{ Math.abs(scope.row.freeCoin) }}</span>
              </template>
            </el-table-column>
-            <el-table-column prop="rechargeCoin" label="充值金币" width="150">
+            <el-table-column prop="rechargeCoin" label="充值金币" width="110">
              <template #default="scope">
                <span>{{ Math.abs(scope.row.rechargeCoin) }}</span>
              </template>
            </el-table-column>
-            <el-table-column prop="taskCoin" label="任务金币" width="130">
+            <el-table-column prop="taskCoin" label="任务金币" width="110">
              <template #default="scope">
                <span>{{ Math.abs(scope.row.taskCoin) }}</span>
              </template>
            </el-table-column>
-            <el-table-column prop="name" label="提交人" width="150" />
-            <el-table-column
-              prop="createTime"
-              label="更新时间"
-              width="210"
-              show-overflow-tooltip
-            >
-              <template #default="scope">
-                <span>{{
-                  moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss")
-                }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column prop="jwcode" label="历史充值" width="150" />
+            <el-table-column prop="jwcode" label="历史消费" width="150" />
          </el-table>
        </div>