From f052b7be9feb8b67d487763108b9dde655885ddd Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 29 八月 2025 13:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_fix_sub' into dev_fix_sub
---
config/api.js | 24 ++++++------
pages/prize/PrizeDetail/PrizeDetail.vue | 41 +++++++++++---------
2 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/config/api.js b/config/api.js
index 9db28a0..684433b 100644
--- a/config/api.js
+++ b/config/api.js
@@ -4,10 +4,10 @@
*/
// 寮�鍙戠幆澧�
const dev = {
- im: "http://192.168.0.15:8885",
- common: "http://192.168.0.15:8890",
- buyer: "http://192.168.0.15:8888",
- store: "http://192.168.0.15:8889",
+ // im: "http://192.168.0.15:8885",
+ // common: "http://192.168.0.15:8890",
+ // buyer: "http://192.168.0.15:8888",
+ // store: "http://192.168.0.15:8889",
// im: "http://127.0.0.1:8885",
// common: "http://127.0.0.1:8890",
@@ -21,10 +21,10 @@
// common: "https://myk.9village.cn",
// buyer: "https://myk.9village.cn",
// store: "https://myk.9village.cn",
- // im: "https://www.meiyikuang.com/mykapi",
- // common: "https://www.meiyikuang.com/mykapi",
- // buyer: "https://www.meiyikuang.com/mykapi",
- // store: "https://www.meiyikuang.com/mykapi",
+ im: "https://www.meiyikuang.com",
+ common: "https://www.meiyikuang.com",
+ buyer: "https://www.meiyikuang.com",
+ store: "https://www.meiyikuang.com",
};
// 鐢熶骇鐜
const prod = {
@@ -32,10 +32,10 @@
// common: "http://1.95.67.54:888",
// buyer: "http://1.95.67.54:888",
// store: "http://1.95.67.54:888",
- im: "https://myk.9village.cn",
- common: "https://myk.9village.cn",
- buyer: "https://myk.9village.cn",
- store: "https://myk.9village.cn",
+ im: "https://www.meiyikuang.com",
+ common: "https://www.meiyikuang.com",
+ buyer: "https://www.meiyikuang.com",
+ store: "https://www.meiyikuang.com",
};
//榛樿鐢熶骇鐜
diff --git a/pages/prize/PrizeDetail/PrizeDetail.vue b/pages/prize/PrizeDetail/PrizeDetail.vue
index 9e95cbc..de8af2d 100644
--- a/pages/prize/PrizeDetail/PrizeDetail.vue
+++ b/pages/prize/PrizeDetail/PrizeDetail.vue
@@ -166,6 +166,7 @@
img: item.prizeImg
}
})
+ this.prizeList = [...this.prizeList]
this.prizeList.push({
id: 'notWIn',
name: "璋㈣阿鍙備笌"
@@ -173,22 +174,22 @@
await this.getUnmber(this.activityId)
await this.getGrantRecord(this.activityId)
},
- onShareTimeline(e) {
- console.log('------------------>', e)
- // 濡傛灉鐢ㄦ埛灏濊瘯杩囧垎浜湅鍙嬪湀锛岀粰浜堝鍔�
- if (this.shareTimelineAttempt) {
- this.remainingTimes++;
- this.shareTimelineAttempt = false;
- uni.showToast({
- title: '鑾峰緱1娆℃娊濂栨満浼�',
- icon: 'success'
- });
- }
- return {
- title: '蹇潵鍙備笌鎶藉娲诲姩鍚э紒',
- path: '/pages/prize/PrizeDetail/PrizeDetail?id=' + this.activityId
- }
- },
+ // onShareTimeline(e) {
+ // console.log('------------------>', e)
+ // // 濡傛灉鐢ㄦ埛灏濊瘯杩囧垎浜湅鍙嬪湀锛岀粰浜堝鍔�
+ // if (this.shareTimelineAttempt) {
+ // this.remainingTimes++;
+ // this.shareTimelineAttempt = false;
+ // uni.showToast({
+ // title: '鑾峰緱1娆℃娊濂栨満浼�',
+ // icon: 'success'
+ // });
+ // }
+ // return {
+ // title: '蹇潵鍙備笌鎶藉娲诲姩鍚э紒',
+ // path: '/pages/prize/PrizeDetail/PrizeDetail?id=' + this.activityId
+ // }
+ // },
//鍙兘浼氫娇鐢ㄥ埌
mounted() {
// this.startAutoScroll()
@@ -335,7 +336,7 @@
this.closeMoreChancesModal();
uni.showModal({
title: '鍘昏喘鐗�',
- content: '鍗冲皢璺宠浆鍒板晢鍝佸箍鍦�',
+ content: '鍗冲皢璺宠浆鍒拌喘鐗╄溅',
success: (res) => {
if (res.confirm) {
// 鎴栬�呰烦杞埌璐墿杞�
@@ -489,9 +490,11 @@
.prize-grid {
display: flex;
flex-wrap: wrap;
- justify-content: space-between;
+ justify-content: flex-start;
}
-
+ .prize-item:nth-child(n+1){
+ margin-left: 15rpx;
+ }
.prize-item {
width: 22%;
margin-bottom: 20rpx;
--
Gitblit v1.8.0