二维码跳转用户详情，聊天表情，会员订单下拉问题，系统通知跳转问题，登录弹窗增加选中按钮

src/components/loginDialog.wpy

@@ -53,6 +53,13 @@
         margin-left: 4rpx;
       }
     }
+    .iconV2{
+      width: 28rpx;
+      height: 28rpx;
+      vertical-align: middle;
+      margin-right: 8rpx;
+      margin-top: -2rpx;
+    }
   }
 }
 </style>
@@ -66,10 +73,14 @@
             <image class="u_dialog_img" src="https://images.ufutx.com/202105/12/eeadaef5123837de5109b25e93fdeae6.png" mode="widthFix"></image>
           </view>
           <view class="u_tt ~font_40 ~color333 ~bold">登录福恋，获得更精准的推荐</view>
-          <view class="~font_24 ~color999">登录即表明您同意福恋的
+          <view class="~font_24 ~color999">
+              <image src="https://images.ufutx.com/202012/24/181993236787c898d25df284b5cb092e.png" mode="aspectFit" class="iconV2" v-if="active" @tap="activeFn"></image>
+              <image src="https://images.ufutx.com/202006/18/2b234f0a7d8c1b7f97e98ee597a1f2c1.png" mode="aspectFit" class="iconV2" v-else @tap="activeFn"></image>
+              <span @tap="activeFn">请阅读并同意
             <text class="underline" @tap.stop="gotoApp('https://love.ufutx.com/h5/#/serviceAgreementV2')">用户协议</text>
             与
             <text class="underline" @tap.stop="gotoApp('https://love.ufutx.com/h5/#/PrivacyAgreementV2')">隐私政策</text>
+                  </span>
           </view>
           <view class="m_bu ~f-fcc text-center" @tap="jumpPath">
             <view class="u_bu_tt ~font_32 ~colorF ~bold">微信登录</view>
@@ -98,6 +109,7 @@ wepy.component({
     }
   },
   data: {
+      active: false
   },
   mixins: [https, base],
   methods: {
@@ -107,11 +119,17 @@ wepy.component({
     },
     jumpPath() {
       let vm = this
+        if (!vm.active) {
+            return vm.$showToast('请先选择同意服务协议')
+        }
       vm.hidden()
       wx.navigateTo({url: `/pages/home/registration`})
     },
     gotoApp(url) {
       wx.navigateTo({url: '/pages/books/bookDetail?url=' + encodeURIComponent(url)})
+    },
+      activeFn(index) {
+          this.active = !this.active
       }
   },
   created() {

src/components/userTitle.wpy

@@ -17,36 +17,36 @@
             </view>
           </view>
           <view class="main">
-            <view class="userinfo-info text-center text-shadow text-white" style="display: flex;">
+            <view class="userinfo-info ~text-center ~text-shadow" style="display: flex;">
-              <span v-if="user.nickname" @tap.stop="goto('/pages/users/unmarriV2')" class="font_28 bold white">{{ user.nickname }}</span>
+              <span v-if="user.nickname" @tap.stop="goto('/pages/users/unmarriV2')">{{ user.nickname }}</span>
               <!-- <span>完善个人资料</span> -->
               <span v-else class="font_30 bold white" @tap.stop="gotoTab">你还未登录</span>
               <view class="mainVip" @tap="goto('/pages/users/unmarriV2')">
                 <block v-if="user.rank_id > 0">
                   <view class="text-center vipBox">
                     <image src="https://images.ufutx.com/202101/30/e3a22a60849c3910e680d932772432b4.png" mode="aspectFill" class="icon"></image>
-                    <view v-if="user.nickname" class="_edit ~font_22 ~color-666">编辑</view>
+                    <view v-if="user.nickname" class="_edit ~font_20 ~color-666">编辑</view>
                   </view>
                 </block>
                 <block v-else>
                   <view class="text-center vipBox">
                     <image src="https://images.ufutx.com/202101/30/004a146ad71658aaa2ad0f0263f960b8.png" mode="aspectFill" class="icon"></image>
-                    <view v-if="user.nickname" class="_edit ~font_22 ~color-666">编辑</view>
+                    <view v-if="user.nickname" class="_edit ~font_20 ~color-666">编辑</view>
                   </view>
                 </block>
               </view>
             </view>
-            <view class="editInfo f-fc" @tap.stop="goto('/pages/users/unmarriV2')">
+            <view class="editInfo ~f-fc" @tap.stop="goto('/pages/users/unmarriV2')">
               <block v-if="token">
-                <view v-if="user.is_real_approved == 1" class="font_26 white flo_l text-shadow text-white siz f-fcc">
+                <view v-if="user.is_real_approved == 1" class="~font_26 white flo_l text-shadow text-white siz f-fcc">
                   <image style="width: 24rpx;height: 28rpx;margin-right: 10rpx;" src="https://images.ufutx.com/202106/15/cbfa2e308ecae1e1da4ae876f379a308.png" mode="aspectFill" lazy-load="true"></image>
                   已认证</view>
-                <view v-else-if="user.is_real_approved == 2" class="font_26 white flo_l text-shadow text-white siz">正在审核中</view>
+                <view v-else-if="user.is_real_approved == 2" class="~font_26 white flo_l text-shadow text-white siz">正在审核中</view>
-                <view v-else-if="user.is_approved == 1" class="font_26 white flo_l text-shadow text-white siz">成为认证用户</view>
+                <view v-else-if="user.is_approved == 1" class="~font_26 white flo_l text-shadow text-white siz">成为认证用户</view>
-                <view v-else class="font_26 white flo_l text-shadow text-white siz">完善个人资料</view>
+                <view v-else class="~font_26 white flo_l text-shadow text-white siz">完善个人资料</view>
               </block>
               <block v-else>
-                <view class="font_26 white flo_l text-shadow text-white siz">登录后即可体验完整功能</view>
+                <view class="~font_26 white flo_l text-shadow text-white siz">登录后即可体验完整功能</view>
               </block>
               <image v-if="token" src="https://images.ufutx.com/202101/30/32e488269070923ca4b7e363a1afeffb.png" mode="aspectFill" class="icon flo_r"></image>
             </view>
@@ -253,6 +253,7 @@
       height: 150rpx;
     }
     .mainVip {
+      margin-top: 4rpx;
       margin-left: 10rpx;
       .icon {
         width: 76rpx;
@@ -376,7 +377,7 @@
     height: 50rpx;
     line-height: 50rpx;
     z-index: 9999;
-    span {
+    label {
       max-width: 240rpx;
       overflow: hidden;
       text-overflow: ellipsis;

src/mixins/https.js

@@ -190,7 +190,9 @@ export default {
             console.error('[ERROR]', err)
           },
           complete: (res) => {
-            wx.hideLoading()
+            setTimeout(() => {
+              wx.hideLoading() // loading只展示一会就被去除了
+            }, 1000)
             if (res.errMsg.indexOf('timeout') > -1) {
               vm.errorOne += 1
               let pages = getCurrentPages()    // 获取加载的页面

src/pages/home/information.wpy

@@ -1354,7 +1354,24 @@ wepy.page({
     vm.userData = wx.getStorageSync('userInfo')
     vm.userId = wx.getStorageSync('user_id')
     vm.userType = wx.getStorageSync('type')
+      if (e.scene) {
+          let newScene = decodeURIComponent(e.scene)
+          console.log(newScene, 'newScene-')
+          if (newScene.indexOf('&') >= 0) {
+              newScene.split('&').forEach((item, index) => {
+                  if (item.indexOf('id') >= 0) {
+                      vm.id = item.split('=')[1]
+                  }
+                  if (item.indexOf('from_user_id') >= 0) {
+                      wx.setStorageSync('from_user_id', item.split('=')[1])
+                  }
+              })
+          } else {
+              vm.id = decodeURIComponent(e.scene).split('=')[1]
+          }
+      } else {
           vm.id = e.id
+      }
     vm.getDetail()
     vm.getDynamic()
     vm.getPraiseList()

src/pages/news/chitchat.wpy

@@ -832,7 +832,7 @@ wepy.page({
       app.globalData.nim.msg.sendTextMsg({
         scene: 'p2p',
         to: vm.otherUserId,
-        body: msg,
+        body: vm.msg,
         isSend: 0,
         onSendBefore: function (msg) {
           console.log('get msg before', msg)

src/pages/news/groupChitchat.wpy

@@ -777,11 +777,12 @@ wepy.page({
         vm.$showToast('请输入聊天内容')
         return
       }
+        let msg = vm.msg
       if (/\[[^\]]+\]/.test(vm.msg)) {
-        vm.msg = vm.transitionMsg(vm.msg)
+        msg = vm.transitionMsg(vm.msg)
       }
       vm.msgList.push({
-        text: vm.msg,
+        text: msg,
         attach: '',
         id: `id_${timeData}`,
         isSelf: true,

src/pages/news/groupChitchatDetail.wpy

@@ -389,6 +389,17 @@ wepy.page({
     },
     jumpPath(e) {
       wx.navigateTo({url: e})
+    },
+      handleContact(e) {
+          let vm = this
+          try {
+              wx.previewImage({
+                  current: 'https://image.fulllinkai.com/202310/23/2a132a4978ef87d532a817041e425c26.png',
+                  urls: ['https://image.fulllinkai.com/202310/23/2a132a4978ef87d532a817041e425c26.png']
+              })
+          } catch (error) {
+              vm.$showToast('请更新至微信最新版本')
+          }
       }
   },
   onLoad(e) {

src/pages/news/systemNews.wpy

@@ -148,7 +148,7 @@ page {
                 </view>
               </block>
               <block v-if="item.type == 'system'">
-                <view v-if="item.has_unionid && item.path_url" class="font_24 color-666 friend-text" @tap.stop="jumpH5(item)">点击查看>></view>
+                <view v-if="item.path_url" class="font_24 color-666 friend-text">点击查看>></view>
               </block>
               <block v-else-if="item.type == 'change_moment_topic'">
                 <view class="font_30 name">{{item.message}}</view>
@@ -256,11 +256,19 @@ wepy.page({
     },
     jumpPath(e) {
       let url = ``
+        console.log(e.type, e.path_type, 'path_type=')
       if (e.type == 'system' || e.type == 'gift' || e.type == 'marketing') {
         if (!e.path_url) {
           return
         }
+        if (e.path_type == 2) {
+            console.log('2222')
             wx.navigateTo({url: `/pages/books/bookDetail?url=${encodeURIComponent(e.path_url)}`})
+        } else {
+            console.log('1111')
+            wx.navigateTo({url: '/' + e.path_url})
+        }
+        return
       }
       if (e.type == 'follow' || e.type == 'friend' || e.type == 'remind_profile') {
         url = `/pages/home/information?id=${e.type == 'follow' ? e.send_user_id : e.user_id}`
@@ -297,8 +305,10 @@ wepy.page({
     vm.$refs.pageScroll.showBackTopBtn = top > 380
   },
   onShow() {
+      console.log('33333')
   },
   onLoad() {
+      console.log('44444')
     let vm = this
     vm.getList()
   }

src/pages/users/myOrderList.wpy

@@ -6,9 +6,10 @@
 <!--            <view slot="content">我的订单</view>-->
 <!--        </cuCustom>-->
 
-      <view style="height: {{currentTab != 0 ? 160 : 100}}rpx"></view>
 
-          <scroll-view scroll-top="{{vipTopHandle}}" scroll-with-animation="true" scroll-anchoring="{{true}}" refresher-enabled="{{true}}" refresher-triggered="{{triggeredsService}}" bindrefresherpulling="vipPulling" bindrefresherrefresh="onPullDownRefresh" scroll-y="true" style="-webkit-overflow-scrolling: touch;height: 100%;" lower-threshold="50" bindscrolltolower="onReachBottom" bindscroll="serviceToupper">
+<!--        <view class="ui-placeholder"></view>-->
+        <scroll-view scroll-top="{{vipTopHandle}}" scroll-with-animation="true" scroll-anchoring="{{true}}" refresher-enabled="{{true}}" refresher-triggered="{{triggeredsService}}" bindrefresherpulling="vipPulling" bindrefresherrefresh="onPulling" scroll-y="true" style="-webkit-overflow-scrolling: touch;height: 100%;" lower-threshold="50" bindscrolltolower="onReachBottom" bindscroll="serviceToupper">
+            <view style="height: {{currentTab != 0 ? 160 : 60}}rpx"></view>
             <view class="m_vip">
               <view class="tradeInfo ff" v-for="(item,index) in vipList" :key="index">
                 <view class="font_26 color-666" style="padding-bottom: 20rpx">订单号：{{item.trade_no}}</view>
@@ -99,6 +100,13 @@ wepy.page({
   },
 
   methods: {
+      onPulling () {
+          this.collectionMessage = false
+          this.noMoreShow = false
+          this.vipList = []
+          this.vipPage = 1
+          this.vipData()
+      },
       serviceToupper(e) {
           clearTimeout(this._st)
           this._st = setTimeout(() => {
@@ -136,6 +144,7 @@ wepy.page({
           _this.loading = true
           this.$get({url: `${service.host}/order/rank/list`, data}).then(({code, data}) => {
               _this.triggeredsService = false
+
               if (!data.data || (data.data.length == 0 && _this.vipPage == 1)) {
                   _this.hideMessage = true
                   return
@@ -149,16 +158,12 @@ wepy.page({
               }
               if (_this.vipList.length != 0 && _this.vipPage == 1) return
               _this.vipList = [..._this.vipList, ...data.data]
-              wx.hideLoading()
       }).finally(() => {
+              wx.hideLoading()
               _this.loaded = false
           })
       },
 
-      onPulling() {
-          this.triggered = true
-      },
-
     copyFn(data) {
       let vm = this
       wx.setClipboardData({
@@ -385,6 +390,10 @@ page{
   .ui-quit-btn-submit{
     background: linear-gradient(to right,#FF5380 0%,#FF85A5 100%);
   }
+  .ui-placeholder{
+    width: 100vw;
+    height: 110rpx;
+  }
 }
 </style>
 <config>

src/pages/users/selfTextarea.wpy

@@ -253,7 +253,7 @@ import base from '../../mixins/base'
     this.selfTextareaShow = true
     if (e.text) {
         console.log(e.text, 'text==-')
-        if (e.text == '兴趣爱好') {
+        if (e.text == '兴趣标签') {
             this.bgColor = '#ffffff'
             wx.setNavigationBarColor({
                 frontColor: '#000000',
@@ -557,11 +557,13 @@ import base from '../../mixins/base'
         this.$showLoading('提交中..')
         this.$put({url: `${service.host}/user/other/profie`, data}).then(({code, data}) => {
             this.throttleShow = true
-            wx.hideLoading()
             console.log('参数保存成功！')
+           setTimeout(() => {
+               wx.hideLoading()
                wx.navigateBack({
                    delta: 1
                })
+           }, 2000)
         })
       } else {
         this.throttleShow = false

src/pages/users/unmarri.wpy

@@ -435,11 +435,15 @@
       },
 
       ensureData(data) { // 保存
+          this.$showLoading('提交中..')
         this.$put({url: `${service.host}/user/base/profile`, data}).then(({code, data}) => {
           console.log('参数保存成功！')
+            setTimeout(() => {
+                wx.hideLoading()
                 wx.navigateBack({
                     delta: 1
                 })
+            }, 1200)
       })
       },
 

src/pages/users/unmarriV2.wpy

@@ -314,6 +314,10 @@
         }
       }
     }
+    .imMainInfo{
+      border-radius: 30rpx;
+      border: 1px solid red;
+    }
   }
   .m_bas {
     background-color: white;
@@ -656,7 +660,7 @@
 
 <template>
     <view>
-        <view class="progress bg_f" v-if="progressShow ">
+        <view class="progress bg_f" v-if="progressShow " @click="isComplat">
             <view class="cu-progress progressBox round sm striped active">
                 <view class="bg_theme" :style="{width:profile_count+'%'}"></view>
             </view>
@@ -733,7 +737,7 @@
                 </view>
             </view>
             <view class="container " @tap="goto('/pages/users/unmarri')">
-                <view class="mainInfo">
+                <view class="mainInfo" :class="{imMainInfo:isVipClick && isBaseComplete}">
                     <view class="mainTitle">
                         <view class="_title font_32 bold flo_l">
                             <image src="https://images.ufutx.com/202012/25/7645858a1ae55dd7c3ef90ec7a42bfa3.png" mode="aspectFit" class="circle_icon"></image>
@@ -831,7 +835,7 @@
                 </view>
             </view>
             <view class="container ">
-                <view class="mainInfo">
+                <view class="mainInfo" :class="{imMainInfo:isVipClick && !mylibs.introduction}">
                     <view class="mainTitle">
                         <view class="_title font_32 bold flo_l">
                             <image src="https://images.ufutx.com/202012/25/7645858a1ae55dd7c3ef90ec7a42bfa3.png" mode="aspectFit" class="circle_icon"></image>
@@ -846,7 +850,7 @@
                 </view>
             </view>
             <view class="container">
-                <view class="mainInfo">
+                <view class="mainInfo" :class="{imMainInfo:isVipClick && !mylibs.interest_label}">
                     <view class="mainTitle">
                         <view class="_title font_32 bold flo_l">
                             <image src="https://images.ufutx.com/202012/25/7645858a1ae55dd7c3ef90ec7a42bfa3.png" mode="aspectFit" class="circle_icon"></image>
@@ -855,7 +859,7 @@
                         <image  src="https://images.ufutx.com/202004/13/c9505127b21e909aae5a609987f5ac66.png" class="icon flo_r" mode="widthFix" @tap="showModal('interest_label','兴趣标签','日常生活你有什么爱好？可以写一下')"/>
                     </view>
                     <view class="mainPhoto" @tap="showModal('interest_label','兴趣标签','添加兴趣标签，遇见合适的Ta')">
-                      <view class="f-fc ui-wrap ui-hobbies-big-box" v-if="mylibs.interest_label">
+                      <view class="f-fc ui-wrap ui-hobbies-big-box" v-if="mylibs.interest_label.length > 0">
                         <view class="hobbies-box " v-for="(item,index) in mylibs.interest_label" :key="index">
                           {{item}}
                         </view>
@@ -866,7 +870,7 @@
                 </view>
             </view>
           <view class="container">
-            <view class="mainInfo">
+            <view class="mainInfo" :class="{imMainInfo:isVipClick && !mylibs.interest_hobby}">
               <view class="mainTitle">
                 <view class="_title font_32 bold flo_l">
                   <image src="https://images.ufutx.com/202012/25/7645858a1ae55dd7c3ef90ec7a42bfa3.png" mode="aspectFit" class="circle_icon"></image>
@@ -883,7 +887,7 @@
             </view>
           </view>
             <view class="container animation-slide-bottom">
-                <view class="mainInfo">
+                <view class="mainInfo " :class="{imMainInfo:isVipClick && conditionArr.length == 0}">
                     <view class="mainTitle">
                         <view class="_title font_32 bold flo_l">
                             <image src="https://images.ufutx.com/202012/25/7645858a1ae55dd7c3ef90ec7a42bfa3.png" mode="aspectFit" class="circle_icon"></image>
@@ -1008,6 +1012,8 @@
             ],
             tempMember: 0, // 是否有可领取会员
             progressShow: 'true',
+            isVipClick: false,
+            isBaseComplete: false,
             chooseShow: false,
             choosePicsShow: false,
             jumpString: 'unmarriV2',
@@ -1296,6 +1302,16 @@
 
             hideCut(e) {
                 this.chooseShow = e.chooseShow
+            },
+            isComplat() {
+                this.isBaseComplete = false
+                let baseData = ['nickname', 'birthday', 'state', 'sex', 'stature', 'weight', 'city', 'resident_city', 'industry', 'income', 'belief', 'marry_by_time']
+                for (let i = 0; i < baseData.length; i++) {
+                    if (!this.mylibs[baseData[i]]) {
+                        this.isBaseComplete = true
+                    }
+                }
+                this.isVipClick = true
             }
 
         }

src/utils/util.js

@@ -55,6 +55,8 @@ const wx_login = () => {
                 if (data.user.hidden_profile == 'ALLSEX') {  // 资料是否关闭
                   wx.setStorageSync('logoutCode', 1)
                   wx.redirectTo({url: '/pages/users/logoutDefault'})
+                } else {
+                  wx.removeStorageSync('logoutCode')
                 }
                 let userInfo = {
                   is_moment_admin: data.is_moment_admin,