细节修改

miniprogram/app.wxss

@@ -8,43 +8,6 @@
   padding: 200rpx 0;
   box-sizing: border-box;
 }
-
-.dark-primary-color {
-  background: #303F9F;
-}
-
-.default-primary-color {
-  background: #3F51B5;
-}
-
-.dark-primary-color-font {
-  color: #303F9F;
-}
-
-.default-primary-color-font {
-  color: #3F51B5;
-}
-
-.light-primary-color {
-  background: #C5CAE9;
-}
-
-.accent-color {
-  background: #FF4081;
-}
-
-.primary-text-color {
-  color: #212121;
-}
-
-.divider-color {
-  background: #BDBDBD;
-}
-
-.block-background-color {
-  background: #F0F0F0;
-}
-
 /* new color here */
 
 .primary-text-color {

miniprogram/pages/activity/activity.wxml

@@ -18,13 +18,24 @@
         <view class="time primary-text-color">{{activityInfo.time}}</view>
       </view>
 
-      <view wx:if="{{activityInfo.activityTime != ''}}" class="activity-time">时间：{{activityInfo.activityTime}}</view>
+      <view wx:if="{{activityInfo.details != ''}}" class="text">
+        <text>{{activityInfo.details}}</text>
+      </view>
 
-      <view wx:if="{{activityInfo.place != ''}}" class="activity-place">地点：{{activityInfo.place}}</view>
+      <view class="line primary-background-color"></view>
+
+      <view wx:if="{{activityInfo.activityTime != ''}}" class="text">时间：{{activityInfo.activityTime}}</view>
+
+      <view wx:if="{{activityInfo.place != ''}}" class="text">地点：{{activityInfo.place}}</view>
+
+      <view class="text">活动提供：</view>
+
+      <view class="text">面向对象：</view>
+
+      <view class="text">联系方式：</view>
+
+      <view class="text">报名链接：</view>
 
-      <view wx:if="{{activityInfo.details != ''}}" class="activity-detail">
-        <rich-text>{{activityInfo.details}}</rich-text>
-      </view>
       <imagePicker wx:if="{{activityInfo.photo.length != 0}}" value="{{activityInfo.photo}}" max="1"
         image-width="{{activityInfo.photo.length == 1 ? 696 : activityInfo.photo.length <= 4 ? 330 : 220}}"
         image-height="{{activityInfo.photo.length == 1 ? 696 : activityInfo.photo.length <= 4 ? 330 : 220}}" readonly />
@@ -46,8 +57,8 @@
   <view class="comment block-background-color">
     <view class="comment-inside" style="display: flex; align-items: center;">
       <icon type="info" size="20" color="#B0B0B0"></icon>
-      <input class="comment-input" style="width: 550rpx;" model:value="{{commentText}}" placeholder="提问"
-        confirm-type="send" bindconfirm="comment"></input>
+      <input class="comment-input secondary-background-color " style="width: 550rpx;" model:value="{{commentText}}"
+        placeholder="提问" confirm-type="send" bindconfirm="comment"></input>
     </view>
     <view class="comment-button {{commentText.length < 5 ? 'secondary-text-color' : 'primary-text-color'}}"
       bindtap="comment">发送</view>

miniprogram/pages/activity/activity.wxss

@@ -151,23 +151,14 @@
 }
 
 
-.activity-time {
+.text {
   font-size: 24rpx;
   margin-left: 50rpx;
   margin-bottom: 20rpx;
   margin-right: 20rpx;
 }
 
-.activity-place {
-  font-size: 24rpx;
-  margin-left: 50rpx;
-  margin-bottom: 20rpx;
-  margin-right: 20rpx;
-}
-
-.activity-detail {
-  font-size: 24rpx;
-  margin-left: 50rpx;
-  margin-bottom: 20rpx;
-  margin-right: 20rpx;
+.line {
+  height: 2rpx;
+  margin: 10rpx 20rpx 20rpx 20rpx;
 }

miniprogram/pages/publisherPage/publisherPage.wxml

@@ -1,62 +1,66 @@
 <!-- 为发布者个人页面 -->
-<view class="card block-background-color">
+<view class="card">
   <cover-image class="avatar" src="{{hasPubInfo ? pubInfo[pubIndex].publisher[0].avatar : '/images/user/user.png'}}">
   </cover-image>
-  <view wx:if="{{hasPubInfo}}" class="publisher-name primary-text">{{pubInfo[pubIndex].publisher[0].name}}</view>
+  <view wx:if="{{hasPubInfo}}" class="publisher-name">{{pubInfo[pubIndex].publisher[0].name}}</view>
 </view>
 
-<view class="gap"></view>
-
-<view class="btn block-background-color" hover-class="btn-hover">
-  <image class="btn-icon" mode="aspectFit" src="/images/publisher/home.png"></image>
-  <view class="btn-text primary-text">我的主页</view>
-  <view class="btn-arrow secondary-text">></view>
+<view class="block2" hover-class="btn-hover">
+  <view class="left">
+    <image class="btn-icon" mode="aspectFit" src="/images/publisher/home.png"></image>
+    <view>我的主页</view>
+  </view>
+  <view>></view>
 </view>
 
-<view class="btn block-background-color" hover-class="btn-hover" bindtap="publishInfo">
-  <image class="btn-icon" mode="aspectFit" src="/images/publisher/publish1.png"></image>
-  <view class="btn-text primary-text">发布信息</view>
+<view class="block" hover-class="btn-hover" bindtap="publishInfo">
+  <view class="left">
+    <image class="btn-icon" mode="aspectFit" src="/images/publisher/publish1.png"></image>
+    <view>发布信息</view>
+  </view>
   <view class="btn-arrow secondary-text">></view>
 </view>
 
-<view class="line"></view>
 
-<view class="btn block-background-color" hover-class="btn-hover" bindtap="myPublish">
-  <image class="btn-icon" mode="aspectFit" src="/images/publisher/publish2.png"></image>
-  <view class="btn-text primary-text">修改发布消息</view>
+<view class="block" hover-class="btn-hover" bindtap="myPublish">
+  <view class="left">
+    <image class="btn-icon" mode="aspectFit" src="/images/publisher/publish2.png"></image>
+    <view class="btn-text primary-text">修改发布消息</view>
+  </view>
   <view class="btn-arrow secondary-text">></view>
 </view>
 
-<view class="line"></view>
-
-<view class="btn block-background-color" hover-class="btn-hover" bindtap="publisherQuestion">
-  <image class="btn-icon" mode="aspectFit" src="/images/publisher/question.png"></image>
-  <view class="btn-text primary-text">我收到的问题</view>
+<view class="block2" hover-class="btn-hover" bindtap="publisherQuestion">
+  <view class="left">
+    <image class="btn-icon" mode="aspectFit" src="/images/publisher/question.png"></image>
+    <view class="btn-text primary-text">我收到的问题</view>
+  </view>
   <view class="btn-arrow secondary-text">></view>
 </view>
 
-<view class="gap"></view>
-
-<view class="btn block-background-color" hover-class="btn-hover" bindtap="administratorSetting">
-  <image class="btn-icon" mode="aspectFit" src="/images/publisher/setting.png"></image>
-  <view class="btn-text primary-text">管理员资格设置</view>
+<view class="block" hover-class="btn-hover" bindtap="administratorSetting">
+  <view class="left">
+    <image class="btn-icon" mode="aspectFit" src="/images/publisher/setting.png"></image>
+    <view class="btn-text primary-text">管理员资格设置</view>
+  </view>
   <view class="btn-arrow secondary-text">></view>
 </view>
 
-<view class="line"></view>
 
-<view class="btn block-background-color" hover-class="btn-hover" bindtap="publisherInfoChange">
-  <image class="btn-icon" mode="aspectFit" src="/images/publisher/adjust.png"></image>
-  <view class="btn-text primary-text">社团组织信息修改</view>
+<view class="block" hover-class="btn-hover" bindtap="publisherInfoChange">
+  <view class="left">
+    <image class="btn-icon" mode="aspectFit" src="/images/publisher/adjust.png"></image>
+    <view class="btn-text primary-text">社团组织信息修改</view>
+  </view>
   <view class="btn-arrow secondary-text">></view>
 </view>
 
-<view class="gap"></view>
-
 <picker model:value="{{pubIndex}}" range="{{pubName}}">
-  <view class="btn block-background-color">
-    <image class="btn-icon" mode="aspectFit" src="/images/publisher/switch.png"></image>
-    <view class="btn-text primary-text">切换社团组织</view>
+  <view class="block">
+    <view class="left">
+      <image class="btn-icon" mode="aspectFit" src="/images/publisher/switch.png"></image>
+      <view class="btn-text primary-text">切换社团组织</view>
+    </view>
     <view class="btn-arrow secondary-text">></view>
   </view>
 </picker>

miniprogram/pages/publisherPage/publisherPage.wxss

@@ -1,5 +1,7 @@
 .card {
   height: 300rpx;
+  margin-bottom: 2rpx;
+  background-color: #ffffff;
 }
 
 .avatar {
@@ -19,24 +21,30 @@
   left: 300rpx;
 }
 
-.location {
-  position: absolute;
-  font-size: 27rpx;
-  line-height: 30rpx;
-  top: 175rpx;
-  left: 330rpx;
-}
-
-.gap {
-  height: 20rpx;
+.block {
+  margin-bottom: 4rpx;
+  padding: 20rpx 40rpx 20rpx 20rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 30rpx;
+  background-color: #ffffff;
+  align-items: center;
 }
 
-.line {
-  height: 5rpx;
+.block2 {
+  margin-bottom: 20rpx;
+  padding: 20rpx 40rpx 20rpx 20rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 30rpx;
+  background-color: #ffffff;
+  align-items: center;
 }
 
-.btn {
-  height: 100rpx;
+.left {
+  display: flex;
 }
 
 .btn-hover {
@@ -44,25 +52,7 @@
 }
 
 .btn-icon {
-  position: relative;
-  float: left;
-  top: 28rpx;
-  left: 35rpx;
-  height: 44rpx;
-  width: 44rpx;
-}
-
-.btn-text {
-  position: relative;
-  float: left;
-  left: 50rpx;
-  line-height: 100rpx;
-  font-size: 35rpx;
-}
-
-.btn-arrow {
-  position: relative;
-  float: right;
-  right: 40rpx;
-  line-height: 100rpx;
-}
+  height: 40rpx;
+  width: 40rpx;
+  margin-right: 20rpx;
+}

miniprogram/pages/setting/setting.wxml

@@ -1,32 +1,46 @@
-<view class="btn block-background-color" hover-class="btn-hover" bindtap="myColor">
+<!-- <view class="btn" hover-class="btn-hover" bindtap="myColor">
   <image class="btn-icon" mode="aspectFit" src="/images/user/follow.png"></image>
   <view class="btn-text primary-text">主题颜色设置</view>
   <view class="btn-arrow secondary-text">></view>
+</view> -->
+
+<view class="block" hover-class="btn-hover" bindtap="opinion">
+  <view class="left">
+    <image class="btn-icon" mode="aspectFit" src="/images/user/head.png"></image>
+    <view>修改头像</view>
+  </view>
+  <view>></view>
 </view>
 
-<view class="line"></view>
+<view class="block" hover-class="btn-hover" bindtap="opinion">
+  <view class="left">
+    <image class="btn-icon" mode="aspectFit" src="/images/publisher/adjust.png"></image>
+    <view>修改昵称</view>
+  </view>
+  <view>></view>
+</view>
 
-<picker class="btn block-background-color" hover-class="btn-hover" bindchange="noticeIndexChange"
-  value="{{noticeIndex}}" range="{{noticeForm}}">
-  <image class="btn-icon" mode="aspectFit" src="/images/user/question.png"></image>
-  <view class="btn-text primary-text">消息通知形式</view>
-  <view class="btn-arrow secondary-text">{{noticeForm[noticeIndex]}}</view>
+<picker bindchange="noticeIndexChange" value="{{noticeIndex}}" range="{{noticeForm}}">
+  <view class="block" hover-class="btn-hover">
+    <view class="left">
+      <image class=" btn-icon" mode="aspectFit" src="/images/user/question.png">
+      </image>
+      <view>消息通知形式</view>
+    </view>
+    <view>{{noticeForm[noticeIndex]}}</view>
+  </view>
 </picker>
 
-<view class="gap"></view>
-
-<view class="btn block-background-color" hover-class="btn-hover">
+<!-- <view class="btn block-background-color" hover-class="btn-hover">
   <image class="btn-icon" mode="aspectFit" src="/images/user/setting.png"></image>
   <view class="btn-text primary-text">收到消息振动</view>
   <switch class="btn-arrow secondary-text" checked="{{vibrate}}" bindchange="vibrateChange" />
-</view>
-
-<view class="line"></view>
-
-<view class="btn block-background-color" hover-class="btn-hover" bindtap="opinion">
-  <image class="btn-icon" mode="aspectFit" src="/images/user/feedback.png"></image>
-  <view class="btn-text primary-text">退出登录</view>
-  <view class="btn-arrow secondary-text">></view>
-</view>
+</view> -->
 
-<view class="gap"></view>
+<view class="block" hover-class="btn-hover" bindtap="opinion">
+  <view class="left">
+    <image class="btn-icon" mode="aspectFit" src="/images/user/feedback.png"></image>
+    <view>退出登录</view>
+  </view>
+  <view>></view>
+</view>

miniprogram/pages/setting/setting.wxss

@@ -1,43 +1,16 @@
-/* components/user/user.wxss */
-.card {
-  height: 300rpx;
+.block {
+  margin-bottom: 4rpx;
+  padding: 20rpx 40rpx 20rpx 20rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 30rpx;
+  background-color: #ffffff;
+  align-items: center;
 }
 
-.avatar {
-  position: absolute;
-  top: 50rpx;
-  left: 50rpx;
-  height: 200rpx;
-  width: 200rpx;
-  border-radius: 20%;
-}
-
-.nickname {
-  position: absolute;
-  font-size: 50rpx;
-  line-height: 50rpx;
-  top: 100rpx;
-  left: 300rpx;
-}
-
-.location {
-  position: absolute;
-  font-size: 27rpx;
-  line-height: 30rpx;
-  top: 175rpx;
-  left: 300rpx;
-}
-
-.gap {
-  height: 20rpx;
-}
-
-.line {
-  height: 5rpx;
-}
-
-.btn {
-  height: 100rpx;
+.left {
+  display: flex;
 }
 
 .btn-hover {
@@ -45,25 +18,7 @@
 }
 
 .btn-icon {
-  position: relative;
-  float: left;
-  top: 28rpx;
-  left: 35rpx;
-  height: 44rpx;
-  width: 44rpx;
-}
-
-.btn-text {
-  position: relative;
-  float: left;
-  left: 50rpx;
-  line-height: 100rpx;
-  font-size: 35rpx;
-}
-
-.btn-arrow {
-  position: relative;
-  float: right;
-  right: 40rpx;
-  line-height: 100rpx;
+  height: 40rpx;
+  width: 40rpx;
+  margin-right: 20rpx;
 }