Merge branch 'master' of 123.56.28.111:qz-tour/wxapp

pages/me/index.js

@@ -32,6 +32,12 @@ Page({
     this.getUserInfo()
     this.getUserInfo()
   },
   },
 
 
+  toUrl: function (event) {
+    wx.navigateTo({
+      url: event.currentTarget.dataset.url,
+    })
+  },
+
   getUserInfo: function() {
   getUserInfo: function() {
     api.me.info().then(res => {
     api.me.info().then(res => {
       if (!res.code) {
       if (!res.code) {

pages/me/index.wxml

@@ -4,10 +4,10 @@
   <view class='head-map'>
   <view class='head-map'>
     <image src='/images/personal_center/info_background.png'></image>
     <image src='/images/personal_center/info_background.png'></image>
     <view class='avatar_box'>
     <view class='avatar_box'>
-      <image src='/images/personal_center/avatar.jpg'></image>
+      <image src='/images/personal_center/avatar.jpg' bindtap="toUrl" data-url='/pages/me/profile/index'></image>
     </view>
     </view>
-    <view class='user-info-box'>
-      <image src='/images/personal_center/vip.png'></image>
+    <view class='user-info-box'  >
+      <image src='/images/personal_center/vip.png' ></image>
       <text>小熊</text>
       <text>小熊</text>
     </view>
     </view>
   </view>
   </view>
@@ -15,7 +15,7 @@
   <!-- 我的订单 -->
   <!-- 我的订单 -->
   <i-cell-group>
   <i-cell-group>
     <i-cell title="我的订单" is-link url="/pages/me/order/index">
     <i-cell title="我的订单" is-link url="/pages/me/order/index">
-      <text slot="footer" class='text-gray'>全部</text>
+      <text slot="footer" class='text-gray' url='/pages/order/index'>全部</text>
     </i-cell>
     </i-cell>
     <i-row i-class="order-status-box">
     <i-row i-class="order-status-box">
       <i-col span="8" i-class="col-class">
       <i-col span="8" i-class="col-class">
@@ -40,7 +40,7 @@
   </i-cell-group>
   </i-cell-group>
 
 
   <i-cell-group i-class='vip'>
   <i-cell-group i-class='vip'>
-    <i-cell title="VIP会员" is-link url="/pages/dashboard/index">
+    <i-cell title="VIP会员" is-link url="/pages/me/vip/index">
       <text slot="footer" class='text-gray'>全部</text>
       <text slot="footer" class='text-gray'>全部</text>
     </i-cell>
     </i-cell>
     <i-cell title="我的收藏" is-link url="/pages/collection/index"></i-cell>
     <i-cell title="我的收藏" is-link url="/pages/collection/index"></i-cell>

pages/me/profile/index.js

@@ -5,7 +5,7 @@ Page({
    * 页面的初始数据
    * 页面的初始数据
    */
    */
   data: {
   data: {
-
+    array:["男","女"]
   },
   },
 
 
   /**
   /**

pages/me/profile/index.json

-{}
+{
\ No newline at end of file
+  "navigationBarTitleText": "个人中心",
+  "backgroundColor": "#f5f5f5",
+  "usingComponents": {
+    "i-input": "/iview/input/index",
+    "i-row": "/iview/row/index",
+    "i-col": "/iview/col/index",
+    "i-avatar": "/iview/avatar/index",
+    "i-button": "/iview/button/index"
+  }
+}
\ No newline at end of file

pages/me/profile/index.wxml

 <!--pages/me/profile/index.wxml-->
 <!--pages/me/profile/index.wxml-->
-<text>pages/me/profile/index.wxml</text>
+
+<view class='plane'>
+  <i-row i-class='plane-item'>
+    <i-col span="8" i-class="col-class input ">头像</i-col>
+    <i-col span="16" i-class="col-class avatar-box">
+      <image class='avatar-image' src='https://i.loli.net/2017/08/21/599a521472424.jpg'></image>
+    </i-col>
+  </i-row>
+
+  <i-row i-class='plane-item'>
+    <i-col span="8" i-class="col-class input ">名字</i-col>
+    <i-col span="16" i-class="col-class">
+      <input class='input input-text ' placeholder="请输入您的昵称"></input>
+    </i-col>
+  </i-row>
+
+  <i-row i-class='plane-item'>
+    <i-col span="8" i-class="col-class input ">性别</i-col>
+    <i-col span="16" i-class="col-class">
+      <picker bindchange="bindPickerChange" value="0" range="{{array}}">
+        <view class="picker input input-text">
+          {{array[0]}} >
+        </view>
+      </picker>
+    </i-col>
+  </i-row>
+</view>
+
+<view class='plane'>
+  <i-row i-class='plane-item'>
+    <i-col span="8" i-class="col-class input ">手机号</i-col>
+    <i-col span="16" i-class="col-class">
+      <input class='input input-text ' placeholder="立即授权 >" disabled='false'></input>
+    </i-col>
+  </i-row>
+
+  <i-row i-class='plane-item'>
+    <i-col span="8" i-class="col-class input ">手机号</i-col>
+    <i-col span="16" i-class="col-class">
+      <input class='input input-text ' value='18685850590' disabled='false'></input>
+    </i-col>
+  </i-row>
+</view>
+
+<view class='saveBtn'>
+<i-button type="primary" bind:click="handleClick" shape="circle">保存</i-button>
+</view>
\ No newline at end of file

pages/me/profile/index.wxss

-/* pages/me/profile/index.wxss */
+page {
\ No newline at end of file
+  background-color: #f5f5f5;
+  height: 100%;
+}
+
+.plane {
+  background-color: #fff;
+  margin-top: 20rpx;
+}
+
+.plane-item {
+  width: 90%;
+  margin: auto;
+  border-bottom: 1px solid #f9f9f9;
+}
+
+.input {
+  height: 100rpx;
+  line-height: 100rpx;
+  font-size: 28rpx;
+}
+
+.input-text {
+  text-align: right;
+  color: #999;
+}
+
+.avatar-box {
+  padding: 5px 0;
+  height: 100rpx;
+}
+
+.avatar-image {
+  float: right;
+  width: 80rpx;
+  height: 80rpx;
+  border-radius: 50%;
+}
+
+.saveBtn{
+  width:80%;
+  margin: 40rpx auto;
+}

project.config.json

@@ -37,7 +37,7 @@
 			"list": []
 			"list": []
 		},
 		},
 		"miniprogram": {
 		"miniprogram": {
-			"current": 6,
+			"current": 7,
 			"list": [
 			"list": [
 				{
 				{
 					"id": 0,
 					"id": 0,
@@ -78,7 +78,14 @@
 				{
 				{
 					"id": -1,
 					"id": -1,
 					"name": "vip",
 					"name": "vip",
-					"pathName": "pages/me/vip/index"
+					"pathName": "pages/me/vip/index",
+					"query": ""
+				},
+				{
+					"id": -1,
+					"name": "资料",
+					"pathName": "pages/me/profile/index",
+					"query": ""
 				}
 				}
 			]
 			]
 		}
 		}