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

app.json

@@ -9,6 +9,7 @@
         "pages/my/userInfo",
         "pages/usermymatch/index",
         "pages/setting/index",
+        "pages/setting/basic",
         "pages/test/index"
     ],
     "usingComponents": {

pages/setting/basic.js

@@ -0,0 +1,105 @@
+const app = getApp()
+import WxValidate from '../../utils/wxValidate'
+import { gender } from '../../utils/dict';
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        frameStyle: { useTop: true, name: '个人信息', leftArrow: true, useBar: false },
+        icon: '/image/icon.jpg',
+        form: { id: "1", icon: [], img_url: "/image/icon.jpg", name: "测试", gender: '男', phone: '13174420325', email: '' },
+        // 头像
+        icon: [],
+        // 性别
+        genderList: gender,
+    },
+    initValidate() {
+        const rules = { nickname: { required: true }, phone: { required: true, tel: true }, password: { required: false }, status: { required: true } }
+        // 验证字段的提示信息，若不传则调用默认的信息
+        const messages = { nickname: { required: '请输入昵称', }, phone: { required: '请输入手机号', }, password: { required: '请输入登录密码', }, status: { required: '请选择状态' } };
+        this.WxValidate = new WxValidate(rules, messages)
+    },
+    // 返回
+    back: function () {
+        wx.navigateBack({ delta: 1 })
+    },
+    // 上傳圖片
+    imgUpload: function (e) {
+        const that = this;
+        let data = that.data.icon;
+        data.push(e.detail)
+        that.setData({ icon: data })
+    },
+    // 删除图片
+    imgDel: function (e) {
+        const that = this;
+        let list = that.data.icon;
+        let arr = list.filter((i, index) => index != e.detail.index)
+        that.setData({ icon: arr })
+    },
+    // 选择性别
+    genderChange: function (e) {
+        const that = this;
+        let index = e.detail.value;
+        let value = that.data.genderList[index];
+        that.setData({ 'form.gender': value });
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        const that = this;
+
+    },
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

pages/setting/basic.json

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

pages/setting/basic.less

@@ -0,0 +1,31 @@
+.main {
+    height: 88vh;
+    background: #ffffff;
+
+    .one {
+        width: 96vw;
+
+        .content {
+            display: flex;
+            flex-direction: row;
+            justify-content: space-between;
+            align-items: center;
+            margin: 0 10px;
+            padding: 10px 5px;
+            border-bottom: 1px solid #cccccc;
+
+            .label {
+                font-size: 14px;
+            }
+
+            .value {
+                color: #666;
+                font-size: 12px;
+
+                input {
+                    text-align: right;
+                }
+            }
+        }
+    }
+}

pages/setting/basic.wxml

@@ -0,0 +1,35 @@
+<mobile-main frameStyle="{{frameStyle}}" bind:back="back">
+    <view slot="info" class="container main">
+        <view class="one">
+            <form catchsubmit="onSubmit">
+                <view class="content">
+                    <view class="label">用户名</view>
+                    <view class="value"><input name="name" value="{{form.name}}" placeholder="请输入用户名" /></view>
+                </view>
+                <view class="content">
+                    <view class="label">用户头像</view>
+                    <view class="value">
+                        <vanupload list="{{icon}}" count="{{1}}" previewSize="{{50}}" bind:imgUpload="imgUpload" bind:imgDel="imgDel"></vanupload>
+                    </view>
+                </view>
+                <view class="content">
+                    <view class="label">性别</view>
+                    <view class="value">
+                        <!-- <van-picker value-key="value" columns="{{ form.gender }}" bind:change="genderChange" /> -->
+                        <picker name="gender" bindchange="genderChange" value="{{form.gender}}" range="{{genderList}}">
+                            <view class="input">{{form.gender||'选择性别'}}</view>
+                        </picker>
+                    </view>
+                </view>
+                <view class="content">
+                    <view class="label">手机号</view>
+                    <view class="value"><input name="phone" value="{{form.phone}}" placeholder="请输入手机号" /></view>
+                </view>
+                <view class="content">
+                    <view class="label">邮箱</view>
+                    <view class="value"><input name="email" value="{{form.email}}" placeholder="请输入邮箱" /></view>
+                </view>
+            </form>
+        </view>
+    </view>
+</mobile-main>

pages/setting/basic.wxss

@@ -0,0 +1,26 @@
+.main {
+  height: 88vh;
+  background: #ffffff;
+}
+.main .one {
+  width: 96vw;
+}
+.main .one .content {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  margin: 0 10px;
+  padding: 10px 5px;
+  border-bottom: 1px solid #cccccc;
+}
+.main .one .content .label {
+  font-size: 14px;
+}
+.main .one .content .value {
+  color: #666;
+  font-size: 12px;
+}
+.main .one .content .value input {
+  text-align: right;
+}

pages/topic/index.js

@@ -6,12 +6,30 @@ Page({
      */
     data: {
         frameStyle: { useTop: true, name: '话题', leftArrow: false, useBar: true },
+        //查询条件
+        searchInfo: {
+            name: '',
+            type: '',
+            type_name: ''
+        },
     },
     // 跳转菜单
     tabPath(e) {
         let { route } = e.detail.detail;
         if (route) wx.redirectTo({ url: `/${route}` })
     },
+    //搜索
+    onSearch() {
+        console.log("搜索");
+    },
+    //显示弹框
+    showPopup() {
+        this.setData({ show: true });
+    },
+    //关闭弹框
+    onClose() {
+        this.setData({ show: false });
+    },
     /**
      * 生命周期函数--监听页面加载
      */

pages/topic/index.less

@@ -1,4 +1,8 @@
 .main {
     height: 80.8vh;
     background-color: #ff0000;
+
+    .one {
+        width: 100%;
+    }
 }

pages/topic/index.wxml

@@ -1,5 +1,22 @@
 <mobile-main frameStyle="{{frameStyle}}" bind:back="back" bind:tabPath="tabPath">
     <view slot="info" class="container main">
-        话题
+        <view class="one">
+            <van-search value="{{ searchInfo.name }}" input-align="center" bind:search="onSearch" placeholder="请输入要查询的话题讨论" />
+        </view>
+        <!-- <view class="two">
+            <view class="two_1">
+                <view class="section">
+                    <picker mode="time" value="{{time}}" start="09:01" end="21:01" bindchange="bindTimeChange">
+                        <view class="picker">
+                            <text> 全部时间
+                                <van-iconname="arrow-down" />
+                            </text>
+                            {{time}}
+                        </view>
+                    </picker>
+                </view>
+            </view>
+            <view class="two_1"></view>
+        </view> -->
     </view>
 </mobile-main>

pages/topic/index.wxss

@@ -2,3 +2,6 @@
   height: 80.8vh;
   background-color: #ff0000;
 }
+.main .one {
+  width: 100%;
+}