✨ 对接个人中心/对接角色切换/对接客户信息

pages/clientInfo/clientInfo.js

@@ -1,3 +1,5 @@
+import { get } from "../../utils/http"
+
 // pages/clientInfo/clientInfo.js
 Page({
 
@@ -16,6 +18,14 @@ Page({
       "https://img1.baidu.com/it/u=510862345,2249984174&fm=26&fmt=auto",
       "https://img2.baidu.com/it/u=2222750380,2392750381&fm=26&fmt=auto",
     ],
+    sex: {
+      0: '保密',
+      1: '男',
+      2: '女'
+    },
+    list: [],
+    total: 0,
+    page: 1,
     tags: ['美丽貌美','短短胳膊粗粗的腿','闭月羞花','人美声甜白富美']
   },
 
@@ -23,7 +33,17 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    console.log(options)
+    if(options.userId) {
+      this.setData({
+        userId: options.userId
+      },() => {
+        this.getUserInfo()
+        this.getfeedbackList()
+      })
+      
+    }
+    
   },
 
   /**
@@ -65,7 +85,9 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
-
+    if(this.data.page * 10 < this.data.total) {
+      this.getfeedbackList(++this.data.page)
+    }
   },
 
   /**
@@ -96,10 +118,49 @@ Page({
   /**
    * 图片预览
    */
-  previewImage(e) {
-    wx.previewImage({
-      current: e.currentTarget.dataset.index,
-      urls: this.data.urls
+  previewMedia(e) {
+    let { idx,index } = e.currentTarget.dataset;
+    let arr = this.data.list[idx].media_list
+    let current = index
+    wx.previewMedia({
+      sources: arr,
+      current
+    })
+  },
+
+  /**
+   * 获取客户信息
+   * api/user/info
+  */
+  getUserInfo(user_id) {
+    let { userId } = this.data;
+    get('api/user/info',{
+      user_id: userId
+    },(res) => {
+      this.setData({
+        userInfo: res.data
+      })
+      console.log(res)
+    })
+  },
+
+  /**
+   * 获取订单反馈记录
+   * api/feedback/list/user
+  */
+  getfeedbackList(_page) {
+    let { page,list,userId } = this.data;
+    get('api/feedback/list/user',{
+      user_id: userId,
+      page: _page || page,
+      limit: 10
+    },(res) => {
+      console.log(res)
+      res.data.list.forEach((item,index) => {
+        item.media_list = JSON.parse(item.media_list)
+      })
+      list.push(...res.data.list)
+      this.setData({ list,total: res.data.total, })
     })
   }
 })

pages/clientInfo/clientInfo.wxml

@@ -2,55 +2,61 @@
   <view class="border-radius padding user-info">
     <view class="top flex-justify-space-between">
       <text style="font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;">基本信息</text>
-      <navigator url="/pages/clientInfoEdit/clientInfoEdit" hover-class="none">
+      <navigator url="/pages/clientInfoEdit/clientInfoEdit?userId={{userId}}" hover-class="none">
         <view class="edit-btn flex-center">编辑信息</view>
       </navigator>
     </view>
     <view class="user-avatar flex-align-center">
-      <image src=""></image>
-      <text style="font-size: 28rpx;">查理兹·塞隆…</text>
+      <image src="{{ userInfo.avatar_url }}"></image>
+      <text style="font-size: 28rpx;">{{ userInfo.nickname }}</text>
       <text class="flex1"></text>
-      <text style="font-size: 28rpx;color: #999;">下午  3:45</text>
+      <text style="font-size: 28rpx;color: #999;">{{ userInfo.update_time }}</text>
     </view>
     <view class="user-content flex-column">
-      <text>姓名：陈姐</text>
-      <text>性别：女</text>
-      <text>生日：1980-01-01</text>
-      <text>手机号码：13888888888</text>
-      <text>所在地区：广东省，深圳市，南山区</text>
+      <text>姓名：{{ userInfo.realname }}</text>
+      <text>性别：{{ userInfo.sex == 1 ? "男" : "女" }}</text>
+      <text>生日：{{ userInfo.birthday || '-' }}</text>
+      <text>手机号码：{{ userInfo.mobile || '-' }}</text>
+      <text>所在地区：{{ userInfo.city || '-' }}</text>
       <view class="tags-list flex-align-center">
         <text>客户标签：</text>
-        <view class="item" wx:for="{{ tags }}" wx:key="index">
-          <text>{{ item }}</text>
-        </view>
+        <block wx:if="{{ userInfo.tags && userInfo.tags.length > 0 }}">
+          <view class="item" wx:for="{{ userInfo.tags }}" wx:key="index">
+            <text>相逢是缘</text>
+          </view>
+        </block>
+        <block wx:else>
+          <text>-</text>
+        </block>
       </view>
     </view>
   </view>
   <view class="border-radius padding buy-info">
     <text style="font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;">会员信息</text>
-    <view class="buy-content flex-column">
-      <text class="ellipsis {{ index == 0 ? 'active' : '' }}" wx:for="{{ 10 }}" wx:key="index">2020/01/01-2020/02/01:40分钟月卡会员</text>
+    <view class="buy-content flex-column" wx:if="{{ userInfo.card_list && userInfo.card_list.length > 0 }}">
+      <text class="ellipsis {{ index == 0 ? 'active' : '' }}" wx:for="{{ userInfo.card_list }}" wx:key="index">2020/01/01-2020/02/01:40分钟月卡会员</text>
       <view class="buy-active flex-center">生效中</view>
     </view>
-    <view class="btn-more flex-center" style="color: #666;">查看更多记录</view>
+    <view class="no-more-data" style="padding-bottom: 28rpx;" wx:else>暂无数据~</view>
+    <!-- <view class="btn-more flex-center" style="color: #666;">查看更多记录</view> -->
   </view>
-  <view class="border-radius padding">
+  <!-- <view class="border-radius padding">
     <calendar 
       id="calendar"
       bind:afterCalendarRender="afterCalendarRender"
     />
-  </view>
+  </view> -->
   <view class="border-radius padding list">
     <view class="item-top flex-align-center">
       <text class="flex1">反馈记录</text>
-      <view class="btn flex-center">订单</view>
+      <!-- <view class="btn flex-center">订单</view> -->
     </view>
-    <view class="item flex-column" wx:for="{{4}}" wx:key="index">
+    <view class="item flex-column" wx:for="{{ list }}" wx:for-index="idx" wx:key="index">
       <view class="user-info flex-align-center">
-        <image></image>
+        <image src="{{ item.avatar_url }}"></image>
         <view class="info flex-column flex1">
-          <text style="font-size: 28rpx;margin-bottom: 6rpx;">查理兹·塞隆…</text>
-          <text style="font-size: 20rpx;color: #999;">下午  3:45</text>
+          <text style="font-size: 28rpx;margin-bottom: 6rpx;">{{ item.nickname }}</text>
+          <text style="font-size: 20rpx;color: #999;">{{ item.create_time }}</text>
         </view>
         <!-- <view class="more flex-align-center flex-justify-space-between" bindtap="onEditItem">
           <text></text>
@@ -59,10 +65,26 @@
         </view> -->
         <!-- <view class="more">···</view> -->
       </view>
-      <text style="font-size: 28rpx;color: #666;">当前皮肤毛孔出现堵塞，抓哟集中在T区，主要问题在于自身油脂分泌过多。</text>
+      <text style="font-size: 28rpx;color: #666;">{{ item.content }}</text>
       <view class="box">
-        <image src="{{item}}" data-index="{{item}}" bindtap="previewImage" wx:for="{{urls}}" wx:key="index"></image>
+        <view class="item-media" wx:for="{{ item.media_list }}" wx:key="index">
+          <block wx:if="{{ item.type == 'video' }}">
+            <!-- <video src="{{ item.url }}"></video> -->
+            <!-- <text>视频播放</text> -->
+            <view class="flex-center" style="font-size: 28rpx;width: 100%;height: 100%;background-color: #ccc;" data-idx="{{ idx }}" data-index="{{index}}" bindtap="previewMedia">
+              <!-- 这个是视频 -->
+              <image class="icon-01" src="/images/icon_01.png"></image>
+              <!-- <text style="position: absolute;">这个是视频</text> -->
+              <image class="img-content" data-index="{{index}}" src="{{ item.thumb }}" alt=""></image>
+            </view>
+          </block>
+          <block wx:if="{{ item.type == 'image' }}">
+            <image class="img-content" data-idx="{{ idx }}" data-index="{{index}}" src="{{ item.url }}" alt="" bindtap="previewMedia"></image>
+          </block>
+        </view>
+        <!-- <image src="{{item}}" data-index="{{item}}" bindtap="previewImage" wx:for="{{urls}}" wx:key="index"></image> -->
       </view>
     </view>
   </view>
+  <view class="no-more-data" style="display: {{list.length > 0 && list.length >= total ? 'block' : 'none'}};">已经到底啦~~</view>
 </view>

pages/clientInfo/clientInfo.wxss

@@ -156,5 +156,11 @@
   width: 198rpx;
   height: 198rpx;
   border-radius: 16rpx;
-  background-color: red;
+  /* background-color: red; */
+}
+
+.list .box .icon-01 {
+  width: 64rpx;
+  height: 64rpx;
+  position: absolute;
 }

pages/clientInfoEdit/clientInfoEdit.js

@@ -1,6 +1,6 @@
-// import {
-//   get, post,
-// } from '../../utils/http';
+import {
+  get, post,
+} from '../../utils/http';
 Page({
 
   /**
@@ -19,7 +19,14 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    console.log(options)
+    if(options.userId) {
+      this.setData({
+        userId: options.userId
+      },() => {
+        // this.getUserInfo()
+      })
+    }
   },
 
   /**
@@ -34,6 +41,7 @@ Page({
    */
   onShow: function () {
     // this.getUserFiles()
+    this.getUserInfo()
   },
 
   /**
@@ -144,14 +152,36 @@ Page({
    * api/user/save_files
   */
   setUserFiles() {
-    let { real_name,birthday,sex,city } = this.data.userInfo;
-    post('api/user/save_files',{
-      real_name,
-      birthday,
+    let { user_id,avatar_url,nickname,realname,sex,birthday,mobile,city,tags } = this.data.userInfo;
+    post('api/user/update',{
+      user_id,
+      avatar_url,
+      nickname,
+      realname,
       sex,
-      city
+      birthday,
+      mobile,
+      city,
+      tags
     },() => {
 
     })
-  }
+  },
+
+  /**
+   * 获取用户信息
+   * api/user/info
+  */
+  getUserInfo() {
+    let { userId } = this.data;
+    get('api/user/info',{
+      user_id: userId
+    },(res) => {
+      this.setData({
+        userInfo: res.data
+      })
+      console.log(res)
+    })
+  },
+  
 })

pages/clientInfoEdit/clientInfoEdit.wxml

@@ -3,21 +3,29 @@
     <text class="flex1">头像</text>
     <image class="avatar" src="{{userInfo.avatar_url}}"></image>
   </view>
-  <navigator url="/pages/name/name" hover-class="none">
+  <view class="item flex-align-center">
+    <view class="flex-column flex1">
+      <text class="title">昵称</text>
+      <text class="flex1" wx:if="{{ userInfo.nickname }}">{{ userInfo.nickname  }}</text>
+      <text class="flex1" wx:else style="font-size: 28rpx;color: #ccc;">请填写昵称</text>
+    </view>
+    <!-- <image class="icon-right" src="/images/icon_02.png"></image> -->
+  </view>
+  <!-- <navigator url="/pages/name/name?name={{ userInfo.nickname }}&type=nickname&userId={{ userInfo.user_id }}" hover-class="none">
     <view class="item flex-align-center">
       <view class="flex-column flex1">
         <text class="title">昵称</text>
-        <text class="flex1" wx:if="{{ userInfo.real_name }}">{{ userInfo.real_name  }}</text>
+        <text class="flex1" wx:if="{{ userInfo.nickname }}">{{ userInfo.nickname  }}</text>
         <text class="flex1" wx:else style="font-size: 28rpx;color: #ccc;">请填写昵称</text>
       </view>
       <image class="icon-right" src="/images/icon_02.png"></image>
     </view>
-  </navigator>
-  <navigator url="/pages/name/name" hover-class="none">
+  </navigator> -->
+  <navigator url="/pages/name/name?name={{ userInfo.realname }}&type=realname&userId={{ userInfo.user_id }}" hover-class="none">
     <view class="item flex-align-center">
       <view class="flex-column flex1">
         <text class="title">姓名</text>
-        <text class="flex1" wx:if="{{ userInfo.real_name }}">{{ userInfo.real_name  }}</text>
+        <text class="flex1" wx:if="{{ userInfo.realname }}">{{ userInfo.realname  }}</text>
         <text class="flex1" wx:else style="font-size: 28rpx;color: #ccc;">请填写姓名</text>
       </view>
       <image class="icon-right" src="/images/icon_02.png"></image>
@@ -61,14 +69,18 @@
       <image class="icon-right" src="/images/icon_02.png"></image>
     </view>
   </picker>
-  <navigator url="/pages/tagsEdit/tagsEdit" hover-class="none">
+  <navigator url="/pages/tagsEdit/tagsEdit?user_id={{ userInfo.user_id }}" hover-class="none">
     <view class="item flex-align-center" style="height: auto;padding: 40rpx 24rpx 30rpx;">
       <view class="flex-column flex1">
         <text class="title">客户标签</text>
-        <view class="tags-list flex">
-          <view class="tags-item" wx:for="{{ 10 }}" wx:key="index">美丽貌美</view>
-        </view>
-        <!-- <text class="flex1" wx:if="{{ userInfo.real_name }}">{{ userInfo.real_name  }}</text>
+        <block wx:if="{{ userInfo.tags && userInfo.tags.length > 0 }}">
+          <view class="tags-list flex">
+            <view class="tags-item" wx:for="{{ userInfo.tags }}" wx:key="index">{{ item }}</view>
+          </view>
+        </block>
+        <text class="flex1" wx:else style="font-size: 28rpx;color: #ccc;">暂无客户标签</text>
+        
+        <!-- <text class="flex1" wx:if="{{ userInfo.realname }}">{{ userInfo.realname  }}</text>
         <text class="flex1" wx:else style="font-size: 28rpx;color: #ccc;">请填写昵称</text> -->
       </view>
       <image class="icon-right" src="/images/icon_02.png"></image>

pages/dossier/dossier.js

@@ -1,6 +1,6 @@
-// import {
-//   get, post,
-// } from '../../utils/http';
+import {
+  get, post,
+} from '../../utils/http';
 Page({
 
   /**
@@ -33,7 +33,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    // this.getUserFiles()
+    this.getUserFiles()
   },
 
   /**
@@ -129,7 +129,7 @@ Page({
    * api/user/files
   */
   getUserFiles() {
-    get('api/user/files',{},(res) => {
+    get('api/mruser/info',{},(res) => {
       this.setData({
         userInfo: res.data
       })
@@ -142,12 +142,13 @@ Page({
    * api/user/save_files
   */
   setUserFiles() {
-    let { real_name,birthday,sex,city } = this.data.userInfo;
-    post('api/user/save_files',{
-      real_name,
+    let { avatar_url,realname,birthday,sex,city } = this.data.userInfo;
+    post('api/mruser/update',{
+      avatar_url,
+      realname,
       birthday,
       sex,
-      city
+      city: ''
     },() => {
 
     })

pages/dossier/dossier.wxml

@@ -7,7 +7,7 @@
     <view class="item flex-align-center">
       <view class="flex-column flex1">
         <text class="title">姓名</text>
-        <text class="flex1" wx:if="{{ userInfo.real_name }}">{{ userInfo.real_name  }}</text>
+        <text class="flex1" wx:if="{{ userInfo.realname }}">{{ userInfo.realname  }}</text>
         <text class="flex1" wx:else style="font-size: 28rpx;color: #ccc;">请填写姓名</text>
       </view>
       <image class="icon-right" src="/images/my/right.png"></image>

pages/home/home.js

@@ -15,7 +15,13 @@ Page({
     homeData: {},
     list: [],
     total: 0,
-    page: 1
+    page: 1,
+    // 状态，1待进行，2进行中，3已完成
+    status: {
+      1: '待进行',
+      2: '进行中',
+      3: '已完成',
+    }
   },
 
   /**

pages/home/home.wxml

@@ -34,25 +34,28 @@
     <navigator url="/pages/orderDetail/orderDetail?orderId={{item.order_id}}" hover-class="none" wx:for="{{ list }}" wx:key="index">
       <view class="item border-radius">
         <view class="item-top flex-align-center">
-          <text class="flex1">水氧清洁水光提升综合管理</text>
-          <text style="font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;color: #FF77B0;">已完成</text>
+          <text class="flex1 ellipsis">{{ item.project_name }}</text>
+          <text style="font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;color: #FF77B0;">{{ status[item.status] }}</text>
         </view>
         <view class="item-text flex-column">
-          <text>预约客户：查理兹·塞隆</text>
-          <text>会员信息：非会员</text>
-          <text>预约时间：2019-8-7  8：00~10：00</text>
-          <text>设备：面部综合仪（5号房间）</text>
+          <text>预约客户：{{ item.user_name }}</text>
+          <text>会员信息：{{ item.vip_name }}</text>
+          <text>预约时间：{{ item.order_time }}</text>
+          <text>设备：{{ item.device_name }}</text>
         </view>
         <view class="flex-align-center price">
           <text>预约费用：</text>
-          <text style="color: #FF77B0;">￥888.88</text>
+          <text style="color: #FF77B0;">￥{{ item.price }}</text>
         </view>
         <view class="item-btn flex-align-center flex-justify-space-between">
           <view class="btn flex-center">订单详情</view>
-          <navigator url="/pages/clientInfo/clientInfo" hover-class="none">
+          <navigator url="/pages/clientInfo/clientInfo?userId={{ item.user_id }}" hover-class="none">
             <view class="btn flex-center">客户信息</view>
           </navigator>
-          <view class="btn flex-center">记录反馈</view>
+          <navigator url="/pages/feedback/feedback?orderId={{ item.order_id }}&cover={{ detailData.cover_url }}&name={{ item.project_name }}" hover-class="none">
+            <view class="btn flex-center">记录反馈</view>
+          </navigator>
+          <!-- <view class="btn flex-center">记录反馈</view> -->
         </view>
       </view>
     </navigator>

pages/login/login.json

@@ -1,3 +1,4 @@
 {
+  "navigationBarTitleText": "登录",
   "usingComponents": {}
 }

pages/login/login.wxml

@@ -6,10 +6,10 @@
     <button class="flex-center" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber" wx:else>授权绑定手机号</button>
   </view>
   <view class="flex1"></view>
-  <view class="bottom">
+  <!-- <view class="bottom">
     <text>登录代表同意I JOLI JOLI </text>
     <text style="color: #E95564;" bindtap="goToAgree" data-agree="user_agreement">用户协议、</text>
     <text style="color: #E95564;" bindtap="goToAgree" data-agree="user_private">隐私协议</text>
-  </view>
+  </view> -->
 </view>
 

pages/member/member.js

@@ -1,7 +1,7 @@
-// import {
-//   get,
-//   post
-// } from '../../utils/http';
+import {
+  get,
+  post
+} from '../../utils/http';
 // import {
 //   formatActivity,
 // } from '../../utils/time';
@@ -36,7 +36,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    // this.getUser()
+    this.getUser()
     // this.getUserActivity()
     // this.setData({ agree: wx.getStorageSync('agree') || false })
   },
@@ -94,7 +94,8 @@ Page({
    * api/user
   */
   getUser() {
-    get('api/user',{},(res) => {
+    // api/mruser/info
+    get('api/mruser/info',{},(res) => {
       if(res.data) {
         this.setData({
           userInfo: res.data
@@ -105,44 +106,4 @@ Page({
     })
   },
 
-  /**
-   * 跳转vip页面
-  */
-  goToVip() {
-    console.log(this.data.userInfo)
-    let nextDatas = JSON.stringify(this.data.userInfo)
-    wx.navigateTo({
-      url: `/pages/vip/vip?userInfo=${encodeURIComponent(nextDatas)}`
-      // url: `/pages/vip/vip?userInfo=${JSON.stringify(this.data.userInfo)}`
-      // url: '/pages/vip/vip?userInfo='+ JSON.stringify(this.data.userInfo),
-    })
-  },
-
-  /**
-   * 获取首次开卡优惠
-   * api/user/activity
-  */
-  getUserActivity() {
-    if(this.timer) {
-      clearInterval(this.timer_);
-    }
-    get('api/user/activity',{},(res) => {
-      if(res.data) {
-        res.data.currentTime = formatActivity(res.data.expire_time_seconds)
-        this.setData({
-          activity: res.data
-        })
-        this.timer_ = setInterval(() => {
-          if(res.data.expire_time_seconds <= 0) {
-            clearInterval(this.timer_);
-          }
-          res.data.expire_time_seconds--
-          res.data.currentTime = formatActivity(res.data.expire_time_seconds)
-          this.setData({
-            activity: res.data
-          })
-        }, 1000);
-      }
-    })
-  },
 })

pages/member/member.wxml

@@ -62,16 +62,17 @@
   <view class="item-radius" style="margin-top: 20rpx;">
     <navigator url="/pages/recordList/recordList">
       <view class="item line">
-        <image class="icon-left" src="/images/tools_07.png"></image>
+        <image class="icon-left" src="/images/icon_tools_01.png"></image>
         <text class="flex1">门店检查记录</text>
-        <text class="active" style="color:#999999;">今日未检查</text>
+        <!-- check_status -->
+        <text class="active" style="color:#999999;">{{ userInfo.check_status == 1 ? '今日已检查' : '今日未检查' }}</text>
         <image class="icon-right" src="/images/right.png"></image>
       </view>
     </navigator>
 
     <navigator url="/pages/beautyPlanList/beautyPlanList">
       <view class="item line">
-        <image class="icon-left" src="/images/tools_08.png"></image>
+        <image class="icon-left" src="/images/icon_tools_02.png"></image>
         <text class="flex1">门店客户记录</text>
         <!-- <text class="active" wx:if="{{ userInfo.card_num>0 }}">{{userInfo.card_num}}张可用</text> -->
         <image class="icon-right" src="/images/right.png"></image>
@@ -80,7 +81,7 @@
     
     <navigator url="/pages/dossier/dossier">
       <view class="item line">
-        <image class="icon-left" src="/images/tools_02.png"></image>
+        <image class="icon-left" src="/images/icon_tools_03.png"></image>
         <text class="flex1">个人信息</text>
         <text class="active" style="color:#999999;">去修改</text>
         <image class="icon-right" src="/images/right.png"></image>
@@ -91,14 +92,14 @@
   <view class="item-radius" style="margin-top: 20rpx;">
     <navigator url="/pages/role/role" hover-class="none">
       <view class="item line">
-        <image class="icon-left" src="/images/tools_05.png"></image>
+        <image class="icon-left" src="/images/icon_tools_04.png"></image>
         <text class="flex1">切换角色</text>
         <image class="icon-right" src="/images/right.png"></image>
       </view>
     </navigator>
     <navigator url="/pages/contact/contact" hover-class="none">
       <view class="item">
-        <image class="icon-left" src="/images/tools_06.png"></image>
+        <image class="icon-left" src="/images/icon_tools_05.png"></image>
         <text class="flex1">联系我们</text>
         <!-- <text class="active" style="color:#999999;">去修改</text> -->
         <image class="icon-right" src="/images/right.png"></image>

pages/member/member.wxss

@@ -187,7 +187,7 @@ page {
   width: 48rpx;
   height: 48rpx;
   margin-right: 20rpx;
-  background-color: #ccc;
+  /* background-color: #ccc; */
 }
 
 .tools .item .icon-right {

pages/name/name.js

@@ -1,20 +1,33 @@
-// import {
-//   get, post,
-// } from '../../utils/http';
+import {
+  get, post,
+} from '../../utils/http';
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    userInfo: {}
+    userInfo: {},
+    customerInfo: {},
+    name: '',
+    type: '',
+    userId: ''
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    // this.getUserFiles()
+    console.log(options)
+    if(options.userId) {
+      this.setData({
+        name: options.name,
+        type: options.type,
+        userId: options.userId
+      })
+    } else {
+      this.getUserFiles()
+    }
   },
 
   /**
@@ -71,16 +84,36 @@ Page({
    */
   onChangeName(e) {
     this.setData({
-      ['userInfo.real_name']: e.detail.value,
+      ['userInfo.realname']: e.detail.value,
+    })
+  },
+
+  /**
+   * 更新客户档案
+   * Customer
+   * 
+  */
+  setCustomerInfo() {
+    let { userInfo,type,userId } = this.data;
+    post('api/user/update',{
+      user_id: userId,
+      [type]: userInfo.realname
+    },(res) => {
+      wx.showToast({
+        title: '修改成功',
+      })
+      setTimeout(() => {
+        wx.navigateBack()
+      }, 1000);
     })
   },
 
   /**
-   * 获取用户档案
+   * 获取美导师用户档案
    * api/user/files
    */
   getUserFiles() {
-    get('api/user/files', {}, (res) => {
+    get('api/mruser/info', {}, (res) => {
       this.setData({
         userInfo: res.data
       })
@@ -88,18 +121,20 @@ Page({
   },
 
   /**
-   * 更新用户档案
+   * 更新美导师档案
    * api/user/save_files
    */
   setUserFiles() {
     let {
-      real_name,
+      avatar_url,
+      realname,
       birthday,
       sex,
       city
     } = this.data.userInfo;
-    post('api/user/save_files', {
-      real_name,
+    post('api/mruser/update', {
+      avatar_url,
+      realname,
       birthday,
       sex,
       city

pages/name/name.wxml

@@ -1,4 +1,5 @@
 <view class="content flex-column flex-align-center">
-  <input type="text" focus maxlength="20" placeholder="请输入姓名" value="{{userInfo.real_name}}" bindinput="onChangeName"/>
-  <view class="btn border-radius flex-center" bindtap="setUserFiles">确定</view>
+  <input type="text" focus maxlength="20" placeholder="请输入姓名" value="{{userId ? name :userInfo.realname}}" bindinput="onChangeName"/>
+  <view class="btn border-radius flex-center" bindtap="setCustomerInfo" wx:if="{{ type }}">确定</view>
+  <view class="btn border-radius flex-center" bindtap="setUserFiles" wx:else>确定</view>
 </view>

pages/role/role.js

@@ -1,18 +1,22 @@
-// pages/role/role.js
+import {
+  get,
+  post
+} from '../../utils/http';
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    current: 0
+    current: 0,
+    list: []
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    this.getMruserRole()
   },
 
   /**
@@ -68,5 +72,39 @@ Page({
     this.setData({
       current: e.currentTarget.dataset.index
     })
+  },
+
+  /**
+   * 获取美容师列表
+   * api/mruser/role
+  */
+  getMruserRole() {
+    get('api/mruser/role',{},(res) => {
+      this.setData({
+        list: res.data
+      })
+    })
+  },
+
+  /**
+   * 提交
+  */
+  onSubmit() {
+    // this
+    // api/mruser/change_role
+    let { current,list } = this.data;
+    post('api/mruser/change_role',{
+      role_id: list[current].id
+    },(res) => {
+      wx.showToast({
+        title: res.msg,
+        icon: 'none'
+      })
+      setTimeout(() => {
+        wx.reLaunch({
+          url: '/pages/home/home',
+        })
+      }, 1500);
+    })
   }
 })

pages/role/role.wxml

@@ -1,7 +1,7 @@
 <view class="content">
-  <view class="item flex-align-center {{ index== current ? 'active' : '' }}" wx:for="{{ 3 }}" wx:key="index" bindtap="onChangeRole" data-index="{{index}}">南山店美导师3号</view>
+  <view class="item flex-align-center {{ index== current ? 'active' : '' }}" wx:for="{{ list }}" wx:key="index" bindtap="onChangeRole" data-id="{{ item.id }}" data-index="{{index}}">{{ item.name }}</view>
 </view>
 
 <view class="btn-box">
-  <view class="btn flex-center">确认</view>
+  <view class="btn flex-center" bindtap="onSubmit">确认</view>
 </view>

pages/tagsEdit/tagsEdit.js

@@ -1,18 +1,28 @@
-// pages/tagsEdit/tagsEdit.js
+import {
+  get, post,
+} from '../../utils/http';
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    user_id: ''
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    console.log(options)
+    if(options.user_id) {
+      this.setData({
+        user_id: options.user_id
+      },() => {
+        this.getUserInfo()
+      })
+    }
+    
   },
 
   /**
@@ -62,5 +72,21 @@ Page({
    */
   onShareAppMessage: function () {
 
-  }
+  },
+
+    /**
+   * 获取用户信息
+   * api/user/info
+  */
+  getUserInfo() {
+    let { user_id } = this.data;
+    get('api/user/info',{
+      user_id
+    },(res) => {
+      this.setData({
+        userInfo: res.data
+      })
+      console.log(res)
+    })
+  },
 })

pages/tagsEdit/tagsEdit.wxml

@@ -1,10 +1,10 @@
 <view class="content">
   <view class="title flex-align-center">
     <text style="font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;">客户标签</text>
-    <text style="font-size: 28rpx;color:#999;margin-left: 10rpx;">(3/10)</text>
+    <text style="font-size: 28rpx;color:#999;margin-left: 10rpx;">({{userInfo.tags.length || 0}}/10)</text>
   </view>
   <view class="list">
-    <view class="item flex-align-center" wx:for="{{ 3 }}" wx:key="index">爱美乐观派</view>
+    <view class="item flex-align-center" wx:for="{{ userInfo.tags }}" wx:key="index">{{ item }}</view>
   </view>
   <view class="no-more-data">没有更多标签啦~</view>
 </view>