From 82af85eae92790fc125ca42d1a800046fe0bd916 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 29 三月 2023 14:00:08 +0800
Subject: [PATCH] 登录页修改
---
pages/tabbar-page/index-tabbar/index-tabbar.vue | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 105 insertions(+), 6 deletions(-)
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index aa4986c..9a4b61a 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"></customer-index>
- <freight-forwarder-index v-if="roleType == 2" ref="freightForwarderIndexRef"></freight-forwarder-index>
- <driver-index v-if="roleType == 3" ref="driverIndexRef"></driver-index>
+ <customer-index v-if="roleType == 1" ref="customerIndexRef" :orderPlanDataStore="orderPlanDataStore"></customer-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>
@@ -11,25 +16,82 @@
import customerIndex from '@/pages/customer-page/customer-index/customer-index.vue';
import driverIndex from '@/pages/driver-page/driver-index/driver-index.vue';
import freightForwarderIndex from '@/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue';
-
+import { mapState } from 'vuex';
export default {
components: {
customerIndex,
driverIndex,
freightForwarderIndex
},
+ //棣栭〉涓嬫媺鍒锋柊
+ onPullDownRefresh() {
+ uni.showLoading({
+ title: '鍔犺浇涓�...'
+ });
+ // 瀹㈡埛鑾峰彇鏃ヨ鍒�
+ 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;
+ uni.hideLoading();
+ uni.stopPullDownRefresh();
+ });
+ // 鑾峰彇鍘嗗彶鎻愮叅鍗�
+ this.$reqGet('getJhOrderPlanDataPage', { current: 1, size: 10 }).then(res => {
+ if (res.data.records) {
+ this.indexHistoryCoalData = res.data.records;
+ uni.hideLoading();
+ uni.stopPullDownRefresh();
+ }
+ });
+ } else if (this.roleType == 3) {
+ this.$reqGet('qiangDanList').then(res => {
+ this.indexdriverBillOfLoadingData = res.data;
+ uni.hideLoading();
+ uni.stopPullDownRefresh();
+ });
+ }
+ },
+ onLoad() {
+ // 寮�鍚弻浜洪�氳瘽
+ wx.setEnable1v1Chat({
+ enable: true,
+ backgroundType: 1,
+ minWindowType: 2,
+ success() {
+ console.log('寮�鍚弻浜洪�氳瘽鎴愬姛');
+ },
+ fail() {
+ console.log('寮�鍚弻浜洪�氳瘽澶辫触');
+ },
+ complete() {
+ console.log('寮�鍚弻浜洪�氳瘽鎴愬姛Complete');
+ }
+ });
+ },
data() {
return {
- roleType: null
+ roleType: null,
+ orderPlanDataStore: [],
+ indexHuoDaiOrderPlanData: [],
+ indexHistoryCoalData: [],
+ indexdriverBillOfLoadingData: {}
};
},
onShow() {
this.init();
+ this.userAuthorization();
},
methods: {
init() {
this.roleType = uni.getStorageSync('roleType');
- console.log(this.roleType, 'indexTabbar');
switch (this.roleType) {
case 1:
console.log('customerIndexRef');
@@ -52,6 +114,43 @@
default:
break;
}
+ },
+ // 瑕佹眰鐢ㄦ埛鎺堟潈鐩告満/楹﹀厠椋庢潈闄�
+ userAuthorization() {
+ wx.getSetting({
+ success(res) {
+ // wx.startRecord();
+ console.log('success');
+ if (!res.authSetting['scope.record'] || !res.authSetting['scope.camera']) {
+ if (!res.authSetting['scope.camera']) {
+ wx.authorize({
+ scope: 'scope.camera',
+ success() {
+ // 鐢ㄦ埛宸茬粡鍚屾剰灏忕▼搴忎娇鐢ㄥ綍闊冲姛鑳斤紝鍚庣画璋冪敤 wx.startRecord 鎺ュ彛涓嶄細寮圭獥璇㈤棶
+ console.log('鎺堟潈鎴愬姛');
+ },
+ fail() {
+ console.log('鎺堟潈澶辫触');
+ }
+ });
+ } else if (!res.authSetting['scope.record']) {
+ wx.authorize({
+ scope: 'scope.record',
+ success() {
+ // 鐢ㄦ埛宸茬粡鍚屾剰灏忕▼搴忎娇鐢ㄥ綍闊冲姛鑳斤紝鍚庣画璋冪敤 wx.startRecord 鎺ュ彛涓嶄細寮圭獥璇㈤棶
+ console.log('鎺堟潈鎴愬姛');
+ },
+ fail: () => {
+ console.log('鎺堟潈澶辫触');
+ }
+ });
+ }
+ }
+ },
+ fail() {
+ console.log('鑾峰彇澶辫触');
+ }
+ });
}
}
};
--
Gitblit v1.9.1