FIX

修复发布者主页部分问题

miniprogram/app.js

@@ -58,10 +58,10 @@ App({
   },
 
   globalData: {
-    userInfo: null,
+    userInfo: {},
+    pubInfo: [],
     hasUserInfo: false,
     openId: null,
-    publisherId: null,
     noticeIndex: null,
     vibrate: null
   }

miniprogram/pages/activity/activity.js

@@ -8,6 +8,7 @@ Page({
    */
   data: {
     activityInfo: {},
+    showEdit: false,
     activityComment: [],
     like: -1,
     likeEnable: true,
@@ -159,8 +160,15 @@ Page({
     }).then(res => {
       wx.hideLoading()
       res.result.list[0] = util.dbToMsg(res.result.list[0])
+      let edit = false
+      for (let i = 0; i < app.globalData.pubInfo.length; i++) {
+        if (res.result.list[0].pub_id === app.globalData.pubInfo[i].pub_id) {
+          edit = true
+        }
+      }
       this.setData({
-        activityInfo: res.result.list[0]
+        activityInfo: res.result.list[0],
+        showEdit: edit
       })
     })
 

miniprogram/pages/activity/activity.wxml

@@ -1,56 +1,59 @@
 <!--为首页-信息详情页面-->
 <view class="page">
-  <view class="card">
-    <image wx:if="{{activityInfo.poster.length}}" class="activity-poster" src="{{activityInfo.poster[0]}}" mode="aspectFill" />
-    <view>
-      <view class="profile">
-        <view class="avatar-name" bindtap="getPublisherInfo">
-          <image class="publisher-avatar" src="{{activityInfo.publisher[0].avatar}}"></image>
-          <view class="publisher-name">{{activityInfo.publisher[0].name}}</view>
+  <scroll-view class="message-detail" scroll-y>
+    <view class="card">
+      <image wx:if="{{activityInfo.poster.length}}" class="activity-poster" src="{{activityInfo.poster[0]}}"
+        mode="aspectFill" />
+      <view>
+        <view class="profile">
+          <view class="avatar-name" bindtap="getPublisherInfo">
+            <image class="publisher-avatar" src="{{activityInfo.publisher[0].avatar}}"></image>
+            <view class="publisher-name">{{activityInfo.publisher[0].name}}</view>
+          </view>
+          <view class="activity-attribute primary-background-color white-text-color">
+            {{activityInfo.type}}
+          </view>
         </view>
-        <view class="activity-attribute primary-background-color white-text-color">
-          {{activityInfo.type}}
-        </view>
-      </view>
 
-      <view class="title-time">
-        <view class="title">{{activityInfo.name}}</view>
-        <view class="time primary-text-color">{{activityInfo.publish_time}}</view>
-      </view>
-      <view wx:if="{{activityInfo.detail}}" class="text">
-        <text>{{activityInfo.detail}}</text>
-      </view>
+        <view class="title-time">
+          <view class="title">{{activityInfo.name}}</view>
+          <view class="time primary-text-color">{{activityInfo.publish_time}}</view>
+        </view>
+        <view wx:if="{{activityInfo.detail}}" class="text">
+          <text>{{activityInfo.detail}}</text>
+        </view>
 
-      <view class="line primary-background-color"></view>
+        <view class="line primary-background-color"></view>
 
-      <view wx:if="{{activityInfo.time}}" class="text">时间：{{activityInfo.time}}</view>
-      <view wx:if="{{activityInfo.place}}" class="text">地点：{{activityInfo.place}}</view>
-      <view wx:if="{{activityInfo.tag[0]}}" class="text">活动提供：<text wx:for="{{activityInfo.tag}}" wx:for-item="tag"
-          wx:key="tag">{{tag}} </text></view>
-      <view wx:if="{{activityInfo.orient}}" class="text">面向对象：{{activityInfo.orient}}</view>
-      <view wx:if="{{activityInfo.contact}}" class="text">联系方式：{{activityInfo.contact}}</view>
-      <view wx:if="{{activityInfo.orient}}" class="text">链接：{{activityInfo.link}}</view>
+        <view wx:if="{{activityInfo.time}}" class="text">时间：{{activityInfo.time}}</view>
+        <view wx:if="{{activityInfo.place}}" class="text">地点：{{activityInfo.place}}</view>
+        <view wx:if="{{activityInfo.tag[0]}}" class="text">活动提供：<text wx:for="{{activityInfo.tag}}" wx:for-item="tag"
+            wx:key="tag">{{tag}} </text></view>
+        <view wx:if="{{activityInfo.orient}}" class="text">面向对象：{{activityInfo.orient}}</view>
+        <view wx:if="{{activityInfo.contact}}" class="text">联系方式：{{activityInfo.contact}}</view>
+        <view wx:if="{{activityInfo.orient}}" class="text">链接：{{activityInfo.link}}</view>
 
-      <imagePicker wx:if="{{activityInfo.photo.length}}" value="{{activityInfo.photo}}" max="1"
-        image-width="{{activityInfo.photo.length === 1 ? 698 : activityInfo.photo.length <= 4 ? 330 : 220}}"
-        image-height="{{activityInfo.photo.length === 1 ? 698 : activityInfo.photo.length <= 4 ? 330 : 220}}"
-        readonly />
-    </view>
+        <imagePicker wx:if="{{activityInfo.photo.length}}" value="{{activityInfo.photo}}" max="1"
+          image-width="{{activityInfo.photo.length === 1 ? 698 : activityInfo.photo.length <= 4 ? 330 : 220}}"
+          image-height="{{activityInfo.photo.length === 1 ? 698 : activityInfo.photo.length <= 4 ? 330 : 220}}"
+          readonly />
+      </view>
 
-    <view class="btn primary-background-color" bindtap="editActivity">
-      <image class="btn-icon primary-background-color" mode="aspectFit" src="/images/publisher/publish2.png"></image>
-      <view class=" white-text-color">编辑内容</view>
+      <view wx:if="{{showEdit}}" class="btn primary-background-color" bindtap="editActivity">
+        <image class="btn-icon primary-background-color" mode="aspectFit" src="/images/publisher/publish2.png"></image>
+        <view class=" white-text-color">修改内容</view>
+      </view>
     </view>
-  </view>
 
-  <view class="message-block">
-    <view class="title2">{{activityComment.length == 0 ? "暂无问答" : "答疑区:"}}</view>
-    <image wx:if="{{like != -1}}" class="like" src="/images/like/{{like ? 'heart' : 'hollowheart'}}.png"
-      catchtap="toggleLike" />
-    <view class="card1" wx:for="{{activityComment}}" wx:for-item="item" wx:key="_id">
-      <itemActivityComment comment="{{item}}" time="{{item.time}}" />
+    <view class="message-block">
+      <view class="title2">{{activityComment.length == 0 ? "暂无问答" : "答疑区:"}}</view>
+      <image wx:if="{{like != -1}}" class="like" src="/images/like/{{like ? 'heart' : 'hollowheart'}}.png"
+        catchtap="toggleLike" />
+      <view class="card1" wx:for="{{activityComment}}" wx:for-item="item" wx:key="_id">
+        <itemActivityComment comment="{{item}}" time="{{item.time}}" />
+      </view>
     </view>
-  </view>
+  </scroll-view>
 
   <view class="comment secondary-background-color">
     <view class="comment-inside" style="display: flex; align-items: center;">

miniprogram/pages/activity/activity.wxss

@@ -1,3 +1,11 @@
+.message-detail {
+  position: fixed;
+  top: 0rpx;
+  bottom: 80rpx;
+  left: 0rpx;
+  right: 0rpx;
+}
+
 .like {
   height: 40rpx;
   width: 40rpx;
@@ -62,7 +70,6 @@
   align-self: center;
   width: 700rpx;
   margin: 10rpx 30rpx;
-
 }
 
 
@@ -143,14 +150,12 @@
   margin: 10rpx 10rpx 30rpx 10rpx;
 }
 
-
 .activity-poster {
   height: 400rpx;
   width: 700rpx;
   border-radius: 20rpx 20rpx 0rpx 0rpx;
 }
 
-
 .text {
   font-size: 24rpx;
   margin-left: 50rpx;

miniprogram/pages/activityPublish/activityPublish.wxml

@@ -12,7 +12,7 @@
   </view>
 </view>
 
-<scroll-view wx:if="{{currentTab === 1}}" scroll-y style="height: {{winHeight - 60}}px;">
+<scroll-view wx:if="{{currentTab === 1}}" style="height: {{winHeight - 60}}px;" scroll-y>
   <view class="sub-title">活动{{messageId ? '修改' : '发布'}}</view>
   <form bindsubmit="switch4">
     <view class="block">
@@ -83,7 +83,7 @@
   </form>
 </scroll-view>
 
-<scroll-view wx:if="{{currentTab === 2}}" scroll-y style="height: {{winHeight - 60}}px;">
+<scroll-view wx:if="{{currentTab === 2}}" style="height: {{winHeight - 60}}px;" scroll-y>
   <view class="sub-title">纳新{{messageId ? '修改' : '发布'}}</view>
   <form bindsubmit="switch4">
     <view class="block">
@@ -136,7 +136,7 @@
   </form>
 </scroll-view>
 
-<scroll-view wx:if="{{currentTab === 3}}" scroll-y style="height: {{winHeight - 60}}px;">
+<scroll-view wx:if="{{currentTab === 3}}" style="height: {{winHeight - 60}}px;" scroll-y>
   <view class="sub-title">通知{{messageId ? '修改' : '发布'}}</view>
   <form bindsubmit="switch4">
     <view class="block">

miniprogram/pages/publisher/publisher.js

@@ -24,16 +24,15 @@ Page({
     wx.cloud.callFunction({
       name: 'listMessages',
       data: {
-        pub_id: this.data.publisherInfo.pub_id,
+        pub_id: this.data.publisherInfo._id,
         page_token: this.data.pageToken,
         page_size: 25
       }
     }).then(res => {
       wx.hideNavigationBarLoading()
       for (let i = 0; i < res.result.list.length; i++) {
-        res.result.list[i].photo = res.result.list[i].photo.split(',')
-        res.result.list[i].tag = res.result.list[i].tag.split(',')
-        res.result.list[i].publish_time = util.handleDate(res.result.list[i].publish_time)
+        res.result.list[i] = util.dbToMsg(res.result.list[i])
+        res.result.list[i].publisher = [this.data.publisherInfo]
       }
       this.setData({
         mainDatas: this.data.mainDatas.concat(res.result.list),

miniprogram/pages/publisher/publisher.wxml

@@ -24,6 +24,6 @@
 
 
 
-<view class="card" wx:for="{{mainDatas}}" wx:for-item="item" wx:for-index="index" wx:key="_id">
+<view class="card" wx:for="{{mainDatas}}" wx:for-item="item" wx:key="_id">
   <itemCard item="{{item}}" />
 </view>

miniprogram/pages/publisherLogin/publisherLogin.wxml

@@ -1,7 +1,7 @@
 <!--为社团/组织入驻页面-->
 <view class="title primary-text-color">社团/组织入驻</view>
 
-<scroll-view wx:if="{{currentTab === 0}}" scroll-y style="height: {{winHeight - 60}}px;">
+<scroll-view wx:if="{{currentTab === 0}}" style="height: {{winHeight - 60}}px;" scroll-y>
   <view class="sub-title">社团/组织如何注册入驻？</view>
   <view class="sub-sub-title">1、前提条件</view>
   <view class="text">浙江大学社团/学生组织的负责人代表社团/学生组织进行入驻登记。</view>
@@ -33,7 +33,7 @@
   </view>
 </view>
 
-<scroll-view wx:if="{{currentTab === 2}}" scroll-y style="height: {{winHeight - 60}}px;">
+<scroll-view wx:if="{{currentTab === 2}}" style="height: {{winHeight - 60}}px;" scroll-y>
   <view class="sub-title">组织入驻</view>
   <form bindsubmit="switch5">
     <view class="block" style="margin-bottom: 20rpx;">
@@ -80,7 +80,7 @@
   </form>
 </scroll-view>
 
-<scroll-view wx:if="{{currentTab === 3}}" scroll-y style="height: {{winHeight - 60}}px;">
+<scroll-view wx:if="{{currentTab === 3}}" style="height: {{winHeight - 60}}px;" scroll-y>
   <view class="sub-title">社团入驻</view>
   <form bindsubmit="switch5">
     <view class="block" style="margin-bottom: 20rpx;">
@@ -127,7 +127,7 @@
   </form>
 </scroll-view>
 
-<scroll-view wx:if="{{currentTab === 4}}" scroll-y style="height: {{winHeight - 60}}px;">
+<scroll-view wx:if="{{currentTab === 4}}" style="height: {{winHeight - 60}}px;" scroll-y>
   <view class="sub-title">学校部门入驻</view>
   <form bindsubmit="switch5">
     <view class="block" style="margin-bottom: 20rpx;">