From d1cc06e4f06d0e19e62f55c5f5b79d87894f3b82 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Thu, 6 Jun 2024 17:00:00 +0800
Subject: [PATCH] daohang

---
 common/http.interceptor.js |  12 +++--
 pages/change/change.vue    | 105 +++++++++++++++++++++++++------------
 pages/me/me.vue            |   9 ++--
 pages/talk/talk.vue        |   8 ++-
 4 files changed, 92 insertions(+), 42 deletions(-)

diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index b4bb151..0336a7a 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -104,11 +104,13 @@ const install = (Vue, vm) => {
 
 				return res.data;
 			}
-		} else {
-			// uni.showToast({
-			// 	icon: "none",
-			// 	title: res.statusCode
-			// })
+		} else {
+			console.log("noneeee",res.statusCode)
+			uni.showToast({
+				icon: "none",
+				title: ''+res.statusCode,
+				duration:1500
+			})
 
 			return false;
 		}
diff --git a/pages/change/change.vue b/pages/change/change.vue
index 61a6b22..7932cb5 100644
--- a/pages/change/change.vue
+++ b/pages/change/change.vue
@@ -8,27 +8,32 @@
 				<view class="systemtitle">蟹太太提货系统</view>
 				<view class="systemtext">
 					<text>2024年提货已开放!</text>
-					<text>自2024年<text class="colorOrange">9月25日</text>起 至2024年<text class="colorOrange">12月15日</text></text>
+					<text>自2024年<text class="colorOrange">9月25日</text>起 至2024年<text
+							class="colorOrange">12月15日</text></text>
 				</view>
 			</view>
 			<view class="formChange">
 				<u-form :model="form" ref="uForm">
-					<u-form-item class="formitem" prop="card_number" :border-bottom="false" >
-						<u-input type="text" class="card_number" v-model="form.card_number" placeholder="请输入卡号"/>
+					<u-form-item class="formitem" prop="card_number" :border-bottom="false">
+						<u-input type="text" class="card_number" v-model="form.card_number" placeholder="请输入卡号" />
 					</u-form-item>
 					<u-form-item class="formitem password" prop="password" :border-bottom="false">
-						<u-input class="password" type="password" v-model="form.password" placeholder="请输入密码" :password-icon="false" />
+						<u-input class="password" type="password" v-model="form.password" placeholder="请输入密码"
+							:password-icon="false" />
 					</u-form-item>
 				</u-form>
 				<u-button class="formitem submitform" form-type="submit" :plain="true" @click="goSubmit">点击提货</u-button>
-			</view>	
+			</view>
 		</view>
 	</view>
-	
+
 </template>
 
 <script>
-	import {toast,isNull} from '@/common/util.js'
+	import {
+		toast,
+		isNull
+	} from '@/common/util.js'
 	export default {
 		components: {},
 		data() {
@@ -37,13 +42,13 @@
 					card_number: '',
 					password: '',
 				},
-				rules:{
-					card_number:[{
+				rules: {
+					card_number: [{
 						required: true,
 						message: '请输入卡号',
 						trigger: 'change'
 					}],
-					password:[{
+					password: [{
 						required: true,
 						message: '请输入密码',
 						trigger: 'change'
@@ -53,12 +58,28 @@
 		},
 		methods: {
 			goSubmit() {
-				if(isNull(this.form.card_number)||isNull(this.form.password)){
+				if (isNull(this.form.card_number) || isNull(this.form.password)) {
 					toast('请填写卡号或密码')
 					return
 				}
-				
-				
+				this.$u.api.getCard(this.form).then(res => {
+					if (res.card.status === 2) {
+						uni.setStorageSync('vuex_card', {
+							card_number: this.form.card_number,
+							password: this.form.password,
+							card: res.card
+						})
+						uni.navigateTo({
+							url: '/packages/order/order?hasCard=true'
+						})
+					} else {
+						toast(res.card.can_delivery)
+					}
+				}).then(res => {
+					// console.log("ressssss",res)
+					// toast(res)
+				})
+
 			}
 		},
 		onReady() {
@@ -68,7 +89,7 @@
 </script>
 
 <style scoped>
-	.changecontainer{
+	.changecontainer {
 		width: 100%;
 		background-image: url(../../static/bg-change.jpg);
 		background-position: center top;
@@ -76,7 +97,8 @@
 		padding-top: 114rpx;
 		padding-bottom: 400rpx;
 	}
-	.logobox{
+
+	.logobox {
 		width: 162rpx;
 		height: 162rpx;
 		border-radius: 50%;
@@ -84,20 +106,23 @@
 		margin: 0 auto;
 		background: #fff;
 		margin-bottom: 80rpx;
-		box-shadow: 0 22rpx 32rpx rgba(53,53,53,.6);
+		box-shadow: 0 22rpx 32rpx rgba(53, 53, 53, .6);
 	}
-	.logobox image{
+
+	.logobox image {
 		width: 100%;
 		height: auto;
 	}
-	.formSystem{
+
+	.formSystem {
 		width: 87.33%;
 		margin: 0 auto;
 		border-radius: 10rpx;
 		background: #fff;
 		padding-bottom: 84rpx;
 	}
-	.systemtop{
+
+	.systemtop {
 		padding-top: 80rpx;
 		text-align: center;
 		padding-bottom: 58rpx;
@@ -105,7 +130,9 @@
 		position: relative;
 		margin-bottom: 80rpx;
 	}
-	.systemtop::before,.systemtop::after{
+
+	.systemtop::before,
+	.systemtop::after {
 		content: " ";
 		position: absolute;
 		display: inline-block;
@@ -115,33 +142,40 @@
 		background: #4a4b4a;
 		bottom: -14rpx;
 	}
-	.systemtop::before{
+
+	.systemtop::before {
 		left: -14rpx;
 	}
-	.systemtop::after{
+
+	.systemtop::after {
 		right: -14rpx;
 	}
-	.systemtitle{
+
+	.systemtitle {
 		font-size: 36rpx;
 		font-weight: 700;
 		color: #b98b44;
 		margin-bottom: 25rpx;
 	}
-	.systemtext text{
+
+	.systemtext text {
 		display: block;
 		font-size: 20rpx;
 		color: #000;
 		line-height: 36rpx;
 	}
-	.systemtext text.colorOrange{
+
+	.systemtext text.colorOrange {
 		display: inline-block;
 		color: #b98b44;
 	}
-	.formChange{
+
+	.formChange {
 		width: 68.7%;
 		margin: 0 auto;
 	}
-	/deep/ .u-form-item{
+
+	/deep/ .u-form-item {
 		margin-bottom: 40rpx;
 		height: 74rpx;
 		width: 100%;
@@ -155,10 +189,11 @@
 		color: #676767;
 	}
 
-	/deep/ .u-form-item.password{
+	/deep/ .u-form-item.password {
 		background-image: url(../../static/icon-change2.png);
 	}
-	/deep/ .u-form-item .u-input__input{
+
+	/deep/ .u-form-item .u-input__input {
 		display: block;
 		border: none;
 		width: 100%;
@@ -172,13 +207,16 @@
 		background-size: 38rpx auto;
 		background-repeat: no-repeat;
 	}
-	/deep/ .card_number .u-input__input{
+
+	/deep/ .card_number .u-input__input {
 		background-image: url(../../static/icon-change1.png) !important;
 	}
-	/deep/ .password .u-input__input{
+
+	/deep/ .password .u-input__input {
 		background-image: url(../../static/icon-change2.png) !important;
 	}
-	/deep/ .u-btn{
+
+	/deep/ .u-btn {
 		color: #b98b44 !important;
 		font-size: 24rpx !important;
 		font-weight: bold;
@@ -189,7 +227,8 @@
 		border-radius: 50rpx;
 		background-color: #f4f3f2 !important;
 	}
-	/deep/ .u-btn::after{
+
+	/deep/ .u-btn::after {
 		display: none;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/me/me.vue b/pages/me/me.vue
index 2432f62..c5fd621 100644
--- a/pages/me/me.vue
+++ b/pages/me/me.vue
@@ -56,7 +56,8 @@
 			<view class="login-btn">
 				<view class="login-btn-btn" @click="submit">提 交</view>
 			</view>
-		</u-popup>
+		</u-popup>
+		<tabbar :currentPage="2"></tabbar>
 	</view>
 </template>
 
@@ -69,8 +70,10 @@
 		toast,
 		shareInfo
 	} from "@/common/util.js"
-	export default {
-		components: {
+	import tabbar from '@/components/tabbar/tabbar.vue';
+	export default{
+		components:{
+			tabbar
 		},
 		data() {
 			return {
diff --git a/pages/talk/talk.vue b/pages/talk/talk.vue
index 3955ed0..e75f472 100644
--- a/pages/talk/talk.vue
+++ b/pages/talk/talk.vue
@@ -15,11 +15,17 @@
 			</view>
 			<view class="textbottom">长按扫码添加企业微信</view>
 		</view>
+		<tabbar :currentPage="1"></tabbar>
 	</view>
 </template>
 
 <script>
-	
+		import tabbar from '@/components/tabbar/tabbar.vue';
+	export default{
+		components:{
+			tabbar
+		}
+	}
 </script>
 <style type="text/css" scoped>
 	.changecontainer{