Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_qianduan

pages/user/index.vue

@@ -146,7 +146,8 @@
 							浏览记录
 						</view>
 					</view>
-					<view class="listItem" @click="goJump('/pages/news3/setOutRecords')">
+					<!-- @click="goJump('/pages/news3/setOutRecords')" -->
+					<view class="listItem" @click="goShopOrderList()">
 						<view class="num">
 							{{actionCountsInfo.take_goods_number?actionCountsInfo.take_goods_number:0}}
 						</view>
@@ -605,6 +606,11 @@
 			}
 		},
 		methods: {
+			goShopOrderList(){
+				uni.navigateTo({
+					url:'/pages/news3/shopOrder?delivery_type=10'
+				})
+			},
 			goDealer(type) {
 				if (type == 30) {
 					this.goJump('/pages/news3/JoinDistribution?dataType=all');