Merge branch 'milestone-20250623-金币前端' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250623-金币前端

4 weeks ago · f2f1944ae0
10 changed files with 42 additions and 19 deletions
--- 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/'
--- 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/'
+# VITE_API_BASE='http://18.143.76.3:10704/'
+VITE_UPLOAD_URL=https://api.homilychart.com/hljw/api/aws/upload
--- 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",
--- a/src/assets/link.png
+++ b/src/assets/link.png
--- a/src/views/audit/rechargeAudit.vue
+++ b/src/views/audit/rechargeAudit.vue
@ -33,7 +33,7 @@
          <el-col :span="12">
            <div class="time-controls">
              <div class="time-group">
-                <el-text size="large">充值时间：</el-text>
+                <el-text size="large" style="width: 80px">充值时间：</el-text>
                <el-date-picker v-model="getTime" type="datetimerange" range-separator="至" start-placeholder="起始时间"
                                end-placeholder="结束时间" style="width: 400px"/>
                <el-button @click="getToday()" style="margin-left: 10px"> 今</el-button>
@ -95,10 +95,10 @@
            <el-table-column prop="payModel" label="支付方式" width="110px"/>
            <el-table-column prop="voucher" label="支付凭证" width="110px">
              <template #default="scope">
-                <div v-if="scope.row.voucher" style="cursor: pointer;" @click="previewImage(scope.row.voucher)">
-                  <img :src="scope.row.voucher" alt="支付凭证" style="width: 80px; height: auto;">
+                <div v-if="scope.row.voucher" style="display: flex; justify-content: center; align-items: center; cursor: pointer;" @click="previewImage(scope.row.voucher)">
+                  <img :src="scope.row.voucher" alt="支付凭证" style="width: auto; height: 40px;">
                </div>
-                <div v-else>--</div>
+                <div v-else style="display: flex; justify-content: center; align-items: center; height: 40px;">--</div>
              </template>
            </el-table-column>
            <el-table-column prop="adminName" label="提交人" width="100px"/>
--- a/src/views/audit/refundAudit.vue
+++ b/src/views/audit/refundAudit.vue
@ -32,7 +32,7 @@
            <el-col :span="15">
              <div class="time-controls">
                <div class="time-group">
-                  <el-text size="large">提交时间：</el-text>
+                  <el-text size="large" style="width: 80px">提交时间：</el-text>
                  <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" start-placeholder="开始时间"
                    end-placeholder="结束时间" style="width: 400px" />
                  <el-button @click="getToday()" style="margin-left: 10px">今</el-button>
--- 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'

--- 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 {
    // 搜索参数页码赋值
--- a/src/views/recharge/addCoinRecharge.vue
+++ b/src/views/recharge/addCoinRecharge.vue
@ -675,16 +675,16 @@ onMounted(() => {
          <span
            style="color: #2fa1ff; margin-right: 5px"
            v-if="user.nowSumGold !== undefined"
-          >{{ user.nowSumGold }}</span>
+          >{{ user.nowSumGold /100}}</span>
        </el-form-item>
        <!-- 金币详情独立显示 -->
        <el-form-item style="margin-top: -23px">  <!-- 负边距减少间距 -->
          <span
            style="color: #b1b1b1; margin-left: 0px"
            v-if="user.nowPermanentGold !== undefined"
-          >(永久金币:{{ user.nowPermanentGold }};
-            免费金币:{{ user.nowFreeGold }};
-            任务金币:{{ user.nowTaskGold }})</span>
+          >(永久金币:{{ user.nowPermanentGold /100}};
+            免费金币:{{ user.nowFreeGold /100}};
+            任务金币:{{ user.nowTaskGold /100}})</span>
        </el-form-item>
      </el-col>
    </el-row>
--- 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