From 2b4bc67e22782e87bf7df0aa32b5e5c99de8ef54 Mon Sep 17 00:00:00 2001
From: Wen Fangping <front_wenfp@163.com>
Date: Thu, 10 Mar 2022 15:03:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=8E=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/everyday-donation/index.vue | 9 ++++++---
 src/pages/goods-detail/index.vue      | 8 ++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/pages/everyday-donation/index.vue b/src/pages/everyday-donation/index.vue
index 25e4992..0c3c1b8 100644
--- a/src/pages/everyday-donation/index.vue
+++ b/src/pages/everyday-donation/index.vue
@@ -53,7 +53,7 @@
             </div>
         </div>
         <div class="merit-button-group border-top">
-            <button class="merit-button" @click="showSpec = true">去行善</button>
+            <button class="merit-button" @click="onHasLoginToNext">去行善</button>
         </div>
 
         <van-popup v-model="showSpec" position="bottom" closeable :style="{ height: 'auto' }" safe-area-inset-bottom :close-on-click-overlay="false" :close-on-popstate="true">
@@ -149,7 +149,7 @@
 <script>
 import 'swiper/css/swiper.css'
 import { swiper, swiperSlide } from 'vue-awesome-swiper'
-import { getDynamicData, getGoodsDetail } from '@/api';
+import { getDynamicData, getGoodsDetail, hasLogin } from "@/api";
 
 export default {
     components: {
@@ -218,7 +218,10 @@ export default {
         
     },
     methods: {
-
+        async onHasLoginToNext(){
+            await hasLogin();
+            this.showSpec = true
+        },
         isDisabled(spec){
             const { id } = spec;
             if(!this.onlySpecs) return false;
diff --git a/src/pages/goods-detail/index.vue b/src/pages/goods-detail/index.vue
index 50a2815..9bacb96 100644
--- a/src/pages/goods-detail/index.vue
+++ b/src/pages/goods-detail/index.vue
@@ -42,7 +42,7 @@
         </div>
 
         <fixed-bottom ref="fixedBottom">
-            <button class="merit-button" @click="showSpec = true">{{data.pay_name}}</button>
+            <button class="merit-button" @click="onHasLoginToNext">{{data.pay_name}}</button>
         </fixed-bottom>
 
         <van-popup v-model="showSpec" position="bottom" closeable :style="{ height: 'auto' }" safe-area-inset-bottom :close-on-click-overlay="false" :close-on-popstate="true">
@@ -76,7 +76,7 @@
 <script>
 import 'swiper/css/swiper.css'
 import { swiper, swiperSlide } from 'vue-awesome-swiper'
-import { getGoodsDetail, getOrderCompare } from '@/api';
+import { getGoodsDetail, getOrderCompare, hasLogin } from "@/api";
 import SelectSpec from './components/select-spec.vue'
 import FillInformation from './components/fill-information.vue';
 
@@ -145,6 +145,10 @@ export default {
         this.getGoodsDetail('common');
     },
     methods: {
+        async onHasLoginToNext(){
+            await hasLogin();
+            this.showSpec = true
+        },
         // 接收随喜金额
         onReceiveAnyAmount(anyObj){
             this.anyPrice = anyObj.money;