Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	api/pagesB/CommodityOrder/index.js

api/pagesB/Applforrefund/index.js

@@ -4,7 +4,10 @@ import request from "../../request.js"
 export function refundReason() {
 	return request({
 		url: `/nurseApplet/nursingOrder/refundReason`,
-		method: 'GET'
+		method: 'GET',
+		header: {
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+		},
 	})
 }
 //提交退款
@@ -12,6 +15,9 @@ export function refund(data) {
 	return request({
 		url: `/nurseApplet/nursingOrder/edit`,
 		method: 'POST',
-		data
+		data,
+		header: {
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+		},
 	})
 }

api/pagesB/CommodityOrder/index.js

@@ -3,7 +3,10 @@ import request from "../../request.js"
 export function goodsOrder(patientId, orderStatus, goodsOrderId, pageSize, pageNum) {
 	return request({
 		url: `/nurseApplet/nursingOrder/goodsOrder?patientId=${patientId}&orderStatus=${orderStatus}&goodsOrderId=${goodsOrderId}&pageSize=${pageSize}&pageNum=${pageNum}`,
-		method: 'GET'
+		method: 'GET',
+		header: {
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+		},
 	})
 }
 
@@ -12,7 +15,10 @@ export function goodsOrder(patientId, orderStatus, goodsOrderId, pageSize, pageN
 export function confirmReceipt(orderNo) {
 	return request({
 		url: `/nurseApplet/nursingStationGoods/confirmReceipt?orderNo=${orderNo}`,
-		method: 'POST'
+		method: 'POST',
+		header: {
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+		},
 	})
 }
 

api/pagesB/ProjectDetails/index.js

@@ -7,6 +7,5 @@ export function getAppStationItemInfo(stationId, stationItemId, stationItemPrice
 		header: {
 			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
 		},
-		
 	})
 }

api/pagesB/cancelorder/cancelorder.js

@@ -3,6 +3,9 @@ import request from "../../request.js"
 export function cancellationOrder(appointmentOrderId,cancelAppointmentReason) {
 	return request({
 		url: `/nurseApp/login/cancellationOrder?appointmentOrderId=${appointmentOrderId}&cancelAppointmentReason=${cancelAppointmentReason}`,
-		method: 'post'
+		method: 'post',
+		header: {
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+		},
 	})
 }

api/pagesB/goodsorderRate/index.js

@@ -16,6 +16,9 @@ export function uploadEvaluatePictureUrl(data) {
 	return request({
 		url: `/nurseApp/orderEvaluate/uploadEvaluatePictureUrl`,
 		method: 'POST',
-		data
+		data,
+		header: {
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+		},
 	})
 }

api/pagesB/healthybeans/index.js

@@ -39,6 +39,9 @@ export function integralGoodsOrder(data) {
 	return request({
 		url: `/nurseApplet/patientInfo/integralGoodsOrder`,
 		method: 'post',
-		data
+		data,
+		header: {
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+		},
 	})
 }

api/pagesB/homepage/index.js

@@ -1,9 +0,0 @@
-import request from "../../request.js"
-
-export function getPoserInfoListByType() {
-	return request({
-		url: `/nurseApplet/nearbyNursingStation/getPoserInfoListByType?moduleType=HOME_PAGE_MODULE`,
-		method: 'GET'
-	})
-}
-

api/pagesB/information/index.js

@@ -30,6 +30,9 @@ export function information(data) {
 export function getNurseType() {
 	return request({
 		url: `/nurseApplet/login/getNurseTypeInfo`,
-		method: 'GET'
+		method: 'GET',
+		header: {
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+		},
 	})
 }

api/pagesB/logistics/index.js

@@ -3,6 +3,9 @@ import request from "../../request.js"
 export function queryLogistics(orderNo,expressNo){
 	return request({
 		url: `/nurseApp/logistics/queryLogisticsInfo?orderNo=${orderNo}&expressNo=${expressNo}`,
-		method: 'GET'
+		method: 'GET',
+		header: {
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+		},
 	})
 }

api/pagesB/lookrate/index.js

@@ -4,6 +4,9 @@ import request from "../../request.js"
 export function lookrate(orderNo) {
 	return request({
 		url: `/nurseApp/orderEvaluate/selectOrderEvaluate?orderNo=${orderNo}`,
-		method: 'GET'
+		method: 'GET',
+		header: {
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+		},
 	})
 }

pagesB/cancelorder/cancelorder.vue

@@ -62,6 +62,7 @@
 
 <style lang="scss">
 	.app {
+		margin-top: 20rpx;
 		background-color: #F4F5F7;
 		width: 100%;
 		color: #000000;
@@ -117,4 +118,4 @@
 		}
 
 	}
-</style>
+</style>