Merge branch 'master' into zhongqi-delivery

ghsApp/src/admin/delivery/deliveryManage.vue

@@ -96,18 +96,28 @@ export default {
 			}
 		},
 	    openAddAuthModal() {
+            // 平台判断：只在 App 端允许操作
+            // #ifdef MP-WEIXIN
+            uni.showToast({
+                title: '请用APP操作，小程序不支持',
+                icon: 'none',
+                duration: 2000
+            });
+            return;
+            // #endif
+
             // TODO: 调用API获取可添加的平台列表
             const allPlatforms = [
-			    { id: 'meituan', name: '美团配送', logo: '🍱' },
+		    { id: 'meituan', name: '美团配送', logo: '🍱' },
                 { id: 'fengniao', name: '蜂鸟配送', logo: '🍜'},
                 { id: 'huolala', name: '货拉拉跑腿', logo: '🚛'},
                 { id: 'shansong', name: '闪送', logo: '⚡'},
                 { id: 'didi', name: '滴滴', logo: '🚗'},
-			    { id: 'uu', name: 'UU跑腿', logo: '🛵'},
+		    { id: 'uu', name: 'UU跑腿', logo: '🛵'},
                 { id: 'shunfeng', name: '顺丰同城', logo: '🚚'},
-				{ id: 'dada', name: '达达', logo: '📦'}
-		    ];
-		
+			{ id: 'dada', name: '达达', logo: '📦'}
+	    ];
+	
             // 获取已授权平台的id集合
             const authorizedIds = this.platformList.map(p => p.id);
             // 过滤出未授权的平台

ghsApp/src/admin/home/me.vue

@@ -152,7 +152,7 @@
               <view class="tui-title">更多设置</view>
             </tui-list-cell>
 
-            <tui-list-cell @click="handleDeliveryManage()" class="line-cell" :hover="false" :arrow="true">
+            <tui-list-cell @click="pageTo({ url: '/admin/delivery/deliveryManage' })" class="line-cell" :hover="false" :arrow="true">
               <view class="tui-title">绑定跑腿</view>
             </tui-list-cell>
 
@@ -618,15 +618,6 @@ export default {
         }
       })
     },
-    handleDeliveryManage() {
-      // #ifdef MP-WEIXIN
-      this.$msg('请使用 APP 操作')
-      return
-      // #endif
-      // #ifdef APP-PLUS
-      this.$util.pageTo({ url: '/admin/delivery/deliveryManage' })
-      // #endif
-    }
   },
 };
 </script>

hdApp/src/admin/delivery/deliveryManage.vue

@@ -96,17 +96,27 @@ export default {
 			}
 		},
 	    openAddAuthModal() {
+            // 平台判断：只在 App 端允许操作
+            // #ifdef MP-WEIXIN
+            uni.showToast({
+                title: '请用APP操作，小程序不支持',
+                icon: 'none',
+                duration: 2000
+            });
+            return;
+            // #endif
+
             // TODO: 调用API获取可添加的平台列表
             const allPlatforms = [
-			    { id: 'meituan', name: '美团配送', logo: '🍱' },
+		    { id: 'meituan', name: '美团配送', logo: '🍱' },
                 { id: 'fengniao', name: '蜂鸟配送', logo: '🍜'},
                 { id: 'huolala', name: '货拉拉跑腿', logo: '🚛'},
                 { id: 'shansong', name: '闪送', logo: '⚡'},
                 { id: 'didi', name: '滴滴', logo: '🚗'},
-			    { id: 'uu', name: 'UU跑腿', logo: '🛵'},
+		    { id: 'uu', name: 'UU跑腿', logo: '🛵'},
                 { id: 'shunfeng', name: '顺丰同城', logo: '🚚'}
-		    ];
-		
+	    ];
+	
             // 获取已授权平台的id集合
             const authorizedIds = this.platformList.map(p => p.id);
             // 过滤出未授权的平台

hdApp/src/admin/home/me.vue

@@ -78,7 +78,7 @@
             <tui-list-cell @click="pageTo({ url: '/admin/shop/sk' })" class="line-cell" :hover="false" :arrow="true">
               <view class="tui-title">更多设置</view>
             </tui-list-cell>
-            <tui-list-cell @click="handleDeliveryManage()" class="line-cell" :hover="false" :arrow="true" >
+            <tui-list-cell @click="pageTo({ url: '/admin/delivery/deliveryManage' })" class="line-cell" :hover="false" :arrow="true" >
               <view class="tui-title">绑定跑腿</view>
             </tui-list-cell>
 
@@ -371,15 +371,6 @@ export default {
           this.$msg('修改成功')
         }
       })
-    },
-    handleDeliveryManage() {
-      // #ifdef MP-WEIXIN
-      this.$msg('请使用 APP 操作')
-      return
-      // #endif
-      // #ifdef APP-PLUS
-      this.$util.pageTo({ url: '/admin/delivery/deliveryManage' })
-      // #endif
     }
   },
 };