优化页面

2025-06-06 22:36:41 +08:00
parent f4901f1312
commit d30589fd05
99 changed files with 1091 additions and 1310 deletions
--- a/pages/Forum/Forum.vue
+++ b/pages/Forum/Forum.vue
@@ -0,0 +1,56 @@
+<template>
+    <view class="forum">
+        <view class="bg">
+      <image class="bgImg" src="../../static/HomeBackground.png" mode="scaleToFill" />
+    </view>
+    <view class="title">论坛</view>
+
+
+    </view>
+    <view class="tabBar">
+    <tabBar></tabBar>
+  </view>
+</template>
+
+<script>
+import tabBar from "../../components/tabBar/tabBar";
+    export default {
+        data() {
+            return {
+                title: 'Hello'
+            }
+        },
+        onLoad() {
+            // 页面加载时执行
+        },
+        methods: {
+            // 方法定义
+        },
+        components: {
+            tabBar
+        }
+    }
+</script>
+
+<style scoped>
+.bg {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: -1;
+}
+.bgImg {
+  width: 100%;
+  height: 100%;
+}
+.title {
+  position: absolute;
+  top: 120rpx;
+  left: 345rpx;
+  font-size: 34rpx;
+  color: #100e0f;
+  font-weight: bold;
+}
+</style>
--- a/pages/Home/Home.vue
+++ b/pages/Home/Home.vue
@@ -83,11 +83,15 @@ export default {
      list: [], // 列表数据
      detailsdata: {}, //详情数据
      triggered: false, //下拉刷新标识
+      RealTimePklist: [], // PK大厅列表数据
+      MakeAppointmentPKlist: [], // 今日PK列表数据
+      listtype: 1, // 列表类型 1 当天 2 大于当天
    };
  },
  mounted() {
    // 页面加载完成后请求数据
-    this.pkList();
+    this.pkList({type:2});
+    this.pkList({type:1});
  },
  onLoad() {
    uni.getStorage({
@@ -104,13 +108,6 @@ export default {
              success: (res) => {
                this.chatInfo = res.data;
                TUIlogin(this.chatInfo.appId, this.info.id, this.myuserSig.userSig);
-                // let options = {
-                //   SDKAppID: this.chatInfo.appId,
-                // };
-                // console.log("`````````````````````````````````````````", this.chatInfo);
-                // let chat = TencentCloudChat.create(options);
-                // console.log("chat````````````````````````````````````````", this.chat);
-                // chat.login({ userID: String(this.info.id), userSig: this.myuserSig.userSig });
              },
            });
          },
@@ -119,11 +116,13 @@ export default {
    });
  },
  methods: {
-    goRealTimePk() {
-      console.log("goRealTimePk");
-    },
    goMakeAppointmentPK() {
-      console.log("goMakeAppointmentPK");
+      this.listtype = 1;
+      this.list = this.MakeAppointmentPKlist;
+    },
+    goRealTimePk() {
+        this.listtype = 2;
+        this.list = this.RealTimePklist;
    },
    goAdvertisement() {
      // this.$global.lastPage = getCurrentPages().router;
@@ -132,8 +131,13 @@ export default {
    onRefresherRefresh() {
      this.page = 0;
      this.list = [];
+      if(this.listtype === 1){
+        this.MakeAppointmentPKlist = [];
+      }else{
+        this.RealTimePklist = [];
+      }
      this.triggered = true;
-      this.pkList();
+      this.pkList({type:this.listtype});
    },
    async goDetail(item) {
      uni.showLoading({
@@ -177,7 +181,8 @@ export default {
      }
    },
    formatDate: formatDate,
-    async pkList() {
+
+    async pkList(condition) {
      const res = await request({
        url: "pk/pkList",
        method: "POST",
@@ -185,21 +190,27 @@ export default {
          status: 0,
          page: this.page,
          size: this.size,
+          condition:condition
        },
        userInfo: false,
      });
      console.log(res);
      if (res.code === 200) {
-        this.list.push(...res.data);
-        console.log(this.list);
        this.triggered = false;
+        if (condition.type === 1) {
+          this.MakeAppointmentPKlist.push(...res.data);
+          this.list = this.MakeAppointmentPKlist;
+        } else {
+          this.RealTimePklist.push(...res.data);
+          this.list = this.RealTimePklist;
+        }
+        }
      }
    },
    onScrollToLower() {
      this.page++;
-      this.pkList();
+      this.pkList({type:this.listtype});
    },
-  },
  components: {
    topNavigation,
    Advertisement,
--- a/pages/Mine/Mine.vue
+++ b/pages/Mine/Mine.vue
@@ -54,16 +54,16 @@
          </view>
        </view>
        <view class="card">
-          <view class="cardContent">
+          <view class="cardContent"v-for="(item,index) in myPkRecorddata" :key="index">
            <view class="cardImg">
-              <image src="" mode="scaleToFill" />
+              <image :src="item.anchorIconA" mode="scaleToFill" />
            </view>
-            <!-- <view class="Failure">
+            <view class="Failure"v-if="item.winnerAnchorId !== item.anchorIdA">
                    失败
-                  </view> -->
-            <view class="Result"> 胜利 </view>
-            <view class="Session"> 共一场 </view>
-            <view class="Time"> 20:30 </view>
+                  </view>
+            <view class="Result" v-else-if="item.winnerAnchorId === item.anchorIdA"> 胜利 </view>
+            <view class="Session"> 共{{item.pkNumber}}场 </view>
+            <view class="Time">{{TimeFormatting(item.pkTime)}}</view>
          </view>
        </view>
      </view>
@@ -84,7 +84,7 @@
          <view class="cardtext">联系客服</view>
        </view>

-        <view class="service">
+        <view class="service" @click="serviceProtocol">
          <image
            style="width: 48.28rpx; height: 48.09rpx"
            src="../../static/Agreement.png"
@@ -115,6 +115,7 @@
 import tabBar from "../../components/tabBar/tabBar";
 import request from "../../components/request.js";
 import formatDate from "../../components/formatDate.js";
+import TimeFormatting from "../../components/TimeFormatting.js";

 export default {
  data() {
@@ -137,6 +138,7 @@ export default {
  },
  methods: {
    formatDate: formatDate,
+    TimeFormatting: TimeFormatting,
    //获取pk信息
    getpkInformation(){
      const res = request({
@@ -202,20 +204,15 @@ export default {
        url: "/pages/Setting/Setting",
      });
    },
+    // 跳转到服务协议页面
+    serviceProtocol() {
+      uni.navigateTo({
+        url: "/pages/Mine/minecomponents/serviceProtocol",
+      });
+    },
    // 退出登录
    logout() {
-      uni.removeStorage({
-        key: "chatInfo",
-      });
-      uni.removeStorage({
-        key: "userinfo",
-      });
-      uni.removeStorage({
-        key: "userSig",
-      });
-      uni.removeStorage({
-        key: "lastPage",
-      });
+      uni.clearStorage()
      uni.reLaunch({
        url: "/pages/login/login",
      });
--- a/pages/Mine/minecomponents/contact.vue
+++ b/pages/Mine/minecomponents/contact.vue
@@ -1,6 +1,12 @@
 <template>
    <view class="contact">
-        <h1>联系方式</h1>
+        <view class="bg">
+      <image class="bgImg" src="../../../static/HomeBackground.png" mode="scaleToFill" />
+    </view>
+    <view class="Return" @click="onBack">
+      <image class="ReturnImg" src="../../../static/Return.png" mode="scaleToFill" />
+    </view>
+    <view class="title">联系客服</view>
    </view>
 </template>

@@ -15,17 +21,46 @@
            // 页面加载时执行
        },
        methods: {
-            // 方法定义
+            onBack() {
+                // 返回上一页
+                wx.navigateBack({
+                    delta: 1
+                })
+            }
        }
    }
 </script>

 <style scoped>
-   .contact{
-    width: 100vw;
-    height: 100vh;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-   }
+.bg {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: -1;
+}
+.bgImg {
+  width: 100%;
+  height: 100%;
+}
+.Return {
+  position: absolute;
+  top: 110rpx;
+  left: 35rpx;
+  width: 46rpx;
+  height: 46rpx;
+}
+.title {
+  position: absolute;
+  top: 120rpx;
+  left: 315rpx;
+  font-size: 34rpx;
+  color: #100e0f;
+  font-weight: 500;
+}
+.ReturnImg {
+  width: 100%;
+  height: 100%;
+}
 </style>
--- a/pages/Mine/minecomponents/pkRecord.vue
+++ b/pages/Mine/minecomponents/pkRecord.vue
@@ -102,31 +102,7 @@ export default {
      slidetext: "我发布的PK", // 导航栏文字
      pkmyRecordlist: [], // PK记录列表
      pkInvitationRecordlist: [], // PK记录列表
-      pkRecordlist: [{
-        winnerId: "1",
-        pkTime: "1626211200",
-        anchorIdA: "123",
-        anchorIconA: "https://img.yzcdn.cn/vant/cat.jpeg",
-        userAcoin: "100",
-        anchorIdB: "456",
-        anchorIconB: "https://img.yzcdn.cn/vant/dog.jpeg",
-        userBcoin: "200",
-        senderA: "123",
-        senderB: "456",
-      },
-      {
-        winnerId: "2",
-        pkTime: "1626211200",
-        anchorIdA: "789",
-        anchorIconA: "https://img.yzcdn.cn/vant/cat.jpeg",
-        userAcoin: "100",
-        anchorIdB: "101",
-        anchorIconB: "https://img.yzcdn.cn/vant/dog.jpeg",
-        userBcoin: "200",
-        senderA: "789",
-        senderB: "101",
-      },
-    ], // PK记录列表
+      pkRecordlist: [], // PK记录列表
      userinfo: {}, // 用户信息
      page: 0, // 页码
    };
--- a/pages/Mine/minecomponents/recompose/recompose.vue
+++ b/pages/Mine/minecomponents/recompose/recompose.vue
@@ -215,7 +215,7 @@ export default {
        this.Display = false;
        this.Hint = false;
        this.nameAnchor = "";
-        this.genders = "";
+        this.genders = 0;
        this.numberCoins = "";
        this.remarks = "";
        this.datetimesingle = "";
@@ -234,7 +234,7 @@ export default {
      //判断是否为空
      if (
        this.nameAnchor == "" && this.nameAnchor == null ||
-        this.genders == "" && this.genders == null ||
+        this.genders == 0 && this.genders == null ||
        this.numberCoins =="" && this.numberCoins == null ||
        this.datetimesingle == "" && this.datetimesingle == null ||
        this.countrys == "" && his.countrys == null ||
--- a/pages/Mine/minecomponents/serviceProtocol.vue
+++ b/pages/Mine/minecomponents/serviceProtocol.vue
@@ -0,0 +1,66 @@
+<template>
+  <view class="service-protocol">
+    <view class="bg">
+      <image class="bgImg" src="../../../static/HomeBackground.png" mode="scaleToFill" />
+    </view>
+    <view class="Return" @click="onBack">
+      <image class="ReturnImg" src="../../../static/Return.png" mode="scaleToFill" />
+    </view>
+    <view class="title">服务协议</view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      title: "Hello",
+    };
+  },
+  onLoad() {
+    // 页面加载时执行
+  },
+  methods: {
+    onBack() {
+      // 返回上一页
+      wx.navigateBack({
+        delta: 1,
+      });
+    },
+  },
+};
+</script>
+
+<style scoped>
+.bg {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: -1;
+}
+.bgImg {
+  width: 100%;
+  height: 100%;
+}
+.Return {
+  position: absolute;
+  top: 110rpx;
+  left: 35rpx;
+  width: 46rpx;
+  height: 46rpx;
+}
+.title {
+  position: absolute;
+  top: 120rpx;
+  left: 315rpx;
+  font-size: 34rpx;
+  color: #100e0f;
+  font-weight: 500;
+}
+.ReturnImg {
+  width: 100%;
+  height: 100%;
+}
+</style>
--- a/pages/NewAddedPk/NewAddedPk.vue
+++ b/pages/NewAddedPk/NewAddedPk.vue
@@ -1,5 +1,9 @@
-<template><view v-if="Display" :class="[Display ? 'create-module' : 'close-animation ', 'Mask']" @click="open()">
-  
+<template>
+  <view
+    v-if="Display"
+    :class="[Display ? 'create-module' : 'close-animation ', 'Mask']"
+    @click="open()"
+  >
    <view @click.stop class="containers">
      <view class="container">
        <image
@@ -9,11 +13,11 @@
          mode="scaleToFill"
        />
        <view class="Titlecss">
-        <view class="Star"></view>
+          <view class="Star"></view>
          <view class="Title"></view>
          <view class="Star"></view>
        </view>
-        
+
        <!-- <view class="Individual"> -->
        <view class="NameAnchor">
          <input
@@ -22,82 +26,81 @@
            placeholder-style="color:#666666"
            @input="NameAnchor"
            placeholder="主播名称"
+            @blur="blur"
          />
          <view v-if="nameAnchor === '' && Hint === true" class="Hint"
            >请填写主播名称</view
          >
        </view>

-       
        <!-- </view> -->

        <view class="Accountnumber">
          <view class="Coins country">
            <wht-select
-            style="width: 350rpx"
+              style="width: 350rpx"
              backgroundColor="#ffffff"
              placeholderColor="#666666"
              textColor="#666666"
              borderColor="#ffffff"
              @change="country"
              :options="Country"
-              :filterable = "filterable"
+              :filterable="filterable"
              placeholder="请选择国家"
            />
            <view v-if="countrys === '' && Hint === true" class="Hint">请选择国家</view>
          </view>
          <view class="Gender">
-         <view class="Gendercs">
-          <view class="Gendercss">
-            <wht-select
-              style="width: 300rpx"
-              backgroundColor="#ffffff"
-              placeholderColor="#666666"
-              textColor="#666666"
-              borderColor="#ffffff"
-              @change="gender"
-              :options="Gender"
-              placeholder="性别"
-            />
-          </view>
-          <view class="Gendericoncss">
-            <image
-            v-if="genders === 0"
-            class="Gendericon"
-              src="../../static/ask.png"
-              mode="scaleToFill"
-            />
-            <image
-            v-if="genders === 1"
-            class="Gendericon"
-              src="../../static/man.png"
-              mode="scaleToFill"
-            />
-            <image
-            v-if="genders === 2"
-            class="Gendericon"
-              src="../../static/girl.png"
-              mode="scaleToFill"
-            /> 
-          </view>
-         </view>
-         <view v-if="genders === 0 && Hint === true" class="Hintcss">请选择性别</view>
-        </view>
-          
-        </view>
-        
-        <view class="goldCoin">
-            <view class="number-box">
-              <view class="number-box-title">金币数量:</view>
-              <uni-number-box background="#03ABA8" v-model="numberCoins"></uni-number-box>
-              <view class="number-box-title">单位:</view>
-              <view class="number-box-unit">K</view>
+            <view class="Gendercs">
+              <view class="Gendercss">
+                <wht-select
+                  style="width: 300rpx"
+                  backgroundColor="#ffffff"
+                  placeholderColor="#666666"
+                  textColor="#666666"
+                  borderColor="#ffffff"
+                  @change="gender"
+                  :options="Gender"
+                  placeholder="性别"
+                />
+              </view>
+              <view class="Gendericoncss">
+                <image
+                  v-if="genders === 0"
+                  class="Gendericon"
+                  src="../../static/ask.png"
+                  mode="scaleToFill"
+                />
+                <image
+                  v-if="genders === 1"
+                  class="Gendericon"
+                  src="../../static/man.png"
+                  mode="scaleToFill"
+                />
+                <image
+                  v-if="genders === 2"
+                  class="Gendericon"
+                  src="../../static/girl.png"
+                  mode="scaleToFill"
+                />
+              </view>
            </view>
-            <view v-if="numberCoins === '' && Hint === true" class="Hint"
-              >请填写金币数量</view
-            >
+            <view v-if="genders === 0 && Hint === true" class="Hintcss">请选择性别</view>
          </view>
-          
+        </view>
+
+        <view class="goldCoin">
+          <view class="number-box">
+            <view class="number-box-title">金币数量:</view>
+            <uni-number-box background="#03ABA8" v-model="numberCoins"></uni-number-box>
+            <view class="number-box-title">单位:</view>
+            <view class="number-box-unit">K</view>
+          </view>
+          <view v-if="numberCoins === '' && Hint === true" class="Hint"
+            >请填写金币数量</view
+          >
+        </view>
+
        <view class="time">
          <uni-datetime-picker
            type="datetime"
@@ -110,16 +113,14 @@
        </view>
        <!-- ···············································标记2············································ -->
        <view class="goldCoin">
-            <view class="number-box">
-              <view class="number-box-title">选择场数:</view>
-              <uni-number-box background="#03ABA8" v-model="session"></uni-number-box>
-              <view class="number-box-title">次</view>
-            </view>
-            <view v-if="session === '' && Hint === true" class="Hint"
-              >请填写场数</view
-            >
+          <view class="number-box">
+            <view class="number-box-title">选择场数:</view>
+            <uni-number-box background="#03ABA8" v-model="session"></uni-number-box>
+            <view class="number-box-title">次</view>
          </view>
-      <!-- ··························································································· -->
+          <view v-if="session === '' && Hint === true" class="Hint">请填写场数</view>
+        </view>
+        <!-- ··························································································· -->
        <view class="Remarkscss">
          <uni-easyinput
            type="textarea"
@@ -159,6 +160,7 @@ export default {
      id: null, //用户id
      sendingTime: "", //发送时间
      filterable: true, //是否可搜索
+      AnchorProfilePicture: "", //主播头像
    };
  },
  mounted() {
@@ -191,7 +193,7 @@ export default {
        this.Display = false;
        this.Hint = false;
        this.nameAnchor = "";
-        this.genders = "";
+        this.genders = 0;
        this.numberCoins = "";
        this.remarks = "";
        this.datetimesingle = "";
@@ -201,19 +203,39 @@ export default {
        this.Display = true;
      }
    },
-    //获取主播名称
-    NameAnchor: function (event) {
-      this.nameAnchor = event.target.value;
+    //获取主播名称以及头像地址
+    blur(event){
+      if(this.nameAnchor !== event.target.value){
+        this.nameAnchor = event.target.value;
+        uni.request({
+        url: "http://47.79.98.113:6600/"+this.nameAnchor,
+        success:(res)=>{
+          if (res.data.code === 200) {
+            this.AnchorProfilePicture = res.data.data;
+          }else {
+            uni.showToast({ 
+              title: "主播不存在请确认主播名称",
+              icon: "none",
+              duration: 2000,
+            })
+          }
+        },
+        fail: function (res) {
+          console.log("请求失败", res.data);
+        },
+      });
+      }else{
+        return;
+      }
    },
-
    async Publish() {
      //判断是否为空
      if (
        this.nameAnchor === "" ||
-        this.genders === "" ||
+        this.genders === 0 ||
        this.numberCoins === "" ||
        this.countrys === "" ||
-        this.datetimesingle === ""||
+        this.datetimesingle === "" ||
        this.session === ""
      ) {
        this.Hint = true;
@@ -251,9 +273,8 @@ export default {
          country: this.countrys,
          coin: this.numberCoins,
          remark: this.remarks,
-          status: 0,
          senderId: this.id,
-          anchorIcon: "",
+          anchorIcon: this.AnchorProfilePicture,
          pkNumber: this.session,
        },
        userInfo: true,
@@ -290,14 +311,26 @@ export default {
 /* 定义动画 */
 /* 原始进入动画 */
@keyframes slide-in {
-  from { transform: translateY(100%); opacity: 0; }
-  to { transform: translateY(0); opacity: 1; }
+  from {
+    transform: translateY(100%);
+    opacity: 0;
+  }
+  to {
+    transform: translateY(0);
+    opacity: 1;
+  }
 }

 /* 新增关闭动画 */
@keyframes slide-out {
-  from { transform: translateY(0); opacity: 1; }
-  to { transform: translateY(-100%); opacity: 0; }
+  from {
+    transform: translateY(0);
+    opacity: 1;
+  }
+  to {
+    transform: translateY(-100%);
+    opacity: 0;
+  }
 }

 /* 进入动画类 */
@@ -323,7 +356,7 @@ export default {
  margin-left: 30rpx;
  margin-top: 10rpx;
 }
-.Hintcss{
+.Hintcss {
  color: rgb(255, 0, 0);
  font-size: 20rpx;
  margin-left: 30rpx;
@@ -350,14 +383,14 @@ export default {
  /* margin-bottom: 40rpx; */
  margin-left: 90%;
 }
-.Titlecss{
+.Titlecss {
  width: 100%;
  height: 70rpx;
  display: flex;
  justify-content: center;
  align-items: center;
 }
-.Star{
+.Star {
  width: 50rpx;
  height: 50rpx;
  background-image: url(../../static/star.png);
@@ -389,7 +422,7 @@ export default {
  width: 99%;
  height: 85rpx;
  background-color: #ffffff;
-  border: 1rpx solid #BFBFBF;
+  border: 1rpx solid #bfbfbf;
  border-radius: 10rpx;
  text-align: center;
 }
@@ -399,16 +432,16 @@ export default {
  flex-direction: column;
  justify-content: center;
 }
-.Gendercs{
+.Gendercs {
  display: flex;
  justify-content: center;
  /* align-items: center; */
 }
-.Gendercss{
+.Gendercss {
  width: 200rpx;
  height: 60rpx;
 }
-.Gendericoncss{
+.Gendericoncss {
  display: flex;
  justify-content: center;
  align-items: center;
@@ -419,7 +452,7 @@ export default {
  margin-left: 20rpx;
  margin-top: 10rpx;
 }
-.Gendericon{
+.Gendericon {
  width: 40rpx;
  height: 40rpx;
  /* margin-top: 10rpx;
@@ -439,7 +472,7 @@ export default {
  /* flex-direction: column; */
 }
 .country {
-  margin-left:10rpx;
+  margin-left: 10rpx;
 }
 .goldCoin {
  width: 100%;
@@ -460,10 +493,10 @@ export default {
  margin-left: 17rpx;
 }
 .number-box-unit {
-  color: #03ABA8;
+  color: #03aba8;
  width: 48rpx;
  height: 48rpx;
-  border: 1rpx solid #03ABA8;
+  border: 1rpx solid #03aba8;
  border-radius: 50%;
  line-height: 48rpx;
  text-align: center;
@@ -484,7 +517,7 @@ export default {
  margin-left: 5%;
 }
 .Publishcss {
-  background-image: linear-gradient(135deg, #4FCACD, #5FDBDE);
+  background-image: linear-gradient(135deg, #4fcacd, #5fdbde);
  /* color: #33ff00; */
  color: #ffffff;
  font-weight: bold;
--- a/pages/PKMessageprocessing/PKMessageprocessing.vue
+++ b/pages/PKMessageprocessing/PKMessageprocessing.vue
@@ -31,7 +31,7 @@
                  mode="scaleToFill"
                />
              </view>
-              <view class="age"> 21 </view>
+              <view class="age"> {{ SenderData.sex == 1 ? "男" : "女" }} </view>
            </view>

            <view class="female" v-else>
@@ -42,7 +42,7 @@
                  mode="scaleToFill"
                />
              </view>
-              <view class="age"> 21 </view>
+              <view class="age">{{ SenderData.sex == 1 ? "男" : "女" }}</view>
            </view>
          </view>
          <view class="nation">{{ SenderData.country }}</view>
@@ -91,7 +91,7 @@
                  mode="scaleToFill"
                />
              </view>
-              <view class="age"> 21 </view>
+              <view class="age"> {{ ReceiverData.sex == 1 ? "男" : "女" }} </view>
            </view>

            <view class="female" v-else>
@@ -102,7 +102,7 @@
                  mode="scaleToFill"
                />
              </view>
-              <view class="age"> 21 </view>
+              <view class="age">{{ ReceiverData.sex == 1 ? "男" : "女" }}</view>
            </view>
          </view>
          <view class="nation">{{ ReceiverData.country }}</view>
@@ -199,7 +199,7 @@ export default {
        console.log(status);
        
      const res = await request({
-        url: "pk/pkInfoDetail",
+        url: "pk/updatePkStatus",
        method: "POST",
        data: {
          pkIdA: this.customData.pkIdA,
@@ -208,7 +208,7 @@ export default {
          userIdB: this.customData.userIdB,
          pkTime: this.customData.pkTime,
          pkNumber: this.customData.pkNumber,
-          status: status,
+          pkStatus: status,
        },
        userInfo: false,
      }).then((res) => {
--- a/pages/Setting/Setting.vue
+++ b/pages/Setting/Setting.vue
@@ -72,6 +72,8 @@ export default {
          path: this.userinfo,
          name:generateFileName(),
        }).then((res) => {
+          console.log("上传成功········",res);
+          
          this.userinfo = res;
        }).catch((err) => {
          console.log(err);
--- a/pages/UserInformation/UserInformation.vue
+++ b/pages/UserInformation/UserInformation.vue
@@ -83,8 +83,7 @@ export default {
      postFile({
        path: this.userinfo,
        name: this.Filename,
-      })
-        .then((ress) => {
+      }).then((ress) => {
          this.picture = ress;
          const res = request({
            url: "user/inputUserInfo",
--- a/pages/pkDetail/pkDetail.vue
+++ b/pages/pkDetail/pkDetail.vue
@@ -31,7 +31,7 @@
                  mode="scaleToFill"
                />
              </view>
-              <view class="age"> 21 </view>
+              <view class="age"> {{ item.sex === '1'? '男' : '女' }} </view>
            </view>

            <view class="female" v-else>
@@ -42,7 +42,7 @@
                  mode="scaleToFill"
                />
              </view>
-              <view class="age"> 21 </view>
+              <view class="age">{{ item.sex === '2' ? '男' : '女' }}</view>
            </view>
          </view>
          <view class="nation">{{ item.country }}</view>
@@ -73,7 +73,7 @@
          </view>
        </view>
      </view>
-      <view class="button">
+      <view class="button" v-if="item.senderId !== id">
        <button class="accept" @click="openChat()">聊了个天</button>
        <button class="reject" @click="open()">立即邀请</button>
      </view>
@@ -81,8 +81,15 @@
  </view>
  <!-- 弹窗 -->
  <uni-popup ref="popup" type="center" border-radius="10px 10px 0 0">
-    <view class="popup-content">
+    <view
+      class="popup-content"
+      style="
+        background-image: url(../../static/queryMyCanUsePkbg.png);
+        background-position: center;
+      "
+    >
      <view class="popup-title">
+        <view class="popup-text">请选择您要参与的主播</view>
        <scroll-view scroll-y="true" class="scroll">
          <!-- <uni-card  v-for="(item, index) in list"> -->
          <view class="card" v-for="(item, index) in list">
@@ -90,16 +97,24 @@
              class="card-content"
              @click="Select(item.id, index)"
              :style="{
-                border: selectedId === item.id ? '2px solid red' : '2px solid #afafaf',
+                background:
+                  selectedId === item.id ? '#f6f6f6' : '#ffffff',
              }"
            >
-              <image class="avatar" :src="item.anchorIcon" mode="scaleToFill" />
+              <view class="Avatarimg">
+                <image class="avatar" :src="item.anchorIcon" mode="scaleToFill" />
+              </view>
              <view class="NameMoney">
-                <view class="NameMoney_Name">{{ item.anchorId }}</view>
                <view class="TimeMoney">
-                  <view>{{ TimeFormatting(item.pkTime) }}</view>
-                  <view>金币:{{ item.coin }}</view>
+                  <view class="NameMoney_Name">{{ item.anchorId }}</view>
+                  <viewm class="goldnb"
+                    ><view class="goldimg"></view>{{ item.coin }}K</viewm
+                  >
                </view>
+                <view class="TimeMoney_Time"
+                  ><view class="pkTimeimg"></view
+                  ><view>{{ TimeFormatting(item.pkTime) }}</view></view
+                >
              </view>
            </view>
          </view>
@@ -113,18 +128,15 @@
    </view>
  </uni-popup>
  <NewAddedPk class="createModule" ref="createModule"></NewAddedPk>
+  <!-- <Recompose ref="createModule" class="createModule" :message="parentMessage"></Recompose> -->
 </template>

 <script>
 import formatDate from "../../components/formatDate.js";
 import TimeFormatting from "../../components/TimeFormatting.js";
-// import VerifyLogin from "../../components/VerifyLogin.js";
 import NewAddedPk from "../../pages/NewAddedPk/NewAddedPk.vue";
 import request from "../../components/request.js";
-// // import { isEnabledMessageReadReceiptGlobal } from "../../TUIKit/components/TUIChat/utils/utils.js";
-// const  isEnabledMessageReadReceiptGlobal  = require('../../TUIKit/components/TUIChat/utils/utils.js');
-// // import OfflinePushInfoManager from "../../TUIKit/components/TUIChat/offlinePushInfoManager/index.js";
-// const OfflinePushInfoManager = require('../../TUIKit/components/TUIChat/offlinePushInfoManager/index.js');
+// import Recompose from "../Mine/minecomponents/recompose/recompose.vue";
 import TUIChatEngine, {
  TUIStore,
  StoreName,
@@ -141,6 +153,7 @@ export default {
      InvitingPartyEventindex: null,
      chatInfo: {},
      currentConversation: null,
+      // parentMessage: null,
    };
  },
  onLoad(options) {
@@ -166,6 +179,11 @@ export default {
    });
  },
  methods: {
+    //修改信息
+    // onRecompose(item) {
+    //   this.parentMessage = item;
+    //   this.createModule.open();
+    // },
    formatDate: formatDate,
    TimeFormatting: TimeFormatting,
    Select(id, index) {
@@ -189,13 +207,13 @@ export default {
      this.userlist();
    },
    invite() {
-      // if (this.item.pkTime !== this.list[this.InvitingPartyEventindex].pkTime) {
-      //   uni.showToast({
-      //     icon: "none",
-      //     title: "请保持时间一致",
-      //   });
-      //   return;
-      // }
+      if (this.item.pkTime !== this.list[this.InvitingPartyEventindex].pkTime) {
+        uni.showToast({
+          icon: "none",
+          title: "请保持时间一致",
+        });
+        return;
+      }
      // 发送邀请消息
      const conversationID = `C2C${this.item.senderId}`;
      const myitem = JSON.stringify(this.list[this.InvitingPartyEventindex]);
@@ -260,9 +278,9 @@ export default {

 <style scoped>
 .popup-content {
-  width: 500rpx;
+  width: 600rpx;
  height: 700rpx;
-  background-color: #fff;
+  background-repeat: no-repeat;
  border-radius: 10px;
  display: flex;
  flex-direction: column;
@@ -280,26 +298,38 @@ export default {
  margin-top: 50rpx;
 }
 .invite {
-  width: 200rpx;
-  height: 80rpx;
-  font-size: 30rpx;
+  width: 225.19rpx;
+  height: 78.24rpx;
+  font-size: 28.63rpx;
  line-height: 80rpx;
-  border-radius: 20rpx;
-  background-color: #1aff0087;
+  border-top-left-radius: 50rpx;
+  border-bottom-left-radius: 50rpx;
+  border-bottom-right-radius: 50rpx;
+  background-image: linear-gradient(135deg, #4fcacd, #5fdbde);
 }
 .cancel {
-  width: 200rpx;
-  height: 80rpx;
-  font-size: 30rpx;
+  width: 225.19rpx;
+  height: 78.24rpx;
+  font-size: 28.63rpx;
  line-height: 80rpx;
  margin-left: 30rpx;
-  border-radius: 20rpx;
+  color: #03aba8;
+  border-top-left-radius: 50rpx;
+  border-bottom-left-radius: 50rpx;
+  border-bottom-right-radius: 50rpx;
+  border: 1rpx solid #03aba8;
 }
 .scroll {
  width: 470rpx;
-  height: 500rpx;
-  border: 2px solid #afafaf;
+  height: 400rpx;
  border-radius: 10px;
+  /* background-color: #fff; */
+}
+.popup-text {
+  color: #161616;
+  font-size: 36.26rpx;
+  font-weight: bold;
+  margin-bottom: 30rpx;
 }
 .card {
  margin-top: 10rpx;
@@ -307,10 +337,12 @@ export default {
 }
 .card-content {
  width: 445rpx;
-  height: 75rpx;
+  height: 100rpx;
+  background-color: #ffffff;
  /* border: 2px solid #afafaf; */
-  border-radius: 10px;
+  border-radius: 10rpx;
  display: flex;
+  align-items: center;
  font-size: 28rpx;
  color: rgb(127, 127, 127);
 }
@@ -321,15 +353,46 @@ export default {
  z-index: 998;
  width: 100vw;
 }
+.Avatarimg {
+  width: 90rpx;
+  height: 90rpx;
+  border-radius: 50%;
+  background-color: #dddddd;
+  margin-right: 20rpx;
+  margin-left: 20rpx;
+}
 .avatar {
-  width: 60rpx;
-  height: 60rpx;
+  width: 100%;
+  height: 100%;
  border-radius: 50%;
 }
 .TimeMoney {
  width: 300rpx;
  display: flex;
-  justify-content: space-between;
+  font-weight: bold;
+  font-size: 27rpx;
+  color: #161616;
+}
+.goldnb {
+  display: flex;
+  margin-left: 40rpx;
+}
+.TimeMoney_Time {
+  display: flex;
+  margin-top: 13rpx;
+}
+.pkTimeimg {
+  background-image: url(../../static/time.png);
+  background-size: 100% 100%;
+  width: 31.49rpx;
+  height: 31.49rpx;
+  margin-right: 20rpx;
+}
+.goldimg {
+  background-image: url(../../static/species.png);
+  background-size: 100% 100%;
+  width: 31.49rpx;
+  height: 35rpx;
 }
 .NameMoney {
  display: flex;
@@ -337,6 +400,9 @@ export default {
 }
 .NameMoney_Name {
  text-align: left;
+  font-weight: bold;
+  font-size: 27rpx;
+  color: #161616;
 }
 .background {
  position: fixed;