flx

src/components/ShopUnused/index.jsx

@@ -25,8 +25,6 @@ export default (props) => {
         <image className='orderImg' src={item.poster} mode='aspectFit' />
         <view className='orderRight'>
           <view className='foodName'>{item.description}</view>
-
-
           <view className='price'>合计金额：￥<text style={{ fontSize: '24rpx' }}>{((item.actualPrice / 100) - (item.cashback / 100) - (item.commissionCharge / 100)).toFixed(2)}</text>元 <text className='pnum'>数量：<text>1</text>张</text> </view>
           <view>已下单：等待客户上门就餐</view>
         </view>

src/components/ShopUnused/style.less

@@ -1,89 +1,89 @@
-.orderCard{
+.orderCard {
   margin-bottom: 20px;
-  .orderId{
+  .orderId {
     font-size: 20px;
     color: #666666;
     line-height: 44px;
     float: left;
     margin: 60px 0 0 0;
-
   }
-  .orderTime{    
+  .orderTime {
     font-size: 20px;
     color: #666666;
     line-height: 44px;
     float: right;
     margin: 60px 0 0 0;
   }
-  .order{
-    background: #FFFFFF;
+  .order {
+    background: #ffffff;
     box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
     border-radius: 12px;
     padding: 20px;
-    .orderImg{
+    .orderImg {
       width: 194px;
       height: 194px;
       border-radius: 22px;
       float: left;
-      margin:0 26px 0 0;
+      margin: 0 26px 0 0;
     }
-    .orderRight{
-      .foodName{
+    .orderRight {
+      .foodName {
         font-size: 24px;
         color: #333333;
         margin-top: 40px;
       }
-      .price{
+      .price {
         font-size: 20px;
         font-weight: bold;
         color: #202020;
         margin: 0 0 10px 0;
-        .pnum{
+        .pnum {
           color: #333333;
           font-weight: 400;
-          margin-left: 47px;         
+          margin-left: 47px;
         }
       }
-      .price+view{
+      .price + view {
         font-size: 20px;
         font-weight: bold;
-        color: #FF3434;
+        color: #ff3434;
         line-height: 44px;
         margin-bottom: 35px;
         height: 19px;
       }
     }
-    .line{
+    .line {
+      margin-top: 30px;
+
       width: 100%;
       height: 2px;
       background: #000;
       opacity: 0.1;
     }
-    .phone{
+    .phone {
       font-size: 24px;
       color: #666666;
       line-height: 44px;
       height: 23px;
-      margin: 30px 0;
+      margin: 37px 0;
     }
-    .button-OK{
+    .button-OK {
       width: 160px;
-    height: 40px;
-    background: #1A3B83;
-    line-height: 40px;
-    border-radius: 12px;
-    font-size: 23px;
-    color: #ffffff;
-    position: relative;
-    right: -8em;
-    top: -2em;
+      height: 40px;
+      background: #1a3b83;
+      line-height: 40px;
+      border-radius: 12px;
+      font-size: 23px;
+      color: #ffffff;
+      position: relative;
+      right: -8em;
+      top: -2em;
     }
-    .tripTime{
+    .tripTime {
       font-size: 24px;
       color: #666666;
       line-height: 44px;
       margin-bottom: 30px;
     }
   }
-  
 }

src/components/ShopUsed/style.less

@@ -59,6 +59,8 @@
       padding-top: 20px;
     }
     .line {
+      margin-top: 30px;
+
       width: 100%;
       height: 2px;
       background: #000;
@@ -70,7 +72,7 @@
       color: #666666;
       line-height: 44px;
       height: 23px;
-      margin: 30px 0;
+      margin: 37px 0;
       // .Button-OK{
       //   font-size: 28px;
       //   color: #C0C8D3;

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

@@ -92,14 +92,18 @@ export default withLayout((props) => {
       refundReason: explain,
     }).then((res) => {
       Taro.hideLoading();
-      Taro.navigateBack({
-        delta: 1
-      })
       Taro.showToast({
-        title: "退款成功",
-        icon: "none",
-        duration: 3000,
-      });
+        title: '已提交',
+        icon: 'success',
+        duration: 3000
+      })
+      setTimeout(() => {
+        Taro.navigateBack({
+          delta: 1
+        })
+      }, 2000);
+
+
     });
   };
   useEffect(() => {
@@ -124,100 +128,100 @@ export default withLayout((props) => {
       <View className='index-container'>
         <SpinBox loading={loading} className='box-content'>
           <scroll-view scroll-y style={{ height: '100%' }} >
-              <view className='Refund-Content-box'>
-                <view className='title-image'>
-                  <image
-                    mode='scaleToFill'
-                    className='title-image-cup'
-                    src={BlackSpot}
-                  />
-                  <text className='title-title-boss'>商品信息</text>
-                </view>
-              </view>
-              {/* 商品信息结束 */}
-              <view>
-                {(list || []).map((item) => {
-                  return (
-                    <OrderCard item={item} key={item.orderId} kkp='1' />
-                  );
-                })}
-              </view>
-              {/* 卡片结束 */}
-              <view className='Refund-Content-box'>
-                <view className='title-image'>
-                  <image
-                    mode='scaleToFill'
-                    className='title-image-cup'
-                    src={BlackSpot}
-                  />
-                  <text className='title-title-boss'>退款原因</text>
-                </view>
-                {/* 退款结束 */}
-              </view>
-              <view className='Refund-content'>
-                {options.map((x) => {
-                  return (
-                    <text
-                      className={`Refund-star-view1 ${checkeds.indexOf(x.key) > -1
-                        ? "bg2"
-                        : `Refund-star-view2`
-                        }`}
-                      key={x.key}
-                      onClick={() => viewOK(x)}
-                    >
-                      {x.title}
-                    </text>
-                  );
-                })}
-              </view>
-              <view className='Refund-Content-box'>
-                <view className='title-image'>
-                  <image
-                    mode='scaleToFill'
-                    className='title-image-cup'
-                    src={BlackSpot}
-                  />
-                  <text className='title-title-boss'>退款说明</text>
-                </view>
-              </view>
-              <view class='section'>
-                <Textarea
-                  placeholder='请补充退款说明（选填）!'
-                  onInput={(e) => setExplain(e.detail.value)}
-                  confirm-type='done'
+            <view className='Refund-Content-box'>
+              <view className='title-image'>
+                <image
+                  mode='scaleToFill'
+                  className='title-image-cup'
+                  src={BlackSpot}
                 />
+                <text className='title-title-boss'>商品信息</text>
               </view>
-              <view className='money-title'>
-                实付金额:{" "}
-                <text className='money-name'>{formatPrice(totalPrice.charges)}元</text>
-              </view>
-              <view className='money-title'>
-                已获返现:{" "}
-                <text className='money-name'>{formatPrice(totalPrice.cashback)}元</text>
-              </view>
-              <view className='money-title'>
-                退款金额:{" "}
-                <text className='money-name'>{formatPrice(totalPrice.refundPrice)}元</text>
-              </view>
-              <view className='ul-li-text'>
-                <view className='ul-li-view'></view>
-                <text className='ul-li-textname'>退款金额不可修改</text>
-              </view>
-              <view className='ul-li-text'>
-                <view className='ul-li-view'></view>
-                <text className='ul-li-textname'>
-                  下单获得返现金额，会在退款时被扣除；
-                </text>
-              </view>
-              <view className='ul-li-text'>
-                <view className='ul-li-view'></view>
-                <text className='ul-li-textname'>退款将在七个工作日内原路退还。</text>
+            </view>
+            {/* 商品信息结束 */}
+            <view>
+              {(list || []).map((item) => {
+                return (
+                  <OrderCard item={item} key={item.orderId} kkp='1' />
+                );
+              })}
+            </view>
+            {/* 卡片结束 */}
+            <view className='Refund-Content-box'>
+              <view className='title-image'>
+                <image
+                  mode='scaleToFill'
+                  className='title-image-cup'
+                  src={BlackSpot}
+                />
+                <text className='title-title-boss'>退款原因</text>
               </view>
-              <view className='button-info' >
-                <Button className='button-box' onClick={() => onRefund()}>
-                  提交申请
-                </Button>
+              {/* 退款结束 */}
+            </view>
+            <view className='Refund-content'>
+              {options.map((x) => {
+                return (
+                  <text
+                    className={`Refund-star-view1 ${checkeds.indexOf(x.key) > -1
+                      ? "bg2"
+                      : `Refund-star-view2`
+                      }`}
+                    key={x.key}
+                    onClick={() => viewOK(x)}
+                  >
+                    {x.title}
+                  </text>
+                );
+              })}
+            </view>
+            <view className='Refund-Content-box'>
+              <view className='title-image'>
+                <image
+                  mode='scaleToFill'
+                  className='title-image-cup'
+                  src={BlackSpot}
+                />
+                <text className='title-title-boss'>退款说明</text>
               </view>
+            </view>
+            <view class='section'>
+              <Textarea
+                placeholder='请补充退款说明（选填）!'
+                onInput={(e) => setExplain(e.detail.value)}
+                confirm-type='done'
+              />
+            </view>
+            <view className='money-title'>
+              实付金额:{" "}
+              <text className='money-name'>{formatPrice(totalPrice.charges)}元</text>
+            </view>
+            <view className='money-title'>
+              已获返现:{" "}
+              <text className='money-name'>{formatPrice(totalPrice.cashback)}元</text>
+            </view>
+            <view className='money-title'>
+              退款金额:{" "}
+              <text className='money-name'>{formatPrice(totalPrice.refundPrice)}元</text>
+            </view>
+            <view className='ul-li-text'>
+              <view className='ul-li-view'></view>
+              <text className='ul-li-textname'>退款金额不可修改</text>
+            </view>
+            <view className='ul-li-text'>
+              <view className='ul-li-view'></view>
+              <text className='ul-li-textname'>
+                下单获得返现金额，会在退款时被扣除；
+              </text>
+            </view>
+            <view className='ul-li-text'>
+              <view className='ul-li-view'></view>
+              <text className='ul-li-textname'>退款将在七个工作日内原路退还。</text>
+            </view>
+            <view className='button-info' >
+              <Button className='button-box' onClick={() => onRefund()}>
+                提交申请
+              </Button>
+            </view>
           </scroll-view>
         </SpinBox>
       </View>

src/pages/index/tabs/Guide.jsx

@@ -172,7 +172,7 @@ export default (props) => {
               </view>
               {/* --------房屋位置-------- */}
               {
-                !roomGps ? <view></view>
+                !taRoomContent.location ? <view></view>
                   :
                   <view className='room-box-info-HouLocation'>
                     <view className='room-bi-name-HouLocation' >
@@ -192,7 +192,7 @@ export default (props) => {
 
               {/* --------停车场-------- */}
               {
-                !parkingGps ? <view></view>
+                !taRoomContent.parkingLocation ? <view></view>
                   :
                   <view className='room-box-info-Parking'>
                     <view className='room-bi-name-Parking' >
@@ -206,7 +206,6 @@ export default (props) => {
                       </view>
                     </view>
                   </view>
-
               }
 
 

src/shop/components/Sparead/spreadMoney.jsx

@@ -87,7 +87,7 @@ export default (props) => {
         <view className='title'>推广收入记录</view>
 
         <List
-          style={{ height: 'calc(100% - 145px)' }}
+          style={{ height: '50%' }}
           request={reqestAPI}
           params={queryParams}
           noData={<NoData />}