Merge branch 'master' of http://git.cc-lotus.info/ball-court/court-mobile

pages/createTeam/index.js

@@ -27,23 +27,33 @@ Page({
         // 上传图片
         fileList: [],
     },
+    //验证必填项
+    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)
+    },
     back: function () {
         wx.navigateBack({ url: '/pages/me/index' })
     },
-    determine: function (e) {
-        this.setData({ showModal: false })
+    //上传图片
+    imgUpload: function (e) {
+        const that = this;
+        let data = that.data.fileList;
+        data.push(e.detail)
+        that.setData({ fileList: data })
     },
-    //选择队员
-    checkboxChange: function (e) {
+    //删除图片
+    imgDel: function (e) {
         const that = this;
-        let data = e.detail.value;
-        let item = that.data.item;
-        let members = [];
-        for (const val of data) {
-            let arr = item.find((i) => i._id == val);
-            if (arr) members.push({ id: arr._id, nickname: arr.nickname, icon: arr.icon })
-        }
-        that.setData({ members: members })
+        let data = that.data.fileList;
+        let arr = data.filter((i, index) => index != e.detail.index)
+        that.setData({ fileList: arr })
+    },
+    //点击确定关闭弹窗
+    determine: function (e) {
+        this.setData({ showModal: false })
     },
     //显示对话框
     clickme: function () {
@@ -58,6 +68,18 @@ Page({
         this.setData({
             showModal: false
         })
+    },
+     //选择队员
+     checkboxChange: function (e) {
+        const that = this;
+        let data = e.detail.value;
+        let item = that.data.item;
+        let members = [];
+        for (const val of data) {
+            let arr = item.find((i) => i._id == val);
+            if (arr) members.push({ id: arr._id, nickname: arr.nickname, icon: arr.icon })
+        }
+        that.setData({ members: members })
     },
     //选择
     bindPickerChange: function (e) {
@@ -70,7 +92,6 @@ Page({
             ['form.create_time']: e.detail.value
         })
     },
-
     //点击减号删除
     delList: function (e) {
         var id = e.currentTarget.dataset.id;
@@ -82,21 +103,6 @@ Page({
         }
         this.setData({ members: members })
     },
-
-    //上传图片
-    imgUpload: function (e) {
-        const that = this;
-        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 })
-    },
     //提交
     formSubmit: function (e) {
         const value = e.detail.value;
@@ -146,15 +152,8 @@ Page({
         // 监听用户是否登录
         this.watchLogin();
     },
-    //验证必填项
-    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)
-    },
-     // 计算高度
-     searchHeight: function () {
+    // 计算高度
+    searchHeight: function () {
         let frameStyle = this.data.frameStyle;
         let client = app.globalData.client;
         let infoHeight = client.windowHeight;

pages/createTeam/index.wxml

@@ -50,7 +50,6 @@
                                     <view class="tianjia">
                                         <text bindtap='clickme' class=" icon iconfont icon-jia"></text>
                                     </view>
-
                                 </view>
                             </view>
                         </view>

pages/layNew/index.js

@@ -27,7 +27,16 @@ Page({
         red: {},
         blue: {},
     },
-
+    //验证必填项
+    initValidate() {
+        const rules = { match_name: { required: true }, }
+        // 验证字段的提示信息，若不传则调用默认的信息
+        const messages = { match_name: { required: '请输入比赛名称' }, };
+        this.WxValidate = new WxValidate(rules, messages)
+    },
+    back: function () {
+        wx.navigateBack({ url: '/pages/me/index' })
+    },
     //蓝方
     bindCatePickerChangeblue: function (e) {
         this.setData({
@@ -53,23 +62,6 @@ Page({
             time: e.detail.value
         })
     },
-    //上传图片
-    imgUpload: function (e) {
-        const that = this;
-        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 })
-    },
-    back: function () {
-        wx.navigateBack({ url: '/pages/me/index' })
-    },
     //提交
     formSubmit: function (e) {
         var match_time = this.data.date + '  ' + this.data.time;
@@ -117,12 +109,12 @@ Page({
      */
     onLoad: function (options) {
         this.setData({ id: options.id })
+        //验证规则函数
+        this.initValidate();
         // 计算高度
         this.searchHeight();
         // 监听用户是否登录
         this.watchLogin();
-        //验证规则函数
-        this.initValidate();
     },
     // 监听用户是否登录
     watchLogin: function () {
@@ -153,16 +145,9 @@ Page({
             }
         })
     },
-    //验证必填项
-    initValidate() {
-        const rules = { match_name: { required: true }, }
-        // 验证字段的提示信息，若不传则调用默认的信息
-        const messages = { match_name: { required: '请输入比赛名称' }, };
-        this.WxValidate = new WxValidate(rules, messages)
-    },
 
-     // 计算高度
-     searchHeight: function () {
+    // 计算高度
+    searchHeight: function () {
         let frameStyle = this.data.frameStyle;
         let client = app.globalData.client;
         let infoHeight = client.windowHeight;

pages/me/index.js

@@ -77,6 +77,8 @@ Page({
   // 我的服务-功能按钮
   toCommon: function (e) {
     let { route, method } = e.currentTarget.dataset;
+    let list = JSON.stringify(e.currentTarget.dataset.item);
+    let id = e.currentTarget.dataset.id;
     if (method == 'signout') {
       wx.showModal({
         title: '提示',
@@ -93,66 +95,9 @@ Page({
         }
       })
     } else {
-      wx.navigateTo({ url: `/${route}` })
+      wx.navigateTo({ url: `/${route}?id=` + id + `&list=` + list })
     }
   },
-  // //已上传图片
-  // Uploaded: function () {
-  //   wx.navigateTo({
-  //     url: `/pages/photo/index`,
-  //   })
-  // },
-  // //修改密码
-  // change: function () {
-  //   wx.navigateTo({
-  //     url: `/pages/password/index`,
-  //   })
-  // },
-  // //审核队员
-  // examine: function (e) {
-  //   let id = e.currentTarget.dataset.id;
-  //   wx.navigateTo({
-  //     url: `/pages/auditTeam/index?id=` + id,
-  //   })
-  // },
-  // //解散团队
-  // clickme: function (e) {
-  //   let id = e.currentTarget.dataset.id;
-  //   wx.navigateTo({
-  //     url: `/pages/dissolution/detail?id=` + id,
-  //   })
-  // },
-  // //退出登录
-  // tui() {
-  //   wx.showModal({
-  //     title: '',
-  //     content: '是否确认退出登录',
-  //     success(res) {
-  //       if (res.confirm) {
-  //         wx.removeStorage({
-  //           key: 'token',
-  //           success(res) {
-  //             return wx.redirectTo({ url: '/pages/index/index', })
-  //           }
-  //         })
-  //       } else if (res.cancel) {
-  //       }
-  //     }
-  //   })
-  // },
-  // //团队创建人-比赛管理
-  // Administration: function (e) {
-  //   var list = JSON.stringify(this.data.list[0])
-  //   wx.navigateTo({
-  //     url: `/pages/meMatch/index?list=${list}`,
-  //   })
-  // },
-  // //管理员-比赛管理
-  // manage: function (e) {
-  //   wx.navigateTo({
-  //     url: `/pages/meMatch/detail`,
-  //   })
-  // },
   /**
    * 生命周期函数--监听页面加载
    */
@@ -184,32 +129,6 @@ Page({
             // 判断用户身份显示不同功能按钮
             let jump = btn.filter((i) => i.type.includes(type));
             if (jump) that.setData({ jumpList: jump });
-            // let list = [
-            //   { name: '已上传照片', icons: 'icon-shangchuanzhaopian', route: 'pages/photo/index' },
-            //   { name: '修改密码', icons: 'icon-xiugaimima', route: 'pages/password/index' },
-            //   { name: '审核队员', icons: 'icon-shenhe', route: 'pages/auditTeam/index' },
-            //   { name: '解散团队', icons: 'icon-ren_jiesantuandui_line', route: 'pages/dissolution/detail' },
-            //   { name: '退出登录', icons: 'icon-tuichudenglu', route: '', method: 'signout' },
-            //   { name: '比赛管理', icons: ' icon-bisaiguanli', route: 'pages/meMatch/index' }
-            // ];
-            // let list1 = [
-            //   { name: '已上传照片', icons: 'icon-shangchuanzhaopian', route: 'pages/photo/index' },
-            //   { name: '修改密码', icons: 'icon-xiugaimima', route: 'pages/password/index' },
-            //   { name: '退出登录', icons: ' icon-tuichudenglu', route: '', method: 'signout' },
-            // ];
-            // let list2 = [
-            //   { name: '已上传照片', icons: 'icon-shangchuanzhaopian', route: 'pages/photo/index' },
-            //   { name: '修改密码', icons: 'icon-xiugaimima', route: 'pages/password/index' },
-            //   { name: '退出登录', icons: ' icon-tuichudenglu', route: '', method: 'signout' },
-            //   { name: '比赛管理', icons: 'icon-bisaiguanli', route: '/pages/meMatch/detail' }
-            // ];
-            // if (type == '1') {
-            //   that.setData({ jumpList: list });
-            // } else if (type == 2) {
-            //   that.setData({ jumpList: list1 })
-            // } else if (type == 0) {
-            //   that.setData({ jumpList: list2 })
-            // }
           },
           error: err => {
           }

pages/me/index.wxml

@@ -128,7 +128,7 @@
     </view>
     <view class="six">
       <view class="six-11"><text class="fui">我的服务</text></view>
-      <view class="six-0" wx:for="{{jumpList}}" wx:key="item" bindtap="toCommon" data-route="{{item.route}}" data-method="{{item.method}}">
+      <view class="six-0" wx:for="{{jumpList}}" wx:key="item" bindtap="toCommon" data-route="{{item.route}}" data-method="{{item.method}}" data-id="{{list[0]._id}}" data-item="{{list[0]}}">
         <view class="six-left">
           <text class="icon iconfont {{item.icon}}"></text>
         </view>
@@ -136,62 +136,6 @@
           <text class="six-text">{{item.title}}</text>
         </view>
       </view>
-      <!-- <view class="six-0" bindtap="Uploaded">
-        <view class="six-left">
-          <text class=" icon iconfont icon-shangchuanzhaopian"></text>
-        </view>
-        <view class="six-right">
-          <text class="six-text">已上传照片</text>
-        </view>
-      </view>
-      <view class="six-1" bindtap="change">
-        <view class="six-left">
-          <text class=" icon iconfont icon-xiugaimima"></text>
-        </view>
-        <view class="six-right">
-          <text class="six-text">修改密码</text>
-        </view>
-      </view>
-      <view class="six-2" bindtap="examine" data-id="{{list[0]._id}}" wx:if="{{item1.type=='1'}}">
-        <view class="six-left">
-          <text class=" icon iconfont icon-shenhe"></text>
-        </view>
-        <view class="six-right">
-          <text class="six-text">审核队员</text>
-        </view>
-      </view>
-      <view class="six-3" bindtap="clickme" data-id="{{list[0]._id}}" wx:if="{{item1.type=='1'}}">
-        <view class="six-left">
-          <text class=" icon iconfont icon-ren_jiesantuandui_line"></text>
-        </view>
-        <view class="six-right">
-          <text class="six-text">解散团队</text>
-        </view>
-      </view>
-      <view class="six-4" bindtap="tui">
-        <view class="six-left">
-          <text class=" icon iconfont icon-tuichudenglu"></text>
-        </view>
-        <view class="six-right">
-          <text class="six-text">退出登录</text>
-        </view>
-      </view>
-      <view class="six-5" bindtap="Administration" wx:if="{{item1.type=='1'}}">
-        <view class="six-left">
-          <text class=" icon iconfont icon-bisaiguanli"></text>
-        </view>
-        <view class="six-right">
-          <text class="six-text">比赛管理</text>
-        </view>
-      </view>
-      <view class="six-5" bindtap="manage" wx:if="{{item1.type=='0'}}">
-        <view class="six-left">
-          <text class=" icon iconfont icon-bisaiguanli"></text>
-        </view>
-        <view class="six-right">
-          <text class="six-text">比赛管理</text>
-        </view>
-      </view> -->
     </view>
   </view>
 </mobile-main>