李志伟 3 years ago
parent
commit
124ad08468

+ 0
- 1
src/components/MyCard/index.jsx View File

1
-import Taro from "@tarojs/taro"
2
 import { View } from '@tarojs/components'
1
 import { View } from '@tarojs/components'
3
 import Jianbian from "@/components/Jianbian"
2
 import Jianbian from "@/components/Jianbian"
4
 import MyCell from "../MyCell"
3
 import MyCell from "../MyCell"

+ 1
- 1
src/pages/index/components/Job/index.jsx View File

1
 import Taro from "@tarojs/taro";
1
 import Taro from "@tarojs/taro";
2
 import { useState, useEffect } from "react";
2
 import { useState, useEffect } from "react";
3
 import { View, Input, Image, Text, ScrollView } from "@tarojs/components"
3
 import { View, Input, Image, Text, ScrollView } from "@tarojs/components"
4
-import searchImg from '@/assets/comm/search.png'
5
 import NullCard from "@/components/NullCard";
4
 import NullCard from "@/components/NullCard";
6
 import MyCard from "@/components/MyCard";
5
 import MyCard from "@/components/MyCard";
7
 import Footer from "@/components/Footer";
6
 import Footer from "@/components/Footer";
8
 import { getOrderList } from "@/services/order";
7
 import { getOrderList } from "@/services/order";
8
+import searchImg from '@/assets/comm/search.png'
9
 import './style.less'
9
 import './style.less'
10
 
10
 
11
 export default () => {
11
 export default () => {

+ 5
- 5
src/pages/index/components/order/index.jsx View File

2
 import Taro from "@tarojs/taro";
2
 import Taro from "@tarojs/taro";
3
 import { View, Input, Swiper, Image, SwiperItem, Text, ScrollView, Button } from "@tarojs/components"
3
 import { View, Input, Swiper, Image, SwiperItem, Text, ScrollView, Button } from "@tarojs/components"
4
 import { Popup } from "@antmjs/vantui";
4
 import { Popup } from "@antmjs/vantui";
5
-import positionImg from '@/assets/comm/position.png'
6
-import searchImg from '@/assets/comm/search.png'
7
-import orderImg from '@/assets/comm/orderList.png'
8
-import PositionImg from '@/assets/job/positionImg.png'
9
 import Footer from "@/components/Footer";
5
 import Footer from "@/components/Footer";
10
-import { useModel } from "@/store";
11
 import MyCard from "@/components/MyCard";
6
 import MyCard from "@/components/MyCard";
12
 import NullCard from "@/components/NullCard";
7
 import NullCard from "@/components/NullCard";
8
+import { useModel } from "@/store";
13
 import { getBannerList } from "@/services/banner";
9
 import { getBannerList } from "@/services/banner";
14
 import { getJobList, toggleJob, overJob } from '@/services/job'
10
 import { getJobList, toggleJob, overJob } from '@/services/job'
11
+import positionImg from '@/assets/comm/position.png'
12
+import searchImg from '@/assets/comm/search.png'
13
+import orderImg from '@/assets/comm/orderList.png'
14
+import PositionImg from '@/assets/job/positionImg.png'
15
 import './style.less'
15
 import './style.less'
16
 
16
 
17
 
17
 

+ 2
- 2
src/pages/index/index.jsx View File

1
 import Taro from "@tarojs/taro";
1
 import Taro from "@tarojs/taro";
2
 import { useEffect, useState } from "react";
2
 import { useEffect, useState } from "react";
3
 import { View, Image } from "@tarojs/components"
3
 import { View, Image } from "@tarojs/components"
4
-import { useModel } from "@/store";
5
 import withLayout from '@/layouts'
4
 import withLayout from '@/layouts'
6
 import CustomNav from "@/components/CustomNav";
5
 import CustomNav from "@/components/CustomNav";
7
 import LoginModel from "@/components/LoginModel";
6
 import LoginModel from "@/components/LoginModel";
8
-import { setAmap } from '@/services/amap'
9
 import indexImg from "@/assets/comm/index.png";
7
 import indexImg from "@/assets/comm/index.png";
10
 import indexActive from "@/assets/comm/indexActive.png";
8
 import indexActive from "@/assets/comm/indexActive.png";
11
 import job from "@/assets/comm/job.png";
9
 import job from "@/assets/comm/job.png";
12
 import jobActive from "@/assets/comm/jobActive.png";
10
 import jobActive from "@/assets/comm/jobActive.png";
13
 import user from "@/assets/comm/user.png";
11
 import user from "@/assets/comm/user.png";
14
 import userActive from "@/assets/comm/userActive.png";
12
 import userActive from "@/assets/comm/userActive.png";
13
+import { useModel } from "@/store";
14
+import { setAmap } from '@/services/amap'
15
 import Order from './components/Order'
15
 import Order from './components/Order'
16
 import Job from './components/Job'
16
 import Job from './components/Job'
17
 import User from "./components/User";
17
 import User from "./components/User";

+ 0
- 4
src/pages/machineryDetail/index.jsx View File

40
           <View className='detailContent'>
40
           <View className='detailContent'>
41
             <Jianbian value={machinery?.jobStatus} type='machinery' />
41
             <Jianbian value={machinery?.jobStatus} type='machinery' />
42
             <View className='detialName'>{machinery?.name}</View>
42
             <View className='detialName'>{machinery?.name}</View>
43
-            <View className='detailTime'>
44
-              <Image src={clockImg} className='clockImg' />
45
-              距离上次使用时间为三天
46
-            </View>
47
             <View className='title'>
43
             <View className='title'>
48
               <Image src={micon} className='detailIcon' />
44
               <Image src={micon} className='detailIcon' />
49
               农机详情
45
               农机详情

+ 0
- 11
src/pages/machineryDetail/style.less View File

16
     font-size: 36px;
16
     font-size: 36px;
17
     font-weight: bold;
17
     font-weight: bold;
18
   }
18
   }
19
-  .detailTime{
20
-    display: flex;
21
-    align-items: center;
22
-    font-weight: bold;
23
-    margin-top: 40px;
24
-    .clockImg{
25
-      width: 36px;
26
-      height: 36px;
27
-      margin-right: 18px;
28
-    }
29
-  }
30
   .title{
19
   .title{
31
     display: flex;
20
     display: flex;
32
     align-items: center;
21
     align-items: center;