flx

src/components/OrderMolded/style.less

@@ -8,7 +8,7 @@
     padding-bottom: 21px;
     display: flex;
     border-radius: 15px 0px 0px 15px;
-    align-items: center;    
+    align-items: center;
     .left-viewText-payOrder {
       background: url(../../assets/icons/ProCard/ProCard_hot.png) no-repeat;
       background-size: 100% 100%;
@@ -24,8 +24,8 @@
     //图片
     .title-image-cardOrder {
       width: 100%;
-      margin-left: 20px;
       border-radius: 24px;
+      display: flex;
       overflow: hidden;
       position: relative;
       .image-1-cardOrder {

src/pages/MineUserAll/ContactMe/index.jsx

@@ -24,15 +24,19 @@ export default withLayout((props) => {
         content
       }).then(() => {
 
-        Taro.navigateBack({
-          delta: 1
-        })
         Taro.showToast({
           title: '反馈成功',
           icon: 'success',
           duration: 2000
+
+        }).then(x => {
+
+          Taro.navigateBack({
+            delta: 1
+          })
+          setLoading(false)
+
         })
-        setLoading(false)
       })
     }
     else {

src/pages/MineUserAll/RefundMoney/index.jsx

@@ -29,9 +29,11 @@ export default withLayout((props) => {
         pageNum === 1 ? res.records || [] : list.concat(res.records || [])
       );
       setHasNextPage(res.current < res.pages);
-      Taro.hideLoading();
+      setLoading(false)
 
-    });
+    }).catch(e => {
+      setLoading(false)
+    })
   };
 
 
@@ -62,12 +64,14 @@ export default withLayout((props) => {
         <SpinBox loading={loading} className='index-container' >
 
           <view className='View-box-Card'>
+
             {(list || []).map((item) => {
               return (
                 <OrderCard item={item} key={item.orderId} sh='1' />
               )
             })}
             <view className='foot'>这是我的底线</view>
+
           </view>
         </SpinBox>
 

src/pages/PayOrder/style.less

@@ -98,16 +98,20 @@
           margin-right: 5px;
           width: 10px;
           height: 10px;
-          background: #999999;
+          font-weight: 800;
+
+          background: #000;
           border-radius: 50%;
         }
         .ul-li-textname {
+          font-weight: 800;
+
           font-size: 25px;
-          color: #999999;
+          color: #000;
         }
       }
     }
-    .payorder{
+    .payorder {
       margin: 40px 30px;
       color: #fff;
       background-color: #274190;
@@ -118,12 +122,12 @@
       align-items: center;
       //垂直居中
       justify-content: center;
-      .paytext{
+      .paytext {
         font-size: 30px;
       }
-      .paycontent{
-        margin:0 40px 0 20px;
-        .paybuttontop{
+      .paycontent {
+        margin: 0 40px 0 20px;
+        .paybuttontop {
           background: url(../../assets/icons/ProCard/ProCard_hot.png) no-repeat;
           background-size: 100% 100%;
           padding: 5px 25px 8px 6px;
@@ -134,7 +138,7 @@
           color: @whiteColor;
           font-weight: 600;
         }
-        .paybuttonbottom{          
+        .paybuttonbottom {
           font-size: 18px;
           text-decoration: line-through;
           line-height: 17px;
@@ -142,4 +146,4 @@
       }
     }
   }
-}
+}

src/pages/TobeShop/index.jsx

@@ -1,22 +1,16 @@
 import Taro from "@tarojs/taro";
-import { Button, Icon, Text, Textarea, View } from "@tarojs/components";
+import { Button, View } from "@tarojs/components";
 import { useState, useEffect } from "react";
 import withLayout from "@/layouts";
 import CustomNav from "@/components/CustomNav";
-import { getShopDetail, getShopPackage, getExtendContent } from '@/services/home';
+import { getShopDetail } from '@/services/home';
 import { getVerifyTargetList, putVerifyTarget } from "@/services/payOrder";
-import formatTime from '@/utils/formatTime'
 import Popup from "@/components/Popup";
 import SpinBox from "@/components/Spin/SpinBox";
-import formatPrice from "@/utils/formatPrice";
 
 import LocationBig from "@/assets/icons/UserCenter/LocationBig.png";
 import Perfection from "@/assets/icons/UserCenter/Perfection.png";
-import Check_OK from "@/assets/icons/UserCenter/Check_OK.png";
-import Check_NO from "@/assets/icons/UserCenter/Check_NO.png";
 import BlackSpot from "@/assets/icons/GuideCheck/BlackSpot.png";
-import food from "@/assets/icons/ProCard/food.png";
-import ProCard_hot from "@/assets/icons/ProCard/ProCard_hot.png";
 import TBCard from './Card'
 
 import "./style.less";
@@ -105,20 +99,17 @@ export default withLayout((props) => {
   };
   const ButtonOK = (e) => {
     if (!submiting) {
-      Taro.showLoading({
-        title: '核销中'
-      })
 
       setSubmiting(true);
       Promise.all(checked.map(verifyNo => putVerifyTarget(verifyNo)))
         .then(res => {
-          Taro.hideLoading()
+
           setSubmiting(false);
           setShowDialog(false);
           setConsumption(true);
         })
         .catch(e => {
-          Taro.hideLoading()
+
           setShowDialog(false);
           setSubmiting(false);
           getList();  // 刷新数据
@@ -136,7 +127,10 @@ export default withLayout((props) => {
     if (list?.length > 1) {
       getList()
     } else {
-      Taro.navigateBack({ delta: 1 })
+      Taro.redirectTo({
+        url: '/pages/MineUserAll/AllOrder/index?tabJump=3',
+      });
+      // Taro.navigateBack({ delta: 1 })
     }
   };
 
@@ -190,8 +184,8 @@ export default withLayout((props) => {
         <SpinBox loading={loading}>
           {(list || []).map((item) => {
             return (
-              <TBCard item={item} key={item.verifyNo} checked={checked} handleCheck={handleCheck} />             
-            )           
+              <TBCard item={item} key={item.verifyNo} checked={checked} handleCheck={handleCheck} />
+            )
           })}
         </SpinBox>
         <view className='button-info'>

src/pages/index/tabs/GuideCss/style.less

@@ -8,8 +8,8 @@
   .room-box-info-ROOM {
     width: 97%;
     display: flex;
-    margin: 60px auto;
-
+    margin-top: 35px;
+    margin: auto;
     .room-bi-name-ROOM {
       width: 100%;
 
@@ -34,7 +34,8 @@
   .room-box-info-HouLocation {
     width: 97%;
     display: flex;
-    margin: 60px auto;
+    margin-top: 35px;
+    margin: auto;
 
     .room-bi-name-HouLocation {
       width: 100%;
@@ -91,8 +92,8 @@
   .room-box-info-Parking {
     width: 97%;
     display: flex;
-    margin: 60px auto;
-
+    margin-top: 35px;
+    margin: auto;
     .room-bi-name-Parking {
       width: 100%;
 
@@ -148,8 +149,8 @@
   .room-box-info-WIFIContent {
     width: 97%;
     display: flex;
-    margin: 60px auto;
-
+    margin-top: 35px;
+    margin: auto;
     .room-bi-name-WIFIContent {
       width: 100%;
 
@@ -270,6 +271,7 @@
     }
   }
   .Guide-Content-box {
+    margin-top: 2em;
     .title-image {
       display: flex;
       // width: 270px;