master
王文杰 7 months ago
parent e8178b7ad9
commit 812ba8adb8

@ -259,7 +259,7 @@ getSettingInfo()
<view class="item" v-for="item in orderList" :key="item.id">
<!-- 订单信息 -->
<view class="hd">
<text class="locationNum">距离{{ item.distance }}千米</text>
<text class="locationNum">距离{{ item.distance2 }}千米</text>
<view class="button" v-if="props.orderState == 'PENDING'" @tap="onOrderAccept(item)"
>接单</view
>
@ -275,7 +275,7 @@ getSettingInfo()
<view class="icon">
<uni-icons type="location" color="#3775F6" size="20"></uni-icons>
</view>
<view class="text ellipsis">{{ item.recycleAddress }}</view>
<view class="text ellipsis">{{ item.addressInfo?.receiveStreet }} {{ item.addressInfo?.receiveHouseNumber }}</view>
</view>
<view class="meta-item">
<view class="icon">

@ -65,7 +65,7 @@ const getMemberOrderByIdData = async (orderId) => {
</view>
<view class="item">
<view class="label">取件地址</view>
<view class="val">{{ order.recycleAddress }}</view>
<view class="val">{{ order.addressInfo?.receiveStreet }} {{ order.addressInfo?.receiveHouseNumber }}</view>
</view>
<view class="item">
<view class="label">下单时间</view>
@ -176,7 +176,7 @@ page {
.label {
font-size: 28rpx;
color: #3D3D3D;
width: 120rpx;
width: 160rpx;
}
.val {
font-size: 28rpx;

@ -96,7 +96,7 @@ const onRefresherrefresh = async () => {
<view class="icon">
<uni-icons type="location" color="#3775F6" size="20"></uni-icons>
</view>
<view class="text ellipsis">{{ item.recycleAddress }}</view>
<view class="text ellipsis">{{ item.addressInfo?.receiveStreet }} {{ item.addressInfo?.receiveHouseNumber }}</view>
</view>
<view class="meta-item">
<view class="icon">

@ -59,7 +59,7 @@ const getLocationInfo = () => {
})
uni.setStorageSync('location', location)
tMap.direction({
mode: 'walking',
mode: 'driving',
from: {
longitude: res.longitude,
latitude: res.latitude,
@ -91,8 +91,12 @@ const getLocationInfo = () => {
width: 4,
},
]
//
orderDetailPopup?.value?.open()
},
fail(error) {
console.log('error', error)
},
})
},
fail(err) {
@ -140,6 +144,7 @@ const getOrderByIdData = async (orderId) => {
data.categoryStr = categoryArr.join('、')
order.value = data
// 线
getLocationInfo()
isLoading.value = false
}
@ -302,7 +307,7 @@ const handleDetailPopupClose = () => {
<view class="icon">
<uni-icons type="location" color="#3775F6" size="20"></uni-icons>
</view>
<view class="val ellipsis"> {{ order.recycleAddress }} </view>
<view class="val ellipsis"> {{ order.addressInfo?.receiveStreet }} {{ order.addressInfo?.receiveHouseNumber }} </view>
</view>
<view class="item">
<view class="icon">
@ -336,7 +341,7 @@ const handleDetailPopupClose = () => {
</view> -->
<view class="remark">
<view class="label">距离</view>
<view class="val">{{ order.distance }}千米</view>
<view class="val">{{ order.distance2 }}千米</view>
</view>
<view class="remark">
<view class="label">回收内容</view>

@ -2,7 +2,7 @@
* @Author:
* @Date: 2024-01-04 12:54:56
* @LastEditors:
* @LastEditTime: 2024-03-15 18:09:23
* @LastEditTime: 2024-03-17 11:23:40
* @FilePath: /app-nx-recycle/src/services/constants.ts
* @Description: ,`customMade`, koroFileHeader : https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@ -32,7 +32,8 @@ export const orderStateList = [
{ id: 6, text: '已取消' },
]
// 文件路径
export const fileDomain = 'https://nxhs.cjyx.cc'
// export const fileDomain = 'https://nxhs.cjyx.cc'
export const fileDomain = 'http://222.71.165.188:8808'
export const storage_userInfo = {
userType: {

@ -1,8 +1,8 @@
/*
* @Author:
* @Date: 2024-01-04 12:54:56
* @LastEditors:
* @LastEditTime: 2024-03-15 18:09:18
* @LastEditors:
* @LastEditTime: 2024-03-17 11:23:50
* @FilePath: /app-nx-recycle/src/utils/http.ts
* @Description: ,`customMade`, koroFileHeader : https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@ -18,8 +18,8 @@
* 4. token
*/
import { useMemberStore } from '@/stores'
// const baseURL = 'http://192.168.0.166:8808/api'
const baseURL = 'https://nxhs.cjyx.cc/api'
const baseURL = 'http://222.71.165.188:8808/api'
// const baseURL = 'https://nxhs.cjyx.cc/api'
// 添加拦截器
const httpInterceptor = {
// 拦截前触发

Loading…
Cancel
Save