优化页面

2025-05-27 21:05:01 +08:00
parent cf8728f0d7
commit e682754922
28 changed files with 2742 additions and 2434 deletions
--- a/unpackage/dist/dev/mp-weixin/pages/Home/Home.js
+++ b/unpackage/dist/dev/mp-weixin/pages/Home/Home.js
@@ -1,5 +1,6 @@
 "use strict";
 const common_vendor = require("../../common/vendor.js");
+const components_TUILogin = require("../../components/TUILogin.js");
 const common_assets = require("../../common/assets.js");
 const topNavigation = () => "../../components/topNavigation/topNavigation.js";
 const Advertisement = () => "../../components/Advertisement/Advertisement.js";
@@ -8,9 +9,32 @@ const tabBar = () => "../../components/tabBar/tabBar.js";
 const _sfc_main = {
  inject: ["$global"],
  data() {
-    return {};
+    return {
+      info: {},
+      myuserSig: "",
+      chatInfo: {}
+    };
  },
  onLoad() {
+    common_vendor.index.getStorage({
+      key: "userinfo",
+      success: (res) => {
+        this.info = res.data;
+        common_vendor.index.getStorage({
+          key: "myuserSig",
+          success: (res2) => {
+            this.myuserSig = res2.data;
+            common_vendor.index.getStorage({
+              key: "chatInfo",
+              success: (res3) => {
+                this.chatInfo = res3.data;
+                components_TUILogin.TUIlogin(this.chatInfo.appId, this.info.id, this.myuserSig.userSig);
+              }
+            });
+          }
+        });
+      }
+    });
  },
  methods: {
    goAdvertisement() {
--- a/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.js
+++ b/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.js
@@ -1,8 +1,10 @@
 "use strict";
 const common_vendor = require("../../common/vendor.js");
 const components_formatDate = require("../../components/formatDate.js");
-const components_VerifyLogin = require("../../components/VerifyLogin.js");
+const components_TimeFormatting = require("../../components/TimeFormatting.js");
 const components_request = require("../../components/request.js");
+const TUIKit_components_TUIChat_utils_utils = require("../../TUIKit/components/TUIChat/utils/utils.js");
+const TUIKit_components_TUIChat_offlinePushInfoManager_index = require("../../TUIKit/components/TUIChat/offlinePushInfoManager/index.js");
 const common_assets = require("../../common/assets.js");
 const NewAddedPk = () => "../NewAddedPk/NewAddedPk2.js";
 const _sfc_main = {
@@ -10,14 +12,19 @@ const _sfc_main = {
    return {
      item: {},
      id: 0,
-      list: []
+      InvitingPartyEventID: null,
+      list: [],
+      selectedId: null,
+      InvitingPartyEventindex: null,
+      chatInfo: {},
+      currentConversation: null
    };
  },
  onLoad(options) {
    const eventChannel = this.getOpenerEventChannel();
    eventChannel.on("itemDetail", (data) => {
      this.item = data.item;
-      common_vendor.index.__f__("log", "at pages/pkDetail/pkDetail.vue:79", "接收到的数据:", this.item);
+      common_vendor.index.__f__("log", "at pages/pkDetail/pkDetail.vue:105", "接收到的数据:", this.item);
    });
    common_vendor.index.getStorage({
      key: "userinfo",
@@ -25,9 +32,27 @@ const _sfc_main = {
        this.id = res.data.id;
      }
    });
+    common_vendor.index.getStorage({
+      key: "chatInfo",
+      success: (res) => {
+        this.chatInfo = res.data;
+      }
+    });
  },
  methods: {
    formatDate: components_formatDate.formatDate,
+    TimeFormatting: components_TimeFormatting.TimeFormatting,
+    Select(id, index) {
+      if (this.selectedId === id) {
+        this.selectedId = null;
+        this.InvitingPartyEventID = null;
+        this.InvitingPartyEventindex = null;
+      } else {
+        this.selectedId = this.selectedId === id ? null : id;
+        this.InvitingPartyEventID = id;
+        this.InvitingPartyEventindex = index;
+      }
+    },
    Returnfunc() {
      common_vendor.index.navigateBack({
        delta: 1
@@ -38,16 +63,52 @@ const _sfc_main = {
      this.userlist();
    },
    invite() {
+      var _a, _b;
+      if (this.item.pkTime !== this.list[this.InvitingPartyEventindex].pkTime) {
+        common_vendor.index.showToast({
+          icon: "none",
+          title: "请保持时间一致"
+        });
+        return;
+      }
+      const payload = {
+        data: JSON.stringify({
+          businessID: "pk",
+          title: "PK邀请",
+          buttonText1: "接受邀请",
+          buttonText2: "拒绝邀请"
+        }),
+        description: "邀请参加PK",
+        extension: "邀请参加PK"
+      };
+      common_vendor.Jt.watch(common_vendor.o.CONV, {
+        currentConversation: (conversation) => {
+          this.currentConversation = conversation;
+        }
+      });
+      const options = {
+        to: `C2C${this.list[this.InvitingPartyEventindex].senderId}`,
+        conversationType: (_b = (_a = this.currentConversation) == null ? void 0 : _a.value) == null ? void 0 : _b.type,
+        payload,
+        needReadReceipt: TUIKit_components_TUIChat_utils_utils.isEnabledMessageReadReceiptGlobal()
+      };
+      const offlinePushInfoCreateParams = {
+        conversation: this.currentConversation,
+        payload: options.payload,
+        messageType: common_vendor.qt.TYPES.MSG_CUSTOM
+      };
+      const sendMessageOptions = {
+        offlinePushInfo: TUIKit_components_TUIChat_offlinePushInfoManager_index.OfflinePushInfoManager.create(offlinePushInfoCreateParams)
+      };
+      common_vendor.Qt.sendCustomMessage(options, sendMessageOptions);
    },
    close() {
      this.$refs.popup.close();
    },
    openChat() {
-      components_VerifyLogin.VerifyLogin().then(() => {
-        const conversationID = `C2C${this.item.senderId}`;
-        common_vendor.index.redirectTo({
-          url: `/TUIKit/components/TUIChat/index?conversationID=${conversationID}`
-        });
+      const conversationID = `C2C${this.item.senderId}`;
+      common_vendor.index.redirectTo({
+        url: `/TUIKit/components/TUIChat/index?conversationID=${conversationID}`
      });
    },
    async userlist() {
@@ -56,7 +117,7 @@ const _sfc_main = {
        mask: true
      });
      const res = await components_request.request({
-        url: "pk/queryMyPkData",
+        url: "pk/queryMyCanUsePkData",
        method: "POST",
        data: {
          userId: this.id
@@ -66,7 +127,7 @@ const _sfc_main = {
      if (res.code === 200) {
        if (res.data.length !== 0) {
          common_vendor.index.hideLoading();
-          common_vendor.index.__f__("log", "at pages/pkDetail/pkDetail.vue:133", "res.data", res.data);
+          common_vendor.index.__f__("log", "at pages/pkDetail/pkDetail.vue:214", "res.data", res.data);
          this.list = res.data;
        } else {
          common_vendor.index.hideLoading();
@@ -112,7 +173,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
    j: common_vendor.o$1(($event) => $options.openChat()),
    k: common_vendor.o$1(($event) => $options.open()),
    l: common_vendor.f($data.list, (item, index, i0) => {
-      return {};
+      return {
+        a: item.anchorIcon,
+        b: common_vendor.t(item.anchorId),
+        c: common_vendor.t($options.TimeFormatting(item.pkTime)),
+        d: common_vendor.t(item.coin),
+        e: common_vendor.o$1(($event) => $options.Select(item.id, index)),
+        f: $data.selectedId === item.id ? "2px solid red" : "2px solid #afafaf"
+      };
    }),
    m: common_vendor.o$1(($event) => $options.invite()),
    n: common_vendor.o$1(($event) => $options.close()),
--- a/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.json
+++ b/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.json
@@ -1,7 +1,7 @@
 {
  "navigationBarTitleText": "PK详情",
  "usingComponents": {
-    "new-added-pk": "../NewAddedPk/NewAddedPk",
-    "uni-popup": "../../uni_modules/uni-popup/components/uni-popup/uni-popup"
+    "uni-popup": "../../uni_modules/uni-popup/components/uni-popup/uni-popup",
+    "new-added-pk": "../NewAddedPk/NewAddedPk"
  }
 }
--- a/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.wxml
@@ -1 +1 @@
-<view class="Navigation data-v-9639f721"><image src="{{a}}" mode="scaleToFill" class="Navigationimg data-v-9639f721"/><image bindtap="{{b}}" src="{{c}}" mode="scaleToFill" class="Return data-v-9639f721"/></view><view class="container data-v-9639f721"><view class="individual data-v-9639f721"><view class="anchor data-v-9639f721"></view><view class="data-v-9639f721"><view class="data-v-9639f721">主播名称{{d}}</view><view class="data-v-9639f721">主播性别{{e}}</view><view class="data-v-9639f721"> 国家{{f}}</view></view></view><view class="data-v-9639f721">金币{{g}}</view><view class="data-v-9639f721">PK时间{{h}}</view><view class="data-v-9639f721">主播备注{{i}}</view><button class="data-v-9639f721" bindtap="{{j}}">聊了个天</button><button class="data-v-9639f721" bindtap="{{k}}">立即邀请PK</button></view><uni-popup wx:if="{{p}}" class="r data-v-9639f721" u-s="{{['d']}}" u-r="popup" u-i="9639f721-0" bind:__l="__l" u-p="{{p}}"><view class="popup-content data-v-9639f721"><view class="popup-title data-v-9639f721"><scroll-view scroll-y="true" class="scroll data-v-9639f721"><view wx:for="{{l}}" wx:for-item="item" class="card data-v-9639f721"><view class="card-content data-v-9639f721"></view></view></scroll-view></view><view class="popup-btn data-v-9639f721"><button class="invite data-v-9639f721" type="primary" bindtap="{{m}}">邀请</button><button class="cancel data-v-9639f721" type="default" bindtap="{{n}}">取消</button></view></view></uni-popup><new-added-pk class="createModule r data-v-9639f721" u-r="createModule" u-i="9639f721-1" bind:__l="__l"></new-added-pk>
+<view class="Navigation data-v-9639f721"><image src="{{a}}" mode="scaleToFill" class="Navigationimg data-v-9639f721"/><image bindtap="{{b}}" src="{{c}}" mode="scaleToFill" class="Return data-v-9639f721"/></view><view class="container data-v-9639f721"><view class="individual data-v-9639f721"><view class="anchor data-v-9639f721"></view><view class="data-v-9639f721"><view class="data-v-9639f721">主播名称{{d}}</view><view class="data-v-9639f721">主播性别{{e}}</view><view class="data-v-9639f721"> 国家{{f}}</view></view></view><view class="data-v-9639f721">金币{{g}}</view><view class="data-v-9639f721">PK时间{{h}}</view><view class="data-v-9639f721">主播备注{{i}}</view><button class="data-v-9639f721" bindtap="{{j}}">聊了个天</button><button class="data-v-9639f721" bindtap="{{k}}">立即邀请PK</button></view><uni-popup wx:if="{{p}}" class="r data-v-9639f721" u-s="{{['d']}}" u-r="popup" u-i="9639f721-0" bind:__l="__l" u-p="{{p}}"><view class="popup-content data-v-9639f721"><view class="popup-title data-v-9639f721"><scroll-view scroll-y="true" class="scroll data-v-9639f721"><view wx:for="{{l}}" wx:for-item="item" class="card data-v-9639f721"><view class="card-content data-v-9639f721" bindtap="{{item.e}}" style="{{'border:' + item.f}}"><image class="avatar data-v-9639f721" src="{{item.a}}" mode="scaleToFill"/><view class="NameMoney data-v-9639f721"><view class="NameMoney_Name data-v-9639f721">{{item.b}}</view><view class="TimeMoney data-v-9639f721"><view class="data-v-9639f721">{{item.c}}</view><view class="data-v-9639f721">金币:{{item.d}}</view></view></view></view></view></scroll-view></view><view class="popup-btn data-v-9639f721"><button class="invite data-v-9639f721" type="primary" bindtap="{{m}}">邀请</button><button class="cancel data-v-9639f721" type="default" bindtap="{{n}}">取消</button></view></view></uni-popup><new-added-pk class="createModule r data-v-9639f721" u-r="createModule" u-i="9639f721-1" bind:__l="__l"></new-added-pk>
--- a/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.wxss
@@ -75,12 +75,8 @@
 .scroll.data-v-9639f721 {
  width: 470rpx;
  height: 500rpx;
-  border: 1px solid #afafaf;
+  border: 2px solid #afafaf;
  border-radius: 10px;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
 }
 .card.data-v-9639f721 {
  margin-top: 10rpx;
@@ -88,14 +84,34 @@
 }
 .card-content.data-v-9639f721 {
  width: 445rpx;
-  height: 70rpx;
-  border: 1px solid #afafaf;
+  height: 75rpx;
+  /* border: 2px solid #afafaf; */
  border-radius: 10px;
+  display: flex;
+  font-size: 28rpx;
+  color: rgb(127, 127, 127);
 }
-.createModule.data-v-9639f721{
-    position: fixed;
-    bottom: 0;
-    right: 0;
-    z-index: 998;
-    width: 100vw;
+.createModule.data-v-9639f721 {
+  position: fixed;
+  bottom: 0;
+  right: 0;
+  z-index: 998;
+  width: 100vw;
+}
+.avatar.data-v-9639f721 {
+  width: 60rpx;
+  height: 60rpx;
+  border-radius: 50%;
+}
+.TimeMoney.data-v-9639f721 {
+  width: 300rpx;
+  display: flex;
+  justify-content: space-between;
+}
+.NameMoney.data-v-9639f721 {
+  display: flex;
+  flex-direction: column;
+}
+.NameMoney_Name.data-v-9639f721 {
+  text-align: left;
 }