From 51e6d988279008c9e66b709bb32e6d40e577ab84 Mon Sep 17 00:00:00 2001
From: lanzhihui <503792708@qq.com>
Date: Mon, 16 Jun 2025 10:06:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=AE=A1=E6=A0=B8=20?=
 =?UTF-8?q?=E5=BC=BA=E5=88=B6=E7=99=BB=E5=BD=95=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app.wpy                         |  2 +-
 src/components/UnlockingDialog.wpy  | 15 +++++++++--
 src/components/dynamicDiscuss.wpy   |  7 ++++-
 src/components/dynamicList.wpy      | 16 +++++------
 src/pages/dynamic/dynamicDetail.wpy | 20 +++++++++++---
 src/pages/dynamic/issue.wpy         |  4 +++
 src/pages/tabBar/dynamic.wpy        |  8 +++---
 src/pages/tabBar/home.wpy           | 23 +++++++++++-----
 src/pages/tabBar/news.wpy           |  8 +++---
 src/pages/tabBar/user.wpy           | 30 ++++++++++-----------
 src/pages/users/myCertification.wpy | 41 +++++++++++++++++++----------
 src/pages/users/setTing.wpy         | 19 ++++++++++---
 src/pages/users/upgradeVIP.wpy      | 18 ++++++++++---
 src/pages/users/upgradeVIP2.wpy     | 20 +++++++++++---
 14 files changed, 163 insertions(+), 68 deletions(-)

diff --git a/src/app.wpy b/src/app.wpy
index eb1bbbf..900ceff 100644
--- a/src/app.wpy
+++ b/src/app.wpy
@@ -35,7 +35,7 @@ wepy.app({
     }
   },
   globalData: {
-    versions: 'v5.5.98', // 版本号
+    versions: 'v5.5.99', // 版本号
     navBarHeight: 0, // 导航栏高度
     navRight: 0, // 胶囊距右方间距（方保持左、右间距一致）
     navTop: 0, // 胶囊距顶部间距
diff --git a/src/components/UnlockingDialog.wpy b/src/components/UnlockingDialog.wpy
index 5265fd4..a9b3153 100644
--- a/src/components/UnlockingDialog.wpy
+++ b/src/components/UnlockingDialog.wpy
@@ -79,6 +79,8 @@
             </view>
             </view>
         </view>
+      <loginDialog :loginShow="loginShow" @hiddenLogin="hiddenLogin"></loginDialog>
+
     </view>
 </template>
 <script>
@@ -116,8 +118,8 @@ import https from '../mixins/https'
     active: 1,
     selectedVal: '',
     rankList: [],
-    payId: ''
-
+    payId: '',
+    loginShow: false
   },
   watch: {
     modalName(e) {
@@ -177,7 +179,16 @@ import https from '../mixins/https'
       this.active = index
       this.payId = val
     },
+    hiddenLogin() {
+      let vm = this
+      vm.loginShow = false
+    },
     conversion(item) {
+      // 校验是否完成注册资料
+      if (!this.$signInVerify()) {
+        this.$emit('signInVerify')
+        return
+      }
       let that = this,
         url = `${service.host}/rank/buy`
       that.modalName = ''
diff --git a/src/components/dynamicDiscuss.wpy b/src/components/dynamicDiscuss.wpy
index 86eb63c..ed054da 100644
--- a/src/components/dynamicDiscuss.wpy
+++ b/src/components/dynamicDiscuss.wpy
@@ -364,12 +364,17 @@
       showReplyView: true,
       inputBoxH: 86,
       modalName: '',
-        userInfo: {}
+        userInfo: {},
+      loginShow: false
     },
     mixins: [https, base],
     methods: {
       // 评论
       send() {
+        if (!this.$signInVerify()) {
+          this.$emit('signInVerify')
+          return
+        }
         let vm = this
         let comment = vm.replyId ? vm.inputVal.split(`回复@${vm.name}：`)[1] : vm.inputVal
         let data = {
diff --git a/src/components/dynamicList.wpy b/src/components/dynamicList.wpy
index a344724..4a15729 100644
--- a/src/components/dynamicList.wpy
+++ b/src/components/dynamicList.wpy
@@ -406,10 +406,10 @@ scroll-view {
       jumpPath(url, type) {
         let vm = this
         // 校验是否完成注册资料
-        if (!vm.$signInVerify()) {
-          vm.$emit('signInVerify')
-          return
-        }
+        // if (!vm.$signInVerify()) {
+        //   vm.$emit('signInVerify')
+        //   return
+        // }
         console.log(vm.from, url, type, '7777')
         if (vm.from != 'dynamic' && vm.from != 'myDynamic' && type != 'vote' && vm.from != 'hotTopic') {
             console.log('44---')
@@ -421,10 +421,10 @@ scroll-view {
         jumpPathV2(url, type) {
             let vm = this
             // 校验是否完成注册资料
-            if (!vm.$signInVerify()) {
-                vm.$emit('signInVerify')
-                return
-            }
+            // if (!vm.$signInVerify()) {
+            //     vm.$emit('signInVerify')
+            //     return
+            // }
             console.log(vm.from, url, type, '7777')
             if (vm.from != 'dynamicDetail' && vm.from != 'dynamic') {
                 console.log('44---')
diff --git a/src/pages/dynamic/dynamicDetail.wpy b/src/pages/dynamic/dynamicDetail.wpy
index ca51a3b..9cbc1e0 100644
--- a/src/pages/dynamic/dynamicDetail.wpy
+++ b/src/pages/dynamic/dynamicDetail.wpy
@@ -11,7 +11,9 @@ page {
   <!--动态操作功能，selectData选择的动态数据、selectIndex选中的动态下标、admin是否管理员、from来自哪个父组件-->
   <dynamicOperation :selectData="selectData" :chooseShow.sync="chooseShow" :selectIndex="selectIndex" :admin="admin" :from="'home'"  @hideModal="hideModal" @changeOperation="changeOperation"></dynamicOperation>
   <!--评论数据-->
-  <dynamicDiscuss :list="list" :detail="detail" @getList="getList" @changLiker="changLiker" :type="'dynamic'"  @deleteComment="deleteComment"></dynamicDiscuss>
+  <dynamicDiscuss :list="list" :detail="detail" @getList="getList" @changLiker="changLiker" :type="'dynamic'" @signInVerify="signInVerify"  @deleteComment="deleteComment"></dynamicDiscuss>
+  <loginDialog :loginShow="loginShow" @hiddenLogin="hiddenLogin"></loginDialog>
+
 </template>
 
 <script>
@@ -32,7 +34,9 @@ wepy.page({
     selectIndex: null,
     detail: {},
     dynamicList: [],
-    list: [] // 评论列表数据
+    list: [], // 评论列表数据
+    loginShow: false
+
   },
    async onShareAppMessage(res) {
         let that = this
@@ -68,6 +72,14 @@ wepy.page({
         }
     },
   methods: {
+    signInVerify() {
+      let vm = this
+      vm.loginShow = true
+    },
+    hiddenLogin() {
+      let vm = this
+      vm.loginShow = false
+    },
     getDetail() {
       let vm = this
       vm.$get({url: `${service.host}/moment/${vm.id}`}).then(({code, data}) => {
@@ -183,6 +195,8 @@ usingComponents: {
 dynamicList: '~@/components/dynamicList',
 dynamicOperation: '~@/components/dynamicOperation',
 dynamicDiscuss: '~@/components/dynamicDiscuss',
-}
+  loginDialog: '~@/components/loginDialog',
+
+  }
 }
 </config>
diff --git a/src/pages/dynamic/issue.wpy b/src/pages/dynamic/issue.wpy
index 65225fb..9158d2d 100644
--- a/src/pages/dynamic/issue.wpy
+++ b/src/pages/dynamic/issue.wpy
@@ -349,6 +349,10 @@ wepy.page({
   methods: {
     saveIssue() {
       let vm = this
+      if (!vm.$signInVerify()) {
+        vm.loginShow = true
+        return
+      }
       let data = {
         topic_id: vm.id * 1,
         content: vm.value,
diff --git a/src/pages/tabBar/dynamic.wpy b/src/pages/tabBar/dynamic.wpy
index 56ff5a3..464147b 100644
--- a/src/pages/tabBar/dynamic.wpy
+++ b/src/pages/tabBar/dynamic.wpy
@@ -394,10 +394,10 @@ wepy.page({
     jumpPath(url) {
       let vm = this
       // 校验是否完成注册资料
-      if (!vm.$signInVerify()) {
-        vm.loginShow = true
-        return
-      }
+      // if (!vm.$signInVerify()) {
+      //   vm.loginShow = true
+      //   return
+      // }
       wx.navigateTo({url: url})
     },
     signInVerify() {
diff --git a/src/pages/tabBar/home.wpy b/src/pages/tabBar/home.wpy
index dc4a175..3bd4a9c 100644
--- a/src/pages/tabBar/home.wpy
+++ b/src/pages/tabBar/home.wpy
@@ -801,11 +801,11 @@ wepy.page({
     },
     jumpPath(url) {
       let vm = this
-      // 校验是否完成注册资料
-      if (!vm.$signInVerify()) {
-        vm.loginShow = true
-        return
-      }
+      // // 校验是否完成注册资料
+      // if (!vm.$signInVerify()) {
+      //   vm.loginShow = true
+      //   return
+      // }
       wx.navigateTo({url: url})
     },
     hiddenLogin() {
@@ -889,8 +889,17 @@ wepy.page({
     if (!vm.userInfo) {
       console.log('444')
       setTimeout(() => {
-        wx.switchTab({url: '/pages/tabBar/home'})
-      }, 3000)
+        vm.getTopUser()
+        vm.getArea()
+        vm.getEveryday()
+        vm.getSquare()
+        vm.applyTopUpState()
+        vm.getBannerList()
+        vm.advModal = wx.getStorageSync('adv')
+        if ((vm.advModal.id - 0) > 0) {
+          vm.modalName = 'showAdv'
+        }
+      }, 1200)
     } else {
       vm.getTopUser()
       vm.getArea()
diff --git a/src/pages/tabBar/news.wpy b/src/pages/tabBar/news.wpy
index 3897308..748ebee 100644
--- a/src/pages/tabBar/news.wpy
+++ b/src/pages/tabBar/news.wpy
@@ -446,10 +446,10 @@ wepy.page({
     jumpPath(e) {
       let vm = this
       // 校验是否完成注册资料
-      if (!vm.$signInVerify()) {
-        vm.loginShow = true
-        return
-      }
+      // if (!vm.$signInVerify()) {
+      //   vm.loginShow = true
+      //   return
+      // }
       wx.navigateTo({url: e.path})
     },
     hiddenLogin() {
diff --git a/src/pages/tabBar/user.wpy b/src/pages/tabBar/user.wpy
index 68c888a..4f8f28c 100644
--- a/src/pages/tabBar/user.wpy
+++ b/src/pages/tabBar/user.wpy
@@ -33,11 +33,11 @@
           <view class="dredge bold" @tap="goto('/pages/users/upgradeVIP')">去开通</view>
         </block>
       </view>
-      <view style="background: #FAF9F9;width: 100%;padding-top: 12rpx;position:relative;">
-        <view class="d_close" @tap="hideIphoneBtn"></view>
-        <button class="u_lst f-fbc btn getUserIphone" v-if="isShowIphoneBtn" open-type="getPhoneNumber"
-                bindgetphonenumber="getPhoneNumber"></button>
-      </view>
+<!--      <view style="background: #FAF9F9;width: 100%;padding-top: 12rpx;position:relative;">-->
+<!--        <view class="d_close" @tap="hideIphoneBtn"></view>-->
+<!--        <button class="u_lst f-fbc btn getUserIphone" v-if="isShowIphoneBtn" open-type="getPhoneNumber"-->
+<!--                bindgetphonenumber="getPhoneNumber"></button>-->
+<!--      </view>-->
     </view>
     <view class="m_spr">
       <view class="u_spr f-fbc">
@@ -697,16 +697,16 @@
           vm = this, {id} = wx.getStorageSync('userInfo')
           // 校验是否完成注册资料
           console.log(vm.$signInVerify(), 'vm.$signInVerify()===')
-          if (!vm.$signInVerify()) {
-              console.log('000')
-              vm.loginShow = true
-              return
-          }
-        if (titles.includes(text) && !is_base_info) {
-          vm.showVisitorModel = true
-            return
-          // return vm.$invoke('visitorModel', 'showModal', '0') // 游客模式，无法查看
-        }
+          // if (!vm.$signInVerify()) {
+          //     console.log('000')
+          //     vm.loginShow = true
+          //     return
+          // }
+        // if (titles.includes(text) && !is_base_info) {
+        //   vm.showVisitorModel = true
+        //     return
+        //   // return vm.$invoke('visitorModel', 'showModal', '0') // 游客模式，无法查看
+        // }
         // vm.$parent.getEvent(vm.config.navigationBarTitleText, `点击${text}`, `userID=${id}`)
         vm.modalName = ''
         vm.hide = true
diff --git a/src/pages/users/myCertification.wpy b/src/pages/users/myCertification.wpy
index 0730315..d3da020 100644
--- a/src/pages/users/myCertification.wpy
+++ b/src/pages/users/myCertification.wpy
@@ -93,6 +93,8 @@
         <view class="Know font_32" @tap="vanish">我知道了</view>
       </view>
     </view>
+  <loginDialog :loginShow="loginShow" @hiddenLogin="hiddenLogin"></loginDialog>
+
 </template>
 
 <script>
@@ -120,7 +122,8 @@
       ],
       tempId: [], // 模板id
       system: wx.getStorageSync('system'),
-      approve_time: 0
+      approve_time: 0,
+      loginShow: false
     },
     onShow() {
       this.$showLoading('加载中')
@@ -200,17 +203,22 @@
         let vm = this
           console.log(this.mobile, 'url===')
         if ((text == '真人认证' || text == '学历认证') && !this.mobile) {
-          wx.showModal({
-            title: '温馨提示',
-            content: '请先绑定手机号后再真人认证',
-            success(res) {
-              if (res.confirm) {
-                vm.$goto('/pages/home/information')
-              } else if (res.cancel) {
-                console.log('用户点击取消')
-              }
-            }
-          })
+          if (!vm.$signInVerify()) {
+              console.log('000')
+              vm.loginShow = true
+              return
+          }
+          // wx.showModal({
+          //   title: '温馨提示',
+          //   content: '请先绑定手机号后再真人认证',
+          //   success(res) {
+          //     if (res.confirm) {
+          //       vm.$goto('/pages/home/information')
+          //     } else if (res.cancel) {
+          //       console.log('用户点击取消')
+          //     }
+          //   }
+          // })
           return
         }
         if (text == '学历认证' && this.is_real_approved !== 1) {
@@ -260,6 +268,10 @@
       },
       vanish() {
         this.modalName = ''
+      },
+      hiddenLogin() {
+        let vm = this
+        vm.loginShow = false
       }
     }
   })
@@ -450,7 +462,8 @@
     backgroundColorTop: '#ffffff',
     backgroundColorBottom: '#ffffff',
     usingComponents: {
-    cuCustom: '~@/components/cuCustom'
-    }
+    cuCustom: '~@/components/cuCustom',
+    loginDialog: '~@/components/loginDialog',
+  }
     }
 </config>
diff --git a/src/pages/users/setTing.wpy b/src/pages/users/setTing.wpy
index 6404dad..198bef4 100644
--- a/src/pages/users/setTing.wpy
+++ b/src/pages/users/setTing.wpy
@@ -43,7 +43,9 @@
             </block>
         </view>
     </view>
-    <UnlockingDialog :modalName="unlockIngModalName" @unlockingCut="unlockingCut" @toUpdateCut-="toUpdateCut"></UnlockingDialog>
+    <UnlockingDialog :modalName="unlockIngModalName" @unlockingCut="unlockingCut" @toUpdateCut-="toUpdateCut" @signInVerify="signInVerify"></UnlockingDialog>
+  <loginDialog :loginShow="loginShow" @hiddenLogin="hiddenLogin"></loginDialog>
+
 </template>
 
 <script>
@@ -153,7 +155,8 @@
             path: '/pages/users/aboutLove'
           }
         ]
-      ]
+      ],
+      loginShow: false
     },
     watch: {
 
@@ -166,6 +169,14 @@
       this.system = app.globalData.systemInfo.system.split(' ')[0]
     },
     methods: {
+      signInVerify() {
+        let vm = this
+        vm.loginShow = true
+      },
+      hiddenLogin() {
+        let vm = this
+        vm.loginShow = false
+      },
         vipData() {
             this.$get({url: service.host + '/user/center'}).then(({code, data}) => {
                 this.rankData = data.rank_profile
@@ -378,6 +389,8 @@ backgroundColorBottom: '#f2f2f2',
 usingComponents: {
 UnlockingDialog: '~@/components/UnlockingDialog',
 shareComponent: '~@/components/shareComponent',
-}
+  loginDialog: '~@/components/loginDialog',
+
+  }
 }
 </config>
diff --git a/src/pages/users/upgradeVIP.wpy b/src/pages/users/upgradeVIP.wpy
index 9fc6843..0a06ca2 100644
--- a/src/pages/users/upgradeVIP.wpy
+++ b/src/pages/users/upgradeVIP.wpy
@@ -121,6 +121,7 @@
     </view>
   </view>
   <view style="height: 120rpx;"></view>
+  <loginDialog :loginShow="loginShow" @hiddenLogin="hiddenLogin"></loginDialog>
 
 </template>
 
@@ -167,7 +168,8 @@
       paymentAmount: 0,
       coinMoney: 0,
       deductionPrice: 0,
-        bgVip: 'background: #333333;\ncolor: white'
+        bgVip: 'background: #333333;\ncolor: white',
+      loginShow: false
     },
     computed: {
       residue() {
@@ -297,6 +299,10 @@
         }, 800)
       },
       showFn (index) { // 弹框支付
+        if (!this.$signInVerify()) {
+          this.loginShow = true
+          return
+        }
         if (this.system == 'iOS') {
           this.modalName = 'showTips'
           return
@@ -397,6 +403,10 @@
       },
       payChoice(e) {
         this.wxPayShow = this.wxPayShow == 'coin' ? 'cash' : e
+      },
+      hiddenLogin() {
+        let vm = this
+        vm.loginShow = false
       }
     }
   })
@@ -613,7 +623,9 @@
     backgroundColorTop: '#f2f2f2',
     backgroundColorBottom: '#f2f2f2',
     usingComponents: {
-    cuCustom: '~@/components/cu-custom'
-    }
+    cuCustom: '~@/components/cu-custom',
+  loginDialog: '~@/components/loginDialog',
+
+  }
     }
 </config>
diff --git a/src/pages/users/upgradeVIP2.wpy b/src/pages/users/upgradeVIP2.wpy
index 3173782..6e0fee6 100644
--- a/src/pages/users/upgradeVIP2.wpy
+++ b/src/pages/users/upgradeVIP2.wpy
@@ -121,6 +121,8 @@
     </view>
   </view>
   <view style="height: 120rpx;"></view>
+  <loginDialog :loginShow="loginShow" @hiddenLogin="hiddenLogin"></loginDialog>
+
 </template>
 
 <script>
@@ -168,7 +170,9 @@
       wxPayShow: 'cash',
       coinMoney: 0,
       deductionPrice: 0,
-        bgVip: 'background: #333333;\ncolor: white'
+        bgVip: 'background: #333333;\ncolor: white',
+      loginShow: false
+
     },
     computed: {
       residue() {
@@ -347,6 +351,10 @@
         }, 800)
       },
       showFn (index) { // 弹框支付
+        if (!this.$signInVerify()) {
+          this.loginShow = true
+          return
+        }
         this.wxPayShow = 'cash'
         this.coinMoney = (this.payData.coin / 10).toFixed(2)
         // this.deductionPrice = this.payData.coin >= this.specialVIP.can_coin_amount ? (this.payData.discount_price - this.specialVIP.can_cash_amount).toFixed(2) : (this.payData.discount_price - this.coinMoney).toFixed(2)
@@ -460,6 +468,10 @@
       },
       payChoice(e) {
         this.wxPayShow = this.wxPayShow == 'coin' ? 'cash' : e
+      },
+      hiddenLogin() {
+        let vm = this
+        vm.loginShow = false
       }
     }
   })
@@ -686,7 +698,9 @@
     backgroundColorTop: '#f2f2f2',
     backgroundColorBottom: '#f2f2f2',
     usingComponents: {
-    cuCustom: '~@/components/cu-custom'
-    }
+    cuCustom: '~@/components/cu-custom',
+  loginDialog: '~@/components/loginDialog',
+
+  }
     }
 </config>