。

src/components/AlreadyUsedMolded/index.jsx

@@ -1,64 +0,0 @@
-
-
-import food from '@/assets/icons/ProCard/food.png'
-import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
-import formatTime from '@/utils/formatTime'
-
-import { useState } from 'react'
-import './style.less'
-
-
-
-
-const scoreList = new Array(5).fill(0);
-const score = "3.9";
-
-export default (props) => {
-  const [detail, setDetail] = useState({})
-
-  const star = parseFloat(((detail.sweetScore + detail.environmentScore + detail.serviceScore) / 3).toFixed(1));
-
-  const { list } = props
-
-  return (
-    <view>
-      {
-        list.map((item, index) => {
-          return (
-            <view class='wrapper-box' key={index} >
-              <view class='left-complete-one'  >
-                <image className='left-image-1' src={ProCard_hot}></image>
-                <view className='left-viewText'>
-                  返现￥{(item.cashback / 100)?.toFixed(2)}
-                </view>
-                <view className='title-image' >
-                  <image className='image-1' mode='scaleToFill' src={item.poster || []}></image>
-                  <image className='image-2' src={food}></image>
-                </view>
-                <view className='title-content'>
-                  <view className='Pro-title'  >
-                    <view className='title-text'>
-                      {item.packageDescription}
-                      <text className='title-money-2'>
-                        数量：{item.amount}张
-                      </text>
-                    </view>
-                  </view>
-                  <text className='title-money' >￥{(item.unitPrice / 100)?.toFixed(2)}元<text className='title-money-3'>订单编号：{item.orderId}</text></text>
-                  <view className='title-time'>
-                    核销时间：{" "}
-                    {formatTime(item.verifiedDate, "yyyy/MM/dd hh:mm")}
-                  </view>
-                </view>
-              </view>
-            </view>
-          )
-
-        })
-      }
-    </view>
-
-
-
-  )
-}

src/components/AlreadyUsedMolded/style.less

@@ -1,126 +0,0 @@
-@whiteColor: #fff;
-
-.wrapper-box {
-  display: flex;
-  position: relative;
-  margin: 30px auto;
-  filter: drop-shadow(0 0 0.9rem rgba(0, 0, 0, 0.12));
-
-  .left-complete-one {
-    padding-top: 87px;
-    padding-bottom: 43px;
-    position: relative;
-    display: flex;
-    background: @whiteColor;
-    background: radial-gradient(circle at top right, transparent 15px, #fff 0)
-        top right,
-      radial-gradient(circle at bottom right, transparent 15px, #fff 0) bottom
-        right;
-    background-size: 100% 60%;
-
-    width: 100%;
-    border-radius: 15px 0px 0px 15px;
-    // border-radius: 12px;
-
-    align-items: center;
-    .left-image-1 {
-      width: 145px;
-      height: 44px;
-      position: absolute;
-      top: 22px;
-    }
-    .left-viewText {
-      // background-image: url(@Image-ProCard_hot);
-      // width: 287px;
-      width: auto;
-      height: 44.3px;
-      position: absolute;
-      left: 1px;
-      top: 28px;
-      font-size: 24px;
-      color: @whiteColor;
-      font-weight: 600;
-    }
-    //图片
-    .title-image {
-      height: 144px;
-      margin-left: 20px;
-      border-radius: 24px;
-      overflow: hidden;
-      position: relative;
-      .image-1 {
-        width: 144px;
-        height: 144px;
-        margin: 0;
-      }
-      .image-2 {
-        width: 89px;
-        height: 34px;
-        position: absolute;
-        left: 0;
-      }
-    }
-    // 商品标题
-    .title-content {
-      // padding: 84px 0 56px 20px;
-      padding-left: 18px;
-
-      .Pro-title {
-        .title-text {
-          width: 375px;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          display: -webkit-box; //必须要
-          -webkit-line-clamp: 1;
-          -webkit-box-orient: vertical;
-          word-break: break-all; /* 多出文本省略号代替 */
-          text-align: left;
-          font-size: 24px;
-          padding-bottom: 10px;
-          .title-money-2 {
-            height: 19px;
-            font-size: 20px;
-            font-weight: 400;
-            color: #333333;
-            padding-left: 40px;
-          }
-        }
-      }
-      .title-money {
-        width: 58px;
-        height: 21px;
-        font-size: 24px;
-        font-weight: bold;
-        color: #333333;
-        font-weight: 800;
-      }
-      .title-time {
-        font-size: 24px;
-        // padding-top: 20px;
-        color: #c0c8d3;
-      }
-      .title-money-3 {
-        font-size: 18px;
-        padding-left: 10px;
-        color: rgba(102, 102, 102, 0.8);
-      }
-
-      .title-time {
-        font-size: 24px;
-        padding-top: 20px;
-        color: #c0c8d3;
-      }
-    }
-  }
-}
-
-//线条
-.right-complete-two::after {
-  content: "";
-  position: absolute;
-  top: 15px;
-  margin: 26px auto;
-  height: 70%;
-  border-left: 1px dashed #595959;
-  opacity: 0.12;
-}

src/components/CompoentsOrder/AlreadyUsed/index.jsx

@@ -6,104 +6,126 @@ import starOff from '@/assets/icons/GuideCheck/starOff.png'
 import formatTime from '@/utils/formatTime'
 import food from '@/assets/icons/ProCard/food.png'
 import Popup from '@/components/Popup'
+import {saveEvaluate} from '@/services/mine'
 import './style.less'
 
 
-const scoreList = new Array(5).fill(0)
-const score = '3.9'
 
 
 
-export default (props) => {
-  const { showCutover, maskClosable, list, onClose } = props
 
-  const [CollectNub, setCollectNub] = useState(1)
+export default (props) => {
+  const { showCutover, maskClosable, item, onClose } = props
 
+  
+  const scoreList = new Array(5).fill(0)
   const ButtonCancel = () => {
     onClose()
   }
   const ButtonOK = (e) => {
-    onClose()
-
+    if (evaluate.sweetScore==0||evaluate.environmentScore==0||evaluate.serviceScore==0) {
+      Taro.showToast({
+        title: '请您给本店点亮小星星哦',
+        icon: 'none'
+      })
+      return;
+    }
+    else{
+      saveEvaluate(evaluate.targetType,evaluate.targetId,evaluate).then((res)=>{
+        console.log(res)
+      })    
+      onClose()
+    }
   }
+  const [evaluate,setEvaluate]=useState({
+    sweetScore:0,//口味
+    environmentScore:0,//环境
+    serviceScore:0,//服务
+    targetId:'',
+    targetType:'shop'
+  })
+  const [kwCollectNub, setkwCollectNub] = useState(0)
+  const kwChange = (val) => {
+    setkwCollectNub(val+1)
+    setEvaluate({...evaluate,sweetScore:val+1,targetId:item.shopId})
+  }
+  const [hjCollectNub, sethjCollectNub] = useState(0)
+  const hjChange = (val) => {
+    sethjCollectNub(val+1)
+    setEvaluate({...evaluate,serviceScore:val+1})
 
-  const Nuberr = () => {
-    setCollectNub(+1)
+  }
+  const [fwCollectNub, setfwCollectNub] = useState(0)
+  const fwChange = (val) => {
+    setfwCollectNub(val+1)
+    setEvaluate({...evaluate,environmentScore:val+1})
   }
 
   return (
     <Popup show={showCutover} maskClosable={maskClosable} onClose={onClose} className='box-content' >
-      {/* <AlreadyUsedMolded list={list} /> */}
-      {
-        list.map((item, index) => {
-          return (
-            <View class='left-complete-one'  >
-              <View className='v1'>
-                <View className='left-viewText'>
-                  返现￥{(item.cashback / 100)?.toFixed(2)}
-                </View>
+      <View class='left-complete-one'  >
+        <View className='v1'>
+          <View className='left-viewText'>
+            返现￥{(item.cashback / 100)?.toFixed(2)}
+          </View>
+        </View>
+        <View className='v2'>
+          <View className='title-image' >
+            <image className='image-1' mode='scaleToFill' src={item.poster || []}></image>
+            <image className='image-2' src={food}></image>
+          </View>
+          <View className='title-content'>
+            <View className='Pro-title'  >
+              <View className='title-text'>
+                {item.packageDescription}
               </View>
-              <View className='v2'>
-                <View className='title-image' >
-                  <image className='image-1' mode='scaleToFill' src={item.poster || []}></image>
-                  <image className='image-2' src={food}></image>
-                </View>
-                <View className='title-content'>
-                  <View className='Pro-title'  >
-                    <View className='title-text'>
-                      {item.packageDescription}
-                    </View>
-                    <View className='title-money-2'>
-                      数量：{item.amount}张
-                    </View>
-                  </View>
-                  <text className='title-money' >￥{(item.unitPrice / 100)?.toFixed(2)}元</text><text className='title-money-3'>订单编号：{item.orderId}</text>
-                  <View className='title-time'>
-                    核销时间：{" "}
-                    {formatTime(item.verifiedDate, "yyyy/MM/dd hh:mm")}
-                  </View>
-                </View>
+              <View className='title-money-2'>
+                数量：{item.amount}张
               </View>
             </View>
-          )
-
-        })
-      }
+            <text className='title-money' >￥{(item.unitPrice / 100)?.toFixed(2)}元</text><text className='title-money-3'>订单编号：{item.orderId}</text>
+            <View className='title-time'>
+              核销时间：{" "}
+              {formatTime(item.verifiedDate, "yyyy/MM/dd hh:mm")}
+            </View>
+          </View>
+        </View>
+      </View>
       <View className='pjLine'></View>
       <view className='item-center-Number' >
         {/* 评分 */}
         <view className='card-box-star'>
-          <text className='card-box-star-text' onClick={Nuberr} >口味：</text>
+          <text className='card-box-star-text'  >口味：</text>
           {
             scoreList.map((_, index) => {
 
-              const src = (index + `${CollectNub}`) < score ? starOn : starOff
+              const src = index  < kwCollectNub ? starOn : starOff
               return (
-                <image className='card-star-image' key={index} src={src} onClick={Nuberr} />
+                <image className='card-star-image' key={index} src={src} onClick={()=>kwChange(index)} />
               )
             })
           }
         </view>
         <view className='card-box-star'>
-          <text className='card-box-star-text' onClick={Nuberr} >环境：</text>
+          <text className='card-box-star-text' >环境：</text>
           {
             scoreList.map((_, index) => {
 
-              const src = (index + `${CollectNub}`) < score ? starOn : starOff
+              const src = index  < hjCollectNub ? starOn : starOff
               return (
-                <image className='card-star-image' key={index} src={src} onClick={Nuberr} />
+                <image className='card-star-image' key={index} src={src} onClick={()=>hjChange(index)} />
               )
             })
           }
         </view>
         <view className='card-box-star'>
-          <text className='card-box-star-text' onClick={Nuberr} >服务：</text>
+          <text className='card-box-star-text'  >服务：</text>
           {
             scoreList.map((_, index) => {
 
-              const src = (index + `${CollectNub}`) < score ? starOn : starOff
+              const src = index  < fwCollectNub ? starOn : starOff
               return (
-                <image className='card-star-image' key={index} src={src} onClick={Nuberr} />
+                <image className='card-star-image' key={index} src={src} onClick={()=>fwChange(index)} />
               )
             })
           }

src/components/CompoentsOrder/OrderCard/index.jsx

@@ -14,7 +14,7 @@ const CouponMedia = CouponCard.Media
 const Action = CouponCard.Action
 
 export default (props) => {
-  const { item, setShowCutover } = props
+  const { item, setShowCutover,show } = props
 
   const handleDetail = () => {
     if (item.status === 0) {
@@ -46,15 +46,18 @@ export default (props) => {
     });
   }
   //评价
-  const evaluation = () => {
+  const evaluation = (val) => {
+    show(val)
     setShowCutover(true)
   }
   const PayAction =
     item.status === 0 ? <Action.Icon icon={Pay} text='支付' onClick={handleDetail} /> :
-      item.status === 1 && item.isVerified == 0 ? <Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} /> :
-        item.status === 2 && item.isVerified == 0 ? <Action.Image image={refund} /> :
+      item.status === 1 && item.isVerified == false ? <Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} /> :
+        item.status === 2 && item.isVerified == false ? <Action.Image image={refund} /> :
           item.status === 9 ? <Action.Image image={Null} /> :
-            item.isVerified == 1 ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation()} /> : ''
+          item.isVerified == true&&item.isEvaluated==3 ? <Action.Image image={Null} /> :
+            item.isVerified == true ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} /> :'' 
+
 
   return (
     <>

src/components/CompoentsOrder/OrderCard/style.less

@@ -41,6 +41,6 @@
 }
 .OrderNumber {
   font-size: 20px;
-  font-weight: 400;
   color: #666666;
+  padding: 20px 0;
 }

src/components/CompoentsOrder/complete/index.jsx

@@ -77,8 +77,10 @@ export default (props) => {
       }
     }
   }, [IsPull]);
-
-
+  const [ite,setItem]=useState({})
+  const show=(val)=>{
+    setItem(val)
+  }
   const slideButtonTap = (e) => {
     deleteOrder(e.orderId || '').then(() => {
       Taro.showToast({
@@ -109,7 +111,7 @@ export default (props) => {
           list.length == 0 ?
             <NoData /> :
             <view className='complete-boxs'>
-              <AlreadyUsed showCutover={showCutover} maskClosable={showCutover} onClose={onClose} list={list} />
+              <AlreadyUsed showCutover={showCutover} maskClosable={showCutover} onClose={onClose} item={ite} />
               {list.map((item, index) => {
                 /* 待支付 */
                 if (item.status === 0) {
@@ -125,7 +127,7 @@ export default (props) => {
                 else if (item.isVerified == 1) {
                   return (
                     <view key={`${type}-${item.orderId}`}>
-                      <OrderCard item={item} setShowCutover={setShowCutover} />
+                      <OrderCard item={item} setShowCutover={setShowCutover} show={show} />
                     </view>
                   );
                 }

src/components/CompoentsOrder/complete/style.less

@@ -8,7 +8,7 @@
 }
 
 .complete-boxs {
-  margin: 40px auto;
+  margin: 20px auto;
   padding: 0 30px;
   .foot {
     width: 100%;

src/services/guide.js

@@ -1,19 +0,0 @@
-//入住指引模块
-import request from '@/utils/request'
-
-/**
- * 民宿详情
- * @param {*} id 
- * @returns 
- * 看home.js里面getHotelDetail
- */
-/**
- * 套餐详情
- * @param {*} id 
- * @returns 
- */
-/**
- * 套餐列表绑定民宿老板id
- * @param {*} id 
- * @returns 
- */

src/services/mine.js

@@ -5,17 +5,7 @@ import request from '@/utils/request'
  * @param {*} data 
  * @returns 
  */
- export const saveEvaluation = (data) => request('/taEvaluation', { method: 'post', data })
-
- /**
- * 查看评价详情
- * @param {*} id 
- * @returns 
- */
-  export const getEvaluationDetail = (id) => request(`/taEvaluation/${id}`)
-
- //订单列表用哪个表    
-//收藏列表
+ export const saveEvaluate = (type,id,data) => request(`/${type}/${id}/evaluate`, { method: 'post', data })
 
 /**
  * 联系我们