fix: rank

script/config/webpack.dev.ts

@@ -99,19 +99,11 @@ export default new Promise((resolve) => {
               },
             },
             '/prodapi': {
-              target: 'http://42.193.157.44:3200',
+              target: 'https://live.hsslive.cn',
               secure: false,
               changeOrigin: true,
               pathRewrite: {
-                '^/prodapi': '/admin/',
-              },
-            },
-            '/betaapi': {
-              target: 'http://42.193.157.44:3300',
-              secure: false,
-              changeOrigin: true,
-              pathRewrite: {
-                '^/betaapi': '/admin/',
+                '^/prodapi': '/api/',
               },
             },
           },

src/api/live.ts

@@ -2,7 +2,7 @@ import request from '@/utils/request';
 
 export function fetchLiveList(params: { orderName: string; orderBy: string }) {
   return request.instance({
-    url: '/api/live/list',
+    url: '/live/list',
     method: 'get',
     params,
   });

src/api/order.ts

@@ -1,3 +1,4 @@
+import { IList, IOrder } from '@/interface';
 import request from '@/utils/request';
 
 /**
@@ -13,7 +14,7 @@ export function fetchAliPay(data: {
   body: string;
 }) {
   return request.instance({
-    url: '/api/order/pay',
+    url: '/order/pay',
     method: 'post',
     data,
   });
@@ -26,7 +27,7 @@ export function fetchAliPay(data: {
  */
 export function fetchAliPayStatus(params: { out_trade_no: string }) {
   return request.instance({
-    url: '/api/order/pay_status',
+    url: '/order/pay_status',
     method: 'get',
     params,
   });
@@ -36,9 +37,10 @@ export function fetchAliPayStatus(params: { out_trade_no: string }) {
  * @param out_trade_no 订单支付时传入的商户订单号
  * @returns
  */
-export function fetchAliPayList() {
+export function fetchOrderList(params: IList<IOrder>) {
   return request.instance({
-    url: '/api/order/order_list',
+    url: '/order/order_list',
     method: 'get',
+    params,
   });
 }

src/api/qqUser.ts

@@ -3,7 +3,7 @@ import request from '@/utils/request';
 // qq登录
 export function fetchQQLogin(code: any) {
   return request.instance({
-    url: `/api/qq_user/login`,
+    url: `/qq_user/login`,
     method: 'post',
     data: { code },
   });

src/api/srs.ts

@@ -8,7 +8,8 @@ export function fetchRtcV1Publish(data: {
   tid: string;
 }) {
   return request.instance({
-    url: `/srs/rtc/v1/publish/`,
+    baseURL: '/srs',
+    url: `/rtc/v1/publish/`,
     method: 'post',
     data,
   });
@@ -21,7 +22,8 @@ export function fetchRtcV1Play(data: {
   tid: string;
 }) {
   return request.instance({
-    url: '/srs/rtc/v1/play/',
+    baseURL: '/srs',
+    url: '/rtc/v1/play/',
     method: 'post',
     data,
   });

src/api/user.ts

@@ -3,11 +3,11 @@ import request from '@/utils/request';
 
 export function fetchUserInfo() {
   return request.instance({
-    url: '/api/user/get_user_info',
+    url: '/user/get_user_info',
     method: 'get',
   });
 }
 
 export function fetchUserList() {
-  return request.get<IPaging<IUser>>('/api/user/list');
+  return request.get<IPaging<IUser>>('/user/list');
 }

src/interface.ts

@@ -1,5 +1,22 @@
 // 这里放项目里面的类型
 
+export enum PayStatusEnum {
+  error = 'error',
+  WAIT_BUYER_PAY = 'WAIT_BUYER_PAY',
+  TRADE_SUCCESS = 'TRADE_SUCCESS',
+}
+
+export type IList<T> = {
+  nowPage?: string;
+  pageSize?: string;
+  orderBy?: string;
+  orderName?: string;
+  keyWord?: string;
+  rangTimeType?: 'created_at' | 'updated_at' | 'deleted_at';
+  rangTimeStart?: string;
+  rangTimeEnd?: string;
+} & T;
+
 export interface IPaging<T> {
   nowPage: number;
   pageSize: number;
@@ -8,6 +25,29 @@ export interface IPaging<T> {
   rows: T[];
 }
 
+export interface IOrder {
+  id?: number;
+  billd_live_user_id?: number;
+  user: IUser;
+  out_trade_no?: string;
+  total_amount?: string;
+  subject?: string;
+  product_code?: string;
+  qr_code?: string;
+  buyer_logon_id?: string;
+  buyer_pay_amount?: string;
+  buyer_user_id?: string;
+  invoice_amount?: string;
+  point_amount?: string;
+  receipt_amount?: string;
+  send_pay_date?: string;
+  trade_no?: string;
+  trade_status?: string;
+  created_at?: string;
+  updated_at?: string;
+  deleted_at?: string;
+}
+
 export enum liveTypeEnum {
   webrtcPull = 'webrtcPull',
   srsWebrtcPull = 'srsWebrtcPull',

src/utils/request.ts

@@ -117,6 +117,7 @@ class MyAxios {
 }
 
 export default new MyAxios({
-  // baseURL:'/'
+  baseURL: '/api',
+  // baseURL: '/prodapi',
   timeout: 1000 * 5,
 });

src/views/about/index.vue

@@ -1,11 +1,17 @@
 <template>
   <div class="about-wrap">
-    <h2>有空再写，微信交流群：</h2>
+    <h2>有空再写</h2>
+    <h2>微信交流群 & 我的微信</h2>
     <img
       src="@/assets/img/wechat-group.webp"
       alt=""
       class="wechat-group"
     />
+    <img
+      src="@/assets/img/my-wechat.webp"
+      alt=""
+      class="my-wechat"
+    />
   </div>
 </template>
 
@@ -15,7 +21,10 @@
 .about-wrap {
   text-align: center;
   .wechat-group {
-    width: 400px;
+    height: 500px;
+  }
+  .my-wechat {
+    height: 500px;
   }
 }
 </style>

src/views/rank/index.vue

@@ -41,7 +41,7 @@
           class="top50-item"
         >
           <div class="rank">
-            <i>{{ item.rank > 10 ? item.rank : '0' + item.rank }}</i>
+            <i>{{ item.rank >= 10 ? item.rank : '0' + item.rank }}</i>
           </div>
           <div class="left">
             <img
@@ -220,9 +220,11 @@ onMounted(() => {
           background-color: #fafbfc;
         }
         .rank {
+          width: 80px;
+          box-sizing: border-box;
           margin-right: 20px;
-          padding: 0 20px;
           border-radius: 40px;
+          text-align: center;
           background-color: #84f9da;
           color: white;
           font-size: 20px;

src/views/sponsors/index.vue

@@ -10,6 +10,18 @@
         class="item"
       >
         <div class="time">发起时间：{{ item.created_at }}，</div>
+        <div class="user">
+          <template v-if="item.user">
+            <img
+              :src="item.user.avatar"
+              class="avatar"
+              alt=""
+            />
+            <span class="username">{{ item.user.username }}</span>
+          </template>
+          <span v-else>游客</span>，
+        </div>
+
         <div class="account">支付宝账号：{{ item.buyer_logon_id }}，</div>
         <div class="gift">
           赞助了：{{ item.subject }}（{{ item.total_amount }}元），
@@ -79,7 +91,8 @@ import { hrefToTarget, isMobile } from 'billd-utils';
 import QRCode from 'qrcode';
 import { onMounted, onUnmounted, ref } from 'vue';
 
-import { fetchAliPay, fetchAliPayList, fetchAliPayStatus } from '@/api/order';
+import { fetchAliPay, fetchAliPayStatus, fetchOrderList } from '@/api/order';
+import { IOrder, PayStatusEnum } from '@/interface';
 
 const payOk = ref(false);
 const onMountedTime = ref('');
@@ -90,34 +103,7 @@ const receiveMoney = ref(0);
 const downTime = ref();
 const downTimeEnd = ref();
 
-const payList = ref<IPay[]>([]);
-
-interface IPay {
-  id: number;
-  out_trade_no: string;
-  total_amount: string;
-  subject: string;
-  product_code: string;
-  qr_code: string;
-  buyer_logon_id: string;
-  buyer_pay_amount: string;
-  buyer_user_id: string;
-  invoice_amount: string;
-  point_amount: string;
-  receipt_amount: string;
-  send_pay_date: string;
-  trade_no: string;
-  trade_status: string;
-  created_at: string;
-  updated_at: string;
-  deleted_at: null | string;
-}
-
-enum PayStatusEnum {
-  error = 'error',
-  WAIT_BUYER_PAY = 'WAIT_BUYER_PAY',
-  TRADE_SUCCESS = 'TRADE_SUCCESS',
-}
+const payList = ref<IOrder[]>([]);
 
 const currentPayStatus = ref(PayStatusEnum.error);
 
@@ -209,12 +195,15 @@ function handleDownTime() {
 
 async function getPayList() {
   try {
-    const res = await fetchAliPayList();
+    const res = await fetchOrderList({
+      trade_status: PayStatusEnum.TRADE_SUCCESS,
+    });
     if (res.code === 200) {
       payList.value = res.data.rows;
-      receiveMoney.value = payList.value
-        .filter((item) => item.trade_status !== PayStatusEnum.WAIT_BUYER_PAY)
-        .reduce((pre, item) => pre + Number(item.total_amount) * 100, 0);
+      receiveMoney.value = payList.value.reduce(
+        (pre, item) => pre + Number(item.total_amount) * 100,
+        0
+      );
     }
   } catch (error) {
     console.log(error);
@@ -294,6 +283,21 @@ function getPayStatus(outTradeNo: string) {
       width: 100%;
       text-align: left;
 
+      .user {
+        width: 120px;
+        padding: 0 10px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        .avatar {
+          width: 30px;
+          height: 30px;
+          border-radius: 50%;
+        }
+        .username {
+          @extend %singleEllipsis;
+        }
+      }
       .account {
         width: 250px;
       }