Merge branch 'donghaolin' into dev

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

@@ -522,7 +522,7 @@ onMounted(async function () {
             <el-table-column prop="area" label="所属地区" width="100px" />
             <el-table-column prop="refundType" label="退款类型" width="100px" />
             <el-table-column
-              prop="refundGoods"
+              prop="productName"
               label="退款商品"
               width="200px"
             />

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

@@ -62,7 +62,7 @@ const add = async function () {
     addRecharge.value.area = adminData.value.area;
     addRecharge.value.rechargeVoucher = "";
     addRecharge.value.rechargeWay = "客服充值";
-    addRecharge.value.freeGold = 0;
+    addRecharge.value.freeGold = "";
     addRecharge.value.rechargeGold = 1;
     addRecharge.value.paidGold = "";
     imageUrl.value = "";
@@ -250,16 +250,11 @@ function handleActivityChange(value) {
 }
 // 监听 paidGold 的变化
 const calculatedFree = computed(() => {
-  if (
-    Math.trunc(addRecharge.value.paidGold / addRecharge.value.rechargeRatio) <
-      1 ||
-    addRecharge.value.rechargeRatio == 0
-  ) {
+  const result = addRecharge.value.paidGold / addRecharge.value.rechargeRatio;
+  if (isNaN(result) || result < 1 || addRecharge.value.rechargeRatio == 0) {
     return 0;
   } else {
-    return Math.trunc(
-      addRecharge.value.paidGold / addRecharge.value.rechargeRatio
-    );
+    return Math.trunc(result);
   }
 });
 watch(calculatedFree, (newVal) => {

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

@@ -7,7 +7,7 @@ import axios from "axios";
 import { ElMessageBox } from "element-plus";
 import API from "../../api/index.js";
 import moment from "moment";
-import _ from 'lodash';
+import _ from "lodash";
 
 const addRe = ref({
   typeR: "0",
@@ -16,10 +16,7 @@ const addRe = ref({
 const adminData = ref({});
 const getAdminData = async function () {
   try {
-    const result = await API.post(
-      "/hwjb/admin/userinfo",
-      {}
-    );
+    const result = await API.post("/hwjb/admin/userinfo", {});
     adminData.value = result;
     addRefund.value.adminId = adminData.value.adminId;
     console.log("请求成功", result);
@@ -55,10 +52,7 @@ const cancel = function () {
 const add = async function () {
   try {
     // 发送POST请求
-    const result = await API.post(
-      "/hwjb/refund/add",
-      addRefund.value
-    );
+    const result = await API.post("/hwjb/refund/add", addRefund.value);
     if (result.code === 0) {
       ElMessage.error(result.msg);
       return;
@@ -203,7 +197,7 @@ const getGoods = async function (jwcode) {
   try {
     // 发送POST请求
     const result = await API.post(
-      "/hwjb/consume/getDeatil/" + addRefund.value.jwcode,
+      "hwjb/consume/getDeatil/" + addRefund.value.jwcode,
       {}
     );
     if (result.code === 0) {
@@ -249,7 +243,7 @@ const getProductByOrderCode = async function (item) {
       "/hwjb/refund/searchByOrderCode?orderCode=" + item,
       {}
     );
-    addRefund.value.contactId = result.data.detailId;
+    addRefund.value.contactId = result.data.detailyId;
     addRefund.value.refundGoods = result.data.productName;
     addRefund.value.orderCode = result.data.orderCode;
     addRefund.value.taskCoin = result.data.taskCoin * -1;

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

@@ -196,10 +196,7 @@ const handleClick = function (tab, event) {
 const getArea = async function () {
   try {
     // 发送POST请求
-    const result = await API.post(
-      "/hwjb/recharge/user/search",
-      {}
-    );
+    const result = await API.post("/hwjb/recharge/user/search", {});
     // 将响应结果存储到响应式数据中
     console.log("请求成功", result);
     // 存储地区信息
@@ -227,8 +224,7 @@ const delConfirm = async function () {
     console.log("delObj", delObj.value);
     // 发送POST请求
     const result = await API.post(
-      "/hwjb/refund/softDelete?detailId=" +
-        delObj.value.detailId,
+      "/hwjb/refund/softDelete?detailId=" + delObj.value.detailId,
       {}
     );
     // 将响应结果存储到响应式数据中
@@ -419,7 +415,7 @@ const checkNumber = function () {
             <el-table-column prop="area" label="所属地区" width="120px" />
             <el-table-column prop="refundType" label="退款类型" width="100px" />
             <el-table-column
-              prop="refundGoods"
+              prop="productName"
               label="退款商品"
               width="200px"
             />