From e85f87d859a5cd14516bb3512a8c858e0020a2de Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Sat, 16 May 2026 10:03:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A5=96=E5=93=81=E5=9B=BE=E7=89=87=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |   5 -
 .../almost-lottery/almost-lottery.vue         |   2 +
 src/pageB/lucky/index.vue                     | 110 ++++----
 src/pages/index/index.vue                     | 242 ++++++------------
 src/pages/login/index.vue                     |   5 +-
 src/pages/welcome/index.vue                   | 135 +++++-----
 src/static/images/almost-lottery__action.png  | Bin 4234 -> 0 bytes
 src/static/images/almost-lottery__bg.png      | Bin 3398 -> 0 bytes
 src/utils/login.js                            |  46 ++--
 9 files changed, 233 insertions(+), 312 deletions(-)
 delete mode 100644 src/static/images/almost-lottery__action.png
 delete mode 100644 src/static/images/almost-lottery__bg.png

diff --git a/src/App.vue b/src/App.vue
index cd4eee3..d6cf276 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,6 @@
 <script>
 // import { checkUpdate } from '@/utils/check-update';
 import { strToParams } from '@/utils/tools';
-import { wxMnpLogin } from '@/utils/login';
 export default {
   data() {
     return {
@@ -14,10 +13,6 @@ export default {
     this.$store.dispatch('app/getSys');
     this.$store.dispatch('app/getArticle');
 
-    /* #ifdef MP-WEIXIN */
-    wxMnpLogin()
-    /* #endif */
-
     // #ifdef APP-PLUS
     // const clientInfo = plus.push.getClientInfo()
     // console.log(clientInfo);
diff --git a/src/pageB/components/almost-lottery/components/almost-lottery/almost-lottery.vue b/src/pageB/components/almost-lottery/components/almost-lottery/almost-lottery.vue
index 18b307c..bd3ca47 100644
--- a/src/pageB/components/almost-lottery/components/almost-lottery/almost-lottery.vue
+++ b/src/pageB/components/almost-lottery/components/almost-lottery/almost-lottery.vue
@@ -441,6 +441,8 @@
         let prizeCount = this.prizeList.length
         let baseAngle = Math.PI * 2 / prizeCount
 
+        ctx.font = "bold 28px sans-serif";
+
         // 设置字体
         ctx.setFontSize(this.higtFontSize)
 
diff --git a/src/pageB/lucky/index.vue b/src/pageB/lucky/index.vue
index 8e1f389..c3a7076 100644
--- a/src/pageB/lucky/index.vue
+++ b/src/pageB/lucky/index.vue
@@ -1,8 +1,7 @@
 <template>
   <view class="h-full">
-    <loading-view v-if="isFirstLoading && isLogin"></loading-view>
-    <view class="bg min-h-full overflow-hidden" v-else-if="isLogin"
-      :style="{ backgroundImage: `url(${draw_activity.bg_image})`, backgroundColor: draw_activity.bg_color }">
+    <loading-view v-if="isFirstLoading"></loading-view>
+    <view v-else class="bg min-h-full overflow-hidden" :style="{ backgroundImage: `url(${draw_activity.bg_image})`, backgroundColor: draw_activity.bg_color }">
       <view class="">
         <view class="fixed top-0 left-0 w-full bg z-10" :style="{ backgroundImage: `url(${draw_activity.bg_image})` }">
           <view :style="{ height: statusBarHeight + 'px' }"></view>
@@ -32,52 +31,34 @@
               </swiper-item>
             </swiper>
           </view>
-          <!-- <view v-for="item in logs" :key="item.id" class="opacity">
-               <view class="bg-hex-000 bg-opacity-30 text-white rounded-full px-20px h-44rpx leading-44rpx text-28rpx mb-10rpx inline-block">
-                 <text
-                   >恭喜{{ item.user.nickname }}抽中<text class="text-hex-ffde58">{{ item.prize.name }}</text></text
-                 >
-               </view>
-             </view> -->
         </view>
         <almost-lottery pointer-position="edge" :lottery-size="lotteryConfig.lotterySize"
           :action-size="lotteryConfig.actionSize" :ring-count="8" :duration="8" :prize-list="prizeList"
           :prize-index="prizeIndex" @reset-index="prizeIndex = -1" @draw-start="handleDrawStart"
           @draw-end="handleDrawEnd" @finish="handleDrawFinish" v-if="prizeList.length" stroke-color="#ffffff"
-          :strFontSize="28" :strMaxLen="10" :strFontColors="['#fb6056']" :colors="['#ffeaa7', '#ffeaa7']"
+          :strFontSize="36" :strMaxLen="10"
+          :colors="prizeBgColors"
+          :strFontColors="['#FFFFFF']"
           :stroked="true" :img-width="120" :img-height="120" :imgMarginStr="30" :strMarginOutside="32"
-          :canvasCached="true"
           :lotteryBg="lotteryBg"
           :actionBg="actionBg"
-          />
+          :imgDrawed="false"
+          strDirection="vertical"
+        />
         <view class="text-center mt-40rpx">今天还可以抽 <text class="text-error">{{ freeNum }}</text> 次</view>
       </view>
 
-
       <view class="p-30rpx">
         <u-parse :html="draw_activity.desc"></u-parse>
       </view>
       <u-mask :show="show">
         <view class="flex items-center justify-center h-full">
-          <view class="">
-            <view class="pr-30rpx text-right">
-              <image src="/static/images/app/app_update_close.png" alt="" srcset="" class="w-48rpx h-48rpx"
-                @click="show = false"></image>
-            </view>
-            <view class="w-600rpx h-600rpx relative" v-if="prizeData.prize">
-              <image v-if="prizeData.prize.type == 0" :src="results.goods" class="w-full h-full"></image>
-              <block v-if="prizeData.prize.type != 0">
-                <view class="absolute top-178rpx left-0 right-0 text-center mx-auto mx-auto w-300rpx h-290rpx">
-                  <image :src="results.goods" alt="" class="w-full h-full"></image>
-                </view>
-                <view class="absolute top-116rpx left-0 right-0 text-center h-42rpx leading-40rpx text-30rpx text-hex-f74a2c bg-gradient-to-t to-hex-fff4e5 from-hex-ffd4b2 w-240rpx rounded-full mx-auto">
-                  {{ results.name }}
-                </view>
-                <view v-if="!!results.btn" @click="onResults" class="absolute top-486rpx left-0 right-0 text-center h-54rpx leading-54rpx text-28rpx text-white bg-img w-280rpx mx-auto">
-                  {{ results.btn }}
-                </view>
-              </block>
+          <view class="prize-result" v-if="prizeData.prize">
+            <view class="prize-title text-center h-42rpx leading-40rpx text-30rpx text-hex-f74a2c bg-gradient-to-t to-hex-fff4e5 from-hex-ffd4b2 w-240rpx rounded-full mx-auto">{{ results.name }}</view>
+            <view class="prize-image text-center mx-auto mx-auto w-500rpx h-800rpx" style="margin: 30rpx 0">
+              <image :src="results.goods" alt="" class="w-full h-full"></image>
             </view>
+            <view v-if="results.btn" @click="onResults" class="prize-btn text-center h-54rpx leading-54rpx text-28rpx text-white bg-img w-280rpx mx-auto">{{ results.btn }}</view>
           </view>
         </view>
       </u-mask>
@@ -125,9 +106,9 @@ export default {
       show: false,
       prizeData: {},
       results: {
-        name: '50元消费体验价',
-        btn: '充值账户余额内',
-        goods: 'https://ystmp.oss-cn-beijing.aliyuncs.com/wechart/lucky/hb.png',
+        name: '',
+        btn: '确定',
+        goods: '',
       },
       // 开启调试模式
       isDev: process.env.NODE_ENV === 'development',
@@ -142,9 +123,9 @@ export default {
 
       // 以下是转盘 UI 配置
       // 转盘外环图，如有需要，请参考替换为自己的设计稿
-      lotteryBg: "/static/images/almost-lottery__bg.png",
+      lotteryBg: "https://jiqu-library.peidikeji.cn/uniapp/almost-lottery/almost-lottery__bg.png",
       // 抽奖按钮图
-      actionBg: "/static/images/almost-lottery__action.png",
+      actionBg: "https://jiqu-library.peidikeji.cn/uniapp/almost-lottery/almost-lottery__action.png",
       // 奖品数据
       prizeList: [],
       // 奖品是否设有库存
@@ -184,6 +165,10 @@ export default {
           },
         ],
       },
+      // 抽奖转盘 奖品的背景色 ['#ffeaa7', '#ffeaa7']
+      prizeBgColors: [],
+      // 抽奖转盘 奖品的字体颜色 ['#FFFFFF']
+      prizeFontColors: []
     };
   },
   computed: {
@@ -202,17 +187,19 @@ export default {
   },
   async onLoad({ id }) {
     this.id = id;
-    setTimeout(() => {
-      if (!this.isLogin) {
-        this.$u.route({
-          type: 'redirectTo',
-          url: `/pages/login/index?redirec=${encodeURIComponent(`/pageB/lucky/index?id=${id}`)}`
-        })
-      } else {
-        this.getConfig();
-        this.getLuckyLog();
-      }
-    }, 300)
+    this.getConfig();
+    this.getLuckyLog();
+    // setTimeout(() => {
+    //   if (!this.isLogin) {
+    //     this.$u.route({
+    //       type: 'redirectTo',
+    //       url: `/pages/login/index?redirec=${encodeURIComponent(`/pageB/lucky/index?id=${id}`)}`
+    //     })
+    //   } else {
+    //     this.getConfig();
+    //     this.getLuckyLog();
+    //   }
+    // }, 300)
   },
 
   //微信分享
@@ -257,6 +244,14 @@ export default {
       if (prize.type == 1) {
         this.show = false;
         this.showAddress = true;
+      }
+      // 优惠券
+      else if (prize.type == 6) {
+        this.show = false;
+        // 跳转查看我的优惠券
+        uni.navigateTo({
+          url: '/pageA/coupon/coupon'
+        });
       } else {
         this.show = false;
       }
@@ -292,6 +287,18 @@ export default {
         return { prizeId: e.id, prizeName: e.name, prizeStock: 10, prizeWeight: 200, prizeImage: e.icon, ...e };
       });
 
+      // 配置奖品的背景色 和 字体颜色
+      const prizeBgColors = []
+      const prizeFontColors = []
+      for (var i = 0; i < data.length; i++) {
+        const item = data[i]
+        
+        prizeBgColors.push(item.other?.bgColor ?? "#22292f")
+        prizeFontColors.push(item.other?.textColor ?? "#FFFFFF")
+      }
+      this.prizeBgColors = prizeBgColors
+      this.prizeFontColors = prizeFontColors
+
       this.draw_log_id = this.config.draw_log_id;
       this.prizeList = data;
       if (!!this.draw_log_id && !this.showAddress) {
@@ -344,14 +351,19 @@ export default {
       // 旋转结束后，开始处理拿到结果后的逻辑
       let prize = this.prizeList[this.prizeIndex];
 
+      // type = 1 实物奖品
+      // type = 6 优惠券奖品
       const { type, prizeImage, name, amount } = prize;
       this.draw_log_id = this.prizeData.id;
       this.results.name = name;
-      this.results.btn = '';
+      this.results.btn = '确定';
       if (type == 1) {
         // this.showAddress = true
         this.results.btn = '填写地址';
       }
+      if (type == 6) {
+        this.results.btn = '查看我的优惠券';
+      }
       this.results.goods = prizeImage;
       this.show = true;
       this.prizeing = false;
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 5e5eb17..af3a8c9 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -3,7 +3,8 @@
     <!-- 导航栏 -->
     <u-navbar :border-bottom="false" :is-back="false" :background="{ background: '#ffffff' }">
       <view class="pl-base w-full" @tap="$u.route('/pages/search/search')">
-        <u-search class="w-full" :disabled="true" placeholder="搜索商品名称" v-model="searchText" :show-action="false"></u-search>
+        <u-search class="w-full" :disabled="true" placeholder="搜索商品名称" v-model="searchText"
+          :show-action="false"></u-search>
       </view>
       <template #right>
         <view class="mx-base relative" @tap="$u.routeAuth('/pageA/news/index')">
@@ -14,39 +15,28 @@
         </view>
       </template>
     </u-navbar>
-    <mescroll-body :bottombar="false" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption" :up="upOption">
+    <mescroll-body :bottombar="false" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+      :down="downOption" :up="upOption">
       <view class="px-base">
         <!-- 轮播图 -->
         <view>
-          <swiper
-            class="swipers h-400rpx text-center mt-base m-auto rounded15rpx overflow"
-            circular="true"
-            autoplay="true"
-            indicator-dots="true"
-            indicator-color="#ffffff"
-            indicator-active-color="#378264"
-          >
-            <swiper-item class="flex justify-center w-full h-full" v-for="(item, index) in bannerList['wechat_mini_top_banner']" :key="index">
-              <image
-                :src="`${item.image}?x-oss-process=image/resize,w_750/quality,q_90`"
-                mode="aspectFill"
-                class="w-full h-full"
-                @tap="jumpByOption(item)"
-              />
+          <swiper class="swipers h-400rpx text-center mt-base m-auto rounded15rpx overflow" circular="true"
+            autoplay="true" indicator-dots="true" indicator-color="#ffffff" indicator-active-color="#378264">
+            <swiper-item class="flex justify-center w-full h-full"
+              v-for="(item, index) in bannerList['wechat_mini_top_banner']" :key="index">
+              <image :src="`${item.image}?x-oss-process=image/resize,w_750/quality,q_90`" mode="aspectFill"
+                class="w-full h-full" @tap="jumpByOption(item)" />
             </swiper-item>
           </swiper>
         </view>
         <!-- tabs -->
         <block v-if="!isVerify">
           <view class="grid grid-cols-5">
-            <view
-              @tap="jumpByOption(item)"
-              class="py-25rpx flex flex-col justify-center items-center"
-              v-for="(item, index) in bannerList['wechat_mini_top_navigation_banner']"
-              :key="index"
-            >
+            <view @tap="jumpByOption(item)" class="py-25rpx flex flex-col justify-center items-center"
+              v-for="(item, index) in bannerList['wechat_mini_top_navigation_banner']" :key="index">
               <view class="flex items-end">
-                <u-image width="70rpx" height="70rpx" :src="`${item.image}?x-oss-process=image/resize,w_70/quality,q_90`" :lazy-load="true"></u-image>
+                <u-image width="70rpx" height="70rpx"
+                  :src="`${item.image}?x-oss-process=image/resize,w_70/quality,q_90`" :lazy-load="true"></u-image>
               </view>
               <view class="text-md mt-14rpx text-hex-txBase">{{ item.name }}</view>
             </view>
@@ -58,20 +48,11 @@
             <indexTitle></indexTitle>
             <!-- 第一张广告图 -->
             <view class="grid grid-cols-2 gap-x-20rpx mt-10rpx">
-              <view
-                v-for="(item, index) in bannerList['wechat_mini_recommend_banner']"
-                :key="index"
-                :class="index == 0 ? 'col-start-1 col-span-2' : ''"
-                class="mt-20rpx"
-              >
-                <u-image
-                  border-radius="15rpx"
-                  width="100%"
-                  height="260rpx"
-                  :src="`${item.image}?x-oss-process=image/resize,w_750/quality,q_90`"
-                  :lazy-load="true"
-                  @tap="jumpByOption(item)"
-                ></u-image>
+              <view v-for="(item, index) in bannerList['wechat_mini_recommend_banner']" :key="index"
+                :class="index == 0 ? 'col-start-1 col-span-2' : ''" class="mt-20rpx">
+                <u-image border-radius="15rpx" width="100%" height="260rpx"
+                  :src="`${item.image}?x-oss-process=image/resize,w_750/quality,q_90`" :lazy-load="true"
+                  @tap="jumpByOption(item)"></u-image>
               </view>
             </view>
           </view>
@@ -82,19 +63,10 @@
           <!-- 左右滑动 -->
           <view class="px-base">
             <scroll-view scroll-x="true" class="mt-base scroll pb-10rpx">
-              <view
-                class="scroll-item mt-10rpx mr-20rpx"
-                v-for="(item, index) in recommendList"
-                @tap="$u.route('/pages/product_details/index', { skuId: item.id })"
-                :key="index"
-              >
-                <u-image
-                  border-radius="15rpx"
-                  width="260rpx"
-                  height="260rpx"
-                  :src="`${item.cover}?x-oss-process=image/resize,w_260/quality,q_90`"
-                  :lazy-load="true"
-                ></u-image>
+              <view class="scroll-item mt-10rpx mr-20rpx" v-for="(item, index) in recommendList"
+                @tap="$u.route('/pages/product_details/index', { skuId: item.id })" :key="index">
+                <u-image border-radius="15rpx" width="260rpx" height="260rpx"
+                  :src="`${item.cover}?x-oss-process=image/resize,w_260/quality,q_90`" :lazy-load="true"></u-image>
                 <view class="text-md w-240rpx line-1 text-hex-bgBase h-40rpx">{{ item.name }}</view>
                 <view class="text-md text-txBase">￥{{ item.sell_price }}</view>
                 <view class="flex items-center" v-if="item.vip_price">
@@ -107,32 +79,17 @@
         </view>
         <!-- 第四张广告图 -->
         <view class="mt-base" v-for="(item, index) in bannerList['wechat_mini_floor_banner']" :key="index">
-          <u-image
-            @tap="jumpByOption(item)"
-            border-radius="15rpx"
-            width="100%"
-            height="220rpx"
-            :src="`${item.image}?x-oss-process=image/resize,w_750/quality,q_90`"
-            :lazy-load="true"
-          ></u-image>
+          <u-image @tap="jumpByOption(item)" border-radius="15rpx" width="100%" height="220rpx"
+            :src="`${item.image}?x-oss-process=image/resize,w_750/quality,q_90`" :lazy-load="true"></u-image>
         </view>
         <!--  -->
         <view class="bg-white m-auto shdow mt-base px-base">
           <indexTitle name="热销商品"></indexTitle>
           <scroll-view scroll-x="true" class="mt-base scroll">
-            <view
-              class="scroll-item mt-10rpx mr-20rpx"
-              v-for="(item, index) in hotList"
-              @tap="$u.route('/pages/product_details/index', { skuId: item.id })"
-              :key="index"
-            >
-              <u-image
-                border-radius="15rpx"
-                width="260rpx"
-                height="260rpx"
-                :src="`${item.cover}?x-oss-process=image/resize,w_260/quality,q_90`"
-                :lazy-load="true"
-              ></u-image>
+            <view class="scroll-item mt-10rpx mr-20rpx" v-for="(item, index) in hotList"
+              @tap="$u.route('/pages/product_details/index', { skuId: item.id })" :key="index">
+              <u-image border-radius="15rpx" width="260rpx" height="260rpx"
+                :src="`${item.cover}?x-oss-process=image/resize,w_260/quality,q_90`" :lazy-load="true"></u-image>
               <view class="text-md w-240rpx line-1 text-hex-bgBase h-40rpx">{{ item.name }}</view>
               <view class="text-md text-txBase">￥{{ item.sell_price }}</view>
               <view class="flex items-center" v-if="item.vip_price">
@@ -146,19 +103,10 @@
         <view class="bg-white m-auto shdow mt-base px-base" v-if="boutique_books.length">
           <indexTitle name="精品书籍"></indexTitle>
           <scroll-view scroll-x="true" class="mt-base scroll">
-            <view
-              class="scroll-item mt-10rpx mr-20rpx"
-              v-for="(item, index) in boutique_books"
-              @tap="$u.route('/pages/product_details/index', { skuId: item.id })"
-              :key="index"
-            >
-              <u-image
-                border-radius="15rpx"
-                width="260rpx"
-                height="260rpx"
-                :src="`${item.cover}?x-oss-process=image/resize,w_260/quality,q_90`"
-                :lazy-load="true"
-              ></u-image>
+            <view class="scroll-item mt-10rpx mr-20rpx" v-for="(item, index) in boutique_books"
+              @tap="$u.route('/pages/product_details/index', { skuId: item.id })" :key="index">
+              <u-image border-radius="15rpx" width="260rpx" height="260rpx"
+                :src="`${item.cover}?x-oss-process=image/resize,w_260/quality,q_90`" :lazy-load="true"></u-image>
               <view class="text-md w-240rpx line-1 text-hex-bgBase h-40rpx">{{ item.name }}</view>
               <view class="text-md text-txBase">￥{{ item.sell_price }}</view>
               <view class="flex items-center" v-if="item.vip_price">
@@ -172,19 +120,10 @@
         <view class="bg-white m-auto shdow mt-base px-base" v-if="natural_water_feature.length">
           <indexTitle name="自然水景"></indexTitle>
           <scroll-view scroll-x="true" class="mt-base scroll">
-            <view
-              class="scroll-item mt-10rpx mr-20rpx"
-              v-for="(item, index) in natural_water_feature"
-              @tap="$u.route('/pages/product_details/index', { skuId: item.id })"
-              :key="index"
-            >
-              <u-image
-                border-radius="15rpx"
-                width="260rpx"
-                height="260rpx"
-                :src="`${item.cover}?x-oss-process=image/resize,w_260/quality,q_90`"
-                :lazy-load="true"
-              ></u-image>
+            <view class="scroll-item mt-10rpx mr-20rpx" v-for="(item, index) in natural_water_feature"
+              @tap="$u.route('/pages/product_details/index', { skuId: item.id })" :key="index">
+              <u-image border-radius="15rpx" width="260rpx" height="260rpx"
+                :src="`${item.cover}?x-oss-process=image/resize,w_260/quality,q_90`" :lazy-load="true"></u-image>
               <view class="text-md w-240rpx line-1 text-hex-bgBase h-40rpx">{{ item.name }}</view>
               <view class="text-md text-txBase">￥{{ item.sell_price }}</view>
               <view class="flex items-center" v-if="item.vip_price">
@@ -198,19 +137,10 @@
         <view class="bg-white m-auto shdow mt-base px-base" v-if="ornamental_creatures.length">
           <indexTitle name="观赏生物"></indexTitle>
           <scroll-view scroll-x="true" class="mt-base scroll">
-            <view
-              class="scroll-item mt-10rpx mr-20rpx"
-              v-for="(item, index) in ornamental_creatures"
-              @tap="$u.route('/pages/product_details/index', { skuId: item.id })"
-              :key="index"
-            >
-              <u-image
-                border-radius="15rpx"
-                width="260rpx"
-                height="260rpx"
-                :src="`${item.cover}?x-oss-process=image/resize,w_260/quality,q_90`"
-                :lazy-load="true"
-              ></u-image>
+            <view class="scroll-item mt-10rpx mr-20rpx" v-for="(item, index) in ornamental_creatures"
+              @tap="$u.route('/pages/product_details/index', { skuId: item.id })" :key="index">
+              <u-image border-radius="15rpx" width="260rpx" height="260rpx"
+                :src="`${item.cover}?x-oss-process=image/resize,w_260/quality,q_90`" :lazy-load="true"></u-image>
               <view class="text-md w-240rpx line-1 text-hex-bgBase h-40rpx">{{ item.name }}</view>
               <view class="text-md text-txBase">￥{{ item.sell_price }}</view>
               <view class="flex items-center" v-if="item.vip_price">
@@ -224,19 +154,10 @@
         <view class="bg-white m-auto shdow mt-base px-base" v-if="coral_aquatic_plants.length">
           <indexTitle name="珊瑚水草"></indexTitle>
           <scroll-view scroll-x="true" class="mt-base scroll">
-            <view
-              class="scroll-item mt-10rpx mr-20rpx"
-              v-for="(item, index) in coral_aquatic_plants"
-              @tap="$u.route('/pages/product_details/index', { skuId: item.id })"
-              :key="index"
-            >
-              <u-image
-                border-radius="15rpx"
-                width="260rpx"
-                height="260rpx"
-                :src="`${item.cover}?x-oss-process=image/resize,w_260/quality,q_90`"
-                :lazy-load="true"
-              ></u-image>
+            <view class="scroll-item mt-10rpx mr-20rpx" v-for="(item, index) in coral_aquatic_plants"
+              @tap="$u.route('/pages/product_details/index', { skuId: item.id })" :key="index">
+              <u-image border-radius="15rpx" width="260rpx" height="260rpx"
+                :src="`${item.cover}?x-oss-process=image/resize,w_260/quality,q_90`" :lazy-load="true"></u-image>
               <view class="text-md w-240rpx line-1 text-hex-bgBase h-40rpx">{{ item.name }}</view>
               <view class="text-md text-txBase">￥{{ item.sell_price }}</view>
               <view class="flex items-center" v-if="item.vip_price">
@@ -250,19 +171,10 @@
         <view class="bg-white m-auto shdow mt-base px-base" v-if="equipment_consumables.length">
           <indexTitle name="设备耗材"></indexTitle>
           <scroll-view scroll-x="true" class="mt-base scroll">
-            <view
-              class="scroll-item mt-10rpx mr-20rpx"
-              v-for="(item, index) in equipment_consumables"
-              @tap="$u.route('/pages/product_details/index', { skuId: item.id })"
-              :key="index"
-            >
-              <u-image
-                border-radius="15rpx"
-                width="260rpx"
-                height="260rpx"
-                :src="`${item.cover}?x-oss-process=image/resize,w_260/quality,q_90`"
-                :lazy-load="true"
-              ></u-image>
+            <view class="scroll-item mt-10rpx mr-20rpx" v-for="(item, index) in equipment_consumables"
+              @tap="$u.route('/pages/product_details/index', { skuId: item.id })" :key="index">
+              <u-image border-radius="15rpx" width="260rpx" height="260rpx"
+                :src="`${item.cover}?x-oss-process=image/resize,w_260/quality,q_90`" :lazy-load="true"></u-image>
               <view class="text-md w-240rpx line-1 text-hex-bgBase h-40rpx">{{ item.name }}</view>
               <view class="text-md text-txBase">￥{{ item.sell_price }}</view>
               <view class="flex items-center" v-if="item.vip_price">
@@ -297,6 +209,8 @@ import popupView from './components/popup-view.vue';
 import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
 import { checkUpdate } from '@/utils/check-update';
 import CartMixin from '@/pages/shop_cart/mixin';
+import { wxMnpLogin } from '@/utils/login'
+
 const defaultBanner = {
   wechat_mini_top_banner: [],
   wechat_mini_recommend_banner: [],
@@ -331,11 +245,11 @@ export default {
         },
         noMoreSize: 1,
       },
-      boutique_books:[],//精品书籍
-      natural_water_feature:[],//自然水景
-      ornamental_creatures:[],//观赏生物
-      coral_aquatic_plants:[],//珊瑚水草
-      equipment_consumables:[]//设备耗材
+      boutique_books: [],//精品书籍
+      natural_water_feature: [],//自然水景
+      ornamental_creatures: [],//观赏生物
+      coral_aquatic_plants: [],//珊瑚水草
+      equipment_consumables: []//设备耗材
     };
   },
   computed: {
@@ -356,23 +270,25 @@ export default {
     return shareObj;
   },
   onLoad(e) {
+    /* #ifdef MP-WEIXIN */
+    wxMnpLogin()
+    /* #endif */
     this.init();
     this.getpopAdver();
-    this.$store.dispatch('user/getUserInfo');
     this.$store.dispatch('user/getNewsNum');
   },
   methods: {
     //新增开始-精品书籍
-    async getrecGoods(){
+    async getrecGoods() {
       return new Promise((resolve, reject) => {
         this.$api
           .get('/v1/product/part', {
             params: {
-              part:'boutique_books',
+              part: 'boutique_books',
             },
           })
           .then((res) => {
-          this.boutique_books=res.data
+            this.boutique_books = res.data
             resolve(res);
           })
           .catch((err) => {
@@ -381,16 +297,16 @@ export default {
       });
     },
     //自然水景
-    async getnatural_water_feature(){
+    async getnatural_water_feature() {
       return new Promise((resolve, reject) => {
         this.$api
           .get('/v1/product/part', {
             params: {
-              part:'natural_water_feature',
+              part: 'natural_water_feature',
             },
           })
           .then((res) => {
-          this.natural_water_feature=res.data
+            this.natural_water_feature = res.data
             resolve(res);
           })
           .catch((err) => {
@@ -399,16 +315,16 @@ export default {
       });
     },
     //观赏生物
-    async getornamental_creatures(){
+    async getornamental_creatures() {
       return new Promise((resolve, reject) => {
         this.$api
           .get('/v1/product/part', {
             params: {
-              part:'ornamental_creatures',
+              part: 'ornamental_creatures',
             },
           })
           .then((res) => {
-          this.ornamental_creatures=res.data
+            this.ornamental_creatures = res.data
             resolve(res);
           })
           .catch((err) => {
@@ -417,16 +333,16 @@ export default {
       });
     },
     //珊瑚水草
-    async getcoral_aquatic_plants(){
+    async getcoral_aquatic_plants() {
       return new Promise((resolve, reject) => {
         this.$api
           .get('/v1/product/part', {
             params: {
-              part:'coral_aquatic_plants',
+              part: 'coral_aquatic_plants',
             },
           })
           .then((res) => {
-          this.coral_aquatic_plants=res.data
+            this.coral_aquatic_plants = res.data
             resolve(res);
           })
           .catch((err) => {
@@ -435,16 +351,16 @@ export default {
       });
     },
     //设备耗材
-    async getequipment_consumables(){
+    async getequipment_consumables() {
       return new Promise((resolve, reject) => {
         this.$api
           .get('/v1/product/part', {
             params: {
-              part:'equipment_consumables',
+              part: 'equipment_consumables',
             },
           })
           .then((res) => {
-          this.equipment_consumables=res.data
+            this.equipment_consumables = res.data
             resolve(res);
           })
           .catch((err) => {
@@ -454,7 +370,7 @@ export default {
     },
     //新增结束
     init() {
-      return Promise.all([this.getHot(), this.getBanner(), this.getRecommend(),this.getrecGoods(),this.getnatural_water_feature(),this.getornamental_creatures(),this.getcoral_aquatic_plants(),this.getequipment_consumables()]);
+      return Promise.all([this.getHot(), this.getBanner(), this.getRecommend(), this.getrecGoods(), this.getnatural_water_feature(), this.getornamental_creatures(), this.getcoral_aquatic_plants(), this.getequipment_consumables()]);
     },
     async downCallback() {
       await this.init();
@@ -553,14 +469,14 @@ export default {
       return this.bannerList[key] ?? [];
     },
     jumpByOption(e) {
-      const whiteRouter = ['/pages/user_sign/index', '/pageA/user_sign/index','/pages/points/swap','/pageB/lucky/index'];
+      const whiteRouter = ['/pages/user_sign/index', '/pageA/user_sign/index', '/pages/points/swap', '/pageB/lucky/index'];
       const tabRouter = ['/pages/sort/index', '/pages/shop_cart/index', '/pages/healthy/index', '/pages/me/me'];
       if (!!e.jump_link) {
         if (e.jump_type == 1) {
           if (tabRouter.findIndex((el) => e.jump_link?.includes(el)) >= 0) {
             const params = this.getParams(e.jump_link);
             // console.log(params);
-            if(Object.keys(params.params).length>0) {
+            if (Object.keys(params.params).length > 0) {
               uni.$emit('jumpTab', params.params)
               uni.switchTab({
                 url: params.path
@@ -579,9 +495,9 @@ export default {
 
     getParams(str) {
       var result = {};
-      const arr =str.split('?')
+      const arr = str.split('?')
       const url = arr[0];
-      if(arr.length>1){
+      if (arr.length > 1) {
         var strParams = arr[1];
         var arrParams = strParams.split('&');
         arrParams.forEach((item) => {
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 7af2b76..c02c1ca 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -61,7 +61,7 @@
 </template>
 <script>
 // import { getWxCode } from '@/utils/login';
-import { wxMnpLogin,getWxCode } from '@/utils/login'
+import { getWxCode } from '@/utils/login'
 import { mapMutations } from 'vuex';
 export default {
   data() {
@@ -115,9 +115,6 @@ export default {
       const { code } = e.detail;
       if(!code) return
       const invite_code = uni.getStorageSync('INVITE_CODE');
-      // if(!this.$store.getters.token){
-      //    await wxMnpLogin(invite_code)
-      // }
       const params = {
         openid: uni.getStorageSync("openid"),
         invite_code: invite_code
diff --git a/src/pages/welcome/index.vue b/src/pages/welcome/index.vue
index f3879db..9673468 100644
--- a/src/pages/welcome/index.vue
+++ b/src/pages/welcome/index.vue
@@ -5,70 +5,77 @@
 </template>
 
 <script>
-  import {
-    strToParams
-  } from '@/utils/tools';
-  import {
-    wxMnpLogin
-  } from '@/utils/login'
-  export default {
-    data() {
-      return {
-        scene: null
-      };
-    },
-    onLoad(e) {
-      const scene = strToParams(decodeURIComponent(e.scene))
-      console.log(scene)
-      this.scene = scene
-      // 清空桌号
-      uni.removeStorageSync('desk');
-      // 优先存储 invite_code
-      if (scene.i) {
-        uni.setStorageSync('INVITE_CODE', scene.i)
-      }
-      // 产品详细页
-      if (scene.p) {
-        uni.reLaunch({
-          url: '/pages/product_details/index?skuId=' + scene.product
-        })
-      }
-      // 扫码下单
-      else if (scene.o) {
-        uni.reLaunch({
-          url: '/pageB/select_product/com_order?id=' + scene.o
-        })
-      }
-      // 线下订单
-      else if (scene.oo) {
-        uni.reLaunch({
-          url: '/pageB/offline_order/user/order_preview?id=' + scene.oo
-        })
-      }
-      // 扫码桌号
-      else if (scene.d) {
-        const desk = scene.d
-        uni.setStorageSync('desk', desk);
-        // 商品分类
-        const id = scene.c
-        // 店铺 id
-        const mid = scene.s
-        uni.reLaunch({
-          url: `/pageB/select_product/search?mid=${mid}&cid=${id}`
-        });
-      }
-      // 会员购买
-      else if (scene.vip) {
-        uni.reLaunch({
-          url: `/pageB/svip/index`
-        });
-      }
-      // 默认跳转首页
-      else {
-        uni.switchTab({
-          url: '/pages/index/index'
-        })
-      }
+import { strToParams } from '@/utils/tools';
+import { wxMnpLogin } from '@/utils/login'
+export default {
+  data() {
+    return {
+      scene: null
+    };
+  },
+  async onLoad(e) {
+    // 先登录
+    /* #ifdef MP-WEIXIN */
+    wxMnpLogin()
+    /* #endif */
+
+    const scene = strToParams(decodeURIComponent(e.scene))
+    console.log(scene)
+    this.scene = scene
+    // 清空桌号
+    uni.removeStorageSync('desk');
+    // 优先存储 invite_code
+    if (scene.i) {
+      uni.setStorageSync('INVITE_CODE', scene.i)
+    }
+    // 产品详细页
+    if (scene.p) {
+      uni.reLaunch({
+        url: '/pages/product_details/index?skuId=' + scene.product
+      })
+    }
+    // 扫码下单
+    else if (scene.o) {
+      uni.reLaunch({
+        url: '/pageB/select_product/com_order?id=' + scene.o
+      })
+    }
+    // 线下订单
+    else if (scene.oo) {
+      uni.reLaunch({
+        url: '/pageB/offline_order/user/order_preview?id=' + scene.oo
+      })
+    }
+    // 扫码桌号
+    else if (scene.d) {
+      const desk = scene.d
+      uni.setStorageSync('desk', desk);
+      // 商品分类
+      const id = scene.c
+      // 店铺 id
+      const mid = scene.s
+      uni.reLaunch({
+        url: `/pageB/select_product/search?mid=${mid}&cid=${id}`
+      });
+    }
+    // 会员购买
+    else if (scene.vip) {
+      uni.reLaunch({
+        url: `/pageB/svip/index`
+      });
+    }
+    // 抽奖活动 scene=draw%3D1
+    else if (scene.draw) {
+      uni.reLaunch({
+        url: '/pageB/lucky/index?id=' + scene.draw
+      });
+    }
+    // 默认跳转首页
+    else {
+      uni.switchTab({
+        url: '/pages/index/index'
+      })
     }
   }
+}
 </script>
diff --git a/src/static/images/almost-lottery__action.png b/src/static/images/almost-lottery__action.png
deleted file mode 100644
index 2e221a4b957d156001da5ce190067e07b29cc885..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4234
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

diff --git a/src/static/images/almost-lottery__bg.png b/src/static/images/almost-lottery__bg.png
deleted file mode 100644
index be3936730215d4a9f3bfc1aeaefe66767e582a73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3398
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

diff --git a/src/utils/login.js b/src/utils/login.js
index d021f6b..cca68c2 100644
--- a/src/utils/login.js
+++ b/src/utils/login.js
@@ -1,6 +1,4 @@
-import {
-  http
-} from '@/utils/request'
+import { http } from '@/utils/request'
 
 import store from '@/store'
 
@@ -19,28 +17,22 @@ export function getWxCode() {
 }
 
 //小程序静默登录
-export async function wxMnpLogin(invite_code){
-  store.commit('user/LOGOUT')
-  const code = await getWxCode()
-  invite_code=invite_code?invite_code: uni.getStorageSync('INVITE_CODE')
- await silentLogin({code,invite_code})
+export async function wxMnpLogin(invite_code) {
+	// 判断是否有 auth_token
+	var token = store.getters.token
+	if (token) {
+		// 获取 当前用户信息
+		await store.dispatch('user/getUserInfo', false)
+		return;
+	}
+	// 没有 auth_token, 再调用 wx.login 登录
+	store.commit('user/LOGOUT')
+	const code = await getWxCode()
+	invite_code = invite_code ? invite_code : uni.getStorageSync('INVITE_CODE')
+
+	const resData = await http.post(`/v1/wechat-mini/login`, { code, invite_code }, { custom: { toast: false } })
+	uni.setStorageSync("openid", resData.openid)
+	if (resData.token) {
+		store.commit('user/LOGIN', resData.token)
+	}
 }
-
-
-async function silentLogin(data){
-  // const provider = 'wechat-mini'
-  // const resData = await http.post(`/v1/socialite/code-auth/${provider}`,data,{
-  //   custom:{
-  //     toast:false
-  //   }
-  // })
-  const resData = await http.post(`/v1/wechat-mini/login`,data,{
-    custom:{
-      toast:false
-    }
-  })
-  uni.setStorageSync("openid", resData.openid)
-  if (resData.token) {
-    store.commit('user/LOGIN', resData.token)
-  }
- }