合并

miniprogram/components/itemActivityComment/itemActivityComment.wxml

@@ -1,4 +1,4 @@
-<view class="text default-primary-color-font">{{time}}</view>
+<view class="text primary-text-color">{{time}}</view>
 <view class="text">Q: {{comment.question}}</view>
 <view class="text">A: {{comment.answer}}</view>
-<view class="line divider-color"></view>
+<view class="line divider-color"></view>

miniprogram/components/itemCard/itemCard.wxss

@@ -44,7 +44,7 @@
 }
 
 .time {
-  font-size: 16rpx;
+  font-size: 20rpx;
 }
 
 .activity-attribute {

miniprogram/pages/aboutUs/aboutUs.wxml

@@ -26,7 +26,7 @@
 <view wx:if="{{currentTab == 1}}" class="con">
   <view scroll-y style="height: {{winHeight - 60}}px;">
 
-    <view class="subTitle primary-text-color">汇听建立的初衷</view>
+    <view class="sub-title primary-text-color">汇听建立的初衷</view>
     <view class="activity-detail">
       <rich-text class="detail-text">
         “汇听”是一个为浙江大学各级各类学生组织、社团，发布活动、通知、纳新招募三种信息搭建的信息平台，用户可以在小程序上查看最新信息、检索自己需要的信息。

miniprogram/pages/aboutUs/aboutUs.wxss

@@ -32,4 +32,8 @@
   justify-content: center;
   font-weight: normal !important;
   border: none !important;
+}
+
+.sub-title {
+  margin: 40rpx;
 }

miniprogram/pages/activity/activity.wxml

@@ -3,7 +3,7 @@
   <view class="card">
     <image wx:if="{{activityInfo.poster != ''}}" class="activity-poster" src="{{activityInfo.poster}}"
       mode="aspectFill" />
-    <view class="activity-info">
+    <view>
       <view class="profile">
         <view class="avatar-name" catchtap="getPublisherInfo">
           <image class="publisher-avatar" src="{{activityInfo.publisherAvatar}}"></image>

miniprogram/pages/activity/activity.wxss

@@ -1,47 +1,3 @@
-/* .activity-poster{
-  width: 100%;
-  height: 300rpx;
-  margin-bottom: 0rpx;
-  display: flex;
-  flex-direction: column;
-}
-
-.activity-info{
-  font-size: 35rpx;
-  display: flex;
-  flex-direction: column;
-}
-
-.top-column{
-  margin-left: 30rpx;
-  margin-right: 30rpx;
-  display: flex;
-  flex-direction: column;
-  margin-top: 10rpx;
-}
-
-.brief-info{
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.brief-info-left{
-  display: flex;
-  align-items: center;
-}
-
-.publisher-avatar{
-  height: 50rpx;
-  width: 50rpx;
-  border-radius: 30rpx;
-}
-
-.publisher-name{
-  font-weight: 800;
-  margin-left: 10rpx;
-} */
-
 .like {
   height: 40rpx;
   width: 40rpx;
@@ -50,40 +6,6 @@
   right: 40rpx;
 }
 
-/* .activity-name{
-  font-weight: 800;
-  margin-left: 60rpx;
-  margin-bottom: 10rpx;
-}
-
-.activity-time{
-  margin-left: 50rpx;
-  font-size: 30rpx;
-}
-
-.activity-place{
-  margin-left: 50rpx;
-  font-size: 30rpx;
-}
-
-.line{
-  width: 100%;
-  height: 5rpx;
-  margin: 5rpx 0rpx;
-}
-
-
-.activity-detail-text{
-  text-indent: 2em;
-}
-
-.message-block{
-  margin-bottom: 80rpx;
-  margin-left: 50rpx;
-  margin-right: 50rpx;
-  font-size: 30rpx;
-} */
-
 .activity-detail {
   margin: -40rpx 40rpx 0rpx 40rpx;
   font-size: 30rpx;
@@ -130,6 +52,7 @@
   display: flex;
   flex-direction: column;
   align-self: center;
+  align-items: center;
   width: 700rpx;
   margin: 50rpx 20rpx;
   padding-bottom: 20rpx;
@@ -232,18 +155,9 @@
   margin: 10rpx 10rpx 30rpx 10rpx;
 }
 
-.tags {
-  display: flex;
-  align-items: center;
-}
-
-.to-detail {
-  display: flex;
-  align-items: center;
-}
 
-.arrow {
-  height: 20rpx;
-  width: 20rpx;
-  margin: 0rpx 20rpx 0rpx 20rpx;
+.activity-poster {
+  height: 400rpx;
+  width: 700rpx;
+  border-radius: 20rpx 20rpx 0rpx 0rpx;
 }

miniprogram/pages/activityPublish/activityPublish.wxss

@@ -9,7 +9,6 @@
 .sub-title {
   font-size: 35rpx;
   margin: 20rpx 40rpx;
-  font-weight: 800;
 }
 
 .radio {
@@ -37,8 +36,7 @@
 
 .title2 {
   align-self: center;
-  font-size: 50rpx;
-  font-weight: 800;
+  font-size: 35rpx;
   margin-top: 100rpx;
   margin-bottom: 70rpx;
 }

miniprogram/pages/opinion/opinion.js

@@ -32,6 +32,12 @@ Page({
     })
   },
 
+  handleTap: function (e) {
+    this.setData({
+      currentTab: 0,
+      probType: e.currentTarget.dataset.type
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */

miniprogram/pages/opinion/opinion.wxml

@@ -28,10 +28,10 @@
   <view class="block4" data-type="产品建议" bindtap="handleTap">
     <view class="cate">产品建议</view>
   </view>
-  <view class="block4">
+  <view class="block4" data-type="违规举报" bindtap="handleTap">
     <view class="cate">违规举报</view>
   </view>
-  <view class="block4">
+  <view class="block4" data-type="其他" bindtap="handleTap">
     <view class="cate">其他</view>
   </view>
 </view>
@@ -39,25 +39,25 @@
 
 <view wx:if="{{currentTab == 2}}" class="con">
   <view class="sub-text secondary-text-color">选择你遇到的问题</view>
-  <view class="block4">
+  <view class="block4" data-type="小程序闪退" bindtap="handleTap">
     <view class="cate">小程序闪退</view>
   </view>
-  <view class="block4">
+  <view class="block4" data-type="页面卡顿" bindtap="handleTap">
     <view class="cate">页面卡顿</view>
   </view>
-  <view class="block4">
+  <view class="block4" data-type="页面刷新失败" bindtap="handleTap">
     <view class="cate1">页面刷新失败</view>
   </view>
-  <view class="block4">
+  <view class="block4" data-type="页面排版错误" bindtap="handleTap">
     <view class="cate1">页面排版错误</view>
   </view>
-  <view class="block4">
+  <view class="block4" data-type="信息发布失败" bindtap="handleTap">
     <view class="cate1">信息发布失败</view>
   </view>
-  <view class="block4">
+  <view class="block4" data-type="图片上传/加载失败" bindtap="handleTap">
     <view class="cate1">图片上传/加载失败</view>
   </view>
-  <view class="block4">
-    <view class="cate1">其他异常</view>
+  <view class="block4" data-type="其他功能异常" bindtap="handleTap">
+    <view class="cate1">其他功能异常</view>
   </view>
 </view>

miniprogram/pages/publisherLogin/publisherLogin.wxml

@@ -2,7 +2,7 @@
 <view class="title primary-text-color">社团/组织入驻</view>
 
 <scroll-view wx:if="{{currentTab == 0}}" scroll-y style="height: {{winHeight - 60}}px;">
-  <view class="sub-title primary-text-color">社团/组织如何注册入驻？</view>
+  <view class="sub-title">社团/组织如何注册入驻？</view>
   <view class="sub-sub-title">1、前提条件</view>
   <view class="text">浙江大学社团/学生组织的负责人代表社团/学生组织进行入驻登记。</view>
   <view class="sub-sub-title">2、输入邀请码</view>
@@ -12,7 +12,7 @@
   <view class="sub-sub-title">4、入驻成功</view>
   <view class="text">填写完成后，相应的社团/组织管理功能将开启。</view>
 
-  <view class="sub-title primary-text-color">社团/组织成功入驻，我可以：</view>
+  <view class="sub-title">社团/组织成功入驻，我可以：</view>
   <view class="sub-sub-title">1、发布活动</view>
   <view class="text">发布近期召开的活动，招纳活动参与者，扩大活动影响力和宣传范围。</view>
   <view class="sub-sub-title">2、发布通知</view>

miniprogram/pages/publisherLogin/publisherLogin.wxss

@@ -15,7 +15,6 @@
 .sub-sub-title {
   font-size: 35rpx;
   margin: 20rpx 40rpx;
-  font-weight: 600;
 }
 
 .radio {
@@ -43,8 +42,7 @@
 
 .title2 {
   align-self: center;
-  font-size: 50rpx;
-  font-weight: 900;
+  font-size: 40rpx;
   margin-top: 100rpx;
   margin-bottom: 100rpx;
 }

miniprogram/pages/search/search.wxss

@@ -37,12 +37,12 @@
 
 .hot-tag-title {
   font-size: 30rpx;
-  margin-top: 10rpx;
-  margin-left: 40rpx;
+  margin-top: 20rpx;
+  margin-left: 50rpx;
 }
 
 .hot-tags {
-  margin: 10rpx 40rpx;
+  margin: 0rpx 40rpx;
 }
 
 .hot-tag {