From 2b853aea1d32e59be0109dc32dd1b496101c277a Mon Sep 17 00:00:00 2001
From: zengBin <web260320689@163.com>
Date: Mon, 30 Sep 2024 10:57:38 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dynamicList.wpy      | 145 ++++++++++++++--------------
 src/pages/dynamic/dynamicDetail.wpy |  16 +--
 src/pages/dynamic/issue.wpy         |   6 +-
 src/pages/dynamic/voteDetail.wpy    |  16 +--
 src/pages/news/friendRequest.wpy    |   3 +-
 src/pages/tabBar/dynamic.wpy        |   2 -
 6 files changed, 96 insertions(+), 92 deletions(-)

diff --git a/src/components/dynamicList.wpy b/src/components/dynamicList.wpy
index 6ef65a5..6ec4dcc 100644
--- a/src/components/dynamicList.wpy
+++ b/src/components/dynamicList.wpy
@@ -201,87 +201,85 @@ scroll-view {
 }
 </style>
 <template>
-  <block v-if="item.type != 'vote'">
-    <block v-for="(item,index) in list" :key="index">
-      <view class="~f-fl ~ui-pl-30 ~ui-pr-30 ~ui-pt-30 ~ui-relative" @tap="jumpPath(`/pages/dynamic/dynamicDetail?id=${item.id}`)">
-        <view class="ui-user-pic" style="{{'background-image:url(' + (item.user.photo || 'https://image.fulllinkai.com/202203/09/cc1c73eb1a4941fef25a15cd1ff2f9df.png') + ')'}}" @tap.stop="jumpPath(`/pages/home/information?id=${item.user_id}`)"></view>
-        <view class="~color999 ~font_24 ui-time">{{ item.create_time }}</view>
-        <view class="~ui-pl-16">
-          <view class="~f-fc">
-            <view class="~f-fcl">
-              <view class="ui-name">{{ item.user.nickname || '未设置名称' }}</view>
-              <view v-if="item.work_user_tag" class="ui-identification ~font_22 ~f-fcc">
-                <image class="ui-identification-icon" src="https://image.fulllinkai.com/202307/21/eb5c30d676eac58af4235bad8e6d8c43.png" mode="widthFix"></image>
-                {{item.work_user_tag}}
-              </view>
-            </view>
-<!--            <image class="referencesIcon" src="https://image.fulllinkai.com/202207/19/7e78a1dd367f1250d4cba4e85bfd60f1.png" mode="widthFix" v-if="item.user.type != 'single'"></image>-->
-            <view class="~font_24 ~ui-ml-24 ~color-theme" v-if="item.vote_id > 0">
-              参与了投票：
+  <block v-for="(item,index) in list" :key="index">
+    <view class="~f-fl ~ui-pl-30 ~ui-pr-30 ~ui-pt-30 ~ui-relative" @tap="jumpPath(`/pages/dynamic/dynamicDetail?id=${item.id}`)">
+      <view class="ui-user-pic" style="{{'background-image:url(' + (item.user.photo || 'https://image.fulllinkai.com/202203/09/cc1c73eb1a4941fef25a15cd1ff2f9df.png') + ')'}}" @tap.stop="jumpPath(`/pages/home/information?id=${item.user_id}`)"></view>
+      <view class="~color999 ~font_24 ui-time">{{ item.create_time }}</view>
+      <view class="~ui-pl-16">
+        <view class="~f-fc">
+          <view class="~f-fcl">
+            <view class="ui-name">{{ item.user.nickname || '未设置名称' }}</view>
+            <view v-if="item.work_user_tag" class="ui-identification ~font_22 ~f-fcc">
+              <image class="ui-identification-icon" src="https://image.fulllinkai.com/202307/21/eb5c30d676eac58af4235bad8e6d8c43.png" mode="widthFix"></image>
+              {{item.work_user_tag}}
             </view>
           </view>
-          <view class="~font_24 ~f-fbc">
-            <view class="~f-fcl">
-              <view class="~font_24 ~color-999">{{ item.u_year }}</view>
-              <view class="~font_24 ~color-999" v-if="item.profile && item.profile.stature"><text decode>&nbsp;</text>· {{ item.profile.stature }}cm
-              </view>
-              <view class="~font_24 ~color-999" v-if="item.profile && item.profile.degree"><text decode>&nbsp;</text>· {{ item.profile.degree }}</view>
-            </view>
-            <view class="~color-theme" v-if="item.is_audited == 0">审核中</view>
-            <view class="~color-theme" v-if="item.is_audited == -1">审核失败</view>
+          <!--            <image class="referencesIcon" src="https://image.fulllinkai.com/202207/19/7e78a1dd367f1250d4cba4e85bfd60f1.png" mode="widthFix" v-if="item.user.type != 'single'"></image>-->
+          <view class="~font_24 ~ui-ml-24 ~color-theme" v-if="item.vote_id > 0">
+            参与了投票：
           </view>
-          <view class="~ui-pt-14">
-            <view class="ui-dynamic-content substance ~color333 ~ui-mb-10 ~font_30 {{item.readmore.status == false ? 'ui-active-content' : ''}}">{{item.content}}</view>
-            <block v-if="item.vote_id > 0">
-              <view class="ui-voteItem ~f-fl" @tap.stop="jumpPath(`/pages/dynamic/voteDetail?id=${item.vote_id}`, 'vote')">
-                <image class="ui-vote-icon" src="https://image.fulllinkai.com/202206/29/7fd07d9687390a58d25ac92b55d9a9dd.png" mode="widthFix"></image>
-                <view class="~font_28">{{item.vote.title}}</view>
-              </view>
-            </block>
-            <block v-else>
-              <view class="~color-theme ~font_30 ~ui-mb-10" v-if="item.readmore.auto" @tap.stop="toggle" data-index="{{index}}">{{ item.readmore.tip }}</view>
-              <view v-if="item.photos.length > 0" class="~ui-wrap ui-dynamic-pic-box {{item.photos.length == 2 ? '~f-fl' : '~f-fb'}}">
-                <image v-for="(itemV2,indexV2) in item.photos" :key="indexV2" @tap.stop="$previewImages(itemV2, item.photos)" class="{{item.photos.length == 1 ? 'ui-only-img':''}} {{item.photos.length > 1 ? 'ui-grid-square' : ''}} {{item.photos.length == 2 ? '~ui-mr-10' : ''}}" :src="itemV2" mode="aspectFill"></image>
-              </view>
-              <view v-if="item.play_url" :style="{width: item.video_width > item.video_height ? '480rpx' : '320rpx', height: item.video_width > item.video_height ? '270rpx' : '480rpx', display: videoIndex == index ? 'none' : 'block'}" class="liveImg"  mode="widthFix" @tap.stop="playVideo(index, item.id)">
-                <image v-if="videoIndex != index" class="ui-video-box" :src="item.cover_url" :style="{width: item.video_width > item.video_height ? '480rpx' : '320rpx', height: item.video_width > item.video_height ? '270rpx' : '480rpx'}">
-                  <view class="ui-vide-poster">
-                    <image class="ui-video_play_icon" src="https://image.fulllinkai.com/202308/17/42c88bf039bb56f85cfcb9af0392ffb6.png"></image>
-                  </view>
-                </image>
-                <video id="video" :src="item.play_url" v-if="videoIndex == index" play-btn-position="center" show-fullscreen-btn="{{false}}" controls direction="0" object-fit="{{videoIndex == index ? 'contain' : 'cover'}}" referrer-policy="origin" bindfullscreenchange="leaveVideo" class="videoCenter ui-video-r-box" :style="{width: item.video_width > item.video_height ? '480rpx' : '320rpx', height: item.video_width > item.video_height ? '270rpx' : '480rpx'}" :key="item.id">
-                </video>
-              </view>
-              <view class="~font_24 ~f-fb ~ui-mt-10" v-if="item.topic && item.topic.name" @tap="jumpPath(`/pages/dynamic/hotTopic?id=${item.topic.id}`)">
-                <view class="ui-tags ~f-fcc ~color-theme ~font_24 ~ui-pr-16">
-                  <image lazy-load="true" class="ui-img" src="https://images.ufutx.com/202102/04/dc3043df7d265ae0b2401e589405a239.png" alt=""/>
-                  {{ item.topic.name }}
+        </view>
+        <view class="~font_24 ~f-fbc">
+          <view class="~f-fcl">
+            <view class="~font_24 ~color-999">{{ item.u_year }}</view>
+            <view class="~font_24 ~color-999" v-if="item.profile && item.profile.stature"><text decode>&nbsp;</text>· {{ item.profile.stature }}cm
+            </view>
+            <view class="~font_24 ~color-999" v-if="item.profile && item.profile.degree"><text decode>&nbsp;</text>· {{ item.profile.degree }}</view>
+          </view>
+          <view class="~color-theme" v-if="item.is_audited == 0">审核中</view>
+          <view class="~color-theme" v-if="item.is_audited == -1">审核失败</view>
+        </view>
+        <view class="~ui-pt-14">
+          <view class="ui-dynamic-content substance ~color333 ~ui-mb-10 ~font_30 {{item.readmore.status == false ? 'ui-active-content' : ''}}">{{item.content}}</view>
+          <block v-if="item.vote_id > 0">
+            <view class="ui-voteItem ~f-fl" @tap.stop="jumpPath(`/pages/dynamic/voteDetail?id=${item.vote_id}`, 'vote')">
+              <image class="ui-vote-icon" src="https://image.fulllinkai.com/202206/29/7fd07d9687390a58d25ac92b55d9a9dd.png" mode="widthFix"></image>
+              <view class="~font_28">{{item.vote.title}}</view>
+            </view>
+          </block>
+          <block v-else>
+            <view class="~color-theme ~font_30 ~ui-mb-10" v-if="item.readmore.auto" @tap.stop="toggle" data-index="{{index}}">{{ item.readmore.tip }}</view>
+            <view v-if="item.photos.length > 0" class="~ui-wrap ui-dynamic-pic-box {{item.photos.length == 2 ? '~f-fl' : '~f-fb'}}">
+              <image v-for="(itemV2,indexV2) in item.photos" :key="indexV2" @tap.stop="$previewImages(itemV2, item.photos)" class="{{item.photos.length == 1 ? 'ui-only-img':''}} {{item.photos.length > 1 ? 'ui-grid-square' : ''}} {{item.photos.length == 2 ? '~ui-mr-10' : ''}}" :src="itemV2" mode="aspectFill"></image>
+            </view>
+            <view v-if="item.play_url" :style="{width: item.video_width > item.video_height ? '480rpx' : '320rpx', height: item.video_width > item.video_height ? '270rpx' : '480rpx', display: videoIndex == index ? 'none' : 'block'}" class="liveImg"  mode="widthFix" @tap.stop="playVideo(index, item.id)">
+              <image v-if="videoIndex != index" class="ui-video-box" :src="item.cover_url" :style="{width: item.video_width > item.video_height ? '480rpx' : '320rpx', height: item.video_width > item.video_height ? '270rpx' : '480rpx'}">
+                <view class="ui-vide-poster">
+                  <image class="ui-video_play_icon" src="https://image.fulllinkai.com/202308/17/42c88bf039bb56f85cfcb9af0392ffb6.png"></image>
                 </view>
+              </image>
+              <video id="video" :src="item.play_url" v-if="videoIndex == index" play-btn-position="center" show-fullscreen-btn="{{false}}" controls direction="0" object-fit="{{videoIndex == index ? 'contain' : 'cover'}}" referrer-policy="origin" bindfullscreenchange="leaveVideo" class="videoCenter ui-video-r-box" :style="{width: item.video_width > item.video_height ? '480rpx' : '320rpx', height: item.video_width > item.video_height ? '270rpx' : '480rpx'}" :key="item.id">
+              </video>
+            </view>
+            <view class="~font_24 ~f-fb ~ui-mt-10" v-if="item.topic && item.topic.name" @tap="jumpPath(`/pages/dynamic/hotTopic?id=${item.topic.id}`)">
+              <view class="ui-tags ~f-fcc ~color-theme ~font_24 ~ui-pr-16">
+                <image lazy-load="true" class="ui-img" src="https://images.ufutx.com/202102/04/dc3043df7d265ae0b2401e589405a239.png" alt=""/>
+                {{ item.topic.name }}
               </view>
-              <view v-if="item.address" class="~color666 ~font_24 ~f-fl ~ui-mt-16">
-                <image lazy-load="true" class="ui-address-icon" src="https://images.ufutx.com/202102/04/817a393539ee854226eef79defef2fc4.png" alt=""/>
-                <view>{{ item.address }}</view>
-              </view>
-            </block>
+            </view>
+            <view v-if="item.address" class="~color666 ~font_24 ~f-fl ~ui-mt-16">
+              <image lazy-load="true" class="ui-address-icon" src="https://images.ufutx.com/202102/04/817a393539ee854226eef79defef2fc4.png" alt=""/>
+              <view>{{ item.address }}</view>
+            </view>
+          </block>
+        </view>
+        <view class="~color666 ~font_28 ui-like-box">
+          <view class="ui-like-icon-box">
+            <image lazy-load="true" class="ui-like-icon" src="https://images.ufutx.com/202102/04/ab432de170b4e8ca1a1a59e34af9aa25.png"></image>
+            {{ item.commenter_count }}
           </view>
-          <view class="~color666 ~font_28 ui-like-box">
-            <view class="ui-like-icon-box">
-              <image lazy-load="true" class="ui-like-icon" src="https://images.ufutx.com/202102/04/ab432de170b4e8ca1a1a59e34af9aa25.png"></image>
-              {{ item.commenter_count }}
-            </view>
-            <view class="ui-like-icon-box ~ui-mr-40" @tap.stop="upvote(item ,index)">
-              <image v-if="item.is_like == false" lazy-load="true" class="ui-like-icon-v2" src="https://images.ufutx.com/202106/10/a97c7c76f3aaf7065e7f7a5fe2abc081.png"></image>
-              <image v-else class="ui-img2_gif" src="{{item.is_like ? gifurl : 'https://images.ufutx.com/202106/07/b227f3ecf9cbd080fb814450b667b5ce.gif'}}"></image>
-              {{  item.liker_count  }}
-            </view>
-            <view class="~ui-pl-20 ~ui-pr-6" style="margin-right: -20rpx">
-              <image class="ui-cuIcon-moreandroid" src="https://image.fulllinkai.com/202409/05/fdb58839d1909d75f636941d6aea6cb5.png" mode="widthFix" @tap.stop="changeOperation(item, index)"></image>
-            </view>
+          <view class="ui-like-icon-box ~ui-mr-40" @tap.stop="upvote(item ,index)">
+            <image v-if="item.is_like == false" lazy-load="true" class="ui-like-icon-v2" src="https://images.ufutx.com/202106/10/a97c7c76f3aaf7065e7f7a5fe2abc081.png"></image>
+            <image v-else class="ui-img2_gif" src="{{item.is_like ? gifurl : 'https://images.ufutx.com/202106/07/b227f3ecf9cbd080fb814450b667b5ce.gif'}}"></image>
+            {{  item.liker_count  }}
+          </view>
+          <view class="~ui-pl-20 ~ui-pr-6" style="margin-right: -20rpx">
+            <image class="ui-cuIcon-moreandroid" src="https://image.fulllinkai.com/202409/05/fdb58839d1909d75f636941d6aea6cb5.png" mode="widthFix" @tap.stop="changeOperation(item, index)"></image>
           </view>
         </view>
       </view>
-      <view class="ui-line"></view>
-    </block>
+    </view>
+    <view class="ui-line"></view>
   </block>
 </template>
 <script>
@@ -415,7 +413,8 @@ scroll-view {
         vm.$emit('signInVerify')
         return
       }
-      if (vm.from != 'dynamic' && type != 'vote') {
+      console.log(vm.from, url, type, '7777')
+      if (vm.from != 'dynamic' && type != 'vote' && vm.from != 'hotTopic') {
         return
       }
       wx.navigateTo({url: url})
diff --git a/src/pages/dynamic/dynamicDetail.wpy b/src/pages/dynamic/dynamicDetail.wpy
index 56fa28b..e8336f0 100644
--- a/src/pages/dynamic/dynamicDetail.wpy
+++ b/src/pages/dynamic/dynamicDetail.wpy
@@ -66,13 +66,15 @@ wepy.page({
       vm.$showLoading('加载中...')
       vm.$get({url: `${service.host}/moment/${vm.id}/comment/list?type=moment&nopage=1`}).then(({code, data}) => {
         if (code === 0) {
-          data.forEach((item) => {
-            item.created_at = commentTimeHandle(item.created_at)
-            item.comment = item.comment.split('?')[0]
-            item.likeGif = 'https://images.ufutx.com/202106/07/b227f3ecf9cbd080fb814450b667b5ce.gif'
-          })
-          vm.list = data
-          console.log(vm.list, '////')
+          if (data && data.length > 0) {
+            data.forEach((item) => {
+              item.created_at = commentTimeHandle(item.created_at)
+              item.comment = item.comment.split('?')[0]
+              item.likeGif = 'https://images.ufutx.com/202106/07/b227f3ecf9cbd080fb814450b667b5ce.gif'
+            })
+            vm.list = data
+            console.log(vm.list, '////')
+          }
         }
         wx.hideLoading()
       }).catch(err => {
diff --git a/src/pages/dynamic/issue.wpy b/src/pages/dynamic/issue.wpy
index 70ed525..e93176b 100644
--- a/src/pages/dynamic/issue.wpy
+++ b/src/pages/dynamic/issue.wpy
@@ -348,9 +348,13 @@ wepy.page({
         topic_id: vm.id * 1,
         content: vm.value,
         photos: vm.imgList,
-        address: vm.address,
+        address: vm.address == '我在哪里' ? '' : vm.address,
         is_hot: vm.hot * 1
       }
+      if (!vm.value) {
+        vm.$showToast('请输入动态内容')
+        return
+      }
       if (vm.throttle) {
         vm.throttle = false
         vm.$post({url: `${service.host}/moment/add`, data}).then(({code}) => {
diff --git a/src/pages/dynamic/voteDetail.wpy b/src/pages/dynamic/voteDetail.wpy
index 3854941..0ab0cb1 100644
--- a/src/pages/dynamic/voteDetail.wpy
+++ b/src/pages/dynamic/voteDetail.wpy
@@ -191,13 +191,15 @@ wepy.page({
       vm.$showLoading('加载中...')
       vm.$get({url: `${service.host}/vote/${vm.id}/comment/list`}).then(({code, data}) => {
         if (code === 0) {
-          data.forEach((item) => {
-            item.created_at = commentTimeHandle(item.created_at)
-            item.comment = item.comment.split('?')[0]
-            item.likeGif = 'https://images.ufutx.com/202106/07/b227f3ecf9cbd080fb814450b667b5ce.gif'
-          })
-          vm.list = data
-          console.log(vm.list, '////')
+          if (data && data.length > 0) {
+            data.forEach((item) => {
+              item.created_at = commentTimeHandle(item.created_at)
+              item.comment = item.comment.split('?')[0]
+              item.likeGif = 'https://images.ufutx.com/202106/07/b227f3ecf9cbd080fb814450b667b5ce.gif'
+            })
+            vm.list = data
+            console.log(vm.list, '////')
+          }
         }
         wx.hideLoading()
       }).catch(err => {
diff --git a/src/pages/news/friendRequest.wpy b/src/pages/news/friendRequest.wpy
index 81ccf83..bbd449a 100644
--- a/src/pages/news/friendRequest.wpy
+++ b/src/pages/news/friendRequest.wpy
@@ -386,8 +386,7 @@ page {
                   <view class="age {{item.user.sex == 1?'sex1':''}}">
                     <image v-if="item.user.sex == 1" class="img" src="https://images.ufutx.com/202101/27/1fc8381ccac933612936bb617a5ae906.png" alt=""/>
                     <image v-else class="img" src="https://images.ufutx.com/202101/27/f17913a8fc57de75dc0046db6c317b35.png" alt=""/>
-                    <view v-if="item.user.age == null">0</view>
-                    <view v-else>{{ item.profile.age }}</view>
+                    <view>{{ item.profile.age || 0 }}</view>
                   </view>
                 </block>
               </view>
diff --git a/src/pages/tabBar/dynamic.wpy b/src/pages/tabBar/dynamic.wpy
index 2819424..b2452d9 100644
--- a/src/pages/tabBar/dynamic.wpy
+++ b/src/pages/tabBar/dynamic.wpy
@@ -197,8 +197,6 @@ page {
             <dynamicList :dynamicList="dynamicList" @changeSelect="changeSelect" @signInVerify="signInVerify" :from="'dynamic'"></dynamicList>
           </scroll-view>
         </swiper-item>
-        <swiper-item wx:key="id" style="-webkit-overflow-scrolling:touch"></swiper-item>
-        <swiper-item wx:key="id" style="-webkit-overflow-scrolling:touch"></swiper-item>
       </swiper>
     </view>
   </view>