diff --git a/common/common.js b/common/common.js
index e940acd..a7e9c07 100644
--- a/common/common.js
+++ b/common/common.js
@@ -51,11 +51,6 @@ export default {
* @returns
*/
removeTrailingZeros(numStr) {
- // 判断传入参数是否为字符串，如果不是则转为字符串
- if (typeof numStr !== 'string') {
- numStr = String(numStr);
- }
-
if (numStr.includes('.')) {
numStr = numStr.replace(/0+$/, ''); // 移除末尾的零
if (numStr.endsWith('.')) {
diff --git a/common/config.js b/common/config.js
index 51fc8de..bee9d11 100644
--- a/common/config.js
+++ b/common/config.js
@@ -8,7 +8,7 @@ import RequestManager from '@/common/request.js'
let configData = null;
let isLoading = false;
let loadPromise = null;
-const wx_version = "104";
+const wx_version = "103";
const defaultConfig = {
"good_type": [{ "value": 0, "sort_order": 0, "is_show": 1, "name": "全部", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }, { "value": 1, "sort_order": 1, "is_show": 0, "name": "一番赏", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }, { "value": 2, "sort_order": 2, "is_show": 1, "name": "无限赏", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }, { "value": 3, "sort_order": 3, "is_show": 0, "name": "擂台赏", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }, { "value": 5, "sort_order": 4, "is_show": 0, "name": "积分赏", "pay_wechat": 0, "pay_balance": 0, "pay_currency": 0, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 0 }, { "value": 6, "sort_order": 5, "is_show": 1, "name": "限时活动", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }, { "value": 8, "sort_order": 6, "is_show": 1, "name": "领主赏", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }, { "value": 9, "sort_order": 7, "is_show": 0, "name": "连击赏", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }, { "value": 10, "sort_order": 8, "is_show": 0, "name": "商城赏", "pay_wechat": 1, "pay_balance": 0, "pay_currency": 0, "pay_currency2": 1, "pay_coupon": 0, "is_deduction": 0 }, { "value": 11, "sort_order": 9, "is_show": 0, "name": "自制赏", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }, { "value": 15, "sort_order": 15, "is_show": 0, "name": "福利屋", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 0, "pay_currency2": 0, "pay_coupon": 0, "is_deduction": 0 }, { "value": 16, "sort_order": 16, "is_show": 1, "name": "翻倍赏", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }, { "value": 17, "sort_order": 17, "is_show": 0, "name": "外卖盒子", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 0, "pay_currency2": 0, "pay_coupon": 0, "is_deduction": 0 }],
"app_setting": {
@@ -147,17 +147,8 @@ class ConfigManager {
static getGoodType() {
let goodType = this.get('good_type');
if (goodType != null) {
- if (this.GetVersion()) {
- return goodType.filter(item => item.is_show === 1 && (item.value === 2||item.value === 0)).map(item => {
- return {
- id: item.value,
- title: item.name
- }
- });
- }
+ // goodType数组过滤，只保留is_show=1的项目
return goodType.filter(item => item.is_show === 1).map(item => {
- console.log(item);
-
return {
id: item.value,
title: item.name
diff --git a/package/index/coupon-center.vue b/package/index/coupon-center.vue
new file mode 100644
index 0000000..f30d92c
--- /dev/null
+++ b/package/index/coupon-center.vue
@@ -0,0 +1,213 @@
+
+
+
+
+
+
+
+
+ ¥
+ {{ item.price }}
+
+
+
+ {{ item.title }}
+
+ 领取后有效期{{ item.effective_day }}天
+
+
+
+ 立即领取
+
+
+ 已领取
+
+
+
+
+
+
+
+
diff --git a/package/index/leitai.vue b/package/index/leitai.vue
new file mode 100644
index 0000000..32adbbe
--- /dev/null
+++ b/package/index/leitai.vue
@@ -0,0 +1,1941 @@
+
+
+
+
+
+
+
+
+
+
+
+ 赏品预览
+
+
+ 概率
+
+
+ 记录
+
+
+
+
+
+
+
+
+
+ {{ item.shang_info.title }}
+
+ {{ item.surplus_stock }}/{{ item.stock }}
+ 预售
+
+
+
+
+
+
+
+ {{ item.title }}
+
+ {{ item.pro }}
+
+ 售价:￥{{ item.sc_money }}
+
+
+
+
+
+
+
+
+
+
+ {{i.shang_info.title}}
+
+ {{ i.surplus_stock }}/{{ i.stock }}
+ {{ i.title }}
+
+ {{ i.pro }}
+
+
+
+
+
+
+
+
+
+ {{ item.shang_title }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.user_info.nickname }}
+
+ {{ item.addtime }}
+
+
+
+
+
+
+
+ {{ item.shang_title }}
+
+
+ {{ item.goodslist_title }}
+
+ ×1
+
+
+
+
+
+
+
+
+
+
+ 抽1发
+
+
+
+
+
+
+
+ {{ 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_money }} (剩余:{{ orderData.money }})
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 我已满18岁,阅读并同意
+
+
+ 《用户协议》
+
+
+
+ 《隐私政策》
+
+
+
+
+ 确认支付
+ {{
+ pageData.goods.type == 5
+ ? ` ${orderData.use_score}积分`
+ : ` ¥${orderData.price}`
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.shang_title }}
+ ×{{ item.prize_num }}
+
+
+ {{ item.goodslist_title }}
+
+
+ {{
+ item.goodslist_money * 1 > 0
+ ? `可兑换:${item.goodslist_money}`
+ : `不可兑换`
+ }}
+
+
+
+
+
+
+
+ 去发货
+
+
+
+ 继续抽
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/package/index/lian-ji.vue b/package/index/lian-ji.vue
new file mode 100644
index 0000000..5301bee
--- /dev/null
+++ b/package/index/lian-ji.vue
@@ -0,0 +1,2186 @@
+
+
+
+
+
+
+
+
+
+
+ 连击赏
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ pageData.goods.join_count }}次参与
+
+
+
+
+
+
+
+
+
+ 连击×{{ pageData.goods.user_lian_ji_number }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{pageData.goods_list.data[swCur].title}}
+
+
+ ￥{{pageData.goods_list.data[swCur].price}}/ 抽
+
+
+
+
+
+
+
+
+ 收藏
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+ 规则说明
+
+
+ 概率
+
+
+ 记录
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.pro }}
+
+
+
+
+
+
+
+
+ 预售
+
+
+ {{ a.title }}
+
+ 售价:{{ a.price }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.shang_title }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.user_info.nickname }}
+
+
+ {{ item.addtime }}
+
+
+
+
+
+
+
+ {{item.shang_title}}
+
+
+ {{ item.goodslist_title }}
+
+ ×1
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 购买
+
+
+
+
+
+
+
+
+
+ 使用密保{{buyNum}}次
+
+
+
+
+
+
+
+
+
+
+
+ {{buyNum}}
+
+
+
+
+
+
+ cp:
+ {{pageData.goods?pageData.goods.user_lian_ji_number:0}}/{{pageData.goods?pageData.goods.lian_ji_num:0}}
+
+
+
+
+
+
+ 连击{{ pageTabCur==0?buyNum:0}}次
+
+
+
+
+ {{ pageData.goods?pageData.goods.user_mb_number:0 }}次夺取秘宝
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.shang_title }}
+ ×1
+
+
+ {{ item.goodslist_title }}
+
+
+ {{
+ item.goodslist_money * 1 > 0
+ ? `可兑换:${item.goodslist_money}`
+ : `不可兑换`
+ }}
+
+
+
+
+
+
+
+ 去发货
+
+
+
+ 继续抽
+
+
+
+
+
+
+
+
+ {{ previewData.shang_title }}
+
+
+
+
+ {{ previewData.title }}
+
+
+
+
+
+ {{ previewData.shang_title }} {{ previewData.pro }}
+
+
+ 产品类型:{{ optData.type_text }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 确认订单
+
+
+
+
+
+
+
+
+
+
+
+ {{ orderData.goods.title }}
+
+ 类型:明信片
+
+
+
+ ¥
+ {{ orderData.goods.shou_zhe_price }}
+
+ ×{{ 1 }}
+
+
+
+ ¥
+ {{ orderData.goods.price }}
+
+
+ ×{{ orderData.goods.prize_num * 1 - 1 }}
+
+
+
+
+
+ ¥{{ orderData.goods.price }}
+
+ ×{{ orderData.goods.prize_num }}
+
+
+
+
+
+
+
+
+
+
+
+ 优惠券
+
+
+ {{
+ couponData && orderData.coupon_price > 0
+ ? `-${couponData.price}`
+ : '未选择'
+ }}
+
+
+
+
+
+
+
+
+
+
+ 使用{{$config.getAppSetting('currency1_name')}}抵扣¥{{ orderData.use_integral_money }} (剩余:{{ orderData.integral }}个)
+
+
+
+
+
+
+
+
+
+ {{$config.getAppSetting('balance_name')}}支付¥{{ orderData.use_money }} (剩余:{{ orderData.money }})
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 我已满18岁,阅读并同意
+
+
+ 《用户协议》
+
+
+
+ 《隐私政策》
+
+
+
+
+
+
+ 立即支付
+
+ {{
+ pageData.goods.type == 5
+ ? ` ${orderData.price}积分`
+ : ` ¥${orderData.price}`
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/package/index/sign.vue b/package/index/sign.vue
new file mode 100644
index 0000000..2f207f8
--- /dev/null
+++ b/package/index/sign.vue
@@ -0,0 +1,312 @@
+
+
+
+
+
+
+
+
+
+
+ 签到任务
+
+
+
+
+
+
+
+
+
+ {{ i + 1 }}天
+
+
+
+
+
+
+
+ {{ item }}{{$config.getAppSetting('currency1_name')}}
+
+
+
+
+ 第七天
+
+ {{ item }}{{$config.getAppSetting('currency1_name')}}
+
+
+
+
+
+
+
+
+
+
+ 立即签到
+ 已签到
+
+
+
+
+
+ 恭喜获得 {{ sucData.num }} {{$config.getAppSetting('currency1_name')}}
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/package/mine/collect.vue b/package/mine/collect.vue
new file mode 100644
index 0000000..0479772
--- /dev/null
+++ b/package/mine/collect.vue
@@ -0,0 +1,399 @@
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ tabList[tabCur].title }}
+
+ {{ item.goods_title }}
+
+
+
+ ¥{{ item.goods_price }}
+
+
+ {{ item.surplus_stock }}/{{ item.stock }}
+
+
+
+
+
+
+
+
+
+ 暂无收藏内容
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/package/mine/coupon-detail.vue b/package/mine/coupon-detail.vue
new file mode 100644
index 0000000..a6639e8
--- /dev/null
+++ b/package/mine/coupon-detail.vue
@@ -0,0 +1,540 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ pageData.level_text }}
+
+ 需要{{ pageData.kl_num2 }}个参与者
+
+
+
+
+
+ {{ pageData.yl_count == pageData.kl_num2 ? '已结束' : '分享中' }}
+
+
+ {{ pageData.yl_count }}/{{ pageData.kl_num2 }}
+
+
+
+
+
+
+
+ 已结束
+
+
+
+ 您参与的{{ pageData.level_text }}共获得
+
+
+
+
+
+
+ {{ pageData.yl_integral_count }}
+
+
+
+
+ 只要再邀请{{
+ pageData.kl_num2 * 1 - pageData.yl_count * 1
+ }}位参与者就能开券
+
+
+ 已全部领取
+
+
+
+
+
+ 分享好友
+
+
+
+
+
+
+
+
+
+
+ {{ pageData.share_user_nickname }}
+
+
+ {{ pageData.share_time }}
+
+
+
+ {{ pageData.own2 }}
+
+ 已领取
+
+
+
+
+
+ 参与列表
+
+
+ 已参与
+
+ {{ pageData.yl_count }}/{{ pageData.kl_num2 }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.nickname }}
+
+
+ {{ item.addtime }}
+
+
+
+ {{ item.l_num }}
+
+ 已领取
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/package/mine/equity.vue b/package/mine/equity.vue
new file mode 100644
index 0000000..fbdb25d
--- /dev/null
+++ b/package/mine/equity.vue
@@ -0,0 +1,899 @@
+
+
+
+
+
+
+
+ LV.{{ pageData.quan_yi_level.level }}
+
+
+
+
+
+
+
+
+
+ 差{{ pageData.quan_yi_level.cha }}欧气值升级
+
+ 已满级
+
+
+
+
+
+
+
+
+ 去购买
+
+
+
+
+
+
+
+
+
+
+
+ 普通奖励
+
+
+
+ 高级奖励
+
+
+
+
+
+
+
+ {{ item.level }}级
+
+
+
+
+
+
+
+
+
+ 领取
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+ {{ item.title }}({{ item.ywc_count }}/{{ item.number }})
+
+ 欧气值
+ +{{ item.z_number }}
+
+
+
+
+
+
+
+ 去完成
+
+
+
+ 待领取
+
+
+
+ 已领取
+
+
+
+
+
+
+
+
+
+ {{ previewData.level }}级普通奖励
+
+
+ 只有等级达到了当前等级，方可领取下方奖励哦~
+
+ 每一级奖励只可领取一次，领取后请在有效期内使用!
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+ {{ previewData.level }}级高级奖励
+
+
+ 完成任务后您将从以下奖品中随机获得一件
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 普通奖励
+ 高级奖励
+
+
+ {{item.title}}
+
+
+
+
+ 确定
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/package/mine/qy-rule.vue b/package/mine/qy-rule.vue
new file mode 100644
index 0000000..7343d1b
--- /dev/null
+++ b/package/mine/qy-rule.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/package/mine/skill-card.vue b/package/mine/skill-card.vue
new file mode 100644
index 0000000..25e4ed7
--- /dev/null
+++ b/package/mine/skill-card.vue
@@ -0,0 +1,146 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+ 抽赏时可选择重新抽赏
+
+ ×1
+
+
+
+
+
+
+
+
diff --git a/package/mine/ti-qu.vue b/package/mine/ti-qu.vue
new file mode 100644
index 0000000..4c72a63
--- /dev/null
+++ b/package/mine/ti-qu.vue
@@ -0,0 +1,622 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.status_text }}
+
+ ({{ item.reason }})
+
+
+ {{ item.addtime }}
+
+
+ {{ item.tal_money }}元
+
+
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index 2966d08..a00c583 100644
--- a/pages.json
+++ b/pages.json
@@ -7,8 +7,7 @@
"^detail-preview-popup$": "@/components/detail-preview-popup/detail-preview-popup.vue",
"^banner$": "@/components/banner/banner.vue"
},
- "pages": [
- {
+ "pages": [{
"path": "pages/shouye/index",
"style": {
"navigationStyle": "custom",
@@ -46,6 +45,14 @@
"navigationBarTextStyle": "black"
}
},
+ {
+ "path": "pages/shouye/wxl",
+ "style": {
+ "navigationBarTitleText": "无限令",
+ "navigationBarBackgroundColor": "#222222",
+ "navigationBarTextStyle": "black"
+ }
+ },
{
"path": "pages/shouye/huanxiang",
"style": {
@@ -144,6 +151,7 @@
"navigationStyle": "custom"
}
},
+
{
"path": "pages/user/vip",
"style": {
@@ -152,6 +160,15 @@
"navigationBarTextStyle": "black"
}
},
+
+ {
+ "path": "pages/guize/guize",
+ "style": {
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "navigationBarTitleText": "",
+ "navigationBarTextStyle": "black"
+ }
+ },
{
"path": "pages/user/my_coupon",
"style": {
@@ -186,6 +203,14 @@
"navigationBarTextStyle": "black"
}
},
+ {
+ "path": "pages/sangdai/hegui",
+ "style": {
+ "navigationBarTextStyle": "black",
+ "navigationStyle": "custom",
+ "disableSwipeBack": true
+ }
+ },
{
"path": "pages/sangdai/sangdai",
"style": {
@@ -210,6 +235,7 @@
"navigationBarTextStyle": "black"
}
},
+
{
"path": "pages/user/change",
"style": {
@@ -218,6 +244,43 @@
"navigationBarTextStyle": "black"
}
},
+ {
+ "path": "pages/DrawCard/index",
+ "style": {
+ "navigationBarTextStyle": "black",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/DrawCard/cardDetail",
+ "style": {
+ "navigationBarTextStyle": "black",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/DrawCard/tujian",
+ "style": {
+ "navigationBarBackgroundColor": "#222222",
+ "navigationBarTitleText": "图鉴",
+ "navigationBarTextStyle": "black"
+ }
+ },
+ {
+ "path": "pages/chouka/ka",
+ "style": {
+ "navigationBarTextStyle": "black",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/chouka/kace",
+ "style": {
+ "navigationBarBackgroundColor": "#222222",
+ "navigationBarTitleText": "卡册",
+ "navigationBarTextStyle": "black"
+ }
+ },
{
"path": "pages/chouka/detail",
"style": {
@@ -232,6 +295,22 @@
"navigationStyle": "custom"
}
},
+ {
+ "path": "pages/zizhi/index",
+ "style": {
+ "navigationBarTextStyle": "black",
+ "navigationBarTitleText": "自制赏",
+ "navigationBarBackgroundColor": "#222222"
+ }
+ },
+ {
+ "path": "pages/zizhi/detail",
+ "style": {
+ "navigationBarTextStyle": "black",
+ "navigationBarTitleText": "龙珠手办店",
+ "navigationBarBackgroundColor": "#222222"
+ }
+ },
{
"path": "pages/infinite/index",
"style": {
@@ -240,6 +319,62 @@
"navigationBarBackgroundColor": "#222222"
}
},
+ {
+ "path": "pages/infinite/UnlimitedOrder",
+ "style": {
+ "navigationBarTextStyle": "black",
+ "navigationBarTitleText": "魔晶令",
+ "navigationBarBackgroundColor": "#222222",
+ "navigationStyle": "custom"
+ }
+ },
+ // {
+ // "path": "pages/shop/index",
+ // "style": {
+ // "navigationStyle": "custom",
+ // "transparentTitle": "none"
+ // }
+ // },
+ // {
+ // "path": "pages/shop/list",
+ // "style": {
+ // "navigationBarTitleText": "",
+ // "navigationBarBackgroundColor": "#000000",
+ // "navigationBarTextStyle": "white"
+ // }
+ // },
+ // {
+ // "path": "pages/shop/detail",
+ // "style": {
+ // "navigationBarTitleText": "商品详请",
+ // "navigationBarBackgroundColor": "#000000",
+ // "navigationBarTextStyle": "white"
+ // }
+ // },
+ // {
+ // "path": "pages/shop/shop_order",
+ // "style": {
+ // "navigationBarTitleText": "我的订单",
+ // "navigationBarBackgroundColor": "#000000",
+ // "navigationBarTextStyle": "white"
+ // }
+ // },
+ // {
+ // "path": "pages/shop/order_detail",
+ // "style": {
+ // "navigationBarTitleText": "订单详情",
+ // "navigationBarBackgroundColor": "#000000",
+ // "navigationBarTextStyle": "white"
+ // }
+ // },
+ // {
+ // "path": "pages/shop/wuliu_detail",
+ // "style": {
+ // "navigationBarTitleText": "物流详情",
+ // "navigationBarBackgroundColor": "#000000",
+ // "navigationBarTextStyle": "white"
+ // }
+ // },
{
"path": "pages/mall/index",
"style": {
@@ -248,6 +383,23 @@
"navigationStyle": "custom"
}
},
+
+ {
+ "path": "pages/fuli/fuli",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/fuli/fuli-detail",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ },
{
"path": "pages/user/coupon",
"style": {
@@ -270,6 +422,7 @@
"navigationBarTitleText": "绑定手机号"
}
},
+
{
"path": "pages/shouye/yaoqing_ranking",
"style": {
@@ -301,53 +454,118 @@
"style": {
"navigationStyle": "custom"
}
- },
- {
+ }, {
"path": "pages/shouye/dada_ranking",
"style": {
"navigationStyle": "custom"
}
},
{
- "path": "pages/infinite/reward_records",
- "style": {
+ "path" : "pages/infinite/reward_records",
+ "style" :
+ {
"navigationStyle": "custom"
}
},
{
- "path": "pages/shouye/danye",
- "style": {
+ "path" : "pages/shouye/danye",
+ "style" :
+ {
"navigationStyle": "custom"
}
},
{
- "path": "pages/other/prize_draw",
- "style": {
+ "path" : "pages/other/prize_draw",
+ "style" :
+ {
"navigationStyle": "custom"
}
},
{
- "path": "pages/other/order_list",
- "style": {
+ "path" : "pages/other/order_list",
+ "style" :
+ {
"navigationStyle": "custom"
}
},
{
- "path": "pages/other/order_info",
- "style": {
+ "path" : "pages/other/order_info",
+ "style" :
+ {
"navigationStyle": "custom"
}
- },
- {
- "path": "pages/guize/guize",
- "style": {
- "navigationBarBackgroundColor": "#FFFFFF",
- "navigationBarTitleText": "",
- "navigationBarTextStyle": "black"
- }
}
],
- "subPackages": [],
+ "subPackages": [{
+ "root": "package/index",
+ "pages": [{
+ "path": "sign",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "lian-ji",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "coupon-center",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "leitai",
+ "style": {
+ "navigationBarTitleText": "擂台赏",
+ "navigationStyle": "custom"
+ }
+ }
+ ]
+ },
+ {
+ "root": "package/mine",
+ "pages": [{
+ "path": "collect",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "skill-card",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "equity",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "qy-rule",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "coupon-detail",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "ti-qu",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ }
+ ]
+ }
+ ],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "友达赏",
@@ -362,8 +580,7 @@
"borderStyle": "black",
"backgroundColor": "#FFFFFF",
"iconWidth": "48rpx",
- "list": [
- {
+ "list": [{
"pagePath": "pages/shouye/index",
"iconPath": "static/tabbar/m1.png",
"selectedIconPath": "static/tabbar/s1.png",
diff --git a/pages/fuli/fuli-detail.vue b/pages/fuli/fuli-detail.vue
new file mode 100644
index 0000000..f721023
--- /dev/null
+++ b/pages/fuli/fuli-detail.vue
@@ -0,0 +1,2478 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ join_count }}次参与
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 抽赏说明
+
+
+
+
+ 抽奖需要{{ goods.need_draw_num || 0 }}张抽奖券
+
+
+
+
+ {{ goods.title }}
+
+
+
+
+
+
+
+ {{ item.shang_title }}
+
+ {{ item.pro }}
+
+
+
+
+
+
+
+
+
+
+ {{ v.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.shang_title }}
+
+
+
+
+ {{ item.title }}
+ {{ item.pro }}
+
+ 售价:{{ item.price }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.shang_title }}
+
+
+
+
+
+ {{ item.luck_no }}
+
+
+
+
+
+
+ {{ item.nickname }}
+
+ {{ item.addtime }}
+
+
+
+
+
+
+
+
+
+ {{ item.goodslist_title }}
+
+ ×1
+
+
+
+
+
+
+
+
+
+
+ 当前有{{ 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
+ }}{{ goods.box_type == 5 ? '积分' : '' }}
+
+
+
+
+
+ 支付方式
+
+
+
+
+ 使用星钻抵扣￥
+ {{ pay_news.use_integral }}
+ （剩余：
+ {{ pay_news.integral }}
+ ）
+
+
+
+
+
+
+
+
+
+
+ 使用星钻抵扣￥
+ {{ 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 }}
+
+ ×1
+
+
+
+ {{ item.goodslist_title }}
+
+
+
+
+
+
+
+ 去发货
+
+
+
+ 确定
+
+
+
+
+
+
+
+ 统计
+
+
+
+
+
+
+ {{ item.userinfo.nickname }}
+
+ 冲{{ item.count }}发
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ previewData.title }}
+
+
+
+
+
+ {{ previewData.shang_title }} {{ previewData.real_pro }}%
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/fuli/fuli.vue b/pages/fuli/fuli.vue
new file mode 100644
index 0000000..e5e3182
--- /dev/null
+++ b/pages/fuli/fuli.vue
@@ -0,0 +1,408 @@
+
+
+
+
+
+
+ 说明
+
+
+
+
+
+
+
+ 抽赏仅需{{ item.need_draw_num }}张抽赏券
+
+ 马上抽
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/guize/guize.vue b/pages/guize/guize.vue
index 23209f1..e33dc57 100644
--- a/pages/guize/guize.vue
+++ b/pages/guize/guize.vue
@@ -69,7 +69,6 @@
if (e.type == 16) {
title = '签到规则'
}
-
this.title = title
uni.setNavigationBarTitle({
title: title
diff --git a/pages/infinite/UnlimitedOrder.vue b/pages/infinite/UnlimitedOrder.vue
new file mode 100644
index 0000000..e3d3e74
--- /dev/null
+++ b/pages/infinite/UnlimitedOrder.vue
@@ -0,0 +1,446 @@
+
+
+
+
+
+
+ 当前累计消费:{{ datas.money }}
+
+
+
+
+ 魔晶令规则
+
+
+
+
+ {{ datas.time }}
+
+
+
+
+
+
+
+ 累计消费满{{ item.give_money }}即可抽取赏品
+
+
+
+
+
+
+
+
+ {{ a.title }}
+
+
+
+
+
+ 规则
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/sangdai/hegui.vue b/pages/sangdai/hegui.vue
new file mode 100644
index 0000000..61e7a95
--- /dev/null
+++ b/pages/sangdai/hegui.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
diff --git a/pages/sangdai/sangdai copy.vue b/pages/sangdai/sangdai copy.vue
new file mode 100644
index 0000000..9b32055
--- /dev/null
+++ b/pages/sangdai/sangdai copy.vue
@@ -0,0 +1,1916 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ v.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ v.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ v.shang_title }}
+
+
+ ×{{ v.prize_num }}
+
+
+
+ {{ v.goodslist_title }}
+
+ 打包价:{{ v.goodslist_money }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.goods_title }}
+
+ {{ item.buy_count }}
+ /{{ item.all_count }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 发货须知
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确认环保
+
+
+
+
+
+
+
+ 已选赠品
+
+ 共
+ {{ num }}
+ 件
+
+
+
+
+
+
+
+ {{ item.shang_title }}
+
+ ×{{ item.number }}
+
+
+
+ 参考价:{{ item.goodslist_money * item.number }}元
+
+
+
+
+
+
+
+ 环保合计:{{ zong_price.toFixed(2) }}元
+
+
+
+
+
+
+
+
+
+
+
+ 确认发货
+
+
+
+
+
+
+
+ 已选赠品
+
+ 共
+ {{ num }}
+ 件
+
+
+
+
+
+
+
+ {{ item.shang_title }}
+
+ ×{{ item.number }}
+
+
+
+ {{ item.goodslist_title }}
+
+
+
+
+
+
+
+ {{ selectCity }}
+
+
+
+ 满{{ post.free_post }}件赠品包邮
+
+ 如果不满{{ post.free_post }}件，需支付{{ post.post_money }}元运费
+
+
+
+
+
+
+ 需支付:{{ num >= post.free_post ? 0 : post.post_money }}元
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 地址列表
+ ×
+
+
+
+
+
+ 默认
+ {{ v.name }} {{ v.mobile }}
+
+
+ {{ v.province }} {{ v.city }} {{ v.county }} {{ v.address }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ yulan_news.shang_title }}
+
+
+
+
+
+ {{ yulan_news.goodslist_title }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/zizhi/detail.vue b/pages/zizhi/detail.vue
new file mode 100644
index 0000000..8982be1
--- /dev/null
+++ b/pages/zizhi/detail.vue
@@ -0,0 +1,315 @@
+
+
+
+
+
+
+ 龙珠手办店
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+ ￥
+ {{ item.price }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/zizhi/index.vue b/pages/zizhi/index.vue
new file mode 100644
index 0000000..900ab14
--- /dev/null
+++ b/pages/zizhi/index.vue
@@ -0,0 +1,238 @@
+
+
+
+
+ {{v}}
+
+
+
+
+
+
+
+
+
+
+ {{item.sale_stock}}/{{item.stock}}
+
+
+
+ 龙珠手办店
+
+
+
+
+
+
+
+
+
+