diff --git a/pages/club/createClub/createClub.js b/pages/club/createClub/createClub.js
index 342179e..ac88731 100644
--- a/pages/club/createClub/createClub.js
+++ b/pages/club/createClub/createClub.js
@@ -448,13 +448,13 @@ setclub: function () {
       duration: 1000
     })
   }
-  // else if(that.data.tagList.length==0){
-  //   wx.showToast({
-  //     title: '主打项目必填',
-  //     icon: 'none',
-  //     duration: 1000
-  //   })
-  // }
+  else if(!that.data.clubLogo){
+    wx.showToast({
+      title: '俱乐部logo不能为空',
+      icon: 'none',
+      duration: 1000
+    })
+  }
   else {
     re.request(Api.creatClub(),postData, header).then((res) => {
       console.log(res)
diff --git a/pages/index/editjoin/editjoin.js b/pages/index/editjoin/editjoin.js
index cf58a8a..5feae96 100644
--- a/pages/index/editjoin/editjoin.js
+++ b/pages/index/editjoin/editjoin.js
@@ -13,12 +13,17 @@ Page({
    */
   onLoad: function (options) {
     this.setData({
-      data:JSON.parse(options.data)
+      data:JSON.parse(options.data)[0]
     })
     console.log(this.data.data)
   
   },
-
+  genderChange: function (e) {
+    let gender = e.detail.value;
+    this.setData({
+      gender: gender
+    });
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/index/editjoin/editjoin.wxml b/pages/index/editjoin/editjoin.wxml
index 6ecf08b..c6fa6c2 100644
--- a/pages/index/editjoin/editjoin.wxml
+++ b/pages/index/editjoin/editjoin.wxml
@@ -2,23 +2,30 @@
   <view class="content">
       <view class="list">
         <view class="title">昵称</view>
-        <view class="inputbox"><input placeholder="宇航员飞行"/></view>
+        <view class="inputbox"><input placeholder="宇航员飞行" value="{{data.nickname}}"/></view>
       </view>
       <view class="list">
         <view class="title">手机号</view>
-        <view class="inputbox"><input placeholder="17222222222"/></view>
+        <view class="inputbox"><input placeholder="17222222222" value="{{data.phone}}"/></view>
       </view>
       <view class="list">
         <view class="title">性别</view>
-        <view class="inputbox"><input placeholder="男"/></view>
+        <radio-group name="gender" bindchange="genderChange" >
+                <label>
+                  <radio value="0" color="#FFCB12" checked="{{data.gender==0}}" />女
+                </label>
+                <label>
+                  <radio value="1" color="#FFCB12" checked="{{data.gender==1}}" />男
+                </label>
+              </radio-group>
       </view>
       <view class="list">
         <view class="title">真实姓名</view>
-        <view class="inputbox"><input placeholder="李三"/></view>
+        <view class="inputbox"><input placeholder="李三" value="{{data.realname}}"/></view>
       </view>
       <view class="list">
         <view class="title">身份证号</view>
-        <view class="inputbox"><input placeholder="451357199812053364"/></view>
+        <view class="inputbox"><input placeholder="451357199812053364" value="{{data.idcard}}"/></view>
       </view>
 
     </view>
diff --git a/pages/index/history/history.js b/pages/index/history/history.js
index 46b1a19..cf3976a 100644
--- a/pages/index/history/history.js
+++ b/pages/index/history/history.js
@@ -10,16 +10,12 @@ Page({
     ]
   },
   toedit:function(){
-    let data = JSON.stringify( wx.getStorageSync('stroe'))
+    let datas = JSON.stringify( wx.getStorageSync('stroe'))
     wx.navigateTo({
-      url: '/pages/index/history'
+      url: '../editjoin/editjoin?data='+datas
     })
-    console.log(data)
-    // wx.navigateTo({
-    //   url: '/pages/index/editjoin/editjoin?data='+data
-    // })
   },
-  NowIndex:function(e){
+NowIndex:function(e){
 // console.log(index);
 let id =e.currentTarget.dataset.id;
 
diff --git a/pages/index/myjoin/myjoin.js b/pages/index/myjoin/myjoin.js
index c135e8e..b3839b8 100644
--- a/pages/index/myjoin/myjoin.js
+++ b/pages/index/myjoin/myjoin.js
@@ -70,6 +70,7 @@ Page({
   },
   init: function () {
     let that = this;
+    console.log(new Info(),'11111')
     this.setData({
       info: new Info(),
     });
@@ -88,7 +89,7 @@ Page({
       }
     }
 
-    console.log(info.details)
+    console.log(info.details,'33333333')
   },
   addItem: function (e) {
     var that = this;
@@ -285,10 +286,18 @@ Page({
       })
       console.log(bl);
       if (!bl) {
-        info.details.push(items)
-        this.setData({
-          info,
-        })
+        if(info.details.length>1){
+          info.details.push(items)
+          this.setData({
+            info,
+          })
+        }
+        if(info.details.length==1){
+          info.details.splice(0,1,items)
+          this.setData({
+            info,
+          })
+        }
         wx.removeStorageSync('item')
       } else {
         wx.removeStorageSync('item')
diff --git a/pages/release/editactive/editactive.js b/pages/release/editactive/editactive.js
index 9dc3825..33cdb81 100644
--- a/pages/release/editactive/editactive.js
+++ b/pages/release/editactive/editactive.js
@@ -152,6 +152,8 @@ Page({
         address:datas.activityAddr,
         content,
         costName:costname,
+        nameInput:datas.activityName,
+        telInput:datas.clubPhone,
         costExplain:datas.costExplain,
         cost:datas.lowestPrice,
         startT: datas.startRegisterTime,