From 17646d19b0a7b5b8bcd706e006f2610403adc1f3 Mon Sep 17 00:00:00 2001
From: h30830569 <30830569@qq.com>
Date: Mon, 6 Jun 2022 17:13:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=B7=BB=E5=8A=A0=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                              |   1 +
 src/components/spec-popup/spec-popup.vue |  16 +-
 src/pageB/lucky/index.vue                | 189 +++++++++++++----------
 src/pages/login/index.vue                |  22 ++-
 src/store/modules/user.js                |  10 +-
 src/utils/login.js                       |   2 +-
 6 files changed, 146 insertions(+), 94 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index cb8a3c2..24741d8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -29,6 +29,7 @@ export default {
     // #endif
   },
   onShow: function (option) {
+    console.log(option);
     let invite_code = option.query.invite_code || strToParams(decodeURIComponent(option.query.scene)).invite_code
      uni.setStorageSync('INVITE_CODE',invite_code)
   },
diff --git a/src/components/spec-popup/spec-popup.vue b/src/components/spec-popup/spec-popup.vue
index c54b3d5..294cb7b 100644
--- a/src/components/spec-popup/spec-popup.vue
+++ b/src/components/spec-popup/spec-popup.vue
@@ -2,7 +2,7 @@
   <cu-popup v-model="show" mode="bottom" border-radius="20" closeable close-icon-size="24">
     <view class="px-40rpx mt-40rpx">
       <view class="flex py-base">
-        <image class="flex-none rounded-20rpx w-200rpx h-200rpx" :src="sku.cover" mode="aspectFill"></image>
+        <image  @tap="previewImage(sku.cover)" class="flex-none rounded-20rpx w-200rpx h-200rpx" :src="sku.cover" mode="aspectFill"></image>
         <view class="flex flex-col justify-end ml-40rpx">
           <view class="font-bold text-hex-FF0200 mr-36rpx text-52rpx"> {{ sku.sell_price }} </view>
           <view class="mt-10rpx text-28rpx"> 会员价：{{ sku.vip_price }} </view>
@@ -20,12 +20,12 @@
               <view class="inline-block mr-24rpx mb-16rpx" v-for="(spce,index2) in item.items" :key="index2">
                 <view
                   @tap="onChangeSku(spce, item.items)"
-                  :class="spce.selected?'text-hex-FF0000 bg-hex-FDF2EC':'text-hex-333333 bg-hex-F8F8F8'"
+                  :class="spce.selected?'text-hex-FF0000 bg-hex-FDF2EC border border-solid border-hex-FF0000':'text-hex-333333 bg-hex-F8F8F8 border border-solid border-hex-F8F8F8'"
                   :text="spce.name"
                   class="cu-tag"
                   :disabled="spce.sku_id == 0"
                   :color="spce.selected ? '#FF0000' : '#333333'"
-                  :bg-color="spce.selected ? '#FDF2EC' : '#F8F8F8'"
+                
                   :border-color="spce.selected ? '#FDF2EC' : '#F8F8F8'"
                   shape="circle"
                 >{{spce.name}}
@@ -187,13 +187,19 @@ export default {
       if (this.isOutStock) return this.$u.toast('超出库存');
       this.$emit(type, this.sku);
     },
+    //图片预览
+    previewImage(url){
+      uni.previewImage({
+         urls: [url],
+      })
+    }
   },
 };
 </script>
 <style lang="scss">
 .cu-tag{
   font-size: 30rpx;
-  border-radius: 30rpx;
-  padding:10rpx 25rpx;
+  border-radius: 15rpx;
+  padding:10rpx 40rpx;
 }
 </style>
diff --git a/src/pageB/lucky/index.vue b/src/pageB/lucky/index.vue
index 5e4912d..b8c6002 100644
--- a/src/pageB/lucky/index.vue
+++ b/src/pageB/lucky/index.vue
@@ -1,9 +1,9 @@
 <template>
   <view class="h-full">
-    <loading-view v-if="isFirstLoading"></loading-view>
+    <loading-view v-if="isFirstLoading && isLogin "></loading-view>
     <view
       class="bg min-h-full overflow-hidden"
-      v-else
+       v-else-if="isLogin" 
       :style="{ backgroundImage: `url(${draw_activity.bg_image})`, backgroundColor: draw_activity.bg_color }"
     >
       <view class="">
@@ -22,79 +22,79 @@
         </view>
         <view class="w-full" :style="{ height: 50 + statusBarHeight + 'px' }"> </view>
       </view>
-      <view class="h-300rpx w-full"></view>
-      <view class="w-full relative">
-        <view class="h-100rpx"></view>
-        <view class="absolute top-0 z-9 left-0 px-30rpx message w-full">
-          <view class="h-180rpx">
-            <swiper
-              vertical="vertical"
-              autoplay="play"
-              class="h-full"
-              previous-margin="60rpx"
-              next-margin="60rpx"
-              disable-touch
-              @change="change"
-              circular
-              :current="current"
-            >
-              <swiper-item v-for="(item, index) in logsAll" :key="index" class="h-full flex items-start flex-col justify-center">
-                <view
-                  class="bg-hex-000 bg-opacity-30 text-white rounded-full px-20px h-44rpx leading-44rpx text-28rpx inline-block"
-                  :class="index == current ? 'opacity1' : index + 1 == current ? 'opacity0' : index - 1 == current ? 'opacity2' :(current==logsAll.length-1 && index==0)?'opacity2' :  'opacity3'"
-                >
-                  <text
-                    >恭喜{{ item.user.nickname }}抽中<text class="text-hex-ffde58">{{ item.prize.name }}</text></text
-                  >
-                </view>
-              </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"
-          :str-font-size="18"
-          :strFontColors="['#fb6056']"
-          :colors="['#ffeaa7', '#ffeaa7']"
-          :stroked="true"
-          :img-width="120"
-          :img-height="120"
-          :imgMarginStr="30"
-          :strMarginOutside="16"
-          :canvasCached="true"
-          :lotteryBg="lotteryBg"
-          :actionBg="actionBg"
-        />
-        <view class="text-center mt-40rpx"
-          >今天还可以抽 <text class="text-error">{{ freeNum }}</text> 次</view
-        >
-      </view>
-
-      <block>
-        <view class="p-30rpx">
-          <u-parse :html="draw_activity.desc"></u-parse>
-        </view>
-      </block>
-
+     
+         <view class="h-300rpx w-full"></view>
+         <view class="w-full relative">
+           <view class="h-100rpx"></view>
+           <view class="absolute top-0 z-9 left-0 px-30rpx message w-full">
+             <view class="h-180rpx">
+               <swiper
+                 vertical="vertical"
+                 autoplay="play"
+                 class="h-full"
+                 previous-margin="60rpx"
+                 next-margin="60rpx"
+                 disable-touch
+                 @change="change"
+                 circular
+                 :current="current"
+               >
+                 <swiper-item v-for="(item, index) in logsAll" :key="index" class="h-full flex items-start flex-col justify-center">
+                   <view
+                     class="bg-hex-000 bg-opacity-30 text-white rounded-full px-20px h-44rpx leading-44rpx text-28rpx inline-block"
+                     :class="index == current ? 'opacity1' : index + 1 == current ? 'opacity0' : index - 1 == current ? 'opacity2' :(current==logsAll.length-1 && index==0)?'opacity2' :  'opacity3'"
+                   >
+                     <text
+                       >恭喜{{ item.user.nickname }}抽中<text class="text-hex-ffde58">{{ item.prize.name }}</text></text
+                     >
+                   </view>
+                 </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"
+             :str-font-size="18"
+             :strFontColors="['#fb6056']"
+             :colors="['#ffeaa7', '#ffeaa7']"
+             :stroked="true"
+             :img-width="120"
+             :img-height="120"
+             :imgMarginStr="30"
+             :strMarginOutside="16"
+             :canvasCached="true"
+             :lotteryBg="lotteryBg"
+             :actionBg="actionBg"
+           />
+           <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>
+         </block>
       <u-mask :show="show">
         <view class="flex items-center justify-center h-full">
           <view class="">
@@ -230,6 +230,9 @@ export default {
     };
   },
   computed: {
+    user() {
+      return this.$store.getters.user ?? {};
+    },
     isApple() {
       return uni.getSystemInfoSync().platform === 'ios';
     },
@@ -242,16 +245,44 @@ export default {
   },
   async onLoad({ id }) {
     this.id = id;
-    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)
+  },
+ 
+  //微信分享
+  onShareAppMessage(res) {
+    let code = this.user.code ? this.user.code : '';
+    let shareObj = {
+      title: this.draw_activity.name,
+      path: `/pageB/lucky/index?id=${this.id}&invite_code=${code}`,
+      imageUrl: this.draw_activity.bg_image,
+    };
+    return shareObj;
   },
-
   methods: {
     change(e) {
       this.current = e.detail.current;
     },
     onBack() {
-      uni.navigateBack();
+      const pages = getCurrentPages()
+      const prevPage = pages[pages.length - 2]
+      if(prevPage){
+        uni.navigateBack({})
+      }else{
+        uni.switchTab({
+          url:'/pages/index/index'
+        })
+      }
+      // uni.navigateBack();
     },
     async getConfig() {
       try {
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index a719990..bdfff27 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -62,13 +62,15 @@
   </view>
 </template>
 <script>
-import { getWxCode } from '@/utils/login';
+// import { getWxCode } from '@/utils/login';
+import { wxMnpLogin,getWxCode } from '@/utils/login'
 import { mapMutations } from 'vuex';
 export default {
   data() {
     return {
       check: false,
       code:'',
+      redirec:null,
       form: {
         phone: '',
         password: '',
@@ -95,7 +97,10 @@ export default {
   onReady() {
     // this.$refs.uForm.setRules(this.rules);
   },
- async onLoad({ type, phone }) {
+ async onLoad({ type, phone,redirec}) {
+   
+  
+    this.redirec = redirec
     this.form.phone = phone ?? '';
     /* #ifdef MP-WEIXIN */
     this.code = await getWxCode();
@@ -115,14 +120,23 @@ export default {
       if(!code) return
       const invite_code = uni.getStorageSync('INVITE_CODE');
       // const code = await getWxCode();
+      if(!this.$store.getters.token){
+         await wxMnpLogin()
+      }
       const params = {}
       if(!!invite_code) params.inviter_code = invite_code
+      console.log(params.inviter_code);
       const resData = await this.$api.post('/v1/wechat-mini/bind-phone', {
         code:code,
         ...params
       });
-      this.LOGIN(resData.token);
-      uni.navigateBack({
+      await this.LOGIN(resData.token);
+      // await this.LOGIN('555|bZL3mr19Tpgs4jRvpKkguoH865lL2zGLa35WdU7Z')
+      if(!!this.redirec) this.$u.route({
+        type:'redirectTo',
+        url:decodeURIComponent(this.redirec)
+      })
+      else uni.navigateBack({
         delta: 1,
       });
     },
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 7709afd..787dcfe 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -25,17 +25,17 @@ const mutations = {
   RESET_STATE: (state) => {
     Object.assign(state, getDefaultState())
   },
-  LOGIN(state, value) {
-		this.commit('user/SET_TOKEN',value)
-		this.dispatch('user/getUserInfo',false)
+  async LOGIN(state, value) {
+		await this.commit('user/SET_TOKEN',value)
+		await this.dispatch('user/getUserInfo',false)
 	},
   LOGOUT(){
     return this.dispatch('user/resetToken')
   },
   // 登录
-  SET_TOKEN(state, value) {
+  async SET_TOKEN(state, value) {
     state.token = value
-    uni.setStorageSync(TOKEN, value);
+   await uni.setStorageSync(TOKEN, value);
   },
   //获取用户信息
   SET_USERINFO(state, value) {
diff --git a/src/utils/login.js b/src/utils/login.js
index 268fc5f..07a5253 100644
--- a/src/utils/login.js
+++ b/src/utils/login.js
@@ -22,7 +22,7 @@ export function getWxCode() {
 export async function wxMnpLogin(){
   store.commit('user/LOGOUT')
   const code = await getWxCode()
-  silentLogin({code})
+ await silentLogin({code})
 }