flx

src/components/List/index.jsx

@@ -1,4 +1,4 @@
-import React, {  useEffect, useRef, useState, useImperativeHandle } from 'react';
+import React, { useEffect, useRef, useState, useImperativeHandle } from 'react';
 import { ScrollView } from '@tarojs/components';
 import Taro from '@tarojs/taro';
 
@@ -6,7 +6,7 @@ export default React.forwardRef((props, ref) => {
   const {
     render,
     request,
-    params={},
+    params = {},
     pageSize = 10,
     onError,
     onDataChange,
@@ -79,7 +79,7 @@ export default React.forwardRef((props, ref) => {
 
   useEffect(() => {
     Taro.nextTick(() => {
-      Taro.createSelectorQuery().select('.list-view').node(function(res){
+      Taro.createSelectorQuery().select('.list-view').node(function (res) {
         contextRef.current = res.node
       }).exec()
     })
@@ -87,6 +87,7 @@ export default React.forwardRef((props, ref) => {
 
   // https://developers.weixin.qq.com/miniprogram/dev/api/ui/scroll/ScrollViewContext.html
   // ScrollViewContext 透传给父组件
+  //https://zh-hans.reactjs.org/docs/hooks-reference.html#useimperativehandle
   useImperativeHandle(ref, () => ({
     context: contextRef.current,
   }))
@@ -103,10 +104,10 @@ export default React.forwardRef((props, ref) => {
         ? props.children
         : list.map((item, index) => render({ item, index }))
       }
-      { !list || !list.length && noData }
+      {!list || !list.length && noData}
+
+      {list && list.length > 0 && !hasMore && <view className='botton'>已经到底了~</view>}
 
-      { list && list.length > 0 && !hasMore && <view className='botton'>已经到底了~</view> }
-      
     </ScrollView>
   )
 })

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

@@ -92,7 +92,6 @@ export default withLayout((props) => {
       Taro.navigateBack({ delta: 1 })
     });
   };
-
   useEffect(() => {
     let total = {
       cashback: 0, //已获返现

src/pages/PayOrder/index.jsx

@@ -1,7 +1,7 @@
 import withLayout from "@/layouts";
 import image from "@/assets/icons/ProCard/8kb.jpg";
 import { useState, useEffect } from "react";
-import { Button, Checkbox, Input } from "@tarojs/components";
+import { Button, Checkbox, Input, RadioGroup, Radio } from "@tarojs/components";
 import AuthPage from '@/components/AuthPage'
 import food from "@/assets/icons/ProCard/food.png";
 import ProCard_hot from "@/assets/icons/ProCard/ProCard_hot.png";
@@ -158,6 +158,12 @@ export default withLayout((props) => {
     }
   }, [packageId, orderId]);
 
+  //用户协议
+  const goRules = () => {
+    Taro.navigateTo({ url: `/pages/MineUserAll/Rules/index` })
+
+  }
+
   useEffect(() => {
     if (BuyNumber < 2) {
       setDisabledBool(true);
@@ -181,125 +187,127 @@ export default withLayout((props) => {
   }, [list]);
 
   return (
-    !person.phone ? <AuthPage /> : <view class="container">
-      <CustomNav title="订单" />
+    !person.phone ? <AuthPage /> : <view class='container'>
+      <CustomNav title='订单' />
       <Popup show={showDialog} maskClosable={false}>
         <OrderMolded item={detail} />
-        <view className="item-center-Number">
+        <view className='item-center-Number'>
           <view
-            className="buy-num-minus"
+            className='buy-num-minus'
             disabled={DisabledBool}
             onClick={NumberCut}
           >
             -
           </view>
           <Input
-            className="buy-num-input"
-            type="number"
-            min="1"
+            className='buy-num-input'
+            type='number'
+            min='1'
             onInput={onInput}
             value={BuyNumber}
           />
-          <view className="buy-num-add" onClick={NumberAdd}>
+          <view className='buy-num-add' onClick={NumberAdd}>
             +
           </view>
         </view>
-        <view className="buy-button-box">
-          <button className="button-Cancel" onClick={ButtonCancel}>
+        <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>
-      <view class="coupon-list">
+      <view class='coupon-list'>
         {(list || []).map((item) => {
           return (
-            <view class="wrapper" key={item.orderId}>
-              <view class="left-complete-one">
-                <image className="left-image-1" src={ProCard_hot}></image>
-                <view className="left-viewText">
+            <view class='wrapper' key={item.orderId}>
+              <view class='left-complete-one'>
+                <image className='left-image-1' src={ProCard_hot}></image>
+                <view className='left-viewText'>
                   返现￥{formatPrice(item.cashback)}
                 </view>
-                <view className="title-image">
+                <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">{item.description}</view>
+                <view className='title-content'>
+                  <view className='Pro-title'>
+                    <view className='title-text'>{item.description}</view>
                   </view>
-                  <text className="title-money">
+                  <text className='title-money'>
                     ￥{formatPrice(item.actualPrice || item.unitPrice)}元
-                    <text className="title-money-2">
+                    <text className='title-money-2'>
                       门市价{formatPrice(item.standardPrice)}元
                     </text>
                   </text>
-                  <view className="title-time">
+                  <view className='title-time'>
                     有效期：{formatTime(item.startTime, "yyyy/MM/dd")}-
                     {formatTime(item.endTime, "yyyy/MM/dd")}
                   </view>
                 </view>
               </view>
               <view
-                class="right-complete-two"
+                class='right-complete-two'
                 onClick={() => ShowMoldeOn(item)}
               >
-                <view className="right-content">
-                  <view className="right-number">×{item.amount || 1}</view>
-                  <view className="right-title">数量</view>
+                <view className='right-content'>
+                  <view className='right-number'>×{item.amount || 1}</view>
+                  <view className='right-title'>数量</view>
                 </view>
               </view>
             </view>
           );
         })}
       </view>
-      <view className="view-button">
-        <view className="Card-number-box">
-          <view className="Card-number">
-            <text style="left:29px;position: absolute; padding-top:20px">
+      <view className='view-button'>
+        <view className='Card-number-box'>
+          <view className='Card-number'>
+            <text style='left:29px;position: absolute; padding-top:20px'>
               手机号码:
             </text>
-            <text style="right:29px;position: absolute;padding-top:20px">
+            <text style='right:29px;position: absolute;padding-top:20px'>
               {person.phone}
             </text>
           </view>
-          <view className="Card-user">
-            <Checkbox
-              style="padding-left:20px; position: relative; top:24px;"
-              value="agreement"
+          <view className='Card-user'>
+            <Radio
+              style='padding-left:20px; position: relative; top:24px;color:#666666;font-size:14px;'
+              value='agreement'
               checked={agreement}
               onClick={() => {
                 setAgreement(!agreement);
               }}
             >
               我已阅读知晓并同意
-              <text style="color:#274190;text-decoration:underline;font-weight:400">
+              <text style='color:#274190;text-decoration:underline;font-weight:400;display: inline-block;' onClick={goRules}>
                 《平台用户服务协议》
               </text>
-            </Checkbox>
+            </Radio>
+
+
           </view>
         </view>
-        <view className="button-box-button-box">
-          <view className="button-text-image">
-            <text className="button-text-money-hot">
+        <view className='button-box-button-box'>
+          <view className='button-text-image'>
+            <text className='button-text-money-hot'>
               返现￥{formatPrice(totalPrice?.cashback || 0)}
             </text>
-            <image className="button-image" src={ProCard_hot}>
+            <image className='button-image' src={ProCard_hot}>
               123123
             </image>
-            <view className="button-text-money">
+            <view className='button-text-money'>
               门店市面价：{formatPrice(totalPrice?.standardPrice || 0)}元
             </view>
           </view>
-          <Button className="button-box-one" onClick={() => onShowPay()}>
+          <Button className='button-box-one' onClick={() => onShowPay()}>
             ￥{formatPrice(totalPrice?.actualPrice || 0)}元
-            <text className="button-text-one">支付订单</text>
+            <text className='button-text-one'>支付订单</text>
           </Button>
         </view>
       </view>