From 0f4ae76f61182c19fe6bf1d7e1c025a860ee5f82 Mon Sep 17 00:00:00 2001
From: tx <2622874537@qq.com>
Date: Thu, 17 Oct 2024 18:08:10 +0800
Subject: [PATCH] 11
---
common/http.interceptor.js | 4 +-
components/tab-bar/tab-bar.vue | 2 +-
page_user/user_order.vue | 70 +++++++++++++++-
pages/index/index.vue | 147 ++++++++++++++++++++++++++-------
pages/login/login.vue | 23 ++++--
pages/my.vue | 3 +
6 files changed, 206 insertions(+), 43 deletions(-)
diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index b05298d..994201b 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -7,9 +7,9 @@ const install = (Vue, vm) => {
// baseUrl: 'http://192.168.2.46:8080',
// baseUrl: 'https://che.chuangtewl.com/prod-api',
// 测试环境
- baseUrl: 'https://testzc.chuangtewl.com/prod-api',
+ baseUrl: 'https://zc.chuangtewl.com/prod-api',
// 俞山岛
- // baseUrl: 'http://192.168.2.228:8090',
+ // baseUrl: 'http://192.168.2.20:8090',
// baseUrl: 'http://47.120.68.19:8090',
// 创特
diff --git a/components/tab-bar/tab-bar.vue b/components/tab-bar/tab-bar.vue
index 7103638..25ffbe9 100644
--- a/components/tab-bar/tab-bar.vue
+++ b/components/tab-bar/tab-bar.vue
@@ -1,7 +1,7 @@
-
+
diff --git a/page_user/user_order.vue b/page_user/user_order.vue
index 9d51cb3..5bc9e8e 100644
--- a/page_user/user_order.vue
+++ b/page_user/user_order.vue
@@ -7,9 +7,16 @@
-
+
+ 已超时
+
+
{{typeReturn(orderInfo.status)}}
+
+
+ 已超时，请点击续租按钮进行续租
+
剩余支付时间：{{countdown}}
@@ -199,7 +206,30 @@
-
+
+
+ 配送信息
+
+
+
+ 配送状态： {{typeReturns(orderInfo.deliveryOrder.status).text}}
+
+
+
+
+
+ 配送人员： {{orderInfo.deliveryOrder.deliveryman?orderInfo.deliveryOrder.deliveryman:'--'}}
+
+
+
+
+
+
+ 联系电话： {{orderInfo.deliveryOrder.deliverymanPhone?orderInfo.deliveryOrder.deliverymanPhone:'--'}}
+
+
+
+
取消订单
@@ -245,6 +275,9 @@
重新下单
+
+
+
@@ -306,7 +339,7 @@
确认还车
-
+
确认用车
@@ -397,6 +430,35 @@
this.getOrderInfo()
},
methods: {
+ closeSub(){
+ this.showsub=false
+ },
+ typeReturns(num) {
+ console.log(num,'aaaaaaaaaaaa');
+ let result = {
+ text: '',
+ color: '#4297F3' // 默认颜色
+ };
+
+ if (num == 0) {
+ result.text = '待接单';
+ result.color = '#F14C4C'; // 待支付颜色
+ } else if (num == 1) {
+ result.text = '待配送';
+ result.color = '#F38C42'; // 超时取消颜色
+ } else if (num == 2) {
+ result.text = '配送中';
+ result.color = '#4297F3'; // 超时取消颜色
+ } else if (num == 3) {
+ result.text = '已完成';
+ result.color = '#000000'; // 超时取消颜色
+ } else if (num == 8) {
+ result.text = '已取消';
+ result.color = '#ccc'; // 超时取消颜色
+ }
+
+ return result;
+ },
back(){
uni.redirectTo({
url:'/pages/my'
@@ -1371,6 +1433,8 @@
}
}
+
+
.tab_box {
width: 696rpx;
margin: 0 auto;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f82d7e2..6cea87e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -113,7 +113,7 @@
-
+
@@ -150,11 +150,39 @@
dataIndex: 0,
dataInfo: {},
shopList: [],
- userInfo:{}
+ userInfo: {},
+ qParam:'',
+ sn:''
}
},
- onLoad() {
+ onLoad(e) {
+ console.log(e);
+ if (e.q) {
+ this.qParam = e.q
+ if (this.qParam != 'null' ) {
+ let qParam = this.qParam
+ console.log(qParam, 'qParamqParamqParam');
+ // 第2步: URL解码q参数
+ let decodedUrl = decodeURIComponent(qParam);
+
+ // 第3步: 使用正则表达式解析解码后的URL并提取查询参数
+ let sn = null;
+ let queryParams = decodedUrl.split('?')[1];
+ if (queryParams) {
+ let params = queryParams.split('&');
+ params.forEach(param => {
+ let [key, value] = param.split('=');
+ if (key === 'sn') {
+ sn = value;
+ }
+ });
+ }
+ this.sn = sn
+
+ }
+
+ }
this.getcityList()
this.getdata()
},
@@ -162,7 +190,12 @@
},
onShow() {
- this.getUserInfo()
+ if(this.userInfo.userId){
+
+ }else{
+ this.getUserInfo()
+ }
+
let that = this
uni.getLocation({
type: 'gcj02',
@@ -170,9 +203,10 @@
that.gps.latitude = lb.latitude;
that.gps.longitude = lb.longitude;
+ that.getshopList()
that.getCity()
that.getaddress()
- that.getshopList()
+
},
fail: function(error) {
uni.showToast({
@@ -201,47 +235,98 @@
},
methods: {
- getUserInfo(){
- this.$u.get("/getInfo").then((res) => {
- if(res.code==200){
- this.userInfo=res.user
- console.log(this.userInfo);
- }
-
-
- });
- },
- tomap(){
+ getsn(){
if(this.userInfo.userId){
- uni.navigateTo({
- url:'/page_user/mapSele?index='+this.dataIndex
- })
+ let data = {
+ sn: this.sn
+ }
+ this.$u.get(`appVerify/getInProgressOrder?`, data).then((res) => {
+ if (res.code == 200) {
+ // if(res.data.)
+ // this.getstoreInfo()
+ if(res.data){
+ uni.navigateTo({
+ url:'/pages_device/carInfo?sn='+this.sn
+ })
+ }else{
+ this.$u.get('app/getDeviceBySn?sn=' + this.sn).then((res) => {
+ console.log(res, 'rererer');
+ if (res.code === 200) {
+ // console.log(this.areaId,);
+ uni.redirectTo({
+ url:'/page_user/ordder?storeId='+res.data.storeId+'&modelId='+res.data.modelId
+ })
+
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ });
+ }
+ })
+ }
+
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ });
+ }
+ });
}else{
uni.navigateTo({
- url:'/pages/login/login'
+ url:'/pages/login/login?qParam='+this.qParam
})
}
- console.log(this.dataInfo,'dataInfo');
+ },
+ getUserInfo() {
+ this.$u.get("/getInfo").then((res) => {
+ if (res.code == 200) {
+ this.userInfo = res.user
+
+
+
+ }
+ if(this.sn!=''){
+ this.getsn()
+ }
+
+ });
+ },
+ tomap() {
+ if (this.userInfo.userId) {
+ uni.navigateTo({
+ url: '/page_user/mapSele?index=' + this.dataIndex
+ })
+ } else {
+ uni.navigateTo({
+ url: '/pages/login/login'
+ })
+ }
+ console.log(this.dataInfo, 'dataInfo');
+
// this.dataInfo = item
// this.dataIndex = index
},
- toTips(){
+ toTips() {
uni.navigateTo({
- url:'/page_user/tips'
+ url: '/page_user/tips'
})
},
toStore(item) {
- if(this.userInfo.userId){
+ if (this.userInfo.userId) {
uni.navigateTo({
url: '/page_user/carStore?storeId=' + item.storeId
})
- }else{
+ } else {
uni.navigateTo({
- url:'/pages/login/login'
+ url: '/pages/login/login'
})
}
-
+
},
getshopList() {
let data = {
@@ -381,16 +466,16 @@
});
},
tosele() {
- if(this.userInfo.userId){
+ if (this.userInfo.userId) {
uni.navigateTo({
url: '/page_user/carSelection'
})
- }else{
+ } else {
uni.navigateTo({
- url:'/pages/login/login'
+ url: '/pages/login/login'
})
}
-
+
},
diff --git a/pages/login/login.vue b/pages/login/login.vue
index fbd3af1..0543785 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -245,10 +245,14 @@
codeButtonText2: '获取验证码',
countdown2: 60,
openCode:null,
+ qParam:''
}
},
- onLoad() {
-
+ onLoad(e) {
+ if(e.qParam){
+ this.qParam=e.qParam
+ }
+ console.log(e);
},
computed: {
codeButtonStyle() {
@@ -641,11 +645,18 @@
this.$u.get("/getInfo").then((res) => {
console.log('进入跳转',res);
if(res.user.isAuthentication){
- uni.navigateTo({
- url: '/pages/index/index'
- })
+ if(this.qParam!=''){
+ uni.redirectTo({
+ url: '/pages/index/index?q='+this.qParam
+ })
+ }else{
+ uni.redirectTo({
+ url: '/pages/index/index'
+ })
+ }
+
}else{
- uni.navigateTo({
+ uni.redirectTo({
url:"/page_user/idcard_test"
})
}
diff --git a/pages/my.vue b/pages/my.vue
index d412fd0..912a790 100644
--- a/pages/my.vue
+++ b/pages/my.vue
@@ -29,6 +29,9 @@
{{ typeReturn(item.status).text }}
+
+ 已超时
+
取车方式：自行前往门店