u

nova-tourism/components/collect/index.js

@@ -163,7 +163,7 @@ Component({
       console.log(currentUser);
       let ShopStore = new Parse.Query('DramaShopCollect');
       ShopStore.equalTo('company', company);
-      ShopStore.equalTo('user', currentUser.id);
+      ShopStore.equalTo('user', currentUser?.id);
       ShopStore.equalTo('isCollect', 'true');
       ShopStore.notEqualTo('isDeleted', "true");
       ShopStore.include('homestayStore');

nova-tourism/components/my/index.js

@@ -2,56 +2,57 @@
 let Parse = getApp().Parse;
 const company = getApp().globalData.company
 const auth = require('../../service/auth.service')
+const login = require("../../../utils/login");
 
 Component({
-    /**
-     * 组件的属性列表
-     */
-    properties: {
+  /**
+   * 组件的属性列表
+   */
+  properties: {
 
-    },
+  },
 
-    /**
-     * 组件的初始数据
-     */
-    data: {
-        statusBarHeight: 0,
-        screenHeight: 0,
-        customHeight: 0,
-        bottomNavHeight: 0,
-        contentHeight: 0,
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    statusBarHeight: 0,
+    screenHeight: 0,
+    customHeight: 0,
+    bottomNavHeight: 0,
+    contentHeight: 0,
 
-        uid:null,
-        User1List:[],
-    },
-    lifetimes: {
-        detached: function () {},
-        attached: async function () {
-            const systemInfo = wx.getSystemInfoSync();
-            const statusBarHeight = systemInfo.statusBarHeight || 0;
-            const screenHeight = systemInfo.screenHeight || 0;
-            const custom = wx.getMenuButtonBoundingClientRect();
-            const customHeight = custom.height + 10 + 2 || 0;
-            const bottomNavHeight = systemInfo.screenHeight - systemInfo.safeArea.bottom || 0;
+    uid: null,
+    User1List: [],
+  },
+  lifetimes: {
+    detached: function () {},
+    attached: async function () {
+      const systemInfo = wx.getSystemInfoSync();
+      const statusBarHeight = systemInfo.statusBarHeight || 0;
+      const screenHeight = systemInfo.screenHeight || 0;
+      const custom = wx.getMenuButtonBoundingClientRect();
+      const customHeight = custom.height + 10 + 2 || 0;
+      const bottomNavHeight = systemInfo.screenHeight - systemInfo.safeArea.bottom || 0;
 
-            const contentHeight = (screenHeight - bottomNavHeight - 50 - statusBarHeight - customHeight) * 750 / systemInfo.windowWidth;
-            this.setData({
-                statusBarHeight,
-                screenHeight,
-                customHeight,
-                bottomNavHeight,
-                contentHeight,
-                uid:Parse.User.current()?.id
-            });
-            this.getname()
-        },
+      const contentHeight = (screenHeight - bottomNavHeight - 50 - statusBarHeight - customHeight) * 750 / systemInfo.windowWidth;
+      this.setData({
+        statusBarHeight,
+        screenHeight,
+        customHeight,
+        bottomNavHeight,
+        contentHeight,
+        uid: Parse.User.current()?.id
+      });
+      this.getname()
     },
+  },
 
-    /**
-     * 组件的方法列表
-     */
-    methods: {
-      /**退出登录 */
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    /**退出登录 */
     outLogin() {
       wx.showModal({
         title: '提示',
@@ -70,50 +71,74 @@ Component({
         complete: () => {}
       });
     },
-        gourl(e) {
-            const url = e.currentTarget.dataset.url;
-            wx.navigateTo({
-                url: `${url}`,
-            });
-        },
-        //获取头像名称
-        async getname(){
-            const currentUser = Parse.User.current();
-            let Userquery = new Parse.Query('_User');
-            Userquery.equalTo('company', company);
-            Userquery.equalTo('objectId', currentUser.id);
-            Userquery.notEqualTo('isDeleted', true)
-            let P2 = await Userquery.find();
-            let User1List = P2.map(item => item.toJSON());
-            this.setData({
-                User1List
-            })
-            console.log(this.data.User1List);
-        },
-        //我是商户
-        merchant() {
-            let merchant = wx.getStorageSync('merchant');
-            if (merchant) {
-                wx.navigateTo({
-                    url: '/nova-tourism/pages/my/merchant/merchant-home/index'
-                });
-            } else {
-                wx.navigateTo({
-                    url: '/nova-tourism/pages/my/merchant/login/index'
-                });
-            }
-        },
-        goorder(e){
-            const url = e.currentTarget.dataset.url;
-            const active = e.currentTarget.dataset.active;
-            wx.navigateTo({
-                url: `${url}?active=`+active,
-            });
-        },
-        gorefund(){
-            wx.navigateTo({
-                url: '../../pages/my/my-order/my-refund/index',
-            });
-        }
+    gourl(e) {
+      let userInfo = wx.getStorageSync("userLogin");
+      if (userInfo == ''||!userInfo) {
+        console.log(userInfo);
+        login.loginNow()
+        return
+      }
+      const url = e.currentTarget.dataset.url;
+      wx.navigateTo({
+        url: `${url}`,
+      });
+    },
+    //获取头像名称
+    async getname() {
+      const currentUser = Parse.User.current();
+      let Userquery = new Parse.Query('_User');
+      Userquery.equalTo('company', company);
+      Userquery.equalTo('objectId', currentUser.id);
+      Userquery.notEqualTo('isDeleted', true)
+      let P2 = await Userquery.find();
+      let User1List = P2.map(item => item.toJSON());
+      this.setData({
+        User1List
+      })
+      console.log(this.data.User1List);
+    },
+    //我是商户
+    merchant() {
+      let userInfo = wx.getStorageSync("userLogin");
+      if (userInfo == ''||!userInfo) {
+        console.log(userInfo);
+        login.loginNow()
+        return
+      }
+      let merchant = wx.getStorageSync('merchant');
+      if (merchant) {
+        wx.navigateTo({
+          url: '/nova-tourism/pages/my/merchant/merchant-home/index'
+        });
+      } else {
+        wx.navigateTo({
+          url: '/nova-tourism/pages/my/merchant/login/index'
+        });
+      }
+    },
+    goorder(e) {
+      let userInfo = wx.getStorageSync("userLogin");
+      if (userInfo == ''||!userInfo) {
+        console.log(userInfo);
+        login.loginNow()
+        return
+      }
+      const url = e.currentTarget.dataset.url;
+      const active = e.currentTarget.dataset.active;
+      wx.navigateTo({
+        url: `${url}?active=` + active,
+      });
+    },
+    gorefund() {
+      let userInfo = wx.getStorageSync("userLogin");
+      if (userInfo == ''||!userInfo) {
+        console.log(userInfo);
+        login.loginNow()
+        return
+      }
+      wx.navigateTo({
+        url: '../../pages/my/my-order/my-refund/index',
+      });
     }
-})
+  }
+})

nova-tourism/pages/collect/collect-detail/index.js

@@ -3,6 +3,8 @@ let Parse = getApp().Parse;
 const company = getApp().globalData.company
 const uid = Parse.User.current()?.id
 let sev = require('../../../service/request')
+const login = require("../../../../utils/login");
+
 Page({
 
   /**
@@ -111,6 +113,13 @@ Page({
 
   /** 打开规格弹框*/
   openSpec() {
+    let userInfo = wx.getStorageSync("userLogin");
+    if ( userInfo == ''||!userInfo) {
+      console.log(userInfo);
+      login.loginNow()
+      return
+    }
+    
     let {
       spec
     } = this.data
@@ -616,6 +625,12 @@ preview(e){
 },
   /** 跳转*/
   tourl(e) {
+    let userInfo = wx.getStorageSync("userLogin");
+    if ( userInfo == ''||!userInfo) {
+      console.log(userInfo);
+      login.loginNow()
+      return
+    }
     const url = e.currentTarget.dataset.url
     wx.navigateTo({
       url: `${url}` // 目标页面的路径

nova-tourism/pages/homestay/homestay-detail/index.js

@@ -6,6 +6,7 @@ const dateF = require("../../../../utils/date")
 let sev = require("../../../service/request")
 const uid = Parse.User.current()?.id
 const req = require('../../../../utils/request')
+const login = require("../../../../utils/login");
 
 Page({
 
@@ -227,6 +228,12 @@ Page({
   },
   /** 点击预定*/
   navigate(e) {
+    let userInfo = wx.getStorageSync("userLogin");
+    if ( userInfo == ''||!userInfo) {
+      console.log(userInfo);
+      login.loginNow()
+      return
+    }
     const {
       index
     } = e.currentTarget.dataset;
@@ -245,12 +252,19 @@ Page({
     }
     let date_start = dateF.formatTime("YYYY-mm-dd", start)
     let date_end = dateF.formatTime("YYYY-mm-dd", end)
+    
     wx.navigateTo({
       url: `../homestay-order2/index?objectId=${roomList[index].objectId}&date_start=${date_start}&date_end=${date_end}`
     })
   },
   /** 点击预定*/
   navigatePopup() {
+    let userInfo = wx.getStorageSync("userLogin");
+    if ( userInfo == ''||!userInfo) {
+      console.log(userInfo);
+      login.loginNow()
+      return
+    }
     let {
       start,
       end,
@@ -291,6 +305,12 @@ Page({
   },
   /**拨打电话 */
   phone() {
+    let userInfo = wx.getStorageSync("userLogin");
+    if ( userInfo == ''||!userInfo) {
+      console.log(userInfo);
+      login.loginNow()
+      return
+    }
     let phone = this.data.shopStore.mobile
     wx.makePhoneCall({
       phoneNumber: phone
@@ -331,6 +351,12 @@ preview(e){
 },
   /** 跳转*/
   tourl(e) {
+    let userInfo = wx.getStorageSync("userLogin");
+    if ( userInfo == ''||!userInfo) {
+      console.log(userInfo);
+      login.loginNow()
+      return
+    }
     const url = e.currentTarget.dataset.url
     wx.navigateTo({
       url: `${url}` // 目标页面的路径

nova-tourism/pages/index/index.js

@@ -46,12 +46,7 @@ Page({
 
   async onChange(event) {
     let currentIndex = event.detail;
-    let userInfo = wx.getStorageSync("userLogin");
-    if (currentIndex != 0 && userInfo == '') {
-      console.log(userInfo);
-      login.loginNow()
-      return
-    }
+   
     this.setData({
       active: currentIndex
     })

nova-tourism/service/request.js

@@ -52,7 +52,7 @@ async function getAddress() {
     query.equalTo('objectId', addressId)
   } else {
     let user = Parse.User.current();
-    query.equalTo("user", user.id);
+    query.equalTo("user", user?.id);
     query.descending("is_default")
   }
   let res = await query.first()