feast

src/components/CarsListContent/index.jsx

@@ -28,7 +28,7 @@ export default (props) => {
 
 
   const startReserve = () => {
-    Taro.navigateTo({ url: `/pages/OrderInfo/index?id${1}` })
+    Taro.navigateTo({ url: `/pages/OrderConfirmation/index?id${1}` })
 
   }
   const goCarsInfo = (res) => {

src/pages/CheckMap/index.jsx

@@ -1,9 +1,9 @@
-import { useEffect } from "react"
+import { useEffect, useState } from "react"
 import { Map, View, Image, Text } from "@tarojs/components"
 import CustomNav from "@/components/CustomNav"
 import ButtontWX from "@/components/ButtontWX"
 import Taro from "@tarojs/taro"
-import decorate from "@/assets/icons/comm/decorate.png"
+import locationImage from "@/assets/icons/comm/locationImage.png"
 import addresss from '@/assets/mineImgaes/addresss.png'//地址
 import './style.less'
 
@@ -11,6 +11,18 @@ import './style.less'
 export default (props) => {
 
   const $instance = Taro.getCurrentInstance()
+  const [mapLoca, setMapLoca] = useState('')
+  Taro.getStorage({
+    key: 'location',
+    success: function (res) {
+      setMapLoca(res.data)
+    }
+  })
+
+
+  const LocationMap = mapLoca.split(",")
+  console.log("🚀 ~ file: index.jsx ~ line 25 ~ LocationMap", LocationMap)
+
 
 
   useEffect(() => {
@@ -24,10 +36,10 @@ export default (props) => {
   }
 
   const markers = [{ // 绘制浮标，传入JSON支持多个
-    // iconPath: "/images/location.png", 
+    iconPath: locationImage,
     id: 0,
-    latitude: 112.092169,// 经度
-    longitude: 32.694883,//纬度
+    latitude: LocationMap[0],// 经度
+    longitude: LocationMap[1],//纬度
     width: 50, // 浮标宽度
     height: 50 // 浮标高度
   }]

src/pages/FeedbackText/index.jsx

@@ -2,6 +2,9 @@ import { useState } from "react"
 import { Textarea, View } from "@tarojs/components"
 import CustomNav from "@/components/CustomNav"
 import ButtontWX from "@/components/ButtontWX"
+import { feedback } from "@/services/mine"
+import Taro from "@tarojs/taro"
+
 import './style.less'
 
 
@@ -13,6 +16,24 @@ export default (props) => {
 
   const onSubmitClick = () => {
     console.log('textAreaValue', textAreaValue);
+    feedback({ content: textAreaValue }).then(() => {
+      Taro.showToast({
+        title: '反馈已收到！',
+        icon: 'success',
+        duration: 2000
+      }).then(() => {
+        setTimeout(() => {
+          Taro.navigateBack({
+            delta: 1
+          }
+
+          )
+        }, 1500)
+
+      })
+    })
+
+
   }
 
   return (

src/pages/MyAddressList/AddressInfos/index.jsx

@@ -11,12 +11,50 @@ import { useEffect } from "react"
 
 
 export default (props) => {
+  console.log("🚀 ~ file: index.jsx ~ line 14 ~ props", props)
+
+  const $instance = Taro.getCurrentInstance()
+  const { addressId, address } = $instance.router.params
+
+  console.log("🚀 ~ file: index.jsx ~ line 14 ~ props", $instance.router.params)
+
   const formSubmit = e => {
+
     const value = e.detail.value
     console.log(value)
-    addressSave({ address: value.address, isDefault: value.isDefault }).then((e) => {
-      console.log('e', e);
-    })
+    if (addressId) {
+      addressUpdate(addressId, { address: value.address }).then((res) => {
+        console.log('地址修改成功', res);
+        Taro.showToast({
+          title: '地址修改成功',
+          icon: 'success',
+          duration: 2000
+        }).then(() => {
+          setTimeout(() => {
+            Taro.navigateBack({
+              delta: 1
+            })
+          }, 1500)
+
+        })
+      })
+    } else {
+      addressSave({ address: value.address }).then((e) => {
+        console.log('地址添加成功', e);
+        Taro.showToast({
+          title: '地址添加成功',
+          icon: 'success',
+          duration: 2000
+        }).then(() => {
+          setTimeout(() => {
+            Taro.navigateBack({
+              delta: 1
+            })
+          }, 1500)
+        })
+      })
+    }
+
 
   }
 
@@ -30,7 +68,7 @@ export default (props) => {
       <Form onSubmit={formSubmit} onReset={formReset} >
         <View className='example-body'>
           <View>详细地址：</View>
-          <Textarea name='address' className='aTextareaCentent' placeholder='请输入地址信息' />
+          <Textarea name='address' value={address} className='aTextareaCentent' placeholder='请输入地址信息' />
         </View>
         {/* <View className='example-body'>
           <View>是否设为默认地址：</View>

src/pages/MyAddressList/index.jsx

@@ -1,6 +1,6 @@
 import { View, Image, Switch, Radio, RadioGroup } from "@tarojs/components"
-import Taro from "@tarojs/taro"
-import { useState, useEffect } from "react"
+import Taro, { useDidShow } from "@tarojs/taro"
+import { useState, useEffect, useMemo } from "react"
 import CustomNav from "@/components/CustomNav"
 import edit from "@/assets/icons/comm/edit.png"
 import userRight from '@/assets/mineImgaes/userRight.png'
@@ -29,6 +29,12 @@ export default (props) => {
       success: function (res) {
         if (res.confirm) {
           addressDelete(e).then((e) => {
+            Taro.showToast({
+              title: '地址删除成功',
+              icon: 'success',
+              duration: 2000
+            })
+            getList()
 
           })
         } else if (res.cancel) {
@@ -43,8 +49,6 @@ export default (props) => {
 
   const handelSwitch = (a, e) => {
     const { value } = e.detail
-    // console.log('e', !!value);
-    console.log('a,e', a, value);
     addressDefault(a).then((se) => {
       console.log('e', se);
       getList()
@@ -57,25 +61,32 @@ export default (props) => {
     // }
 
   }
-  const addressEdit = (e) => {
+  const addressEdit = (e, res) => {
     console.log('e', e);
+    Taro.navigateTo({ url: `/pages/MyAddressList/AddressInfos/index?addressId=${e}&address=${res}` })
 
   }
 
 
+
   const getList = () => {
     getAddress().then((e) => {
       console.log('地址列表', e);
+      // let abccList = e.records.sort((a, b) => b.isDefault - a.isDefault)
+      // console.log("🚀 ~ file: index.jsx ~ line 75 ~ getAddress ~ abccList", abccList)
       setAddresList(e.records)
     })
   }
+  useDidShow(() => {
+    getList()
+
+  })
 
   useEffect(() => {
     getList()
 
 
-    console.log('执行了', switchBool,);
-  }, [switchBool,])
+  }, [])
 
 
 
@@ -87,12 +98,14 @@ export default (props) => {
       <scroll-view scrollY style='height: 100%;' >
         <View>
           {
-
             addresList.map((item, index) => {
               return (
                 <View className='addressList-box' key={index}>
                   <View className='addressList-box-addressTop'>
-                    <View className='addressList-box-addressTop-redText'>默认地址</View>
+                    {
+                      item.isDefault ?
+                        <View className='addressList-box-addressTop-redText'>默认地址</View> : ''
+                    }
                     <View className='addressList-box-addressTop-title'>我的地址{index + 1}</View>
                   </View>
                   <View className='addressList-box-addressBotton'>
@@ -100,19 +113,15 @@ export default (props) => {
                       <View>
                         {item.address}
                       </View>
-                      <Image src={edit} onClick={() => addressEdit(item.addressId)} />
+                      <Image src={edit} onClick={() => addressEdit(item.addressId, item.address)} />
                     </View>
 
                     <View className='addressList-box-addressBotton-setAddress'>
                       <View>
-
                         设为默认地址:
-
                         <RadioGroup className='radio-group' onChange={(res) => handelSwitch(item.addressId, res)} >
                           <Radio color='#FC5531' checked={item.isDefault}></Radio>
                         </RadioGroup>
-
-
                       </View>
 
                       <View className='addressList-box-addressBotton-addressDelete' onClick={() => addressDeletess(item.addressId)}>

src/pages/MyAddressList/style.less

@@ -96,7 +96,8 @@
 }
 
 .bottomButtom {
+  margin: 22vh auto;
   width: 100%;
-  margin: 0 auto;
-  margin-bottom: 15vh;
+  position: relative;
+  bottom: 17vh;
 }

src/pages/OrderConfirmation/index.config.js

@@ -0,0 +1,9 @@
+
+export default {
+  navigationBarTitleText: '订单确认',
+  navigationStyle: 'custom',
+  disableScroll: true,
+  usingComponents: {
+  }
+
+}

src/pages/OrderConfirmation/index.jsx

@@ -0,0 +1,49 @@
+import { View, Text } from "@tarojs/components"
+import Taro from "@tarojs/taro"
+import { useState } from "react"
+import CustomNav from '@/components/CustomNav'
+import ButtontWX from '@/components/ButtontWX'
+// import BottomMoadl from '@/components/BottomMoadl/index'
+
+
+
+
+
+
+import './style.less'
+
+export default (props) => {
+  //底部弹窗
+  // const [showFrame, setShowFrame] = useState(false)
+  // const setRecommend = () => {
+  //   setShowFrame(!showFrame)
+  // }
+
+  const okgoPay = () => {
+    Taro.navigateTo({ url: `/pages/OrderInfo/index?id${1}` })
+  }
+  const cancelPay = () => {
+    Taro.navigateBack({
+      delta: 1
+    })
+  }
+
+
+
+  return (
+    <View className='page-index'>
+      <View className='index-navbar'>
+        <CustomNav title='订单确认' />
+      </View>
+      {/* <BottomMoadl frameTitle='支付方式' flag={showFrame} onRecommend={setRecommend} /> */}
+      <View>
+
+      </View>
+      <View className='BottomtBut' >
+        <ButtontWX butText='取消' onClick={cancelPay} butWidth={123} butHeight={39} butFontSize={16} butBorderRadius={49} />
+
+        <ButtontWX butText='确定' onClick={okgoPay} butWidth={123} butHeight={39} butFontSize={16} butBorderRadius={49} />
+      </View>
+    </View>
+  )
+}

src/pages/OrderConfirmation/style.less

@@ -0,0 +1,4 @@
+.BottomtBut {
+  width: 99vw;
+  display: flex;
+}

src/pages/OrderInfo/index.jsx

@@ -1,7 +1,11 @@
 import { View, Text } from "@tarojs/components"
-import { useState } from "react"
+import { useEffect, useState } from "react"
+import Taro from "@tarojs/taro"
 import CustomNav from '@/components/CustomNav'
 import ButtontWX from '@/components/ButtontWX'
+import formatTimes from "@/utils/codeSegment"
+
+import { generateOrder, orderDelete, orderInfo } from "@/services/order"
 // import BottomMoadl from '@/components/BottomMoadl/index'
 
 
@@ -12,14 +16,77 @@ import ButtontWX from '@/components/ButtontWX'
 import './style.less'
 
 export default (props) => {
+
+  const $instance = Taro.getCurrentInstance()
+  const { orderId } = $instance.router.params
+
+  const [orderInfos, setOrderInfos] = useState()
   //底部弹窗
   // const [showFrame, setShowFrame] = useState(false)
   // const setRecommend = () => {
   //   setShowFrame(!showFrame)
   // }
 
-  const pay = () => {
+  const cancelPay = () => {
+    Taro.showModal({
+      title: '提示',
+      content: '您确定要取消此订单吗？',
+      success: function (res) {
+        if (res.confirm) {
+          orderDelete(orderId).then((e) => {
+            console.log('订单取消/删除', e);
+            Taro.showToast({
+              title: '订单取消成功',
+              icon: 'success',
+              duration: 2000
+            }).then(() => {
+              setTimeout(() => {
+                Taro.navigateBack({
+                  delta: 1
+                })
+              }, 1500)
+            })
+          })
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
+      }
+    })
+  }
 
+  useEffect(() => {
+    if (orderId) {
+      orderInfo(orderId).then((res) => {
+        setOrderInfos(res)
+      })
+    } else {
+      Taro.showToast({
+        title: '暂无订单详情',
+        icon: 'error',
+        duration: 2000
+      }).then(() => {
+        setTimeout(() => {
+          Taro.navigateBack({
+            delta: 1
+          })
+        }, 1500)
+      })
+    }
+
+  }, [orderId])
+
+  const pay = () => {
+    generateOrder({
+      charges: 200,
+      price: 100,
+      amount: 20,
+      machineryId: '7cdf832d7a7af0c19ab33418e10e1a94',
+      machineryName: '第一台播种机',
+      machineryType: 'b4d183f684ed1f3d1cb2194c1975ae46',
+      typeName: '播种机',
+      address: '我是作业地址：房屋后面',
+      appontmentDate: new Date(),
+    })
   }
 
 
@@ -30,18 +97,20 @@ export default (props) => {
       </View>
       {/* <BottomMoadl frameTitle='支付方式' flag={showFrame} onRecommend={setRecommend} /> */}
       <View className='orders-listBox-RihtboxBoxOrderViewText'>
-        <View className='View-LiftTextTop'>订单编号：<Text>41242425</Text></View>
-        <View>农机名称：<Text>阿松大的</Text></View>
-        <View>需求数量：<Text>2</Text></View>
-        <View>需求时间：<Text>2322-80-99</Text></View>
-        <View>下单时间：<Text>2244-06-78</Text></View>
-        <View>订单状态：<Text  >未支付</Text></View>
+        <View className='View-LiftTextTop'>订单编号：<Text>{orderInfos?.orderNo}</Text></View>
+        <View>农机名称：<Text>{orderInfos?.machineryName}</Text></View>
+        <View>作业面积：<Text>{orderInfos?.amount}</Text></View>
+        <View>需求时间：<Text>{formatTimes(orderInfos?.appointmentDate, 'yyyy-MM-dd hh:mm')}</Text></View>
+        <View>下单时间：<Text>{formatTimes(orderInfos?.createDate, 'yyyy-MM-dd hh:mm')}</Text></View>
+        <View>订单状态：<Text  >{orderInfos?.payStatus}</Text></View>
         <View className='View-LiftTextBotton'>
-          <View>费用：<Text className='feiyongStyle'>88</Text></View>
+          <View>费用：<Text className='feiyongStyle'>{orderInfos?.charges}</Text></View>
         </View>
       </View>
       <View className='BottomtBut' >
-        <ButtontWX butText='支付' onClick={pay} butWidth={345} butHeight={49} butFontSize={16} butBorderRadius={49} />
+        <ButtontWX butText='取消' onClick={cancelPay} butWidth={123} butHeight={39} butFontSize={16} butBorderRadius={49} />
+
+        <ButtontWX butText='支付' onClick={pay} butWidth={123} butHeight={39} butFontSize={16} butBorderRadius={49} />
       </View>
     </View>
   )

src/pages/OrderInfo/style.less

@@ -46,4 +46,5 @@
   width: 99vw;
   position: absolute;
   bottom: 5vh;
+  display: flex;
 }

src/pages/index/tabs/Mine.jsx

@@ -1,6 +1,6 @@
 
 import { View, Image } from "@tarojs/components"
-import Taro from "@tarojs/taro"
+import Taro, { useDidShow } from "@tarojs/taro"
 import { useState, useEffect, useMemo } from "react"
 import UserCellBox from '@/components/UserCellBox'
 import addresss from '@/assets/mineImgaes/addresss.png'//地址
@@ -8,9 +8,12 @@ import aboutUs from '@/assets/mineImgaes/aboutUs.png'//关于我们
 import feedbacks from '@/assets/mineImgaes/feedbacks.png'//意见反馈
 import helpCenter from '@/assets/mineImgaes/helpCenter.png'//帮助中心
 import versionUpdate from '@/assets/mineImgaes/versionUpdate.png'//版本更新
+import userMoren from '@/assets/mineImgaes/userMoren.png'//默认头像
 import userRight from '@/assets/mineImgaes/userRight.png'
 import { useModel } from "@/store"
 
+import { getAddress } from "@/services/address"
+
 
 
 import './MineCss/style.less'
@@ -19,6 +22,8 @@ import './MineCss/style.less'
 export default (props) => {
   const { person } = useModel('userData')
   const [isLoginBox, setIsLoginBox] = useState(false)
+  const [addresInfo, setAddresInfo] = useState('')
+
   const userList = [
     { userTitle: '关于我们', userImg: aboutUs, pageType: 0 },
     { userTitle: '版本更新', userImg: versionUpdate, pageType: 1 },
@@ -40,6 +45,20 @@ export default (props) => {
 
 
 
+  useDidShow(() => {
+    getAddress().then((e) => {
+      let abccList = e.records.sort((a, b) => b.isDefault - a.isDefault)
+      setAddresInfo(abccList[0].address)
+    })
+  })
+  useEffect(() => {
+
+    getAddress().then((e) => {
+      let abccList = e.records.sort((a, b) => b.isDefault - a.isDefault)
+      console.log("🚀 ~ file: index.jsx ~ line 75 ~ getAddress ~ abccList", abccList)
+      setAddresInfo(abccList[0].address)
+    })
+  }, [])
 
   const setAddress = (dd) => {
     Taro.navigateTo({ url: `/pages/MyAddressList/index?id${dd}` })
@@ -88,14 +107,14 @@ export default (props) => {
         {
           !isLoginBox ?
             <View style={{ backgroundImage: "url(" + require("@/assets/mineImgaes/mineBack.png") + ")" }} className='User-Avatar-background-falseBox'>
-              <Image className='User-Avatar-background-falseBox-userImg userImg' src='https://profile.csdnimg.cn/3/1/5/0_qq_42551866' />
+              <Image className='User-Avatar-background-falseBox-userImg userImg' src={userMoren} />
               <View onClick={userLoginnow} className='User-Avatar-background-falseBox-userLogin' >点击登陆</View>
             </View>
             :
             <>
               <View style={{ backgroundImage: "url(" + require("@/assets/mineImgaes/mineBack.png") + ")" }} className='User-Avatar-background-trueBox'>
                 <View className='setPassword' onClick={goUserInfo}>修改个人信息</View>
-                <Image className='User-Avatar-background-trueBox-userImg' src={userInfo?.avatar} />
+                <Image className='User-Avatar-background-trueBox-userImg' src={userInfo?.avatar || userMoren} />
                 <View className='User-Avatar-background-trueBox-name'>
                   <View >{userInfo?.nickName}</View>
                   <View >{userInfo?.phone}</View>
@@ -106,7 +125,7 @@ export default (props) => {
                 <View className='addresss-box' onClick={setAddress} >
                   <Image className='addresss-box-images' src={addresss} />
                   <View className='addresss-box-contents'>
-                    <View className='addresss-box-contents-texts' >河南省南阳市邓州市九龙镇5556666665</View>
+                    <View className='addresss-box-contents-texts' >{addresInfo}</View>
                     <View>》</View>
                   </View>
                 </View>

src/pages/index/tabs/Orders.jsx

@@ -1,18 +1,32 @@
 
 import { View, Image, Text } from "@tarojs/components"
-import Taro from '@tarojs/taro'
+import Taro, { useDidShow } from '@tarojs/taro'
 
 import ordersListImga from '@/assets/ordersImages/ordersListImga.png'
 import ordersLeft from '@/assets/ordersImages/ordersLeft.png'//订单装饰
-
+import { useEffect, useState } from "react"
+import { getOrder } from "@/services/order"
+import formatTimes from "@/utils/codeSegment"
 
 import './OrdersCss/style.less'
 
 
 export default (props) => {
 
-
-
+  const [ourderList, setOrderList] = useState([])
+  useDidShow(() => {
+    getOrder().then((e) => {
+      const { records } = e
+      setOrderList(records)
+    })
+  })
+  useEffect(() => {
+    getOrder().then((e) => {
+      const { records } = e
+      setOrderList(records)
+    })
+  }, [])
+  console.log(ourderList, 'ourderList');
 
   const orderStates = (item) => {
     switch (item) {
@@ -58,19 +72,11 @@ export default (props) => {
         }
     }
   }
-  const handleTobePaid = () => {
-    Taro.navigateTo({ url: '/pages/OrderInfo/index' })
+  const handleTobePaid = (id) => {
+    Taro.navigateTo({ url: `/pages/OrderInfo/index?orderId=${id}` })
   }
 
-  const orderListContent = [
-    { orderNumber: 'XJDF82521DA', cardsName: '联合收割机', cardNumber: '6', need: '2021-08-09', place: '2021-08-01', orderState: 0, feiyong: '360' },
-    { orderNumber: 'XJDF45244DA', cardsName: '不知道这是什么什么', cardNumber: '1', need: '2021-05-08', place: '2021-08-17', orderState: 1, feiyong: '78' },
-    { orderNumber: 'XJDF82521DA', cardsName: '为此发爱疸的箭的', cardNumber: '211', need: '2021-08-04', place: '2021-08-27', orderState: 2, feiyong: '35' },
-    { orderNumber: 'X78788821DA', cardsName: '水稻播种000015', cardNumber: '4', need: '2021-04-04', place: '2021-08-22', orderState: 3, feiyong: '170' },
-    { orderNumber: 'X44F77777DA', cardsName: '消费者协会', cardNumber: '5', need: '2021-02-11', place: '2021-08-10', orderState: 4, feiyong: '88' },
-    { orderNumber: 'XJ7857771DA', cardsName: '3·15', cardNumber: '1', need: '2021-01-09', place: '2021-08-10', orderState: 5, feiyong: '1.35' },
-    { orderNumber: 'X0000000001', cardsName: '农民伯伯', cardNumber: '2', need: '2027-08-29', place: '2021-08-17', orderState: 6, feiyong: '0.35' },
-  ]
+
 
   return (
     <scroll-view scrollY style='height: 100%;' >
@@ -82,19 +88,19 @@ export default (props) => {
         {/* <View className='content-header-box-orders-rightCentent'>更多&gt;&gt;</View> */}
       </View>
       {
-        orderListContent.map((item, index) => {
+        ourderList.map((item, index) => {
           return (
             <View key={index} className='orders-listBox'>
               <Image src={ordersLeft} />
               <View className='orders-listBox-RihtboxBoxOrderViewText'>
-                <View className='View-LiftTextTop' onClick={handleTobePaid} >订单编号：<Text>{item.orderNumber}</Text><Text className='View-LiftTextTop-nextText'>更多&gt;&gt;</Text></View>
-                <View>农机名称：<Text>{item.cardsName}</Text></View>
-                <View>需求数量：<Text>{item.cardNumber}</Text></View>
-                <View>需求时间：<Text>{item.need}</Text></View>
-                <View>下单时间：<Text>{item.place}</Text></View>
+                <View className='View-LiftTextTop' onClick={() => handleTobePaid(item.orderId)} >订单编号：<Text>{item.orderNo}</Text><Text className='View-LiftTextTop-nextText'>更多&gt;&gt;</Text></View>
+                <View>农机名称：<Text>{item.machineryName}</Text></View>
+                <View>作业面积：<Text>{item.amount}</Text></View>
+                <View>需求时间：<Text>{formatTimes(item.appointmentDate, 'yyyy-MM-dd hh:mm')}</Text></View>
+                <View>下单时间：<Text>{formatTimes(item.createDate, 'yyyy-MM-dd hh:mm')}</Text></View>
                 <View className='View-LiftTextBotton'>
-                  <View>订单状态：<Text style={{ color: orderStates(item.orderState).styleColor }} >{orderStates(item.orderState).title}</Text></View>
-                  <View>费用：<Text className='feiyongStyle'>{item.feiyong}</Text></View>
+                  <View>订单状态：<Text style={{ color: orderStates(item.payStatus).styleColor }} >{orderStates(item.orderState).title}</Text></View>
+                  <View>费用：<Text className='feiyongStyle'>{item.charges}</Text></View>
                 </View>
               </View>
             </View>

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

@@ -41,7 +41,7 @@
       padding-top: 0;
       &-nextText {
         position: relative;
-        left: 13vw;
+        left: 5vw;
         font-size: 32px;
         font-weight: 500;
         color: #666666;

src/pages/userInfo/index.jsx

@@ -40,7 +40,11 @@ export default (props) => {
           title: '保存成功',
           icon: 'none',
         })
-        Taro.navigateBack({ delta: 1 })
+        setTimeout(() => {
+          Taro.navigateBack({
+            delta: 1
+          })
+        }, 1500)
       }).catch((e) => {
         console.log(e)
         Taro.showToast({

src/routes.js

@@ -10,6 +10,10 @@ const Pages = [
     title: '订单详情',
     page: 'pages/OrderInfo/index',
   },
+  {
+    title: '订单确认页',
+    page: 'pages/OrderConfirmation/index',
+  },
   {
     title: '登陆页',
     page: 'pages/UserLogin/index',

src/services/mine.js

@@ -0,0 +1,9 @@
+
+import request from '@/utils/request'
+/**
+ * 意见反馈
+ * @param {*} data 
+ * @returns 
+ */
+export const feedback = (data) => request('/feedback', { data, method: 'post' })
+

src/services/order.js

@@ -0,0 +1,35 @@
+
+
+import request from '@/utils/request'
+
+
+
+/**
+ * 订单列表
+ * @param {*} data 
+ * @returns 
+ */
+export const getOrder = (data) => request(`/order`, { data, method: 'GET' })
+
+/**
+ * 生成订单
+ * @param {*} data 
+ * @returns 
+ */
+export const generateOrder = (data) => request(`/order`, { data, method: 'POST' })
+/**
+* 订单详情
+* @param {*} data 
+* @returns 
+*/
+export const orderInfo = (id, data) => request(`/order/${id}`, { data, method: 'GET' })
+/**
+ * 删除订单
+ * @param {*} data 
+ * @returns 
+ */
+export const orderDelete = (id, data) => request(`/order/${id}`, { data, method: 'DELETE' })
+
+
+
+

src/utils/codeSegment.js

@@ -18,3 +18,35 @@ export function getQueryString (params) {
 }
 
 
+
+
+
+function getDateByStr (dtStr) {
+  if (!dtStr) return undefined;
+
+  const t = dtStr.split(/[-T :]/);
+  return new Date(t[0], t[1] - 1, t[2], t[3] || 0, t[4] || 0, t[5] || 0)
+}
+
+export default function formatTimes (dt, fmt) {
+  if (!dt) return dt;
+
+  // 解决苹果手机不能正常初始化的问题
+  const date = typeof dt === 'string' ? getDateByStr(dt) : new Date(dt);
+
+  var o = {
+    "M+": date.getMonth() + 1, //月份
+    "d+": date.getDate(), //日
+    "h+": date.getHours(), //小时
+    "m+": date.getMinutes(), //分
+    "s+": date.getSeconds(), //秒
+    "q+": Math.floor((date.getMonth() + 3) / 3), //季度
+    "S": date.getMilliseconds() //毫秒
+  };
+  if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
+  for (var k in o)
+    if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+  return fmt;
+};
+
+