···

pages/auditTeam/index.wxml

@@ -5,8 +5,12 @@
                 <image class="icon" src="{{item.icon[0].url}}"></image>
             </view>
             <view class="one_r">
-                <view class="text1">{{item.apply_user}}</view>
+                <view class="text1">{{item.apply_user}} 
+                <text class="text3">{{item.status=='1'?'已通过':item.status=='0'?'待通过':'已驳回'}}</text>
+                </view>
+               
                 <view class="text2">申请时间：{{item.apply_time}}</view>
+
             </view>
             <view class="btn">
                 <button size="mini" bindtap="reject" data-id="{{item._id}}" class="btn1">驳回</button>

pages/auditTeam/index.wxss

@@ -28,6 +28,7 @@
 
 .text1 {
     margin: 10px 0 10px 0;
+    /* width: 50px; */
 }
 
 .text2 {
@@ -58,4 +59,9 @@
     color: #ffffff;
     text-align: center;
     margin: 4px 0 4px 100px;
+}
+.text3{
+    font-size: 12px;
+    margin: 0 0 0 20px;
+    color: #f18080;
 }

pages/createTeam/index.js

@@ -15,7 +15,7 @@ Page({
         form: {
             type: ['乒乓球', '足球', '篮球'],
             objectType: [{ id: 0, name: '乒乓球' }, { id: 1, name: '足球' }, { id: 2, name: '篮球' },],
-            create_time:'2020-02-02',
+            create_time: '2020-02-02',
             create_id: '',
             create_user: '',
         },
@@ -83,81 +83,22 @@ Page({
             members: members,
         })
     },
-    //提交
-    formSubmit: function (e) {
-        const value = e.detail.value;
-        if (!this.WxValidate.checkForm(value)) {
-            const error = this.WxValidate.errorList[0];
-            wx.showToast({ title: `${error.msg}`, icon: 'error', duration: 2000 })
-            return false
-        } else {
-            value.logo = this.data.fileList;
-            value.members = this.data.members;
-            value.create_id = this.data.form.create_id;
-            wx.getStorage({
-                key: 'token',
-                success: function (res) {
-                    wx.request({
-                        url: `${app.globalData.publicUrl}/courtAdmin/api/team`, //接口地址
-                        method: "post",//请求方法
-                        //请求参数
-                        data: value,
-                        header: {},
-                        success: res => {
-                            console.log(res);
-                            if (res.data.errcode == 0) {
-                                wx.showToast({
-                                    title: '创建团队成功',
-                                    icon: 'success',
-                                    duration: 2000//延迟两秒
-                                })
-                            } else {
-                                wx.showToast({
-                                    title: '创建团队失败',
-                                    icon: 'error',
-                                    duration: 2000
-                                })
-                            }
-                        },
-                        error: err => {
-                            console.log(err);
-                        }
-                    })
-                }
-            })
-        }
-        console.log(e.detail.value);
-    },
-    afterRead: function (event) {
+
+    //上传图片
+    imgUpload: function (e) {
         const that = this;
-        const { file } = event.detail;
-        // 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式app.globalData.fileUrl：
-        console.log(file);
-        wx.uploadFile({
-            url: `${app.globalData.imageUrl}/files/court/elimg/upload`,
-            filePath: file.url,
-            name: 'file',
-            formData: {},
-            success: (res) => {
-                console.log(res);
-                if (res.statusCode == '200') {
-                    let data = [{ name: JSON.parse(res.data).name, url: `${app.globalData.imageUrl}` + JSON.parse(res.data).uri }]
-                    // const { fileList = [] } = this.data;
-                    // fileList.push({ ...file, url: res.data });
-                    that.setData({ fileList: data });
-                } else {
-                    wx.showToast({ title: `${res.data.errmsg}`, icon: 'fail', duration: 2000 })
-                }
-            },
-        });
+        let data = that.data.fileList;
+        data.push(e.detail)
+        that.setData({ fileList: data })
     },
-    //验证必填项
-    initValidate() {
-        const rules = { name: { required: true }, type: { required: true }, create_user: { required: true }, }
-        // 验证字段的提示信息，若不传则调用默认的信息
-        const messages = { name: { required: '请输入团队名称' }, type: { required: '请输入团队类型' }, create_user: { required: '请输入团队创建人名称' }, };
-        this.WxValidate = new WxValidate(rules, messages)
+    //删除图片
+    imgDel: function (e) {
+        const that = this;
+        let data = that.data.fileList;
+        let arr = data.filter((i, index) => index != e.detail.index)
+        that.setData({ fileList: arr })
     },
+
     /**
      * 生命周期函数--监听页面加载
      */
@@ -169,6 +110,13 @@ Page({
         //验证规则函数
         this.initValidate()
     },
+    //验证必填项
+    initValidate() {
+        const rules = { name: { required: true }, type: { required: true }, create_user: { required: true }, }
+        // 验证字段的提示信息，若不传则调用默认的信息
+        const messages = { name: { required: '请输入团队名称' }, type: { required: '请输入团队类型' }, create_user: { required: '请输入团队创建人名称' }, };
+        this.WxValidate = new WxValidate(rules, messages)
+    },
     // 监听用户是否登录
     watchLogin: function () {
         const that = this;
@@ -209,6 +157,51 @@ Page({
             }
         })
     },
+    //提交
+    formSubmit: function (e) {
+        const value = e.detail.value;
+        if (!this.WxValidate.checkForm(value)) {
+            const error = this.WxValidate.errorList[0];
+            wx.showToast({ title: `${error.msg}`, icon: 'error', duration: 2000 })
+            return false
+        } else {
+            value.logo = this.data.fileList;
+            value.members = this.data.members;
+            value.create_id = this.data.form.create_id;
+            wx.getStorage({
+                key: 'token',
+                success: function (res) {
+                    wx.request({
+                        url: `${app.globalData.publicUrl}/courtAdmin/api/team`, //接口地址
+                        method: "post",//请求方法
+                        //请求参数
+                        data: value,
+                        header: {},
+                        success: res => {
+                            console.log(res);
+                            if (res.data.errcode == 0) {
+                                wx.showToast({
+                                    title: '创建团队成功',
+                                    icon: 'success',
+                                    duration: 2000//延迟两秒
+                                })
+                            } else {
+                                wx.showToast({
+                                    title: '创建团队失败',
+                                    icon: 'error',
+                                    duration: 2000
+                                })
+                            }
+                        },
+                        error: err => {
+                            console.log(err);
+                        }
+                    })
+                }
+            })
+        }
+        console.log(e.detail.value);
+    },
     // 计算高度
     searchHeight: function () {
         let frameStyle = this.data.frameStyle;

pages/createTeam/index.json

@@ -1,6 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "mobile-main": "/commpents/mobile-frame/mobile-main"
+    "mobile-main": "/commpents/mobile-frame/mobile-main",
+    "upload": "/commpents/upload/index"
   }
 }

pages/createTeam/index.wxml

@@ -5,7 +5,7 @@
                 <view class="top">
                     <view class="zero">
                         <view class="text">团队LOGO</view>
-                        <van-uploader class="tou" file-list="{{fileList}}" preview-image="true" max-count="1" bind:after-read="afterRead" />
+                        <upload class="tou" list="{{fileList}}" count="{{1}}"  bind:imgUpload="imgUpload" bind:imgDel="imgDel"></upload>
                     </view>
                     <view class="one">
                         <view class="text">团队名称</view>

pages/information/index.js

@@ -16,28 +16,19 @@ Page({
         fileList: [],
     },
 
-    afterRead: function (event) {
-        const { file } = event.detail;
+    //上传图片
+    imgUpload: function (e) {
         const that = this;
-        // 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式app.globalData.fileUrl：
-        console.log(file);
-        wx.uploadFile({
-            url: `${app.globalData.imageUrl}/files/court/elimg/upload`,
-            filePath: file.url,
-            name: 'file',
-            formData: {},
-            success: (res) => {
-                // console.log(res);
-                if (res.statusCode == '200') {
-                    let data = [{ name: JSON.parse(res.data).name, url: `${app.globalData.imageUrl}` + JSON.parse(res.data).uri }]
-                    // const { fileList = [] } = this.data;
-                    // fileList.push({ ...file, url: res.data });
-                    that.setData({ fileList: data });
-                } else {
-                    wx.showToast({ title: `${res.data.errmsg}`, icon: 'fail', duration: 2000 })
-                }
-            },
-        });
+        let data = that.data.fileList;
+        data.push(e.detail)
+        that.setData({ fileList: data })
+    },
+    //删除图片
+    imgDel: function (e) {
+        const that = this;
+        let data = that.data.fileList;
+        let arr = data.filter((i, index) => index != e.detail.index)
+        that.setData({ fileList: arr })
     },
     // //选择
     // bindPickerChange: function (e) {
@@ -49,13 +40,7 @@ Page({
     back: function () {
         wx.navigateBack({ url: '/pages/me/index' })
     },
-    //验证必填项
-    initValidate() {
-        const rules = { phone: { required: true, tel: true }, }
-        // 验证字段的提示信息，若不传则调用默认的信息
-        const messages = { phone: { required: '请输入手机号' }, };
-        this.WxValidate = new WxValidate(rules, messages)
-    },
+
     /**
      * 生命周期函数--监听页面加载
      */
@@ -66,7 +51,13 @@ Page({
         this.watchLogin();
         //验证规则函数
         this.initValidate();
-
+    },
+    //验证必填项
+    initValidate() {
+        const rules = { phone: { required: true, tel: true }, }
+        // 验证字段的提示信息，若不传则调用默认的信息
+        const messages = { phone: { required: '请输入手机号' }, };
+        this.WxValidate = new WxValidate(rules, messages)
     },
     // 监听用户是否登录
     watchLogin: function () {

pages/information/index.json

@@ -1,6 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "mobile-main": "/commpents/mobile-frame/mobile-main"
+    "mobile-main": "/commpents/mobile-frame/mobile-main",
+    "upload": "/commpents/upload/index"
   }
 }

pages/information/index.wxml

@@ -4,7 +4,7 @@
             <view class="form" style="height:{{infoHeight-140}}px;">
                 <view class="zero">
                     <view class="text">头像</view>
-                    <van-uploader class="tou" file-list="{{fileList}}" preview-image="true" max-count="1" bind:after-read="afterRead" />
+                    <upload class="tou" list="{{fileList}}" count="{{1}}"  bind:imgUpload="imgUpload" bind:imgDel="imgDel"></upload>
                 </view>
                 <view class="one">
                     <view class="text">昵称</view>

pages/me/index.js

@@ -55,9 +55,12 @@ Page({
       url: `/pages/createTeam/index`,
     })
   },
-  ToDetails: function () {
+  //团队详情
+  ToDetails: function (e) {
+    let id = e.currentTarget.dataset.id;
+    console.log(e.currentTarget.dataset.id);
     wx.navigateTo({
-      url: `/pages/teamDetails/detail`,
+      url: `/pages/teamDetails/detail?id=` + id,
     })
   },
   //已上传图片
@@ -80,9 +83,9 @@ Page({
   },
   //解散申请
   apply: function (e) {
-    let id= e.currentTarget.dataset.id;
+    let id = e.currentTarget.dataset.id;
     wx.navigateTo({
-      url: `/pages/dissolution/index?id=`+id,
+      url: `/pages/dissolution/index?id=` + id,
     })
   },
   //解散团队弹窗
@@ -107,22 +110,26 @@ Page({
     this.searchHeight()
     // 监听用户是否登录
     this.watchLogin();
-
+  },
+  // 监听用户是否登录
+  watchLogin: function () {
     const that = this;
     wx.getStorage({
       key: 'token',
       success: res => {
         //数据请求
         wx.request({
-          url: `${app.globalData.publicUrl}/courtAdmin/api/team`, //接口地址
+          url: `${app.globalData.publicUrl}/courtAdmin/api/user/${res.data.id}`, //接口地址
           method: "get",//请求方法
           data: {},//请求参数
           header: {},
           success: res => {
             // console.log(res);
-            that.setData({ list3: res.data.data })
+            that.setData({ item1: res.data.data })
+            let icon = res.data.data.icon[0];
+            if (icon) this.setData({ icon: icon.url })
+            else this.setData({ icon: '/image/tou.png' })
             console.log(res.data.data);
-
           },
           error: err => {
             console.log(err);
@@ -133,26 +140,18 @@ Page({
         wx.redirectTo({ url: '/pages/login/index', })
       }
     })
-
-  },
-  // 监听用户是否登录
-  watchLogin: function () {
-    const that = this;
     wx.getStorage({
       key: 'token',
       success: res => {
         //数据请求
         wx.request({
-          url: `${app.globalData.publicUrl}/courtAdmin/api/user/${res.data.id}`, //接口地址
+          url: `${app.globalData.publicUrl}/courtAdmin/api/team`, //接口地址
           method: "get",//请求方法
           data: {},//请求参数
           header: {},
           success: res => {
             // console.log(res);
-            that.setData({ item1: res.data.data })
-            let icon = res.data.data.icon[0];
-            if (icon) this.setData({ icon: icon.url })
-            else this.setData({ icon: '/image/tou.png' })
+            that.setData({ list3: res.data.data })
             console.log(res.data.data);
           },
           error: err => {
@@ -174,7 +173,7 @@ Page({
         if (res.confirm) {
           wx.removeStorage({
             key: 'token',
-            success (res) {
+            success(res) {
               return wx.redirectTo({ url: '/pages/index/index', })
             }
           })

pages/me/index.wxml

@@ -89,13 +89,13 @@
           <text class="chuang" bindtap="create" wx:if="{{list3.length<1||item1.type=='1'}}">创建团队</text>
         </view>
         <view class="weui-cells mgt-0 {{!showMore? 'hiddenmore' : 'showmore'}}">
-          <view wx:key="item" wx:for="{{list3}}" wx:for-index="idx" wx:key="key" bindtap="ToDetails" class="list3 {{idx>1 ? 'more-item' : ''}}">
+          <view wx:key="item" wx:for="{{list3}}" wx:for-index="idx" wx:key="key"  class="list3 {{idx>1 ? 'more-item' : ''}}">
             <view class="dui-left">
               <view class="dui-left1">
-                <image src="/image/head1.png" class="dui-image"></image>
+                <image src="{{item.logo[0].url}}" class="dui-image"></image>
               </view>
-              <view class="dui-right1">
-                <text class="group">{{item.name}}</text>
+              <view class="dui-right1 textOver" >
+                <text class="group" bindtap="ToDetails" data-id="{{item._id}}">{{item.name}}</text>
               </view>
               <button class="ball" size="mini" wx:if="{{item.type=='0'}}" style="background-color:rgb(63, 127, 245);">乒乓球</button>
               <button class="ball" size="mini" wx:if="{{item.type=='1'}}" style="background-color:rgb(245, 172, 63);">足球</button>

pages/password/index.js

@@ -16,16 +16,6 @@ Page({
     back: function () {
         wx.navigateBack({ url: '/pages/me/index' })
     },
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    //验证必填项
-    initValidate() {
-        const rules = { password: { required: true }, }
-        // 验证字段的提示信息，若不传则调用默认的信息
-        const messages = { password: { required: '请输入新密码' }, };
-        this.WxValidate = new WxValidate(rules, messages)
-    },
     /**
      * 生命周期函数--监听页面加载
      */
@@ -38,6 +28,13 @@ Page({
         this.initValidate();
 
     },
+    //验证必填项
+    initValidate() {
+        const rules = { password: { required: true }, }
+        // 验证字段的提示信息，若不传则调用默认的信息
+        const messages = { password: { required: '请输入新密码' }, };
+        this.WxValidate = new WxValidate(rules, messages)
+    },
     // 监听用户是否登录
     watchLogin: function () {
         const that = this;

pages/teamDetails/detail.js

@@ -13,53 +13,51 @@ Page({
     // 主体高度
     infoHeight: '',
     list: [
-      {
-        id: '1',time: '08:30', date: '2022.01.15',Founder:'XXX',group:'哈拉海队',person:'10'
-      }
     ],
     lists: [
-      {
-        id: '1',name:'老头1',head:'/image/tou.png'
-      },
-      {
-        id: '1',name:'老头2',head:'/image/tou.png'
-      },
-      {
-        id: '1',name:'老头3',head:'/image/tou.png'
-      },
-      {
-        id: '1',name:'老头4',head:'/image/tou.png'
-      },
-      {
-        id: '1',name:'老头5',head:'/image/tou.png'
-      },
-      {
-        id: '1',name:'老头6',head:'/image/tou.png'
-      },
-      {
-        id: '1',name:'老头7',head:'/image/tou.png'
-      },
-
-      {
-        id: '1',name:'老头8',head:'/image/tou.png'
-      },
-      {
-        id: '1',name:'老头9',head:'/image/tou.png'
-      },
     ],
     fileList: [],
+    ids: ''
   },
   back: function () {
     wx.navigateBack({ url: '/pages/home/index' })
   },
-
-
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
     // 计算高度
     this.searchHeight()
+    this.ids = options.id;
+    console.log(options.id);
+    // 监听用户是否登录
+    this.watchLogin();
+
+  },
+  // 监听用户是否登录
+  watchLogin: function () {
+    const that = this;
+    let id = that.ids
+    console.log(that.ids);
+    wx.getStorage({
+      key: 'token',
+      success: res => {
+        //查询数据
+        wx.request({
+          url: `${app.globalData.publicUrl}/courtAdmin/api/team/` + id, //接口地址
+          method: 'get',
+          data: '',
+          success(res) {
+            console.log(res);
+            that.setData({ list: res.data.data });
+            console.log(res.data.data);
+          }
+        })
+      },
+      fail: res => {
+        return wx.redirectTo({ url: '/pages/login/index', })
+      }
+    })
   },
   // 计算高度
   searchHeight: function () {

pages/teamDetails/detail.wxml

@@ -3,30 +3,29 @@
     <view class="one">
       <view class="one-1">
         <view class="onea">
-         
           <cover-image src='/image/back.png' class="back" bindtap='back'></cover-image>
         </view>
         <view class="ones">
-          <text>团队信息</text>
+          <text>团队详情</text>
         </view>
         <image style="width: 100%; height: 280px; background-color: #eeeeee;" src="{{src}}"></image>
       </view>
-      <view class="one-2" wx:key="item" wx:for="{{list}}">
-        <image class="imgs" src="{{src1}}"></image>
-      </view>
-      <view class="one-3" wx:key="item" wx:for="{{list}}">
-        <view class="group">{{item.group}}</view>
-        <view class="person">共{{item.person}}人</view>
+      <view class="one-2">
+        <image class="imgs" src="{{list.logo[0].url}}"></image>
       </view>
+      <view class="one-3">
+      <view class="group textOver">{{list.name}}</view>
+      <view class="person">共{{list.members.length||0}}人</view>
+    </view>
     </view>
-    <view class="two" wx:key="item" wx:for="{{list}}">
+    <view class="two">
       <view class="two-1">
         <view class="two1">
           <view class="two-left1">
             <text class=" icon iconfont icon-dian"></text>
           </view>
           <view class="two-right1">
-            <view><text class="zi">创建人：</text>{{item.Founder}}</view>
+            <view><text class="zi">创建人：</text>{{list.create_user}}</view>
           </view>
         </view>
         <view class="two2">
@@ -34,32 +33,21 @@
             <text class=" icon iconfont icon-dian"></text>
           </view>
           <view class="two-right2">
-            <view><text class="zi">创建时间：</text><text class="date">{{item.date}}</text>{{item.time}}</view>
+            <view><text class="zi">创建时间：</text><text class="date">{{list.create_time}}</text></view>
           </view>
         </view>
       </view>
     </view>
     <view class="thr">
       <view><text class="tuan">队员信息</text></view>
-      <view class="thr-1" wx:key="item" wx:for="{{lists}}">
+      <view class="thr-1" wx:key="item" wx:for="{{list.members}}">
         <view class="thr1">
           <view class="thr-left">
-            <image class="img" src="{{item.head}}"></image>
+            <image class="img" src="{{item.icon[0].url}}"></image>
           </view>
-          <view class="thr-right"><text class="name">{{item.name}}</text> </view>
+          <view class="thr-right"><text class="name textOver">{{item.nickname}}</text> </view>
         </view>
       </view>
-      <view class="thr-2">
-        <view class="thr2">
-          <view class="thr3">
-            <text class=" icon iconfont icon-jia"></text>
-          </view>
-        </view>
-      </view>
-    </view>
-    <view class="four">
-      <view class="four-1">
-      </view>
     </view>
   </view>
 </mobile-main>

pages/teamDetails/detail.wxss

@@ -2,6 +2,7 @@
   position: relative;
   width: 100%;
 }
+
 .back {
   width: 40rpx;
   height: 40rpx;
@@ -9,93 +10,115 @@
   width: 40rpx;
   height: 40rpx;
 }
-.onea{
+
+.onea {
   font-weight: 600;
   position: absolute;
   top: 5%;
   left: 2%;
 }
-.ones{
+
+.ones {
   font-weight: 600;
   position: absolute;
   top: 5%;
   left: 42%;
   color: #ffffff;
 }
-.one-2{
+
+.one-2 {
   position: absolute;
   top: 18%;
   left: 41%;
   width: 18%;
   height: 63.78px;
-  border-radius: 50%; 
+  border-radius: 50%;
 }
 .one-3{
   position: absolute;
   top: 29%;
-  left: 42%;
+  left: 37.5%;
   width: 23%;
   height: 63.78px;
 }
-.imgs{
+
+.imgs {
   margin-top: 4px;
   margin-left: 2px;
   width: 95%;
-  height: 51.58px; 
+  height: 51.58px;
 }
-.two-1{
+
+.two-1 {
   margin-top: -4px;
   background-color: #ffffff;
   font-size: 15px;
   margin-bottom: 6%;
 }
-.two{
+
+.two {
   background-color: #ffffff;
 }
-.two1{
+
+.two1 {
   padding-top: 30px;
   padding-bottom: 10px;
 }
-.two2{
+
+.two2 {
   padding-bottom: 20px;
 }
-.two-left1{
+
+.two-left1 {
   float: left;
   margin-top: -3px;
   width: 10%;
 }
-.two-left2{
+
+.two-left2 {
   margin-top: -3px;
   float: left;
   width: 10%;
 }
-.zi{
+
+.zi {
   color: #9e9e9e;
 }
-.date{
+
+.date {
   margin-right: 2%;
 }
-.thr{
+
+.thr {
+  float: left;
+  width: 100%;
   padding-top: 15px;
   background-color: #ffffff;
 }
+
 .tuan {
   margin-left: 11px;
   font-size: 16px;
-  font-weight: 500;
+  font-weight: 550;
   margin-right: 10px;
 }
-.thr-left{
+
+.thr-left {
   width: 79%;
   height: 49px;
   background-color: #eeeeee;
   border-radius: 24.5px;
 }
-.img{
+.thr-right{
+  margin-left: 3px;
+}
+
+.img {
   width: 100%;
-  height: 49px; 
+  height: 49px;
 }
-.thr-1{
+
+.thr-1 {
   padding-top: 10px;
   padding-left: 10px;
   float: left;
@@ -103,10 +126,12 @@
   background-color: #ffffff;
   padding-bottom: 5px;
 }
-.thr1{
+
+.thr1 {
   background-color: #ffffff;
 }
-.thr-2{
+
+.thr-2 {
   padding-top: 10px;
   padding-left: 8px;
   float: left;
@@ -115,80 +140,42 @@
   background-color: #ffffff;
   /* border: 1px solid red; */
 }
-.thr2{
+
+.thr2 {
   float: left;
   width: 50px;
   height: 50px;
   border: 2px solid #dddcdc;
 }
-.name{
-  margin-left: 10px;
+
+.name {
+  text-align: center;
   font-size: 13px;
   color: #727272;
 }
-.thr3{
+
+.thr3 {
   margin-top: 22%;
   margin-left: 23%;
 }
-.four{
-  background-color: white;
-}
-.four-1{
-  background-color: white;
-  width: 100%;
-  height: 280px;
-  margin-top: 10%;
-}
-.four1{
-  background-color: white;
-  margin-top: 15%;
-  margin-bottom: 15%;
-  margin-left: 10%;
-  float: left;
-  width: 37%;
-}
-.four2{
-  background-color: white;
-  margin-top: 15%;
-  margin-bottom: 15%;
-  float: left;
-  width: 30%;
-}
-.button{
-  margin-top: 0 !important;
-  width: 140px !important;
-  height: 35px;
-  background-color: rgba(209, 205, 205, 0.5);
-  /* background-image: linear-gradient(to right, rgb(236, 75, 83) , rgb(247, 41, 230)); */
-  border-top-left-radius: 1.5em;
-  border-top-right-radius: 0em;
-  border-bottom-right-radius: 0em;
-  border-bottom-left-radius: 1.5em;
-  color:#777777; 
-  font-size: 14px;
-}
-.buttons{
-  margin-top: 0 !important;
-  width: 140px !important;
-  height: 35px;
-  background-color: rgba(32, 88, 243, 0.5);
-  background-image: linear-gradient(to right, rgb(75, 113, 236) , rgb(203, 97, 245));
-  border-top-left-radius: 0em;
-  border-top-right-radius: 1.5em;
-  border-bottom-right-radius: 1.5em;
-  border-bottom-left-radius: 0em;
-  color:#ffffff; 
-  font-size: 14px;
-}
-.group{
+
+.group {
   color: #ffffff;
   margin-top: 20%;
-  margin-left: 2%;
+  margin-left: 21%;
   margin-bottom: 10%;
 }
-.person{
-  margin-left: 18%;
+
+.person {
+  margin-left: 30%;
   font-size: 13px;
   color: #ffffff;
   font-weight: 300;
-}
+}
+
+.buttonend {
+  background-color: rgb(136, 136, 136);
+  border-radius: 15px;
+  font-size: 13px !important;
+  color: #fff;
+}