123456

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

@@ -38,7 +38,7 @@ const add = async function () {
   try {
     // 发送POST请求
     const result = await API.post(
-      "http://192.168.8.93:10010/consume/add",
+      "http://192.168.8.147:10010/consume/add",
       addConsume.value
     );
 
@@ -62,6 +62,11 @@ const addBefore = () => {
     if (valid) {
       ElMessageBox.confirm("确认添加？")
         .then(() => {
+          addConsume.value.freeCoin = Number(-addConsume.value.freeCoin);
+          addConsume.value.rechargeCoin = Number(
+            -addConsume.value.rechargeCoin
+          );
+          addConsume.value.taskCoin = Number(-addConsume.value.taskCoin);
           add();
           console.log("添加成功");
           imageUrl.value = "";
@@ -171,7 +176,8 @@ const userGold = ref({});
 const getUserGold = async function (jwcode) {
   try {
     const result = await API.post(
-      "http://192.168.8.93:10010/statistics/getMess/" + jwcode
+      "http://192.168.8.93:10010/statistics/getMess/" + jwcode,
+      {}
     );
     if (result.code === 0) {
       addConsume.value.jwcode = "";

vue/gold-system/src/views/login.vue

@@ -26,7 +26,7 @@ const login = async function () {
       console.log("请求成功", result);
     } else {
       form.value.password = "";
-      form.value.userjwcode = "";
+      form.value.jwcode = "";
       ElMessage.error(result.data.msg);
     }
   } catch (error) {

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

@@ -556,6 +556,24 @@ const checkNumber = function () {
         <el-form-item label="提交人:">
           <el-input disabled :value="adminData.name" style="width: 240px" />
         </el-form-item>
+        <el-form-item label="开始时间:">
+          <el-date-picker
+            v-model="rateEdit.startTime"
+            type="date"
+            placeholder="请选择时间"
+            :default-value="new Date()"
+            value-format="YYYY-MM-DD"
+          />
+        </el-form-item>
+        <el-form-item label="结束时间:">
+          <el-date-picker
+            v-model="rateEdit.endTime"
+            type="date"
+            placeholder="请选择时间"
+            :default-value="new Date()"
+            value-format="YYYY-MM-DD"
+          />
+        </el-form-item>
         <el-form-item>
           <div class="dialog-footer">
             <el-button type="primary" @click="edit">修改</el-button>

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

@@ -197,35 +197,35 @@ getCurrency();
 // 这是添加上传图片的接口
 const imageUrl = ref("");
 
-// // 上传图片成功的回调函数
-// const handleAvatarSuccess = (response, uploadFile) => {
-//   // imageUrl.value = URL.createObjectURL(uploadFile.raw);
-//   // console.log("图片上传成功", response, uploadFile);
-//   // addRecharge.value.rechargeVoucher = `http://192.168.8.93:10010/upload/${response.data}`;
-//   // console.log("图片名称", addRecharge.value.rechargeVoucher);
-//   // 将图片转换为 Base64 编码
-//   const reader = new FileReader();
-//   reader.onloadend = () => {
-//     const base64data = reader.result;
-//     const data = {
-//       rechargeVoucher: base64data,
-//     };
-//     // 发送 JSON 对象到服务器
-//     axios
-//       .post("http://192.168.8.93:10010/upload", data)
-//       .then((res) => {
-//         console.log("图片上传成功", res);
-//         addRecharge.value.rechargeVoucher = `http://192.168.8.93:10010/upload/${response.data}`;
-//         console.log("图片名称", addRecharge.value.rechargeVoucher);
-//       })
-//       .catch((error) => {
-//         console.error("图片上传失败", error);
-//       });
-//   };
+// 上传图片成功的回调函数
+const handleAvatarSuccess = (response, uploadFile) => {
+  imageUrl.value = URL.createObjectURL(uploadFile.raw);
+  console.log("图片上传成功", response, uploadFile);
+  addRecharge.value.rechargeVoucher = `http://192.168.8.93:10010/upload/${response.data}`;
+  console.log("图片名称", addRecharge.value.rechargeVoucher);
+  // 将图片转换为 Base64 编码
+  // const reader = new FileReader();
+  // reader.onloadend = () => {
+  //   const base64data = reader.result;
+  //   const data = {
+  //     rechargeVoucher: base64data,
+  //   };
+  // 发送 JSON 对象到服务器
+  axios
+    .post("http://192.168.8.93:10010/upload", data)
+    .then((res) => {
+      console.log("图片上传成功", res);
+      addRecharge.value.rechargeVoucher = `http://192.168.8.93:10010/upload/${response.data}`;
+      console.log("图片名称", addRecharge.value.rechargeVoucher);
+    })
+    .catch((error) => {
+      console.error("图片上传失败", error);
+    });
+};
 // reader.readAsDataURL(uploadFile.raw);
 // imageUrl.value = URL.createObjectURL(uploadFile.raw);
 // console.log("图片上传成功", response, uploadFile);
-// };
+
 // const handleAvatarSuccess = (response, uploadFile) => {
 //   // 将图片转换为 Base64 编码
 //   const reader = new FileReader();
@@ -291,40 +291,72 @@ const imageUrl = ref("");
 //     reader.readAsDataURL(file);
 //   });
 // };
-const handleAvatarSuccess = (response, file, fileList) => {
-  // 处理上传成功的逻辑
-  imageUrl.value = URL.createObjectURL(file.raw);
-};
+// const handleAvatarSuccess = (response, file, fileList) => {
+//   // 处理上传成功的逻辑
+//   imageUrl.value = URL.createObjectURL(file.raw);
+// };
 
-const beforeAvatarUpload = (file) => {
-  return new Promise((resolve, reject) => {
-    const reader = new FileReader();
-    reader.onload = (e) => {
-      const base64Data = e.target.result;
-      const imgData = {
-        image: base64Data,
-        fileName: file.name,
-      };
-      const formData = new FormData();
-      formData.append("imageData", JSON.stringify(imgData));
-      // 使用 fetch 或者 axios 发送 formData
-      fetch("http://192.168.8.93:10010/upload", {
-        method: "POST",
-        body: formData,
-      })
-        .then((response) => response.json())
-        .then((data) => {
-          ElMessage.success("上传成功");
-          resolve();
-        })
-        .catch((error) => {
-          ElMessage.error("上传失败");
-          reject();
-        });
-    };
-    reader.readAsDataURL(file);
-  });
-};
+// const beforeAvatarUpload = (file) => {
+//   return new Promise((resolve, reject) => {
+//     const reader = new FileReader();
+//     reader.onload = (e) => {
+//       const base64Data = e.target.result;
+//       const imgData = {
+//         image: base64Data,
+//         fileName: file.name,
+//       };
+//       const formData = new FormData();
+//       formData.append("imageData", JSON.stringify(imgData));
+//       // 使用 fetch 或者 axios 发送 formData
+//       fetch("http://192.168.8.93:10010/upload", {
+//         method: "POST",
+//         body: formData,
+//       })
+//         .then((response) => response.json())
+//         .then((data) => {
+//           ElMessage.success("上传成功");
+//           resolve();
+//         })
+//         .catch((error) => {
+//           ElMessage.error("上传失败");
+//           reject();
+//         });
+//     };
+//     reader.readAsDataURL(file);
+//   });
+// };
+// const beforeAvatarUpload = (file) => {
+//   return new Promise((resolve, reject) => {
+//     const reader = new FileReader();
+//     reader.onload = (e) => {
+//       const base64Data = e.target.result;
+//       const imgData = {
+//         image: base64Data,
+//         fileName: file.name,
+//       };
+//       // 将 imgData 转换为 JSON 字符串
+//       const jsonData = JSON.stringify(imgData);
+//       // 使用 fetch 或者 axios 发送 JSON 数据
+//       fetch("http://192.168.8.93:10010/upload", {
+//         method: "POST",
+//         headers: {
+//           "Content-Type": "application/json", // 设置请求头为 JSON
+//         },
+//         body: jsonData, // 发送 JSON 字符串
+//       })
+//         .then((response) => response.json())
+//         .then((data) => {
+//           ElMessage.success("上传成功");
+//           resolve();
+//         })
+//         .catch((error) => {
+//           ElMessage.error("上传失败");
+//           reject();
+//         });
+//     };
+//     reader.readAsDataURL(file);
+//   });
+// };
 
 //充值方式条目
 const options = [
@@ -411,7 +443,7 @@ const deleteRecharge = function () {
           v-for="item in activity"
           :key="item.value"
           :label="item.activityName"
-          :value="item.activityId"
+          :value="item.rechargeRatio"
         />
       </el-select>
     </el-form-item>
@@ -471,6 +503,7 @@ const deleteRecharge = function () {
       <el-upload
         class="avatar-uploader"
         :show-file-list="false"
+        action="http://192.168.8.93:10010/upload"
         :on-success="handleAvatarSuccess"
         :before-upload="beforeAvatarUpload"
       >

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

@@ -81,9 +81,6 @@ const addBefore = () => {
     if (valid) {
       ElMessageBox.confirm("确认添加？")
         .then(() => {
-          addRefund.value.freeCoin = Number(-addRefund.value.freeCoin);
-          addRefund.value.rechargeCoin = Number(-addRefund.value.rechargeCoin);
-          addRefund.value.taskCoin = Number(-addRefund.value.taskCoin);
           add();
           console.log("添加成功");
           addRefund.value.allCoin = 0;
@@ -197,7 +194,8 @@ const getGoods = async function (jwcode) {
   try {
     // 发送POST请求
     const result = await API.post(
-      "http://192.168.8.93:10010/consume/getDeatil/" + addRefund.value.jwcode
+      "http://192.168.8.93:10010/consume/getDeatil/" + addRefund.value.jwcode,
+      {}
     );
     if (result.code === 0) {
       addRefund.value.jwcode = "";
@@ -214,6 +212,7 @@ const getGoods = async function (jwcode) {
     console.log("请求失败", error);
     ElMessage.error("查询失败，请检查精网号是否正确");
     // 在这里可以处理错误逻辑，比如显示错误提示等
+    addRefund.value.jwcode = "";
   }
 };
 const calculatedRechargeGoods = computed(() => {
@@ -233,14 +232,40 @@ watch(calculatedRechargeGoods, (newVal) => {
 
 // 绑定两个数据
 
+// 这是根据订单号查询消费信息的方法
+const getProductByOrderCode = async function (item) {
+  try {
+    // 发送POST请求
+    const result = await API.post(
+      "http://192.168.8.174:10010/refund/searchByOrderCode?orderCode=" + item,
+      {}
+    );
+    addRefund.value.contactId = result.data.detailId;
+    addRefund.value.refundGoods = result.data.productName;
+    addRefund.value.orderCode = result.data.orderCode;
+    addRefund.value.taskCoin = result.data.taskCoin * -1;
+    addRefund.value.freeCoin = result.data.freeCoin * -1;
+    addRefund.value.rechargeCoin = result.data.rechargeCoin * -1;
+    addRefund.value.allCoin =
+      result.data.taskCoin * -1 +
+      result.data.freeCoin * -1 +
+      result.data.rechargeCoin * -1;
+    console.log("请求成功", addRefund.value);
+    if (result.data.code === 0) {
+      ElMessage.error(result.data.msg);
+    } else {
+      ElMessage.success("选择成功");
+    }
+  } catch (error) {
+    console.log("请求失败", error);
+    ElMessage.error("查询失败，请检查精网号是否正确");
+    // 在这里可以处理错误逻辑，比如显示错误提示等
+  }
+};
 const handleSelectionChange = (value) => {
+  getProductByOrderCode(value);
+  console.log("选择的订单号", value);
   const selectedItem = goods.value.find((item) => item.detailId === value);
-  if (selectedItem) {
-    addRefund.value.contactId = selectedItem.detailId;
-    addRefund.value.refundGoods = selectedItem.productName;
-  }
-  console.log("选择的商品", addRefund.value.refundGoods);
-  console.log("选择的商品ID", addRefund.value.contactId); // 打印选中的商品ID
 };
 </script>
 
@@ -282,9 +307,9 @@ const handleSelectionChange = (value) => {
         />
       </el-select>
     </el-form-item>
-    <el-form-item prop="contactId" label="退款商品">
+    <el-form-item prop="contactId" label="订单号">
       <el-select
-        v-model="addRefund.contactId"
+        v-model="addRefund.orderCode"
         placeholder="请选择"
         style="width: 300px"
         @change="handleSelectionChange"
@@ -292,14 +317,14 @@ const handleSelectionChange = (value) => {
         <el-option
           v-for="item in goods"
           :key="item.value"
-          :label="item.productName"
-          :value="item.detailId"
+          :label="item.productName + item.orderCode"
+          :value="item.orderCode"
         />
       </el-select>
     </el-form-item>
     <div style="display: flex; align-items: center">
       <el-form-item prop="taskCoin" label="任务金币" style="float: left">
-        <el-input v-model="addRefund.taskCoin" style="width: 100px" />
+        <el-input v-model="addRefund.taskCoin" style="width: 100px" disabled />
         <p>个</p>
       </el-form-item>
       <el-form-item
@@ -310,6 +335,7 @@ const handleSelectionChange = (value) => {
         <el-input
           v-model="addRefund.freeCoin"
           style="float: left; width: 100px"
+          disabled
         />
         <p>个</p>
       </el-form-item>
@@ -321,6 +347,7 @@ const handleSelectionChange = (value) => {
         <el-input
           v-model="addRefund.rechargeCoin"
           style="float: left; width: 100px"
+          disabled
         />
         <p>个</p>
       </el-form-item>