From 934d4757a6a3665e8fded38e4e911bc4bd5687fa Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Wed, 16 Apr 2025 20:31:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitattributes                                |   2 +
 App.vue                                       |  41 +-
 common/env.js                                 |   4 +-
 .../detail-wuxian-lingzhu.vue                 | 591 ++++++++++++++++-
 .../detail-wuxian-rage/detail-wuxian-rage.vue |  81 +++
 index.html                                    |  18 +
 manifest.json                                 |   2 +-
 pages/shouye/dada_ranking.vue                 | 118 ++--
 pages/shouye/detail.vue                       |  21 +-
 pages/shouye/detail_wuxian.vue                | 594 ++++++------------
 pages/shouye/yaoqing_ranking.vue              | 283 +++++----
 pages/user/login.vue                          |   3 +-
 12 files changed, 1151 insertions(+), 607 deletions(-)
 create mode 100644 .gitattributes
 create mode 100644 components/detail-wuxian-rage/detail-wuxian-rage.vue
 create mode 100644 index.html

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..babf824
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+manifest.json merge=ours
+common/env.js merge=ours
diff --git a/App.vue b/App.vue
index aec982b..eebadb1 100644
--- a/App.vue
+++ b/App.vue
@@ -10,6 +10,46 @@ export default {
   },
   onLaunch: function () {
     console.log("App Launch");
+    // #ifdef MP-WEIXIN
+    const updateManager = uni.getUpdateManager();
+
+    updateManager.onCheckForUpdate(function (res) {
+      // 请求完新版本信息的回调
+      console.log(res.hasUpdate);
+    });
+
+    updateManager.onUpdateReady(function (res) {
+      uni.showModal({
+        title: "更新提示",
+        content: "新版本已经准备好，是否重启应用？",
+        success(res) {
+          if (res.confirm) {
+            // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+            updateManager.applyUpdate();
+          }
+        },
+      });
+    });
+
+    updateManager.onUpdateFailed(function (res) {
+      // 新的版本下载失败
+    });
+    //#endif
+    var that = this;
+
+    this.$config.init().then(async (data) => {
+      //加载配置
+      let src = await that.$config.getAppSettingAsync("win_audio");
+      if (src == null || src == "") {
+        src = that.$img("/static/mp3/open.mp3");
+      }
+      //创建中奖音乐
+      const openBgm = uni.createInnerAudioContext();
+      Vue.prototype.bgmCtx = {};
+      Vue.prototype.bgmCtx.openBgm = openBgm;
+      openBgm.src = src;
+    });
+
     // 调用登录记录接口
     this.callLoginRecordApi();
 
@@ -183,4 +223,3 @@ button.hide {
   height: 50px !important;
 }
 </style>
-
diff --git a/common/env.js b/common/env.js
index 67ac71e..8a7e24a 100644
--- a/common/env.js
+++ b/common/env.js
@@ -17,6 +17,7 @@ const development = {
 
 // 生产环境配置
 const production = {
+  // baseUrl: 'https://youda.zfunbox.cn',
   baseUrl: 'https://api.zfunbox.cn',
   imageUrl: 'https://image.zfunbox.cn',
   loginPage: 'https://api.zfunbox.cn/login.html',
@@ -44,7 +45,8 @@ if (process.env.NODE_ENV === 'production') {
 // #endif
 
 // #ifdef MP-WEIXIN
-currentEnv =testing;// production; // 小程序默认使用生产环境配置
+// currentEnv =testing;//小程序默认使用测试环境配置
+currentEnv = production; // 小程序默认使用生产环境配置
 // #endif
 
 // 衍生配置
diff --git a/components/detail-wuxian-lingzhu/detail-wuxian-lingzhu.vue b/components/detail-wuxian-lingzhu/detail-wuxian-lingzhu.vue
index 161b651..9c35602 100644
--- a/components/detail-wuxian-lingzhu/detail-wuxian-lingzhu.vue
+++ b/components/detail-wuxian-lingzhu/detail-wuxian-lingzhu.vue
@@ -1,44 +1,312 @@
 <template>
-  <view class="lingzhu center" v-if="bossCardData && bossCardData.king_user">
-    <view class="lingzhu-img relative ml30">
-      <image :src="bossCardData.king_user.headimg" mode="aspectFill"></image>
-      <image :src="$img1('index/king.png')"></image>
-    </view>
-    <view class="lingzhu-content ml30 flex-1">
-      <view class="">{{ bossCardData.king_user.nickname }}</view>
-      <view class="">
-        第
-        <text>{{ bossCardData.king_user.count }}</text>
-        发晋升领主
-        已占领
-        <text>{{ bossCardData.king_user.z_nums }}</text>
-        发
+  <view>
+    <!-- 领主信息展示区域 - 显示当前领主的头像、昵称和占领信息 -->
+    <view class="lingzhu center" v-if="localBossCardData && localBossCardData.king_user">
+      <view class="lingzhu-img relative ml30">
+        <image :src="localBossCardData.king_user.headimg" mode="aspectFill"></image>
+        <image :src="$img1('index/king.png')"></image>
+      </view>
+      <view class="lingzhu-content ml30 flex-1">
+        <view class="">{{ localBossCardData.king_user.nickname }}</view>
+        <view class="">
+          第
+          <text>{{ localBossCardData.king_user.count }}</text>
+          发晋升领主
+          已占领
+          <text>{{ localBossCardData.king_user.z_nums }}</text>
+          发
+        </view>
+      </view>
+      <view class="flex ml40 mr30" @click="openBossPop">
+        <text style="font-size: 20rpx; color: #999999;">查看更多 ></text>
       </view>
     </view>
-    <view class="flex ml40 mr30" @click="openBossPop">
-      <text style="font-size: 20rpx; color: #999999;">查看更多 ></text>
-    </view>
+
+    <!-- 领主弹窗 - 显示领主详细信息和挑战人数/领主记录 -->
+    <uni-popup ref="bossPop" type="bottom" mask-background-color="rgba(0,0,0,0.8)">
+      <view v-if="localBossCardData && localBossCardData.king_user" class="boss-pop relative">
+        <!-- 弹窗标题 -->
+        <view class="boss-pop-title">
+          <text>领主接力</text>
+        </view>
+
+        <!-- 关闭按钮 -->
+        <view @click="close('bossPop')" class="close flex">
+          <image class="img100" :src="$img1('index/close.png')"></image>
+        </view>
+
+        <!-- 领主头像和皇冠 -->
+        <view class="boss-avatar relative">
+          <image :src="localBossCardData.king_user.headimg"></image>
+          <image :src="$img1('index/king.png')"></image>
+
+          <view class="boss-name hang1">
+            {{ localBossCardData.king_user.nickname }}
+          </view>
+
+          <!-- 规则按钮 -->
+          <view class="boss-pop-guize align-center" @click="open('playPop')">
+            <image :src="$img1('common/ic_rule.png')" mode=""></image>
+          </view>
+        </view>
+
+        <!-- 奖励说明 -->
+        <view class="flex row center" style="font-size: 20rpx; color: #999999; margin-top: 24rpx;">
+          <text>挑战领主获得UU币奖励</text>
+          <text class="get-money-one">玩家每挑战一发,领主可获得</text>
+          <text class="get-money-three">{{ localBossCardData.goods.lingzhu_fan }}UU币</text>
+        </view>
+
+        <!-- 标签页切换 -->
+        <view class="boss-tab">
+          <view class="boss-tab-item" v-for="(item, i) in bossTab" :key="i" :class="{
+            act: bossTabCur == i
+          }" @click="bossTabChange(i)">
+            <text>{{ item.title }}</text>
+          </view>
+        </view>
+
+        <!-- 滚动列表区域 - 显示挑战人数或领主记录 -->
+        <child-scroll class="list-wrap" height="350rpx" ref="bossScroll" :fixed="false" :size="20"
+          @up="getBossData">
+          <view class="boss-list">
+            <template v-for="(item, i) in bossList">
+              <!-- 挑战人数列表项 -->
+              <view v-if="bossTab[bossTabCur].id == 1" class="people-item mt30" :key="i">
+                <view class="avatar flex">
+                  <image class="img100" :src="item.headimg"></image>
+                </view>
+                <view class="name hang1">{{ item.nickname }}</view>
+              </view>
+
+              <!-- 领主记录列表项 -->
+              <view v-if="bossTab[bossTabCur].id == 2" class="boss-log" :key="i">
+                <view class="flex center">
+                  <view class="avatar flex" style="width: 52rpx; height: 52rpx;">
+                    <image class="img100" :src="item.headimg"></image>
+                  </view>
+                  <view class="name hang1">{{ item.nickname }}</view>
+                </view>
+
+                <view class="place">
+                  <text>占领领主{{ item.time }}</text>
+                </view>
+              </view>
+            </template>
+          </view>
+        </child-scroll>
+      </view>
+    </uni-popup>
+
+    <!-- 玩法规则弹窗 - 显示领主玩法的详细规则说明 -->
+    <uni-popup ref="playPop" type="center">
+      <view v-if="localBossCardData" class="play-pop common_bg">
+        <!-- 弹窗标题和关闭按钮 -->
+        <view class="close align-center justify-between">
+          <view class="close-icon"></view>
+          <view class="close-title">玩法规则</view>
+          <view class="close-icon flex" @click="close('playPop')">
+            <image class="img100" :src="$img1('index/close.png')"></image>
+          </view>
+        </view>
+
+        <!-- 轮播图展示领主可获得的物品 -->
+        <swiper class="p-swiper">
+          <swiper-item class="p-item" v-for="(item, i) in localBossCardData.ling_goods_list" :key="i">
+            <view class="play-pic flex">
+              <image class="img100" :src="item.imgurl"></image>
+            </view>
+            <view class="play-name hang1">
+              {{ item.title }}
+            </view>
+          </swiper-item>
+        </swiper>
+
+        <!-- 规则文本区域 -->
+        <view class="pd30 br20" style="background: #D8D8D8;">
+          <scroll-view class="rule-text" scroll-y>
+            <!-- 注意：使用v-html可能有XSS风险，但这里的内容来自服务器后台配置，相对可控 -->
+            <view v-html="playRuleData"></view>
+          </scroll-view>
+        </view>
+      </view>
+    </uni-popup>
   </view>
 </template>
 
 <script>
+/**
+ * 领主功能组件
+ * 
+ * 功能描述：
+ * 1. 显示当前领主信息
+ * 2. 提供领主弹窗展示挑战人数和领主记录
+ * 3. 提供玩法规则弹窗说明领主玩法
+ * 
+ * 使用方式：
+ * <detail-wuxian-lingzhu :goods="goods" :goods-num="0"></detail-wuxian-lingzhu>
+ */
 export default {
   name: 'DetailWuxianLingzhu',
   props: {
-    bossCardData: {
+    // 商品信息对象
+    goods: {
       type: Object,
       default: () => ({})
+    },
+    // 商品数量
+    goodsNum: {
+      type: Number,
+      default: 0
     }
   },
+  data() {
+    return {
+      // 领主数据，包含king_user、goods等信息
+      localBossCardData: null,
+      // 标签页配置
+      bossTab: [{
+        id: 1,
+        title: '挑战人数'
+      },
+      {
+        id: 2,
+        title: '领主记录'
+      }
+      ],
+      // 当前选中的标签页索引
+      bossTabCur: 0,
+      // 挑战人数/领主记录列表数据
+      bossList: [],
+      // 玩法规则HTML内容
+      playRuleData: ''
+    }
+  },
+  mounted() {
+    // 组件挂载时自动获取领主数据
+    this.fetchBossData();
+  },
   methods: {
+    /**
+     * 获取领主数据
+     * 请求接口获取领主信息并存储到localBossCardData
+     */
+    fetchBossData() {
+      this.req({
+        url: 'ling_zhu_king',
+        data: {
+          page: 1,
+          goods_id: this.goods.id,
+          type: 1 // 默认只请求挑战人数类型
+        },
+        Loading: true,
+        success: res => {
+          if (res.status == 1) {
+            this.localBossCardData = res.data;
+            this.bossList = this.bossList.concat(res.data.list.data);
+          }
+        }
+      });
+    },
+    
+    /**
+     * 打开领主弹窗
+     */
     openBossPop() {
-      this.$emit('open-boss-pop');
+      this.$refs.bossPop.open();
+      
+      // // 打开弹窗的同时加载挑战人数数据
+      // this.$nextTick(() => {
+      //   // 确保bossList是空的，避免重复加载
+      //   this.bossList = [];
+      //   // 重置滚动区域
+      //   if (this.$refs.bossScroll) {
+      //     this.$refs.bossScroll.mescroll.resetUpScroll();
+      //     this.$refs.bossScroll.mescroll.scrollTo(0, 0);
+      //   }
+        
+      //   // 主动获取挑战人数数据
+      //   this.getBossData({ num: 1, init: false });
+      // });
+    },
+    
+    /**
+     * 打开指定弹窗
+     * @param {String} popName - 弹窗引用名称
+     */
+    open(popName) {
+      this.$refs[popName].open();
+      
+      // 如果是玩法规则弹窗，需要获取规则数据
+      if (popName === 'playPop') {
+        this.$c.getRule(14).then(res => {
+          if (res.status == 1) {
+            this.playRuleData = res.data;
+          }
+        });
+      }
+    },
+    
+    /**
+     * 关闭指定弹窗
+     * @param {String} popName - 弹窗引用名称
+     */
+    close(popName) {
+      this.$refs[popName].close();
+    },
+    
+    /**
+     * 切换标签页
+     * @param {Number} i - 标签页索引
+     */
+    bossTabChange(i) {
+      this.bossTabCur = i;
+      this.bossList = [];
+
+      // 重置滚动区域
+      this.$refs.bossScroll.mescroll.resetUpScroll();
+      this.$refs.bossScroll.mescroll.scrollTo(0, 0);
+    },
+    
+    /**
+     * 获取挑战人数/领主记录列表数据
+     * @param {Object} params - 参数对象
+     * @param {Number} params.num - 页码
+     * @param {Boolean} params.init - 是否初始化
+     */
+    getBossData({ num, init }) {
+      this.req({
+        url: 'ling_zhu_king',
+        data: {
+          page: num,
+          goods_id: this.goods.id,
+          type: this.bossTab[this.bossTabCur].id
+        },
+        Loading: true,
+        success: res => {
+          if (res.status == 1) {
+            // 只更新列表数据，不改变整个localBossCardData
+            if (!init) {
+              if (num == 1) {
+                this.bossList = [];
+              }
+
+              this.bossList = this.bossList.concat(res.data.list.data);
+              this.$refs.bossScroll.mescroll.endByPage(
+                res.data.list.data.length,
+                res.data.list.last_page
+              );
+            }
+          }
+        }
+      });
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
+/* 领主信息展示区域样式 */
 .lingzhu {
   width: 686rpx;
   height: 158rpx;
@@ -49,6 +317,7 @@ export default {
     width: 122rpx;
     height: 106rpx;
 
+    /* 领主头像 */
     >image:nth-child(1) {
       width: 75rpx;
       height: 76rpx;
@@ -60,6 +329,7 @@ export default {
       border-radius: 50rpx;
     }
 
+    /* 皇冠图标 */
     >image:nth-child(2) {
       width: 122rpx;
       height: 120rpx;
@@ -71,22 +341,305 @@ export default {
   }
 
   &-content {
+    /* 领主昵称 */
     >view:nth-child(1) {
       font-weight: normal;
       font-size: 28rpx;
       color: #333333;
     }
 
+    /* 领主信息文本 */
     >view:nth-child(2) {
       margin-top: 6rpx;
       font-weight: normal;
       font-size: 24rpx;
       color: #999999;
 
+      /* 高亮数字 */
       >text {
         color: #333333;
       }
     }
   }
 }
+
+/* 领主弹窗样式 */
+.boss-pop {
+  width: 750rpx;
+  box-sizing: border-box;
+  padding: 0 46rpx 40rpx;
+  position: relative;
+  background: #F7F7F7;
+  border-radius: 16rpx 16rpx 0rpx 0rpx;
+
+  /* 弹窗顶部装饰 */
+  &::after {
+    content: '';
+    position: absolute;
+    top: -62rpx;
+    left: 0;
+    width: 750rpx;
+    height: 62rpx;
+  }
+
+  /* 弹窗标题 */
+  .boss-pop-title {
+    padding: 40rpx 0;
+    text-align: center;
+    font-weight: 400;
+    font-size: 44rpx;
+    color: #333333;
+  }
+
+  /* 规则按钮 */
+  .boss-pop-guize {
+    position: absolute;
+    top: 24rpx;
+    right: 24rpx;
+    color: #FFFFFF;
+    font-size: 28rpx;
+
+    >image {
+      width: 30rpx;
+      height: 30rpx;
+    }
+  }
+
+  /* 关闭按钮 */
+  .close {
+    position: absolute;
+    width: 30rpx;
+    height: 30rpx;
+    top: 50rpx;
+    right: 36rpx;
+  }
+
+  /* 领主头像区域 */
+  .boss-avatar {
+    margin: 20rpx auto 0;
+    width: 686rpx;
+    height: 264rpx;
+    background-color: #FFFFFF;
+
+    /* 领主头像 */
+    >image:nth-child(1) {
+      position: absolute;
+      left: 50%;
+      transform: translateX(-50%);
+      bottom: 112rpx;
+      width: 98rpx;
+      height: 98rpx;
+      border-radius: 50%;
+      z-index: 1;
+    }
+
+    /* 皇冠图标 */
+    >image:nth-child(2) {
+      position: absolute;
+      left: 50%;
+      transform: translateX(-50%);
+      width: 181rpx;
+      height: 173rpx;
+      bottom: 80rpx;
+      z-index: 2;
+    }
+  }
+
+  /* 领主昵称 */
+  .boss-name {
+    margin: 30rpx auto 0;
+    width: 200rpx;
+    text-align: center;
+    font-size: 28rpx;
+    font-family: Source Han Sans CN;
+    font-weight: 400;
+    color: #333333;
+    left: 50%;
+    transform: translateX(-50%);
+    position: absolute;
+    bottom: 32rpx;
+  }
+
+  /* 奖励文本样式 */
+  .get-money-one {
+    font-weight: 400;
+    font-size: 26rpx;
+    color: #999999;
+  }
+
+  .get-money-three {
+    font-weight: 400;
+    font-size: 26rpx;
+    color: #999999;
+  }
+
+  /* 标签页样式 */
+  .boss-tab {
+    padding: 30rpx 0;
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+
+    .boss-tab-item {
+      width: 33%;
+      height: 60rpx;
+      font-size: 20rpx;
+      font-weight: 400;
+      color: #8A8A8A;
+      display: flex;
+      justify-content: space-around;
+      align-items: center;
+      text-align: center;
+      background-color: #FFFFFF;
+      border-radius: 8rpx;
+
+      /* 激活状态 */
+      &.act {
+        font-weight: 500;
+        font-size: 20rpx;
+        color: #333333;
+        background-color: #E6F791;
+        border-radius: 8rpx;
+      }
+    }
+  }
+
+  /* 列表区域样式 */
+  .list-wrap {
+    .boss-list {
+      display: flex;
+      flex-flow: row wrap;
+      justify-content: space-between;
+
+      /* 挑战人数列表项 */
+      .people-item {
+        display: flex;
+        align-items: center;
+        width: 30%;
+
+        .avatar {
+          width: 52rpx;
+          height: 52rpx;
+          background: #9d9d9d;
+          border-radius: 50%;
+          box-sizing: border-box;
+          overflow: hidden;
+        }
+
+        .name {
+          width: calc(100% - 70rpx);
+          box-sizing: border-box;
+          padding-left: 10rpx;
+          font-size: 20rpx;
+          font-family: Source Han Sans CN;
+          font-weight: 400;
+          color: #999999;
+        }
+      }
+
+      /* 领主记录列表项 */
+      .boss-log {
+        width: 100%;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+        padding: 10rpx;
+
+        .avatar {
+          width: 60rpx;
+          height: 60rpx;
+          background: #9d9d9d;
+          border-radius: 50%;
+          overflow: hidden;
+        }
+
+        .name {
+          width: 100rpx;
+          margin-left: 20rpx;
+          font-size: 20rpx;
+          font-weight: 400;
+          color: #999999;
+        }
+
+        .place {
+          margin-left: 30rpx;
+          font-size: 20rpx;
+          font-family: Source Han Sans CN;
+          font-weight: 400;
+          color: #999999;
+
+          text {
+            padding-left: 4rpx;
+            color: #999999;
+          }
+        }
+      }
+    }
+  }
+}
+
+/* 玩法规则弹窗样式 */
+.play-pop {
+  width: 680rpx;
+  box-sizing: border-box;
+  padding: 0 46rpx 40rpx;
+  position: relative;
+  background: #FFFFFF;
+  border-radius: 30rpx;
+
+  /* 弹窗标题栏 */
+  .close {
+    padding: 30rpx 0;
+
+    .close-title {
+      font-weight: 500;
+      font-size: 28rpx;
+      color: #333333;
+    }
+
+    .close-icon {
+      width: 30rpx;
+      height: 30rpx;
+    }
+  }
+
+  /* 轮播图区域 */
+  .p-swiper {
+    margin-top: 10rpx;
+    width: 100%;
+    height: 300rpx;
+
+    .p-item {
+      /* 物品图片 */
+      .play-pic {
+        margin: 0 auto 0;
+        width: 200rpx;
+        height: 200rpx;
+        position: relative;
+      }
+
+      /* 物品名称 */
+      .play-name {
+        width: 310rpx;
+        margin: 16rpx auto 0;
+        text-align: center;
+        font-size: 20rpx;
+        font-weight: 400;
+        color: #333333;
+      }
+    }
+  }
+
+  /* 规则文本区域 */
+  .rule-text {
+    width: 560rpx;
+    height: 200rpx;
+    margin: 20rpx auto 0;
+    font-size: 24rpx;
+    font-weight: 400;
+    color: #8A8A8A;
+  }
+}
 </style> 
\ No newline at end of file
diff --git a/components/detail-wuxian-rage/detail-wuxian-rage.vue b/components/detail-wuxian-rage/detail-wuxian-rage.vue
new file mode 100644
index 0000000..89266df
--- /dev/null
+++ b/components/detail-wuxian-rage/detail-wuxian-rage.vue
@@ -0,0 +1,81 @@
+<template>
+  <view v-if="pageData && pageData.goods.rage_is == 1" class="angry">
+    <view class="icon flex">
+      <image class="img100" src="/static/common/cardIcon.png" lazy-load></image>
+    </view>
+    <view class="ang-info">
+      <view class="ang-num">怒气值:{{ pageData.goods.user_rage }}</view>
+      <view class="progress">
+        <cmd-progress :percent="pageData.goods.user_rage_schedule" :show-info="false"
+          stroke-color="#FFFFFF;" stroke-shape="round" :strokeWidth="8"></cmd-progress>
+      </view>
+      <view class="tip">
+        {{ pageData.goods.item_card_info }}
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'DetailWuxianRage',
+  props: {
+    pageData: {
+      type: Object,
+      default: () => ({})
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.angry {
+  margin: 30rpx auto 0;
+  width: 690rpx;
+  height: 136rpx;
+  box-sizing: border-box;
+  padding: 0 30rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background: #3B3941;
+  border-radius: 24rpx 24rpx 24rpx 24rpx;
+  border: 2rpx solid #FFFFFF;
+
+  .icon {
+    width: 100rpx;
+    height: 58rpx;
+  }
+
+  .ang-info {
+    width: 490rpx;
+
+    .ang-num {
+      text-align: center;
+      font-size: 24rpx;
+      font-family: Source Han Sans CN;
+      font-weight: 400;
+      color: #FFFFFF;
+    }
+
+    .progress {
+      margin-top: 10rpx;
+
+      /deep/.cmd-progress-inner {
+        border-radius: 0;
+        background: #444444;
+      }
+    }
+
+    .tip {
+      margin-top: 20rpx;
+      display: flex;
+      font-size: 20rpx;
+      font-family: Source Han Sans CN;
+      font-weight: 400;
+      color: #ffffff;
+      line-height: 20rpx;
+    }
+  }
+}
+</style> 
\ No newline at end of file
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..70a57c2
--- /dev/null
+++ b/index.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title><%= htmlWebpackPlugin.options.title %>-友达赏</title>
+    <link rel="icon" type="image/png" href="https://image.zfunbox.cn/icon.png">
+    <script>
+        var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+        document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <link rel="stylesheet" href="<%= BASE_URL %>static/index.<%= VUE_APP_INDEX_CSS_HASH %>.css" />
+</head>
+<body>
+    <div id="app"></div>
+    
+</body>
+</html>
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index a72e50a..9c0754e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -177,7 +177,7 @@
         "devServer" : {
             "https" : false
         },
-        "template" : ""
+        "template" : "index.html"
     },
     "vueVersion" : "2",
     "mp-kuaishou" : {
diff --git a/pages/shouye/dada_ranking.vue b/pages/shouye/dada_ranking.vue
index abc2a5a..f283d86 100644
--- a/pages/shouye/dada_ranking.vue
+++ b/pages/shouye/dada_ranking.vue
@@ -1,66 +1,45 @@
 <template>
+	<page-container title="达达券排行榜" :showBack="true">
+		<view class="content-container">
+			<image :src="$img('/static/image/reward_rule.png')" style="width: 686rpx; height: 120rpx; margin-top: 30rpx;"
+				@click="$refs.rulePop.getRule(24, '规则说明')" mode=""></image>
 
-	<view
-		style="width: 100%; min-height: 100vh; display: flex; flex-direction: column; align-items: center; background-color: #FFFFFF;">
+			<view class="ranking-list">
+				<view class="ranking-item" v-for="(item,index) in list" :key="index"
+					:style="{backgroundColor: setBgColor(index)}">
 
-		<view class="" style="position: relative;width: 100%;">
-			<!-- <view class="" style=" width: 100%; height: 457.64rpx; position: absolute;">
-				<swiper class="" style="width: 100%; height: 100%;" :autoplay="true" :indicator-dots="false"
-					:circular="true" :interval="3000">
-					<swiper-item v-for="(v, i) in advert" :key="i" @click="$c.navTo(v)">
-						<image class="yh_bg" :src="v.imgurl" style="width: 100%;height: 100%;"></image>
-					</swiper-item>
-				</swiper>
-			</view> -->
-			<uni-icons type="left" style="position: absolute; left: 30rpx; z-index: 100;"
-				:style="{top:$sys().statusBarHeight+'px'}" @tap="$c.back(1)" color="#000000"></uni-icons>
-			<view class="" :style="{top:$sys().statusBarHeight+'px'}"
-				style="position: absolute;width: 100%; position: absolute; font-weight: 400; text-align: center; font-size: 37rpx; color: #000000;">
-				达达券排行榜</view>
-		</view>
+					<view class="" v-if="index == 0 "
+						style="width: 43rpx; height: 47rpx;color: #B8B8B8;text-align:center; margin-left: 32rpx;">
+						<image :src="$img1('/image/1.png')" style="width: 42rpx; height: 54rpx;"></image>
+					</view>
+					<view class="" v-if="index == 1 "
+						style="width: 43rpx; height: 47rpx;color: #B8B8B8;text-align:center; margin-left: 32rpx;">
+						<image :src="$img1('/image/2.png')" style="width: 42rpx; height: 54rpx;"></image>
+					</view>
+					<view class="" v-if="index == 2 "
+						style="width: 43rpx; height: 47rpx;color: #B8B8B8;text-align:center; margin-left: 32rpx;">
+						<image :src="$img1('/image/3.png')" style="width: 42rpx; height: 54rpx;"></image>
+					</view>
+					<view class="" v-if="index > 2 "
+						style="width: 42rpx; height: 42rpx;color: #333333;text-align:center; margin-left: 32rpx;">
+						{{index+1}}
+					</view>
 
-		<image :src="$img('/static/image/reward_rule.png')" style="width: 686rpx; height: 120rpx; margin-top: 232rpx;"
-			@click="$refs.rulePop.getRule(24, '规则说明')" mode=""></image>
-
-
-		<view style="width: 683rpx; margin-bottom: 50rpx; display: flex; flex-direction: column; overflow: auto; margin-top: 20rpx;">
-			
-			<view class="" v-for="(item,index) in list" 
-				style="display: flex; flex-direction: row; align-items: center; margin-top:30rpx; border-radius: 14rpx; padding-top: 15rpx; padding-bottom: 15rpx;"
-				:style="{backgroundColor: setBgColor(index)}">
-
-				<view class="" v-if="index == 0 "
-					style="width: 43rpx; height: 47rpx;color: #B8B8B8;text-align:center; margin-left: 32rpx;">
-					<image :src="$img1('/image/1.png')" style="width: 42rpx; height: 54rpx;"></image>
+					<view class="" style="width: 94rpx; height: 94rpx; margin-left: 30rpx;">
+						<image :src="item.headimg" style="width: 94rpx; height: 94rpx; border-radius: 50%;"></image>
+					</view>
+					<view class="" style="display: flex; flex-direction: column; margin-left: 28rpx;flex: 1;">
+						<text style="font-size: 20rpx; color: #333333;">{{item.nickname}}</text>
+					</view>
+					<view class="" style="margin-right: 20rpx;">
+						<span style="color: #333333; font-size: 32rpx;">{{item.value}}<text
+								style="font-size: 16rpx; color: #8A8A8A;">张</text></span>
+					</view>
 				</view>
-				<view class="" v-if="index == 1 "
-					style="width: 43rpx; height: 47rpx;color: #B8B8B8;text-align:center; margin-left: 32rpx;">
-					<image :src="$img1('/image/2.png')" style="width: 42rpx; height: 54rpx;"></image>
-				</view>
-				<view class="" v-if="index == 2 "
-					style="width: 43rpx; height: 47rpx;color: #B8B8B8;text-align:center; margin-left: 32rpx;">
-					<image :src="$img1('/image/3.png')" style="width: 42rpx; height: 54rpx;"></image>
-				</view>
-				<view class="" v-if="index > 2 "
-					style="width: 42rpx; height: 42rpx;color: #333333;text-align:center; margin-left: 32rpx;">
-					{{index+1}}
-				</view>
-
-				<view class="" style="width: 94rpx; height: 94rpx; margin-left: 30rpx;">
-					<image :src="item.headimg" style="width: 94rpx; height: 94rpx; border-radius: 50%;"></image>
-				</view>
-				<view class="" style="display: flex; flex-direction: column; margin-left: 28rpx;flex: 1;">
-					<text style="font-size: 20rpx; color: #333333;">{{item.nickname}}</text>
-				</view>
-				<view class="" style="margin-right: 20rpx;">
-					<span style="color: #333333; font-size: 32rpx;">{{item.value}}<text
-							style="font-size: 16rpx; color: #8A8A8A;">张</text></span>
-				</view>
-
 			</view>
 		</view>
 		<rule-pop ref="rulePop"></rule-pop>
-	</view>
+	</page-container>
 </template>
 
 <script>
@@ -114,8 +93,35 @@
 </script>
 
 <style lang="scss">
+	.content-container {
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 0 30rpx;
+		box-sizing: border-box;
+	}
+	
+	.ranking-list {
+		width: 100%;
+		margin-bottom: 50rpx;
+		display: flex;
+		flex-direction: column;
+		overflow: auto;
+		margin-top: 20rpx;
+	}
+	
+	.ranking-item {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		margin-top: 30rpx;
+		border-radius: 14rpx;
+		padding-top: 15rpx;
+		padding-bottom: 15rpx;
+	}
+	
 	.navLeft {
-
 		height: 44px;
 		z-index: 100;
 		display: flex;
diff --git a/pages/shouye/detail.vue b/pages/shouye/detail.vue
index cc183a3..d5f3f0a 100644
--- a/pages/shouye/detail.vue
+++ b/pages/shouye/detail.vue
@@ -2,20 +2,8 @@
 盒子详情
 -->
 <template>
+	<page-container :title="$c.detailPageTitle((pageData && pageData.goods))" :showBack="true">
 	<view class="content">
-		<view>
-
-		</view>
-		<view class="navLeft align-center" :style="{ top: $sys().statusBarHeight + 'px' }" @tap="$c.back(1)">
-			<uni-icons type="left" color="#000000"></uni-icons>
-		</view>
-
-		<view class="center relative" style="z-index: 10;" :style="{ top: $sys().statusBarHeight + 'px' }">
-			<text class="" style="padding-top: 20rpx;">{{ $c.detailPageTitle((pageData && pageData.goods) || "")
-			}}</text>
-		</view>
-
-
 		<view class="header relative" v-if="pageData && pageData.goods"
 			:style="{ background: 'url(' + pageData.goods.imgurl_detail + ') no-repeat 0 0 / 100% 100%', }">
 
@@ -175,9 +163,11 @@
 		<!-- 添加直接引用的预览组件 -->
 		<detail-preview-popup ref="localPreviewPopup"></detail-preview-popup>
 	</view>
+	</page-container>
 </template>
 
 <script>
+import PageContainer from '@/components/page-container/page-container.vue'
 import OrderConfirmPopup from '@/components/order-confirm-popup/order-confirm-popup.vue'
 import DetailListItem from '@/components/detail-list-item/detail-list-item.vue'
 import DetailButton from '@/components/detail-button/detail-button.vue'
@@ -187,6 +177,7 @@ import preview from '@/components/detail-preview-popup/index.js'
 
 export default {
 	components: {
+		PageContainer,
 		OrderConfirmPopup,
 		DetailListItem,
 		DetailButton,
@@ -197,7 +188,7 @@ export default {
 			optData: "",
 			boxNum: "",
 			buyNum: 0,
-
+			title:"",
 			// 下拉刷新的配置(可选, 绝大部分情况无需配置)
 			downOption: {
 				auto: false,
@@ -716,7 +707,7 @@ export default {
 	.header {
 		width: 750rpx;
 		height: 722rpx;
-		margin-top: 130rpx;
+		// margin-top: 130rpx;
 		background-color: #d8d8d8;
 
 		&-wuzhe {
diff --git a/pages/shouye/detail_wuxian.vue b/pages/shouye/detail_wuxian.vue
index 8abd20f..2f9e184 100644
--- a/pages/shouye/detail_wuxian.vue
+++ b/pages/shouye/detail_wuxian.vue
@@ -1,83 +1,70 @@
 <template>
-	<page-container  :title="title" :showBack="true">
+	<page-container :title="title" :showBack="true">
 		<view class="content minHeight100">
-		 
-		<view class="header relative" v-if="pageData && pageData.goods"
-			:style="{ background: 'url(' + pageData.goods.imgurl_detail + ') no-repeat 0 0 / 100% 100%' }">
-			<view class="header-wuzhe flex" v-if="pageData.goods.is_shou_zhe == 1">
-				<image class="img100" :src="$img1('common/chouBanjia.png')" mode="aspectFit"></image>
-			</view>
-			<view class="header-goodsTitel">{{ pageData.goods.title }}</view>
-			<view class="header-suoxiang center" v-if="pageData.goods.lock_is == 1 && pageData.lock_info.goods_lock_surplus_time > 0">
-				<image :src="pageData.lock_info.goods_lock_user_headimg" mode="aspectFill"></image>
-				<view class="hidden ml10">{{ pageData.lock_info.goods_lock_user_nickname }}</view>
-				<image class="ml20" :src="$img1('index/suoxinag.png')" mode="aspectFit"></image>
-				<view class="ml30">倒计时：{{ secNum }}S</view>
-			</view>
-			<view class="header-title center"
-				:style="{ background: 'url(' + $img1('common/chouTitle.png') + ') no-repeat 0 0 / 100% 100%' }">
-				<text>
-					<template></template>
-				</text>
-				<text>
-					<template>￥</template>
-					<template>{{ pageData.goods.price }}</template>
-				</text>
-				<text>
-					<template>/抽</template>
-				</text>
-			</view>
-			<view class="header-canyu row align-center">
-				<view class="header-canyu-imgs flex">
-					<image v-for="(item, i) in pageData.goods.join_user.slice(0, 3)" :key="i" :style="{ 'z-index': i }"
-						:src="item" mode="aspectFill"></image>
+			<view class="header relative" v-if="pageData && pageData.goods"
+				:style="{ background: 'url(' + pageData.goods.imgurl_detail + ') no-repeat 0 0 / 100% 100%' }">
+				<view class="header-wuzhe flex" v-if="pageData.goods.is_shou_zhe == 1">
+					<image class="img100" :src="$img1('common/chouBanjia.png')" mode="aspectFit"></image>
 				</view>
-				<view class="header-canyu-num mt10">{{ pageData.goods.join_count }}次参与</view>
-			</view>
-
-
-			<view class="header-shoucang justify-center" style=" flex-direction: column; margin-right: 48rpx;"
-				@tap="toggleCollect">
-				<image :src="pageData.goods.collection_is ? $img1('index/sc1.png') : $img1('index/sc2.png')"></image>
-				<text>收藏</text>
-			</view>
-
-			<view
-				style="width: 100%; height: 232rpx; position: absolute; bottom: 0; background-image: linear-gradient(180deg, rgba(0, 0, 0, 0), rgba(0, 0, 0, 1));">
-			</view>
-
-		</view>
-		<!--选项卡-->
-		<detail-toolbar :goods-type="pageData.goods.type" :current-tab="tabCur" @rule-click="$refs.rulePop.getRule(pageData.danye_id, '购买说明')"
-			@tab-change="tabChange" @change-box="changeBox" :isWuxian="true"></detail-toolbar>
-		<detail-wuxian-lingzhu  :boss-card-data="bossCardData" @open-boss-pop="open('bossPop')"> </detail-wuxian-lingzhu>
-		<view v-if="pageData && pageData.goods.rage_is == 1" class="angry">
-			<view class="icon flex">
-				<image class="img100" src="/static/common/cardIcon.png" lazy-load></image>
-			</view>
-			<view class="ang-info">
-				<view class="ang-num">怒气值:{{ pageData.goods.user_rage }}</view>
-				<view class="progress">
-					<cmd-progress :percent="pageData.goods.user_rage_schedule" :show-info="false"
-						stroke-color="#FFFFFF;" stroke-shape="round" :strokeWidth="8"></cmd-progress>
+				<view class="header-goodsTitel">{{ pageData.goods.title }}</view>
+				<view class="header-suoxiang center"
+					v-if="pageData.goods.lock_is == 1 && pageData.lock_info.goods_lock_surplus_time > 0">
+					<image :src="pageData.lock_info.goods_lock_user_headimg" mode="aspectFill"></image>
+					<view class="hidden ml10">{{ pageData.lock_info.goods_lock_user_nickname }}</view>
+					<image class="ml20" :src="$img1('index/suoxinag.png')" mode="aspectFit"></image>
+					<view class="ml30">倒计时：{{ secNum }}S</view>
 				</view>
-				<view class="tip">
-					{{ pageData.goods.item_card_info }}
+				<view class="header-title center"
+					:style="{ background: 'url(' + $img1('common/chouTitle.png') + ') no-repeat 0 0 / 100% 100%' }">
+					<text>
+						<template></template>
+					</text>
+					<text>
+						<template>￥</template>
+						<template>{{ pageData.goods.price }}</template>
+					</text>
+					<text>
+						<template>/抽</template>
+					</text>
 				</view>
-			</view>
-		</view>
-		<!-- 商品预览 -->
-		<view v-if="tabCur == 1 && pageData" class="list" style="padding: 0rpx 20rpx 0;">
-			<view class="list-item common_bg mb30" v-for="(item, i) in pageData.goodslist" :key="i">
-				<view class="list-title common_bg align-center">
-					<view class="align-center">
-						<image style="width: 56rpx; height: 56rpx;" :src="item.shang_imgurl"></image>
-						<text class="ml20" style="color: #999999;">{{ item.pro }}</text>
+				<view class="header-canyu row align-center">
+					<view class="header-canyu-imgs flex">
+						<image v-for="(item, i) in pageData.goods.join_user.slice(0, 3)" :key="i"
+							:style="{ 'z-index': i }" :src="item" mode="aspectFill"></image>
 					</view>
+					<view class="header-canyu-num mt10">{{ pageData.goods.join_count }}次参与</view>
 				</view>
-				<view class="goods-list justify-center">
-					<template v-for="(a, b) in item.goods_list">
-						<detail-list-item :item="a" @click="previewDetail(item, a)" :key="b">
+				<view class="header-shoucang justify-center" style=" flex-direction: column; margin-right: 48rpx;"
+					@tap="toggleCollect">
+					<image :src="pageData.goods.collection_is ? $img1('index/sc1.png') : $img1('index/sc2.png')">
+					</image>
+					<text>收藏</text>
+				</view>
+
+				<view
+					style="width: 100%; height: 232rpx; position: absolute; bottom: 0; background-image: linear-gradient(180deg, rgba(0, 0, 0, 0), rgba(0, 0, 0, 1));">
+				</view>
+			</view>
+			<!--选项卡-->
+			<detail-toolbar v-if="goods!=null" :goods-type="goods.type" :current-tab="tabCur"
+				@rule-click="$refs.rulePop.getRule(pageData.danye_id, '购买说明')" @tab-change="tabChange"
+				@change-box="changeBox" :isWuxian="true"></detail-toolbar>
+			<detail-wuxian-lingzhu v-if="goods != null && goods.lingzhu_is == 1" :goods-num="0" :goods="goods">
+			</detail-wuxian-lingzhu>
+			<detail-wuxian-rage v-if="pageData && pageData.goods.rage_is == 1"
+				:page-data="pageData"></detail-wuxian-rage>
+
+			<!-- 商品预览 -->
+			<view v-if="tabCur == 1 && pageData" class="list" style="padding: 0rpx 20rpx 0;">
+				<view class="list-item common_bg mb30" v-for="(item, i) in pageData.goodslist" :key="i">
+					<view class="list-title common_bg align-center">
+						<view class="align-center">
+							<image style="width: 56rpx; height: 56rpx;" :src="item.shang_imgurl"></image>
+							<text class="ml20" style="color: #999999;">{{ item.pro }}</text>
+						</view>
+					</view>
+					<view class="goods-list justify-center">
+						<detail-list-item v-for="(a, b) in item.goods_list" :key="b" :item="a" @click="previewDetail(item, a)">
 							<template #content>
 								<view class="item-info">
 									<view class="item-title hang1">
@@ -90,113 +77,112 @@
 								</view>
 							</template>
 						</detail-list-item>
-
-					</template>
+					</view>
 				</view>
+				<view style="height: 150rpx;"></view>
 			</view>
-			<view style="height: 150rpx;"></view>
-		</view>
-		<!-- 中赏记录 -->
-		<template v-if="tabCur == 2">
-			<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="getLog" :down="downOption"
-				:up="upOption">
-				<scroll-view class="sub-tab" scroll-x>
-					<view class="sub-tab-item common_bg" v-for="(item, i) in subTab" :key="i"
-						:class="{ act: subTabCur == i }" @click="subTabChange(i)">
-						{{ item.shang_title }}
-					</view>
-				</scroll-view>
-
-				<view class="log-list">
-					<view class="log-item br10" v-for="(a, b) in logList" :key="b">
-						<!-- 添加角标 -->
-						<view class="corner-tag" v-if="a.doubling > 1"></view>
-						<view class="lingzhu-tag" v-if="a.is_lingzhu > 0"></view>
-
-						<view class="avatar">
-							<image :src="a.user_info && a.user_info.headimg" style="width:80rpx; height: 80rpx;">
-							</image>
+			<!-- 中赏记录 -->
+			<template v-if="tabCur == 2">
+				<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="getLog"
+					:down="downOption" :up="upOption">
+					<scroll-view class="sub-tab" scroll-x>
+						<view class="sub-tab-item common_bg" v-for="(item, i) in subTab" :key="i"
+							:class="{ act: subTabCur == i }" @click="subTabChange(i)">
+							{{ item.shang_title }}
 						</view>
+					</scroll-view>
 
-						<view class="info">
-							<view class="name hang1">
-								{{ a.user_info && a.user_info.nickname }}
+					<view class="log-list">
+						<view class="log-item br10" v-for="(a, b) in logList" :key="b">
+							<!-- 添加角标 -->
+							<view class="corner-tag" v-if="a.doubling > 1"></view>
+							<view class="lingzhu-tag" v-if="a.is_lingzhu > 0"></view>
+
+							<view class="avatar">
+								<image :src="a.user_info && a.user_info.headimg" style="width:80rpx; height: 80rpx;">
+								</image>
 							</view>
 
-							<view class="time">{{ a.addtime }}</view>
-						</view>
+							<view class="info">
+								<view class="name hang1">
+									{{ a.user_info && a.user_info.nickname }}
+								</view>
 
-						<view class="prize">
-
-							<view class="pic flex">
-								<image class="img100" :src="a.goodslist_imgurl"></image>
+								<view class="time">{{ a.addtime }}</view>
 							</view>
-							<view class="align-end column">
-								<view style="display: flex; align-items: center;">
 
-									<view class="center log-tag" :style="{ background: a.shang_color }">{{ a.shang_title
-									}}
+							<view class="prize">
+
+								<view class="pic flex">
+									<image class="img100" :src="a.goodslist_imgurl"></image>
+								</view>
+								<view class="align-end column">
+									<view style="display: flex; align-items: center;">
+
+										<view class="center log-tag" :style="{ background: a.shang_color }">{{
+											a.shang_title
+										}}
+										</view>
+										<view v-if="a.doubling > 1" class="center multiple-tag" style="">x{{
+											a.doubling }}</view>
 									</view>
-									<view v-if="a.doubling > 1" class="center multiple-tag" style="">x{{
-										a.doubling }}</view>
-								</view>
-								<view class="align-center mt10">
-									<view class="title hang1">
-										{{ a.goodslist_title }}
+									<view class="align-center mt10">
+										<view class="title hang1">
+											{{ a.goodslist_title }}
+										</view>
+										<view class="num">×1</view>
 									</view>
-									<view class="num">×1</view>
 								</view>
 							</view>
 						</view>
 					</view>
-				</view>
-			</mescroll-body>
-		</template>
-		<!-- 选项按钮 -->
-		<detail-button v-if="pageData" :pageData="pageData" :isWuxian="true" @button-click="confirmSubmit"
-			@button-wx-click="wuxianchou"></detail-button>
-		<uni-popup ref="resPop" type="center" mask-background-color="rgba(0,0,0,0.8)">
-			<view class="res-pop common_bg column center" @click="close('resPop')">
-				<view class="res-pop-hd"></view>
-				<scroll-view class="res-pop-bd" scroll-y>
-					<view class="res-list">
-						<view class="res-item" v-for="(item, i) in prizeData.data" :key="i">
-							<view class="pic center">
-								<image :src="item.goodslist_imgurl" lazy-load></image>
-								<view class="type-tag center"
-									:style="{ backgroundColor: getBgColor(item.shang_title), color: getTextColor(item.shang_title) }">
-									{{ item.shang_title }}
-								</view>
-								<view class="num center">{{ item.prize_num || '1' }}</view>
-								<view v-if="item.doubling > 1" class="yu-tag-text ziti log-multiple-tag" style="">
-									x{{ item.doubling }}</view>
-								<view v-if="item.is_lingzhu > 0" class="yu-tag-text ziti log-lingzhu-tag" style="">
-								</view>
+				</mescroll-body>
+			</template>
+			<!-- 选项按钮 -->
+			<detail-button v-if="pageData" :pageData="pageData" :isWuxian="true" @button-click="confirmSubmit"
+				@button-wx-click="wuxianchou"></detail-button>
+			<uni-popup ref="resPop" type="center" mask-background-color="rgba(0,0,0,0.8)">
+				<view class="res-pop common_bg column center" @click="close('resPop')">
+					<view class="res-pop-hd"></view>
+					<scroll-view class="res-pop-bd" scroll-y>
+						<view class="res-list">
+							<view class="res-item" v-for="(item, i) in prizeData.data" :key="i">
+								<view class="pic center">
+									<image :src="item.goodslist_imgurl" lazy-load></image>
+									<view class="type-tag center"
+										:style="{ backgroundColor: getBgColor(item.shang_title), color: getTextColor(item.shang_title) }">
+										{{ item.shang_title }}
+									</view>
+									<view class="num center">{{ item.prize_num || '1' }}</view>
+									<view v-if="item.doubling > 1" class="yu-tag-text ziti log-multiple-tag" style="">
+										x{{ item.doubling }}</view>
+									<view v-if="item.is_lingzhu > 0" class="yu-tag-text ziti log-lingzhu-tag" style="">
+									</view>
 
-							</view>
-							<view class="title hang1" style="text-align: center;">
-								<text> {{ item.goodslist_title }}</text>
+								</view>
+								<view class="title hang1" style="text-align: center;">
+									<text> {{ item.goodslist_title }}</text>
+								</view>
 							</view>
 						</view>
-					</view>
-				</scroll-view>
+					</scroll-view>
 
-				<view class="res-pop-ft">
-					<view class="btn-list">
-						<view class="ft-btn common_bg justify-center center" :style="{
-							backgroundImage: `url(${$img1('common/quhegui.png')})`
-						}" @click="toBag">
-							<text>去发货</text>
+					<view class="res-pop-ft">
+						<view class="btn-list">
+							<view class="ft-btn common_bg justify-center center" :style="{
+								backgroundImage: `url(${$img1('common/quhegui.png')})`
+							}" @click="toBag">
+								<text>去发货</text>
+							</view>
+
+							<view class="ft-btn common_bg justify-center center" :style="{
+								backgroundImage: `url(${$img1('common/jixuchou.png')})`
+							}" @click="confirmSubmit([0, buyNum])">
+								<text>继续抽</text>
+							</view>
 						</view>
 
-						<view class="ft-btn common_bg justify-center center" :style="{
-							backgroundImage: `url(${$img1('common/jixuchou.png')})`
-						}" @click="confirmSubmit([0, buyNum])">
-							<text>继续抽</text>
-						</view>
-					</view>
-
-					<!-- <view class="r-draw common_bg justify-center" :style="{
+						<!-- <view class="r-draw common_bg justify-center" :style="{
 						backgroundImage: `url(${$img1('common/chongzhi.png')})`
 					}" @click="$c.noDouble(doReDraw)">
 						<text class="draw-num">
@@ -204,163 +190,53 @@
 						</text>
 						<text class="num">(余{{ prizeData.item_card_count }})</text>
 					</view> -->
-				</view>
-			</view>
-		</uni-popup>
-
-		<uni-popup ref="bossPop" type="bottom" mask-background-color="rgba(0,0,0,0.8)">
-			<view v-if="bossCardData && bossCardData.king_user" class="boss-pop relative">
-				<view class="boss-pop-title">
-					<text>领主接力</text>
-				</view>
-
-
-				<view @click="close('bossPop')" class="close flex">
-					<image class="img100" :src="$img1('index/close.png')"></image>
-				</view>
-
-
-				<view class="boss-avatar relative">
-					<image :src="bossCardData.king_user.headimg"></image>
-					<image :src="$img1('index/king.png')"></image>
-
-					<view class="boss-name hang1">
-						{{ bossCardData.king_user.nickname }}
-					</view>
-
-					<view class="boss-pop-guize align-center" @click="open('playPop')">
-						<image :src="$img1('common/ic_rule.png')" mode=""></image>
 					</view>
 				</view>
+			</uni-popup>
 
-
-
-				<view class="flex row center" style="font-size: 20rpx; color: #999999; margin-top: 24rpx;">
-
-					<text>挑战领主获得UU币奖励</text>
-
-					<text class="get-money-one">玩家每挑战一发,领主可获得</text>
-					<!-- <image class="get-money-two" :src="$img('/static/img/pay_type2.png')" mode="widthFix"></image> -->
-					<text class="get-money-three">{{ bossCardData.goods.lingzhu_fan }}币</text>
-
-				</view>
-
-				<view class="boss-tab">
-					<view class="boss-tab-item" v-for="(item, i) in bossTab" :key="i" :class="{
-						act: bossTabCur == i
-					}" @click="bossTabChange(i)">
-
-						<text>{{ item.title }}</text>
-
+			<uni-popup ref="dPop" type="center" maskBackgroundColor="rgba(0,0,0,0.9)">
+				<view v-if="previewData" class="d-pop">
+					<view class="pic center relative">
+						<image :src="previewData.imgurl" lazy-load></image>
+						<view class="flex center">{{ previewData.shang_title }}</view>
 					</view>
-				</view>
-
-				<child-scroll class="list-wrap" height="350rpx" ref="bossScroll" :fixed="false" :size="20"
-					@up="getBossData">
-					<view class="boss-list">
-						<template v-for="(item, i) in bossList">
-							<view v-if="bossTab[bossTabCur].id == 1" class="people-item mt30" :key="i">
-								<view class="avatar flex">
-									<image class="img100" :src="item.headimg"></image>
-								</view>
-								<view class="name hang1">{{ item.nickname }}</view>
-							</view>
-
-							<view v-if="bossTab[bossTabCur].id == 2" class="boss-log">
-								<view class="flex center">
-									<view class="avatar flex" style="width: 52rpx; height: 52rpx;">
-										<image class="img100" :src="item.headimg"></image>
-									</view>
-									<view class="name hang1">{{ item.nickname }}</view>
-								</view>
-
-
-								<view class="place">
-									<text>占领领主{{ item.time }}</text>
-								</view>
-
-								<!-- <view class="time"></view> -->
-							</view>
-						</template>
+					<view class="title">
+						<text class="hang1">
+							{{ previewData.title }}
+						</text>
 					</view>
-				</child-scroll>
-			</view>
-		</uni-popup>
-
-		<uni-popup ref="playPop" type="center">
-			<view v-if="bossCardData" class="play-pop common_bg">
-				<view class="close align-center justify-between">
-					<view class="close-icon"></view>
-					<view class="close-title">玩法规则</view>
-					<view class="close-icon flex" @click="close('playPop')">
-						<image class="img100" :src="$img1('index/close.png')"></image>
-					</view>
-				</view>
-
-				<swiper class="p-swiper">
-					<swiper-item class="p-item" v-for="(item, i) in bossCardData.ling_goods_list" :key="i">
-						<view class="play-pic flex">
-							<image class="img100" :src="item.imgurl"></image>
+					<view class="d-list">
+						<view class="d-item">
+							<!-- {{ previewData.shang_title }} -->
+							概率:{{ previewData.pro }}%
 						</view>
-						<view class="play-name hang1">
-							{{ item.title }}
-						</view>
-					</swiper-item>
-				</swiper>
 
-				<!-- <view class="line"></view> -->
-				<view class="pd30 br20" style="background: #D8D8D8;">
-					<scroll-view class="rule-text" scroll-y>
-						<view v-html="playRuleData"></view>
-					</scroll-view>
-				</view>
-			</view>
-		</uni-popup>
-
-		<uni-popup ref="dPop" type="center" maskBackgroundColor="rgba(0,0,0,0.9)">
-			<view v-if="previewData" class="d-pop">
-				<view class="pic center relative">
-					<image :src="previewData.imgurl" lazy-load></image>
-					<view class="flex center">{{ previewData.shang_title }}</view>
-				</view>
-				<view class="title">
-					<text class="hang1">
-						{{ previewData.title }}
-					</text>
-				</view>
-				<view class="d-list">
-					<view class="d-item">
-						<!-- {{ previewData.shang_title }} -->
-						概率:{{ previewData.pro }}%
+						<view class="d-item">产品类型:{{ optData.type_text }}</view>
 					</view>
+					<view class="close icon" @click="close('dPop')">
+						<image :src="$img('/static/img/close.png')" lazy-load></image>
+					</view>
+				</view>
+			</uni-popup>
+			<!-- 购买确认弹窗 -->
+			<order-confirm-popup ref="buyPop" v-if="orderData" :order-data="orderData" :page-data="pageData"
+				:use-money="useMoney" :use-money2="useMoney2" :use-integral="useIntegral" :coupon-data="couponData"
+				:is-agree="isAgree" :send-rule-data="sendRuleData" :buy-num="buyNum" @close="close('buyPop')"
+				@change-pay="changePay" @toggle-agree="isAgree = !isAgree" @to-coupon="toCoupon"
+				@confirm="$c.noDouble1(confirmSubmit, [1, buyNum])"></order-confirm-popup>
 
-					<view class="d-item">产品类型:{{ optData.type_text }}</view>
-				</view>
-				<view class="close icon" @click="close('dPop')">
-					<image :src="$img('/static/img/close.png')" lazy-load></image>
-				</view>
+			<view v-if="aniShow" class="ani-pop">
+				<image :src="aniSrc" lazy-load></image>
 			</view>
-		</uni-popup>
-		<!-- 购买确认弹窗 -->
-		<order-confirm-popup ref="buyPop" v-if="orderData" :order-data="orderData" :page-data="pageData"
-			:use-money="useMoney" :use-money2="useMoney2" :use-integral="useIntegral" :coupon-data="couponData"
-			:is-agree="isAgree" :send-rule-data="sendRuleData" :buy-num="buyNum" @close="close('buyPop')"
-			@change-pay="changePay" @toggle-agree="isAgree = !isAgree" @to-coupon="toCoupon"
-			@confirm="$c.noDouble1(confirmSubmit, [1, buyNum])"></order-confirm-popup>
 
-		<view v-if="aniShow" class="ani-pop">
-			<image :src="aniSrc" lazy-load></image>
+			<buy-notice ref="buyNotice" @confirm="$c.noDouble(confirmSubmit, [1, buyNum, true])"></buy-notice>
+
+			<rule-pop ref="rulePop"></rule-pop>
+			<coupon-pop ref="couponPop"></coupon-pop>
+			<!-- 添加直接引用的预览组件 -->
+			<detail-preview-popup ref="localPreviewPopup"></detail-preview-popup>
 		</view>
-
-		<buy-notice ref="buyNotice" @confirm="$c.noDouble(confirmSubmit, [1, buyNum, true])"></buy-notice>
-
-		<rule-pop ref="rulePop"></rule-pop>
-		<coupon-pop ref="couponPop"></coupon-pop>
-		<!-- 添加直接引用的预览组件 -->
-		<detail-preview-popup ref="localPreviewPopup"></detail-preview-popup>
-	</view>
 	</page-container>
-
 </template>
 
 <script>
@@ -372,6 +248,7 @@ import DetailButton from '@/components/detail-button/detail-button.vue'
 import DetailPreviewPopup from '@/components/detail-preview-popup/detail-preview-popup.vue'
 import preview from '@/components/detail-preview-popup/index.js'
 import DetailWuxianLingzhu from '@/components/detail-wuxian-lingzhu/detail-wuxian-lingzhu.vue'
+import DetailWuxianRage from '@/components/detail-wuxian-rage/detail-wuxian-rage.vue'
 
 export default {
 	components: {
@@ -380,13 +257,14 @@ export default {
 		DetailListItem,
 		DetailButton,
 		DetailPreviewPopup,
-		DetailWuxianLingzhu // 注册新组件
+		DetailWuxianLingzhu,
+		DetailWuxianRage // 注册新组件
 	},
 	data() {
 		return {
 			userCoupon: null,
 			optData: '',
-			title:'',
+			title: '',
 			buyNum: 0,
 			useMoney: true,
 			useIntegral: true,
@@ -415,16 +293,6 @@ export default {
 			autoplay: false,
 			subTab: [],
 			subTabCur: 0,
-			bossTab: [{
-				id: 1,
-				title: '挑战人数'
-			},
-			{
-				id: 2,
-				title: '领主记录'
-			}
-			],
-			bossTabCur: 0,
 			pageData: '',
 			previewData: '',
 			orderData: '',
@@ -433,12 +301,9 @@ export default {
 			couponData: '',
 			isAgree: true,
 			aniShow: false,
-			bossCardData: '',
-			bossList: [],
-			bossTotal: 0,
-			playRuleData: '',
 			logList: [],
-			choujiangloading: false
+			choujiangloading: false,
+			goods: null,
 		}
 	},
 
@@ -480,14 +345,14 @@ export default {
 	onLoad(options) {
 		this.optData = options;
 		console.log(options);
-		
+
 		uni.$on('chooseCoupon', data => {
 			// console.log('data', data)
 
 			this.couponData = data
 			this.confirmSubmit([0, this.buyNum])
 		})
- 
+
 
 		this.$c.getRule(10).then(res => {
 			if (res.status == 1) {
@@ -501,7 +366,8 @@ export default {
 	},
 
 	onReady() {
-		this.tabChange(this.tabCur)
+		// this.tabChange(this.tabCur)
+		this.getData();
 	},
 
 	onHide() {
@@ -513,14 +379,6 @@ export default {
 	},
 
 	methods: {
-		bossTabChange(i) {
-			this.bossTabCur = i
-			this.bossList = []
-
-			this.$refs.bossScroll.mescroll.resetUpScroll()
-			this.$refs.bossScroll.mescroll.scrollTo(0, 0)
-		},
-
 		previewDetail(item, a) {
 
 			const obj = {
@@ -792,6 +650,9 @@ export default {
 		},
 
 		tabChange(i) {
+			if (i == this.tabCur) {
+				return;
+			}
 			this.tabCur = i
 
 			switch (Number(i)) {
@@ -804,41 +665,6 @@ export default {
 			}
 		},
 
-		getBossData({
-			num,
-			init
-		}) {
-			this.req({
-				url: 'ling_zhu_king',
-				data: {
-					page: num,
-					goods_id: this.optData.goods_id,
-					type: this.bossTab[this.bossTabCur].id
-				},
-				Loading: true,
-				success: res => {
-					if (res.status == 1) {
-						this.bossCardData = res.data
-						console.log(this.bossCardData);
-
-						if (init) {
-							return
-						}
-
-						if (num == 1) {
-							this.bossList = []
-						}
-
-						this.bossList = this.bossList.concat(res.data.list.data)
-						this.$refs.bossScroll.mescroll.endByPage(
-							res.data.list.data.length,
-							res.data.list.last_page
-						)
-					}
-				}
-			})
-		},
-
 		getLog({
 			num,
 			size
@@ -881,16 +707,11 @@ export default {
 				},
 				success: res => {
 					if (res.status == 1) {
-						if (res.data.goods.lingzhu_is == 1) {
-							this.getBossData({
-								num: 1,
-								init: true
-							})
-						}
+						this.goods = res.data.goods;
 						res.data.goodslist.forEach(item => {
 							this.$set(item, 'open', false)
 						})
-						if(res.data.goods.type_text){
+						if (res.data.goods.type_text) {
 							this.title = res.data.goods.type_text
 						}
 						this.pageData = res.data
@@ -922,30 +743,6 @@ export default {
 
 		open(e) {
 			this.$refs[e].open()
-
-			if (e == 'bossPop') {
-				this.$nextTick(() => {
-					setTimeout(() => {
-						this.bossTabChange(this.bossTabCur)
-					}, 200)
-				})
-			}
-
-			// if (e == "resPop") {
-			// 	this.$nextTick(() => {
-			// 		setTimeout(() => {
-			// 			this.$refs["couponPop"].open()
-			// 		}, 200)
-			// 	})
-			// }
-
-			if (e == 'playPop') {
-				this.$c.getRule(14).then(res => {
-					if (res.status == 1) {
-						this.playRuleData = res.data
-					}
-				})
-			}
 		},
 
 		// 设置背景颜色
@@ -1062,7 +859,7 @@ export default {
 		color: #FFFFFF;
 	}
 }
- 
+
 
 .content {
 	padding: 0 0 0rpx;
@@ -1677,7 +1474,6 @@ export default {
 					font-weight: 400;
 					font-size: 24rpx;
 					color: #333333;
-					text-align: right;
 				}
 
 				.num {
diff --git a/pages/shouye/yaoqing_ranking.vue b/pages/shouye/yaoqing_ranking.vue
index ca7a801..e66d0e8 100644
--- a/pages/shouye/yaoqing_ranking.vue
+++ b/pages/shouye/yaoqing_ranking.vue
@@ -1,119 +1,64 @@
 <template>
+	<page-container title="邀请排行榜" :showBack="true">
+		<view class="content-container">
+			<image :src="$img('/static/image/reward_rule.png')" style="width: 686rpx; height: 120rpx; margin-top: 30rpx;"
+				@click="$refs.rulePop.getRule(25, '规则说明')" mode=""></image>
 
-	<view
-		style="width: 100%; min-height: 100vh; display: flex; flex-direction: column; align-items: center; background-color: #FFFFFF;">
+			<view class="top-three" v-if="list.length > 0">
+				<!-- 第二名 -->
+				<view class="common_bg second-place"
+					:style="{ 'background-image': `url(${$img('/static/image/invite2.png')})` }">
+					<image :src="topThree[1].headimg" class="avatar"></image>
+					<text class="hang1 nickname">{{ topThree[1].nickname }}</text>
+					<text class="hang1 value">{{ topThree[1].value }}<text class="unit">人</text></text>
+				</view>
 
-		<view class="" style="position: relative;width: 100%;">
- 
-			<uni-icons type="left" style="position: absolute; left: 30rpx; z-index: 100;"
-				:style="{ top: $sys().statusBarHeight + 'px' }" @tap="$c.back(1)" color="#000000"></uni-icons>
-			<view class="" :style="{ top: $sys().statusBarHeight + 'px' }"
-				style="position: absolute;width: 100%; position: absolute; font-weight: 400; text-align: center; font-size: 37rpx; color: #000000;">
-				邀请排行榜</view>
-		</view>
+				<!-- 第一名 -->
+				<view class="common_bg first-place"
+					:style="{ 'background-image': `url(${$img('/static/image/invite1.png')})` }">
+					<image :src="topThree[0].headimg" class="avatar"></image>
+					<text class="hang1 nickname">{{ topThree[0].nickname }}</text>
+					<text class="hang1 value">{{ topThree[0].value }}<text class="unit">人</text></text>
+				</view>
 
-		<image :src="$img('/static/image/reward_rule.png')" style="width: 686rpx; height: 120rpx; margin-top: 232rpx;"
-			@click="$refs.rulePop.getRule(25, '规则说明')" mode=""></image>
-
-
-		<view class="" v-if="list.length > 0" style="width: 100%; height: 480rpx; margin-top: 20rpx; display: flex; flex-direction: row;">
-			<!-- 第二名 -->
-			<view class="common_bg"
-				style="width: 200rpx; height: 379rpx; margin-top: 52rpx; margin-left: 32rpx; display: flex; flex-direction: column;"
-				:style="{ 'background-image': `url(${$img('/static/image/invite2.png')})` }">
-				<image :src="list[1].headimg"
-					style="width: 94rpx; height: 94rpx; border-radius: 50%; margin-top: 38rpx; margin-left: 55rpx;">
-				</image>
-
-				<text class="hang1" style="width: 100%; text-align: center; margin-top: 24rpx;">{{ list[1].nickname
-				}}</text>
-
-				<text class="hang1" style="width: 100%; text-align: center; margin-top: 24rpx; font-size: 32rpx;">{{
-					list[1].value }}
-					<text style="font-size: 16rpx;">人</text>
-				</text>
+				<!-- 第三名 -->
+				<view class="common_bg third-place"
+					:style="{ 'background-image': `url(${$img('/static/image/invite3.png')})` }">
+					<image :src="topThree[2].headimg" class="avatar"></image>
+					<text class="hang1 nickname">{{ topThree[2].nickname }}</text>
+					<text class="hang1 value">{{ topThree[2].value }}<text class="unit">人</text></text>
+				</view>
 			</view>
 
-			<!-- 第一名 -->
-			<view class="common_bg"
-				style="width: 200rpx; height: 379rpx; margin-top: 10rpx; margin-left: 42rpx; display: flex; flex-direction: column;"
-				:style="{ 'background-image': `url(${$img('/static/image/invite1.png')})` }">
-				<image :src="list[0].headimg"
-					style="width: 94rpx; height: 94rpx; border-radius: 50%; margin-top: 38rpx; margin-left: 55rpx;">
-				</image>
+			<view class="ranking-list">
+				<view class="ranking-item" v-for="(item, index) in restList" :key="index"
+					:style="{ backgroundColor: setBgColor(index + 3) }">
 
-				<text class="hang1" style="width: 100%; text-align: center; margin-top: 24rpx;">{{ list[0].nickname
-				}}</text>
+					<view class="rank-number">
+						{{ index + 4 }}
+					</view>
 
-				<text class="hang1" style="width: 100%; text-align: center; margin-top: 24rpx; font-size: 32rpx;">{{
-					list[0].value }}
-					<text style="font-size: 16rpx;">人</text>
-				</text>
+					<view class="" style="width: 94rpx; height: 94rpx; margin-left: 30rpx;">
+						<image :src="item.headimg" style="width: 94rpx; height: 94rpx; border-radius: 50%;"></image>
+					</view>
+					<view class="" style="display: flex; flex-direction: column; margin-left: 28rpx;flex: 1;">
+						<text style="font-size: 20rpx; color: #333333;">{{ item.nickname }}</text>
+					</view>
+					<view class="" style="margin-right: 20rpx;">
+						<span style="color: #333333; font-size: 32rpx;">{{ item.value }}<text
+								style="font-size: 16rpx; color: #8A8A8A;">人</text></span>
+					</view>
+				</view>
 			</view>
 
-			<!-- 第三名 -->
-			<view class="common_bg"
-				style="width: 200rpx; height: 379rpx; margin-top: 52rpx; margin-left: 42rpx; display: flex; flex-direction: column;"
-				:style="{ 'background-image': `url(${$img('/static/image/invite3.png')})` }">
-				<image :src="list[2].headimg"
-					style="width: 94rpx; height: 94rpx; border-radius: 50%; margin-top: 38rpx; margin-left: 55rpx;">
-				</image>
-
-				<text class="hang1" style="width: 100%; text-align: center; margin-top: 24rpx;">{{ list[2].nickname
-				}}</text>
-
-				<text class="hang1"
-					style="width: 100%; text-align: center; margin-top: 24rpx; font-size: 32rpx; color: #333333;">{{
-						list[2].value }}
-					<text style="font-size: 16rpx; color: #8A8A8A;">人</text>
-				</text>
-			</view>
-		</view>
-
-		<view style="width: 683rpx; margin-bottom:160rpx; display: flex; flex-direction: column; overflow: auto;">
-			<view class="" v-for="(item, index) in list" v-if="index > 2"
-				style="display: flex; flex-direction: row; align-items: center; margin-top:30rpx; border-radius: 14rpx; padding-top: 15rpx; padding-bottom: 15rpx;"
-				:style="{ backgroundColor: setBgColor(index) }">
-
-				<view class="" v-if="index == 0"
-					style="width: 43rpx; height: 47rpx;color: #B8B8B8;text-align:center; margin-left: 32rpx;">
-					<image :src="$img1('/image/1.png')" style="width: 43rpx; height: 47rpx;"></image>
+			<view class="bottom-btn">
+				<view class="invite-btn" @click="$c.nav('/pages/user/tui-guang')">
+					<text>立即邀请</text>
 				</view>
-				<view class="" v-if="index == 1"
-					style="width: 43rpx; height: 47rpx;color: #B8B8B8;text-align:center; margin-left: 32rpx;">
-					<image :src="$img1('/image/2.png')" style="width: 43rpx; height: 47rpx;"></image>
-				</view>
-				<view class="" v-if="index == 2"
-					style="width: 43rpx; height: 47rpx;color: #B8B8B8;text-align:center; margin-left: 32rpx;">
-					<image :src="$img1('/image/3.png')" style="width: 43rpx; height: 47rpx;"></image>
-				</view>
-				<view class="" v-if="index > 2"
-					style="width: 43rpx; height: 47rpx;color: #333333;text-align:center; margin-left: 32rpx;">
-					{{ index + 1 }}
-				</view>
-
-				<view class="" style="width: 94rpx; height: 94rpx; margin-left: 30rpx;">
-					<image :src="item.headimg" style="width: 94rpx; height: 94rpx; border-radius: 50%;"></image>
-				</view>
-				<view class="" style="display: flex; flex-direction: column; margin-left: 28rpx;flex: 1;">
-					<text style="font-size: 20rpx; color: #333333;">{{ item.nickname }}</text>
-				</view>
-				<view class="" style="margin-right: 20rpx;">
-					<span style="color: #333333; font-size: 32rpx;">{{ item.value }}<text
-							style="font-size: 16rpx; color: #8A8A8A;">人</text></span>
-				</view>
-
-			</view>
-		</view>
-
-		<view style="position: fixed;bottom: 0px;height: 100px;display: flex;justify-content: center;align-items: center;background-color: #fff;width: 100%;">
-			<view class="center" style="width: 386rpx; height: 102rpx; background-color: #D8FD24; border-radius: 26rpx;"
-				@click="$c.nav('/pages/user/tui-guang')">
-				<text style="font-size: 32rpx; color: #333333; font-weight: 600;">立即邀请</text>
 			</view>
 		</view>
 		<rule-pop ref="rulePop"></rule-pop>
-	</view>
+	</page-container>
 </template>
 
 <script>
@@ -126,6 +71,14 @@ export default {
 			colors: ['#F8DE61', '#E0E0E0', '#E5967F', '#F8F8F8'],
 		}
 	},
+	computed: {
+		topThree() {
+			return this.list.slice(0, 3);
+		},
+		restList() {
+			return this.list.slice(3);
+		}
+	},
 	onLoad() {
 		this.load();
 	},
@@ -178,22 +131,124 @@ export default {
 </script>
 
 <style lang="scss">
-.navLeft {
-
-	height: 44px;
-	z-index: 100;
-	display: flex;
+.content-container {
 	width: 100%;
-	align-items: center !important;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 0 30rpx;
+	box-sizing: border-box;
+}
 
-	>view {
+.top-three {
+	width: 100%;
+	height: 480rpx;
+	margin-top: 20rpx;
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	
+	.common_bg {
+		width: 200rpx;
+		height: 379rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+	}
+	
+	.avatar {
+		width: 94rpx;
+		height: 94rpx;
+		border-radius: 50%;
+		margin-top: 38rpx;
+	}
+	
+	.nickname {
 		width: 100%;
-		// font-family: YouSheBiaoTiHei;
-		position: absolute;
-		font-weight: 400;
 		text-align: center;
-		font-size: 37rpx;
-		color: #FFFFFF;
+		margin-top: 24rpx;
+	}
+	
+	.value {
+		width: 100%;
+		text-align: center;
+		margin-top: 24rpx;
+		font-size: 32rpx;
+	}
+	
+	.unit {
+		font-size: 16rpx;
+	}
+	
+	.first-place {
+		margin-top: 10rpx;
+	}
+	
+	.second-place, .third-place {
+		margin-top: 52rpx;
+	}
+	
+	.second-place {
+		margin-right: 42rpx;
+	}
+	
+	.third-place {
+		margin-left: 42rpx;
+	}
+}
+
+.ranking-list {
+	width: 100%;
+	margin-bottom: 160rpx;
+	display: flex;
+	flex-direction: column;
+	overflow: auto;
+}
+
+.ranking-item {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	margin-top: 30rpx;
+	border-radius: 14rpx;
+	padding-top: 15rpx;
+	padding-bottom: 15rpx;
+}
+
+.rank-number {
+	width: 43rpx;
+	height: 47rpx;
+	color: #333333;
+	text-align: center;
+	margin-left: 32rpx;
+}
+
+.bottom-btn {
+	position: fixed;
+	bottom: 0px;
+	height: 100px;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	background-color: #fff;
+	width: 100%;
+}
+
+.invite-btn {
+	width: 386rpx;
+	height: 102rpx;
+	background-color: #D8FD24;
+	border-radius: 26rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	
+	text {
+		font-size: 32rpx;
+		color: #333333;
+		font-weight: 600;
 	}
 }
 </style>
\ No newline at end of file
diff --git a/pages/user/login.vue b/pages/user/login.vue
index bbc1b52..316cc76 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -200,7 +200,8 @@
 			h5UserProfile() {
 				var that = this;
 				console.log('进入h5')
-				window.location.href = this.$wxloginPage;
+				this.$c.msg('暂未开放登录');
+				// window.location.href = this.$wxloginPage;
 			},
 			getdata() {
 				let that = this