Merge remote-tracking branch 'origin/master'

doc/memo.txt

@@ -32,4 +32,10 @@
 1.高职用户也要能使用志愿者小程序，用户信息从icdl平台获取即可。
 2.高职用户社会实践亲子活动无法推送，减少该模块，保留课程及自愿者模块
 3.目前认证后的机构可发布活动，发布活动时，把高职用户归纳为社会人士，这样高职用户可见志愿活动
-4.志愿活动发布新增发布新增关键字标签如“图书馆”“室外”之类的，这个放入我们公司的系统后端，到时我们编辑设计后可以把编辑好的内容更新至其他志愿者后端
\ No newline at end of file
+4.志愿活动发布新增发布新增关键字标签如“图书馆”“室外”之类的，这个放入我们公司的系统后端，到时我们编辑设计后可以把编辑好的内容更新至其他志愿者后端。
+
+
+
+
+验收：
+1.各种图片素材的尺寸比例确认？？？
\ No newline at end of file

src/user/if/ajax_get_circle_info_invite.php

+<?php
+
+// 获取指定圈子首页信息
+require_once ("../user_include.inc");
+
+ErrorLogger::doOutput("Compass...ajax_get_circle_info.php....Start.", 0);
+
+//获取参数
+$circleId = ParamUtil::getRequestNumber("circleId", 0);//圈子id
+
+$result = array();
+
+//参数检查
+if(empty($circleId)) {
+	$result["message"] = "参数错误！";
+	responseNG($result);
+}
+
+$result = array();
+
+//判断圈子是否存在
+$circleDat = CircleDat::getById($circleId);
+if(empty($circleDat)) {
+	$result["message"] = "圈子不存在！";
+	responseNG($result);
+}
+
+ErrorLogger::doOutput("Compass...ajax_get_circle_info.php....End.", 0);
+
+//返回结果
+$result["circleDat"] = $circleDat;
+responseOK($result);
+
+function responseNG($result) {
+	$result = array("status"=>"NG", "result"=>$result);
+	print json_encode($result);
+	exit;
+}
+function responseOK($result) {
+	$result = array("status"=>"OK", "result"=>$result);
+	print json_encode($result);
+	exit;
+}
+?>
\ No newline at end of file

src/wx/pages/circle/circle.js

@@ -117,7 +117,9 @@ Page({
   },
 
   //加入圈子
-  joinCircle(){
+  joinCircle(e){
+    //获取圈子id
+    let cirleId = e.currentTarget.dataset['index']
     var that = this;
     var config = wx.getStorageSync('config');
     // var location = wx.getStorageSync('location');
@@ -125,7 +127,7 @@ Page({
       url: app.url + 'ajax_check_user_join_circle.php',
       data: {
         unionId: config.unionId,
-        circleId:7
+        circleId: cirleId
       },
       header: { 'content-type': 'application/json' },
       method: 'GET',

src/wx/pages/circle/circle.wxml

@@ -42,7 +42,7 @@
           <image src='{{item.front_image}}'></image>{{item.circle_title}}
         <text>({{item.member_count}}人)</text>
         </view>
-        <van-button type="default" size='mini' bind:click="joinCircle">进圈</van-button>
+        <van-button type="default" size='mini' bind:click="joinCircle" data-index="{{item.id}}">进圈</van-button>
       </view>
     </view>
   </view>

src/wx/pages/circleMembers/circleMembers.js

@@ -46,7 +46,7 @@ Page({
   //获取输入的值
   onInutName(e) {
     this.setData({
-      name: e.detail
+      name: e.detail.value
     })
   },
 

src/wx/pages/circleMembers/circleMembers.wxml

 <!--pages/peopleManagement/peopleManagement.wxml-->
 <view class='peopleManagement'>
   <view class='top_peopleManagement'>
-    <text>圈内人数：{{memberCount}}人</text>
-    <view class='peoplesearch'>
-      <view class='search'>
-        <van-cell-group>
-          <van-field
-            value="{{ name }}"
-            placeholder="请输入用户名"
-            border="{{false}}"
-            bind:change="onInutName"
-          />
-        </van-cell-group>
-      </view>
-      <van-button type="default" size='small' bindtap="getMemberList">搜索</van-button>
+    <view class='topQuanzi'>
+      <image src='../../img/search.png'></image>
+      <input class="input" value='{{name}}' placeholder="请输入圈子名称" bindinput ="onInutName"/>
+      <view bindtap='getMemberList'>搜索</view>
     </view>
+    <text>圈内人数：{{memberCount}}人</text>
     <view class='peopleList'>
       <view class='con_peopleList' wx:for='{{memberList}}' wx:for-index='key' wx:for-item='members'>
         <text>{{key}}</text>
@@ -24,14 +16,14 @@
             <van-cell-group>
               <image src='{{member.header_img}}'></image>{{member.name}}
             </van-cell-group>
-            <view slot="right" wx:if="{{isOwner}}" bindtap="deleteMember" data-index="{{member.user_id}}">删除</view>
+            <view slot="right" wx:if="{{isOwner}}" bindtap="deleteMember" data-index="{{member.user_id}}" style='height:50px;line-height:50px'>删除</view>
           </van-swipe-cell>
         </view>
       </view>
     </view>
   </view>
   <view class='invite' bindtap='inviteCircleMember'>邀请成员</view>
-  <button open-type='share' class="btn-share">邀请成员</button>
+  <!-- <button open-type='share' class="btn-share">邀请成员</button> -->
   <van-dialog id="van-dialog" />
   <van-notify id="van-notify" />
 </view>

src/wx/pages/circleMembers/circleMembers.wxss

 /* pages/peopleManagement/peopleManagement.wxss */
+page{
+  width: 100%;
+  height: 100%;
+  background: #f5f5f5;
+}
 .top_peopleManagement{
   width: 100%;
+  background: #fff;
 }
 .top_peopleManagement>text{
   display: block;
@@ -11,13 +17,35 @@
   box-sizing: border-box;
   padding-right: 10px;
 }
-.peoplesearch{
-  width: 100%;
+.topQuanzi{
+  width: 94%;
   height: 40px;
-  background: #ccc;
   display: flex;
-  justify-content: space-between;
   align-items: center;
+  margin: 0 auto;
+  background: #f6f6f6;
+  border-radius: 30px;
+}
+.topQuanzi>image{
+  width: 25px;
+  height: 25px;
+  margin: 0 10px;
+}
+.topQuanzi>input{
+  flex: 1;
+  height: 40px;
+  line-height: 40px;
+  font-size: 14px;
+}
+.topQuanzi>view{
+  width: 90px;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  font-size: 14px;
+  background: #0D76ED;
+  border-radius: 0 30px 30px 0;
+  color: #fff;
 }
 .search{
   height: 30px;
@@ -38,46 +66,46 @@
 .peoplesearch button{
   margin-right: 10px;
 }
-.con_peopleList{
-  margin-top: 20px;
-}
 .con_peopleList>text{
   display: block;
   font-size: 14px;
-  height: 40px;
-  line-height: 40px;
-  border-bottom: 1px solid #ccc;
+  height: 50px;
+  line-height: 50px;
+  border-bottom: 1px solid #f0f0f0;
   box-sizing: border-box;
   padding-left: 10px;
+  background: #f5f5f5;
 }
 .con_peopleList>view{
   width: 100%;
-  height: 40px;
-  border-bottom: 1px solid #ccc;
+  height: 50px;
+  border-bottom: 1px solid #f0f0f0;
 }
 .con_peopleList>view image{
-  width: 30px;
-  height: 30px;
+  width: 35px;
+  height: 35px;
   border-radius: 50%;
   margin: 0 10px;
 }
 .peoplesearch van-cell-group{
-  height: 30px;
+  height: 50px;
   display: flex;
   align-items: center;
 }
 .peopleList van-cell-group{
-  height: 40px;
+  height: 50px;
   display: flex;
   align-items: center;
 }
 .invite{
-  width: 150px;
-  height: 30px;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 40px;
   font-size: 14px;
   text-align: center;
-  line-height: 30px;
-  border: 1px solid #ccc;
-  border-radius: 10px;
-  margin: 40px auto;
+  line-height: 40px;
+  color: #fff;
+  background: #0D76ED;
 }
\ No newline at end of file

src/wx/pages/inviteCircleMember/inviteCircleMember.js

@@ -45,14 +45,94 @@ Page({
 
   },
 
+  //参加
+  accept() {
+    var that = this;
+    //判断有没有注册
+    var config = wx.getStorageSync('config');
+    if (config.registed == false || config.unionId == undefined) {
+      Notify("请先注册");
+      //跳转到社会人士注册,保存邀请地址
+      var interval = setInterval(function () {
+        let inviteUrl = '/pages/inviteCircleMember/inviteCircleMember?circleId=' + that.data.circleDat + '&inviteUserName=' + that.data.inviteUserName
+        wx.setStorageSync("inviteUrl", inviteUrl);
+        wx.redirectTo({
+          url: '../socialUserRegister/socialUserRegister',
+        })
+        clearInterval(interval)
+      }, 1000);  
+    } else {
+      //调用接入圈子接口
+      wx.request({
+        url: app.url + 'ajax_user_join_circle.php',
+        data: {
+          unionId: config.unionId,
+          circleId: that.data.circleId
+        },
+        header: { 'content-type': 'application/json' },
+        method: 'GET',
+        dataType: 'json',
+        success: function (res) {
+          console.log(res)
+          if (res.statusCode == 200) {
+            //已经是成员
+            if (res.data.status == "MEMBER") {
+              Notify("您已经是圈子成员");
+              var interval = setInterval(function () {
+                wx.redirectTo({
+                  url: '../circleDetails/circleDetails?circleId=' + that.data.circleId,
+                })
+                clearInterval(interval)
+              }, 1000);
+            } else if (res.data.status == "OK") {
+              //跳转到圈子模块首页
+              wx.redirectTo({
+                url: '../circle/circle',
+              })
+            } else if (res.data.status == "NG") {
+              //跳转到小程序首页
+              wx.switchTab({
+                url: '../index/index',
+              })
+            }
+
+          }
+        },
+        fail: function (res) { },
+        complete: function (res) { },
+      })
+    }
+  },
+
+  //拒绝
+  refuse() {
+    var that = this;
+    //判断有没有注册
+    var config = wx.getStorageSync('config');
+    if (config.registed == false || config.unionId == undefined) {
+      Notify("请先注册");
+      //跳转到社会人士注册,保存邀请地址
+      var interval = setInterval(function () {
+        wx.redirectTo({
+          url: '../socialUserRegister/socialUserRegister',
+        })
+        clearInterval(interval)
+      }, 1000);
+    } else {
+      //跳转到首页
+      wx.switchTab({
+        url: '../index/index',
+      });
+
+    }
+  },
+
   //获取圈子信息
   circleinfo() {
     var that = this;
-    var config = wx.getStorageSync('config');
-    wx: wx.request({
-      url: app.url + 'ajax_get_circle_info.php',
+    wx.request({
+      url: app.url + 'ajax_get_circle_info_invite.php',
       data: {
-        unionId: config.unionId,
         circleId: that.data.circleId
       },
       header: { 'content-type': 'application/json' },

src/wx/pages/inviteCircleMember/inviteCircleMember.wxml

 <!--pages/inviteCircleMember/inviteCircleMember.wxml-->
 <view class='inviteMember'>
   <view class='title'>
-    <text>{{circleDat.inviteUserName}}邀请您加入圈子【{{circleDat.title}}】</text>
+    <text style="color:#0D76ED">{{inviteUserName}}</text><text>邀请您加入圈子【{{circleDat.title}}】</text>
   </view>
   <view class='frontImage'>
     <image src='{{circleDat.front_image}}'></image>
@@ -14,4 +14,5 @@
     <view class='refuseButton' bindtap='refuse'>拒绝</view>
   </view>
 </view>
+<van-notify id="van-notify" />
 

src/wx/pages/inviteCircleMember/inviteCircleMember.wxss

@@ -19,6 +19,10 @@
 .inviteMember .frontImage{
   width: 100%;
 }
+.inviteMember .frontImage>image{
+  width: 100%;
+}
+
 .inviteMember .comment{
   width: 100%;
   display: flex;
@@ -32,13 +36,12 @@
   width: 100%;
   display: flex;
   flex-direction: row;
-  justify-content: space-around;
+  justify-content: space-between;
   align-items: center;
 }
 
-
 .acceptButton{
-  width: 150px;
+  width: 40%;
   height: 40px;
   line-height: 40px;
   font-size: 14px;
@@ -49,7 +52,7 @@
 }
 
 .refuseButton{
-  width: 150px;
+  width: 40%;
   height: 40px;
   line-height: 40px;
   font-size: 14px;

src/wx/project.config.json

@@ -71,7 +71,7 @@
 					"id": 3,
 					"name": "邀请参加模式",
 					"pathName": "pages/inviteCircleMember/inviteCircleMember",
-					"query": "circleId=12& inviteUserName=宗彪",
+					"query": "circleId=12&inviteUserName=宗彪",
 					"scene": null
 				}
 			]