Merge branch 'master' of http://gitlab.oytour.com/huaguohao/flashman

app.json

@@ -2,7 +2,6 @@
   "pages": [
     "pages/Home/home",
     "pages/login/login",
-    
     "pages/GroupTour/Pay/Pay",
     "pages/GroupTour/FillOrder/FillOrder",
     "pages/GroupTour/ChDateNum/ChDateNum",
@@ -13,6 +12,7 @@
     "pages/member/member",
     "pages/member/memberCenter/memberCenter",
     "pages/member/memberInfo/memberInfo",
+    "pages/member/memberInfoED/memberInfoED",
     "pages/visa/visa",
     "pages/Voucher/Voucher",
     "pages/Voucher/rating/rating",

pages/member/memberInfo/memberInfo.js

@@ -17,7 +17,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    //修改title
+    wx.setNavigationBarTitle({
+      title: '个人信息'
+    })
   },
 
   /**

pages/member/memberInfo/memberInfo.wxml

 <view class='memberInfo'>
-  <view class='memberInfo-info'>
+  <view class='memberInfo-info' wx:if="{{active === 1}}">
     <view class='head'>
       <view class="boxF">
         <view class="boxS">
@@ -9,7 +9,7 @@
     </view>
     <view class='name'>
       <text>唐先生</text>
-      <image src='../../../images/memberInfo/qianbi.png'></image>
+      <navigator url="/pages/member/memberInfoED/memberInfoED" hover-class="navigator-hover"><image src='../../../images/memberInfo/qianbi.png'></image></navigator>
     </view>
     <view class='info-box'>
       <view class='info-box-tit'>
@@ -53,6 +53,15 @@
       <view class='{{active === 3? "active" : ""}}' id="active3" bindtap='setActive'>
         实名认证
       </view>
+      <view class='{{active === 4? "active" : ""}}' id="active4" bindtap='setActive'>
+        个人认证
+      </view>
+      <view class='{{active === 4? "active" : ""}}' id="active4" bindtap='setActive'>
+        个人认证
+      </view>
+      <view class='{{active === 5? "active" : ""}}' id="active5" bindtap='setActive'>
+        收货地址管理
+      </view>
     </view>
   </scroll-view>
 </view>

pages/member/memberInfo/memberInfo.wxss

 page {
   width: 100%;
   height: 100VH;
-  background:rgba(248,245,245,1);
   background:linear-gradient(0deg,rgba(179,235,255,1),rgba(255,255,255,1),rgba(255,255,255,1));
   overflow: hidden
 }
+.Home_hover{
+  background: transparent;
+}
 .memberInfo{
   height: 987rpx;
   margin-top: 57rpx;

pages/member/memberInfoED/memberInfoED.js

+// pages/member/memberInfoED/memberInfoED.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    index: 0,
+    objectArrayobjectArray: [
+      {
+        id: 0,
+        name: '美国'
+      },
+      {
+        id: 1,
+        name: '中国'
+      },
+      {
+        id: 2,
+        name: '巴西'
+      },
+      {
+        id: 3,
+        name: '日本'
+      }
+    ],
+  },
+  bindPickerChange: function (e) {
+    console.log('picker发送选择改变，携带值为', e.detail.value)
+    this.setData({
+      index: e.detail.value
+    })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+    //修改title
+    wx.setNavigationBarTitle({
+      title: '编辑门店基本资料'
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file

pages/member/memberInfoED/memberInfoED.json

+{
+  "usingComponents": {}
+}
\ No newline at end of file

pages/member/memberInfoED/memberInfoED.wxml

+<view class='edit'>
+  <view class='edit-item'>
+    <label>登录账户：</label><input disabled='disabled'></input>
+  </view>
+  <view class='edit-item'>
+    <label>门店名称：</label><input></input>
+  </view>
+  <view class='edit-item'>
+    <label>联系电话：</label><input></input>
+  </view>
+  <view class='edit-item'>
+    <label>详细地址：</label><input></input>
+  </view>
+  <view class='edit-item'>
+    <label>所属品牌：</label>
+    <view class='brand-box'>
+      <text>四川华夏国旅</text>
+      <text>四川国旅</text>
+      <text>四川国旅</text>
+      <text>四川国旅</text>
+      <text>四川国旅</text>
+    </view>
+  </view>
+  <view class="section">
+    <picker mode="selector" bindchange="bindPickerChange" range-key="{{'name'}}" value="{{'name'}}" range="{{objectArrayobjectArray}}">
+      <view class="picker">
+        请选择
+        <image mode='widthFix' src='../../../images/memberInfo/sanjiao.png'></image>
+      </view>
+    </picker>
+  </view>
+  <view class='save-btn'>
+    保存
+  </view>
+</view>
\ No newline at end of file

pages/member/memberInfoED/memberInfoED.wxss

+page {
+  width: 100%;
+  height: 100VH;
+  background:#f8f5f5;   
+  overflow: hidden;
+}
+.edit{
+  font-size: 28rpx;
+  color: #999999;
+  padding: 40rpx 0;
+}
+.edit .edit-item ,.section{
+  padding: 34rpx 28rpx;
+  border-bottom: 1px solid #E8E8E8;
+  display: flex;
+} 
+.edit .edit-item label{
+  flex: 1;
+}
+.edit .edit-item input,.brand-box,picker{
+  flex: 3;
+}
+.picker{
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: space-between;
+}
+.picker image{
+  width: 24px;
+}
+.brand-box text{
+  padding: 17rpx 37rpx;
+  background:rgba(201,240,254,.4);
+  border-radius:30rpx;
+  display: inline-block;
+  margin: 0 30rpx 15rpx 0;
+}
+.save-btn{
+  padding: 30rpx 0;
+  margin: 61rpx 25rpx 0 25rpx;
+  text-align: center;
+  font-size: 28rpx;
+  background:rgba(238,68,84,1);
+  border-radius:12rpx;
+  color: #FFFFFF
+}
\ No newline at end of file