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

src/components/CompoentsOrder/OrderCard/index.jsx

@@ -77,7 +77,7 @@ export default (props) => {
   return (
     <>
       {
-        sh != '1' || kkp == '1' ? <view className='OrderNumber'>订单编号：{item.orderId}</view> : null
+        sh != '1' || kkp != '1' ? <view className='OrderNumber'>订单编号：{item.orderId}</view> : null
       }
       {
         item.status === 0 ? <SlideViewOrder del onDelete={() => handeDelete(item)} >

src/components/CouponCard/Action/IconAction.jsx

@@ -18,7 +18,7 @@ export default (props) => {
     <View className='cpn-action cpn-icon-action'>
       <View onClick={handleClick}>
         <Image src={icon} />
-        <Text>{text}</Text>
+        {text?<Text>{text}</Text>:null}
       </View>
     </View>
   )

src/components/InputNumber/index.jsx

@@ -41,7 +41,7 @@ export default (props) => {
     <View className={cls} style={style}>
       <View>
         <View className='input-number' onClick={handleSub}>-</View>
-        <Input value={value} onInput={handleInput} type='number' className='input-number' {...leftProps} />
+        <Input min='1' type='number' value={value} onInput={handleInput}  className='input-number' {...leftProps} />
         <View className='input-number' onClick={handleAdd}>+</View>
       </View>
     </View>

src/components/OrderMolded/index.jsx

@@ -1,6 +1,6 @@
 import { useState } from 'react'
 
-import { Button, Radio } from '@tarojs/components'
+import { Button, Radio, View } from '@tarojs/components'
 import PayOrderCard from '@/components/PayOrderCard'
 import formatTimes from '@/utils/formatTime'
 import food from '@/assets/icons/ProCard/food.png'
@@ -13,10 +13,7 @@ export default (props) => {
   return (
     <view class='wrapper-box-cardOrder'>
       <view class='left-complete-one-cardOrder'>
-        <image className='left-image-1-cardOrder' src={ProCard_hot}></image>
-        <view className='left-viewText-cardOrder'>
-          返现￥{(item.cashback / 100).toFixed(2)}
-        </view>
+        <View className='left-viewText-payOrder'>返现￥{(item.cashback / 100).toFixed(2)}</View>
         <view className='title-image-cardOrder'>
           <image className='image-1-cardOrder' mode='scaleToFill' src={item.poster}></image>
           <image className='image-2-cardOrder' src={food}></image>

src/components/OrderMolded/style.less

@@ -6,48 +6,30 @@
   .left-complete-one-cardOrder {
     padding-top: 87px;
     padding-bottom: 21px;
-    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%;
-    background-repeat: no-repeat;
-
-    width: 573px;
     border-radius: 15px 0px 0px 15px;
-    // border-radius: 12px;
-
-    align-items: center;
-    .left-image-1-cardOrder {
-      width: 145px;
-      height: 44px;
-      position: absolute;
-      top: 22px;
-    }
-    .left-viewText-cardOrder {
-      // background-image: url(@Image-ProCard_hot);
-      // width: 287px;
-      width: auto;
+    align-items: center;    
+    .left-viewText-payOrder {
+      background: url(../../assets/icons/ProCard/ProCard_hot.png) no-repeat;
+      background-size: 100% 100%;
+      padding: 0 24px 7px 2px;
+      font-size: 24px;
+      line-height: 48px;
       height: 44.3px;
       position: absolute;
-      left: 1px;
-      top: 28px;
-      font-size: 24px;
+      top: 20px;
       color: @whiteColor;
       font-weight: 600;
     }
     //图片
     .title-image-cardOrder {
-      width: 145px;
+      width: 100%;
       margin-left: 20px;
       border-radius: 24px;
       overflow: hidden;
       position: relative;
       .image-1-cardOrder {
-        width: 100%;
+        width: 145px;
         height: 145px;
       }
       .image-2-cardOrder {

src/pages/MineUserAll/RefundMoney/CheckRefund/index.jsx

@@ -114,7 +114,7 @@ export default withLayout((props) => {
       </view>
       <View className='index-container'>
         <View className='box-content'>
-          <scroll-view scroll-y style='height: calc(100vh - 65px);' >
+          <scroll-view scroll-y style='height: 100%;' >
             <view className='Refund-Content-box'>
               <view className='title-image'>
                 <image
@@ -204,7 +204,7 @@ export default withLayout((props) => {
               <view className='ul-li-view'></view>
               <text className='ul-li-textname'>退款将在七个工作日内原路退还。</text>
             </view>
-            <view className='button-info'>
+            <view className='button-info' >
               <Button className='button-box' onClick={() => onRefund()}>
                 提交申请
               </Button>
@@ -212,6 +212,7 @@ export default withLayout((props) => {
           </scroll-view>
         </View>
       </View>
+
     </view >
   );
 });

src/pages/MineUserAll/RefundMoney/CheckRefund/style.less

@@ -82,8 +82,8 @@
     }
   }
 
-  .button-info {
-    margin-bottom: 80px;
+  .button-info{
+    padding-bottom: 80px;
     .button-box {
       margin-top: 60px;
       height: 92px;
@@ -95,4 +95,5 @@
       letter-spacing: 0.1em;
     }
   }
-}
+  
+}

src/pages/PayOrder/index.jsx

@@ -15,24 +15,18 @@ import "./style.less";
 
 
 export default withLayout((props) => {
-  //#region 
   const { router, person } = props;
   const { packageId, orderId } = props.router.params;
-
   const [payInfo, setPayInfo] = useState();
-
   // 是否已阅读协议
   const [agreement, setAgreement] = useState(false);
   // 总价 totalPrice
   const [totalPrice, setTotalPrice] = useState({});
   const [list, setList] = useState([]);
-
   const [BuyNumber, setBuyNumber] = useState(1);
   const [detail, setDetail] = useState({});
   const [showDialog, setShowDialog] = useState(false);
 
-  const [DisabledBool, setDisabledBool] = useState(false);
-
   const ShowMoldeOn = (e) => {
     if (packageId) {
       setBuyNumber(e.amount || 1);
@@ -62,20 +56,6 @@ export default withLayout((props) => {
     }
   };
 
-  const NumberAdd = () => {
-    setBuyNumber(BuyNumber + 1);
-  };
-
-  const NumberCut = () => {
-    if (DisabledBool) return;
-    setBuyNumber(BuyNumber - 1);
-  };
-
-  const onInput = (e) => {
-    let values = e.detail.value;
-    setBuyNumber(values - 0);
-  };
-
   const requestPayment = (params) => {
     Taro.hideLoading()
     Taro.requestPayment({
@@ -174,14 +154,6 @@ export default withLayout((props) => {
 
   }
 
-  useEffect(() => {
-    if (BuyNumber < 2) {
-      setDisabledBool(true);
-    } else {
-      setDisabledBool(false);
-    }
-  }, [BuyNumber]);
-
   useEffect(() => {
     let total = {
       cashback: 0,

src/pages/TobeShop/Card/index.jsx

@@ -11,7 +11,7 @@ const Action = CouponCard.Action
 export default (props) => {
   const { item, checked, handleCheck } = props
 
-  const PayAction = <Action.Icon icon={checked?.indexOf(item.verifyNo) > -1 ? Check_OK : Check_NO} onClick={handleCheck} />
+  const PayAction = <Action.Icon icon={checked?.indexOf(item.verifyNo) > -1 ? Check_OK : Check_NO} onClick={() => handleCheck(item.verifyNo)} />
   return (
     <CouponCard action={PayAction} onClick={() => handleCheck(item.verifyNo)}>
       <CouponMedia>

src/pages/TobeShop/index.jsx

@@ -142,7 +142,7 @@ export default withLayout((props) => {
 
   const btnText = ['确认核销', checked && checked.length > 0 ? `(${checked.length})` : undefined].filter(Boolean).join(' ')
   return (
-    <view className='shop-Eat'>
+    <view className='page-index shop-Eat'>
       <view className='index-navbar'>
         <CustomNav title='到店核销' />
       </view>
@@ -190,83 +190,10 @@ export default withLayout((props) => {
         <SpinBox loading={loading}>
           {(list || []).map((item) => {
             return (
-              <TBCard item={item} key={item.verifyNo} checked={checked} handleCheck={handleCheck} />
-              // <CouponCard action={PayAction} onClick={() => handleCheck(item.verifyNo)}>
-              //   <CouponMedia>
-              //     <CouponMedia.Header
-              //       cashback={item.cashback}
-              //       image={item.poster}
-              //       badge='food'
-              //     />
-              //     <CouponMedia.Body star={null}>
-              //       <View className='orderCard'>
-              //         <View className='cpn-card-text'>
-              //           <View style={{ flex: '1' }}>{(item.description).toString().length > 25 ? (item.description).substring(0, 25) + '...' : (item.description)}</View>
-              //           <text className={ 'title-money-2'}>
-              //             数量：{item.amount}张
-              //           </text>
-              //         </View>
-              //         <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
-              //           <Text className='cpn-card-text_mn'>￥{`${(item.actualPrice / 100)?.toFixed(2)}元`}</Text>
-              //         </View>
-              //         <View className='cpn-md-act'>
-              //           <view className='title-time'>
-              //             {
-              //               '有效期：' + formatTime(item?.createDate, "yyyy/MM/dd") + '-' +
-              //               formatTime(item.expireDate, "yyyy/MM/dd")
-              //             }
-              //           </view>
-              //         </View>
-              //       </View>
-              //     </CouponMedia.Body>
-              //   </CouponMedia>
-              // </CouponCard>
-
-
-
-
-            )
-            // <view class='wrapper' key={item.verifyNo} onClick={() => handleCheck(item.verifyNo)}>
-            //   <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='cpn-card-text'>
-            //         <View style={{ flex: '1' }}>{(item.description).toString().length > 25 ? (item.description).substring(0, 25) + '...' : (item.description)}</View>
-            //         <text className='title-money-2'>
-            //           数量：1张
-            //         </text>
-            //       </View>
-            //       <text className='title-money'>
-            //         ￥{formatPrice(item.actualPrice)}元<text className='title-money-2'>门市价{formatPrice(item.standPrice)}元</text>
-            //       </text>
-            //       <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 className='Check_OK-box'>
-            //         <image className='Check_OK-image' src={checked.indexOf(item.verifyNo) > -1 ? Check_OK : Check_NO} />
-            //       </view>
-            //     </view>
-            //   </view>
-            // </view>
-
+              <TBCard item={item} key={item.verifyNo} checked={checked} handleCheck={handleCheck} />             
+            )           
           })}
         </SpinBox>
-
         <view className='button-info'>
           <Button className='button-box' onClick={handleVerifyClick}>
             {btnText}

src/pages/TobeShop/style.less

@@ -33,10 +33,6 @@
       }
     }
   }
-  .weui-dialog__bd{
-    padding: 0 67px;
-    margin-bottom: 40px;
-  }
   .position-header {
     display: flex;
     align-items: center;
@@ -62,7 +58,6 @@
     .shop-title-image-cup {
       width: 32px;
       height: 32px;
-      // margin-top: 10px;
       padding-right: 15px;
       align-items: center;
     }
@@ -73,115 +68,6 @@
       color: #202020;
     }
   }
-
-  .wrapper {
-    display: flex;
-    filter: drop-shadow(0 0 0.9rem rgba(0, 0, 0, 0.12));    
-
-    .left-complete-one {
-      padding-top: 87px;
-      padding-bottom: 43px;
-      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%;
-      background-repeat: no-repeat;
-      border-radius: 15px 0px 0px 15px;
-      align-items: center;
-      .left-image-1 {
-        width: 145px;
-        height: 44px;
-        position: absolute;
-        top: 22px;
-      }
-      .left-viewText {
-        position: absolute;
-        top: 28px;
-        font-size: 20px;
-        color: @whiteColor;
-      }
-      //图片
-      .title-image {
-        width: 145px;
-        height: 145px;
-        margin-left: 20px;
-        border-radius: 24px;
-        overflow: hidden;
-        position: relative;
-        flex: none;
-        .image-1 {
-          width: 100%;
-          height: 100%;
-        }
-        .image-2 {
-          width: 89px;
-          height: 34px;
-          position: absolute;
-          left: 0;
-          top: 0;
-        }
-      }
-      // 商品标题
-      .title-content {
-        padding-left: 20px;
-        .cpn-card-text {
-          font-size: 24px;
-          font-weight: 400;
-          color: #333333;
-          line-height: 40px;
-          vertical-align: baseline;
-          display: flex;
-        }
-        .title-money {
-          font-size: 24px;
-          display: inline-block;
-          font-weight: 800;
-          margin: 15px auto;
-        }
-        .title-money-2 {
-          font-size: 20px;
-          font-weight: 400;
-          color: #333333;
-          padding-left: 50px;
-        }
-        .title-time {
-          font-size: 24px;
-          color: #c0c8d3;
-        }
-      }
-    }
-  }
-  .right-complete-two {
-    background: @whiteColor;
-    background: radial-gradient(circle at top left, transparent 15px, #fff 0)
-        top left,
-      radial-gradient(circle at bottom left, transparent 15px, #fff 0) bottom
-        left;
-    background-size: 100% 60%;
-    background-repeat: no-repeat;
-    width: 129px;
-    border-radius: 0 15px 15px 0;
-    //右面部分
-    .right-content {
-      height: 120px;
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      transform: translate(-50%, -50%);
-      .Check_OK-box {
-        position: relative;
-        left: 37vw;
-        top: 6vw;
-        .Check_OK-image {
-          width: 34px;
-          height: 34px;
-        }
-      }
-    }
-  }
   .button-info {
     margin-bottom: 80px;
     position: absolute;