Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

src/components/CollectList/MyCollect/style.less

@@ -54,7 +54,8 @@
     background-size: 100% 60%;
     background-repeat: no-repeat;
 
-    width: 573px;
+    
+    width: 80%;
     border-radius: 15px 0px 0px 15px;
     // border-radius: 12px;
 
@@ -189,7 +190,7 @@
   position: relative;
   //右面部分
   .right-content {
-    width: 50%;
+    // width: 50%;
     height: 134px;
     position: absolute;
     top: calc(50% - 45px);
@@ -197,14 +198,17 @@
     .right-image {
       width: 35px;
       height: 34px;
-      margin-left: calc(50% - 17.5px);
+      margin-left: calc(50% - 41.5px);
     }
 
     .right-title {
       font-weight: 700;
+      width: 110px;
       font-size: 24px;
       padding-top: 15px;
       text-align: center;
+      position: relative;
+      left: -22px;
     }
   }
 }
@@ -269,7 +273,7 @@
     background-size: 100% 60%;
     background-repeat: no-repeat;
 
-    width: 573px;
+    width: 80%;
     border-radius: 15px 0px 0px 15px;
     // border-radius: 12px;
 

src/components/CompoentsOrder/AlreadyUsed/index.jsx

@@ -1,9 +1,4 @@
 import { useState, useEffect } from 'react'
-import { Button, Radio, Input } from '@tarojs/components'
-import image from '@/assets/icons/ProCard/8kb.jpg'
-import food from '@/assets/icons/ProCard/food.png'
-import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
-import Evaluation from '@/assets/icons/UserCenter/Evaluation.png'
 import starOn from '@/assets/icons/GuideCheck/starOn.png'
 import starOff from '@/assets/icons/GuideCheck/starOff.png'
 import AlreadyUsedMolded from '@/components/AlreadyUsedMolded'
@@ -17,14 +12,15 @@ const score = '3.9'
 
 
 export default (props) => {
-  const { show, maskClosable, list } = props
+  const { showCutover, maskClosable, list, onClose } = props
 
-  const [showDialog, setShowDialog] = useState(false)
   const [CollectNub, setCollectNub] = useState(1)
 
   const ButtonCancel = () => {
+    onClose()
   }
   const ButtonOK = (e) => {
+    onClose()
 
   }
 
@@ -33,7 +29,7 @@ export default (props) => {
   }
 
   return (
-    <Popup show={show} maskClosable={show} onClose={ButtonCancel} className='box-content' >
+    <Popup show={showCutover} maskClosable={maskClosable} onClose={onClose} className='box-content' >
       <AlreadyUsedMolded list={list} />
       <view className='item-center-Number' >
         {/* 评分 */}

src/components/CompoentsOrder/AlreadyUsed/style.less

@@ -58,26 +58,5 @@
       color: #ffffff;
     }
   }
-  .OrderNumber {
-    // width: 234px;
-    height: 19px;
-    font-size: 20px;
-    font-weight: 400;
-    color: #666666;
-    line-height: 44px;
-  }
- 
-  .button-info {
-    margin-bottom: 70px;
 
-    .button-box {
-      margin: 60px 0;
-      width: calc(100% - 60px);
-      height: 88px;
-      line-height: 88px;
-      background: #274291;
-      border-radius: 12px;
-      color: @whiteColor;
-    }
-  }
 // }

src/components/CompoentsOrder/complete/index.jsx

@@ -72,10 +72,15 @@ export default (props) => {
   };
 
   const [show, setShow] = useState(false)
+  const [showCutover, setShowCutover] = useState(false)
 
+  const onClose = () => {
+    setShowCutover(false)
+  }
   //评价
   const evaluation = () => {
-    setShow(true)
+    setShowCutover(true)
+
   }
 
   useEffect(() => {
@@ -129,7 +134,7 @@ export default (props) => {
         list.length == 0 ?
           <NoData /> :
           <view className='complete-boxs'>
-            <AlreadyUsed show={show} maskClosable={show} list={list} />
+            <AlreadyUsed showCutover={showCutover} maskClosable={showCutover} onClose={onClose} list={list} />
             {list.map((item, index) => {
               /* 待支付 */
               if (item.status === 0) {

src/components/CompoentsOrder/complete/style.less

@@ -288,268 +288,7 @@
         color: #ffffff;
       }
     }
-    .OrderNumber {
-      // width: 234px;
-      height: 19px;
-      font-size: 20px;
-      font-weight: 400;
-      color: #666666;
-      line-height: 44px;
-    }
-    .wrapper {
-      margin-top: 40px;
-      display: flex;
-      position: relative;
-      // margin-top: 600px;
-      margin: 30px auto;
-      width: 700px;
-  
-      // box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
-      // filter: drop-shadow(5px 8px 6px rgb(202, 202, 202));
-      filter: drop-shadow(0 0 0.9rem rgba(0, 0, 0, 0.12));
-      .card-box-star {
-        position: absolute;
-        width: auto;
-        height: 44.3px;
-        position: absolute;
-        left: 200px;
-        top: 28px;
-        font-size: 20px;
-        color: @whiteColor;
-        .card-star-image {
-          padding-left: 6px;
-          width: 21px;
-          height: 21px;
-        }
-        .card-star-text {
-          padding-left: 10px;
-          font-size: 20px;
-          color: #333;
-          font-weight: 700;
-        }
-      }
-  
-      .left-complete-one {
-        padding-top: 85px;
-        padding-bottom: 43px;
-        position: relative;
-        display: flex;
-        background: @whiteColor;
-        background: radial-gradient(
-              circle at top right,
-              transparent 15px,
-              @whiteColor 0
-            )
-            top right,
-          radial-gradient(circle at bottom right, transparent 15px, @whiteColor 0)
-            bottom right;
-        background-size: 100% 60%;
-        background-repeat: no-repeat;
-  
-        width: 573px;
-        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: 20px;
-          color: @whiteColor;
-        }
-        //图片
-        .title-image {
-          width: 145px;
-          margin-left: 20px;
-          border-radius: 24px;
-          overflow: hidden;
-          position: relative;
-          .image-1 {
-            width: 100%;
-            height: 145px;
-          }
-          .image-2 {
-            width: 89px;
-            height: 34px;
-            position: absolute;
-            left: 0;
-            top: 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 {
-            // padding-top: 34px;
-            font-size: 24px;
-            // color: red;
-            font-weight: 800;
-          }
-          .title-money-2 {
-            height: 19px;
-            font-size: 20px;
-            font-weight: 400;
-            color: #333333;
-            padding-left: 40px;
-          }
-  
-          .title-time {
-            font-size: 24px;
-            // padding-top: 20px;
-            color: #c0c8d3;
-          }
-          .title-position-on {
-            display: flex;
-            font-size: 20px;
-            .title-position {
-              width: 18px;
-              height: 24px;
-              padding-right: 10px;
-              padding-top: 5px;
-            }
-            .title-position-image {
-              align-items: center;
-              font-size: 20px;
-              color: #333;
-            }
-            .title-on {
-              // margin-bottom: 10px;
-              padding-top: 5px;
-              padding-left: 40px;
-              width: 21px;
-              height: 21px;
-              padding-right: 10px;
-            }
-            .title-on-text {
-              align-items: center;
-  
-              font-size: 20px;
-              color: #333;
-            }
-          }
-        }
-      }
-      // .left-complete-one:nth-child(2) {
-      //   background: rgb(182, 0, 0);
-      //   padding-top: 10px;
-      // }
-    }
-  
-    .right-complete-two {
-      background: @whiteColor;
-      background: radial-gradient(
-            circle at top left,
-            transparent 15px,
-            @whiteColor 0
-          )
-          top left,
-        radial-gradient(circle at bottom left, transparent 15px, @whiteColor 0)
-          bottom left;
-      background-size: 100% 60%;
-      background-repeat: no-repeat;
-      width: 129px;
-      border-radius: 0 15px 15px 0;
-      position: relative;
-      //右面部分
-      .right-content {
-        // width: 100px;
-        height: 120px;
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        transform: translate(-50%, -50%);
-        // border: 1px solid red;
-        .right-image-2 {
-          width: 76px;
-          height: 66px;
-          margin-top: 1em;
-        }
-        .right-number {
-          // width: 32px;
-          // font-size: 20px;
-          // border-radius: 4px;
-          // border: 2px solid #999;
-          // margin: auto;
-          // text-align: center;
-        }
-        .right-image {
-          // float: convert();
-          width: 35px;
-          height: 34px;
-          margin: 0 auto;
-          align-items: center;
-          margin: auto;
-          padding-left: 8px;
-          // text-align: center;
-        }
-  
-        .right-title {
-          font-weight: 700;
-          font-size: 24px;
-          padding-top: 15px;
-          text-align: center;
-        }
-      }
-    }
-    //线条
-    .right-complete-two::after {
-      content: "";
-      position: absolute;
-      top: 15px;
-      margin: 26px auto;
-      height: 70%;
-      border-left: 1px dashed #595959;
-    }
-    .foot {
-      width: 100%;
-      height: 26px;
-      font-size: 28px;
-      font-weight: 400;
-      color: #c0c8d3;
-      line-height: 34px;
-      margin-top: 40px;
-      text-align: center;
-    }
-  
-    .button-info {
-      margin-bottom: 70px;
-  
-      .button-box {
-        margin: 60px 0;
-        width: calc(100% - 60px);
-        height: 88px;
-        line-height: 88px;
-        background: #274291;
-        border-radius: 12px;
-        color: @whiteColor;
-      }
-    }
   }
 }
+
+

src/pages/TobeShop/index.jsx

@@ -21,7 +21,7 @@ import formatTime from '@/utils/formatTime'
 import "./style.less";
 
 export default withLayout((props) => {
-  const { router, person } = props;
+  const { router, person, location } = props;
   const { id, subOrderId } = props.router.params;
   const [showDialog, setShowDialog] = useState(false);
   //核销
@@ -34,7 +34,7 @@ export default withLayout((props) => {
 
 
   const getShop = () => {
-    getShopDetail(id).then(e => {
+    getShopDetail(id, { location: location }).then(e => {
       setShopContent(e)
 
     })
@@ -106,92 +106,92 @@ export default withLayout((props) => {
   };
 
   return (
-    <view className="shop-Eat">
-      <CustomNav title="到店核销" />
+    <view className='shop-Eat'>
+      <CustomNav title='到店核销' />
       <Popup show={showDialog} maskClosable={false}>
-        <view className="Consumption-Now">您即将核销1张套餐券！</view>
-        <text className="Consumption-text">核销后套餐券不退不换</text>
-        <text className="Consumption-text">请核对无误后再点击确认！</text>
-        <view className="buy-button-box">
-          <button className="button-Cancel" onClick={ButtonCancel}>
+        <view className='Consumption-Now'>您即将核销1张套餐券！</view>
+        <text className='Consumption-text'>核销后套餐券不退不换</text>
+        <text className='Consumption-text'>请核对无误后再点击确认！</text>
+        <view className='buy-button-box'>
+          <button className='button-Cancel' onClick={ButtonCancel}>
             取消
           </button>
-          <button className="button-OK" onClick={ButtonOK}>
+          <button className='button-OK' onClick={ButtonOK}>
             确定
           </button>
         </view>
       </Popup>
       <Popup show={Consumption} maskClosable={false}>
-        <view className="Perfection-image-view">
-          <image src={Perfection} className="Perfection-image" />
+        <view className='Perfection-image-view'>
+          <image src={Perfection} className='Perfection-image' />
         </view>
         <text>核销完成！请与店铺确认！</text>
-        <view className="buy-button-box">
-          <button className="button-OK" onClick={PerfectionOK}>
+        <view className='buy-button-box'>
+          <button className='button-OK' onClick={PerfectionOK}>
             完成
           </button>
         </view>
       </Popup>
       <view>
-        <view className="position-header">
-          <image className="position-LocationBig" src={LocationBig} />
-          <text cla="position-LocationBig-text">
+        <view className='position-header'>
+          <image className='position-LocationBig' src={LocationBig} />
+          <text cla='position-LocationBig-text'>
             当前所在店铺：{shopContent?.shopName || []}
           </text>
         </view>
-        <view className="shop-image">
+        <view className='shop-image'>
           <image
-            mode="scaleToFill"
-            className="shop-title-image-cup"
+            mode='scaleToFill'
+            className='shop-title-image-cup'
             src={BlackSpot}
           />
-          <text className="shop-title-title">请选择你要核销的套餐</text>
+          <text className='shop-title-title'>请选择你要核销的套餐</text>
         </view>
         <view>
           {(list || []).map((item) => {
 
             return (
-              <view class="wrapper" key={item.verifyNo} onClick={() => setChecked(item.verifyNo)}>
-                <view class="left-complete-one">
-                  <view className="Check_OK-box">
-                    <image className="Check_OK-image" src={item.verifyNo == checked ? Check_OK : Check_NO} />
+              <view class='wrapper' key={item.verifyNo} onClick={() => setChecked(item.verifyNo)}>
+                <view class='left-complete-one'>
+                  <view className='Check_OK-box'>
+                    <image className='Check_OK-image' src={item.verifyNo == checked ? Check_OK : Check_NO} />
                   </view>
-                  <image className="left-image-1" src={ProCard_hot}></image>
-                  <view className="left-viewText">返现￥{item.cashback}</view>
-                  <view className="title-image">
+                  <image className='left-image-1' src={ProCard_hot}></image>
+                  <view className='left-viewText'>返现￥{item.cashback}</view>
+                  <view className='title-image'>
                     <image
-                      className="image-1"
-                      mode="scaleToFill"
+                      className='image-1'
+                      mode='scaleToFill'
                       src={item.poster}
                     ></image>
-                    <image className="image-2" src={food}></image>
+                    <image className='image-2' src={food}></image>
                   </view>
-                  <view className="title-content">
-                    <view className="Pro-title">
-                      <view className="title-text">
+                  <view className='title-content'>
+                    <view className='Pro-title'>
+                      <view className='title-text'>
                         {item.description}
-                        <text className="title-money-2">数量：1张</text>
+                        <text className='title-money-2'>数量：1张</text>
                       </view>
                     </view>
-                    <text className="title-money">
-                      ￥{formatPrice(item.actualPrice)}元<text className="title-money-2">门市价{formatPrice(item.standPrice)}元</text>
+                    <text className='title-money'>
+                      ￥{formatPrice(item.actualPrice)}元<text className='title-money-2'>门市价{formatPrice(item.standPrice)}元</text>
                     </text>
-                    <view className="title-time">
+                    <view className='title-time'>
                       有效期：{formatTime(item?.createDate, "yyyy/MM/dd")}-
                       {formatTime(item?.expireDate, "yyyy/MM/dd")}
                     </view>
                   </view>
                 </view>
-                <view class="right-complete-two">
-                  <view className="right-content"></view>
+                <view class='right-complete-two'>
+                  <view className='right-content'></view>
                 </view>
               </view>
             );
           })}
         </view>
 
-        <view className="button-info">
-          <Button className="button-box" disabled={!checked} onClick={ShowMoldeOn}>
+        <view className='button-info'>
+          <Button className='button-box' disabled={!checked} onClick={ShowMoldeOn}>
             确定核销
           </Button>
         </view>

src/pages/TobeShop/style.less

@@ -141,7 +141,7 @@
         width: 145px;
         height: 44px;
         position: absolute;
-        margin-left: 88px;
+        margin-left: 85px;
         top: 22px;
       }
       .left-viewText {

src/services/payOrder.js

@@ -30,7 +30,7 @@ export const payOrder = (id) => request(`/order/${id}/pay`, { method: 'post' })
 * @param {*} id 
 * @returns 
 */
-export const refund = (id,data) => request(`/order/${id}/refund`, { method: 'delete' ,data})
+export const refund = (id, data) => request(`/order/${id}/refund`, { method: 'delete', data })
 
 /**
 * 获取子订单列表
@@ -51,12 +51,22 @@ export const getMineOrder = () => request(`/orderSub/summary/mine`)
 * @param {*} params
 * @returns 
 */
-export const getVerifyTargetList = (params) => request(`/verifyTarget`,{ params })
+export const getVerifyTargetList = (params) => request(`/verifyTarget`, { params })
 
 /**
 * 核销
 * @param {*} id
 * @returns 
 */
-export const putVerifyTarget = (id) => request(`/verifyTarget/${id}`,{ method: 'put' })
+export const putVerifyTarget = (id) => request(`/verifyTarget/${id}`, { method: 'put' })
+
+
+
+/**
+* 评价
+* @param {*} id
+* @returns 
+*/
+export const orderEvaluation = (targetType, targetId) => request(`/${targetType}/${targetId}/evaluate`, { method: 'post' })
+