Merge remote-tracking branch 'origin/dev_fix_sub' into dev_fix_sub

zxl

2025-08-29 f052b7be9feb8b67d487763108b9dde655885ddd

Merge remote-tracking branch 'origin/dev_fix_sub' into dev_fix_sub

 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",
};

//默认生产环境

 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;