页面修改

components/logistiComptent/logistiCard/logistiCard.vue

@@ -76,11 +76,14 @@
 							共计{{goodsInfo.product_count}}件商品
 						</view>
 
-						<u-button type="primary" @click="qrqodeFn" class="custom-style"
+						<u-button v-if="!is_captain" type="primary" @click="qrqodeFn" class="custom-style"
 							style="background-color: #0122C7;border: 0;">
 							<u-icon name="scan" color="white" size="25" style="margin-right: 10rpx;"></u-icon>
 							扫码取货</u-button>
-
+						<u-button v-else type="primary" @click="goDetil" class="custom-style"
+							style="background-color: #0122C7;border: 0;">
+							<u-icon name="scan" color="white" size="25" style="margin-right: 10rpx;"></u-icon>
+							查看详情</u-button>
 
 					</view>
 
@@ -141,9 +144,13 @@
 							共计{{goodsInfo.product_count}}件商品
 						</view>
 
-						<u-button type="primary" @click="showPop = true"
+						<u-button v-if="!is_captain" type="primary" @click="showPop = true"
 							style="background-color: #FF7C32; border: 0;"><u-icon name="car-fill" color="white"
 								size="25" style="margin-right: 10rpx;"></u-icon> 货物送达</u-button>
+						<u-button v-else type="primary" @click="goDetil" class="custom-style"
+							style="background-color: #FF7C32;border: 0;">
+							<u-icon name="scan" color="white" size="25" style="margin-right: 10rpx;"></u-icon>
+							查看详情</u-button>
 
 					</view>
 
@@ -298,6 +305,7 @@
 		props: ['goodsInfo'],
 		data() {
 			return {
+				is_captain: 0,
 				list: [],
 				flag: undefined,
 				showPop: false,
@@ -305,6 +313,9 @@
 
 			}
 		},
+		onLaunch() {
+			this.is_captain = JSON.parse(uni.getStorageSync("USER_INFO")).is_captain
+		},
 		methods: {
 			fuzzyName(name) {
 				let length = name.length;

pages/logistics/deliveryDetil.vue

@@ -83,7 +83,7 @@
 				<view style="margin-top: 200rpx;height: 1px;">
 					<!-- 565 -->
 				</view>
-				<view class="btn">
+				<view class="btn" v-if="!is_captain">
 					<u-button @click="qrqodeFn" type="primary" style="background-color: #0122C7;border: 0;">
 						<u-icon name="scan" color="white" size="30" style="margin-right: 10rpx;"></u-icon>
 						扫码取货</u-button>
@@ -166,6 +166,7 @@
 
 			// 唤起高德
 			test() {
+				if (this.is_captain) return
 				var packageName = 'com.autonavi.minimap';
 				var main = plus.android.runtimeMainActivity();
 				var packageManager = main.getPackageManager();
@@ -291,7 +292,8 @@
 			},
 		},
 		onLoad(options) {
-			console.log(JSON.parse(uni.getStorageSync("USER_INFO")).is_captain)
+			// console.log()
+			this.is_captain = JSON.parse(uni.getStorageSync("USER_INFO")).is_captain
 			getDetil({
 				logistics_id: options.id
 			}).then(res => {

pages/logistics/index.vue

@@ -41,6 +41,7 @@
 		},
 		data() {
 			return {
+				is_captain: "",
 				notArr: [],
 				keywords: "",
 				tabLists: [{
@@ -89,8 +90,9 @@
 				let id = JSON.parse(uni.getStorageSync('USER_INFO')).id
 				getList({
 					status: this.curNow,
-					courier_id: id,
-					keywords: this.keywords
+					user_id: id,
+					keywords: this.keywords,
+					user_type: this.is_captain
 				}).then(res => {
 					this.orderlist = []
 					this.orderlist = res.data.data
@@ -99,6 +101,7 @@
 
 		},
 		onLoad() {
+			this.is_captain = JSON.parse(uni.getStorageSync('USER_INFO')).is_captain
 			let that = this
 			//#ifdef APP-PLUS
 			jpushModule.addNotificationListener(function(result) {

pages/oaHome/oaHome.vue

@@ -195,6 +195,7 @@
 		},
 		data() {
 			return {
+				is_captain: 0,
 				iconList: [
 					"../../static/img/home/GSXX.png",
 					"../../static/img/home/RYGL.png",
@@ -248,6 +249,7 @@
 			});
 		},
 		onLoad() {
+			this.is_captain = JSON.parse(uni.getStorageSync("USER_INFO")).is_captain
 			//#ifdef APP-PLUS
 
 			let that = this;
@@ -291,7 +293,8 @@
 			async getOrderList() {
 				let id = JSON.parse(uni.getStorageSync("USER_INFO")).id || "";
 				let res = await getList({
-					courier_id: id,
+					user_id: id,
+					user_type: this.is_captain
 					// courier_id: 167
 				});
 				this.orderList = res.data.data;

subpkg/captain/captain.vue

@@ -27,7 +27,7 @@
 			<view class="card" v-for="(item, index) in list" :key="item.id"
 				@click="navTo('/subpkg/archives/archives?id='+item.id)">
 				<view class="card_head">
-					<text style="font-size: 34rpx;">最后更新: {{item.informationg_update_time.split(' ')[0]}}</text>
+					<text>最后更新: {{item.informationg_update_time.split(' ')[0]}}</text>
 					<text>{{'管理户数: '+item.informationg_count+" 户"}}<u-icon
 							style="display: inline-block;margin-left: 10rpx;" color="white"
 							name="arrow-right"></u-icon></text>
@@ -207,7 +207,7 @@
 			height: 100rpx;
 			display: flex;
 			justify-content: space-between;
-      align-items: center;
+			align-items: center;
 		}
 
 		.card_content {