diff --git a/App.vue b/App.vue
index 306a209..63bdf38 100644
--- a/App.vue
+++ b/App.vue
@@ -136,6 +136,12 @@ export default {
@import url("./common/common.css");
@import url("/components/gaoyia-parse/parse.css");
+uni-tabbar {
+ display: block;
+ box-sizing: border-box;
+ width: 100%;
+ z-index: 97!important;
+}
/* 引入字体 */
@font-face {
font-family: "YouSheBiaoTiHei";
@@ -227,12 +233,12 @@ button.hide {
}
/* 重写组件样式 */
-/deep/.uni-noticebar {
+::v-deep.uni-noticebar {
padding: 0 !important;
margin: 0 !important;
}
-/deep/.mescroll-upwarp {
+::v-deep.mescroll-upwarp {
box-sizing: border-box;
min-height: 55px;
padding: 15px 0;
@@ -240,7 +246,7 @@ button.hide {
clear: both;
}
-/deep/.cmd-progress-outer {
+::v-deep.cmd-progress-outer {
line-height: 0;
.cmd-progress-bg {
diff --git a/common/env.js b/common/env.js
index f66a756..7e89416 100644
--- a/common/env.js
+++ b/common/env.js
@@ -41,7 +41,7 @@ const testing = {
// 根据环境变量选择对应配置
-let currentEnv = testing;//production_wz;
+let currentEnv = production;//production;//testing;//production_wz;
// 判断当前环境
// #ifdef H5
diff --git a/common/platform/BasePlatform.js b/common/platform/BasePlatform.js
index 77975b1..31c6c2f 100644
--- a/common/platform/BasePlatform.js
+++ b/common/platform/BasePlatform.js
@@ -176,13 +176,28 @@ class BasePlatform {
if (res.confirm) {
uni.removeStorageSync('token');
uni.removeStorageSync('userinfo');
- uni.switchTab({
- url: '/pages/user/index'
- });
- // window.location.href = window.location.href;
+ // uni.switchTab({
+ // url: '/pages/user/index'
+ // });
+ window.location.href = window.location.href;
}
}
});
}
+ /**
+ * 开启调试
+ */
+ startDeb() {
+
+ }
+ /**
+ * 关闭调试
+ */
+ closeDeb() {
+
+ }
+ getVersion() {
+ return '1.0.0';
+ }
}
export default BasePlatform;
\ No newline at end of file
diff --git a/common/platform/H5Platform.js b/common/platform/H5Platform.js
index 1e40c3a..c935e26 100644
--- a/common/platform/H5Platform.js
+++ b/common/platform/H5Platform.js
@@ -1,4 +1,5 @@
import BasePlatform from './BasePlatform';
+import eruda from 'eruda';
function parseQueryString(queryString) {
@@ -24,9 +25,14 @@ class H5Platform extends BasePlatform {
super();
this.code = 'WEB_H5';
this.env = 'h5';
+ // 简单初始化
+ let erudaInstance = uni.getStorageSync("erudaInstance");
+ if (erudaInstance != null && erudaInstance != "") {
+ this.startDeb();
+ }
+ // eruda.init();
}
getPayData(url, data) {
-
data['quitUrl'] = escape(window.location.href);
data['returnUrl'] = escape(window.location.href);
console.log('处理数据', data);
@@ -37,6 +43,12 @@ class H5Platform extends BasePlatform {
return new Promise((resolve) => {
console.log(data);
+ // 检查是否已存在同ID的表单,如果存在则先删除
+ const existingForm = document.getElementById('alipaysubmit');
+ if (existingForm) {
+ existingForm.parentNode.removeChild(existingForm);
+ }
+
// 创建一个临时div元素
const tempDiv = document.createElement('div');
// 将data作为HTML插入到div中(假设data是表单的HTML字符串)
@@ -114,6 +126,10 @@ class H5Platform extends BasePlatform {
console.log("AppLaunch", options);
if (options.query) {
let query = options.query;
+ if(query['version'] != null){
+ uni.setStorageSync('version', query['version']);
+ }
+ // if(){}
if (query['method'] != null && query['method'] == "alipay.trade.wap.pay.return" && query['out_trade_no'] != null) {
//支付宝跳转过来的
//重定向url
@@ -128,30 +144,11 @@ class H5Platform extends BasePlatform {
let str = Object.entries(query)
.map(([key, value]) => `${key}=${value}`)
.join('&')
-
+
url += "?" + str;
- console.log('支付成功,重定向页面。',url);
+ console.log('支付成功,重定向页面。', url);
window.location.href = url;
}
-
- // query['']
- // {
- // "goods_id": "1081",
- // "type_text": "%E6%97%A0%E9%99%90%E8%B5%8F",
- // "order_no": "MH_ZFAH5ZFB2025050449989950960",
- // "charset": "UTF-8",
- // "out_trade_no": "MH_ZFAH5ZFB2025050449989950960",
- // "method": "alipay.trade.wap.pay.return",
- // "total_amount": "0.01",
- // "sign": "JD2PDNDh2qTi/y4wiqtsyJSc5uPy1OgO5W7NaYRdc/ctHT85yVJP9fDVpJAIXRDj/xd8oWpT9a2BSrNfqIbZ0sT0Fa8ha15unfi9RX+jYEkKAa2Grz0rkcv3YOlMni9vThCRdmNPCzh0fKLCKFRBZiuxPIFW7qgoRxFkWvziR8dUi0GccleOSUV6Z3W+HG6b+Ru3fgZSRMm+8+d0UXrH5wi7KIgJja+ZbAnVYkh+4R7BjxS1zpUPMXNzej9fAFHO6UD8RBobYi1r6D3gYpKJaChVUJXaXkRqU/6ybgUbX7FsvviCYoEGUkukiq9HCaKZ/bfrD3TvoAicC4aXo6p7Dw==",
- // "trade_no": "2025050422001402751446415564",
- // "auth_app_id": "2021005141643914",
- // "version": "1.0",
- // "app_id": "2021005141643914",
- // "sign_type": "RSA2",
- // "seller_id": "2088170936712914",
- // "timestamp": "2025-05-04 01:41:48"
- // }
}
}
getOrderNo() {
@@ -160,8 +157,8 @@ class H5Platform extends BasePlatform {
let query = parseQueryString(window.location.search);
if (query['method'] != null && query['method'] == "alipay.trade.wap.pay.return" && query['out_trade_no'] != null) {
//表示还在支付请求中,还未开始重定向
- console.log('window.location.search',window.location.search);
-
+ console.log('window.location.search', window.location.search);
+
resolve(null);
return;
}
@@ -179,7 +176,7 @@ class H5Platform extends BasePlatform {
getUserMenuList() {
// 获取基础菜单列表
const baseMenuList = super.getUserMenuList();
-
+
// H5环境下可能需要修改某些菜单项的行为
return baseMenuList.map(item => {
// 示例:在H5环境下可能需要特殊处理某些菜单项
@@ -196,5 +193,27 @@ class H5Platform extends BasePlatform {
return item;
});
}
+
+ /**
+ * 开启调试
+ */
+ startDeb() {
+ // 简单初始化
+ window.erudaInstance = eruda.init();
+ uni.setStorageSync("erudaInstance", true);
+ }
+ /**
+ * 关闭调试
+ */
+ closeDeb() {
+ if (window.erudaInstance) {
+ // 完全销毁Eruda实例(从DOM中移除)
+ window.erudaInstance.destroy();
+ }
+ uni.removeStorageSync("erudaInstance")
+ }
+ getVersion() {
+ return '1.0.0';
+ }
}
export default H5Platform;
\ No newline at end of file
diff --git a/common/platform/PlatformFactory.js b/common/platform/PlatformFactory.js
index 5edd5df..9dc6cdc 100644
--- a/common/platform/PlatformFactory.js
+++ b/common/platform/PlatformFactory.js
@@ -1,7 +1,9 @@
import MiniProgramPlatform from './MiniProgramPlatform';
import AppPlatform from './AppPlatform';
+//#ifdef WEB
import H5Platform from './H5Platform';
import WebAppPlatform from './WebAppPlatform';
+//#endif
class PlatformFactory {
static create() {
// 判断小程序环境
diff --git a/common/platform/WebAppPlatform.js b/common/platform/WebAppPlatform.js
index dc50442..533a6a6 100644
--- a/common/platform/WebAppPlatform.js
+++ b/common/platform/WebAppPlatform.js
@@ -76,7 +76,10 @@ class WebAppPlatform extends H5Platform {
};
// 将客服菜单插入到第二个位置
- return [...baseMenuList.slice(0, baseMenuList.length-1), customServiceMenu, ...baseMenuList.slice(baseMenuList.length-1)];
+ return [...baseMenuList.slice(0, baseMenuList.length - 1), customServiceMenu, ...baseMenuList.slice(baseMenuList.length - 1)];
+ }
+ getVersion() {
+ return uni.getStorageSync('version') == '' ? '1.0.0' : uni.getStorageSync('version');
}
}
export default WebAppPlatform;
\ No newline at end of file
diff --git a/common/server/mall.js b/common/server/mall.js
index 69bf151..985e704 100644
--- a/common/server/mall.js
+++ b/common/server/mall.js
@@ -1,6 +1,7 @@
import RequestManager from '../request';
import common from '../common';
+import { platform } from '@/common/platform/PlatformFactory'
/**
* 获取钻石商品列表
@@ -21,7 +22,9 @@ export const getDiamondList = async () => {
* @returns
*/
export const createOrderProducts = async (productId) => {
- const res = await RequestManager.get('/createOrderProducts', { product_id: productId });
+ // platform.
+ let postData = platform.getPayData('createOrderProducts', { product_id: productId });
+ const res = await RequestManager.get('/createOrderProducts', postData);
if (res.status == 1) {
return res.data;
} else {
diff --git a/components/detail-lucky/detail-grand-prize.vue b/components/detail-lucky/detail-grand-prize.vue
index 747bc68..934058a 100644
--- a/components/detail-lucky/detail-grand-prize.vue
+++ b/components/detail-lucky/detail-grand-prize.vue
@@ -1,8 +1,10 @@
-
+
+
+ 动画结果因设备差异可能会显示异常,获得赏品以(恭喜获得)结果为准
@@ -59,12 +61,12 @@ export default {
this.bgmCtx.csBgm.seek(0);
this.bgmCtx.csBgm.play();
}
-
+
// 设置动画结束后的淡出效果
setTimeout(() => {
// 开始淡出动画
this.isFadingOut = true;
-
+
// 等待淡出动画完成后再隐藏组件
setTimeout(() => {
if (this.bgmCtx && this.bgmCtx.csBgm) {
@@ -73,9 +75,9 @@ export default {
this.isVisible = false;
this.$emit("end");
}, 400); // 淡出动画持续800ms
-
+
}, 3800); // 4秒后开始淡出(总时间仍维持在4.2秒左右)
-
+
return this;
},
},
diff --git a/components/detail-lucky/detail-lucky.vue b/components/detail-lucky/detail-lucky.vue
index f591ccc..286e75b 100644
--- a/components/detail-lucky/detail-lucky.vue
+++ b/components/detail-lucky/detail-lucky.vue
@@ -1,1064 +1,1115 @@
-
-
-
-
-
-
-
-
-
-
-
- 动画结果因设备差异可能会显示异常,获得赏品以(恭喜获得)结果为准
- 跳过动画
-
-
+
+
+
+
+
+
+
+
+
+
+
+ 动画结果因设备差异可能会显示异常,获得赏品以(恭喜获得)结果为准
+ 跳过动画
+
+
+
+
\ 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
index 89266df..5bae4dc 100644
--- a/components/detail-wuxian-rage/detail-wuxian-rage.vue
+++ b/components/detail-wuxian-rage/detail-wuxian-rage.vue
@@ -61,7 +61,7 @@ export default {
.progress {
margin-top: 10rpx;
- /deep/.cmd-progress-inner {
+ ::v-deep.cmd-progress-inner {
border-radius: 0;
background: #444444;
}
diff --git a/components/order-confirm-popup/order-confirm-popup.vue b/components/order-confirm-popup/order-confirm-popup.vue
index 007d933..3b079eb 100644
--- a/components/order-confirm-popup/order-confirm-popup.vue
+++ b/components/order-confirm-popup/order-confirm-popup.vue
@@ -30,7 +30,6 @@
积分
(首抽5折)
-
×{{ 1 }}
@@ -45,6 +44,7 @@
×{{ orderData.goods.prize_num * 1 - 1 }}
+
@@ -56,6 +56,15 @@
×{{ orderData.goods.prize_num }}
+
+
+ 特效开关
+
+
+
+
+
+
@@ -126,11 +135,9 @@
我已满18岁,阅读并同意
-
《用户协议》
-
《隐私政策》
@@ -194,6 +201,11 @@ export default {
buyNum: {
type: Number,
default: 1
+ },
+ // 特效开关
+ effectSwitch: {
+ type: Boolean,
+ default: false
}
},
watch: {
@@ -231,6 +243,11 @@ export default {
},
methods: {
+ onEffectSwitch(e) {
+ console.log(e.detail.value);
+
+ this.$emit('on-effect-switch', e.detail.value);
+ },
toCoupon() {
if (this.pageData != null && this.pageData.limitInfo != null) {
let limitInfo = this.pageData.limitInfo;
diff --git a/manifest.json b/manifest.json
index 91dc506..8728f19 100644
--- a/manifest.json
+++ b/manifest.json
@@ -189,5 +189,6 @@
"enable" : false
}
},
- "fallbackLocale" : "zh-Hans"
+ "fallbackLocale" : "zh-Hans",
+ "sassImplementationName":"node-sass"
}
diff --git a/package-lock.json b/package-lock.json
index dcbb3bf..36a4d40 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,6 +6,7 @@
"": {
"dependencies": {
"@lucky-canvas/uni": "^0.0.14",
+ "eruda": "^3.4.1",
"js-md5": "^0.8.3",
"uqrcodejs": "^4.0.7"
}
@@ -18,6 +19,11 @@
"lucky-canvas": "~1.7.19"
}
},
+ "node_modules/eruda": {
+ "version": "3.4.1",
+ "resolved": "https://registry.npmjs.org/eruda/-/eruda-3.4.1.tgz",
+ "integrity": "sha512-RmaO5yD97URY/9Q0lye3cmmNPoXNKreeePIw7c/zllbscR92CjGFZFuQ70+0fLIvLcKW3Xha8DS8NFhmeNbEBQ=="
+ },
"node_modules/js-md5": {
"version": "0.8.3",
"resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.8.3.tgz",
diff --git a/package.json b/package.json
index 0686126..5302444 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,7 @@
{
"dependencies": {
"@lucky-canvas/uni": "^0.0.14",
+ "eruda": "^3.4.1",
"js-md5": "^0.8.3",
"uqrcodejs": "^4.0.7"
}
diff --git a/package/mine/coupon-detail.vue b/package/mine/coupon-detail.vue
index a6639e8..516ae01 100644
--- a/package/mine/coupon-detail.vue
+++ b/package/mine/coupon-detail.vue
@@ -248,7 +248,7 @@
width: 150rpx;
margin-top: 10rpx;
- /deep/.cmd-progress-inner {
+ ::v-deep.cmd-progress-inner {
background-color: rgba(255, 255, 255, 0.2);
}
}
diff --git a/pages/infinite/benefit.vue b/pages/infinite/benefit.vue
index 0daae00..02c9e2e 100644
--- a/pages/infinite/benefit.vue
+++ b/pages/infinite/benefit.vue
@@ -306,7 +306,7 @@ export default {
box-sizing: border-box;
}
-/deep/ .u-tab-item {
+::v-deep .u-tab-item {
color: #222222 !important;
}
diff --git a/pages/other/about.vue b/pages/other/about.vue
index c55c9b8..b5419e5 100644
--- a/pages/other/about.vue
+++ b/pages/other/about.vue
@@ -1,37 +1,176 @@
-
+
友达赏
- App:1.0.1
- Version:102
+ Version:{{version}}
+
+
+
+
+
+
+
+ 测试模式已激活
+
+
+ 用户Id: {{ userinfo.id || '未知' }}
+
+
+ 用户UId: {{ userinfo.uid || '未知' }}
+
+
+ 用户类型: {{ userinfo.ut }}
+
+
+ 当前域名: {{ domain || '未获取' }}
+
+
+ 日志状态: {{ logEnabled ? '已开启' : '已关闭' }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/shop/detail.vue b/pages/shop/detail.vue
index 5cae2a8..f73600b 100644
--- a/pages/shop/detail.vue
+++ b/pages/shop/detail.vue
@@ -636,7 +636,7 @@ textarea {
-/deep/.shop_detail image {
+::v-deep.shop_detail image {
width: 100%;
}
diff --git a/pages/shouye/detail.vue b/pages/shouye/detail.vue
index febe678..a902d9e 100644
--- a/pages/shouye/detail.vue
+++ b/pages/shouye/detail.vue
@@ -118,7 +118,8 @@
: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], choujiangloading)">
+ @confirm="$c.noDouble1(confirmSubmit, [1, buyNum], choujiangloading)" :effect-switch="effectSwitch"
+ @on-effect-switch="onEffectSwitch">
@@ -248,7 +249,8 @@ export default {
useMoney: true,
useIntegral: true,
useMoney2: true,
- isPrizeLoading: false // 是否显示抽奖loading
+ isPrizeLoading: false, // 是否显示抽奖loading
+ effectSwitch: true, // 特效开关
};
},
created() {
@@ -296,7 +298,7 @@ export default {
this.couponData = data;
this.confirmSubmit([0, this.buyNum]);
});
-
+ this.effectSwitch = uni.getStorageSync('effectSwitch') === 1 || uni.getStorageSync('effectSwitch') === "";
// uni.getImageInfo({
// src: this.$img('/static/img/animation.png'),
// success: ({ path }) => {
@@ -313,6 +315,8 @@ export default {
this.sendRuleData = res.data;
}
});
+
+
},
onReady() {
@@ -327,14 +331,16 @@ export default {
},
methods: {
+ onEffectSwitch(value) {
+ this.effectSwitch = value;
+ uni.setStorageSync('effectSwitch', value ? 1 : 0);
+ },
// 老虎机结束抽奖回调
onLuckyEnd(data) {
console.log("抽奖结束", data);
-
- // 获取所有中奖奖品
- // console.log("所有中奖奖品:", data.allPrizes);
-
- this.$refs.detailLucky.hide();
+ if (this.$refs.detailLucky != null) {
+ this.$refs.detailLucky.hide();
+ }
this.bgmCtx.openBgm.play()
this.open('resPop')
},
@@ -422,26 +428,31 @@ export default {
this.getPrize(order_num)
return
}
- this.$refs.detailLucky.init(this.getGoodList, this.buyNum);
+
if (that.buyNum == 0 || that.buyNum == null) {
if (res.data.prize_num != null) {
that.buyNum = res.data.prize_num;
}
}
+ this.isPrizeLoading = false;
+ uni.hideLoading();
+ if (!this.effectSwitch) {
+ this.onLuckyEnd([]);
+ return;
+ }
+ this.$refs.detailLucky.init(this.getGoodList, this.buyNum);
if (this.prizeData.data.length > 10) {
- this.$refs.detailLucky.hide();
- this.bgmCtx.openBgm.play()
- this.open('resPop')
+ this.onLuckyEnd([]);
return;
}
let chaoshen = this.prizeData.data.findIndex(it => it.shang_id == 34);
- if (chaoshen != -1) {
- console.log('抽中超神');
- uni.hideLoading();
- this.$refs.detailGrandPrize.init();
- this.$refs.detailGrandPrize.show();
- return;
- }
+ // if (chaoshen != -1) {
+ // console.log('抽中超神');
+ // uni.hideLoading();
+ // this.$refs.detailGrandPrize.init();
+ // this.$refs.detailGrandPrize.show();
+ // return;
+ // }
//获取奖品下标
let resultIndices = this.prizeData.data.map(it => {
// console.log(it.id);
@@ -452,9 +463,8 @@ export default {
// console.log(resultIndices,this.getGoodList, this.prizeData.data, "resultIndices");
this.$refs.detailLucky.startDrawWithResult(resultIndices, () => {
console.log("抽奖结束");
- });
- this.isPrizeLoading = false;
- uni.hideLoading();
+ },chaoshen);
+
}
}, 500)
diff --git a/pages/shouye/detail_wuxian.vue b/pages/shouye/detail_wuxian.vue
index d567827..6fed44c 100644
--- a/pages/shouye/detail_wuxian.vue
+++ b/pages/shouye/detail_wuxian.vue
@@ -227,7 +227,8 @@
: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])">
+ @confirm="$c.noDouble1(confirmSubmit, [1, buyNum])" :effect-switch="effectSwitch"
+ @on-effect-switch="onEffectSwitch">
@@ -319,7 +320,8 @@ export default {
choujiangloading: false,
goods: null,
productList: [],
- isPrizeLoading: false // 是否显示抽奖loading
+ isPrizeLoading: false, // 是否显示抽奖loading
+ effectSwitch: true, // 特效开关
}
},
@@ -374,6 +376,7 @@ export default {
this.couponData = data
this.confirmSubmit([0, this.buyNum])
})
+ this.effectSwitch = uni.getStorageSync('effectSwitch') === 1 || uni.getStorageSync('effectSwitch') === "";
this.$platform.getOrderNo().then(order_num => {
console.log("order_num", order_num);
if (order_num != null && order_num != "") {
@@ -386,7 +389,8 @@ export default {
if (res.status == 1) {
this.sendRuleData = res.data
}
- })
+ });
+
},
onShow() {
@@ -407,15 +411,25 @@ export default {
},
methods: {
+ onEffectSwitch(value) {
+
+ this.effectSwitch = value;
+ uni.setStorageSync('effectSwitch', value ? 1 : 0);
+ },
// 老虎机结束抽奖回调
onLuckyEnd(data) {
- console.log("抽奖结束", data);
+ console.log("抽奖结束");
// 获取所有中奖奖品
- // console.log("所有中奖奖品:", data.allPrizes);
- this.$refs.detailLucky.hide();
- this.bgmCtx.openBgm.play()
- this.open('resPop')
+ if (this.$refs.detailLucky != null) {
+ this.$refs.detailLucky.hide();
+ }
+ var that = this;
+ setTimeout(() => {
+ that.bgmCtx.openBgm.seek(0);
+ that.bgmCtx.openBgm.play();
+ that.open('resPop');
+ }, 200)
},
previewDetail(item, a) {
@@ -530,13 +544,17 @@ export default {
if (!this.isPrizeLoading) {
this.isPrizeLoading = true;
- uni.showLoading({ title: '加载中...' });
+ uni.showLoading({
+ title: '加载中...'
+ });
}
let that = this;
setTimeout(async () => {
- const res = await this.$request.post('infinite_prizeorderlog', { order_num }, false);
+ const res = await this.$request.post('infinite_prizeorderlog', {
+ order_num
+ }, false);
if (res.status == 1) {
res.data.data.map(item => {
item.isChoose = false
@@ -549,33 +567,37 @@ export default {
this.getPrize(order_num)
return
}
- this.$refs.detailLucky.init(this.getGoodList, this.buyNum);
+
if (that.buyNum == 0 || that.buyNum == null) {
if (res.data.prize_num != null) {
that.buyNum = res.data.prize_num;
}
}
- let chaoshen = this.prizeData.data.findIndex(it => it.shang_id == 34);
- if (chaoshen != -1) {
- console.log('抽中超神');
- uni.hideLoading();
- this.$refs.detailGrandPrize.init();
- this.$refs.detailGrandPrize.show();
- return;
- }
- //获取奖品下标
- let resultIndices = this.prizeData.data.map(it => {
- // console.log(it.id);
- const index = this.getGoodList.findIndex(item => item.id == it.goodslist_id);
- // console.log(index);
- return index;
- });
- // console.log(resultIndices,this.getGoodList, this.prizeData.data, "resultIndices");
- this.$refs.detailLucky.startDrawWithResult(resultIndices, () => {
- console.log("抽奖结束");
- });
this.isPrizeLoading = false;
uni.hideLoading();
+ if (!this.effectSwitch) {
+ this.onLuckyEnd([]);
+ return;
+ }
+ this.$refs.detailLucky.init(this.getGoodList, this.buyNum);
+ let chaoshen = this.prizeData.data.findIndex(it => it.shang_id == 34);
+ // if (chaoshen != -1) {
+ // uni.hideLoading();
+ // console.log('抽中超神');
+ // this.$refs.detailGrandPrize.init();
+ // this.$refs.detailGrandPrize.show();
+ // return;
+ // }
+ //获取奖品下标
+ let resultIndices = this.prizeData.data.map(it => {
+ const index = this.getGoodList.findIndex(item => item.id == it
+ .goodslist_id);
+ return index;
+ });
+ this.$refs.detailLucky.startDrawWithResult(resultIndices, () => {
+ console.log("抽奖结束");
+ },chaoshen);
+
}
}, 500)
},
@@ -608,7 +630,9 @@ export default {
// 计算订单金额
calculateOrder(num) {
- uni.showLoading({ title: '计算中...' });
+ uni.showLoading({
+ title: '计算中...'
+ });
this.buyNum = num;
@@ -663,7 +687,9 @@ export default {
// 支付订单
async submitOrder(num, flag) {
this.choujiangloading = true;
- uni.showLoading({ title: '提交订单中' });
+ uni.showLoading({
+ title: '提交订单中'
+ });
this.buyNum = num;
@@ -802,7 +828,9 @@ export default {
async getData(isLoading = true) {
- const res = await this.$request.post("infinite_goodsdetail", { goods_id: this.optData.goods_id }, isLoading);
+ const res = await this.$request.post("infinite_goodsdetail", {
+ goods_id: this.optData.goods_id
+ }, isLoading);
if (res.status == 1) {
this.goods = res.data.goods;
res.data.goodslist.forEach(item => {
@@ -1296,7 +1324,7 @@ export default {
.progress {
margin-top: 10rpx;
- /deep/.cmd-progress-inner {
+ ::v-deep.cmd-progress-inner {
border-radius: 0;
background: #444444;
}
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index 3c5fc52..a1d996e 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -8,7 +8,7 @@
-
+
@@ -627,7 +627,7 @@ export default {
align-items: center;
margin-left: 18rpx;
- /deep/.uni-noticebar__content-text {
+ ::v-deep.uni-noticebar__content-text {
font-size: 24rpx;
}
}
diff --git a/pages/user/recharge-page.vue b/pages/user/recharge-page.vue
index 25cba09..cbdcbe5 100644
--- a/pages/user/recharge-page.vue
+++ b/pages/user/recharge-page.vue
@@ -9,7 +9,7 @@
- {{userInfo.money}}
+ {{ userInfo.money }}
我的钻石
@@ -20,23 +20,24 @@
-
+
-
+
-
+
-
-
- {{isPaying ? '支付中...' : '确认支付'}}
+
+
+ {{ isPaying ? '支付中...' : '确认支付' }}
@@ -45,141 +46,145 @@
\ No newline at end of file
diff --git a/pages/user/tui-guang.vue b/pages/user/tui-guang.vue
index dd52071..5c0338d 100644
--- a/pages/user/tui-guang.vue
+++ b/pages/user/tui-guang.vue
@@ -59,7 +59,7 @@
-
+
@@ -365,7 +365,7 @@ page {
}
}
- /deep/.uni-navbar__content {
+ ::v-deep.uni-navbar__content {
z-index: 998;
}