Merge remote-tracking branch 'origin/tianyi' into clientDemo

src/pageMerchant/components/toBeVerified.vue

@@ -109,14 +109,20 @@
 			},
 			compileHalend() {
 				console.log(this.list.id, this.merchantId,"this.list.id, this.merchantId")
-				getVerificationApi(this.list.id, this.merchantId)
+				getVerificationApi(this.list.id, this.list.merchantId)
 					.then(response => {
+						uni.navigateTo({
+							url:"/pageMerchant/storeModule/components/verificationStatus"
+						})
 						if (response.code == "OK") {
-							uni.showToast({
-								title: "核销成功",
-								icon: 'success',
-								dration: 2000,
-							});
+							// uni.navigateTo({
+							// 	url:"/pageMerchant/storeModule/components/verificationStatus"
+							// })
+							// uni.showToast({
+							// 	title: "核销成功",
+							// 	icon: 'success',
+							// 	dration: 2000,
+							// });
 						}
 					})
 			},

src/pageMerchant/mineModule/myPurse/purse.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

src/pageMerchant/storeModule/appointList.vue

@@ -157,6 +157,7 @@
 			onDayClick(data) {
 				console.log(data.date)
 				this.curDate = data.date;
+				this.getMerchantList()
 			},
 			async getMerchantList() {
 				let result = Object.assign({}, {
@@ -170,6 +171,7 @@
 					...result
 				});
 				console.log(res, "sdaasdsas")
+				this.appointList = res.data.records
 			},
 			getStatusColor(status) {
 				switch (status) {

src/pageMerchant/storeModule/components/verificationStatus.vue

@@ -0,0 +1,103 @@
+<template>
+	<view class="container">
+		<view class="pay-box">
+			<image class="pay-img" src="@/static/images/paySuccess.png"></image>
+			<p class="pay-text">核销成功</p>
+			<p class="pay-text1" @click="toVerificationList">查看核销记录</p>
+		</view>
+
+		<view class="pay-btn-box">
+			<button class='btn btn1' @click='handlerSkipBtn(1)'>继续核销</button>
+			<button class='btn btn2' @click='handlerSkipBtn(2)'>返回首页</button>
+		</view>
+
+
+
+
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+			toVerificationList() {
+				uni.navigateTo({
+					url: "/pageMerchant/storeModule/components/verificationList"
+				})
+			},
+			handlerSkipBtn(e) {
+				switch (e) {
+					case 1:
+						uni.navigateTo({
+							url: "/pageMerchant/storeModule/commodityWriteOff"
+						})
+						break;
+					case 2:
+						uni.navigateTo({
+							url: "/pageMerchant/index"
+						})
+						break;
+				}
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		padding-top: 20%;
+
+		.pay-box {
+			text-align: center;
+			padding-top: 100rpx;
+
+			.pay-img {
+				width: 160rpx;
+				height: 160rpx;
+				border-radius: 50%;
+			}
+
+			.pay-text {
+				font-weight: bold;
+				font-size: 42rpx;
+				margin-top: 60rpx;
+			}
+
+			.pay-text1 {
+				font-weight: bold;
+				font-size: 42rpx;
+				margin-top: 60rpx;
+				color: blue
+			}
+		}
+
+		.pay-btn-box {
+			display: flex;
+			justify-content: space-evenly;
+			margin-top: 400rpx;
+
+			.btn {
+				width: 45%;
+				border-radius: 38rpx;
+				font-size: 32rpx;
+			}
+
+			.btn1 {
+				background-color: #7785DB;
+				color: #fff;
+			}
+
+			.btn2 {
+				background-color: #FF6201;
+				color: #fff;
+			}
+		}
+	}
+</style>

src/pageMerchant/tabbar/mine.vue

@@ -233,8 +233,8 @@
 				}
 			},
 			toMyPurse() {
-				uni.navigateto({
-					url: ""
+				uni.navigateTo({
+					url: "/pageMerchant/mineModule/myPurse/purse"
 				})
 			}
 

src/pages.json

@@ -419,6 +419,21 @@
 					{
 						"navigationBarTitleText" : "待核销"
 					}
+				},
+				{
+					"path" : "storeModule/components/verificationStatus",
+					"style" : 
+					{
+						"navigationBarTitleText" : "核销状态",
+						  "navigationStyle": "custom"
+					}
+				},
+				{
+					"path" : "mineModule/myPurse/purse",
+					"style" : 
+					{
+						"navigationBarTitleText" : "我的钱包"
+					}
 				}
 			]
 		}

src/utils/request.js

@@ -11,10 +11,10 @@ import {
 
 // 每次请求都创建一个新的实例
 const instance = axios.create({
-  baseURL: 'https://test.api.chelvc.com',
+  // baseURL: 'https://test.api.chelvc.com',
   // baseURL: "http://192.168.68.77:11000",
   // baseURL: "https://358175z5l5.yicp.fun",
-  // baseURL: "http://localhost:11000",
+  baseURL: "http://localhost:11000",
   timeout: 10000,
   adapter: UniAdapter,
 });