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

app.json

@@ -2,12 +2,12 @@
     "pages": [
         "pages/index/index",
         "pages/login/index",
+        "pages/register/index",
         "pages/home/index",
         "pages/news/index",
         "pages/topic/index",
         "pages/my/index",
-        "pages/test/index",
-        "pages/register/index"
+        "pages/test/index"
     ],
     "usingComponents": {
         "van-sidebar": "@vant/weapp/sidebar/index",

commpents/mobile-frame/index.wxml

@@ -1,5 +1,5 @@
 <view class="body">
-    <view class="head" wx:if="{{frameStyle.useTop}}" style="background:{{frameStyle.topBg||'#EDEDED'}};">
+    <view class="head" wx:if="{{frameStyle.useTop}}" style="background:{{frameStyle.topBg||'#F5F5F9'}};">
         <top frameStyle="{{frameStyle}}" bind:back="back"></top>
     </view>
     <view class="info">

commpents/upload/index.js

@@ -34,14 +34,14 @@ Component({
         imgUpload(event) {
             const { file } = event.detail;
             wx.uploadFile({
-                url: `${app.globalData.imageUrl}/files/court/elimg/upload`,
+                url: `${app.globalData.fileUrl}/files/court/elimg/upload`,
                 filePath: file.url,
                 name: 'file',
                 formData: {},
                 success: (res) => {
                     let arr = JSON.parse(res.data);
                     if (res.statusCode == 200) {
-                        this.triggerEvent('imgUpload', { name: arr.name, url: `${app.globalData.imageUrl}` + arr.uri, uri: arr.uri })
+                        this.triggerEvent('imgUpload', { name: arr.name, url: `${app.globalData.fileUrl}` + arr.uri, uri: arr.uri })
                     } else {
                         wx.showToast({ title: `${res.errMsg}`, icon: 'fail', duration: 2000 })
                     }

pages/my/index.js

@@ -6,6 +6,7 @@ Page({
      */
     data: {
         frameStyle: { useTop: true, name: '我的', leftArrow: false, useBar: true },
+        icon: '/image/icon.jpg'
     },
     // 跳转菜单
     tabPath(e) {

pages/my/index.less

@@ -1,4 +1,52 @@
 .main {
     height: 80.8vh;
-    background-color: #ff0000;
+
+    .zero {
+        width: 96vw;
+        margin: 0 0 2vw 0;
+    }
+
+    .one {
+        position: relative;
+        width: 96vw;
+        height: 120px;
+
+        .one_1 {
+            height: 80px;
+            background-color: #216EC7;
+            border-bottom-left-radius: 10px;
+            border-bottom-right-radius: 10px;
+            color: transparent;
+        }
+
+        .one_2 {
+            position: absolute;
+            top: 5vw;
+            width: 92vw;
+            height: 100px;
+            margin: 0 2vw;
+            background-color: #ffffff;
+            display: flex;
+            justify-content: space-between;
+
+            .l {
+                display: flex;
+                justify-content: space-between;
+                .l_1 {
+                    .icon {
+                        width: 60px;
+                        height: 60px;
+                        border-radius: 90px;
+                    }
+                }
+            }
+
+            .r {}
+        }
+    }
+
+    .two {
+        background-color: #ff0000;
+    }
+
 }

pages/my/index.wxml

@@ -1,5 +1,25 @@
 <mobile-main frameStyle="{{frameStyle}}" bind:back="back" bind:tabPath="tabPath">
     <view slot="info" class="container main">
-        我的
+        <view class="zero one">
+            <view class="one_1">1</view>
+            <view class="one_2">
+                <view class="l">
+                    <view class="l_1">
+                        <image class="icon" src="{{icon}}"></image>
+                    </view>
+                    <view class="l_2">
+                        <view>姓名</view>
+                        <view>电话号</view>
+                    </view>
+                </view>
+                <view class="r">
+                    <text>详细</text>
+                    <van-icon name="arrow" />
+                </view>
+            </view>
+        </view>
+        <view class="zero two">
+            按钮
+        </view>
     </view>
 </mobile-main>

pages/my/index.wxss

@@ -1,4 +1,41 @@
 .main {
   height: 80.8vh;
+}
+.main .zero {
+  width: 96vw;
+  margin: 0 0 2vw 0;
+}
+.main .one {
+  position: relative;
+  width: 96vw;
+  height: 120px;
+}
+.main .one .one_1 {
+  height: 80px;
+  background-color: #216EC7;
+  border-bottom-left-radius: 10px;
+  border-bottom-right-radius: 10px;
+  color: transparent;
+}
+.main .one .one_2 {
+  position: absolute;
+  top: 5vw;
+  width: 92vw;
+  height: 100px;
+  margin: 0 2vw;
+  background-color: #ffffff;
+  display: flex;
+  justify-content: space-between;
+}
+.main .one .one_2 .l {
+  display: flex;
+  justify-content: space-between;
+}
+.main .one .one_2 .l .l_1 .icon {
+  width: 60px;
+  height: 60px;
+  border-radius: 90px;
+}
+.main .two {
   background-color: #ff0000;
 }