From 5c01be6370291febe52adfa74fad8101a197c388 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 28 三月 2023 18:27:19 +0800
Subject: [PATCH] 微信绑定测试
---
pages/login/userPassword.vue | 27 ++++--
manifest.json | 5 +
pages.json | 112 +++++++++++++++++++++------
pages/tabbar-page/index-tabbar/index-tabbar.vue | 46 +++++++++--
pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue | 27 ++++++
pages/driver-page/driver-index/driver-index.vue | 15 +++
6 files changed, 187 insertions(+), 45 deletions(-)
diff --git a/manifest.json b/manifest.json
index f2ef2b6..9d4cb6c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -56,6 +56,9 @@
"desc": "浣犵殑浣嶇疆淇℃伅灏嗙敤浜庡皬绋嬪簭浣嶇疆鎺ュ彛鐨勬晥鏋滃睍绀�"
}
},
+ "optimization": {
+ "subPackages": true
+ },
"requiredPrivateInfos": [
"getFuzzyLocation"
],
@@ -80,4 +83,4 @@
"enable": false
},
"vueVersion": "2"
-}
\ No newline at end of file
+}
diff --git a/pages.json b/pages.json
index b3d3053..f8eb57f 100644
--- a/pages.json
+++ b/pages.json
@@ -14,13 +14,13 @@
// "enablePullDownRefresh": false
// }
// },
- {
- "path": "pages/register/register",
- "style": {
- "navigationBarTitleText": "娉ㄥ唽",
- "enablePullDownRefresh": false
- }
- },
+ // {
+ // "path": "pages/register/register",
+ // "style": {
+ // "navigationBarTitleText": "娉ㄥ唽",
+ // "enablePullDownRefresh": false
+ // }
+ // },
{
"path": "pages/tabbar-page/index-tabbar/index-tabbar",
"style": {
@@ -85,14 +85,15 @@
"enablePullDownRefresh": false
}
- }, {
+ },
+ {
"path": "pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details",
"style": {
"navigationBarTitleText": "鎻愮叅鍗曡鎯�",
"enablePullDownRefresh": false
}
-
- }, {
+ },
+ {
"path": "pages/customer-page/freight-forwarder-details/freight-forwarder-details",
"style": {
"navigationBarTitleText": "",
@@ -106,55 +107,112 @@
"enablePullDownRefresh": false
}
- }, {
- "path": "pages/public-page/forward/forward",
- "style": {
- "navigationBarTitleText": "杞彂",
- "enablePullDownRefresh": false
- }
- }, {
- "path": "pages/driver-page/appointment/appointment",
- "style": {
- "navigationBarTitleText": "鏃舵",
- "enablePullDownRefresh": false
- }
+ },
+ // {
+ // "path": "pages/public-page/forward/forward",
+ // "style": {
+ // "navigationBarTitleText": "杞彂",
+ // "enablePullDownRefresh": false
+ // }
+ // },
+ // {
+ // "path": "pages/driver-page/appointment/appointment",
+ // "style": {
+ // "navigationBarTitleText": "鏃舵",
+ // "enablePullDownRefresh": false
+ // }
- }, {
+ // },
+ {
"path": "pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails",
"style": {
"navigationBarTitleText": "鍙戣繍璁″垝璇︽儏",
"enablePullDownRefresh": false
}
- }, {
+ },
+ {
"path": "pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill",
"style": {
"navigationBarTitleText": "鎻愮叅鍗�",
"enablePullDownRefresh": false
}
- }, {
+ },
+ {
"path": "pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice",
"style": {
"navigationBarTitleText": "绉伴噸",
"enablePullDownRefresh": false
}
- }, {
+ },
+ {
"path": "pages/login/wxLogin",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
- }, {
+ },
+ {
"path": "pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock",
"style": {
"navigationBarTitleText": "鐭垮満绛惧埌",
"enablePullDownRefresh": false
}
+ },
+ {
+ "path": "pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore",
+ "style": {
+ "navigationBarTitleText": "鏇村",
+ "enablePullDownRefresh": false
+ }
+
}
],
+ "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
+ }
+ }]
+ }],
+ "preloadRule": {
+ "pages/login/login": {
+ "network": "all",
+ "packages": ["pages/register"]
+ },
+ "pages/tabbar-page/index-tabbar/index-tabbar": {
+ "network": "all",
+ "packages": ["pages/public-page"]
+ },
+ "pages/tabbar-page/index-tabbar/index-tabbar": {
+ "network": "all",
+ "packages": ["pages/driver-page/appointment"]
+ }
+ },
"tabBar": {
// "color": "#999794",
// "selectedColor": "#007AFF",
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index d8a4eba..5d0d623 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -130,6 +130,21 @@
import { customerId } from '@/utils/status';
export default {
+ props: {
+ indexdriverBillOfLoadingData: {
+ type: Array,
+ default: []
+ }
+ },
+ watch: {
+ indexdriverBillOfLoadingData: {
+ handler(v) {
+ this.driverBillOfLoadingData = v;
+ },
+ deep: true,
+ immediate: true
+ }
+ },
data() {
return {
driverBillOfLoadingData: [],
diff --git a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
index 37f7a57..c49a730 100644
--- a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
+++ b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
@@ -61,6 +61,32 @@
<script>
import combinedTitle from '@/components/combined-title/combined-title.vue';
export default {
+ props: {
+ indexHistoryCoalData: {
+ type: Array,
+ default: []
+ },
+ indexHuoDaiOrderPlanData: {
+ type: Array,
+ default: []
+ }
+ },
+ watch: {
+ indexHistoryCoalData: {
+ handler(v) {
+ this.historyCoalData = v;
+ },
+ deep: true,
+ immediate: true
+ },
+ indexHuoDaiOrderPlanData: {
+ handler(v) {
+ this.orderPlanData = v;
+ },
+ deep: true,
+ immediate: true
+ }
+ },
components: {
combinedTitle
},
@@ -90,6 +116,7 @@
}
},
methods: {
+ // 鑾峰彇鍘嗗彶鎻愮叅鍗�
getJhOrderPlanDataPage() {
this.loading = true;
this.$reqGet('getJhOrderPlanDataPage', { current: this.pageCurrent, size: this.pageSize }).then(res => {
diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue
index e71f036..5fb6074 100644
--- a/pages/login/userPassword.vue
+++ b/pages/login/userPassword.vue
@@ -107,17 +107,26 @@
this.$u.toast(res.msg);
}
} else {
- this.$reqPost('wxBind', { state: 'MINI', code: uni.getStorageSync('code') }, 'params').then(res => {
- uni.hideLoading();
- if (res.code == 0) {
- this.$u.toast('缁戝畾鎴愬姛锛佸嵆灏嗗洖鍒扮櫥褰曢〉锛�');
- setTimeout(() => {
- uni.navigateBack();
- }, 1000);
- } else {
- this.$u.toast(res.msg ? res.msg : '缁戝畾澶辫触');
+ uni.login({
+ success: res => {
+ if (res.code) {
+ uni.setStorageSync('bindcode', res.code);
+ }
}
});
+ if (uni.getStorageSync('bindcode')) {
+ this.$reqPost('wxBind', { state: 'MINI', code: uni.getStorageSync('bindcode') }, 'params').then(res => {
+ uni.hideLoading();
+ if (res.code == 0) {
+ this.$u.toast('缁戝畾鎴愬姛锛佸嵆灏嗗洖鍒扮櫥褰曢〉锛�');
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 1000);
+ } else {
+ this.$u.toast(res.msg ? res.msg : '缁戝畾澶辫触');
+ }
+ });
+ }
}
})
.catch(e => {
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index 5d9d6d6..fa520ac 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -1,8 +1,13 @@
<template>
<view>
<customer-index v-if="roleType == 1" ref="customerIndexRef" :orderPlanDataStore="orderPlanDataStore"></customer-index>
- <freight-forwarder-index v-if="roleType == 2" ref="freightForwarderIndexRef"></freight-forwarder-index>
- <driver-index v-if="roleType == 3" ref="driverIndexRef"></driver-index>
+ <freight-forwarder-index
+ v-if="roleType == 2"
+ ref="freightForwarderIndexRef"
+ :indexHistoryCoalData="indexHistoryCoalData"
+ :indexHuoDaiOrderPlanData="indexHuoDaiOrderPlanData"
+ ></freight-forwarder-index>
+ <driver-index v-if="roleType == 3" ref="driverIndexRef" :indexdriverBillOfLoadingData="indexdriverBillOfLoadingData"></driver-index>
<tab-bar :current="0"></tab-bar>
</view>
</template>
@@ -18,17 +23,39 @@
driverIndex,
freightForwarderIndex
},
+ //棣栭〉涓嬫媺鍒锋柊
onPullDownRefresh() {
uni.showLoading({
title: '鍔犺浇涓�...'
});
- this.$reqGet('GetOrderPlan').then(res => {
- if (res.data) {
- this.orderPlanDataStore = res.data;
+ // 瀹㈡埛鑾峰彇鏃ヨ鍒�
+ if (this.roleType == 1) {
+ this.$reqGet('GetOrderPlan').then(res => {
+ if (res.data) {
+ this.orderPlanDataStore = res.data;
+ uni.hideLoading();
+ uni.stopPullDownRefresh();
+ }
+ });
+ } else if (this.roleType == 2) {
+ this.$reqGet('huoDaiList').then(res => {
+ this.indexHuoDaiOrderPlanData = res.data;
+ });
+ // 鑾峰彇鍘嗗彶鎻愮叅鍗�
+ this.$reqGet('getJhOrderPlanDataPage', { current: 1, size: 10 }).then(res => {
+ if (res.data.records) {
+ this.indexHistoryCoalData = [...this.historyCoalData, ...res.data.records];
+ uni.hideLoading();
+ uni.stopPullDownRefresh();
+ }
+ });
+ } else {
+ this.$reqGet('qiangDanList').then(res => {
+ this.indexdriverBillOfLoadingData = res.data;
uni.hideLoading();
uni.stopPullDownRefresh();
- }
- });
+ });
+ }
},
onLoad() {
// 寮�鍚弻浜洪�氳瘽
@@ -50,7 +77,10 @@
data() {
return {
roleType: null,
- orderPlanDataStore: []
+ orderPlanDataStore: [],
+ indexHuoDaiOrderPlanData: [],
+ indexHistoryCoalData: [],
+ indexdriverBillOfLoadingData: []
};
},
onShow() {
--
Gitblit v1.9.1