feat: page-comment;

pages.json

@@ -91,6 +91,12 @@
 			{
 				"path": "coupon/couponList/index"
 			},
+			{
+				"path": "comment/commentRecordsOfProduct"
+			},
+			{
+				"path": "comment/commentRecords"
+			},
 			{
 				"path": "growing/activity/search"
 			},

pages/index/center.vue

@@ -116,14 +116,12 @@
 				list1: [
 					{ id: '001', label: '我的收藏', icon: '/pages_order/static/center/icon-collect.png', path: '/pages_order/product/collectList' },
 					{ id: '004', label: '学员管理', icon: '/pages_order/static/center/icon-student.png', path: `/pages_order/member/memberList` },
-					// todo
 					{ id: '003', label: '我的优惠券', icon: '/pages_order/static/center/icon-coupon.png', path: `/pages_order/common?key=instruc&title=服用说明` },
 				],
 				list2: [
-					// todo
-					{ id: '005', label: '我的评价', icon: '/pages_order/static/center/icon-comment.png', key: 'comment' },
+					{ id: '005', label: '我的评价', icon: '/pages_order/static/center/icon-comment.png', path: `/pages_order/comment/commentRecords` },
 					// todo: check key
-					{ id: '006', label: '关于我们', icon: '/pages_order/static/center/icon-msg.png', path: `/pages_order/common?key=aboutUs&title=关于我们` },
+					{ id: '006', label: '开营通知', icon: '/pages_order/static/center/icon-msg.png', path: `/pages_order/common?key=aboutUs&title=关于我们` },
 					{ id: '007', label: '修改信息', icon: '/pages_order/static/center/icon-modifyInfo.png', path: `/pages_order/auth/wxUserInfo?mode=edit` },
 					{ id: '008', label: '退出登录', icon: '/pages_order/static/center/icon-logout.png', key: 'logout' },
 				],

pages/index/growing.vue

@@ -46,7 +46,7 @@
 	import tabber from '@/components/base/tabbar.vue'
 	import userCard from '@/components/growing/userCard.vue'
 	import recordsView from '@/components/growing/recordsView.vue'
-	import recordFormPopup from '@/pages_order/growing/activity/recordFormPopup.vue'
+	import recordFormPopup from '@/pages_order/comment/recordFormPopup.vue'
 
   export default {
 		mixins: [mixinsList],

pages_order/comment/commentCard.vue

@@ -5,7 +5,7 @@
       <view class="flex left">
         <view class="avatar">
           <!-- todo: check key -->
-          <image class="avatar-img" :src="data.user.avatar"></image>
+          <image class="avatar-img" :src="data.user.avatar" mode="scaleToFill"></image>
         </view>
         <view class="info">
           <view class="name">{{ data.user.name }}</view>
@@ -35,7 +35,7 @@
         <uv-rate :value="data.logisticsNum" size="48rpx" gutter="16rpx" activeColor="#F7BA1E" :allowHalf="true" :minCount="0.5" readonly></uv-rate>
       </view>
     </view>
-    <view class="section operate" v-if="mode == 'edit'">
+    <view class="section operate">
       <button class="flex btn" @click="onComment">
         <image class="icon" src="@/static/image/icon-comment.png" mode="aspectFill"></image>
         <view>评论</view>
@@ -49,6 +49,20 @@
         <view>点赞</view>
       </button>
     </view>
+    <view class="section comment" 
+      v-for="item in commentList"
+      :key="item.id"
+    >
+      <view class="flex comment-user">
+        <view class="avatar">
+          <!-- todo: check key -->
+          <image class="avatar-img" :src="item.avatar" mode="scaleToFill"></image>
+        </view>
+        <view class="name">{{ item.name }}</view>
+        <view class="time">{{ item.createTime }}</view>
+      </view>
+      <view class="comment-content">{{ item.content }}</view>
+    </view>
   </view>
 </template>
 
@@ -71,20 +85,32 @@
         const { image } = this.data || {}
 
         return image?.split?.(',')
-      }
+      },
+      disabled() {
+        return this.mode !== 'edit'
+      },
     },
     methods: {
       onComment() {
+        if (this.disabled) {
+          return
+        }
         // todo
 
         this.$emit('change')
       },
       onLike() {
+        if (this.disabled) {
+          return
+        }
         // todo
 
         this.$emit('change')
       },
       onCancelLike() {
+        if (this.disabled) {
+          return
+        }
         // todo
 
         this.$emit('change')
@@ -191,4 +217,40 @@
       
     }
   }
+
+  .comment {
+    &-user {
+      column-gap: 16rpx;
+
+      .avatar {
+        width: 48rpx;
+        height: 48rpx;
+        border-radius: 50%;
+
+        &-img {
+          width: 100%;
+          height: 100%;
+        }
+      }
+
+      .name {
+        font-size: 26rpx;
+        font-weight: 600;
+        color: #000000;
+      }
+
+      .time {
+        flex: 1;
+        text-align: right;
+        font-size: 24rpx;
+        color: #999999;
+      }
+    }
+
+    &-content {
+      margin-top: 28rpx;
+      font-size: 26rpx;
+      color: #666666;
+    }
+  }
 </style>

pages_order/comment/commentPopup.vue

@@ -0,0 +1,308 @@
+<template>
+  <view>
+    <uv-popup ref="popup" mode="bottom" bgColor="none" >
+      <view class="popup__view">
+        <view class="flex header">
+          <view class="title">评价</view>
+          <button class="btn" @click="close">关闭</button>
+        </view>
+        <view class="form">
+          <uv-form 
+            ref="form"
+            :model="form"
+            :rules="rules"
+            errorType="toast"
+          >
+            <view class="section">
+              <productCard :data="detail"></productCard>
+            </view>
+            <view class="section">
+              <view class="form-item">
+                <uv-form-item prop="tripNum" :customStyle="formItemStyle">
+                  <view class="flex row">
+                    <view class="form-item-label">行程</view>
+                    <view class="form-item-content">
+                      <formRate v-model="form.tripNum"></formRate>
+                    </view>
+                  </view>
+                </uv-form-item>
+              </view>
+              <view class="form-item">
+                <uv-form-item prop="spotNum" :customStyle="formItemStyle">
+                  <view class="flex row">
+                    <view class="form-item-label">景点</view>
+                    <view class="form-item-content">
+                      <formRate v-model="form.spotNum"></formRate>
+                    </view>
+                  </view>
+                </uv-form-item>
+              </view>
+              <view class="form-item">
+                <uv-form-item prop="mentorNum" :customStyle="formItemStyle">
+                  <view class="flex row">
+                    <view class="form-item-label">导师</view>
+                    <view class="form-item-content">
+                      <formRate v-model="form.mentorNum"></formRate>
+                    </view>
+                  </view>
+                </uv-form-item>
+              </view>
+            </view>
+            <view class="form-item">
+              <uv-form-item prop="content" :customStyle="formItemStyle">
+                <view class="form-item-content">
+                  <view class="tags">
+                    <view 
+                      v-for="(item, oIdx) in options" :key="oIdx"
+                      :class="['tag', item === form.content ? 'is-active' : '']" 
+                      @click="onSelectContent(item)"
+                    >
+                      {{ item }}
+                    </view>
+                  </view>
+                </view>
+              </uv-form-item>
+            </view>
+          </uv-form>
+        </view>
+        <view class="footer">
+          <button class="flex btn" @click="onPublish">发布</button>
+        </view>
+      </view>
+    </uv-popup>
+  </view>
+</template>
+
+<script>
+  import productCard from '@/pages_order/order/components/productCard.vue'
+  import formRate from '@/pages_order/components/formRate.vue'
+
+  export default {
+    components: {
+      productCard,
+      formRate,
+    },
+    data() {
+      return {
+        id: null,
+        // todo: fetch
+        detail: {},
+        form: {
+          tripNum: null,
+          spotNum: null,
+          mentorNum: null,
+          content: null,
+        },
+        rules: {
+          'tripNum': {
+            type: 'number',
+            required: true,
+            message: '请为行程打分',
+          },
+          'spotNum': {
+            type: 'number',
+            required: true,
+            message: '请为景点打分',
+          },
+          'mentorNum': {
+            type: 'number',
+            required: true,
+            message: '请为导师打分',
+          },
+          'content': {
+            type: 'string',
+            required: true,
+            message: '请选择评语',
+          },
+        },
+        // todo: fetch
+        options: [],
+      }
+    },
+    methods: {
+      async getData() {
+        // todo: fetch order product
+      },
+      async open(id) {
+        this.id = id
+
+        await this.getData()
+
+        this.form = {
+          tripNum: null,
+          spotNum: null,
+          mentorNum: null,
+          content: null,
+        }
+
+        this.$refs.popup.open()
+      },
+      close() {
+        this.$refs.popup.close()
+      },
+      onSelectContent(content) {
+        this.form.content = content
+      },
+      async onPublish() {
+        try {
+          await this.$refs.form.validate()
+
+          const {
+          } = this.form
+
+          const params = {
+          }
+
+          // todo: fetch
+          // await this.$fetch('updateAddress', params)
+
+          uni.showToast({
+            icon: 'success',
+            title: '发布成功',
+          });
+
+          this.$emit('submitted')
+
+          this.close()
+
+        } catch (err) {
+          console.log('onSave err', err)
+        }
+      },
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+
+  .popup__view {
+    width: 100vw;
+    display: flex;
+    flex-direction: column;
+    box-sizing: border-box;
+    background: #FFFFFF;
+    border-top-left-radius: 32rpx;
+    border-top-right-radius: 32rpx;
+  }
+
+  .header {
+    position: relative;
+    width: 100%;
+    padding: 24rpx 0;
+    box-sizing: border-box;
+    border-bottom: 2rpx solid #EEEEEE;
+
+    .title {
+      font-family: PingFang SC;
+      font-weight: 500;
+      font-size: 34rpx;
+      line-height: 1.4;
+      color: #181818;
+    }
+
+    .btn {
+      font-family: PingFang SC;
+      font-weight: 500;
+      font-size: 32rpx;
+      line-height: 1.4;
+      color: #8B8B8B;
+      position: absolute;
+      top: 26rpx;
+      left: 40rpx;
+    }
+
+  }
+
+  .section {
+    & + & {
+      margin-top: 24rpx;
+    }
+  }
+  
+  .form {
+    max-height: 75vh;
+    padding: 32rpx 40rpx;
+    box-sizing: border-box;
+    overflow-y: auto;
+
+    &-item {
+
+      &-label {
+        margin-bottom: 14rpx;
+        display: flex;
+        align-items: center;
+        font-family: PingFang SC;
+        font-weight: 400;
+        font-size: 26rpx;
+        line-height: 1.4;
+        color: #181818;
+
+        .icon {
+          margin-right: 8rpx;
+          width: 16rpx;
+          height: auto;
+        }
+      }
+
+      &-content {
+
+      }
+    }
+  }
+
+  .row {
+    justify-content: space-between;
+    padding: 4rpx 0;
+
+    & + & {
+      margin-top: 4rpx;
+    }
+
+    .form-label {
+      margin: 0;
+    }
+  }
+
+  .tags {
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+    gap: 24rpx;
+  }
+
+  .tag {
+    min-width: 0;
+    padding: 16rpx;
+    font-size: 26rpx;
+    line-height: 1.4;
+    color: #252545;
+    background: #F5F8FF;
+    border-radius: 24rpx;
+
+    &.is-active {
+      color: #FFFFFF;
+      background: #00A9FF;
+    }
+  }
+
+  .footer {
+    width: 100%;
+    padding: 32rpx 40rpx;
+    box-sizing: border-box;
+    border-top: 2rpx solid #F1F1F1;
+
+    .btn {
+      width: 100%;
+      padding: 14rpx 0;
+      box-sizing: border-box;
+      font-family: PingFang SC;
+      font-weight: 500;
+      font-size: 36rpx;
+      line-height: 1.4;
+      color: #FFFFFF;
+      background-image: linear-gradient(to right, #21FEEC, #019AF9);
+      border: 2rpx solid #00A9FF;
+      border-radius: 41rpx;
+    }
+  }
+
+</style>

pages_order/comment/commentRecords.vue

@@ -1,39 +1,24 @@
 <template>
   <view class="page__view">
 
-		<navbar :title="title" leftClick @leftClick="$utils.navigateBack" color="#191919" bgColor="#FFFFFF" />
+		<navbar title="我的评价" leftClick @leftClick="$utils.navigateBack" />
 
     <view class="main">
-      <view class="tabs">
-        <uv-tabs 
-          :list="tabs" 
-          :scrollable="false" 
-          lineColor="#7451DE"
-          lineWidth="48rpx"
-          lineHeight="4rpx"
-          :activeStyle="{
-            'font-family': 'PingFang SC',
-            'font-weight': 500,
-            'font-size': '32rpx',
-            'line-height': 1.4,
-            'color': '#7451DE',
-          }" 
-          :inactiveStyle="{
-            'font-family': 'PingFang SC',
-            'font-weight': 400,
-            'font-size': '32rpx',
-            'line-height': 1.4,
-            'color': '#181818',
-          }" 
-          @click="clickTabs"
-        ></uv-tabs>
-      </view>
 
-      <view class="comment">
-        <view class="comment-item" v-for="item in list" :key="item.id">
-          <commentCard :data="item" mode="edit" @deleteSucc="getData"></commentCard>
+      <view class="list">
+        <view class="list-item" v-for="item in list" :key="item.id">
+          <view class="flex list-item-header">
+            <view class="flex mark">
+              <image class="icon" src="@/static/image/icon-mark-highlight.png" mode="widthFix"></image>
+            </view>
+            <view class="title">
+              {{ `来自 ${item.productName}` }}
+            </view>
+          </view>
+          <commentCard :data="item"></commentCard>
         </view>
       </view>
+
     </view>
 
   </view>
@@ -51,79 +36,77 @@
     },
     data() {
       return {
-        title: '我的评价',
-        tabs: [
-          { name: '全部' },
-          { name: '有图/视频' },
-          { name: '最新' },
-        ],
-				mixinsListApi: 'myEvaluate',
+        // todo
+				mixinsListApi: '',
       }
     },
     onShow() {
       console.log('onShow')
     },
-    onLoad() {
+    onLoad(arg) {
+      console.log('onLoad')
+      const { productId } = arg
+
+      this.queryParams.productId = productId
+
       this.getData()
     },
     methods: {
-			//点击tab栏
-			clickTabs({ index }) {
-        // todo
-        return
-				if (index == 0) {
-					delete this.queryParams.status
-				} else {
-					this.queryParams.status = index - 1
-				}
-				this.getData()
-			},
     },
   }
 </script>
 
 <style scoped lang="scss">
   .page__view {
-    width: 100vw;
-    min-height: 100vh;
     background-color: $uni-bg-color;
-    position: relative;
-    
-    /deep/ .nav-bar__view {
-      position: fixed;
-      top: 0;
-      left: 0;
-    }
-    
   }
 
   .main {
-    width: 100vw;
-    padding-top: calc(var(--status-bar-height) + 204rpx);
-    box-sizing: border-box;
-
-    .tabs {
-      position: fixed;
-      top: calc(var(--status-bar-height) + 120rpx);
-      left: 0;
-      width: 100%;
-      height: 84rpx;
-      background: #FFFFFF;
-
-      /deep/ .uv-tabs__wrapper__nav__line {
-        border-radius: 2rpx;
-      }
-    }
-	}
-
+    padding: 40rpx;
+  }
   
-  .comment {
-    padding: 40rpx 32rpx;
+  .list {
+    padding: 32rpx;
+    background: #FFFFFF;
+    border-radius: 24rpx;
     
     &-item {
+      padding-bottom: 40rpx;
+      border-bottom: 2rpx solid #F5F5F5;
+
       & + & {
         margin-top: 40rpx;
       }
+
+      &:last-child {
+        border: none;
+      }
+
+      &-header {
+        justify-content: flex-start;
+        column-gap: 24rpx;
+        margin-bottom: 14rpx;
+
+        .mark {
+          width: 36rpx;
+          height: 36rpx;
+          background: linear-gradient(to right, #21FEEC, #019AF9);
+          border-radius: 50%;
+
+          .icon {
+            width: 24rpx;
+            height: auto;
+          }
+        }
+
+        .title {
+          flex: 1;
+          font-size: 30rpx;
+          font-weight: 600;
+          line-height: 1.4;
+          color: #00A9FF;
+        }
+      }
     }
   }
 

pages_order/comment/commentRecordsOfProduct.vue

@@ -1,14 +1,16 @@
 <template>
   <view class="page__view">
 
-		<navbar :title="title" leftClick @leftClick="$utils.navigateBack" color="#191919" bgColor="#FFFFFF" />
+		<navbar title="全部评论" leftClick @leftClick="$utils.navigateBack" />
 
     <view class="main">
-      <view class="comment">
-        <view class="comment-item" v-for="item in list" :key="item.id">
+
+      <view class="list">
+        <view class="list-item" v-for="item in list" :key="item.id">
           <commentCard :data="item"></commentCard>
         </view>
       </view>
+
     </view>
 
   </view>
@@ -26,8 +28,8 @@
     },
     data() {
       return {
-        title: '用户评价',
-				mixinsListApi: 'productEvaluate',
+        // todo
+				mixinsListApi: '',
       }
     },
     onShow() {
@@ -48,32 +50,21 @@
 
 <style scoped lang="scss">
   .page__view {
-    width: 100vw;
-    min-height: 100vh;
     background-color: $uni-bg-color;
-    position: relative;
-    
-    /deep/ .nav-bar__view {
-      position: fixed;
-      top: 0;
-      left: 0;
-    }
-    
   }
 
   .main {
-    width: 100vw;
-    padding-top: calc(var(--status-bar-height) + 120rpx);
-    box-sizing: border-box;
-	}
-
+    padding: 40rpx;
+  }
   
-  .comment {
-    padding: 40rpx 32rpx;
+  .list {
+    padding: 32rpx;
+    background: #FFFFFF;
+    border-radius: 24rpx;
     
     &-item {
       & + & {
-        margin-top: 40rpx;
+        margin-top: 16rpx;
       }
     }
   }

pages_order/comment/commentWrite.vue

@@ -1,270 +0,0 @@
-<template>
-  <view class="page__view">
-
-		<navbar title="立即评价" leftClick @leftClick="$utils.navigateBack" color="#191919" bgColor="#F3F2F7" />
-
-    <view class="main form">
-
-      <uv-form 
-        ref="form"
-        :model="form"
-        :rules="rules"
-        errorType="toast"
-      >
-        <view class="card info">
-          <view class="card-header">评价信息</view>
-          <view class="form-item">
-            <uv-form-item prop="content" :customStyle="formItemStyle">
-              <view class="form-item-label">评价内容</view>
-              <view class="form-item-content">
-                <formTextarea v-model="form.content"></formTextarea>
-              </view>
-            </uv-form-item>
-          </view>
-          <view class="form-item">
-            <uv-form-item prop="images" :customStyle="formItemStyle">
-              <view class="form-item-label">上传图片/视频（选填）</view>
-              <view class="form-item-content">
-                <formUpload v-model="form.images"></formUpload>
-              </view>
-            </uv-form-item>
-          </view>
-        </view>
-
-        <view class="card">
-          <view class="form-item">
-            <uv-form-item prop="productNum" :customStyle="formItemStyle">
-              <view class="flex row">
-                <view class="form-item-label">产品服务度</view>
-                <view class="form-item-content">
-                  <uv-rate v-model="form.productNum" size="48rpx" gutter="16rpx" activeColor="#F7BA1E" :allowHalf="true" :minCount="0.5" ></uv-rate>
-                </view>
-              </view>
-            </uv-form-item>
-          </view>
-          <view class="form-item">
-            <uv-form-item prop="paperNum" :customStyle="formItemStyle">
-              <view class="flex row">
-                <view class="form-item-label">问卷体验</view>
-                <view class="form-item-content">
-                  <uv-rate v-model="form.paperNum" size="48rpx" gutter="16rpx" activeColor="#F7BA1E" :allowHalf="true" :minCount="0.5" ></uv-rate>
-                </view>
-              </view>
-            </uv-form-item>
-          </view>
-          <view class="form-item">
-            <uv-form-item prop="logisticsNum" :customStyle="formItemStyle">
-              <view class="flex row">
-                <view class="form-item-label">物流速度</view>
-                <view class="form-item-content">
-                  <uv-rate v-model="form.logisticsNum" size="48rpx" gutter="16rpx" activeColor="#F7BA1E" :allowHalf="true" :minCount="0.5" ></uv-rate>
-                </view>
-              </view>
-            </uv-form-item>
-          </view>
-        </view>
-      </uv-form>
-    </view>
-
-    <view class="bottom">
-      <button class="btn" @click="onSubmit">提交申请</button>
-    </view>
-  </view>
-</template>
-
-<script>
-	import { mapState } from 'vuex'
-
-  import formTextarea from '@/pages_order/components/formTextarea.vue'
-  import formUpload from '@/pages_order/components/formUpload.vue'
-
-  export default {
-    components: {
-      formTextarea,
-      formUpload,
-    },
-    data() {
-      return {
-        orderId: null,
-        form: {
-          content: null,
-          images: [],
-          productNum: null,
-          paperNum: null,
-          logisticsNum: null,
-        },
-        rules: {
-          'content': {
-            type: 'string',
-            required: true,
-            message: '请输入评价',
-          },
-          'productNum': {
-            type: 'number',
-            required: true,
-            message: '请为【产品服务度】打分',
-          },
-          'paperNum': {
-            type: 'number',
-            required: true,
-            message: '请为【问卷体验】打分',
-          },
-          'logisticsNum': {
-            type: 'number',
-            required: true,
-            message: '请为【物流速度】打分',
-          },
-        },
-        formItemStyle: { padding: 0 },
-      }
-    },
-		computed: {
-			...mapState(['userInfo']),
-		},
-    onLoad(arg) {
-      const { orderId } = arg
-
-      this.orderId = orderId
-    },
-    methods: {
-      async onSubmit() {
-        try {
-          await this.$refs.form.validate()
-
-          const {
-            content,
-            images,
-            productNum,
-            paperNum,
-            logisticsNum,
-          } = this.form
-
-          const params = {
-            orderId: this.orderId,
-            content,
-            image: images.join(','),
-            productNum,
-            paperNum,
-            logisticsNum,
-          }
-
-          await this.$fetch('evaluateOrder', params)
-          
-					uni.showToast({
-						icon: 'success',
-						title: '提交成功',
-					});
-          
-          setTimeout(() => {
-            this.$utils.navigateBack()
-          }, 800)
-          
-        } catch (err) {
-          console.log('onSubmit err', err)
-        }
-      },
-    },
-  }
-</script>
-
-<style scoped lang="scss">
-
-  .page__view {
-    width: 100vw;
-		min-height: 100vh;
-    background-color: $uni-bg-color;
-    position: relative;
-    
-    /deep/ .nav-bar__view {
-      position: fixed;
-      top: 0;
-      left: 0;
-    }
-  }
-
-  .main {
-    padding: calc(var(--status-bar-height) + 144rpx) 32rpx 236rpx 32rpx;
-	}
-
-  .card {
-    padding: 32rpx;
-    background: #FFFFFF;
-    border: 2rpx solid #FFFFFF;
-    border-radius: 32rpx;
-
-    & + & {
-      margin-top: 40rpx;
-    }
-
-    &-header {
-      font-family: PingFang SC;
-      font-weight: 500;
-      font-size: 36rpx;
-      line-height: 1.4;
-      color: #252545;
-      margin-bottom: 32rpx;
-    }
-  }
-
-  .form {
-    &-item {
-      border-bottom: 2rpx solid #EEEEEE;
-
-      &:last-child {
-        border: none;
-      }
-
-      & + & {
-        margin-top: 32rpx;
-      }
-
-      &-label {
-        font-family: PingFang SC;
-        font-weight: 400;
-        font-size: 26rpx;
-        line-height: 1.4;
-        color: #181818;
-      }
-    }
-  }
-
-  .info {
-    .form-item + .form-item {
-      margin-top: 40rpx;
-    }
-    .form-item-content {
-      margin-top: 16rpx;
-    }
-  }
-
-  .row {
-    justify-content: space-between;
-  }
-
-  .bottom {
-		position: fixed;
-		left: 0;
-		bottom: 0;
-
-		width: 100vw;
-		// height: 200rpx;
-		padding: 24rpx 40rpx;
-		padding-bottom: calc(env(safe-area-inset-bottom) + 24rpx);
-		background: #FFFFFF;
-		box-sizing: border-box;
-
-    .btn {
-      width: 100%;
-      padding: 16rpx 0;
-      box-sizing: border-box;
-      font-family: PingFang SC;
-      font-weight: 500;
-      font-size: 36rpx;
-      line-height: 1;
-      color: #FFFFFF;
-      background-image: linear-gradient(to right, #4B348F, #845CFA);
-      border-radius: 41rpx;
-    }
-	}
-
-</style>

pages_order/order/components/productCard.vue

@@ -36,6 +36,10 @@
           return {}
         }
       },
+      style: {
+        type: String,
+        default: ''
+      }
     },
     computed: {
       product() {

pages_order/order/orderDetail/index.vue

@@ -52,15 +52,22 @@
         <template v-if="detail.status == 1">
           <button class="col btn" @click="onContactMentor">联系导师</button>
         </template>
+        <!-- 待评价 -->
+        <template v-else-if="data.status == 2">
+          <button class="btn" @click="onComment">立即评价</button>
+        </template>
         <!-- 已完成 -->
-        <template v-else-if="detail.status == 2">
+        <template v-else-if="detail.status == 3">
           <button class="col btn" @click="onApplyService">申请售后</button>
         </template>
       </view>
     </view>
 
     <contactMentorPopup ref="contactMentorPopup"></contactMentorPopup>
-		<agreementModal ref="modal" @confirm="onConfirmAgreement"></agreementModal>
+		
+    <commentPopup ref="commentPopup" @submitted="getData"></commentPopup>
+    
+    <agreementModal ref="modal" @confirm="onConfirmAgreement"></agreementModal>
 
   </view>
 </template>
@@ -71,6 +78,7 @@
   import productCard from '@/pages_order/order/components/productCard.vue'
   import orderInfoView from '@/pages_order/order/components/orderInfoView.vue'
   import contactMentorPopup from '@/pages_order/order/components/contactMentorPopup.vue'
+  import commentPopup from '@/pages_order/comment/commentPopup.vue'
 	import agreementModal from '@/pages_order/components/agreementModal.vue'
 
   export default {
@@ -78,6 +86,7 @@
       productCard,
       orderInfoView,
       contactMentorPopup,
+      commentPopup,
       agreementModal,
     },
     data() {
@@ -113,13 +122,13 @@
       // console.log('orderInfo', this.orderInfo)
       // this.detail = this.orderInfo
       // todo: check fetch by id?
-      this.fetchOrderDetail()
+      this.getData()
     },
     onPullDownRefresh() {
-      this.fetchOrderDetail()
+      this.getData()
     },
     methods: {
-      async fetchOrderDetail() {
+      async getData() {
           try {
 
             this.detail = {
@@ -244,6 +253,9 @@
 
           uni.stopPullDownRefresh()
       },
+      onComment(id) {
+        this.$refs.commentPopup.open(id)
+      },
       onApplyService() {
         // todo
       },

pages_order/order/orderList/index.vue

@@ -35,6 +35,7 @@
       <view class="card" v-for="item in list" :key="item.id">
         <orderCard 
           :data="item" 
+          @comment="onComment(item.id)"
           @applyService="onApplyService"
           @contatcMentor="onContactMentor"
           @statusChange="getData"
@@ -45,6 +46,8 @@
 
     <contactMentorPopup ref="contactMentorPopup" :phone="data.mentorPhone"></contactMentorPopup>
 
+    <commentPopup ref="commentPopup" @submitted="getData"></commentPopup>
+
   </view>
   
 </template>
@@ -54,12 +57,14 @@
 
   import orderCard from './orderCard.vue'
   import contactMentorPopup from '@/pages_order/order/components/contactMentorPopup.vue'
+  import commentPopup from '@/pages_order/comment/commentPopup.vue'
 
   export default {
 		mixins: [mixinsList],
     components: {
       orderCard,
       contactMentorPopup,
+      commentPopup,
     },
     data() {
       return {
@@ -95,6 +100,9 @@
 				}
 				this.getData()
 			},
+      onComment(id) {
+        this.$refs.commentPopup.open(id)
+      },
       onApplyService(obj) {
         // todo
         // this.$refs.serviceSelectPopup.open(obj)

pages_order/order/orderList/orderCard.vue

@@ -81,7 +81,7 @@
         this.$emit('contatcMentor', this.data.mentorPhone)
       },
       onComment() {
-        this.$utils.navigateTo(`/pages_order/comment/commentWrite?orderId=${this.data.id}`)
+        this.$emit('comment')
       },
       onApplyService() {
         // todo

pages_order/product/productDetail.vue

@@ -287,8 +287,6 @@
         this.$refs.orderInfoPopup.open({ selectTime: this.selectTime })
       },
       jumpToCommentRecords() {
-        // todo
-        return
         this.$utils.navigateTo(`/pages_order/comment/commentRecordsOfProduct?productId=${this.id}`)
       },
 			//点击tab栏