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

pages/my/userInfo.js

@@ -5,7 +5,8 @@ Page({
      * 页面的初始数据
      */
     data: {
-        frameStyle: { useTop: true, name: '详细信息', leftArrow: true, useBar: false },
+        frameStyle: { useTop: true, name: '个人信息', leftArrow: true, useBar: false },
+        form: { id: "1", img_url: "/image/icon.jpg", name: "测试", gender: '男', phone: '13174420325', email: '' },
     },
     // 返回
     back: function () {

pages/my/userInfo.less

@@ -1,4 +1,32 @@
 .main {
     height: 88vh;
-    background-color: #ff0000;
+    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;
+
+                .img {
+                    height: 10vw;
+                    width: 10vw;
+                    // border-radius: 5px;
+                }
+            }
+        }
+    }
 }

pages/my/userInfo.wxml

@@ -1,7 +1,30 @@
 <mobile-main frameStyle="{{frameStyle}}" bind:back="back">
     <view slot="info" class="container main">
         <view class="one">
-            1
+            <form catchsubmit="onSubmit">
+                <view class="content">
+                    <view class="label">用户名</view>
+                    <view class="value">{{form.name||'未知'}}</view>
+                </view>
+                <view class="content">
+                    <view class="label">用户头像</view>
+                    <view class="value">
+                        <image class="img" src="{{form.img_url}}"></image>
+                    </view>
+                </view>
+                <view class="content">
+                    <view class="label">性别</view>
+                    <view class="value">{{form.gender||'未知'}}</view>
+                </view>
+                <view class="content">
+                    <view class="label">手机号</view>
+                    <view class="value">{{form.phone||'未知'}}</view>
+                </view>
+                <view class="content">
+                    <view class="label">邮箱</view>
+                    <view class="value">{{form.email||'--'}}</view>
+                </view>
+            </form>
         </view>
     </view>
 </mobile-main>

pages/my/userInfo.wxss

@@ -1,4 +1,27 @@
 .main {
   height: 88vh;
-  background-color: #ff0000;
+  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 .img {
+  height: 10vw;
+  width: 10vw;
 }

pages/news/index.wxml

@@ -9,7 +9,77 @@
         <view class="thr">
             <scroll-view scroll-y="true" class="scroll-view">
                 <view class="list-scroll-view">
-                    <view wx:if="{{tabs.active=='a'}}" class="a">
+                    <view wx:if="{{tabs.active=='a'}}">
+                        <view class="list" wx:for="{{list}}" wx:key="item">
+                            <view class="content">
+                                <view class="name">
+                                    <van-icon name="stop" size="10px" />{{item.name}}
+                                </view>
+                                <view class="title">{{item.content}}</view>
+                                <view class="title">{{item.status=='0'?'其他':'原创'}}<text>来源：{{item.source}}</text></view>
+                            </view>
+                            <view class="image" wx:if="{{item.src}}">
+                                <image src="{{item.src}}"></image>
+                            </view>
+                        </view>
+                    </view>
+                    <view wx:if="{{tabs.active=='b'}}">
+                        <view class="list" wx:for="{{list}}" wx:key="item">
+                            <view class="content">
+                                <view class="name">
+                                    <van-icon name="stop" size="10px" />{{item.name}}
+                                </view>
+                                <view class="title">{{item.content}}</view>
+                                <view class="title">{{item.status=='0'?'其他':'原创'}}<text>来源：{{item.source}}</text></view>
+                            </view>
+                            <view class="image" wx:if="{{item.src}}">
+                                <image src="{{item.src}}"></image>
+                            </view>
+                        </view>
+                    </view>
+                    <view wx:if="{{tabs.active=='c'}}">
+                        <view class="list" wx:for="{{list}}" wx:key="item">
+                            <view class="content">
+                                <view class="name">
+                                    <van-icon name="stop" size="10px" />{{item.name}}
+                                </view>
+                                <view class="title">{{item.content}}</view>
+                                <view class="title">{{item.status=='0'?'其他':'原创'}}<text>来源：{{item.source}}</text></view>
+                            </view>
+                            <view class="image" wx:if="{{item.src}}">
+                                <image src="{{item.src}}"></image>
+                            </view>
+                        </view>
+                    </view>
+                    <view wx:if="{{tabs.active=='d'}}">
+                        <view class="list" wx:for="{{list}}" wx:key="item">
+                            <view class="content">
+                                <view class="name">
+                                    <van-icon name="stop" size="10px" />{{item.name}}
+                                </view>
+                                <view class="title">{{item.content}}</view>
+                                <view class="title">{{item.status=='0'?'其他':'原创'}}<text>来源：{{item.source}}</text></view>
+                            </view>
+                            <view class="image" wx:if="{{item.src}}">
+                                <image src="{{item.src}}"></image>
+                            </view>
+                        </view>
+                    </view>
+                    <view wx:if="{{tabs.active=='e'}}">
+                        <view class="list" wx:for="{{list}}" wx:key="item">
+                            <view class="content">
+                                <view class="name">
+                                    <van-icon name="stop" size="10px" />{{item.name}}
+                                </view>
+                                <view class="title">{{item.content}}</view>
+                                <view class="title">{{item.status=='0'?'其他':'原创'}}<text>来源：{{item.source}}</text></view>
+                            </view>
+                            <view class="image" wx:if="{{item.src}}">
+                                <image src="{{item.src}}"></image>
+                            </view>
+                        </view>
+                    </view>
+                    <view wx:if="{{tabs.active=='f'}}">
                         <view class="list" wx:for="{{list}}" wx:key="item">
                             <view class="content">
                                 <view class="name">