Merge branch 'dev' into 4/1日二期

gold-system/src/views/audit/refundAudit.vue

@@ -66,10 +66,6 @@ const refundType = [
     value: "退款金币",
     label: "退款金币",
   },
-  {
-    value: "退款商品",
-    label: "退款商品",
-  },
 ];
 
 // //表格高度
@@ -607,11 +603,11 @@ const handleSortChange = (column) => {
           <el-tab-pane label="待审核" name="wait"></el-tab-pane>
           <el-tab-pane label="已通过" name="pass"></el-tab-pane>
           <el-tab-pane label="已驳回" name="reject"></el-tab-pane>
-          <div>
+          <!-- <div>
             退款记录条数：{{ Math.abs(trueCount) }},退款金币总数：{{
               Math.abs(trueGold)
             }}
-          </div>
+          </div> -->
         </el-tabs>
         <!-- 设置表格容器的高度和滚动样式 -->
         <div style="height: 540px; overflow-y: auto">
@@ -648,7 +644,7 @@ const handleSortChange = (column) => {
             <el-table-column prop="area" label="所属地区" width="100px" />
             <el-table-column prop="refundType" label="退款类型" width="100px" />
             <el-table-column
-              prop="productName"
+              prop="refundGoods"
               label="退款商品"
               width="200px"
             />

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

@@ -413,13 +413,13 @@ const handleSortChange = (column) => {
   <el-row>
     <el-col>
       <el-card>
-        <div>
+        <!-- <div>
           消费金币总数：{{ Math.abs(totalCoin) }}，永久金币：{{
             Math.abs(rechargeCoin)
           }}，免费金币：{{ Math.abs(freeCoin) }}，任务金币：{{
             Math.abs(taskCoin)
           }}
-        </div>
+        </div> -->
         <!-- 设置表格容器的高度和滚动样式 -->
         <div style="height: 576px; overflow-y: auto">
           <el-table

gold-system/src/views/index.vue

@@ -259,7 +259,6 @@ const handleSelect = (index) => {
             class="el-menu-demo"
             mode="horizontal"
             :ellipsis="false"
-            @select="handleSelect"
           >
             <el-sub-menu index="1" class="admin">
               <template #title>

gold-system/src/views/permissions/index.vue

@@ -660,7 +660,7 @@ onMounted(async function () {
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="store" label="职称:">
+        <el-form-item prop="store" label="所属部门:">
           <el-input
             v-model="addAdmin.store"
             placeholder="请输入职称"
@@ -674,6 +674,16 @@ onMounted(async function () {
             style="width: 220px"
           />
         </el-form-item>
+        <el-form-item prop="remark" label="备注">
+          <el-input
+            v-model="addAdmin.remark"
+            style="width: 300px"
+            :rows="2"
+            maxlength="100"
+            show-word-limit
+            type="textarea"
+          />
+        </el-form-item>
       </el-form>
 
       <div>

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

@@ -114,21 +114,38 @@ const addBefore = () => {
 // 开始时间改变时，重新验证结束时间
 const Ref = ref(null);
 
-const checkFreeGoldRadio = function (rule, value, callback) {
-  if (value == "0" || value == null || value == "") {
-    callback(new Error("请输入永久金币"));
-  } else if (value < 0 || isNaN(value)) {
-    callback(new Error("请输入正确的格式"));
-  } else {
-    callback();
-  }
-};
+// const checkFreeGoldRadio = function (rule, value, callback) {
+//   if (value == "0" || value == null || value == "") {
+//     callback(new Error("请输入永久金币"));
+//   } else if (value < 0 || isNaN(value)) {
+//     callback(new Error("请输入正确的格式"));
+//   } else {
+//     callback();
+//   }
+// };
 const rules = reactive({
   jwcode: [{ required: true, message: "请输入精网号", trigger: "blur" }],
-  // activityId: [{ required: true, message: "请选择活动名称", trigger: "blur" }],
-  paidGold: [{ validator: checkFreeGoldRadio, trigger: "blur" }],
-  rechargeGold: [
+  activityId: [{ required: true, message: "请选择活动名称", trigger: "blur" }],
+  paidGold: [
     { required: true, message: "请输入充值金额", trigger: "blur" },
+    {
+      validator: (rule, value, callback) => {
+        if (value > 0) {
+          callback();
+        } else {
+          callback(new Error("请输入大于0的金额"));
+        }
+      },
+    },
+  ],
+  // 必须进行选择
+
+  rechargeGold: [
+    {
+      required: true,
+      message: "请选择充值方式",
+      trigger: "blur",
+    },
   ],
   payWay: [{ required: true, message: "请选择付款方式", trigger: "blur" }],
   rechargeTime: [

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

@@ -505,11 +505,11 @@ const handleSortChange = (column) => {
           <el-tab-pane label="待审核" name="wait"></el-tab-pane>
           <el-tab-pane label="已通过" name="pass"></el-tab-pane>
           <el-tab-pane label="已驳回" name="reject"></el-tab-pane>
-          <div>
+          <!-- <div>
             充值金额：{{ totalmoney }}新币，永久金币：{{
               totalRcoin
             }}金币，免费金币：{{ totalFcoin }}金币
-          </div>
+          </div> -->
         </el-tabs>
         <!-- 设置表格容器的高度和滚动样式 -->
         <div style="height: 520px; overflow-y: auto">

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

@@ -472,11 +472,11 @@ const handleSortChange = (column) => {
           <el-tab-pane label="待审核" name="wait"></el-tab-pane>
           <el-tab-pane label="已通过" name="pass"></el-tab-pane>
           <el-tab-pane label="已驳回" name="reject"></el-tab-pane>
-          <div>
+          <!-- <div>
             充值金额：{{ totalmoney / 100 }}新币，永久金币：{{
               totalRcoin / 100
             }}金币，免费金币：{{ totalFcoin / 100 }}金币
-          </div>
+          </div> -->
         </el-tabs>
         <!-- 设置表格容器的高度和滚动样式 -->
         <div style="height: 520px; overflow-y: auto">

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

@@ -116,41 +116,10 @@ const rules = reactive({
   jwcode: [{ required: true, message: "请输入精网号", trigger: "blur" }],
   refundType: [{ required: true, message: "请选择退款类型", trigger: "blur" }],
   orderCode: [{ required: true, message: "请选择退款商品", trigger: "blur" }],
-  taskCoin: [
-    { required: true, message: "请输入任务金币", trigger: "blur" },
-    {
-      validator: (rule, value) => {
-        if (Number(value) === 0) {
-          return Promise.reject(new Error("任务金币不能为 0"));
-        }
-        return Promise.resolve();
-      },
-      trigger: "blur",
-    },
-  ],
-  freeCoin: [
-    { required: true, message: "请输入免费金币", trigger: "blur" },
-    {
-      validator: (rule, value) => {
-        if (Number(value) === 0) {
-          return Promise.reject(new Error("免费金币不能为 0"));
-        }
-        return Promise.resolve();
-      },
-      trigger: "blur",
-    },
-  ],
+  taskCoin: [{ required: true, message: "请输入任务金币", trigger: "blur" }],
+  freeCoin: [{ required: true, message: "请输入免费金币", trigger: "blur" }],
   rechargeCoin: [
     { required: true, message: "请输入永久金币", trigger: "blur" },
-    {
-      validator: (rule, value) => {
-        if (Number(value) === 0) {
-          return Promise.reject(new Error("永久金币不能为 0"));
-        }
-        return Promise.resolve();
-      },
-      trigger: "blur",
-    },
   ],
   allCoin: [
     { required: true, message: "请选择付款方式", trigger: "blur" },
@@ -219,10 +188,6 @@ const refundType = [
     value: "退款商品",
     label: "退款商品",
   },
-  {
-    value: "退款金币",
-    label: "退款金币",
-  },
 ];
 
 // 根据精网号查询商品

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

@@ -48,10 +48,6 @@ const activeName = ref("all");
 // 退款类型
 const consumeType = [
   {
-    value: "退款金币",
-    label: "退款金币",
-  },
-  {
     value: "退款商品",
     label: "退款商品",
   },
@@ -537,13 +533,13 @@ const handleSortChange = (column) => {
           <el-tab-pane label="已驳回" name="reject"></el-tab-pane>
         </el-tabs>
 
-        <div>
+        <!-- <div>
           退款金币总数：{{ Math.abs(trueGold) }}，永久金币：{{
             Math.abs(trueRgold)
           }}，免费金币：{{ Math.abs(trueFgold) }}，任务金币：{{
             Math.abs(trueTgold)
           }}
-        </div>
+        </div> -->
         <!-- 设置表格容器的高度和滚动样式 -->
         <div style="height: 520px; overflow-y: auto">
           <el-table
@@ -578,11 +574,8 @@ const handleSortChange = (column) => {
             />
             <el-table-column prop="area" label="所属地区" width="110px" />
             <el-table-column prop="refundType" label="退款类型" width="100px" />
-            <el-table-column
-              prop="refundGoods"
-              label="退款商品"
-              width="110px"
-            />
+            <el-table-column prop="refundGoods" label="退款商品" width="110px">
+            </el-table-column>
             <el-table-column label="退款金币数" width="110px">
               <template #default="scope">
                 {{

gold-system/src/views/usergold/index.vue

@@ -150,6 +150,8 @@ const reset = function () {
   sortField.value = "";
   sortOrder.value = "";
   getTime.value = {};
+  //重置平台信息
+  detailY.value.consumePlatform = "";
 };
 // 今天
 const getToday = function () {
@@ -658,11 +660,11 @@ const handleSortChange = (column) => {
   <el-row>
     <el-col>
       <el-card>
-        <div>
+        <!-- <div>
           现有金币：永久金币：{{ Math.abs(rechargeCoin) }}，免费金币：{{
             Math.abs(freeCoin)
           }}，任务金币：{{ Math.abs(taskCoin) }}
-        </div>
+        </div> -->
         <!-- 设置表格容器的高度和滚动样式 -->
         <div style="height: 584px; overflow-y: auto">
           <el-table

gold-system/src/views/usergoldInfo/index.vue

@@ -275,11 +275,11 @@ onMounted(async function () {
   <el-row>
     <el-col>
       <el-card>
-        <div>
+        <!-- <div>
           现有金币：永久金币：{{ Math.abs(rechargeCoin) }}，免费金币：{{
             Math.abs(freeCoin)
           }}，任务金币：{{ Math.abs(taskCoin) }}
-        </div>
+        </div> -->
         <!-- 设置表格容器的高度和滚动样式 -->
         <div style="height: 626px; overflow-y: auto">
           <el-table