Merge branch 'master' of http://git.cc-lotus.info/ball-competition-zs/applet

app.js

@@ -18,7 +18,7 @@ App({
     },
     globalData: {
         // 接口地址
-        serverUrl: "http://192.168.1.113:13005", //https://broadcast.waityou24.cn   http://192.168.1.113:13005
+        serverUrl: "http://192.168.1.113:13005", //https://broadcast.waityou24.cn   http://192.168.1.113:13005  http://192.168.1.159:13005
         fileserverUrl: 'https://broadcast.waityou24.cn',
         // 当前设备信息
         client: {},

pages/index/index.js

@@ -5,22 +5,13 @@ Page({
      * 页面的初始数据
      */
     data: {
-        logo: '',
-        list: []
-    },
-    // 选择用户
-    userChange(e) {
-        console.log(e);
+        logo: ''
     },
+    
     /**
      * 生命周期函数--监听页面加载
      */
-    async onLoad(options) {
-        // const that = this;
-        // let res = await app.$api('user', 'GET', { status: '1', type: '0' })
-        // if (res.errcode == '0') that.setData({ list: res.data })
-    },
-
+    async onLoad(options) {},
 
     /**
      * 生命周期函数--监听页面初次渲染完成
@@ -28,7 +19,6 @@ Page({
     onReady() {
 
     },
-
     /**
      * 生命周期函数--监听页面显示
      */

pages/index/index.wxml

@@ -2,14 +2,4 @@
     <view class="one">
         <image class="image" src="{{logo}}" mode="" />
     </view>
-    <view class="two">
-        <checkbox-group class="list" bindchange="userChange">
-            <label class="label" wx:for="{{list}}" wx:key="index" wx:for-item="item">
-                <view class="list_1">
-                    <!-- checked="{{item.checked}}"  -->
-                    <checkbox value="{{item._id}}">{{item.name}}</checkbox>
-                </view>
-            </label>
-        </checkbox-group>
-    </view>
 </view>

pagesMy/team/index.wxml

@@ -4,7 +4,7 @@
             <input class="input" type="text" bindconfirm="toSearch" confirm-type="search" placeholder-style=' text-align: center;' placeholder="搜索" />
         </view>
         <view class="one_2" wx:if="{{user.type=='1'}}">
-            <button class="button" type="primary" size="mini" bindtap="toAdd">添加团队</button>
+            <button class="button" type="primary" size="mini" bindtap="toAdd">添加</button>
         </view>
     </view>
     <view class="two">

pagesMy/team/index.wxss

@@ -11,7 +11,7 @@
 }
 
 .main .one .one_1 {
-    width: 75%;
+    width: 83%;
 }
 
 .main .one .one_1 .input {

pagesMy/teamCreate/index.wxss

@@ -35,6 +35,7 @@
 
 .main .one .info .info_1 .value .list {
     display: flex;
+    justify-content: flex-start;
     flex-wrap: wrap;
 }
 
@@ -62,4 +63,4 @@
     background-color: var(--rgb40E);
     background-image: linear-gradient(to right, var(--rgb3AB), var(--rgb40E));
     border-radius: 30rpx;
-}
+}