1. 配送页面修改 2.跑腿设置页面修改

ghsApp/src/admin/delivery/allDelivery.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="delivery-container">
     <!-- 页面头部 -->
-    <view class="delivery-header">
+    <!-- <view class="delivery-header">
       <view class="header-top">
         <view class="order-sn">{{ orderSn }}</view>
         <view class="predict-time">{{ predictTime }}</view>
@@ -9,7 +9,7 @@
       <view class="header-bottom">
         <view class="speed-tips">最快01-20 14:24送达</view>
       </view>
-    </view>
+    </view> -->
 
     <!-- 地址选择区 -->
     <view class="address-section">
@@ -227,7 +227,7 @@ export default {
         //     { name: '闪送', price: '19.00', type: '两轮' },
         //     { name: '达达秒送', price: '11.30', type: '团送' },
         //     { name: '美团配送', price: '暂无报价', type: '暂无报价' },
-        //     { name: '顺丰直营', price: '11.30', type: '团送' },
+        //     { name: '顺丰同城', price: '11.30', type: '团送' },
         //     { name: 'UU跑腿', price: '8.90', type: '专人直送' },
         //     { name: '蜂鸟', price: '17.30', type: '配送' }
         // ],
@@ -347,7 +347,9 @@ export default {
       }).then(res => {
         if (res && res.code === 1) {
           this.$msg('下单成功');
-          this.pageTo({url: '/pagesOrder/detail?id=' + this.orderId});
+          //this.pageTo({url: '/pagesOrder/detail?id=' + this.orderId, type: 2 }); 
+          // 为了能正常返回，需要使用navigateBack
+          uni.navigateBack({ delta: 1 });
         }
       }).catch(err => {
         this.$msg(res.msg);
@@ -366,7 +368,7 @@ export default {
 }
 
 /* 头部 */
-.delivery-header {
+/*.delivery-header {
   background-color: #3385FF;
   color: white;
   padding: 30upx 20upx;
@@ -393,14 +395,14 @@ export default {
     font-size: 24upx;
     opacity: 0.85;
   }
-}
+}*/
 
 /* 地址选择 */
 .address-section {
   background-color: white;
   margin: 20upx;
   border-radius: 12upx;
-  border: 2upx solid #e74c3c;
+  border: 2upx solid #f0f0f0;
   overflow: hidden;
 
   .address-item {

ghsApp/src/admin/delivery/deliveryManage.vue

@@ -97,11 +97,11 @@ export default {
             const allPlatforms = [
 			    { id: 'meituan', name: '美团配送', logo: '🍱' },
                 { id: 'fengniao', name: '蜂鸟配送', logo: '🍜'},
-                { id: 'huolala', name: '货拉拉', logo: '🚛'},
+                { id: 'huolala', name: '货拉拉跑腿', logo: '🚛'},
                 { id: 'shansong', name: '闪送', logo: '⚡'},
                 { id: 'didi', name: '滴滴', logo: '🚗'},
 			    { id: 'uu', name: 'UU跑腿', logo: '🛵'},
-                { id: 'shunfeng', name: '顺丰', logo: '🚚'}
+                { id: 'shunfeng', name: '顺丰同城', logo: '🚚'}
 		    ];
 		
             // 获取已授权平台的id集合
@@ -130,12 +130,10 @@ export default {
 		handleCancelAuth(platform) {
 			uni.showModal({
 				title: '确认取消授权',
-				content: `您确定要取消【${platform.name}】的授权吗？此操作不可逆。`,
+				content: `您确定要取消【${platform.name}】的授权吗？`,
 				success: res => {
 					if (res.confirm) {
-						// TODO: 调用取消授权接口
-						console.log(`取消 ${platform} 的授权`);
-                        cancelAuth(platform.id).then(res => {
+                        cancelAuth({platform: platform.id}).then(res => {
                             if (res.code === 1) {
                                 uni.showToast({ title: '取消授权成功', icon: 'none' });
                                 this.fetchPlatformList(); // 刷新列表

ghsApp/src/api/express/delivery.js

@@ -32,7 +32,7 @@ export const cancelDeliveryOrder = data => {
  * 获取可用订单取消原因
  */
  export const getCancelReason = data => {
-	return https.post('/delivery/cancel-reason?XDEBUG_SESSION_START=PHPSTORM', data)
+	return https.post('/delivery/cancel-reason', data)
  }
 
 /**
@@ -52,6 +52,6 @@ export const getAuthUrl = (platformId) => {
 /**
  * 取消授权
  */
-export const cancelAuth = (platformId) => {
-	return https.get(`/delivery/cancel-auth?platform=${platformId}`)
+export const cancelAuth = data => {
+	return https.get('/delivery/cancel-auth', data)
 }

ghsApp/src/pagesOrder/detail.vue

@@ -806,7 +806,7 @@ export default {
 		//呼叫跑腿
 		openExpressPage() {
 			//this.$util.pageTo({url: '/admin/order/callExpress?orderId='+this.detailInfo.id}) // TODO: 删除掉对应页面
-			this.pageTo({url:  '/admin/delivery/allDelivery?orderId=' + this.detailInfo.id })
+			this.pageTo({url:  '/admin/delivery/allDelivery?orderId=' + this.detailInfo.id})
 		},
 		//判断是否可以取消跑腿
 		canCancelExpress(status) {