Merge refs/remotes/origin/master into refs/heads/master

miniprogram/pages/activityPublish/activityPublish.js

@@ -38,10 +38,9 @@ Page({
     notiDetail: "",
     notiPoster: [],
     notiPicture: [],
-    types1: ["志愿活动", "文艺活动", "体育活动", "学术活动", "其他活动"],
-    types2: ["二课分", "三课分", "志愿者小时数", "综素", "勤工助学", "活动纪实"],
-    types3: ["组织纳新", "社团纳新"],
-    types4: ["选课通知", "水电通知", "缴费通知", "其他通知"],
+    types1: ["志愿活动", "文艺活动", "体育活动", "学术活动", "素质拓展", "精品课程", "其他活动"],
+    types2: ["二课分", "三课分", "四课分", "勤工助学", "志愿者小时数", "综素/活动纪实"],
+    types3: ["水电通知", "缴费通知", "假期通知", "后勤通知", "图书馆通知", "选课通知", "竞赛通知", "考试通知", "其他通知"],
     publisherId: ""
   },
 

miniprogram/pages/activityPublish/activityPublish.wxml

@@ -19,188 +19,152 @@
 </view>
 
 <scroll-view wx:if="{{currentTab == 1}}" scroll-y style="height: {{winHeight - 60}}px;">
-  <view class="subTitle">活动发布</view>
-  <view class="block">
-    <view class="cate">*活动名称</view>：
-    <input class="input block-background-color" placeholder="请输入活动名称" model:value="{{activityName}}" />
-  </view>
-  <view class="block">
-    <view class="cate">简介</view>：
-    <input class="input block-background-color" placeholder="请输入活动副标题" model:value="{{activitySubTitle}}" />
-  </view>
-  <view class="block">
-    <view class="cate">*活动时间</view>：
-    <input class="input block-background-color" placeholder="请输入活动开展的时间" model:value="{{activityTime}}" />
-  </view>
-  <view class="block">
-    <view class="cate">*活动地点</view>：
-    <input class="input block-background-color" placeholder="请输入活动开展的地点" model:value="{{activityPlace}}" />
-  </view>
-  <view class="block">
-    <view class="cate">*活动属性</view>：
-    <checkbox-group class="checkbox-group" bindchange="activityAttrUpdate">
-      <label wx:for="{{types1}}" wx:for-item="item" wx:key="*this">
-        <checkbox class="checkbox" value="{{item}}" color="#3F51B5">{{item}}</checkbox>
-      </label>
-    </checkbox-group>
-  </view>
-  <view class="block">
-    <view class="cate">活动提供</view>：
-    <checkbox-group class="checkbox-group" bindchange="activitySupplyUpdate">
-      <label wx:for="{{types2}}" wx:for-item="item" wx:key="*this">
-        <checkbox class="checkbox" value="{{item}}" color="#3F51B5">{{item}}</checkbox>
-      </label>
-    </checkbox-group>
-  </view>
-  <view class="block">
-    <view class="cate">*联系方式</view>：
-    <input class="input block-background-color" model:value="{{activityContact}}" placeholder="请输入联系方式" />
-  </view>
-  <view class="block">
-    <view class="cate">面向对象</view>：
-    <input class="input block-background-color" model:value="{{activityAim}}" placeholder="请输入面向对象" />
-  </view>
-  <view class="block2">
-    <view class="block22">
-      <view class="cate">*活动详情</view>：
+  <view class="sub-title">活动发布</view>
+  <form bindsubmit="switch4">
+    <view class="block">
+      <view class="cate">活动名称<span style="color: #FF0000">*</span></view>
+      <input class="input" placeholder="请填写" name="name" />
     </view>
-    <textarea class="textarea block-background-color" placeholder="请输入具体活动信息"
-      model:value="{{activityDetail}}"></textarea>
-  </view>
-  <view class="block2">
-    <view class="block22">
-      <view class="cate">活动海报</view>：
+    <view class="block">
+      <view class="cate" style="align-self: flex-start;">活动类型<span style="color: #FF0000">*</span></view>
+      <radio-group class="radio-group" name="type">
+        <label wx:for="{{types1}}" wx:for-item="item" wx:key="*this">
+          <radio class="radio" value="{{item}}" color="#469298">{{item}}</radio>
+        </label>
+      </radio-group>
     </view>
-    <imagePicker images="{{activityPoster}}" max="1" image-width="450" image-height="270"
-      bindchange="updateActivityPoster" />
-  </view>
-  <view class="block2">
-    <view class="block22">
-      <view class="cate">活动图片</view>：
+    <view class="block">
+      <view class="cate" style="align-self: flex-start;">活动简介<span style="color: #FF0000">*</span></view>
+      <textarea class="input" style="height: 100rpx;" placeholder="请填写" name="brief"></textarea>
     </view>
-    <imagePicker images="{{activityPicture}}" max="9" image-width="145" image-height="145"
-      bindchange="updateActivityPicture" />
-  </view>
-  <view class="block2">
-    <view class="block22">
-      <view class="cate">现宣信息</view>：
+    <view class="block" style="margin-bottom: 20rpx;">
+      <view class="cate" style="align-self: flex-start;">活动详情<span style="color: #FF0000">*</span></view>
+      <textarea class="input" style="height: 200rpx;" placeholder="请填写" name="detail"></textarea>
     </view>
-    <textarea class="textarea block-background-color" placeholder="请输入你的现宣信息"
-      model:value="{{activityProInfo}}"></textarea>
-  </view>
-  <view class="block">
-    <view class="cate">报名链接</view>：
-    <input class="input block-background-color" model:value="{{activitySrc}}" placeholder="请输入报名链接" />
-  </view>
-  <myButton class="button" type="primary" bindtap="switch4">提交</myButton>
+    <view class="block">
+      <view class="cate" style="align-self: flex-start;">活动封图</view>
+      <imagePicker name="poster" max="1" image-width="450" image-height="270" />
+    </view>
+    <view class="block" style="margin-bottom: 20rpx;">
+      <view class="cate" style="align-self: flex-start;">活动图片</view>
+      <imagePicker name="photo" max="9" image-width="145" image-height="145" />
+    </view>
+    <view class="block">
+      <view class="cate" style="align-self: flex-start;">活动提供</view>
+      <radio-group class="radio-group" name="type">
+        <label wx:for="{{types2}}" wx:for-item="item" wx:key="*this">
+          <radio class="radio" value="{{item}}" color="#469298">{{item}}</radio>
+        </label>
+      </radio-group>
+    </view>
+    <view class="block" style="margin-bottom: 20rpx;">
+      <view class="cate">面向对象</view>
+      <input class="input" placeholder="请填写" name="orient" />
+    </view>
+    <view class="block">
+      <view class="cate">活动时间</view>
+      <input class="input" placeholder="请填写" name="time" />
+    </view>
+    <view class="block">
+      <view class="cate">活动地点</view>
+      <input class="input" placeholder="请填写" name="place" />
+    </view>
+    <view class="block">
+      <view class="cate">联系方式</view>
+      <input class="input" placeholder="请填写" name="contact" />
+    </view>
+    <view class="block">
+      <view class="cate">报名链接</view>
+      <input class="input" placeholder="请填写" name="link" />
+    </view>
+    <myButton class="button" type="primary" bindtap="switch4">提交</myButton>
+  </form>
 </scroll-view>
 
 <scroll-view wx:if="{{currentTab == 2}}" scroll-y style="height: {{winHeight - 60}}px;">
-  <view class="subTitle">纳新发布</view>
-  <view class="block">
-    <view class="cate">*纳新标题</view>：
-    <input class="input block-background-color" placeholder="请输入纳新标题" model:value="{{recruitName}}" />
-  </view>
-  <view class="block">
-    <view class="cate">简介</view>：
-    <input class="input block-background-color" placeholder="请输入纳新副标题" model:value="{{recruitSubTitle}}" />
-  </view>
-  <view class="block">
-    <view class="cate">*纳新时间</view>：
-    <input class="input block-background-color" placeholder="请输入纳新开展的时间" model:value="{{recruitTime}}" />
-  </view>
-  <view class="block">
-    <view class="cate">*纳新属性</view>：
-    <radio-group class="checkbox-group" bindchange="recruitAttrUpdate">
-      <label wx:for="{{types3}}" wx:for-item="item" wx:key="*this">
-        <radio class="checkbox" value="{{item}}" color="#3F51B5">{{item}}</radio>
-      </label>
-    </radio-group>
-  </view>
-  <view class="block">
-    <view class="cate">*联系方式</view>：
-    <input class="input block-background-color" model:value="{{recruitContact}}" placeholder="请输入联系方式" />
-  </view>
-  <view class="block">
-    <view class="cate">面向对象</view>：
-    <input class="input block-background-color" model:value="{{recruitAim}}" placeholder="请输入面向对象" />
-  </view>
-  <view class="block2">
-    <view class="block22">
-      <view class="cate">*纳新详情</view>：
+  <view class="sub-title">纳新发布</view>
+  <form bindsubmit="switch4">
+    <view class="block">
+      <view class="cate">纳新标题<span style="color: #FF0000">*</span></view>
+      <input class="input" placeholder="请填写" name="name" />
     </view>
-    <textarea class="textarea block-background-color" placeholder="请输入具体纳新信息"
-      model:value="{{recruitDetail}}"></textarea>
-  </view>
-  <view class="block2">
-    <view class="block22">
-      <view class="cate">纳新海报</view>：
+    <view class="block">
+      <view class="cate" style="align-self: flex-start;">纳新简介<span style="color: #FF0000">*</span></view>
+      <textarea class="input" style="height: 100rpx;" placeholder="请填写" name="brief"></textarea>
     </view>
-    <imagePicker images="{{recruitPoster}}" max="1" image-width="450" image-height="270"
-      bindchange="updateRecruitPoster" />
-  </view>
-  <view class="block2">
-    <view class="block22">
-      <view class="cate">纳新图片</view>：
+    <view class="block" style="margin-bottom: 20rpx;">
+      <view class="cate" style="align-self: flex-start;">纳新详情<span style="color: #FF0000">*</span></view>
+      <textarea class="input" style="height: 200rpx;" placeholder="请填写" name="detail"></textarea>
     </view>
-    <imagePicker images="{{recruitPicture}}" max="9" image-width="145" image-height="145"
-      bindchange="updateRecruitPicture" />
-  </view>
-  <view class="block2">
-    <view class="block22">
-      <view class="cate">现宣信息</view>：
+    <view class="block">
+      <view class="cate" style="align-self: flex-start;">纳新封图</view>
+      <imagePicker name="poster" max="1" image-width="450" image-height="270" />
     </view>
-    <textarea class="textarea block-background-color" placeholder="请输入你的现宣信息"
-      model:value="{{recruitProInfo}}"></textarea>
-  </view>
-  <view class="block">
-    <view class="cate">报名链接</view>：
-    <input class="input block-background-color" model:value="{{recruitSrc}}" placeholder="请输入报名链接" />
-  </view>
-  <myButton class="button" type="primary" bindtap="switch4">提交</myButton>
+    <view class="block" style="margin-bottom: 20rpx;">
+      <view class="cate" style="align-self: flex-start;">纳新图片</view>
+      <imagePicker name="photo" max="9" image-width="145" image-height="145" />
+    </view>
+    <view class="block">
+      <view class="cate">面向对象</view>
+      <input class="input" placeholder="请填写" name="orient" />
+    </view>
+    <view class="block">
+      <view class="cate">纳新时间</view>
+      <input class="input" placeholder="请填写" name="time" />
+    </view>
+    <view class="block">
+      <view class="cate">现宣信息</view>
+      <input class="input" placeholder="请填写" name="place" />
+    </view>
+    <view class="block">
+      <view class="cate">联系方式</view>
+      <input class="input" placeholder="请填写" name="contact" />
+    </view>
+    <view class="block">
+      <view class="cate">报名链接</view>
+      <input class="input" placeholder="请填写" name="link" />
+    </view>
+    <myButton class="button" type="primary" bindtap="switch4">提交</myButton>
+  </form>
 </scroll-view>
 
 <scroll-view wx:if="{{currentTab == 3}}" scroll-y style="height: {{winHeight - 60}}px;">
-  <view class="subTitle">通知发布</view>
-  <view class="block">
-    <view class="cate">*通知标题</view>：
-    <input class="input block-background-color" placeholder="请输入通知标题" model:value="{{notiName}}" />
-  </view>
-  <view class="block">
-    <view class="cate">简介</view>：
-    <input class="input block-background-color" placeholder="请输入通知副标题" model:value="{{notiSubTitle}}" />
-  </view>
-  <view class="block">
-    <view class="cate">*通知属性</view>：
-    <checkbox-group class="checkbox-group" bindchange="notiAttrUpdate">
-      <label wx:for="{{types4}}" wx:for-item="item" wx:key="*this">
-        <checkbox class="checkbox" value="{{item}}" color="#3F51B5">{{item}}</checkbox>
-      </label>
-    </checkbox-group>
-  </view>
-  <view class="block">
-    <view class="cate">面向对象</view>：
-    <input class="input block-background-color" model:value="{{notiAim}}" placeholder="请输入面向对象" />
-  </view>
-  <view class="block2">
-    <view class="block22">
-      <view class="cate">*通知详情</view>：
+  <view class="sub-title">通知发布</view>
+  <form bindsubmit="switch4">
+    <view class="block">
+      <view class="cate">通知标题<span style="color: #FF0000">*</span></view>
+      <input class="input" placeholder="请填写" name="name" />
     </view>
-    <textarea class="textarea block-background-color" placeholder="请输入通知详情" model:value="{{notiDetail}}"></textarea>
-  </view>
-  <view class="block2">
-    <view class="block22">
-      <view class="cate">通知海报</view>：
+    <view class="block">
+      <view class="cate" style="align-self: flex-start;">通知类型<span style="color: #FF0000">*</span></view>
+      <radio-group class="radio-group" name="type">
+        <label wx:for="{{types3}}" wx:for-item="item" wx:key="*this">
+          <radio class="radio" value="{{item}}" color="#469298">{{item}}</radio>
+        </label>
+      </radio-group>
     </view>
-    <imagePicker images="{{notiPoster}}" max="1" image-width="450" image-height="270" bindchange="updateNotiPoster" />
-  </view>
-  <view class="block2">
-    <view class="block22">
-      <view class="cate">通知图片</view>：
+    <view class="block">
+      <view class="cate" style="align-self: flex-start;">通知简介<span style="color: #FF0000">*</span></view>
+      <textarea class="input" style="height: 100rpx;" placeholder="请填写" name="brief"></textarea>
     </view>
-    <imagePicker images="{{notiPicture}}" max="9" image-width="145" image-height="145" bindchange="updateNotiPicture" />
-  </view>
-  <myButton class="button" type="primary" bindtap="switch4">提交</myButton>
+    <view class="block" style="margin-bottom: 20rpx;">
+      <view class="cate" style="align-self: flex-start;">通知详情<span style="color: #FF0000">*</span></view>
+      <textarea class="input" style="height: 200rpx;" placeholder="请填写" name="detail"></textarea>
+    </view>
+    <view class="block">
+      <view class="cate" style="align-self: flex-start;">通知封图</view>
+      <imagePicker name="poster" max="1" image-width="450" image-height="270" />
+    </view>
+    <view class="block" style="margin-bottom: 20rpx;">
+      <view class="cate" style="align-self: flex-start;">通知图片</view>
+      <imagePicker name="photo" max="9" image-width="145" image-height="145" />
+    </view>
+    <view class="block">
+      <view class="cate">通知链接</view>
+      <input class="input" placeholder="请填写" name="link" />
+    </view>
+    <myButton class="button" type="primary" bindtap="switch4">提交</myButton>
+  </form>
 </scroll-view>
 
 <view wx:if="{{currentTab == 4}}" class="con">

miniprogram/pages/activityPublish/activityPublish.wxss

@@ -6,35 +6,19 @@
   font-weight: 800;
 }
 
-.subTitle {
+.sub-title {
   font-size: 35rpx;
   margin: 20rpx 40rpx;
   font-weight: 800;
 }
 
-.thirdTitle {
-  font-size: 35rpx;
-  margin: 20rpx 40rpx;
-  font-weight: 600;
-}
-
-.picker-date {
-  width: 450rpx;
-  text-align: center;
-}
-
-.picker-time {
-  width: 210rpx;
-  text-align: center;
-}
-
-.checkbox {
+.radio {
   transform: scale(0.8);
   margin-left: 10rpx;
 }
 
-.checkbox-group {
-  width: 450rpx;
+.radio-group {
+  width: 500rpx;
 }
 
 .text {
@@ -43,8 +27,7 @@
 }
 
 .button {
-  margin-top: 40rpx;
-  margin-bottom: 40rpx;
+  margin: 10rpx;
 }
 
 .title2 {
@@ -57,47 +40,19 @@
 
 .block {
   display: flex;
-  margin: 20rpx 40rpx;
-  font-size: 35rpx;
   align-items: center;
+  margin: 4rpx 0rpx;
+  padding: 20rpx 40rpx;
+  font-size: 30rpx;
+  background-color: #FFFFFF;
 }
 
-.block2 {
-  display: flex;
-  margin: 20rpx 40rpx;
-  font-size: 35rpx;
-}
-
-.block22 {
-  display: flex;
+.cate {
+  width: 160rpx;
 }
 
 .input {
-  border-radius: 10rpx;
-  width: 450rpx;
-  padding: 0 20rpx;
-}
-
-.textarea {
-  border-radius: 10rpx;
-  width: 450rpx;
-  height: 200rpx;
-  padding: 0 20rpx;
-}
-
-.poster {
-  width: 450rpx;
-  height: 270rpx;
-}
-
-.picture {
-  width: 100rpx;
-  height: 100rpx;
-}
-
-.cate {
-  width: 160rpx;
-  text-align: right;
+  width: 500rpx;
 }
 
 .con {

miniprogram/pages/opinion/opinion.js

@@ -5,6 +5,7 @@ Page({
    */
   data: {
     currentTab: 0,
+    probType: ''
   },
 
   stopTouchMove: function () {
@@ -24,6 +25,13 @@ Page({
     })
   },
 
+  handleTap: function (e) {
+    this.setData({
+      currentTab: 0,
+      probType: e.currentTarget.dataset.type
+    })
+  },
+
   /**
    * 生命周期函数--监听页面加载
    */

miniprogram/pages/opinion/opinion.wxml

@@ -2,7 +2,7 @@
 <view wx:if="{{currentTab == 0}}">
   <view class="block" bindtap="switch1">
     <view class="cate">问题类型</view>
-    <input class="input" disabled placeholder="请选择问题类型" />
+    <input class="input" disabled placeholder="请选择问题类型" value="{{probType}}" />
     >
   </view>
   <view class="block2">
@@ -25,7 +25,7 @@
   <view class="block4" bindtap="switch2">
     <view class="cate">功能异常</view>>
   </view>
-  <view class="block4">
+  <view class="block4" data-type="产品建议" bindtap="handleTap">
     <view class="cate">产品建议</view>
   </view>
   <view class="block4">

miniprogram/pages/publisherLogin/publisherLogin.wxss

@@ -24,7 +24,7 @@
 }
 
 .radio-group {
-  width: 450rpx;
+  width: 500rpx;
 }
 
 .text {

miniprogram/pages/user/user.wxml

@@ -52,7 +52,7 @@
 </view>
 
 <view wx:if="{{hasUserInfo}}">
-  <view wx:if="{{pubInfo.length !== 0}}" class="publisher primary-background-color" hover-class="btn-hover"
+  <view wx:if="{{pubInfo.length === 0}}" class="publisher primary-background-color" hover-class="btn-hover"
     bindtap="publisherLogin">
     <text class="white-text-color">社团\n组织\n入驻</text>
   </view>