diff --git a/.env.development b/.env.development index e3a60cd..4938f73 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,6 @@ -# VITE_API_BASE='https://hwjb.homilychart.com/admin/' +VITE_API_BASE='https://hwjb.homilychart.com/admin' # VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' -VITE_API_BASE='http://192.168.8.242:8081/' +# VITE_API_BASE='http://192.168.8.242:8081/' # VITE_API_BASE='http://18.143.76.3:10704/' # VITE_API_BASE='http://192.168.9.28:8081/' # VITE_API_BASE='http://192.168.8.94:8081/' diff --git a/.env.test b/.env.test index afb777c..1879950 100644 --- a/.env.test +++ b/.env.test @@ -1,3 +1,4 @@ # VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' VITE_API_BASE='https://hwjb.homilychart.com/admin/' -# VITE_API_BASE='http://18.143.76.3:10704/' \ No newline at end of file +# VITE_API_BASE='http://18.143.76.3:10704/' +VITE_UPLOAD_URL=https://api.homilychart.com/hljw/api/aws/upload \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index d981d98..de43ca2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3522,9 +3522,8 @@ }, "node_modules/dayjs-plugin-utc": { "version": "0.1.2", - "resolved": "https://registry.npmjs.org/dayjs-plugin-utc/-/dayjs-plugin-utc-0.1.2.tgz", - "integrity": "sha512-ExERH5o3oo6jFOdkvMP3gytTCQ9Ksi5PtylclJWghr7k7m3o2U5QrwtdiJkOxLOH4ghr0EKhpqGefzGz1VvVJg==", - "license": "MIT" + "resolved": "https://registry.npmmirror.com/dayjs-plugin-utc/-/dayjs-plugin-utc-0.1.2.tgz", + "integrity": "sha512-ExERH5o3oo6jFOdkvMP3gytTCQ9Ksi5PtylclJWghr7k7m3o2U5QrwtdiJkOxLOH4ghr0EKhpqGefzGz1VvVJg==" }, "node_modules/de-indent": { "version": "1.0.2", diff --git a/src/assets/link.png b/src/assets/link.png new file mode 100644 index 0000000..74f98cb Binary files /dev/null and b/src/assets/link.png differ diff --git a/src/views/audit/rechargeAudit.vue b/src/views/audit/rechargeAudit.vue index 301ecde..fc702b0 100644 --- a/src/views/audit/rechargeAudit.vue +++ b/src/views/audit/rechargeAudit.vue @@ -33,7 +33,7 @@
- 充值时间: + 充值时间: @@ -95,10 +95,10 @@ diff --git a/src/views/audit/refundAudit.vue b/src/views/audit/refundAudit.vue index eedf247..1deff6b 100644 --- a/src/views/audit/refundAudit.vue +++ b/src/views/audit/refundAudit.vue @@ -32,7 +32,7 @@
- 提交时间: + 提交时间: diff --git a/src/views/home.vue b/src/views/home.vue index 1389824..056b884 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -7,7 +7,7 @@ import { VscGlobe } from 'vue-icons-plus/vsc' import { ElMessage } from 'element-plus' import axios from 'axios' import API from '@/util/http' -import dmmn from '../assets/blue.png' +import dmmn from '../assets/link.png' import { useRoute } from 'vue-router' import moment from 'moment' diff --git a/src/views/permissions/permission.vue b/src/views/permissions/permission.vue index 4bdb383..1d5e244 100644 --- a/src/views/permissions/permission.vue +++ b/src/views/permissions/permission.vue @@ -46,6 +46,7 @@ const addAdmin = ref({ remark: '' }) const addMachineIdInput = function () { // 为啥>=1?????????????? + // 因为需求写的是最多两个机器码,这个点击了添加后,可以写或者不写,也就是0和1,所以>=1 if (addAdmin.value.machineIds.length >= 1) { ElMessage.warning('设备数量已达上限') return @@ -58,7 +59,7 @@ const permissionEditObj = ref({}) // 删除权限对象 const delObj = ref({}) -// 搜索接口search +// 搜索接口 const get = async function (val) { try { // 搜索参数页码赋值 diff --git a/src/views/recharge/addCoinRecharge.vue b/src/views/recharge/addCoinRecharge.vue index 396527a..a25a5a7 100644 --- a/src/views/recharge/addCoinRecharge.vue +++ b/src/views/recharge/addCoinRecharge.vue @@ -675,16 +675,16 @@ onMounted(() => { {{ user.nowSumGold }} + >{{ user.nowSumGold /100}} (永久金币:{{ user.nowPermanentGold }}; - 免费金币:{{ user.nowFreeGold }}; - 任务金币:{{ user.nowTaskGold }}) + >(永久金币:{{ user.nowPermanentGold /100}}; + 免费金币:{{ user.nowFreeGold /100}}; + 任务金币:{{ user.nowTaskGold /100}}) diff --git a/src/views/refund/addCoinRefund.vue b/src/views/refund/addCoinRefund.vue index 4504f1e..c7e398c 100644 --- a/src/views/refund/addCoinRefund.vue +++ b/src/views/refund/addCoinRefund.vue @@ -152,12 +152,31 @@ const rules = reactive({ ] }) + +// 取消按钮 +const cancelExceptJwcode = function () { + addRefund.value = { + jwcode: addRefund.value.jwcode, // 保留精网号 + goodsName: '', + refundType: '', + refundModel: 0, + permanentGold: '', + freeGold: '', + taskGold: '', + sumGold: 0, + remark: '', + adminId: adminData.value.id + } + addRe.value.typeR = '0' +} + // 查找客户信息的方法 const user = ref({ firstRechargeTime: '' }) const getUser = async function (jwcode) { trimJwCode(); + cancelExceptJwcode(); try { // 发送POST请求 const result = await API({ @@ -190,7 +209,7 @@ const getUser = async function (jwcode) { } catch (error) { console.log("请求失败", error); ElMessage.error("查询失败,请检查精网号是否正确"); - // 在这里可以处理错误逻辑,比如显示错误提示等 + } } @@ -222,10 +241,14 @@ const getRefundTypes = async function () { } } + + + // 根据精网号查询商品 const goodsName = ref([]) const getGoods = async function (jwcode) { trimJwCode(); + // 只有精网号存在时才发送请求 if (!addRefund.value.jwcode) { goodsName.value = []; // 清空商品数据 @@ -234,7 +257,6 @@ const getGoods = async function (jwcode) { try { // 发送POST请求 const result = await API({ - // url: 'http://39.101.133.168:8828/live_mall/api/product/all', //需要接口 url: '/refund/selectGoods', data: { jwcode: addRefund.value.jwcode