diff --git a/App.vue b/App.vue
index 64804e3..8600157 100644
--- a/App.vue
+++ b/App.vue
@@ -184,4 +184,13 @@ button.hide {
.uni-tabbar__icon {
height: 50px !important;
}
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/common/config.js b/common/config.js
index 4f751db..92f77cf 100644
--- a/common/config.js
+++ b/common/config.js
@@ -36,6 +36,7 @@ class ConfigManager {
if (res.status === 1 && res.data) {
configData = res.data;
console.log('全局配置数据加载成功');
+ uni.setStorageSync('configData', configData);
resolve(configData);
} else {
console.error('加载配置数据失败:', res.msg || '未知错误');
diff --git a/components/detail-preview-popup/detail-preview-popup.vue b/components/detail-preview-popup/detail-preview-popup.vue
new file mode 100644
index 0000000..2e36608
--- /dev/null
+++ b/components/detail-preview-popup/detail-preview-popup.vue
@@ -0,0 +1,240 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/detail-prize-log/detail-prize-log.vue b/components/detail-prize-log/detail-prize-log.vue
new file mode 100644
index 0000000..937d060
--- /dev/null
+++ b/components/detail-prize-log/detail-prize-log.vue
@@ -0,0 +1,233 @@
+
+
+
+
+
+ {{ item.shang_title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.user_info.nickname }}
+ {{ item.addtime }}
+
+
+
+
+
+
+
+
+
+ {{ item.shang_title }}
+
+
+ {{ item.goodslist_title }}
+ ×{{ item.prize_num }}
+
+
+
+
+
+
+
+ 暂无中奖记录
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/detail-toolbar/detail-toolbar.vue b/components/detail-toolbar/detail-toolbar.vue
new file mode 100644
index 0000000..c081774
--- /dev/null
+++ b/components/detail-toolbar/detail-toolbar.vue
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/main.js b/main.js
index 4838072..7f263a4 100644
--- a/main.js
+++ b/main.js
@@ -7,6 +7,10 @@ import ConfigManager from '@/common/config.js'
import RequestManager from '@/common/request.js'
import EnvConfig from '@/common/env.js'
+// 全局注册uni-popup组件
+import uniPopup from '@/uni_modules/uni-popup/components/uni-popup/uni-popup.vue'
+Vue.component('uni-popup', uniPopup)
+
// 全局变量配置
Vue.prototype.siteBaseUrl = EnvConfig.apiBaseUrl
Vue.prototype.$baseUrl = EnvConfig.baseUrl
diff --git a/pages.json b/pages.json
index 55d0260..b415c2f 100644
--- a/pages.json
+++ b/pages.json
@@ -1,7 +1,10 @@
{
"easycom": {
"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue",
- "^collect-btn$": "@/components/collect-btn/collect-btn.vue"
+ "^collect-btn$": "@/components/collect-btn/collect-btn.vue",
+ "^detail-toolbar$": "@/components/detail-toolbar/detail-toolbar.vue",
+ "^detail-prize-log$": "@/components/detail-prize-log/detail-prize-log.vue",
+ "^detail-preview-popup$": "@/components/detail-preview-popup/detail-preview-popup.vue"
},
"pages": [{
"path": "pages/shouye/index",
diff --git a/pages/shouye/detail.vue b/pages/shouye/detail.vue
index 3991780..827c242 100644
--- a/pages/shouye/detail.vue
+++ b/pages/shouye/detail.vue
@@ -2,347 +2,301 @@
盒子详情
-->
-
-
-
-
- {{$c.detailPageTitle((pageData && pageData.goods) || '')}}
-
+
+
+
+
+ {{ $c.detailPageTitle((pageData && pageData.goods) || "") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 第 {{ pageData.goods.num }} /{{
+ pageData.goods.stock
+ }}箱
+
+ 赏品余量
+
+ {{ pageData.goods.goodslist_surplus_stock }}/{{ pageData.goods.goodslist_stock }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.shang_info ? item.shang_info.title : "" }}
+
+ {{ item.surplus_stock }}/{{ item.stock }}
+ 预售
+
+
+
+
+
+ {{ item.title }}
+
+ {{ item.pro }}
+
+ 售价:¥ {{ item.sc_money }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 确认订单
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- 第 {{ pageData.goods.num }} /{{ pageData.goods.stock }}箱
-
- 赏品余量
-
- {{ pageData.goods.goodslist_surplus_stock }}/{{ pageData.goods.goodslist_stock }}
-
-
-
-
-
-
-
-
-
-
+
+
+ {{ orderData.goods.title }}
+
+ 类型:明信片
-
-
-
-
-
-
- {{ item.shang_info?item.shang_info.title:'' }}
-
- {{ item.surplus_stock }}/{{ item.stock }}
- 预售
-
-
-
-
+
+
+
+ ¥
+ {{ orderData.goods.shou_zhe_price }}
+ 积分
+ (首抽5折)
+
-
- {{ item.title }}
-
- {{ item.pro }}
-
- 售价:¥ {{ item.sc_money }}
-
+ ×{{ 1 }}
+
+
+
+ ¥
+ {{ orderData.goods.price }}
+ 积分
+
-
-
-
+
+ ×{{ orderData.goods.prize_num * 1 - 1 }}
+
+
+
+
+
+ ¥
+ {{ orderData.goods.price }}
+ 积分
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ ×{{ orderData.goods.prize_num }}
+
+
+
-
-
-
- {{ item.shang_title }}
-
-
+
+
-
-
-
-
-
+
+
+ 优惠券
-
-
- {{ item.user_info.nickname }}
-
- {{ item.addtime }}
-
+
+ {{
+ couponData && orderData.coupon_price > 0
+ ? `-${couponData.price}`
+ : "未选择"
+ }}
-
-
-
-
-
-
- {{item.shang_title}}
-
-
-
- {{ item.goodslist_title }}
-
- ×{{item.prize_num}}
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
- 一发入魂
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{previewData.shang_info.title}}
-
-
-
-
-
- {{ previewData.title }}
-
-
-
-
-
- {{ previewData.shang_info.title }} {{ previewData.pro }}
-
-
- 产品类型:{{ optData.type_text }}
-
-
-
-
-
-
-
-
-
-
-
-
- 确认订单
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ orderData.goods.title }}
-
-
- 类型:明信片
-
-
-
-
- ¥
- {{ orderData.goods.shou_zhe_price }}
- 积分
- (首抽5折)
-
-
- ×{{ 1 }}
-
-
-
-
- ¥
- {{ orderData.goods.price }}
- 积分
-
-
-
- ×{{ orderData.goods.prize_num * 1 - 1 }}
-
-
-
-
-
-
- ¥
- {{ orderData.goods.price }}
- 积分
-
-
- ×{{ orderData.goods.prize_num }}
-
-
-
-
-
-
-
-
-
-
-
- 优惠券
-
-
- {{
- couponData && orderData.coupon_price > 0
- ? `-${couponData.price}`
- : '未选择'
- }}
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
- 使用积分抵扣
- {{ orderData.use_score }} (剩余:{{ orderData.score }})
-
+
+ 使用积分抵扣
+ {{ orderData.use_score }} (剩余:{{ orderData.score }})
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
- 使用吧唧币抵扣¥ {{ orderData.use_integral_money }} (剩余:{{ orderData.integral }}个)
-
+
+ 使用吧唧币抵扣¥ {{ orderData.use_integral_money }} (剩余:{{
+ orderData.integral
+ }}个)
+
-
-
+
+
-
-
-
+
+
+
-
-
-
- 使用星钻抵扣¥
- {{ orderData.use_money }} (剩余:{{ orderData.money }})
-
+
+ 使用星钻抵扣¥
+ {{ orderData.use_money }} (剩余:{{ orderData.money }})
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
- 我已满18岁,阅读并同意
+ 我已满18岁,阅读并同意
-
- 《用户协议》
-
+
+ 《用户协议》
+
-
- 《隐私政策》
-
-
+
+ 《隐私政策》
+
+
-
- 确认支付
- {{
- pageData.goods.type == 5
- ? ` ${orderData.use_score}积分`
- : ` ¥${orderData.price}`
- }}
-
-
-
+
+ 确认支付
+ {{
+ pageData.goods.type == 5
+ ? ` ${orderData.use_score}积分`
+ : ` ¥${orderData.price}`
+ }}
+
+
+
-
+
-
-
-
-
-
-
-
-
- {{ item.shang_title }}
- {{ item.prize_num }}
-
-
- {{ item.goodslist_title }}
-
-
-
-
-
-
+
+
+
-
-
- 去发货
-
+
+
+ 去发货
+
-
- 继续抽
-
-
-
-
+
+ 继续抽
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file