1

mer_uniapp/api/merchant.js

@@ -47,7 +47,7 @@ export function getMerIndexInfoApi(id) {
  * @param Obj data
  */
 export function getMerSearchApi(data) {
-  return request.get(`merchant/search/list/v1`, data, {noAuth:true});
+  return request.get(`merchant/search/list`, data, {noAuth:true});
 }
 
 /**

mer_uniapp/pages.json

@@ -1332,37 +1332,6 @@
 			]
 		},
 		{
-			"root": "pages/rider",
-			"name": "rider",
-			"pages": [{
-					"path": "rider_shipping/index",
-					"style": {
-						"navigationBarTitleText": "接单",
-						"app-plus": {
-							// #ifdef APP-PLUS
-							"titleNView": {
-								"type": "default"
-							}
-							// #endif
-						}
-					}
-				},
-				{
-					"path": "rider_me/index",
-					"style": {
-						"navigationBarTitleText": "我的",
-						"app-plus": {
-							// #ifdef APP-PLUS
-							"titleNView": {
-								"type": "default"
-							}
-							// #endif
-						}
-					}
-				}
-			]
-		},
-		{
 			"root": "pages/admin/",
 			"name": "admin",
 			"pages": [{

mer_uniapp/pages/rider_index/components/rider_me/index.vue

@@ -33,23 +33,22 @@
 				riderInfo: [{
 					id: 1,
 					name: '跑腿记录',
-					img: require('./static/run-errands.png'),
+					img: '/statis/img/run-errands.png',
 					pagePath: ''
 				}, {
 					id: 2,
 					name: '提现',
-					img: require('./static/withdrawal.png'),
+					img: '/statis/img/withdrawal.png',
 					pagePath: ''
 				}, {
 					id: 3,
 					name: '返回用户端',
-					img: require('./static/run-errands.png'),
+					img: '/statis/img/run-errands.png',
 					pagePath: ''
 				}],
 			}
 		},
 		methods: {
-
 			onRiderClick(id) {
 				if (id === 3) {
 					uni.switchTab({

mer_uniapp/pages/rider_index/components/rider_shipping/index.vue

@@ -6,7 +6,7 @@
 			</view>
 		</view>
 		<scroll-view scroll-y style="overflow: hidden;">
-			<view v-for="item in riderData" :key="item.id" style="margin: 10rpx 0;">
+			<view v-for="(item, index) in riderData" :key="index" style="margin: 10rpx 0;">
 				<rider-order :orderInfo="item" @orderCilck="goOrderClick" :statusId="riderStatus"></rider-order>
 			</view>
 		</scroll-view>
@@ -53,6 +53,9 @@
 				],
 			}
 		},
+		created() {
+			this.getRiderDataList()
+		},
 		methods: {
 			/**
 			 * 切换类型
@@ -96,9 +99,6 @@
 				console.log(id)
 			}
 		},
-		onLoad(options) {
-			this.getRiderDataList()
-		},
 		mounted() {
 
 		},

mer_uniapp/pages/rider_index/index.vue

@@ -8,10 +8,10 @@
 			{{activeRole == '0' ? '接单' : '我的' }}
 		</view>
 		<!-- <view class="content-dom"> -->
-		<view v-if="activeRole == '0'">
+		<view style="flex: 1;width: 100%;overflow: hidden;" v-if="activeRole == '0'">
 			<rider-shipping></rider-shipping>
 		</view>
-		<view v-if="activeRole == '1'">
+		<view style="flex: 1;width: 100%;overflow: hidden;" v-if="activeRole == '1'">
 			<rider-me></rider-me>
 		</view>
 		<!-- </view> -->
@@ -66,12 +66,6 @@
 				],
 				statusBarHeight: app.globalData.statusBarHeight,
 				navigationBarHeight: 112,
-				riderData: [], // 订单数组
-				loading: false, //是否加载中
-				loadend: false, //是否加载完毕
-				loadTitle: '加载更多', //提示语
-				page: 1,
-				limit: 20
 			}
 		},
 		methods: {
@@ -84,13 +78,6 @@
 				// 	animationType: 'none' // 关闭默认的滑动效果
 				// });
 			},
-			onRiderClick(id) {
-				if (id === 3) {
-					uni.switchTab({
-						url: '/pages/user/index'
-					});
-				}
-			},
 		},
 		onLoad(options) {
 			let that = this
@@ -101,7 +88,6 @@
 					that.winHeight = res.windowHeight
 				},
 			});
-			this.getRiderDataList()
 		},
 		mounted() {