17755135699 пре 11 месеци
родитељ
комит
9bf83100a5
4 измењених фајлова са 53 додато и 95 уклоњено
  1. 8 0
      pages.json
  2. 2 2
      pages/login/index.vue
  3. 42 92
      pagesHouse/Verification/index.vue
  4. 1 1
      pagesHouse/home/orderList.vue

+ 8 - 0
pages.json

@@ -185,6 +185,14 @@
 						"navigationStyle": "custom"
 					}
 				},
+				{
+					"path": "Verification/check",
+					"style": {
+						"navigationBarTitleText": "核销选择",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
 				{
 					"path": "Verification/handiwork",
 					"style": {

+ 2 - 2
pages/login/index.vue

@@ -3,7 +3,7 @@
 		<view class="box">
 			<image src="https://i.ringzle.com/file/20240109/d6c4691423cf40c2bdf9210d389cdd1e.png"></image>
 			<view class="text">您好!欢迎使用<br>游嵊泗商家服务平台</view>
-			<!-- <view class="" @click="aa()">商户静态页面入口</view> -->
+			<!-- <view class="" @click="aa()">核销</view> -->
 			<view class="login">
 				<button open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">登录</button>
 			</view>
@@ -24,7 +24,7 @@
 		methods: {
 			aa(){
 				uni.reLaunch({
-					url:"/pagesHouse/home/index"
+					url:"/pagesHouse/hexiao/index"
 				})
 			},
 			//获取手机号进行登录

+ 42 - 92
pagesHouse/Verification/index.vue

@@ -1,27 +1,12 @@
 <template>
-	<view class="page" :style="{'min-height':(h-th)+'px'}">
-		<c-nav-bar title="核销"></c-nav-bar>
-		<view class="content">
-			<view class="content-one" @click="SweepIt">
-				<view class="image">
-					<image src="https://i.ringzle.com/file/20240224/f7c81755b4f74f47b80c53ba4e6b051a.png" mode="">
-					</image>
-				</view>
-				<view class="text">
-					扫一扫核销
-				</view>
-			</view>
-			<view class="content-two" @click="handiwork">
-				<view class="image">
-					<image src="https://i.ringzle.com/file/20240224/49af25724572427fadff57f73a29d15b.png" mode="">
-					</image>
-				</view>
-				<view class="text">
-					手工核销
-				</view>
+	<view class="page" :style="{'min-height':(h-th)+'px','padding-top':mt+'px'}">
+		<c-nav-bar title="扫码核销"></c-nav-bar>
+		<view class="list">
+			<view class="item" v-for="(i,index) in data" :key="index" @click="check()">
+				<text>08A</text>
+				<text>核销</text>
 			</view>
 		</view>
-		<Tabbares :tabbarid="1"></Tabbares>
 	</view>
 </template>
 
@@ -29,99 +14,64 @@
 	export default {
 		data() {
 			return {
+				date: new Date().Format('yyyy-MM-dd'),
+				show: false,
 				h: uni.getSystemInfoSync().windowHeight - 87,
 				mt: uni.getSystemInfoSync().statusBarHeight + 44,
+				data: [1, 2, 3, 4, 5, 6, 7],
 			}
 		},
+		onLoad() {},
 		methods: {
-			// 扫码
-			SweepIt() {
-				// this.$showToast('正在开发中...');
-				uni.scanCode({
-					onlyFromCamera: true,
-					success: (res) => {
-						console.log('扫描二维码成功,结果:' + res.result);
-						this.$api.get('/merchant/merchantFisherman/home/getDetails?writeOffCode=' + res.result)
-							.then(res => {
-								if (res.data.code == 0) {
-									this.value = ''
-									uni.setStorageSync('list', res.data.data);
-									uni.navigateTo({
-										url: '/pagesHouse/Verification/details'
-									})
-								} else {
-									this.value = ''
-									this.$showToast(res.data.msg)
-								}
-							})
-					},
-					error: (res) => {
-						console.log('扫描二维码出现错误')
-					}
-				})
-
-			},
-			// 手工
-			handiwork() {
+			check() {
 				uni.navigateTo({
-					url: '/pagesHouse/Verification/handiwork'
+					url: '/pagesHouse/Verification/check'
 				})
-			},
+			}
 		}
 	}
 </script>
 
-<style lang="less">
-	* {
-		margin: 0;
-		padding: 0;
-		box-sizing: border-box
+<style lang="less" scoped>
+	.page {
+		background: #F5F8FA;
+		padding-bottom: 40rpx;
+		box-sizing: border-box;
 	}
 
-	.page {
-		height: 100%;
-		background-color: #FFFFFF;
+	.list {
+		box-sizing: border-box;
+		padding: 30rpx 30rpx 0;
 
-		.content {
-			// height: 100%;
-			// line-height: 100%;
-			// padding: 40rpx auto;
-			margin: 34% 64rpx;
+		.item {
+			height: 160rpx;
 			display: flex;
-			flex-wrap: wrap;
-
-			.content-one,
-			.content-two {
-				box-sizing: border-box;
-				width: 100%;
-				height: 224rpx;
-				background-color: #F0F8F6;
-				padding: 40rpx 0;
-				margin-top: 60rpx;
-				border-radius: 24rpx;
+			justify-content: space-between;
+			padding: 0 24rpx;
+			background-color: #fff;
+			align-items: center;
+			box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.08);
+			margin-bottom: 20rpx;
 
-				.image {
-					width: 88rpx;
-					height: 88rpx;
-					margin: auto;
-
-
-					image {
-						width: 100%;
-						height: 100%;
-					}
+			text {
+				&:first-child {
+					font-size: 54rpx;
+					font-weight: bold;
+					color: #111;
 				}
 
-				.text {
-					margin-top: 24rpx;
+				&:last-child {
+					display: inline-block;
+					width: 168rpx;
+					height: 88rpx;
+					line-height: 88rpx;
 					text-align: center;
+					background-color: #007A69;
+					color: #fff;
 					font-size: 32rpx;
-					color: #111111;
-					font-weight: Regular;
+					border-radius: 44rpx;
 				}
 			}
-
 		}
-
 	}
 </style>

+ 1 - 1
pagesHouse/home/orderList.vue

@@ -83,7 +83,7 @@
 
 <style lang="less" scoped>
 	.page {
-		background: #F3F4F4;
+		background: #F5F8FA;
 		padding-bottom: 40rpx;
 		box-sizing: border-box;