0514pm upload

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

@@ -429,13 +429,9 @@ const handleSortChange = (column) => {
     sortField.value = 'create_time'
   } 
   sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC'
-<<<<<<< HEAD
   console.log('传递给后端的排序字段：', sortField.value)
   console.log('传递给后端的排序方式：', sortOrder.value)
   get()
-=======
-
->>>>>>> 5aefc9797093fe880ef02c9f28fafc3a6ed2d444
 }
 </script>
 
@@ -659,11 +655,7 @@ const handleSortChange = (column) => {
             />
             <el-table-column
               prop="rechargeTime"
-<<<<<<< HEAD
-              sortable="custom"
-=======
               sortable
->>>>>>> 5aefc9797093fe880ef02c9f28fafc3a6ed2d444
               label="交款时间"
               width="200px"
             >

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

@@ -151,15 +151,17 @@ const getUser = async function (jwcode) {
     })
     console.log('请求成功', result)
 
+    //在此处错误逻辑的提示做了注释，在后续商品查询接口返回错误时，提示信息会显示在弹窗中
     if (result.code === 0) {
-      ElMessage.error(result.msg)
+      
+      //ElMessage.error(result.msg)
     } else {
       user.value = result.data
       user.value.A =
         Number(user.value.pendingRechargeTimes) +
         Number(user.value.pendingSpendTimes)
       console.log('用户信息', user.value)
-      ElMessage.success(result.msg)
+      //ElMessage.success(result.msg)
     }
   } catch (error) {
     console.log('请求失败', error)