liwei2496 8 mesiacov pred
rodič
commit
981aaa3489
3 zmenil súbory, kde vykonal 175 pridanie a 64 odobranie
  1. 84 62
      components/Tabbares/index.vue
  2. 10 2
      pages.json
  3. 81 0
      pagesHouse/Verification/ems.vue

+ 84 - 62
components/Tabbares/index.vue

@@ -1,63 +1,85 @@
-<template>
-	<view>
-		<u-tabbar :value="tabbarValues" @change="name => tabbarValues = name" :fixed="true" :placeholder="true"
-			:safeAreaInsetBottom="true" :border="false">
-			<u-tabbar-item :text="item.text" v-for="(item,index) in list" :key="index" @click="changeTabbars">
-				<image class="u-page__item__slot-icon" slot="active-icon" :src="item.activeImg"></image>
-				<image class="u-page__item__slot-icon" slot="inactive-icon" :src="item.inactiveImg"></image>
-			</u-tabbar-item>
-		</u-tabbar>
-	</view>
-</template>
-
-<script>
-	export default {
-		props: {
-			tabbarid: 0
-		},
-		data() {
-			return {
-				tabbarValues: 0,
-				list: [{
-						activeImg: 'https://i.ringzle.com/file/20240106/57895bbc5414416ea5de2a537ed23dc3.png',
-						inactiveImg: 'https://i.ringzle.com/file/20240106/29bd09ef7eb748f1820c335f86f74c61.png',
-						text: '首页',
-						paths: '/pagesHouse/home/index'
-					},
-					{
-						activeImg: 'https://i.ringzle.com/file/20240106/584d0a4108c44fa5bc566d0d0082e07d.png',
-						inactiveImg: 'https://i.ringzle.com/file/20240106/9561cd3843694891998a34ed41be0ec8.png',
-						text: '扫码核验',
-						paths: '/pagesHouse/Verification/index'
-					},
-					{
-						activeImg: 'https://i.ringzle.com/file/20240106/daf6362d4d6745c29501cf30a4d99bc2.png',
-						inactiveImg: 'https://i.ringzle.com/file/20240106/8c1f9fc0b5604ef7b966d98f2ffb1d2e.png',
-						text: '我的',
-						paths: '/pagesHouse/Mine/index'
-					}
-				]
-			}
-		},
-		mounted() {
-			this.tabbarValues = this.tabbarid;
-		},
-		methods: {
-			changeTabbars(e) {
-				console.log(this.list[e].paths, '000');
-				this.tabbarValues = e;
-				uni.reLaunch({
-					url: this.list[e].paths
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="less">
-	/deep/.u-page__item__slot-icon {
-		width: 40rpx;
-		height: 40rpx;
-		margin: 8rpx 0 4rpx;
-	}
+<template>
+	<view>
+		<u-tabbar :value="tabbarValues" @change="name => tabbarValues = name" :fixed="true" :placeholder="true"
+			:safeAreaInsetBottom="true" :border="false">
+			<u-tabbar-item :text="item.text" v-for="(item,index) in list" :key="index"
+				@click="changeTabbars(item,index)">
+				<image class="u-page__item__slot-icon" slot="active-icon" :src="item.activeImg"></image>
+				<image class="u-page__item__slot-icon" slot="inactive-icon" :src="item.inactiveImg"></image>
+			</u-tabbar-item>
+		</u-tabbar>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			tabbarid: 0
+		},
+		data() {
+			return {
+				tabbarValues: 0,
+				list: [{
+						activeImg: 'https://i.ringzle.com/file/20240106/57895bbc5414416ea5de2a537ed23dc3.png',
+						inactiveImg: 'https://i.ringzle.com/file/20240106/29bd09ef7eb748f1820c335f86f74c61.png',
+						text: '首页',
+						paths: '/pagesHouse/home/index'
+					},
+					{
+						activeImg: 'https://i.ringzle.com/file/20240106/584d0a4108c44fa5bc566d0d0082e07d.png',
+						inactiveImg: 'https://i.ringzle.com/file/20240106/9561cd3843694891998a34ed41be0ec8.png',
+						text: '扫码核验',
+						paths: '/pagesHouse/Verification/index'
+					},
+					{
+						activeImg: 'https://i.ringzle.com/file/20240106/daf6362d4d6745c29501cf30a4d99bc2.png',
+						inactiveImg: 'https://i.ringzle.com/file/20240106/8c1f9fc0b5604ef7b966d98f2ffb1d2e.png',
+						text: '我的',
+						paths: '/pagesHouse/Mine/index'
+					}
+				]
+			}
+		},
+		mounted() {
+			this.tabbarValues = this.tabbarid;
+		},
+		methods: {
+			changeTabbars(e, i) {
+				console.log(e, i, '000');
+				if (i == 1) {
+					console.log('111111111111111111', )
+					if (uni.getStorageSync('merchantType') == 4) {
+					//	Verification/ems
+						uni.navigateTo({
+							url: "/pagesHouse/Verification/ems"		
+						});
+						
+					} else {
+						this.tabbarValues = i;
+						uni.reLaunch({
+							url: this.list[i].paths
+						})
+					}
+
+				} else {
+					this.tabbarValues = i;
+					uni.reLaunch({
+						url: this.list[i].paths
+					})
+				}
+				// this.tabbarValues = i;
+				// uni.reLaunch({
+				// 	url: this.list[i].paths
+				// })
+			}
+		}
+	}
+</script>
+
+<style lang="less">
+	/deep/.u-page__item__slot-icon {
+		width: 40rpx;
+		height: 40rpx;
+		margin: 8rpx 0 4rpx;
+	}
 </style>

+ 10 - 2
pages.json

@@ -202,12 +202,20 @@
 					}
 				},
 				{
-					"path": "Verification/handiwork",
+					"path": "Verification/ems",
 					"style": {
-						"navigationBarTitleText": "我要核销",
+						"navigationBarTitleText": "核销",
 						"enablePullDownRefresh": false
 						// "navigationStyle": "custom"
 					}
+				},
+				{
+					"path": "Verification/handiwork",
+					"style": {
+						"navigationBarTitleText": "我要核销",
+						"enablePullDownRefresh": false
+						// "navigationStyle": "custom"
+					}
 				},
 				{
 					"path": "Verification/details",

+ 81 - 0
pagesHouse/Verification/ems.vue

@@ -0,0 +1,81 @@
+<template>
+	<view class="page" :style="{'min-height':(h)+'px','padding-top':mt+'px'}">
+	
+		<image @click="hexiao" src="https://i.ringzle.com/file/20240317/d5f047e986a04bff9cfbfef2c5dab095.png"></image>
+		
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				boatNo:'',
+				price:''
+				//merchantType:uni.getStorageSync('merchantType');
+			}
+		},
+		onLoad(opt) {
+			
+		},
+		methods: {
+			hexiao() {
+				  console.log('21321321',)
+				uni.scanCode({
+					success: (res) => {
+						console.log('扫码结果:' + res.result);
+						// 扫码成功后的操作,例如:
+					
+					},
+					fail: (err) => {
+						console.error('扫码失败:' + err);
+					}
+				});
+				
+			}
+		}
+	}
+</script>
+
+<style scoped lang="less">
+	.page{
+		text-align: center;
+		box-sizing: border-box;
+	}
+	image{
+		width: 345rpx;
+		height: 345rpx;
+		margin: 80rpx 0 24rpx;
+	}
+	.tip{
+		font-size: 32rpx;
+		color: #111;
+		text{
+			margin-right:12rpx;
+		}
+		
+	}
+	.price{
+		margin: 28rpx 0 110rpx;
+		text{
+			&:first-child{
+				font-size: 36rpx;
+			}
+			&:last-child{
+				font-size: 48rpx;
+				font-weight: bold;
+			}
+		}
+	}
+	.btn{
+		width: 610rpx;
+		height: 88rpx;
+		line-height: 88rpx;
+		background-color: #007A69;
+		color: #fff;
+		font-size: 32rpx;
+		border-radius: 46rpx;
+		margin: 0 auto;
+	}
+</style>