baijunde 4 ماه پیش
والد
کامیت
169391df13
3فایلهای تغییر یافته به همراه45 افزوده شده و 19 حذف شده
  1. 27 6
      components/index_nav.vue
  2. 10 10
      pages/index/full.vue
  3. 8 3
      pages/index/index.vue

+ 27 - 6
components/index_nav.vue

@@ -48,7 +48,9 @@
 					},
 					{
 						name: '订单管理',
-						url: '/static/index/indent.png'
+						url: '/static/index/indent.png',
+						path:'/pages/order/index',
+						type:'tabbar'
 					},
 					// {
 					// 	name: '审核查询',
@@ -57,7 +59,9 @@
 					// },
 					{
 						name: '提现管理',
-						url: '/static/index/withdraw.png'
+						url: '/static/index/withdraw.png',
+						path:'/pages/finance/index',
+						type:'tabbar'
 					},
 					{
 						name: '商品管理',
@@ -140,10 +144,27 @@
 					return;
 				}
 
-				if (!item.path) return;
-				uni.navigateTo({
-					url: item.path
-				});
+				if (!item.path) {
+					uni,uni.showToast({
+						title: '功能暂未开放',
+						icon:'none'
+					});
+					return
+				};
+				console.log(item.path)
+				if(item.type){
+					uni.switchTab({
+						url:item.path
+					})
+					
+				}else{
+					uni.navigateTo({
+						url: item.path
+					});
+				}
+				
+				
+				
 			}
 		}
 	}

+ 10 - 10
pages/index/full.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="service">
-		<view class="top"></view>
 		<view class="head">
+		<view class="top"></view>
 			<span class="cuIcon-back" @click="back"></span>
 			<view class="case">
 				全部服务
@@ -182,26 +182,26 @@ export default {
 	height: 100%;
 	background: #F7F8FC;
 
-	/*#ifdef APP-PLUS*/
-	.top {
-		width: 100%;
-		height: var(--status-bar-height);
-		background: linear-gradient(180deg, #D6E9FF 0%, #FFFFFF 100%);
-	}
+	
 
-	/*#endif*/
 	.head {
 		width: 100%;
-		height: 112rpx;
+		height: calc(var(--status-bar-height) + 112rpx ) ;
 		padding: 20rpx;
 		display: flex;
 		align-items: center;
 		background: linear-gradient(180deg, #D6E9FF 0%, #FFFFFF 100%);
 		position: relative;
+		.top {
+			width: 100%;
+			// height: ;
+		}
 
 		.cuIcon-back {
 			font-size: 40rpx;
-			margin-right: 40rpx;
+			// margin-right: 40rpx;
+			position: absolute;
+			left: 40rpx;
 		}
 
 		.case {

+ 8 - 3
pages/index/index.vue

@@ -46,10 +46,10 @@
 						</view>
 						<image src="/static/index/scan.png" mode=""></image>
 					</view>
-					<view class="scan green" >
+					<view class="scan green" @click="goOrder">
 						<view class="">
 							<span>售卖订单</span><br />
-							查看历史核销记录<u-icon name="arrow-right" ></u-icon>
+							查看历史订单记录<u-icon name="arrow-right" ></u-icon>
 						</view>
 						<view class="back">
 							<image src="/static/index/order-back.png" mode=""></image>
@@ -58,7 +58,7 @@
 					</view>
 				</view>
 				<view class="right" @click="scan">
-					<span>核销记录</span><br />
+					<span>核销扫码</span><br />
 					扫一扫快速核销<u-icon name="arrow-right" style="margin-left: 10rpx;"></u-icon>
 					<view class="back">
 						<image src="/static/index/scan-back.png" mode=""></image>
@@ -149,6 +149,11 @@
 					url: "/pages/scan/manual",
 				});
 			},
+			goOrder(){
+				uni.switchTab({
+					url:'/pages/order/index'
+				})
+			},
 			//跳转至门店详情页
 			shopDetails() {
 				uni.navigateTo({