✨ 对接反馈记录/首页/订单详情

pages/feedback/feedback.js

@@ -66,19 +66,25 @@ Page({
       3: '一般',
       4: '满意',
       5: '非常好',
-    }
+    },
+    edit: "false"
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    console.log(options)
     if(options.orderId) {
       this.setData({
         orderId: options.orderId,
         cover: options.cover,
-        name: options.name
+        name: options.name,
+        edit: options.edit || "false" 
       })
+      if(options.edit == "true") {
+        this.getfeedbackInfo(options.orderId)
+      }
     }
   },
 
@@ -251,20 +257,32 @@ Page({
   */
   onSubmit() {
     // api/feedback/add
-    let { orderId,value,raterList } = this.data;
+    let { orderId,value,raterList,edit } = this.data;
     console.log(this.data.imgs)
-    post('api/feedback/add',{
-      order_id: orderId,
-      content: value,
-      media_list: JSON.stringify(this.data.imgs),
-      score_whole: raterList[0].num,
-      score_effect: raterList[1].num,
-      score_price: raterList[2].num,
-      score_kind: raterList[3].num,
-      score_safe: raterList[4].num,
-    },(res) => {
-      console.log(res)
-    })
+    console.log(edit)
+    if(edit == "true") {
+      this.editFeedbackUpdate()
+    } else {
+      post('api/feedback/add',{
+        order_id: orderId,
+        content: value,
+        media_list: JSON.stringify(this.data.imgs),
+        score_whole: raterList[0].num,
+        score_effect: raterList[1].num,
+        score_price: raterList[2].num,
+        score_kind: raterList[3].num,
+        score_safe: raterList[4].num,
+      },(res) => {
+        console.log(res)
+        wx.showToast({
+          title: res.msg,
+          icon: 'none'
+        })
+        setTimeout(() => {
+          wx.navigateBack()
+        }, 1500);
+      })
+    }
   },
 
   /**
@@ -313,4 +331,40 @@ Page({
       })
     })
   },
+
+  /**
+   * 获取订单反馈详情
+   * api/feedback/info
+  */
+  getfeedbackInfo(id) {
+    get('api/feedback/info',{ id },(res) => {
+      this.setData({
+        value: res.data.content,
+        imgs: JSON.parse(res.data.media_list),
+        raterList: []
+      })
+    })
+  },
+
+  /**
+   * 编辑反馈记录
+   * api/feedback/update
+  */
+  editFeedbackUpdate() {
+    let { orderId,value,imgs } = this.data;
+    post('api/feedback/update',{
+      id: orderId,
+      content: value,
+      media_list: JSON.stringify(imgs)
+    },(res) => {
+      wx.showToast({
+        title: res.msg,
+        icon: 'none'
+      })
+      setTimeout(() => {
+        wx.navigateBack()
+      }, 1500);
+      console.log(res)
+    })
+  }
 })

pages/feedback/feedback.wxml

@@ -30,21 +30,21 @@
               <image class="img-content" data-index="{{index}}" src="{{ item.url }}" alt="" bindtap="previewMedia"></image>
             </block>
           </view>
-          <image src="" class="delete-img" data-index="{{index}}" bindtap="onDeleteItem"></image>
+          <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>
+          <image src="/images/icon_06.png"></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>
+          <image src="/images/icon_07.png"></image>
           <text style="font-size: 28rpx;">添加图片</text>
         </view>
       </view>
     </view>
   </view>
-  <view class="detail border-radius rater">
+  <view class="detail border-radius rater" wx:if="{{ raterList.length > 0 }}">
     <view class="rater-text">
       <text style="font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;">客户评价</text>
       <text style="font-size: 28rpx;color:#999;">（选填，且只有第一次填写生效）</text>

pages/feedback/feedback.wxss

@@ -89,7 +89,7 @@
 .change-img .upload image {
   width: 48rpx;
   height: 48rpx;
-  background-color: #ccc;
+  /* background-color: #ccc; */
   margin-bottom: 6rpx;
 }
 

pages/orderDetail/orderDetail.js

@@ -29,6 +29,7 @@ Page({
     page: 1,
     index: 0,
     visible: false,
+    currentItem: {}
   },
 
   /**
@@ -40,7 +41,6 @@ Page({
       id: options.orderId
     },() => {
       this.getOrderInfo()
-      this.getFeedbackList()
     })
   },
 
@@ -55,14 +55,16 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    this.getFeedbackList(1)
   },
 
   /**
    * 生命周期函数--监听页面隐藏
    */
   onHide: function () {
-
+    this.setData({
+      visible: false
+    })
   },
 
   /**
@@ -110,9 +112,11 @@ Page({
   /**
    * 打开弹框
    */
-  onEditItem() {
+  onEditItem(e) {
+    console.log(e)
     this.setData({
-      visible: true
+      visible: true,
+      currentItem: e.currentTarget.dataset.item
     })
   },
 
@@ -126,12 +130,34 @@ Page({
   },
 
   /**
-   * 图片预览
-   */
-  previewImage(e) {
-    wx.previewImage({
-      current: e.currentTarget.dataset.index,
-      urls: this.data.urls
+   * 预览图片和视频
+  */
+  previewMedia(e) {
+    let { idx,index } = e.currentTarget.dataset;
+    let arr = this.data.list[idx].media_list
+    let current = index
+    wx.previewMedia({
+      sources: arr,
+      current
+    })
+  },
+
+  /**
+   * 删除反馈记录
+   * api/feedback/delete
+  */
+  onDelete(e) {
+    post('api/feedback/delete',{
+      id: this.data.currentItem.id
+    },(res) => {
+      wx.showToast({
+        title: res.msg,
+        icon: 'none'
+      })
+      this.setData({
+        visible: false     
+      })
+      this.getFeedbackList(1)
     })
   },
 
@@ -160,6 +186,13 @@ Page({
       page: _page || page,
       limit: 10
     },(res) => {
+      if (_page == 1 || page == 1) {
+        list = []
+        this.data.page = 1
+      }
+      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, })
       console.log(res)

pages/orderDetail/orderDetail.wxml

@@ -33,9 +33,9 @@
         <text>预约费用：</text>
         <text style="color: #333333;">￥{{ detailData.order_price }}</text>
       </view>
-      <view class="flex-justify-space-between">
+      <view class="flex-justify-space-between" wx:if="{{ detailData.discount_type == 2 }}">
         <text>优惠券：</text>
-        <text style="color: #333333;">-￥888.88</text>
+        <text style="color: #333333;">-￥{{ detailData.discount }}</text>
       </view>
       <view class="flex-justify-space-between" wx:if="{{ detailData.discount_type == 2 }}">
         <text>优惠券类型：</text>
@@ -62,32 +62,48 @@
         <view class="btn flex-center">新增反馈</view>
       </navigator>
     </view>
-    <view class="item flex-column" wx:for="{{list}}" 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">
+        <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;">当前皮肤毛孔出现堵塞，抓哟集中在T区，主要问题在于自身油脂分泌过多。</text>
-      <view class="box">
-        <image src="{{item}}" data-index="{{item}}" bindtap="previewImage" wx:for="{{urls}}" wx:key="index"></image>
+      <text style="font-size: 28rpx;color: #666;margin-bottom: 30rpx;">{{ item.content }}</text>
+      <view class="box" wx:if="{{ item.media_list && item.media_list.length > 0 }}">
+        <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.url}}" data-index="{{item}}" bindtap="previewImage" wx:for="{{item.media_list}}" wx:key="index"></image> -->
       </view>
     </view>
   </view>
-  <view class="no-more-data">已经到底啦~~</view>
+  <view class="no-more-data" style="display: {{list.length > 0 && list.length >= total ? 'block' : 'none'}};">已经到底啦~~</view>
 </view>
 
 <wux-popup class="popup-radius" position="bottom" catchtouchmove="isShow" visible="{{ visible }}" bind:close="onPopupState">
-  <view class="btn-item flex-center" style="color: #FF77B0;">删除</view>
-  <navigator url="/pages/feedback/feedback" hover-class="none">
+  <view class="btn-item flex-center" style="color: #FF77B0;" bindtap="onDelete">删除</view>
+  <navigator url="/pages/feedback/feedback?orderId={{ currentItem.id }}&cover={{ detailData.cover_url }}&name={{ detailData.project_name }}&edit=true" hover-class="none">
     <view class="btn-item flex-center">编辑</view>
   </navigator>
   <view class="btn-item flex-center" style="color: #999999;" bindtap="onPopupState">取消</view>

pages/orderDetail/orderDetail.wxss

@@ -97,7 +97,7 @@
   width: 64rpx;
   height: 64rpx;
   border-radius: 50%;
-  background-color: red;
+  /* background-color: red; */
   margin-right: 14rpx;
 }
 
@@ -119,14 +119,30 @@
   display: grid;
   grid-gap: 20rpx 22rpx;
   grid-template-columns: repeat(3, 1fr);
-  padding: 30rpx 0;
+  padding: 0rpx 0 30rpx;
 }
 
-.list .box image {
+.list .box .item-media {
   width: 198rpx;
   height: 198rpx;
+  border-radius: 16px;
+  box-sizing: border-box;
+  overflow: hidden;
+  position: relative;
+}
+
+.list .box image {
+  width: 100%;
+  height: 100%;
   border-radius: 16rpx;
-  background-color: red;
+  /* background-color: red; */
+}
+
+
+.list .box .icon-01 {
+  width: 64rpx;
+  height: 64rpx;
+  position: absolute;
 }
 
 .btn-item {

utils/http.js

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