diff --git a/components/rule-pop/rule-pop.vue b/components/rule-pop/rule-pop.vue
index 2d1763f..a55c071 100644
--- a/components/rule-pop/rule-pop.vue
+++ b/components/rule-pop/rule-pop.vue
@@ -8,9 +8,7 @@
{{ ruleData.title }}
-
+
diff --git a/manifest.json b/manifest.json
index 377f67b..5d9c9a9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "吧唧一番赏",
- "appid" : "__UNI__46B4383",
+ "appid" : "__UNI__0A3F586",
"description" : "",
"versionName" : "1.0.1",
"versionCode" : 101,
diff --git a/pages/fuli/fuli-detail.vue b/pages/fuli/fuli-detail.vue
index 7a7ac72..65f9d8d 100644
--- a/pages/fuli/fuli-detail.vue
+++ b/pages/fuli/fuli-detail.vue
@@ -1,25 +1,17 @@
-
-
-
+
-
+
-
-
+
-
-
-
+
+
-
-
-
+ }">
+
+
+
- {{ join_count }}次参与
-
+ {{ join_count }}次参与
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+ }">
+
- 抽赏说明
-
+ 抽赏说明
+
-
-
- 抽奖需要{{ goods.need_draw_num || 0 }}张抽奖券
-
-
+
+
+ 抽奖需要{{ goods.need_draw_num || 0 }}张抽奖券
+
+
-
- {{ goods.title }}
-
+ }">
+ {{ goods.title }}
+
-
-
-
+
+
+ }">
-
- {{ item.shang_title }}
+
+ {{ item.shang_title }}
- {{ item.pro }}
-
-
-
+ {{ item.pro }}
+
+
+
-
-
-
-
-
- {{ v.name }}
-
-
-
-
-
-
+
+
+
+
+ {{ v.name }}
+
+
+
+
+
+
-
-
-
+
+
-
-
-
-
-
- {{ item.shang_title }}
-
-
-
-
- {{ item.title }}
- {{ item.pro }}
-
- 售价:{{ item.price }}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ item.shang_title }}
+
+
+
+
+ {{ item.title }}
+ {{ item.pro }}
+
+ 售价:{{ item.price }}
+
+
+
+
+
+
+
+
+
+
+
- {{ item.shang_title }}
-
-
-
-
-
- {{ item.luck_no }}
-
+ }">
+ {{ item.shang_title }}
+
+
+
+
+
+ {{ item.luck_no }}
+
-
-
+
+
-
- {{ item.nickname }}
+
+ {{ item.nickname }}
- {{ item.addtime }}
-
-
-
-
+ {{ item.addtime }}
+
+
+
+
-
-
+
+
-
- {{ item.goodslist_title }}
-
- ×1
-
-
-
-
-
-
+
+ {{ item.goodslist_title }}
+
+ ×1
+
+
+
+
+
+
-
-
-
+
- 当前有{{ hasNum }}张抽奖券,{{
+ }">
+ 当前有{{ hasNum }}张抽奖券,{{
hasNum == 0 ? '请先获取抽奖券' : '立即抽赏'
}}
-
-
+
+
-
-
-
+
+
+
-
+
-
-
+
+
-
-
-
+
- 抽赏说明
+ }">
+ 抽赏说明
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
- 确认订单
-
-
-
-
-
-
-
-
- {{ pay_news.goods.title }}
- 类型：明信片
-
-
-
- {{ pay_news.goods.price }}元
-
-
- ×{{ pay_news.goods.prize_num }}
-
-
-
-
-
- 明信片×{{ pay_news.goods.prize_num }}
-
-
- 小计:{{ goods.box_type == 5 ? '' : '￥' }}
-
- {{ pay_news.order_total
+
+
+
+
+ 确认订单
+
+
+
+
+
+
+
+
+ {{ pay_news.goods.title }}
+ 类型：明信片
+
+
+
+ {{ pay_news.goods.price }}元
+
+
+ ×{{ pay_news.goods.prize_num }}
+
+
+
+
+
+ 明信片×{{ pay_news.goods.prize_num }}
+
+
+ 小计:{{ goods.box_type == 5 ? '' : '￥' }}
+
+ {{ pay_news.order_total
}}{{ goods.box_type == 5 ? '积分' : '' }}
-
-
-
-
-
- 支付方式
-
-
-
-
- 使用星钻抵扣￥
- {{ pay_news.use_integral }}
- （剩余：
- {{ pay_news.integral }}
- ）
-
-
-
-
-
-
+ 支付方式
+
+
+
+
+ 使用星钻抵扣￥
+ {{ pay_news.use_integral }}
+ （剩余：
+ {{ pay_news.integral }}
+ ）
+
+
+
+
+
+
+
-
-
-
- 使用星钻抵扣￥
- {{ pay_news.use_money }}
- （剩余：
- {{ pay_news.money }}
- ）
-
-
-
-
-
-
-
- 下单购买即表示同意
-
- 《用户服务协议条款》
-
-
-
-
- 共{{ pay_news.goods && pay_news.goods.prize_num }}抽总计:{{
+ ">
+
+
+
+ 使用星钻抵扣￥
+ {{ pay_news.use_money }}
+ （剩余：
+ {{ pay_news.money }}
+ ）
+
+
+
+
+
+
+
+
+ 下单购买即表示同意
+
+ 《用户服务协议条款》
+
+
+
+
+ 共{{ pay_news.goods && pay_news.goods.prize_num }}抽总计:{{
goods.box_type == 5 ? '' : '￥'
}}
-
- {{ pay_news.price }}{{ goods.box_type == 5 ? '积分' : '' }}
-
-
-
-
-
-
-
-
+ }">
+
+
+
+
+
-
-
-
+
-
+ }">
+
-
-
-
-
-
+
+
+
+
+
- {{ item.shang_title }}
+ {{ item.shang_title }}
- ×1
-
+ ×1
+
-
- {{ item.goodslist_title }}
-
-
-
-
+
+ {{ item.goodslist_title }}
+
+
+
+
-
-
+
- 去盒柜
-
+ }" @click="toBag">
+ 去盒柜
+
-
- 确定
-
-
-
-
-
-
-
+ 确定
+
+
+
+
+
+
+
- 统计
+ }">
+ 统计
-
-
-
-
-
- {{ item.userinfo.nickname }}
-
- 冲{{ item.count }}发
-
-
-
+
+
+
+
+
+ {{ item.userinfo.nickname }}
+
+ 冲{{ item.count }}发
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+ }">
+
+
+
-
-
- {{ previewData.title }}
-
-
+ }">
+
+ {{ previewData.title }}
+
+
-
-
- {{ previewData.shang_title }} {{ previewData.real_pro }}%
-
+
+
+ {{ previewData.shang_title }} {{ previewData.real_pro }}%
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+ .num {
+ position: absolute;
+ z-index: 2;
+ right: 6rpx;
+ bottom: 6rpx;
+ padding: 0 16rpx;
+ height: 32rpx;
+ background: rgba(0, 0, 0, 0.6);
+ border-radius: 16rpx;
+ display: flex;
+ align-items: center;
+
+ font-size: 24rpx;
+ font-family: Source Han Sans CN;
+ font-weight: 400;
+ color: #d0d1ff;
+ }
+ }
+
+ .title {
+ padding: 10rpx 10rpx;
+
+ font-size: 24rpx;
+ font-family: Source Han Sans CN;
+ font-weight: 400;
+ color: #ffffff;
+ }
+
+ .hang1 {}
+ }
+ }
+ }
+
+ .res-pop-ft {
+ position: absolute;
+ left: 0;
+ bottom: 0;
+ width: 100%;
+ display: flex;
+ justify-content: space-evenly;
+ transform: translateY(100%);
+ padding-top: 40rpx;
+
+ .ft-btn {
+ width: 230rpx;
+ height: 70rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ font-size: 32rpx;
+ font-family: Source Han Sans CN;
+ font-weight: 400;
+ color: #ffffff;
+
+ &.confirm {
+ text {
+ color: transparent;
+
+ background: linear-gradient(90deg,
+ #6adeff 0%,
+ #7ab5ff 50%,
+ #ff7feb 100%);
+ background-clip: text;
+ }
+ }
+ }
+ }
+ }
+
\ No newline at end of file
diff --git a/pages/shouye/detail_wuxian.vue b/pages/shouye/detail_wuxian.vue
index 8c00229..a20064b 100644
--- a/pages/shouye/detail_wuxian.vue
+++ b/pages/shouye/detail_wuxian.vue
@@ -203,7 +203,7 @@
-
+
@@ -237,8 +237,8 @@
- 确定
+ }" @click="confirmSubmit([0, buyNum])">
+ 继续抽
@@ -275,11 +275,11 @@
挑战领主
- 获得星钻奖励
+ 获得吧唧币奖励
- 玩家每挑战一发,领主可获得星钻
+ 玩家每挑战一发,领主可获得吧唧币
×{{ bossCardData.goods.lingzhu_fan }}
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index 0ce0770..37847e6 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -205,10 +205,10 @@
id: 8,
title: '领主赏',
},
- {
- id: 3,
- title: '擂台赏'
- },
+ // {
+ // id: 3,
+ // title: '擂台赏'
+ // },
// {
// id: 5,
// title: '积分赏'