From a4f739375e8d1e0b399e3493bd4364cc7b9e8719 Mon Sep 17 00:00:00 2001
From: Renpc-kilig <308442850@qq.com>
Date: Thu, 2 Jul 2020 18:41:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BB=E5=8A=A8=E6=8A=A5?=
 =?UTF-8?q?=E5=90=8D=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=88=9B=E5=BB=BA=E5=9B=A2?=
 =?UTF-8?q?=E9=98=9F=E6=97=B6=E5=A4=B4=E5=83=8F=E6=98=BE=E7=A4=BA=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/activity.js               |  1 +
 pages/activityDetail/activityDetail.js   |  6 +++++-
 pages/activityDetail/activityDetail.wxml |  4 ++--
 pages/activitySign/activitySign.js       | 10 ++++++----
 pages/newTeam/newTeam.wxml               |  5 ++---
 pages/newTeam/newTeam.wxss               | 12 ++++++++++++
 6 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/pages/activity/activity.js b/pages/activity/activity.js
index f5ce8cc..f66230b 100644
--- a/pages/activity/activity.js
+++ b/pages/activity/activity.js
@@ -23,6 +23,7 @@ Page({
     app.restAjax.get(app.restAjax.path(app.activityUrl + '/wxminiapp/activitylibrary/listpageactivitylibraryfornetrelease', []), 
       self.data.pages, null, function(code, data) {
         if('200' == code) {
+          console.log(data.rows)
           for(var item of data.rows) {
             if('' != item.activityImage) {
                 item.activityImage = app.activityUrl + '/route/file/downloadfile/true/' + item.activityImage;
diff --git a/pages/activityDetail/activityDetail.js b/pages/activityDetail/activityDetail.js
index 1f67409..c610f84 100644
--- a/pages/activityDetail/activityDetail.js
+++ b/pages/activityDetail/activityDetail.js
@@ -54,13 +54,16 @@ Page({
   onLoad: function (options) {
     var self = this;
     this.getToken().then(result => {
-      console.log(self.data.token)
       var url;
       var id = options.id;
       if(!self.data.token) {
         url = '/wxminiapp/activitylibrary/getactivitylibrarybyidrelease/' + id;
+        self.setData({
+          token: null
+        })
       }else {
         url = '/wxminiapp/activitylibrary/getactivitylibrarybyid/' + id
+        self.getToken()
       }
       app.restAjax.get(app.restAjax.path(app.activityUrl + url, []), 
         {}, {
@@ -73,6 +76,7 @@ Page({
             self.setData({
               dataMap: data
             })
+            console.log(self.data.dataMap)
           }
       }, function() {
 
diff --git a/pages/activityDetail/activityDetail.wxml b/pages/activityDetail/activityDetail.wxml
index b06f942..b636b25 100644
--- a/pages/activityDetail/activityDetail.wxml
+++ b/pages/activityDetail/activityDetail.wxml
@@ -41,9 +41,9 @@
     </view>
   </view>
 </view>
-<view class="sign-box" bindtap="goSign" data-id="{{dataMap.activityLibraryId}}" wx-if="{{dataMap.activityState == 3 && dataMap.isEnroll == ''}}">
+<view class="sign-box" bindtap="goSign" data-id="{{dataMap.activityLibraryId}}" wx-if="{{dataMap.activityState == '3' && dataMap.isEnroll == ''}}">
   <view class="sign-btn">报名</view>
 </view>
-<view class="sign-box" bindtap="cancel" data-id="{{dataMap.activityLibraryId}}" wx-if="{{dataMap.activityState != 6 && dataMap.activityState != 7 && dataMap.activityState != 99 && dataMap.isEnroll != ''}}">
+<view class="sign-box" bindtap="cancel" data-id="{{dataMap.activityLibraryId}}" wx-if="{{dataMap.activityState != '6' && dataMap.activityState != '7' && dataMap.activityState != '99' && dataMap.isEnroll != ''}}">
   <view class="sign-btn">取消报名</view>
 </view>
diff --git a/pages/activitySign/activitySign.js b/pages/activitySign/activitySign.js
index 6935898..81536c2 100644
--- a/pages/activitySign/activitySign.js
+++ b/pages/activitySign/activitySign.js
@@ -41,8 +41,8 @@ Page({
 		    if('200' == code) {
           
         }
-    }, function() {
-
+    }, function(code, data) {
+      app.dialog.msg(data.msg)
     }, function() {
       
     })
@@ -68,7 +68,7 @@ Page({
       userName: self.data.name,
       userPhone: self.data.phone
     }
-    app.restAjax.post(app.restAjax.path(app.activityUrl + '/app/activityuserapply/saveactivityuserapplyrelease', []), 
+    app.restAjax.post(app.restAjax.path(app.activityUrl + '/app/activityuserapply/saveactivityuserapply', []), 
       activityUserApplyVO, {
         headers: {
           token: self.data.token
@@ -76,7 +76,9 @@ Page({
       }, function(code, data) {
         console.log(data)
 		    if('200' == code) {
-          
+          wx.navigateTo({
+            url: '../activitySign/activitySign?id=' + self.data.activityId
+          })
         }
     }, function() {
 
diff --git a/pages/newTeam/newTeam.wxml b/pages/newTeam/newTeam.wxml
index 844a71f..0ef715f 100644
--- a/pages/newTeam/newTeam.wxml
+++ b/pages/newTeam/newTeam.wxml
@@ -1,12 +1,11 @@
 <view class="new-team">
-  <view class="row img-row">
+  <view class="row img-row avatar-row">
     <view class="row-title">团队头像：</view>
-    <view class="row-text" bindtap="uploadPhoto" wx:if="{{photo}}">
+    <view class="row-text avatar" bindtap="uploadPhoto" wx:if="{{photo}}">
       <image src="{{photo}}" class="row-img"></image>
     </view>
     <view class="row-text" wx:else bindtap="uploadPhoto">
       点击上传
-      <image src="" class="row-img"></image>
     </view>
   </view>
   <view class="row">
diff --git a/pages/newTeam/newTeam.wxss b/pages/newTeam/newTeam.wxss
index 0b4573b..ceb514f 100644
--- a/pages/newTeam/newTeam.wxss
+++ b/pages/newTeam/newTeam.wxss
@@ -11,6 +11,8 @@
   color: #242424;
   font-size: 32rpx;
   width: 24%;
+  display: flex;
+  align-items: center;
 }
 .row-text{
   width: 75%;
@@ -73,4 +75,14 @@ label{
   width: 77%;
   font-size: 26rpx;
   height: 55rpx;
+}
+.avatar{
+  height: 150rpx;
+}
+.avatar image{
+  width: 150rpx;
+  height: 150rpx;
+}
+.avatar-row{
+  height: 150rpx;
 }
\ No newline at end of file