111111111

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

@@ -37,7 +37,7 @@ const add = async function () {
   try {
     // 发送POST请求
     const result = await API.post(
-      "http://192.168.8.147:10030/consume/add",
+      "http://192.168.8.93:10030/consume/add",
       addConsume.value
     );
 
@@ -86,6 +86,15 @@ const checkEndTime = function (rule, value, callback) {
     callback(new Error("付款时间不能小于当前时间"));
   }
 };
+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" }],
   productId: [{ required: true, message: "请选择消费商品", trigger: "blur" }],
@@ -94,9 +103,18 @@ const rules = reactive({
   rechargeCoin: [
     { required: true, message: "请输入免费金币", trigger: "blur" },
   ],
-  allGold: [{ required: true, message: "请输入消费金币总数", trigger: "blur" }],
+  allGold: [{ validator: checkFreeGoldRadio, trigger: "blur" }],
 });
-
+//这是重置方法
+const delteConsume = function () {
+  addConsume.value = {};
+  addConsume.value.adminId = adminData.value.adminId;
+  addConsume.value.adminName = adminData.value.adminName;
+  addConsume.value.updateType = "消费";
+  addConsume.value.freeCoin = 0;
+  addConsume.value.rechargeCoin = 0;
+  addConsume.value.taskCoin = 0;
+};
 // 查找客户信息的方法
 const user = ref({});
 const getUser = async function (jwcode) {
@@ -112,9 +130,9 @@ const getUser = async function (jwcode) {
     user.value = result.data[0];
     console.log("用户信息", user.value);
     if (result.data.code === 0) {
-      ElMessage.error(result.data.msg);
+      ElMessage.error("查询失败，请检查精网号是否正确");
     } else {
-      ElMessage.success(result.data.msg);
+      ElMessage.success("查询成功");
     }
   } catch (error) {
     console.log("请求失败", error);
@@ -147,7 +165,7 @@ const userGold = ref({});
 const getUserGold = async function (jwcode) {
   try {
     const result = await API.post(
-      "http://192.168.8.147:10070/statistics/getMess/" + jwcode
+      "http://192.168.8.93:10070/statistics/getMess/" + jwcode
     );
     console.log("请求成功", result);
     // 存储全部数据
@@ -286,9 +304,7 @@ function calculateCoins() {
         placeholder="提交人姓名"
       />
     </el-form-item>
-    <el-button @click="closeAddActivityVisible" style="margin-left: 280px"
-      >取消</el-button
-    >
+    <el-button @click="delteConsume" style="margin-left: 280px">重置</el-button>
     <el-button type="primary" @click="addBefore"> 提交 </el-button>
   </el-form>
 

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

@@ -264,14 +264,10 @@ const checkEndTime = function (rule, value, callback) {
   }
 };
 const checkFreeGoldRadio = function (rule, value, callback) {
-  if (addObj.value.freeGold == 1) {
-    if (value == "0" || value == null || value == "") {
-      callback(new Error("请输入汇率比兑换比"));
-    } else if (value < 0 || isNaN(value)) {
-      callback(new Error("请输入正确的格式"));
-    } else {
-      callback();
-    }
+  if (value == "0" || value == null || value == "") {
+    callback(new Error("请输入汇率比"));
+  } else if (value < 0 || isNaN(value)) {
+    callback(new Error("请输入正确的格式"));
   } else {
     callback();
   }

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

@@ -6,6 +6,7 @@ import { Plus } from "@element-plus/icons-vue";
 import axios from "axios";
 import { ElMessageBox } from "element-plus";
 import API from "../../api/index.js";
+import moment from "moment";
 
 const adminData = ref({});
 const getAdminData = async function () {
@@ -104,10 +105,19 @@ const checkEndTime = function (rule, value, callback) {
     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: [{ required: true, message: "请输入充值金币", trigger: "blur" }],
+  paidGold: [{ validator: checkFreeGoldRadio, trigger: "blur" }],
   rechargeGold: [
     { required: true, message: "请输入充值金额", trigger: "blur" },
   ],
@@ -404,7 +414,9 @@ const deleteRecharge = function () {
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="历史金币总数"> </el-form-item>
+          <el-form-item label="历史金币总数">
+            <p>{{ user.totalRechargeGold }}</p>
+          </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="精网号">
@@ -412,25 +424,41 @@ const deleteRecharge = function () {
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="当前金币总数"> </el-form-item>
+          <el-form-item label="当前金币总数">
+            <p>{{ user.sumgold }}</p>
+          </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="首次充值日期"> </el-form-item>
+          <el-form-item label="首次充值日期">
+            <p>
+              {{ moment(user.firstRechargeTime).format("YYYY-MM-DD HH:mm:ss") }}
+            </p>
+          </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="充值次数"> </el-form-item>
+          <el-form-item label="充值次数">
+            <p>{{ user.rechargeTimes }}</p>
+          </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="负责客服"> </el-form-item>
+          <el-form-item label="负责客服">
+            <p>{{ adminData.name }}</p>
+          </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="消费次数"> </el-form-item>
+          <el-form-item label="消费次数">
+            <p>{{ user.spendTimes }}</p>
+          </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="所属门店"> </el-form-item>
+          <el-form-item label="所属门店">
+            <p>{{ adminData.area }}</p>
+          </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="待审核"> </el-form-item>
+          <el-form-item label="待审核">
+            <p>{{ user.pendingRechageTimes + user.pendingSpendTimes }}</p>
+          </el-form-item>
         </el-col>
       </el-row>
     </el-form>

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

@@ -35,6 +35,16 @@ const addRefund = ref({
   rechargeCoin: 0,
   taskCoin: 0,
 });
+// 取消按钮
+const cancel = function () {
+  addRefund.value = {};
+  addRefund.value.updateType = "退款";
+  addRefund.value.rechargeCoin = 0;
+  addRefund.value.freeCoin = 0;
+  addRefund.value.taskCoin = 0;
+  addRefund.value.allCoin = 0;
+  addRefund.value.adminId = adminData.value.adminId;
+};
 // 这是添加退款信息的接口
 const add = async function () {
   try {
@@ -104,7 +114,7 @@ const checkEndTime = function (rule, value, callback) {
 const rules = reactive({
   jwcode: [{ required: true, message: "请输入精网号", trigger: "blur" }],
   refundType: [{ required: true, message: "请选择退款类型", trigger: "blur" }],
-  refundGoods: [{ required: true, message: "请选择退款商品", trigger: "blur" }],
+  contactId: [{ required: true, message: "请选择退款商品", trigger: "blur" }],
   taskCoin: [{ required: true, message: "请输入任务金币", trigger: "blur" }],
   freeCoin: [{ required: true, message: "请输入免费金币", trigger: "blur" }],
   rechargeCoin: [
@@ -319,9 +329,7 @@ const handleSelectionChange = (value) => {
         placeholder="提交人姓名"
       />
     </el-form-item>
-    <el-button @click="closeAddActivityVisible" style="margin-left: 280px"
-      >取消</el-button
-    >
+    <el-button @click="cancel()" style="margin-left: 280px">重置</el-button>
     <el-button type="primary" @click="addBefore"> 提交 </el-button>
   </el-form>
 

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

@@ -68,7 +68,7 @@ const get = async function (val) {
     }
     console.log("搜索参数", getObj.value);
     // 发送POST请求
-    const result = await API.post("http://192.168.8.174:10040/refund/search", {
+    const result = await API.post("http://192.168.8.93:10060/refund/search", {
       ...getObj.value,
       detail: { ...detail.value },
     });
@@ -241,7 +241,7 @@ const delConfirm = async function () {
     console.log("delObj", delObj.value);
     // 发送POST请求
     const result = await API.post(
-      "http://192.168.8.174:10040/refund/softDelete?detailId=" +
+      "http://192.168.8.93:10060/refund/softDelete?detailId=" +
         delObj.value.detailId
     );
     // 将响应结果存储到响应式数据中