From 82af85eae92790fc125ca42d1a800046fe0bd916 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 29 三月 2023 14:00:08 +0800
Subject: [PATCH] 登录页修改
---
pages/public-page/forward/forward.vue | 35 +++++++-
api/publicInterface.js | 4
pages/login/userPassword.vue | 4
/dev/null | 0
api/request.js | 8 +-
pages.json | 142 ++++++++++++++++++++++-------------
pages/tabbar-page/index-tabbar/index-tabbar.vue | 8 +
pages/driver-page/driver-index/driver-index.vue | 8 +
8 files changed, 135 insertions(+), 74 deletions(-)
diff --git a/api/publicInterface.js b/api/publicInterface.js
index 2458ce4..5154bc8 100644
--- a/api/publicInterface.js
+++ b/api/publicInterface.js
@@ -5,9 +5,9 @@
import {
BaseUrl as wrBaseUrl
} from '@/api/request.js'
-const BaseUrl = "http://hesuancj.cn:9999"
+// const BaseUrl = "http://hesuancj.cn:9999"
// const BaseUrl = "https://hesuancj.cn:9095"
-// const BaseUrl = "http://10.101.33.114:9999"
+const BaseUrl = "http://192.168.3.119:9999"
// 鐧诲綍
// function apiLogin({
diff --git a/api/request.js b/api/request.js
index 8e8f968..4e20f01 100644
--- a/api/request.js
+++ b/api/request.js
@@ -79,16 +79,16 @@
}
// const BaseUrl = "http://192.168.0.120:9997"
-// const webSocketUrl = "ws://192.168.0.120:9997/wrzs/ws/info"
+const webSocketUrl = "ws://192.168.3.119:9997/wrzs/ws/info"
-// const BaseUrl = "http://192.168.3.119:9997";
+const BaseUrl = "http://192.168.3.119:9997";
// const BaseUrl = "http://192.168.0.144:9997";
-const BaseUrl = "http://hesuancj.cn:9997";
+// const BaseUrl = "http://hesuancj.cn:9997";
// 绾夸笂
// const BaseUrl = "https://hesuancj.cn:9095";
// const webSocketUrl = "ws://hesuancj.cn:9095/wrzs/ws/info"
-const webSocketUrl = "ws://hesuancj.cn:9997/wrzs/ws/info"
+// const webSocketUrl = "ws://hesuancj.cn:9997/wrzs/ws/info"
// 璇锋眰鎷︽埅
const fetch = (url, opt) => {
// 鏌ユ壘瀵瑰簲鍦板潃
diff --git a/pages.json b/pages.json
index f8eb57f..c56e227 100644
--- a/pages.json
+++ b/pages.json
@@ -77,15 +77,14 @@
"navigationBarTitleText": "鎴戠殑",
"enablePullDownRefresh": false
}
-
- }, {
- "path": "pages/customer-page/fleet-management/fleet-management",
- "style": {
- "navigationBarTitleText": "杞﹂槦",
- "enablePullDownRefresh": false
- }
-
},
+ // {
+ // "path": "pages/customer-page/fleet-management/fleet-management",
+ // "style": {
+ // "navigationBarTitleText": "杞﹂槦",
+ // "enablePullDownRefresh": false
+ // }
+ // },
{
"path": "pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details",
"style": {
@@ -93,21 +92,21 @@
"enablePullDownRefresh": false
}
},
- {
- "path": "pages/customer-page/freight-forwarder-details/freight-forwarder-details",
- "style": {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
+ // {
+ // "path": "pages/customer-page/freight-forwarder-details/freight-forwarder-details",
+ // "style": {
+ // "navigationBarTitleText": "",
+ // "enablePullDownRefresh": false
+ // }
- }, {
- "path": "pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver",
- "style": {
- "navigationBarTitleText": "娣诲姞",
- "enablePullDownRefresh": false
- }
-
- },
+ // },
+ // {
+ // "path": "pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver",
+ // "style": {
+ // "navigationBarTitleText": "娣诲姞",
+ // "enablePullDownRefresh": false
+ // }
+ // },
// {
// "path": "pages/public-page/forward/forward",
// "style": {
@@ -129,7 +128,6 @@
"navigationBarTitleText": "鍙戣繍璁″垝璇︽儏",
"enablePullDownRefresh": false
}
-
},
{
"path": "pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill",
@@ -172,33 +170,64 @@
}
],
"subPackages": [{
- "root": "pages/register",
- "pages": [{
- "path": "register",
- "style": {
- "navigationBarTitleText": "娉ㄥ唽",
- "enablePullDownRefresh": false
- }
- }]
- }, {
- "root": "pages/public-page",
- "pages": [{
- "path": "forward/forward",
- "style": {
- "navigationBarTitleText": "杞彂",
- "enablePullDownRefresh": false
- }
- }]
- }, {
- "root": "pages/driver-page/appointment",
- "pages": [{
- "path": "appointment",
- "style": {
- "navigationBarTitleText": "鏃舵",
- "enablePullDownRefresh": false
- }
- }]
- }],
+ "root": "pages/register",
+ "pages": [{
+ "path": "register",
+ "style": {
+ "navigationBarTitleText": "娉ㄥ唽",
+ "enablePullDownRefresh": false
+ }
+ }]
+ }, {
+ "root": "pages/public-page",
+ "pages": [{
+ "path": "forward/forward",
+ "style": {
+ "navigationBarTitleText": "杞彂",
+ "enablePullDownRefresh": false
+ }
+ }]
+ }, {
+ "root": "pages/driver-page/appointment",
+ "pages": [{
+ "path": "appointment",
+ "style": {
+ "navigationBarTitleText": "鏃舵",
+ "enablePullDownRefresh": false
+ }
+ }]
+ },
+ {
+ "root": "pages/customer-page/fleet-management",
+ "pages": [{
+ "path": "fleet-management",
+ "style": {
+ "navigationBarTitleText": "杞﹂槦",
+ "enablePullDownRefresh": false
+ }
+ }]
+ },
+ {
+ "root": "pages/customer-page/addTo-freightForwarder-driver",
+ "pages": [{
+ "path": "addTo-freightForwarder-driver",
+ "style": {
+ "navigationBarTitleText": "娣诲姞",
+ "enablePullDownRefresh": false
+ }
+ }]
+ },
+ {
+ "root": "pages/customer-page/freight-forwarder-details",
+ "pages": [{
+ "path": "freight-forwarder-details",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+ }]
+ }
+ ],
"preloadRule": {
"pages/login/login": {
"network": "all",
@@ -206,12 +235,19 @@
},
"pages/tabbar-page/index-tabbar/index-tabbar": {
"network": "all",
- "packages": ["pages/public-page"]
+ "packages": ["pages/public-page", "pages/driver-page/appointment",
+ "pages/customer-page/freight-forwarder-details"
+ ]
},
- "pages/tabbar-page/index-tabbar/index-tabbar": {
+ "pages/tabbar-page/myPage-tabbar/myPage-tabbar": {
"network": "all",
- "packages": ["pages/driver-page/appointment"]
+ "packages": ["pages/customer-page/fleet-management"]
}
+
+ // "pages/tabbar-page/index-tabbar/index-tabbar": {
+ // "network": "all",
+ // "packages": []
+ // }
},
"tabBar": {
// "color": "#999794",
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 5d0d623..6b386d3 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -132,13 +132,14 @@
export default {
props: {
indexdriverBillOfLoadingData: {
- type: Array,
- default: []
+ type: Object,
+ default: {}
}
},
watch: {
indexdriverBillOfLoadingData: {
handler(v) {
+ console.log(v, '鍒锋柊涔嬪悗鐨勫徃鏈洪椤�');
this.driverBillOfLoadingData = v;
},
deep: true,
@@ -147,7 +148,7 @@
},
data() {
return {
- driverBillOfLoadingData: [],
+ driverBillOfLoadingData: {},
// 鎶㈠崟妯℃�佹
qiangDanShow: false,
qiangDanTitle: '鎶㈠崟鎻愮ず',
@@ -169,6 +170,7 @@
title: '鍔犺浇涓�...'
});
this.$reqGet('qiangDanList').then(res => {
+ console.log(res, '鍙告満棣栭〉');
uni.hideLoading();
this.driverBillOfLoadingData = res.data;
});
diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue
index 5fb6074..01bd995 100644
--- a/pages/login/userPassword.vue
+++ b/pages/login/userPassword.vue
@@ -43,10 +43,10 @@
},
data() {
return {
- username: '12222222222', // 瀹㈡埛
+ username: '', // 瀹㈡埛
// username:'13333333331',//璐т唬
// username: '13333333332',// 鍙告満
- password: '123456',
+ password: '',
remember: true,
baseUrl: ''
};
diff --git a/pages/public-page/forward/forward.vue b/pages/public-page/forward/forward.vue
index e98e380..e57f01f 100644
--- a/pages/public-page/forward/forward.vue
+++ b/pages/public-page/forward/forward.vue
@@ -69,12 +69,24 @@
}
this.orderPlanId = params.orderPlanId;
this.$reqGet('forwardList', { OrderPlanId: params.orderPlanId }).then(res => {
- if (res.data.length !== 0) {
+ if (res.data.length !== 0 && this.roleType == 1) {
this.jhOrderPlanForwardList = res.data.map(item => {
return {
id: item.id,
orderPlanId: item.orderPlanId,
name: item.xsUserName === null ? item.fleetName : item.xsUserName,
+ carNum: item.carNum,
+ xsUserId: item.xsUserId === null ? 0 : item.xsUserId,
+ fleetId: item.fleetId === null ? 0 : item.fleetId,
+ checkboxValue1: ''
+ };
+ });
+ } else if (res.data.length !== 0 && this.roleType == 2) {
+ this.jhOrderPlanForwardList = res.data.map(item => {
+ return {
+ id: item.id,
+ orderPlanId: item.orderPlanId,
+ name: item.fleetName,
carNum: item.carNum,
xsUserId: item.xsUserId === null ? 0 : item.xsUserId,
fleetId: item.fleetId === null ? 0 : item.fleetId,
@@ -226,15 +238,19 @@
},
// 鍒犻櫎涓�缁勮〃鍗�
deleteGroup(index, v) {
- if (v.id) {
+ let tempcarNum = v.carNum;
+ if (v.id && this.jhOrderPlanForwardList[index].carNum !== tempcarNum) {
this.$reqPost('deleteForward', { id: v.id }, 'params').then(res => {
if (res.code === 0) {
this.jhOrderPlanForwardList.splice(index, 1);
this.$u.toast('鍒犻櫎鎴愬姛');
+ } else if (res.code === 1) {
+ this.$u.toast(res.msg);
}
});
} else {
this.jhOrderPlanForwardList.splice(index, 1);
+ this.$u.toast('鍒犻櫎鎴愬姛');
}
},
// 鎻愪氦
@@ -245,22 +261,27 @@
this.$u.toast('璇疯緭鍏ュ悎娉曟暟瀛�');
isPass = false;
return isPass;
- } else if (Number(v.carNum) > Number(this.forwardSurplus)) {
- this.$u.toast('瓒呰繃鏈�澶ц鍗曞墿浣欓噺');
- isPass = false;
- return isPass;
- } else {
+ }
+ // else if (Number(v.carNum) > Number(this.forwardSurplus)) {
+ // this.$u.toast('瓒呰繃鏈�澶ц鍗曞墿浣欓噺');
+ // isPass = false;
+ // return isPass;
+ // }
+ else {
isPass = true;
return isPass;
}
});
if (isPass) {
this.$reqPost('forward', this.jhOrderPlanForwardList, 'json').then(res => {
+ console.log(res, 'zh');
if (res.code == 0) {
this.$u.toast('鎻愪氦鎴愬姛');
setTimeout(() => {
uni.navigateBack({ delta: 1 });
}, 1000);
+ } else {
+ this.$u.toast(res.msg);
}
});
}
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index fa520ac..9a4b61a 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -40,16 +40,18 @@
} else if (this.roleType == 2) {
this.$reqGet('huoDaiList').then(res => {
this.indexHuoDaiOrderPlanData = res.data;
+ uni.hideLoading();
+ uni.stopPullDownRefresh();
});
// 鑾峰彇鍘嗗彶鎻愮叅鍗�
this.$reqGet('getJhOrderPlanDataPage', { current: 1, size: 10 }).then(res => {
if (res.data.records) {
- this.indexHistoryCoalData = [...this.historyCoalData, ...res.data.records];
+ this.indexHistoryCoalData = res.data.records;
uni.hideLoading();
uni.stopPullDownRefresh();
}
});
- } else {
+ } else if (this.roleType == 3) {
this.$reqGet('qiangDanList').then(res => {
this.indexdriverBillOfLoadingData = res.data;
uni.hideLoading();
@@ -80,7 +82,7 @@
orderPlanDataStore: [],
indexHuoDaiOrderPlanData: [],
indexHistoryCoalData: [],
- indexdriverBillOfLoadingData: []
+ indexdriverBillOfLoadingData: {}
};
},
onShow() {
diff --git a/static/image/coalBackgroud/https___ibaotu.com_sucai_1068915.html.png b/static/image/coalBackgroud/https___ibaotu.com_sucai_1068915.html.png
deleted file mode 100644
index 0f76c8c..0000000
--- a/static/image/coalBackgroud/https___ibaotu.com_sucai_1068915.html.png
+++ /dev/null
Binary files differ
diff --git a/static/image/coalBackgroud/https___ibaotu.com_sucai_1080418.html.png b/static/image/coalBackgroud/https___ibaotu.com_sucai_1080418.html.png
deleted file mode 100644
index a50f97b..0000000
--- a/static/image/coalBackgroud/https___ibaotu.com_sucai_1080418.html.png
+++ /dev/null
Binary files differ
diff --git a/static/image/coalBackgroud/https___ibaotu.com_sucai_19865761.html_clickFrom=recommendation.png b/static/image/coalBackgroud/https___ibaotu.com_sucai_19865761.html_clickFrom=recommendation.png
deleted file mode 100644
index 028ebef..0000000
--- a/static/image/coalBackgroud/https___ibaotu.com_sucai_19865761.html_clickFrom=recommendation.png
+++ /dev/null
Binary files differ
--
Gitblit v1.9.1