app.json

@@ -18,7 +18,10 @@
     "pages/role/role",
     "pages/recordList/recordList",
     "pages/test/test",
-    "pages/login/login"
+    "pages/login/login",
+    "pages/phone/phone",
+    "pages/customerList/customerList",
+    "pages/historyOrder/historyOrder"
   ],
   "tabBar": {
     "color": "#666666",

pages/clientInfo/clientInfo.js

@@ -1,3 +1,5 @@
+import { get } from "../../utils/http"
+
 // pages/clientInfo/clientInfo.js
 Page({
 
@@ -16,6 +18,18 @@ 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: '女'
+    },
+    calendar: {},
+    calendarConfig: {
+      takeoverTap: true,
+    },
+    list: [],
+    total: 0,
+    page: 1,
     tags: ['美丽貌美','短短胳膊粗粗的腿','闭月羞花','人美声甜白富美']
   },
 
@@ -23,7 +37,17 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    console.log(options)
+    if(options.userId) {
+      this.setData({
+        userId: options.userId
+      },() => {
+        // this.getUserInfo()
+        this.getfeedbackList()
+      })
+      
+    }
+    
   },
 
   /**
@@ -37,7 +61,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    this.getUserInfo()
   },
 
   /**
@@ -65,7 +89,9 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
-
+    if(this.data.page * 10 < this.data.total) {
+      this.getfeedbackList(++this.data.page)
+    }
   },
 
   /**
@@ -76,8 +102,10 @@ Page({
   },
 
   afterCalendarRender(e) {
-    const calendar = this.selectComponent('#calendar').calendar
-    console.log('afterCalendarRender -> calendar', calendar)
+    this.data.calendar = this.selectComponent('#calendar').calendar
+    console.log(this.data.calendar.getCurrentYM())
+    this.getOrderCalendar()
+    console.log('afterCalendarRender -> calendar', this.data.calendar)
     const toSet = [
       {
         year: 2021,
@@ -90,16 +118,107 @@ Page({
         date: 18
       }
     ]
-    calendar.setSelectedDates(toSet)
+    this.data.calendar.setSelectedDates(toSet)
+  },
+
+  /**
+   * 当日历滑动时触发
+   */
+  onSwipe(e) {
+    console.log('onSwipe', e.detail)
+    this.getOrderCalendar()
+  },
+
+  /**
+   * 日期点击事件（此事件会完全接管点击事件），需自定义配置 takeoverTap 值为真才能生效
+   * currentSelect 当前点击的日期
+   */
+  takeoverTap(e) {
+    let { userId } = this.data;
+    if(e.detail.choosed) {
+      wx.navigateTo({
+        url: `/pages/historyOrder/historyOrder?user_id=${userId}&detail=${JSON.stringify(e.detail)}`,
+      })
+      console.log('takeoverTap', e.detail) // => { year: 2019, month: 12, date: 3, ...}
+    }
   },
   
   /**
    * 图片预览
    */
-  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, })
+    })
+  },
+
+  /**
+   * 获取日历
+   * api/order/calendar
+  */
+  getOrderCalendar() {
+    let calendar = this.data.calendar;
+    let month = calendar.getCurrentYM().month;
+    console.log(this.data.calendar.getCurrentYM())
+    get('api/order/calendar',{
+      user_id: this.data.userId,
+      month: `${calendar.getCurrentYM().year}-${month < 10 ? '0' + month : month }`
+    },(res) => {
+      let dates = []
+      calendar.cancelSelectedDates(dates)
+      res.data.forEach((item,index) => {
+        if(item.num > 0) {
+          dates.push({
+            year: calendar.getCurrentYM().year,
+            month: calendar.getCurrentYM().month,
+            date: item.day
+          })
+        }
+        console.log(item)
+      })
+      calendar.setSelectedDates(dates)
+      console.log(dates)
+      console.log(res)
     })
   }
 })

pages/clientInfo/clientInfo.wxml

@@ -2,55 +2,64 @@
   <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>{{ item }}</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">{{ item.active_time }}-{{ item.expire_time }}{{ item.card_name }}</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">
     <calendar 
       id="calendar"
+      config="{{calendarConfig}}"
+      bind:onSwipe="onSwipe"
+      bind:takeoverTap="takeoverTap"
       bind:afterCalendarRender="afterCalendarRender"
     />
   </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 +68,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>
@@ -43,12 +51,13 @@
       <image class="icon-right" src="/images/icon_02.png"></image>
     </view>
   </picker>
-  <view class="item flex-align-center" bindtap="onPopupState" data-key="visible" data-value="{{true}}">
+  <view class="item flex-align-center" data-key="visible" data-value="{{true}}">
+    <!-- bindtap="onPopupState" -->
     <view class="flex-column flex1">
       <text class="title">手机号码</text>
       <text class="flex1">{{ userInfo.mobile }}</text>
     </view>
-    <image class="icon-right" src="/images/icon_02.png"></image>
+    <!-- <image class="icon-right" src="/images/icon_02.png"></image> -->
   </view>
   <picker mode="region" bindchange="bindRegionChange">
     <view class="item flex-align-center">
@@ -61,14 +70,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/customerList/customerList.js

@@ -0,0 +1,95 @@
+import { get } from "../../utils/http"
+
+// pages/customerList/customerList.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    homeData: {},
+    list: []
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.getHomeData()
+    this.getUserList()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+
+  /**
+   * 获取统计数据
+  */
+  getHomeData() {
+    get('api/home',{},(res) => {
+      this.setData({
+        homeData: res.data
+      })
+    })
+  },
+  
+  /**
+   * 获取门店客户列表
+   * api/user/list
+  */
+  getUserList() {
+    get('api/user/list',{},(res) => {
+      this.setData({
+        list: res.data.list
+      })
+      console.log(res)
+    })
+  }
+  // api/user/list
+})

pages/customerList/customerList.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "门店客户记录",
+  "usingComponents": {}
+}

pages/customerList/customerList.wxml

@@ -0,0 +1,28 @@
+<view class="content">
+  <view class="top-text flex-column">
+    <text class="text-1" >今日预约订单数：{{ homeData.order_num }}</text>
+    <text style="font-size: 28rpx;color: #999999;margin-top: 12rpx;">今日服务订单数：{{ homeData.served_num }}</text>
+    <view class="flex-align-center" style="margin-top: 12rpx;">
+      <image src="/images/icon_05.png"></image>
+      <text class="flex1 ellipsis" style="font-size: 24rpx;">{{ homeData.store_address }} {{ homeData.store_name }}</text>
+    </view>
+  </view>
+</view>
+<view class="list">
+  <view class="item" wx:for="{{ list }}" wx:key="index">
+    <view class="title">{{ item.word }}</view>
+    <view class="item-content flex-align-center" wx:for="{{ item.list }}" wx:key="index">
+      <image src="{{ item.avatar_url }}"></image>
+      <text>{{ item.nickname }}</text>
+    </view>
+  </view>
+</view>
+
+
+<!-- font-size: 24px;
+font-family: PingFangSC-Regular, PingFang SC;
+font-weight: 400;
+color: #FF77B0; -->
+<view class="fixed flex-column flex-justify-center">
+  <text style="font-size: 24rpx;color: #FF77B0;" wx:for="{{ list }}" wx:key="index">{{ item.word }}</text>
+</view>

pages/customerList/customerList.wxss

@@ -0,0 +1,54 @@
+.content {
+  padding: 0 28rpx;
+}
+
+.border-radius {
+  background: #FFFFFF;
+  border-radius: 24rpx;
+  margin: 20rpx 0;
+}
+
+.top-text {
+  padding: 18rpx 0 18rpx;
+  padding-left: 8rpx;
+}
+
+.top-text .text-1 {
+  font-size: 36rpx;
+  font-family: PingFangSC-Semibold, PingFang SC;
+  font-weight: 600;
+  color: #FF77B0;
+}
+
+.top-text image {
+  width: 28rpx;
+  height: 28rpx;
+  background-color: #ccc;
+  margin-right: 8rpx;
+}
+
+.title {
+  margin: 20rpx 0;
+  padding: 0 28rpx;
+}
+
+.item-content {
+  height: 112rpx;
+  padding: 0 28rpx;
+  background-color: #fff;
+  border-bottom: 2rpx solid #eee;
+}
+
+.item-content image {
+  width: 72rpx;
+  height: 72rpx;
+  margin-right: 20rpx;
+  border-radius: 50%;
+}
+
+.fixed {
+  position: fixed;
+  right: 20rpx;
+  top: 0rpx;
+  height: 100%;
+}

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,9 +142,10 @@ 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

pages/dossier/dossier.wxml

@@ -7,12 +7,28 @@
     <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>
+      <image class="icon-right" src="/images/right.png"></image>
     </view>
   </navigator>
+  <view class="item flex-align-center">
+    <view class="flex-column flex1">
+      <text class="title">所属店铺</text>
+      <text class="flex1" wx:if="{{ userInfo.realname }}">{{ userInfo.store_name  }}</text>
+      <text class="flex1" wx:else style="font-size: 28rpx;color: #ccc;">'-'</text>
+    </view>
+    <!-- <image class="icon-right" src="/images/right.png"></image> -->
+  </view>
+  <view class="item flex-align-center">
+    <view class="flex-column flex1">
+      <text class="title">直属上级</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/right.png"></image> -->
+  </view>
   <picker bindchange="bindGenderChange" value="{{userInfo.sex == 0 ? 0 : userInfo.sex -1}}" range="{{genders}}">
     <view class="item flex-align-center">
       <view class="flex-column flex1">
@@ -20,7 +36,7 @@
       <text class="flex1">{{ userInfo.sex == 0 ? '保密' : genders[userInfo.sex -1 ] }}</text>
       <!-- <text class="flex1">{{genders[genderIndex]}}</text> -->
     </view>
-    <image class="icon-right" src="/images/my/right.png"></image>
+    <image class="icon-right" src="/images/right.png"></image>
     </view>
   </picker>
   <picker mode="date" value="{{userInfo.birthday}}" start="1980-09-01" bindchange="bindDateChange">
@@ -30,7 +46,7 @@
         <text class="flex1" wx:if="{{ userInfo.birthday }}">{{userInfo.birthday}}</text>
         <text class="flex1" wx:else style="font-size: 28rpx;color: #ccc;">请选择生日</text>
       </view>
-      <image class="icon-right" src="/images/my/right.png"></image>
+      <image class="icon-right" src="/images/right.png"></image>
     </view>
   </picker>
   <view class="item flex-align-center" bindtap="onPopupState" data-key="visible" data-value="{{true}}">
@@ -38,9 +54,9 @@
       <text class="title">手机号码</text>
       <text class="flex1">{{ userInfo.mobile }}</text>
     </view>
-    <image class="icon-right" src="/images/my/right.png"></image>
+    <image class="icon-right" src="/images/right.png"></image>
   </view>
-  <picker mode="region" bindchange="bindRegionChange">
+  <picker mode="region" bindchange="bindRegionChange" style="display: none;">
     <view class="item flex-align-center">
       <view class="flex-column flex1">
         <text class="title">所在地</text>
@@ -48,7 +64,7 @@
         <text class="flex1" wx:else style="font-size: 28rpx;color: #ccc;">请选择常驻城市</text>
         <!-- <text class="flex1">{{region[0]}}，{{region[1]}}，{{region[2]}}</text> -->
       </view>
-      <image class="icon-right" src="/images/my/right.png"></image>
+      <image class="icon-right" src="/images/right.png"></image>
     </view>
   </picker>
 </view>

pages/feedback/feedback.js

@@ -219,24 +219,43 @@ Page({
           mask: true
         });
         const tempFiles = res.tempFiles
+        that.upload(tempFiles[0].thumbTempFilePath).then((data) => {
+          if(imgs.length > 0 && imgs[0].type == 'video') {
+            that.setData({
+              ['imgs[' + 0 + '].thumb']: data.data.url
+            })
+          } else {
+            imgs.unshift({
+              type: 'video',
+              thumb: data.data.url,
+              url: ''
+            })
+            that.setData({ imgs })
+          }
+          // that.setData({ imgs })
+          wx.hideLoading()
+        });
         that.upload(tempFiles[0].tempFilePath).then((data) => {
-          imgs.unshift({
-            type: 'video',
-            thumb: tempFiles[0].thumbTempFilePath,
-            url: data.data.url
-          })
-          that.setData({ imgs })
+          if(imgs.length > 0 && imgs[0].type == 'video') {
+            that.setData({
+              ['imgs[' + 0 + '].url']: data.data.url
+            })
+          } else {
+            imgs.unshift({
+              type: 'video',
+              thumb: '',
+              url: data.data.url
+            })
+            that.setData({ imgs })
+          }
+          // imgs.unshift({
+          //   type: 'video',
+          //   thumb: tempFiles[0].thumbTempFilePath,
+          //   url: data.data.url
+          // })
+          // that.setData({ imgs })
           wx.hideLoading()
         });
-        return;
-        tempFiles.forEach((item) => {
-          imgs.unshift({
-            type: 'video',
-            thumb: item.thumbTempFilePath,
-            url: item.tempFilePath
-          })
-        })
-        that.setData({ imgs })
       }
     })
   },

pages/feedback/feedback.wxss

@@ -21,7 +21,7 @@
 .detail .top image {
   width: 112rpx;
   height: 112rpx;
-  background: #ECECEC;
+  /* background: #ECECEC; */
   border-radius: 12rpx;
   margin-right: 20rpx;
 }

pages/historyOrder/historyOrder.js

@@ -0,0 +1,102 @@
+import { get } from "../../utils/http"
+
+// pages/historyOrder/historyOrder.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    list: [],
+    total: 0,
+    page: 1,
+    user_id: '',
+    detail: {}
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    console.log(options)
+    if(options.user_id) {
+      this.setData({
+        user_id: options.user_id,
+        detail: JSON.parse(options.detail)
+      },() => {
+        this.getHistoryOrder()
+      })
+    }
+    
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    if(this.data.page * 10 < this.data.total) {
+      this.getHistoryOrder(++this.data.page)
+    }
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+
+  /**
+   * 获取历史订单
+   * api/order/history
+  */
+  getHistoryOrder() {
+    let { page,list,user_id,detail } = this.data;
+    let month = detail.month
+    let date = detail.date
+    get('api/order/history',{
+      user_id,
+      day: `${detail.year}-${month < 10 ? '0'+month : month}-${date < 10 ? '0'+date : date}`,
+      page,
+      limit: 10
+    },(res) => {
+      list.push(...res.data.list)
+      this.setData({ list,total: res.data.total, })
+    })
+  }
+})

pages/historyOrder/historyOrder.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "历史订单",
+  "usingComponents": {}
+}

pages/historyOrder/historyOrder.wxml

@@ -0,0 +1,33 @@
+<view class="tabs-content" style="padding: 28rpx;">
+  <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 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">
+        <image src="{{ item.cover_url }}" style="width:152rpx;height:152rpx;margin-right: 12rpx;"></image>
+        <view class="flex-column">
+          <text>预约店铺：{{ item.store_name || '' }}</text>
+          <text>预约时间：{{ item.order_time }}</text>
+          <text>设备：{{ item.device_name }}</text>
+        </view>
+      </view>
+      <view class="flex-align-center price">
+        <text>预约费用：</text>
+        <text style="color: #FF77B0;">￥{{ item.price }}</text>
+      </view>
+      <view class="item-btn flex-align-center ">
+        <text class="flex1"></text>
+        <view class="btn flex-center" style="margin-right: 28rpx;">查看详情</view>
+        <!-- <navigator url="/pages/clientInfo/clientInfo?userId={{ item.user_id }}" hover-class="none">
+          <view class="btn flex-center">客户信息</view>
+        </navigator> -->
+        <navigator url="/pages/feedback/feedback?orderId={{ item.order_id }}&cover={{ item.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>
+</view>

pages/historyOrder/historyOrder.wxss

@@ -0,0 +1,55 @@
+.border-radius {
+  background: #FFFFFF;
+  border-radius: 24rpx;
+  margin: 20rpx 0;
+}
+
+.tabs-content .item {
+  padding: 0 28rpx;
+}
+
+.tabs-content .item-top {
+  height: 102rpx;
+}
+
+.tabs-content .item-top text {
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+}
+
+.tabs-content .item-text {
+  padding: 30rpx 26rpx;
+  background: #FFF7FA;
+  border-radius: 16rpx;
+}
+
+.tabs-content .item-text text {
+  font-size: 28rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #666666;
+  line-height: 48rpx;
+}
+
+.tabs-content .price {
+  height: 84rpx;
+  justify-content: flex-end;
+  border-bottom: 2rpx solid #F9F9F9;
+}
+
+.tabs-content .price text {
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+}
+
+.tabs-content .item-btn {
+  height: 132rpx;
+}
+
+.tabs-content .item-btn .btn {
+  width: 192rpx;
+  height: 72rpx;
+  border-radius: 36rpx;
+  border: 2rpx solid #333333;
+  box-sizing: border-box;
+}

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={{ item.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.js

@@ -107,6 +107,13 @@ Page({
           wx_data: JSON.stringify(that.data.userInfo)
         }, (res) => {
           console.log(res)
+          if(res.data.status == 0) {
+            wx.showToast({
+              title: '未绑定角色，请联系管理员处理！',
+              icon: 'none'
+            })
+            return;
+          } 
           wx.setStorageSync('token', res.data.token);
           wx.setStorageSync('userInfo', res.data)
           wx.showToast({

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">
+    <navigator url="/pages/customerList/customerList">
       <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/orderDetail/orderDetail.wxml

@@ -97,6 +97,7 @@
         <!-- <image src="{{item.url}}" data-index="{{item}}" bindtap="previewImage" wx:for="{{item.media_list}}" wx:key="index"></image> -->
       </view>
     </view>
+    <view class="no-more-data" style="display: {{list.length == 0 ? 'block' : 'none'}};">暂无数据~</view>
   </view>
   <view class="no-more-data" style="display: {{list.length > 0 && list.length >= total ? 'block' : 'none'}};">已经到底啦~~</view>
 </view>

pages/phone/phone.js

@@ -0,0 +1,206 @@
+import { $wuxCountDown } from '../../components/dist/index'
+import {
+  get, post,
+} from '../../utils/http';
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    status: 0,
+    phone: '',
+    phoneVal: '',
+    codeVal: '',
+    sms_token: ''
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    console.log(options)
+    this.setData({
+      phone: options.phone
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+    if(this.c1) this.c1.stop()
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+
+  /**
+   * 监听输入手机号
+  */
+  onChangePhone(e) {
+    this.setData({
+      phoneVal: e.detail.value
+    })
+  },
+
+  /**
+    * 监听输入验证码
+  */
+  onChangeCode(e) {
+    this.setData({
+      codeVal: e.detail.value
+    })
+  },
+
+  /**
+   * 获取验证码
+   * api/sms/send_verify_code
+  */ 
+  getCode() {
+    let { phoneVal,status,sms_token } = this.data;
+    if(phoneVal == '') {
+      wx.showToast({
+        title: '请输入手机号',
+        icon: 'none'
+      })
+      return;
+    }
+    if (this.c1 && this.c1.interval) return !1
+    post('api/sms/send_verify_code',{
+      type: status == 0 ? 1 : 2,
+      mobile: phoneVal,
+      sms_token
+    },(res) => {
+      wx.showToast({
+        title: res.msg,
+      })
+      this.c1 = new $wuxCountDown({
+        date: +(new Date) + 60000,
+        onEnd() {
+          this.setData({
+            c1: '重新获取验证码',
+          })
+        },
+        render(date) {
+          const sec = this.leadingZeros(date.sec, 2) + ' 秒 '
+          date.sec !== 0 && this.setData({
+            c1: sec,
+          })
+        },
+      })
+    })
+  },
+
+  /**
+   * 校验
+  */ 
+  onCheck() {
+    if(this.data.status == 0) {
+      this.verifyMobile();
+    } else {
+      this.changeMobile()
+    }
+    // this.setData({
+    //   status: ++this.data.status,
+    //   phoneVal: '',
+    //   codeVal: ''
+    // })
+  },
+
+  /**
+   * 校验旧手机号的验证码
+   * api/mruser/verify_mobile
+  */
+  verifyMobile() {
+    return new Promise((resolve,reject) => {
+      post('api/mruser/verify_mobile',{
+        verify_code: this.data.codeVal
+      },(res) => {
+        if(this.c1){
+          this.c1.stop()
+          this.setData({
+            c1: null
+          })
+        }
+        wx.showToast({
+          title: res.msg,
+        })
+        this.setData({
+          status: ++this.data.status,
+          phoneVal: '',
+          codeVal: '',
+          sms_token: res.data.sms_token
+        })
+        resolve()
+      })
+    })
+  },
+
+  /**
+   * 更换新手机
+   * api/mruser/change_mobile
+  */
+  changeMobile() {
+    let { phoneVal,codeVal,sms_token } = this.data;
+    post('api/mruser/change_mobile',{
+      verify_code:codeVal,
+      mobile:phoneVal,
+      sms_token
+    },(res) => {
+      if(this.c1){
+        this.c1.stop()
+        this.setData({
+          c1: null
+        })
+      }
+      wx.showToast({
+        title: res.msg,
+      })
+      this.setData({
+        status: ++this.data.status,
+        phoneVal: '',
+        codeVal: '',
+      })
+    })
+  }
+})

pages/phone/phone.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "更改手机绑定",
+  "usingComponents": {}
+}

pages/phone/phone.wxml

@@ -0,0 +1,14 @@
+<view class="content flex-column flex-align-center">
+  <image src="/images/phone_0{{status+1}}.png"></image>
+  <text style="margin-bottom: 56rpx;" wx:if="{{ status == 0 }}">已绑定手机{{phone}}</text>
+  <text style="margin-bottom: 56rpx;" wx:if="{{ status == 1 }}">请输入新的手机号码</text>
+  <text style="margin-bottom: 56rpx;" wx:if="{{ status == 2 }}">绑定成功</text>
+  <block wx:if="{{ status < 2 }}">
+    <input class="number border-radius" value="{{phoneVal}}" type="number" maxlength="11" placeholder="{{ status == 0 ? '请输入手机号' : '请输入新的手机号' }}" bindinput="onChangePhone" />
+    <view class="code border-radius flex-align-center">
+      <input value="{{codeVal}}" type="number" maxlength="6" class="flex1" placeholder="请输入验证码" bindinput="onChangeCode" />
+      <text bindtap="getCode">{{ c1 || '发送验证码' }}</text>
+    </view>
+    <view class="btn border-radius flex-center" bindtap="onCheck">{{status == 0 ? '验证' : '确认'}}</view>
+  </block>
+</view>

pages/phone/phone.wxss

@@ -0,0 +1,52 @@
+page {
+  background: #fff;
+}
+
+.content {
+  padding: 0 92rpx;
+}
+
+image {
+  width: 272rpx;
+  height: 272rpx;
+  margin: 94rpx 0 46rpx;
+}
+
+.border-radius {
+  width: 100%;
+  height: 92rpx;
+  border-radius: 50rpx;
+  box-sizing: border-box;
+}
+
+.number,.code {
+  padding-left: 40rpx;
+  box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(0, 0, 0, 0.15);
+}
+
+.code {
+  margin-top: 30rpx;
+  padding: 16rpx 0;
+}
+
+.code input {
+  height: 100%;
+  padding-left: 40rpx;
+  border-right: 1px solid rgba(229, 229, 229, 0.756);
+}
+
+.code text {
+  padding: 0 26rpx;
+  font-size: 28rpx;
+  color: #333333;
+  font-family: PingFangSC-Regular, PingFang SC;
+}
+
+.btn {
+  background: #FF77B0;
+  margin-top: 62rpx;
+  font-size: 36rpx;
+  font-family: PingFangSC-Medium, PingFang SC;
+  color: #FFFFFF;
+  box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(109, 0, 46, 0.15);
+}

pages/recordList/recordList.js

@@ -1,3 +1,5 @@
+import { get } from "../../utils/http"
+
 // pages/recordList/recordList.js
 Page({
 
@@ -5,14 +7,18 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    todayData: {},
+    list: [],
+    total: 0,
+    page: 1,
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    // this.getCheckToday()
+    // this.getCheckList()
   },
 
   /**
@@ -26,7 +32,8 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    this.getCheckToday()
+    this.getCheckList(1)
   },
 
   /**
@@ -54,7 +61,9 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
-
+    if(this.data.page * 10 < this.data.total) {
+      this.getCheckList(++this.data.page)
+    }
   },
 
   /**
@@ -62,5 +71,38 @@ Page({
    */
   onShareAppMessage: function () {
 
+  },
+
+  /**
+   * 获取今日检查信息
+   * api/check/today
+  */
+  getCheckToday() {
+    get('api/check/today',{},(res) => {
+      this.setData({
+        todayData: res.data
+      })
+      console.log(res)
+    })
+  },
+
+  /**
+   * 获取检查记录列表
+   * api/check/list
+  */
+  getCheckList(_page) {
+    let { page,list,total } = this.data;
+    get('api/check/list',{
+      page: _page || page,
+      limit: 10
+    },(res) => {
+      if (_page == 1 || page == 1) {
+        list = []
+        this.data.page = 1
+      }
+      list.push(...res.data.list)
+      this.setData({ list,total: res.data.total, })
+      console.log(res)
+    })
   }
 })

pages/recordList/recordList.wxml

@@ -1,18 +1,18 @@
 <view class="content">
   <view class="detail-top flex-column">
-    <text style="font-size: 36rpx;">门店名称：JOLIJOLI南山店</text>
-    <text style="font-size: 28rpx;margin: 16rpx 0;">店长：南山店长</text>
+    <text style="font-size: 36rpx;">门店名称：{{ todayData.store_name }}</text>
+    <text style="font-size: 28rpx;margin: 16rpx 0;">店长：{{ todayData.manager_name }}</text>
     <view class="top-info">
       <view class="flex">
         <text>离店检查：</text>
-        <text style="color: #FF77B0;font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;">未检查</text>
+        <text style="color: #FF77B0;font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;">{{ todayData.is_check == 1 ? '已检查' : '未检查' }}</text>
         <text class="flex1"></text>
-        <text>营业复查：已复查</text>
+        <text>营业复查：{{ todayData.is_review == 1 ? '已复查' : '未复查' }}</text>
       </view>
       <view class="top-text flex-column">
-        <text>今日负责人：武则天</text>
-        <text style="margin:20rpx 0;">检查负责人：小婵</text>
-        <text>复查检查人：查理兹·塞隆</text>
+        <text>今日负责人：{{ todayData.charge_name }}</text>
+        <text style="margin:20rpx 0;">检查负责人：{{ todayData.check_name }}</text>
+        <text>复查检查人：{{ todayData.review_name }}</text>
       </view>
     </view>
   </view>
@@ -23,13 +23,13 @@
       <view class="flex1 flex-justify-center">复查</view>
       <view class="flex1 flex-justify-center">负责人</view>
     </view>
-    <navigator url="/pages/recordSheet/recordSheet" hover-class="none" wx:for="{{ 4 }}" wx:key="index">
+    <navigator url="/pages/recordSheet/recordSheet?check_id={{ item.id }}" hover-class="none" wx:for="{{ list }}" wx:key="index">
       <view class="item flex-align-center">
-        <view class="flex1 flex-justify-center">2021/10/11</view>
-        <view class="flex1 flex-justify-center {{ index == 0 ? 'active' : '' }}">未检查</view>
-        <view class="flex1 flex-justify-center {{ index == 0 ? 'active' : '' }}">已复查</view>
+        <view class="flex1 flex-justify-center">{{ item.day }}</view>
+        <view class="flex1 flex-justify-center {{ item.is_check == 0 ? 'active' : '' }}">{{item.is_check == 1 ? '已检查' : '未检查' }}</view>
+        <view class="flex1 flex-justify-center {{ item.is_review == 0 ? 'active' : '' }}">{{item.is_review == 1 ? '已复查' : '未复查' }}</view>
         <view class="flex1 flex-center">
-          <text style="margin-right:12rpx;font-size: 28rpx;">小婵</text>
+          <text style="margin-right:12rpx;font-size: 28rpx;">{{ item.charge_name }}</text>
           <image src="/images/right.png"></image>
         </view>
       </view>

pages/recordSheet/components/inspect/inspect.js

@@ -1,3 +1,5 @@
+import { post } from "../../../../utils/http";
+
 // pages/recordSheet/components/inspect/inspect.js
 Component({
   /**
@@ -7,44 +9,48 @@ Component({
     addGlobalClass: true
   },
   properties: {
-
+    preCheck: {
+      type: Object,
+      value: null,
+      observer(newVal,oldVal) {
+        if(newVal) {
+          console.log(newVal)
+          console.log(newVal.option_list)
+          newVal.option_list.forEach((item,index)=> {
+            item.children.forEach((newItem) => {
+              console.log(newItem)
+              newItem.status = true
+            })
+          })
+          this.setData({
+            check: newVal
+          })
+          console.log(this.data.check)
+        }
+        console.log(newVal,oldVal)
+        // this.setData({
+        //   check
+        // })
+      }
+    },
+    check_id: {
+      type: String,
+      value: null,
+    }
   },
 
   /**
    * 组件的初始数据
    */
   data: {
+    is_list: true,
     list: ['','','',''],
     more: true,
     maxlength: 500,
     number: 0,
     value: "",
-    imgs: [
-      {
-        type: "image",
-        url: "https://img1.baidu.com/it/u=202543353,3627416815&fm=26&fmt=auto"
-      },
-      {
-        type: "image",
-        url: "https://img0.baidu.com/it/u=745609344,230882238&fm=26&fmt=auto"
-      },
-      {
-        type: "image",
-        url: "https://img0.baidu.com/it/u=286636366,3227707112&fm=26&fmt=auto"
-      },
-      {
-        type: "image",
-        url: "https://img1.baidu.com/it/u=2450865760,444795162&fm=26&fmt=auto"
-      },
-      {
-        type: "image",
-        url: "https://img0.baidu.com/it/u=4226275504,4103997964&fm=26&fmt=auto"
-      },
-      {
-        type: "image",
-        url: "https://img0.baidu.com/it/u=2247422843,411257408&fm=26&fmt=auto"
-      },
-    ],
+    imgs: [],
+    check: {}
   },
 
   /**
@@ -55,6 +61,231 @@ Component({
       this.setData({
         more: false
       })
+    },
+
+    /**
+     * 切换结果
+    */
+    onChangeStatus(e) {
+      let { idx,index,status } = e.currentTarget.dataset;
+      this.setData({
+        ['check.option_list[' + idx + '].children['+index+'].status']: status == 'true' ? true : false
+      })
+    },
+
+    /** 监听文本域 */
+    bindTextAreaInput(e) {
+      this.setData({
+        number: e.detail.cursor,
+        value: e.detail.value
+      })
+    },
+
+    /** 选择图片 */
+    chooseImage() {
+      let that = this;
+      let imgs = this.data.imgs;
+      let count = 9 - this.data.imgs.length
+      wx.chooseImage({
+        count,
+        sizeType: ['original', 'compressed'],
+        sourceType: ['album', 'camera'],
+        success (res) {
+          wx.showLoading({
+            title: '正在上传图片',
+            mask: true
+          });
+          const tempFiles = res.tempFiles
+          tempFiles.forEach((item) => {
+            that.upload(item.path).then((data) => {
+              imgs.push({
+                type: 'image',
+                url: data.data.url,
+              })
+              that.setData({ imgs })
+              wx.hideLoading()
+            });
+          })
+          
+        }
+      })
+    },
+
+    /** 选择视频 */
+    chooseVideo(){
+      let that = this;
+      let imgs = this.data.imgs;
+      wx.chooseMedia({
+        count: 1,
+        mediaType: ['video'],
+        sourceType: ['album', 'camera'],
+        maxDuration: 30,
+        camera: 'back',
+        success(res) {
+          wx.showLoading({
+            title: '正在上传视频',
+            mask: true
+          });
+          const tempFiles = res.tempFiles
+          that.upload(tempFiles[0].thumbTempFilePath).then((data) => {
+            if(imgs.length > 0 && imgs[0].type == 'video') {
+              that.setData({
+                ['imgs[' + 0 + '].thumb']: data.data.url
+              })
+            } else {
+              imgs.unshift({
+                type: 'video',
+                thumb: data.data.url,
+                url: ''
+              })
+              that.setData({ imgs })
+            }
+            // that.setData({ imgs })
+            wx.hideLoading()
+          });
+          that.upload(tempFiles[0].tempFilePath).then((data) => {
+            if(imgs.length > 0 && imgs[0].type == 'video') {
+              that.setData({
+                ['imgs[' + 0 + '].url']: data.data.url
+              })
+            } else {
+              imgs.unshift({
+                type: 'video',
+                thumb: '',
+                url: data.data.url
+              })
+              that.setData({ imgs })
+            }
+            // imgs.unshift({
+            //   type: 'video',
+            //   thumb: tempFiles[0].thumbTempFilePath,
+            //   url: data.data.url
+            // })
+            // that.setData({ imgs })
+            wx.hideLoading()
+          });
+        }
+      })
+    },
+
+    /** 上传视频/图片 */
+    upload(filePath) {
+      let that = this;
+      // 上传类型/业务类型：avatar头像，order订单反馈，check检查表反馈
+      return new Promise((resolve,reject) => {
+        let { imgs } = this.data;
+        wx.uploadFile({
+          url: 'https://store.test-api.ijolijoli.com/api/upload',
+          header: {
+            token: wx.getStorageSync('token') || '',
+          },
+          filePath,
+          name: 'file',
+          formData: {
+            'type': 'check'
+          },
+          success(res) {
+            console.log(res)
+            if(res.statusCode == 200 && res.data) {
+              let data = JSON.parse(res.data);
+              if(data.code == 200 && data.data) {
+                resolve(data)
+              } else {
+                wx.showToast({
+                  title: '上传失败',
+                  icon: 'none'
+                })
+              }
+            } else {
+              wx.showToast({
+                title: '上传失败',
+                icon: 'none'
+              })
+            }
+          },
+          fail(err) {
+            wx.showToast({
+              title: '上传失败',
+              icon: 'none'
+            })
+          }
+        })
+      })
+    },
+
+    /**
+     * 删除列表项
+    */
+    onDeleteItem(e) {
+      let imgs = this.data.imgs;
+      if(this.data.is_list) {
+        imgs = this.data.check.feedback.media_list
+      }
+      imgs.splice(e.currentTarget.dataset.index, 1);
+      this.setData({ imgs })
+      console.log(imgs)
+    },
+
+    /**
+     * /api/check/update
+     * 添加/修改检查信息
+    */
+    onCheckUpdate() {
+      let { orderId,value,imgs,check,check_id } = this.data;
+      let option_ids = [], option_values= [];
+      check.option_list.forEach((item,index) => {
+        item.children.forEach((newItem,index) => {
+          option_ids.push(newItem.id)
+          if(newItem.status) {
+            option_values.push(1)
+          } else {
+            option_values.push(2)
+          }
+        })
+      })
+      post('api/check/update',{
+        check_id,
+        type: check.type,
+        option_ids: option_ids.toString(),
+        option_values: option_values.toString(),
+        content: value,
+        media_list: JSON.stringify(imgs)
+      },(res) => {
+        wx.showToast({
+          title: res.msg,
+          icon: 'none'
+        })
+        setTimeout(() => {
+          let pages=getCurrentPages()
+          let prePage = pages[pages.length-1]
+          prePage.onShow()
+          this.setData({
+            is_list: true
+          })
+        }, 1500);
+        console.log(res)
+      })
+    },
+
+    /** 预览图片和视频 */
+    previewMedia(e) {
+      let arr = this.data.imgs
+      if(this.data.is_list) {
+        arr = this.data.check.feedback.media_list
+      }
+      let current = e.currentTarget.dataset.index
+      wx.previewMedia({
+        sources: arr,
+        current
+      })
+    },
+
+    /** 切换编辑 */
+    onChangeEdit() {
+      this.setData({
+        is_list: false
+      })
     }
+
   }
 })

pages/recordSheet/components/inspect/inspect.wxml

@@ -7,71 +7,129 @@
     </view>
     <view class="list">
     <!-- <style="{{ more ? index < 3 ? 'block' : 'none' : block }}"></style> -->
-      <view class="item flex" wx:for="{{ list }}" wx:key="index" wx:if="{{  more?index<3 ? true : false  : true }}">
-        <view class="left flex-center">前台</view>
+      <view class="item flex" wx:for="{{ check.option_list }}" wx:for-index="idx"  wx:key="index" wx:if="{{  more?idx<3 ? true : false  : true }}">
+        <view class="left flex-center">{{ item.location }}</view>
         <view class="right flex1 flex-column flex-justify-center">
-          <view class="flex flex1" style="height: 100%;border-bottom: 2rpx solid #f2f2f2;" wx:for="{{ 3 }}" wx:key="index">
-            <view class="text flex1 flex-center" style="padding: 18rpx;">地面无杂物、垃圾桶清</view>
+          <view class="flex flex1" style="height: 100%;border-bottom: 2rpx solid #f2f2f2;" wx:for="{{ item.children }}" wx:key="index">
+            <view class="text flex1 flex-center" style="padding: 18rpx;">{{ item.name }}</view>
             <view class="item-btn flex-center" style="width: 238rpx;border-left: 2rpx solid #d3d3d3;">
-              <text>是</text>
-              <image src="" style="margin-right: 20rpx;"></image>
-              <text>否</text>
-              <image src=""></image>
+              <block wx:if="{{ is_list }}">
+                <block wx:if="{{ item.value == 1 }}">
+                  <text>是</text>
+                  <image src="/images/select_ok.png" style="margin-right: 20rpx;"></image>
+                </block>
+                <block wx:if="{{ item.value == 2 }}">
+                  <text>否</text>
+                  <image src="/images/select_ok.png"></image>
+                </block>
+                <block wx:if="{{ item.value == 0 }}">
+                  <text>未记录</text>
+                </block>
+              </block>
+              <block wx:if="{{ !is_list }}">
+                <text>是</text>
+                <image src="/images/select_{{ item.status ? 'ok' : 'no' }}.png" style="margin-right: 20rpx;" bindtap="onChangeStatus" data-idx="{{idx}}" data-index="{{index}}" data-status="true"></image>
+                <text>否</text>
+                <image src="/images/select_{{ !item.status ? 'ok' : 'no' }}.png" bindtap="onChangeStatus" data-idx="{{idx}}" data-index="{{index}}" data-status="false"></image>
+              </block>
             </view>
           </view>
         </view>
       </view>
-      <view class="module flex-center" wx:if="{{ list.length > 3 && more }}" bindtap="onOpenList">
+      <view class="module flex-center" wx:if="{{ check.option_list.length > 3 && more }}" bindtap="onOpenList">
         <view class="icon">>></view>
       </view>
     </view>
   </view>
-  <view class="padding" style="padding: 0 36rpx;" style="display: none;">
+  <view class="padding" style="padding: 0 36rpx;">
     <view class="detail border-radius">
-    <view class="top flex-align-center">
-      <text style="font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;">早班复查问题反馈</text>
-    </view>
-    <view class="box-textarea">
-      <textarea bindinput="bindTextAreaInput" value="{{value}}" maxlength="{{maxlength}}" placeholder="请输入记录反馈" />
-      <view class="box-text">{{number}}/{{maxlength}}</view>
-    </view>
-    <view class="change-img">
-      <view class="text">
-        <text>添加视频/图片</text>
-        <text style="font-size:28rpx;color:#999;">({{imgs.length}}/9)</text>
+      <view class="top flex-align-center">
+        <text style="font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;">早班复查问题反馈</text>
       </view>
-      <view class="img-box">
-        <view class="position-relative" style="position: relative;" wx:for="{{ imgs }}" wx:key="index">
-          <view class="item">
-            <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-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>
+      <block wx:if="{{ is_list }}">
+        <view class="check-list" wx:if="{{ check.feedback }}">
+          <view class="item flex-column">
+            <view class="user-info flex-align-center">
+              <image src="{{ check.feedback.avatar_url }}"></image>
+              <view class="info flex-column flex1">
+                <text style="font-size: 28rpx;margin-bottom: 6rpx;">{{ check.feedback.nickname }}</text>
+                <text style="font-size: 20rpx;color: #999;">{{ check.feedback.update_time }}</text>
+              </view>
+              <!-- <view class="more flex-align-center flex-justify-space-between" data-item="{{ item }}" bindtap="onEditItem" wx:if="{{ item.allow_edit == 1 }}">
+                <text></text>
+                <text></text>
+                <text></text>
+              </view> -->
+              <!-- <view class="more">···</view> -->
+            </view>
+            <text style="font-size: 28rpx;color: #666;margin-bottom: 30rpx;">{{ check.feedback.content }}</text>
+            <view class="box" wx:if="{{ check.feedback.media_list && check.feedback.media_list.length > 0 }}">
+              <view class="item-media" wx:for="{{ check.feedback.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>
-            </block>
-            <block wx:if="{{ item.type == 'image' }}">
-              <image class="img-content" data-index="{{index}}" src="{{ item.url }}" alt="" bindtap="previewMedia"></image>
-            </block>
+              
+              <!-- <image src="{{item.url}}" data-index="{{item}}" bindtap="previewImage" wx:for="{{item.media_list}}" wx:key="index"></image> -->
+            </view>
           </view>
-          <image src="" class="delete-img" data-index="{{index}}" bindtap="onDeleteItem"></image>
         </view>
-        
-        <view class="item upload flex-column flex-center" wx:if="{{ imgs.length>0 && imgs.length < 9 &&imgs[0].type != 'video' }}" bindtap="chooseVideo">
-          <image src=""></image>
-          <text style="font-size: 28rpx;">添加视频</text>
+        <view class="no-more-data" wx:if="{{ !check.feedback }}">暂无反馈记录~</view>
+      </block>
+      <block wx:if="{{ !is_list }}">
+        <view class="box-textarea">
+        <textarea bindinput="bindTextAreaInput" value="{{value}}" maxlength="{{maxlength}}" placeholder="请输入记录反馈" />
+        <view class="box-text">{{number}}/{{maxlength}}</view>
         </view>
-        <view class="item upload flex-column flex-center" wx:if="{{ imgs.length > 0 && imgs.length < 9}}" bindtap="chooseImage">
-          <image src=""></image>
-          <text style="font-size: 28rpx;">添加图片</text>
+        <view class="change-img">
+          <view class="text">
+            <text>添加视频/图片</text>
+            <text style="font-size:28rpx;color:#999;">({{imgs.length}}/9)</text>
+          </view>
+          <view class="img-box">
+            <view class="position-relative" style="position: relative;" wx:for="{{ imgs }}" wx:key="index">
+              <view class="item">
+                <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-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-index="{{index}}" src="{{ item.url }}" alt="" bindtap="previewMedia"></image>
+                </block>
+              </view>
+              <image src="/images/icon_03.png" class="delete-img" data-index="{{index}}" bindtap="onDeleteItem"></image>
+            </view>
+            
+            <view class="item upload flex-column flex-center" wx:if="{{ imgs.length < 9 &&imgs[0].type != 'video' }}" bindtap="chooseVideo">
+              <image src=""></image>
+              <text style="font-size: 28rpx;">添加视频</text>
+            </view>
+            <view class="item upload flex-column flex-center" wx:if="{{ imgs.length < 9}}" bindtap="chooseImage">
+              <image src=""></image>
+              <text style="font-size: 28rpx;">添加图片</text>
+            </view>
+          </view>
         </view>
-      </view>
-    </view>
+      </block>
     </view>
-    <view class="btn flex-center">提交</view>
+    <view class="btn flex-center" wx:if="{{ is_list && check.allow_edit == 1 }}" bindtap="onChangeEdit">编辑晚班记录</view>
+    <view class="btn flex-center" wx:if="{{ !is_list }}" bindtap="onCheckUpdate">提交</view>
   </view>
 
 </view>

pages/recordSheet/components/inspect/inspect.wxss

@@ -50,7 +50,7 @@
 .content .item-btn image {
   width: 48rpx;
   height: 48rpx;
-  background-color: #ccc;
+  /* background-color: #ccc; */
   border-radius: 50%;
 }
 
@@ -161,4 +161,80 @@
   border-radius: 48rpx;
   font-size: 36rpx;
   color: #fff;
+}
+
+
+
+
+
+.check-list .item {
+  padding-top: 30rpx;
+}
+
+.check-list .item-top {
+  padding: 0 28rpx;
+}
+
+.check-list .item-top .btn {
+  width: 154rpx;
+  height: 52rpx;
+  border-radius: 26rpx;
+  border: 2rpx solid #333333;
+  box-sizing: border-box;
+  font-size: 28rpx;
+}
+
+.check-list .user-info {
+  margin-bottom: 20rpx;
+}
+
+.check-list .user-info image {
+  width: 64rpx;
+  height: 64rpx;
+  border-radius: 50%;
+  /* background-color: red; */
+  margin-right: 14rpx;
+}
+
+.check-list .more {
+  width: 48rpx;
+  height: 48rpx;
+  padding: 0 4rpx;
+  box-sizing: border-box;
+}
+
+.check-list .more text {
+  width: 8rpx;
+  height: 8rpx;
+  background: #333;
+  border-radius: 50%;
+}
+
+.check-list .box {
+  display: grid;
+  grid-gap: 20rpx 22rpx;
+  grid-template-columns: repeat(3, 1fr);
+  padding: 0rpx 0 30rpx;
+}
+
+.check-list .box .item-media {
+  width: 198rpx;
+  height: 198rpx;
+  border-radius: 16px;
+  box-sizing: border-box;
+  overflow: hidden;
+  position: relative;
+}
+
+.check-list .box image {
+  width: 100%;
+  height: 100%;
+  border-radius: 16rpx;
+  /* background-color: red; */
+}
+
+.check-list .box .icon-01 {
+  width: 64rpx;
+  height: 64rpx;
+  position: absolute;
 }

pages/recordSheet/components/review/review.js

@@ -1,23 +1,272 @@
-// pages/recordSheet/components/review/review.js
+import { post } from "../../../../utils/http";
+
+// pages/recordSheet/components/inspect/inspect.js
 Component({
   /**
    * 组件的属性列表
    */
+  options: {
+    addGlobalClass: true
+  },
   properties: {
-
+    manager: {
+      type: Object,
+      value: null,
+      observer(newVal,oldVal) {
+        if(newVal) {
+          console.log(newVal)
+          console.log(newVal.option_list)
+          newVal.option_list.forEach((item,index)=> {
+            item.children.forEach((newItem) => {
+              console.log(newItem)
+              newItem.status = true
+            })
+          })
+          this.setData({
+            check: newVal
+          })
+          console.log(this.data.check)
+        }
+        console.log(newVal,oldVal)
+        // this.setData({
+        //   check
+        // })
+      }
+    },
+    check_id: {
+      type: String,
+      value: null,
+    }
   },
 
   /**
    * 组件的初始数据
    */
   data: {
-
+    is_list: true,
+    list: ['','','',''],
+    more: true,
+    maxlength: 500,
+    number: 0,
+    value: "",
+    imgs: [],
+    check: {}
   },
 
   /**
    * 组件的方法列表
    */
   methods: {
+    onOpenList() {
+      this.setData({
+        more: false
+      })
+    },
+
+    /**
+     * 切换结果
+    */
+    onChangeStatus(e) {
+      let { idx,index,status } = e.currentTarget.dataset;
+      this.setData({
+        ['check.option_list[' + idx + '].children['+index+'].status']: status == 'true' ? true : false
+      })
+    },
+
+    /** 监听文本域 */
+    bindTextAreaInput(e) {
+      this.setData({
+        number: e.detail.cursor,
+        value: e.detail.value
+      })
+    },
+
+    /** 选择图片 */
+    chooseImage() {
+      let that = this;
+      let imgs = this.data.imgs;
+      let count = 9 - this.data.imgs.length
+      wx.chooseImage({
+        count,
+        sizeType: ['original', 'compressed'],
+        sourceType: ['album', 'camera'],
+        success (res) {
+          wx.showLoading({
+            title: '正在上传图片',
+            mask: true
+          });
+          const tempFiles = res.tempFiles
+          tempFiles.forEach((item) => {
+            that.upload(item.path).then((data) => {
+              imgs.push({
+                type: 'image',
+                url: data.data.url,
+              })
+              that.setData({ imgs })
+              wx.hideLoading()
+            });
+          })
+          
+        }
+      })
+    },
+
+    /** 选择视频 */
+    chooseVideo(){
+      let that = this;
+      let imgs = this.data.imgs;
+      wx.chooseMedia({
+        count: 1,
+        mediaType: ['video'],
+        sourceType: ['album', 'camera'],
+        maxDuration: 30,
+        camera: 'back',
+        success(res) {
+          wx.showLoading({
+            title: '正在上传视频',
+            mask: true
+          });
+          const tempFiles = res.tempFiles
+          that.upload(tempFiles[0].tempFilePath).then((data) => {
+            imgs.unshift({
+              type: 'video',
+              thumb: tempFiles[0].thumbTempFilePath,
+              url: data.data.url
+            })
+            that.setData({ imgs })
+            wx.hideLoading()
+          });
+          return;
+          tempFiles.forEach((item) => {
+            imgs.unshift({
+              type: 'video',
+              thumb: item.thumbTempFilePath,
+              url: item.tempFilePath
+            })
+          })
+          that.setData({ imgs })
+        }
+      })
+    },
+
+    /** 上传视频/图片 */
+    upload(filePath) {
+      let that = this;
+      // 上传类型/业务类型：avatar头像，order订单反馈，check检查表反馈
+      return new Promise((resolve,reject) => {
+        let { imgs } = this.data;
+        wx.uploadFile({
+          url: 'https://store.test-api.ijolijoli.com/api/upload',
+          header: {
+            token: wx.getStorageSync('token') || '',
+          },
+          filePath,
+          name: 'file',
+          formData: {
+            'type': 'check'
+          },
+          success(res) {
+            console.log(res)
+            if(res.statusCode == 200 && res.data) {
+              let data = JSON.parse(res.data);
+              if(data.code == 200 && data.data) {
+                resolve(data)
+              } else {
+                wx.showToast({
+                  title: '上传失败',
+                  icon: 'none'
+                })
+              }
+            } else {
+              wx.showToast({
+                title: '上传失败',
+                icon: 'none'
+              })
+            }
+          },
+          fail(err) {
+            wx.showToast({
+              title: '上传失败',
+              icon: 'none'
+            })
+          }
+        })
+      })
+    },
+
+    /**
+     * 删除列表项
+    */
+    onDeleteItem(e) {
+      let imgs = this.data.imgs;
+      if(this.data.is_list) {
+        imgs = this.data.check.feedback.media_list
+      }
+      imgs.splice(e.currentTarget.dataset.index, 1);
+      this.setData({ imgs })
+      console.log(imgs)
+    },
+
+    /**
+     * /api/check/update
+     * 添加/修改检查信息
+    */
+    onCheckUpdate() {
+      let { orderId,value,imgs,check,check_id } = this.data;
+      let option_ids = [], option_values= [];
+      check.option_list.forEach((item,index) => {
+        item.children.forEach((newItem,index) => {
+          option_ids.push(newItem.id)
+          if(newItem.status) {
+            option_values.push(1)
+          } else {
+            option_values.push(2)
+          }
+        })
+      })
+      post('api/check/update',{
+        check_id,
+        type: check.type,
+        option_ids: option_ids.toString(),
+        option_values: option_values.toString(),
+        content: value,
+        media_list: JSON.stringify(imgs)
+      },(res) => {
+        wx.showToast({
+          title: res.msg,
+          icon: 'none'
+        })
+        setTimeout(() => {
+          let pages=getCurrentPages()
+          let prePage = pages[pages.length-1]
+          prePage.onShow()
+          this.setData({
+            is_list: true
+          })
+        }, 1500);
+        console.log(res)
+      })
+    },
+
+    /** 预览图片和视频 */
+    previewMedia(e) {
+      let arr = this.data.imgs
+      if(this.data.is_list) {
+        arr = this.data.check.feedback.media_list
+      }
+      let current = e.currentTarget.dataset.index
+      wx.previewMedia({
+        sources: arr,
+        current
+      })
+    },
+
+    /** 切换编辑 */
+    onChangeEdit() {
+      this.setData({
+        is_list: false
+      })
+    }
 
   }
 })

pages/recordSheet/components/review/review.wxml

@@ -1,2 +1,135 @@
-<!--pages/recordSheet/components/review/review.wxml-->
-<text>pages/recordSheet/components/review/review.wxml</text>
+<view class="inspect">
+  <view class="content">
+    <view class="title flex">
+      <view class="item flex-center" style="width: 172rpx;border-right: 4rpx solid #fff;">站点</view>
+      <view class="item flex1 flex-center">检查项目</view>
+      <view class="item flex-center" style="width: 236rpx;border-left: 4rpx solid #fff;">结果</view>
+    </view>
+    <view class="list">
+    <!-- <style="{{ more ? index < 3 ? 'block' : 'none' : block }}"></style> -->
+      <view class="item flex" wx:for="{{ check.option_list }}" wx:for-index="idx"  wx:key="index" wx:if="{{  more?idx<3 ? true : false  : true }}">
+        <view class="left flex-center">{{ item.location }}</view>
+        <view class="right flex1 flex-column flex-justify-center">
+          <view class="flex flex1" style="height: 100%;border-bottom: 2rpx solid #f2f2f2;" wx:for="{{ item.children }}" wx:key="index">
+            <view class="text flex1 flex-center" style="padding: 18rpx;">{{ item.name }}</view>
+            <view class="item-btn flex-center" style="width: 238rpx;border-left: 2rpx solid #d3d3d3;">
+              <block wx:if="{{ is_list }}">
+                <block wx:if="{{ item.value == 1 }}">
+                  <text>是</text>
+                  <image src="/images/select_ok.png" style="margin-right: 20rpx;"></image>
+                </block>
+                <block wx:if="{{ item.value == 2 }}">
+                  <text>否</text>
+                  <image src="/images/select_ok.png"></image>
+                </block>
+                <block wx:if="{{ item.value == 0 }}">
+                  <text>未记录</text>
+                </block>
+              </block>
+              <block wx:if="{{ !is_list }}">
+                <text>是</text>
+                <image src="/images/select_{{ item.status ? 'ok' : 'no' }}.png" style="margin-right: 20rpx;" bindtap="onChangeStatus" data-idx="{{idx}}" data-index="{{index}}" data-status="true"></image>
+                <text>否</text>
+                <image src="/images/select_{{ !item.status ? 'ok' : 'no' }}.png" bindtap="onChangeStatus" data-idx="{{idx}}" data-index="{{index}}" data-status="false"></image>
+              </block>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="module flex-center" wx:if="{{ check.option_list.length > 3 && more }}" bindtap="onOpenList">
+        <view class="icon">>></view>
+      </view>
+    </view>
+  </view>
+  <view class="padding" style="padding: 0 36rpx;">
+    <view class="detail border-radius">
+      <view class="top flex-align-center">
+        <text style="font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;">早班复查问题反馈</text>
+      </view>
+      <block wx:if="{{ is_list }}">
+        <view class="check-list" wx:if="{{ check.feedback }}">
+          <view class="item flex-column">
+            <view class="user-info flex-align-center">
+              <image src="{{ check.feedback.avatar_url }}"></image>
+              <view class="info flex-column flex1">
+                <text style="font-size: 28rpx;margin-bottom: 6rpx;">{{ check.feedback.nickname }}</text>
+                <text style="font-size: 20rpx;color: #999;">{{ check.feedback.update_time }}</text>
+              </view>
+              <!-- <view class="more flex-align-center flex-justify-space-between" data-item="{{ item }}" bindtap="onEditItem" wx:if="{{ item.allow_edit == 1 }}">
+                <text></text>
+                <text></text>
+                <text></text>
+              </view> -->
+              <!-- <view class="more">···</view> -->
+            </view>
+            <text style="font-size: 28rpx;color: #666;margin-bottom: 30rpx;">{{ check.feedback.content }}</text>
+            <view class="box" wx:if="{{ check.feedback.media_list && check.feedback.media_list.length > 0 }}">
+              <view class="item-media" wx:for="{{ check.feedback.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.url}}" data-index="{{item}}" bindtap="previewImage" wx:for="{{item.media_list}}" wx:key="index"></image> -->
+            </view>
+          </view>
+        </view>
+        <view class="no-more-data" wx:if="{{ !check.feedback }}">暂无反馈记录~</view>
+      </block>
+      <block wx:if="{{ !is_list }}">
+        <view class="box-textarea">
+        <textarea bindinput="bindTextAreaInput" value="{{value}}" maxlength="{{maxlength}}" placeholder="请输入记录反馈" />
+        <view class="box-text">{{number}}/{{maxlength}}</view>
+        </view>
+        <view class="change-img">
+          <view class="text">
+            <text>添加视频/图片</text>
+            <text style="font-size:28rpx;color:#999;">({{imgs.length}}/9)</text>
+          </view>
+          <view class="img-box">
+            <view class="position-relative" style="position: relative;" wx:for="{{ imgs }}" wx:key="index">
+              <view class="item">
+                <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-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-index="{{index}}" src="{{ item.url }}" alt="" bindtap="previewMedia"></image>
+                </block>
+              </view>
+              <image src="/images/icon_03.png" class="delete-img" data-index="{{index}}" bindtap="onDeleteItem"></image>
+            </view>
+            
+            <view class="item upload flex-column flex-center" wx:if="{{ imgs.length < 9 &&imgs[0].type != 'video' }}" bindtap="chooseVideo">
+              <image src=""></image>
+              <text style="font-size: 28rpx;">添加视频</text>
+            </view>
+            <view class="item upload flex-column flex-center" wx:if="{{ imgs.length < 9}}" bindtap="chooseImage">
+              <image src=""></image>
+              <text style="font-size: 28rpx;">添加图片</text>
+            </view>
+          </view>
+        </view>
+      </block>
+    </view>
+    <view class="btn flex-center" wx:if="{{ is_list && check.allow_edit == 1 }}" bindtap="onChangeEdit">编辑晚班记录</view>
+    <view class="btn flex-center" wx:if="{{ !is_list }}" bindtap="onCheckUpdate">提交</view>
+  </view>
+
+</view>

pages/recordSheet/components/review/review.wxss

@@ -1 +1,240 @@
-/* pages/recordSheet/components/review/review.wxss */
+.inspect .content {
+  background-color: #fff;
+  /* padding: 28rpx 0; */
+  padding-top: 28rpx;
+}
+
+.inspect .title .item {
+  height: 60rpx;
+  background: #FFF7FA;
+  font-size: 28rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #333333;
+}
+
+.inspect .content .list {
+  position: relative;
+}
+
+.inspect .content .module {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 154rpx;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.25) 0%, #FFFFFF 100%);
+} 
+
+.inspect .module .icon {
+  transform: rotate(90deg);
+}
+
+.inspect .content .list view,.content .list text {
+  font-size: 28rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #333333;
+}
+
+.content .list .item {
+  border-bottom: 2rpx solid #d3d3d3;
+}
+
+.content .left {
+  width: 174rpx;
+  padding: 30rpx 0;
+  border-right: 2rpx solid #d3d3d3;
+}
+
+.content .item-btn image {
+  width: 48rpx;
+  height: 48rpx;
+  /* background-color: #ccc; */
+  border-radius: 50%;
+}
+
+.border-radius {
+  background: #FFFFFF;
+  box-shadow: 0rpx 4rpx 14rpx 0rpx rgba(0, 0, 0, 0.05);
+  border-radius: 24rpx;
+  margin: 20rpx 0;
+}
+
+.detail {
+  padding: 30rpx 28rpx;
+}
+
+.detail .top {
+  padding-bottom: 30rpx;
+  border-bottom: 2rpx solid #F2F2F2;
+}
+
+.detail .box-textarea {
+  position: relative;
+  padding-bottom: 30rpx;
+  height: 280rpx;
+  box-sizing: border-box;
+}
+
+.detail textarea {
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  /* height: 280rpx;
+  box-sizing: border-box; */
+  padding: 30rpx 0 50rpx;
+}
+
+.detail .box-textarea .box-text {
+  position: absolute;
+  right: 0;
+  bottom: 30rpx;
+  font-size: 28rpx;
+  color: #999999;
+}
+
+.detail .change-img {
+  padding-top: 30rpx;
+  border-top: 2rpx solid #F2F2F2;
+}
+
+.change-img .img-box {
+  margin-top: 30rpx;
+  display: grid;
+  grid-gap: 20rpx 20rpx;
+  grid-template-columns: repeat(3, 1fr);
+}
+
+.change-img .img-box .item {
+  width: 200rpx;
+  height: 200rpx;
+  border-radius: 16px;
+  box-sizing: border-box;
+  overflow: hidden;
+  position: relative;
+}
+
+.change-img .delete-img {
+  position: absolute;
+  top: -24rpx;
+  right: -16rpx;
+  width: 48rpx;
+  height: 48rpx;
+  border-radius: 50%;
+  background-color: black;
+}
+
+.change-img .img-box .item.upload {
+  border: dashed 2rpx #c6c6c6;
+  background: #F4F4F4;
+}
+
+.change-img .upload image {
+  width: 48rpx;
+  height: 48rpx;
+  background-color: #ccc;
+  margin-bottom: 6rpx;
+}
+
+.change-img .img-box video {
+  width: 100%;
+  height: 100%;
+}
+
+.change-img .img-box .icon-01 {
+  width: 64rpx;
+  height: 64rpx;
+  position: absolute;
+}
+
+.change-img .img-box .img-content {
+  width: 100%;
+  height: 100%;
+}
+
+.btn {
+  margin: 30rpx 0;
+  height: 96rpx;
+  width: 100%;
+  background: #FF77B0;
+  border-radius: 48rpx;
+  font-size: 36rpx;
+  color: #fff;
+}
+
+
+
+
+
+.check-list .item {
+  padding-top: 30rpx;
+}
+
+.check-list .item-top {
+  padding: 0 28rpx;
+}
+
+.check-list .item-top .btn {
+  width: 154rpx;
+  height: 52rpx;
+  border-radius: 26rpx;
+  border: 2rpx solid #333333;
+  box-sizing: border-box;
+  font-size: 28rpx;
+}
+
+.check-list .user-info {
+  margin-bottom: 20rpx;
+}
+
+.check-list .user-info image {
+  width: 64rpx;
+  height: 64rpx;
+  border-radius: 50%;
+  /* background-color: red; */
+  margin-right: 14rpx;
+}
+
+.check-list .more {
+  width: 48rpx;
+  height: 48rpx;
+  padding: 0 4rpx;
+  box-sizing: border-box;
+}
+
+.check-list .more text {
+  width: 8rpx;
+  height: 8rpx;
+  background: #333;
+  border-radius: 50%;
+}
+
+.check-list .box {
+  display: grid;
+  grid-gap: 20rpx 22rpx;
+  grid-template-columns: repeat(3, 1fr);
+  padding: 0rpx 0 30rpx;
+}
+
+.check-list .box .item-media {
+  width: 198rpx;
+  height: 198rpx;
+  border-radius: 16px;
+  box-sizing: border-box;
+  overflow: hidden;
+  position: relative;
+}
+
+.check-list .box image {
+  width: 100%;
+  height: 100%;
+  border-radius: 16rpx;
+  /* background-color: red; */
+}
+
+.check-list .box .icon-01 {
+  width: 64rpx;
+  height: 64rpx;
+  position: absolute;
+}

pages/recordSheet/components/verify/verify.js

@@ -1,23 +1,290 @@
-// pages/recordSheet/components/verify/verify.js
+import { post } from "../../../../utils/http";
+
 Component({
   /**
    * 组件的属性列表
    */
+  options: {
+    addGlobalClass: true
+  },
   properties: {
-
+    review: {
+      type: Object,
+      value: null,
+      observer(newVal,oldVal) {
+        if(newVal) {
+          console.log(newVal)
+          console.log(newVal.option_list)
+          newVal.option_list.forEach((item,index)=> {
+            item.children.forEach((newItem) => {
+              console.log(newItem)
+              newItem.status = true
+            })
+          })
+          this.setData({
+            check: newVal
+          })
+          console.log(this.data.check)
+        }
+        console.log(newVal,oldVal)
+        // this.setData({
+        //   check
+        // })
+      }
+    },
+    check_id: {
+      type: String,
+      value: null,
+    }
   },
 
   /**
    * 组件的初始数据
    */
   data: {
-
+    is_list: true,
+    list: ['','','',''],
+    more: true,
+    maxlength: 500,
+    number: 0,
+    value: "",
+    imgs: [],
+    check: {}
   },
 
   /**
    * 组件的方法列表
    */
   methods: {
+    onOpenList() {
+      this.setData({
+        more: false
+      })
+    },
+
+    /**
+     * 切换结果
+    */
+    onChangeStatus(e) {
+      let { idx,index,status } = e.currentTarget.dataset;
+      this.setData({
+        ['check.option_list[' + idx + '].children['+index+'].status']: status == 'true' ? true : false
+      })
+    },
+
+    /** 监听文本域 */
+    bindTextAreaInput(e) {
+      this.setData({
+        number: e.detail.cursor,
+        value: e.detail.value
+      })
+    },
+
+    /** 选择图片 */
+    chooseImage() {
+      let that = this;
+      let imgs = this.data.imgs;
+      let count = 9 - this.data.imgs.length
+      wx.chooseImage({
+        count,
+        sizeType: ['original', 'compressed'],
+        sourceType: ['album', 'camera'],
+        success (res) {
+          wx.showLoading({
+            title: '正在上传图片',
+            mask: true
+          });
+          const tempFiles = res.tempFiles
+          tempFiles.forEach((item) => {
+            that.upload(item.path).then((data) => {
+              imgs.push({
+                type: 'image',
+                url: data.data.url,
+              })
+              that.setData({ imgs })
+              wx.hideLoading()
+            });
+          })
+          
+        }
+      })
+    },
+
+    /** 选择视频 */
+    chooseVideo(){
+      let that = this;
+      let imgs = this.data.imgs;
+      wx.chooseMedia({
+        count: 1,
+        mediaType: ['video'],
+        sourceType: ['album', 'camera'],
+        maxDuration: 30,
+        camera: 'back',
+        success(res) {
+          wx.showLoading({
+            title: '正在上传视频',
+            mask: true
+          });
+          const tempFiles = res.tempFiles
+          that.upload(tempFiles[0].thumbTempFilePath).then((data) => {
+            if(imgs.length > 0 && imgs[0].type == 'video') {
+              that.setData({
+                ['imgs[' + 0 + '].thumb']: data.data.url
+              })
+            } else {
+              imgs.unshift({
+                type: 'video',
+                thumb: data.data.url,
+                url: ''
+              })
+              that.setData({ imgs })
+            }
+            // that.setData({ imgs })
+            wx.hideLoading()
+          });
+          that.upload(tempFiles[0].tempFilePath).then((data) => {
+            if(imgs.length > 0 && imgs[0].type == 'video') {
+              that.setData({
+                ['imgs[' + 0 + '].url']: data.data.url
+              })
+            } else {
+              imgs.unshift({
+                type: 'video',
+                thumb: '',
+                url: data.data.url
+              })
+              that.setData({ imgs })
+            }
+            // imgs.unshift({
+            //   type: 'video',
+            //   thumb: tempFiles[0].thumbTempFilePath,
+            //   url: data.data.url
+            // })
+            // that.setData({ imgs })
+            wx.hideLoading()
+          });
+        }
+      })
+    },
+
+    /** 上传视频/图片 */
+    upload(filePath) {
+      let that = this;
+      // 上传类型/业务类型：avatar头像，order订单反馈，check检查表反馈
+      return new Promise((resolve,reject) => {
+        let { imgs } = this.data;
+        wx.uploadFile({
+          url: 'https://store.test-api.ijolijoli.com/api/upload',
+          header: {
+            token: wx.getStorageSync('token') || '',
+          },
+          filePath,
+          name: 'file',
+          formData: {
+            'type': 'check'
+          },
+          success(res) {
+            console.log(res)
+            if(res.statusCode == 200 && res.data) {
+              let data = JSON.parse(res.data);
+              if(data.code == 200 && data.data) {
+                resolve(data)
+              } else {
+                wx.showToast({
+                  title: '上传失败',
+                  icon: 'none'
+                })
+              }
+            } else {
+              wx.showToast({
+                title: '上传失败',
+                icon: 'none'
+              })
+            }
+          },
+          fail(err) {
+            wx.showToast({
+              title: '上传失败',
+              icon: 'none'
+            })
+          }
+        })
+      })
+    },
+
+    /**
+     * 删除列表项
+    */
+    onDeleteItem(e) {
+      let imgs = this.data.imgs;
+      if(this.data.is_list) {
+        imgs = this.data.check.feedback.media_list
+      }
+      imgs.splice(e.currentTarget.dataset.index, 1);
+      this.setData({ imgs })
+      console.log(imgs)
+    },
+
+    /**
+     * /api/check/update
+     * 添加/修改检查信息
+    */
+    onCheckUpdate() {
+      let { orderId,value,imgs,check,check_id } = this.data;
+      let option_ids = [], option_values= [];
+      check.option_list.forEach((item,index) => {
+        item.children.forEach((newItem,index) => {
+          option_ids.push(newItem.id)
+          if(newItem.status) {
+            option_values.push(1)
+          } else {
+            option_values.push(2)
+          }
+        })
+      })
+      post('api/check/update',{
+        check_id,
+        type: check.type,
+        option_ids: option_ids.toString(),
+        option_values: option_values.toString(),
+        content: value,
+        media_list: JSON.stringify(imgs)
+      },(res) => {
+        wx.showToast({
+          title: res.msg,
+          icon: 'none'
+        })
+        setTimeout(() => {
+          let pages=getCurrentPages()
+          let prePage = pages[pages.length-1]
+          prePage.onShow()
+          this.setData({
+            is_list: true
+          })
+        }, 1500);
+        console.log(res)
+      })
+    },
+
+    /** 预览图片和视频 */
+    previewMedia(e) {
+      let arr = this.data.imgs
+      if(this.data.is_list) {
+        arr = this.data.check.feedback.media_list
+      }
+      let current = e.currentTarget.dataset.index
+      wx.previewMedia({
+        sources: arr,
+        current
+      })
+    },
+
+    /** 切换编辑 */
+    onChangeEdit() {
+      this.setData({
+        is_list: false
+      })
+    }
 
   }
 })

pages/recordSheet/components/verify/verify.wxml

@@ -1,2 +1,135 @@
-<!--pages/recordSheet/components/verify/verify.wxml-->
-<text>pages/recordSheet/components/verify/verify.wxml</text>
+<view class="inspect">
+  <view class="content">
+    <view class="title flex">
+      <view class="item flex-center" style="width: 172rpx;border-right: 4rpx solid #fff;">站点</view>
+      <view class="item flex1 flex-center">检查项目</view>
+      <view class="item flex-center" style="width: 236rpx;border-left: 4rpx solid #fff;">结果</view>
+    </view>
+    <view class="list">
+    <!-- <style="{{ more ? index < 3 ? 'block' : 'none' : block }}"></style> -->
+      <view class="item flex" wx:for="{{ check.option_list }}" wx:for-index="idx"  wx:key="index" wx:if="{{  more?idx<3 ? true : false  : true }}">
+        <view class="left flex-center">{{ item.location }}</view>
+        <view class="right flex1 flex-column flex-justify-center">
+          <view class="flex flex1" style="height: 100%;border-bottom: 2rpx solid #f2f2f2;" wx:for="{{ item.children }}" wx:key="index">
+            <view class="text flex1 flex-center" style="padding: 18rpx;">{{ item.name }}</view>
+            <view class="item-btn flex-center" style="width: 238rpx;border-left: 2rpx solid #d3d3d3;">
+              <block wx:if="{{ is_list }}">
+                <block wx:if="{{ item.value == 1 }}">
+                  <text>是</text>
+                  <image src="/images/select_ok.png" style="margin-right: 20rpx;"></image>
+                </block>
+                <block wx:if="{{ item.value == 2 }}">
+                  <text>否</text>
+                  <image src="/images/select_ok.png"></image>
+                </block>
+                <block wx:if="{{ item.value == 0 }}">
+                  <text>未记录</text>
+                </block>
+              </block>
+              <block wx:if="{{ !is_list }}">
+                <text>是</text>
+                <image src="/images/select_{{ item.status ? 'ok' : 'no' }}.png" style="margin-right: 20rpx;" bindtap="onChangeStatus" data-idx="{{idx}}" data-index="{{index}}" data-status="true"></image>
+                <text>否</text>
+                <image src="/images/select_{{ !item.status ? 'ok' : 'no' }}.png" bindtap="onChangeStatus" data-idx="{{idx}}" data-index="{{index}}" data-status="false"></image>
+              </block>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="module flex-center" wx:if="{{ check.option_list.length > 3 && more }}" bindtap="onOpenList">
+        <view class="icon">>></view>
+      </view>
+    </view>
+  </view>
+  <view class="padding" style="padding: 0 36rpx;">
+    <view class="detail border-radius">
+      <view class="top flex-align-center">
+        <text style="font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;">早班复查问题反馈</text>
+      </view>
+      <block wx:if="{{ is_list }}">
+        <view class="check-list" wx:if="{{ check.feedback }}">
+          <view class="item flex-column">
+            <view class="user-info flex-align-center">
+              <image src="{{ check.feedback.avatar_url }}"></image>
+              <view class="info flex-column flex1">
+                <text style="font-size: 28rpx;margin-bottom: 6rpx;">{{ check.feedback.nickname }}</text>
+                <text style="font-size: 20rpx;color: #999;">{{ check.feedback.update_time }}</text>
+              </view>
+              <!-- <view class="more flex-align-center flex-justify-space-between" data-item="{{ item }}" bindtap="onEditItem" wx:if="{{ item.allow_edit == 1 }}">
+                <text></text>
+                <text></text>
+                <text></text>
+              </view> -->
+              <!-- <view class="more">···</view> -->
+            </view>
+            <text style="font-size: 28rpx;color: #666;margin-bottom: 30rpx;">{{ check.feedback.content }}</text>
+            <view class="box" wx:if="{{ check.feedback.media_list && check.feedback.media_list.length > 0 }}">
+              <view class="item-media" wx:for="{{ check.feedback.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.url}}" data-index="{{item}}" bindtap="previewImage" wx:for="{{item.media_list}}" wx:key="index"></image> -->
+            </view>
+          </view>
+        </view>
+        <view class="no-more-data" wx:if="{{ !check.feedback }}">暂无反馈记录~</view>
+      </block>
+      <block wx:if="{{ !is_list }}">
+        <view class="box-textarea">
+        <textarea bindinput="bindTextAreaInput" value="{{value}}" maxlength="{{maxlength}}" placeholder="请输入记录反馈" />
+        <view class="box-text">{{number}}/{{maxlength}}</view>
+        </view>
+        <view class="change-img">
+          <view class="text">
+            <text>添加视频/图片</text>
+            <text style="font-size:28rpx;color:#999;">({{imgs.length}}/9)</text>
+          </view>
+          <view class="img-box">
+            <view class="position-relative" style="position: relative;" wx:for="{{ imgs }}" wx:key="index">
+              <view class="item">
+                <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-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-index="{{index}}" src="{{ item.url }}" alt="" bindtap="previewMedia"></image>
+                </block>
+              </view>
+              <image src="/images/icon_03.png" class="delete-img" data-index="{{index}}" bindtap="onDeleteItem"></image>
+            </view>
+            
+            <view class="item upload flex-column flex-center" wx:if="{{ imgs.length < 9 &&imgs[0].type != 'video' }}" bindtap="chooseVideo">
+              <image src=""></image>
+              <text style="font-size: 28rpx;">添加视频</text>
+            </view>
+            <view class="item upload flex-column flex-center" wx:if="{{ imgs.length < 9}}" bindtap="chooseImage">
+              <image src=""></image>
+              <text style="font-size: 28rpx;">添加图片</text>
+            </view>
+          </view>
+        </view>
+      </block>
+    </view>
+    <view class="btn flex-center" wx:if="{{ is_list && check.allow_edit == 1 }}" bindtap="onChangeEdit">编辑晚班记录</view>
+    <view class="btn flex-center" wx:if="{{ !is_list }}" bindtap="onCheckUpdate">提交</view>
+  </view>
+
+</view>

pages/recordSheet/components/verify/verify.wxss

@@ -1 +1,240 @@
-/* pages/recordSheet/components/verify/verify.wxss */
+.inspect .content {
+  background-color: #fff;
+  /* padding: 28rpx 0; */
+  padding-top: 28rpx;
+}
+
+.inspect .title .item {
+  height: 60rpx;
+  background: #FFF7FA;
+  font-size: 28rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #333333;
+}
+
+.inspect .content .list {
+  position: relative;
+}
+
+.inspect .content .module {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 154rpx;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.25) 0%, #FFFFFF 100%);
+} 
+
+.inspect .module .icon {
+  transform: rotate(90deg);
+}
+
+.inspect .content .list view,.content .list text {
+  font-size: 28rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #333333;
+}
+
+.content .list .item {
+  border-bottom: 2rpx solid #d3d3d3;
+}
+
+.content .left {
+  width: 174rpx;
+  padding: 30rpx 0;
+  border-right: 2rpx solid #d3d3d3;
+}
+
+.content .item-btn image {
+  width: 48rpx;
+  height: 48rpx;
+  /* background-color: #ccc; */
+  border-radius: 50%;
+}
+
+.border-radius {
+  background: #FFFFFF;
+  box-shadow: 0rpx 4rpx 14rpx 0rpx rgba(0, 0, 0, 0.05);
+  border-radius: 24rpx;
+  margin: 20rpx 0;
+}
+
+.detail {
+  padding: 30rpx 28rpx;
+}
+
+.detail .top {
+  padding-bottom: 30rpx;
+  border-bottom: 2rpx solid #F2F2F2;
+}
+
+.detail .box-textarea {
+  position: relative;
+  padding-bottom: 30rpx;
+  height: 280rpx;
+  box-sizing: border-box;
+}
+
+.detail textarea {
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  /* height: 280rpx;
+  box-sizing: border-box; */
+  padding: 30rpx 0 50rpx;
+}
+
+.detail .box-textarea .box-text {
+  position: absolute;
+  right: 0;
+  bottom: 30rpx;
+  font-size: 28rpx;
+  color: #999999;
+}
+
+.detail .change-img {
+  padding-top: 30rpx;
+  border-top: 2rpx solid #F2F2F2;
+}
+
+.change-img .img-box {
+  margin-top: 30rpx;
+  display: grid;
+  grid-gap: 20rpx 20rpx;
+  grid-template-columns: repeat(3, 1fr);
+}
+
+.change-img .img-box .item {
+  width: 200rpx;
+  height: 200rpx;
+  border-radius: 16px;
+  box-sizing: border-box;
+  overflow: hidden;
+  position: relative;
+}
+
+.change-img .delete-img {
+  position: absolute;
+  top: -24rpx;
+  right: -16rpx;
+  width: 48rpx;
+  height: 48rpx;
+  border-radius: 50%;
+  background-color: black;
+}
+
+.change-img .img-box .item.upload {
+  border: dashed 2rpx #c6c6c6;
+  background: #F4F4F4;
+}
+
+.change-img .upload image {
+  width: 48rpx;
+  height: 48rpx;
+  background-color: #ccc;
+  margin-bottom: 6rpx;
+}
+
+.change-img .img-box video {
+  width: 100%;
+  height: 100%;
+}
+
+.change-img .img-box .icon-01 {
+  width: 64rpx;
+  height: 64rpx;
+  position: absolute;
+}
+
+.change-img .img-box .img-content {
+  width: 100%;
+  height: 100%;
+}
+
+.btn {
+  margin: 30rpx 0;
+  height: 96rpx;
+  width: 100%;
+  background: #FF77B0;
+  border-radius: 48rpx;
+  font-size: 36rpx;
+  color: #fff;
+}
+
+
+
+
+
+.check-list .item {
+  padding-top: 30rpx;
+}
+
+.check-list .item-top {
+  padding: 0 28rpx;
+}
+
+.check-list .item-top .btn {
+  width: 154rpx;
+  height: 52rpx;
+  border-radius: 26rpx;
+  border: 2rpx solid #333333;
+  box-sizing: border-box;
+  font-size: 28rpx;
+}
+
+.check-list .user-info {
+  margin-bottom: 20rpx;
+}
+
+.check-list .user-info image {
+  width: 64rpx;
+  height: 64rpx;
+  border-radius: 50%;
+  /* background-color: red; */
+  margin-right: 14rpx;
+}
+
+.check-list .more {
+  width: 48rpx;
+  height: 48rpx;
+  padding: 0 4rpx;
+  box-sizing: border-box;
+}
+
+.check-list .more text {
+  width: 8rpx;
+  height: 8rpx;
+  background: #333;
+  border-radius: 50%;
+}
+
+.check-list .box {
+  display: grid;
+  grid-gap: 20rpx 22rpx;
+  grid-template-columns: repeat(3, 1fr);
+  padding: 0rpx 0 30rpx;
+}
+
+.check-list .box .item-media {
+  width: 198rpx;
+  height: 198rpx;
+  border-radius: 16px;
+  box-sizing: border-box;
+  overflow: hidden;
+  position: relative;
+}
+
+.check-list .box image {
+  width: 100%;
+  height: 100%;
+  border-radius: 16rpx;
+  /* background-color: red; */
+}
+
+.check-list .box .icon-01 {
+  width: 64rpx;
+  height: 64rpx;
+  position: absolute;
+}

pages/recordSheet/recordSheet.js

@@ -1,3 +1,7 @@
+import { 
+  get,post
+ } from "../../utils/http"
+
 // pages/recordSheet/recordSheet.js
 Page({
 
@@ -40,13 +44,21 @@ Page({
         url: "https://img0.baidu.com/it/u=2247422843,411257408&fm=26&fmt=auto"
       },
     ],
+    todayData: {},
+    detail: {}
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    console.log(options.check_id)
+    this.setData({
+      check_id: options.check_id
+    },() => {
+      // this.getCheckInfo()
+      // this.getCheckToday()
+    })
   },
 
   /**
@@ -60,7 +72,8 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    this.getCheckInfo()
+    this.getCheckToday()
   },
 
   /**
@@ -201,5 +214,44 @@ Page({
     this.setData({
       ['raterList[' + index + '].num']: value
     })
-  }
+  },
+
+  /**
+   * 获取今日检查信息
+   * api/check/today
+  */
+  getCheckToday() {
+    get('api/check/today',{},(res) => {
+      this.setData({
+        todayData: res.data
+      })
+      console.log(res)
+    })
+  },
+
+  /**
+   * 获取检查记录详情
+   * api/check/info
+  */
+  getCheckInfo() {
+    get('api/check/info',{
+      check_id: this.data.check_id
+    },(res) => {
+      console.log(res.data.check.feedback)
+      if(res.data.check && res.data.check.feedback) {
+        res.data.check.feedback.media_list = JSON.parse(res.data.check.feedback.media_list)
+      }
+      if(res.data.review && res.data.review.feedback) {
+        res.data.review.feedback.media_list = JSON.parse(res.data.review.feedback.media_list)
+      }
+      if(res.data.manager && res.data.manager.feedback) {
+        res.data.manager.feedback.media_list = JSON.parse(res.data.manager.feedback.media_list)
+      }
+      // res.check.feedback.media_list.forEach(() => {})
+      this.setData({
+        detail: res.data
+      })
+    })
+  },
+
 })

pages/recordSheet/recordSheet.wxml

@@ -1,18 +1,18 @@
 <view class="content">
   <view class="detail-top flex-column">
-    <text style="font-size: 36rpx;">门店名称：JOLIJOLI南山店</text>
-    <text style="font-size: 28rpx;margin: 16rpx 0;">店长：南山店长</text>
+    <text style="font-size: 36rpx;">门店名称：{{ todayData.store_name }}</text>
+    <text style="font-size: 28rpx;margin: 16rpx 0;">店长：{{ todayData.manager_name }}</text>
     <view class="top-info">
       <view class="flex">
         <text>离店检查：</text>
-        <text style="color: #FF77B0;font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;">未检查</text>
+        <text style="color: #FF77B0;font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;">{{ todayData.is_check == 1 ? '已检查' : '未检查' }}</text>
         <text class="flex1"></text>
-        <text>营业复查：已复查</text>
+        <text>营业复查：{{ todayData.is_review == 1 ? '已复查' : '未复查' }}</text>
       </view>
       <view class="top-text flex-column">
-        <text>今日负责人：武则天</text>
-        <text style="margin:20rpx 0;">检查负责人：小婵</text>
-        <text>复查检查人：查理兹·塞隆</text>
+        <text>今日负责人：{{ todayData.charge_name }}</text>
+        <text style="margin:20rpx 0;">检查负责人：{{ todayData.check_name }}</text>
+        <text>复查检查人：{{ todayData.review_name }}</text>
       </view>
     </view>
   </view>
@@ -23,14 +23,14 @@
       <view class="item flex-align-center {{currentTab==2 ? 'active' : ''}}" data-index="2" bindtap="onChangeTab">店长审核</view>
     </view>
     <view class="tabs-content">
-      <inspect style="display: {{ current == 0 ? 'block' : 'none' }};"></inspect>
-      <inspect style="display: {{ current == 1 ? 'block' : 'none' }};"></inspect>
-      <inspect style="display: {{ current == 2 ? 'block' : 'none' }};"></inspect>
-      <!-- <review style="display: {{ current == 1 ? 'block' : 'none' }};"></review>
-      <verify style="display: {{ current == 2 ? 'block' : 'none' }};"></verify> -->
+      <inspect style="display: {{ currentTab == 0 ? 'block' : 'none' }};" check_id="{{check_id}}" preCheck="{{detail.check}}" ></inspect>
+      <!-- <inspect style="display: {{ currentTab == 1 ? 'block' : 'none' }};"></inspect>
+      <inspect style="display: {{ currentTab == 2 ? 'block' : 'none' }};"></inspect> -->
+      <review style="display: {{ currentTab == 1 ? 'block' : 'none' }};" check_id="{{check_id}}" manager="{{ detail.manager }}"></review>
+      <verify style="display: {{ currentTab == 2 ? 'block' : 'none' }};" check_id="{{check_id}}" review="{{ detail.review }}"></verify>
     </view>
   </view>
-  <view class="padding" style="padding: 0 36rpx;">
+  <view class="padding" style="padding: 0 36rpx;display: none;">
     <view class="detail border-radius">
     <view class="top flex-align-center">
       <text style="font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;">早班复查问题反馈</text>

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/tagsAdd/tagsAdd.js

@@ -1,3 +1,5 @@
+import { get,post } from "../../utils/http"
+
 // pages/tagsAdd/tagsAdd.js
 Page({
 
@@ -5,16 +7,23 @@ Page({
    * 页面的初始数据
    */
   data: {
-    tags:[
-      true,false,false,true,true,false,false,true,false,false,true
-    ]
+    tags:[],
+    list: []
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    console.log(options)
+    if(options.user_id) {
+      this.setData({
+        user_id: options.user_id
+      },() => {
+        this.getUserInfo()
+        this.getUserTags()
+      })
+    }
   },
 
   /**
@@ -70,10 +79,85 @@ Page({
    * 选中标签
   */
   onChangeTags(e) {
-    let status = e.currentTarget.dataset.item
+    let status = e.currentTarget.dataset.status
     let index = e.currentTarget.dataset.index
+    let { tags,list } = this.data;
+    let sum = list.length
+    let that = this;
+    
     this.setData({
-      ['tags[' + index + ']']: !status
+      ['tags[' + index + '].status']: !status
+    },() => {
+      tags.forEach((item) => {
+        if(item.status) {
+          sum ++
+        }
+      })
+      if(sum > 10) {
+        wx.showToast({
+          title: '最多添加10个标签',
+          icon: 'none'
+        })
+        that.setData({
+          ['tags[' + index + '].status']: false
+        })
+      }
+    })
+  },
+
+  /**
+   * 获取用户信息
+   * api/user/info
+  */
+  getUserInfo() {
+    let { user_id } = this.data;
+    get('api/user/info',{
+      user_id
+    },(res) => {
+      console.log(res)
+      this.setData({
+        list: res.data.tags
+      })
+      console.log(res)
+    })
+  },
+
+  /**
+   * 获取常用标签
+   * api/user/tags
+  */
+  getUserTags() {
+    get('api/user/tags',{
+
+    },(res) => {
+      let { tags } = this.data;
+      res.data.tags.forEach(item => {
+        let obj = { tag:item,status:false }
+        tags.push(obj)
+        console.log(item)
+      });
+      this.setData({
+        tags
+      })
+      console.log(res)
+    })
+  },
+
+  /**
+   * 添加标签
+  */
+  onSubmit() {
+    let { user_id,list,tags } = this.data;
+    tags.forEach((item,index) => {
+      if(item.status) {
+        list.push(item.tag)
+      }
+    })
+    post('api/user/update',{
+      user_id,
+      tags: list.toString()
+    },(res) => {
+      console.log(res)
     })
   }
 })

pages/tagsAdd/tagsAdd.wxml

@@ -1,9 +1,14 @@
 <view class="top">
   <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;">({{ list.length }}/10)</text>
   </view>
-  <navigator url="/pages/tagsCustom/tagsCustom" hover-class="none">
+  <view class="list" style="padding: 0;">
+    <view class="box flex" style="padding: 0;">
+      <view style="margin: 0 5rpx 30rpx;" class="item" wx:for="{{ list }}" wx:key="index" data-index="{{ index }}" data-item="{{ item }}">{{ item }}</view>
+    </view>
+  </view>
+  <navigator url="/pages/tagsCustom/tagsCustom?user_id={{ user_id }}" hover-class="none" wx:if="{{ list.length <= 10 }}">
     <view class="custom-btn flex-center">
       <text>+</text>
       <text>自定义标签</text>
@@ -13,10 +18,10 @@
 <view class="list">
   <text style="margin-left:44rpx;font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;">常用标签</text>
   <view class="box flex">
-    <view class="item {{item ? 'active' : '' }}" wx:for="{{ tags }}" wx:key="index" bindtap="onChangeTags" data-index="{{ index }}" data-item="{{ item }}">美丽貌美</view>
+    <view class="item {{item.status ? 'active' : '' }}" wx:for="{{ tags }}" wx:key="index" bindtap="onChangeTags" data-index="{{ index }}" data-status="{{ item.status }}">{{ item.tag }}</view>
   </view>
 </view>
 
-<view class="btn-box">
+<view class="btn-box" bindtap="onSubmit">
   <view class="btn flex-center">完成</view>
 </view>

pages/tagsCustom/tagsCustom.js

@@ -1,19 +1,26 @@
-// import {
-//   get, post,
-// } from '../../utils/http';
+import {
+  get, post,
+} from '../../utils/http';
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    userInfo: {}
+    userInfo: {},
+    tag: ''
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    console.log(options)
+    if(options.user_id) {
+      this.setData({
+        user_id: options.user_id
+      })
+    }
     // this.getUserFiles()
   },
 
@@ -71,7 +78,7 @@ Page({
    */
   onChangeName(e) {
     this.setData({
-      ['userInfo.real_name']: e.detail.value,
+      tag: e.detail.value,
     })
   },
 
@@ -111,5 +118,20 @@ Page({
         wx.navigateBack()
       }, 1000);
     })
+  },
+
+  /**
+   * 添加标签
+  */
+  onAddTag() {
+    let { user_id,tag } = this.data;
+    let pages=getCurrentPages()
+    let prePage = pages[pages.length-2]
+    let preList = prePage.data.list
+    preList.push(tag)
+    pages[pages.length-2].setData({
+      list: preList
+    })
+    wx.navigateBack()
   }
 })

pages/tagsCustom/tagsCustom.wxml

@@ -1,9 +1,9 @@
 <view class="content flex-column ">
-  <input type="text" focus maxlength="20" placeholder="请输入自定义标签" value="{{userInfo.real_name}}" bindinput="onChangeName"/>
+  <input type="text" focus maxlength="8" placeholder="请输入自定义标签" value="{{userInfo.real_name}}" bindinput="onChangeName"/>
   <text style="margin: 8rpx 0 0 28rpx;font-size:28rpx;color:#999;">标签最多8个字</text>
   <!-- <view class="btn border-radius flex-center" bindtap="setUserFiles">确定</view> -->
 </view>
 
-<view class="btn-box">
+<view class="btn-box" bindtap="onAddTag">
   <view class="btn flex-center">添加标签</view>
 </view>

pages/tagsEdit/tagsEdit.js

@@ -1,18 +1,29 @@
-// pages/tagsEdit/tagsEdit.js
+import {
+  get, post,
+} from '../../utils/http';
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    user_id: '',
+    list: []
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    console.log(options)
+    if(options.user_id) {
+      this.setData({
+        user_id: options.user_id
+      },() => {
+        // this.getUserInfo()
+      })
+    }
+    
   },
 
   /**
@@ -26,7 +37,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    this.getUserInfo()
   },
 
   /**
@@ -62,5 +73,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,16 +1,16 @@
 <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>
 
 <view class="btn-box">
-  <navigator url="/pages/tagsAdd/tagsAdd" hover-class="none">
+  <navigator url="/pages/tagsAdd/tagsAdd?user_id={{ user_id }}" hover-class="none">
     <view class="btn flex-center">
       <text class="icon">+</text>
       <text style="margin-left: 28rpx;">添加标签</text>

project.private.config.json

@@ -57,7 +57,7 @@
         {
           "name": "记录表",
           "pathName": "pages/recordSheet/recordSheet",
-          "query": "",
+          "query": "check_id=6",
           "scene": null
         },
         {

utils/http.js

@@ -48,6 +48,9 @@ function http(url,method,params, success, fail) {
           title: data.msg,
           icon: 'none'
         })
+        wx.reLaunch({
+          url: '/pages/login/login',
+        })
         // login()
       }
     },