diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 59d78d5..1d4d6d6 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -14,6 +14,10 @@
      	{
      		"launchtype" : "local"
      	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "local"
+     	},
      	"type" : "uniCloud"
      }
     ]
diff --git a/App.vue b/App.vue
index d5604b0..2377d3e 100644
--- a/App.vue
+++ b/App.vue
@@ -5,6 +5,7 @@
 		},
 		onShow () {
 			console.log('App Show')
+			uni.hideLoading()
 		},
 		onHide () {
 			console.log('App Hide')
diff --git a/apis/interfaces/scan.js b/apis/interfaces/scan.js
new file mode 100644
index 0000000..65467ed
--- /dev/null
+++ b/apis/interfaces/scan.js
@@ -0,0 +1,22 @@
+/**
+ * Web-zdx
+ * moduleName:核销相关操作
+ */
+
+import request from '../request.js'
+
+
+// 扫码前置条件
+const scanInfo = (apiUrl,data,method) => {
+  return request({
+    url: apiUrl,
+    method:method,
+    data:data
+  })
+}
+
+
+
+export {
+  scanInfo
+}
diff --git a/components/coupon-template/coupon-template-1.vue b/components/coupon-template/coupon-template-1.vue
index 7c50784..ff0355e 100644
--- a/components/coupon-template/coupon-template-1.vue
+++ b/components/coupon-template/coupon-template-1.vue
@@ -30,7 +30,7 @@
 			<!-- 已使用未使用标识 -->
 			<image class="used" v-if='item.status.status === 2' src="/static/images/has_used.png" mode="widthFix" />
 			<image class="used" v-if="item.status.status === 3" src="/static/images/has_un_used.png" mode="widthFix" />
-			<view class="has-used-bg" v-if="item.status.status === 2 || item.status.status === 3"></view>
+			<!-- <view class="has-used-bg" v-if="item.status.status === 2 || item.status.status === 3"></view> -->
 		</view>
   
 		<!-- <u-toast ref="uToast" /> -->
diff --git a/pages.json b/pages.json
index 20e3586..fae2171 100644
--- a/pages.json
+++ b/pages.json
@@ -112,6 +112,15 @@
 				"navigationBarBackgroundColor": "#e93340"
 			}
 		},
+		{
+			"path": "pages/property/coupon/canUseList",
+			"name": "CanUseList",
+			"style": {
+				"navigationBarTitleText": "可兑换商品列表",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#039bfe"
+			}
+		}, 
 		{
 			"path": "pages/property/coupon/coupon",
 			"name": "CouponList",
@@ -453,7 +462,7 @@
 			"style": {
 				"navigationBarTitleText": "扫码验证",
 				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#f40c50"
+				"navigationBarBackgroundColor": "#039bfe"
 			}
 		}, {
 			"path": "pages/verification/details",
diff --git a/pages/property/coupon/canUseList.vue b/pages/property/coupon/canUseList.vue
new file mode 100644
index 0000000..4bc340e
--- /dev/null
+++ b/pages/property/coupon/canUseList.vue
@@ -0,0 +1,217 @@
+<template>
+	<view class="can-use-list">
+		<view v-for="(item,index) in lists" v-if="lists.length>0" :key="index" style="padding: 0 30rpx;">
+			<view class="goods-item">
+				<image class="goods-img" hover-class="none" mode="aspectFill" @click="goDetail(item.goods_id)"
+					:src="item.cover" />
+				<view class="goods-info">
+					<view class="goods-title ellipsis-2">{{item.name}}</view>
+					<view class="flexrow">
+						<view class="goods-price"><span>￥</span>{{item.price}}/权证</view>
+						<view :class="['right',selectSkuId===item.goods_sku_id?'selcetRight':'']"
+							@click="selectSkuId = item.goods_sku_id"> 兑换该商品</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 没有收藏的店铺 -->
+		<no-list name='no-goods' v-else txt="没有任何可兑换商品~" />
+		<view class="nowExchange" ><view class="btn" @click="verifiyCoupon('post')">确认兑换</view></view>
+		<!-- <u-toast ref="uToast" /> -->
+		<u-toast ref="uToast" />
+	</view>
+</template>
+
+<script>
+	import {
+		scanInfo
+	} from '@/apis/interfaces/scan'
+	export default {
+		data() {
+			return {
+				lists: [],
+				page: 1,
+				exchangeShow: false, // false不显示立即兑换按钮
+				has_more: true,
+				code: '2109141403335626',
+				selectSkuId: ''
+			};
+		},
+		onLoad(e) {
+			if (e.code) {
+				// this.code = e.code
+			}
+
+			this.verifiyCoupon('get')
+		},
+		methods: {
+			// 获取列表
+			verifiyCoupon(method) {
+				let apiUrl = 'coupons/verify/coupon'
+
+				let data = {
+					code: this.code
+				}
+				if(method === 'post'){
+					data.goods_sku_id = this.selectSkuId
+				}
+				scanInfo(apiUrl, data, method).then(res => {
+					console.log(res)
+					if(method === 'get'){
+						this.lists = res.goods
+					}else{
+						this.$refs.uToast.show({
+							title: '优惠券核销成功',
+							type: 'error',
+							icon: false,
+							duration: 3000
+						})
+						setTimeout(res=>{
+							uni.navigateBack({})
+						},3000)
+					}
+						
+				}).catch(err => {
+					this.$refs.uToast.show({
+						title: err.message,
+						type: 'error',
+						icon: false,
+						duration: 3000
+					})
+				})
+			},
+			goDetail(id) {
+				console.log(id)
+				uni.navigateTo({
+					url: '/pages/goods/details?id=' + id
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.can-use-list {
+		padding-bottom: 120rpx;
+	}
+
+	.goods-item {
+		width: calc(100% - 20rpx);
+		box-shadow: 0 0 20rpx 4rpx rgba($color: $main-color, $alpha: 0.1);
+		border-radius: 16rpx;
+		// margin-left: 20rpx;
+		margin: 40rpx 0 0 20rpx;
+		display: flex;
+		flex-direction: row;
+		align-items: flex-start;
+		justify-content: flex-start;
+		box-sizing: border-box;
+		position: relative;
+
+		.exchange {
+			position: absolute;
+			bottom: 30rpx;
+			right: 30rpx;
+			padding: 6rpx 16rpx;
+			border-radius: 20rpx 0 20rpx 0;
+			background-color: $main-color;
+			color: #fff;
+			font-size: 20rpx;
+			z-index: 1;
+		}
+
+		.goods-img {
+			width: 180rpx;
+			height: 180rpx;
+			position: relative;
+			top: 0;
+			left: -20rpx;
+			box-shadow: 0 0 10rpx 4rpx rgba($color: $main-color, $alpha: 0.1);
+			border-radius: 8rpx;
+		}
+
+		.goods-info {
+			flex: 1;
+			height: 180rpx;
+			padding: 20rpx 20rpx 20rpx 0;
+			display: flex;
+			flex-direction: column;
+			align-items: flex-start;
+			justify-content: space-around;
+			box-sizing: border-box;
+
+			.goods-title {
+				width: 100%;
+				font-size: 28rpx;
+			}
+
+			.goods-price {
+				color: #039bfe;
+				padding-top: 10rpx;
+				font-weight: bold;
+				font-size: 32rpx;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: center;
+				box-sizing: border-box;
+
+				span {
+					font-size: 26rpx;
+					// padding-right: 10rpx;
+					font-weight: normal;
+
+					&:nth-child(2) {
+						padding-left: 30rpx;
+					}
+				}
+			}
+		}
+	}
+
+	.flexrow {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+
+		.right {
+			padding: 20rpx 20rpx;
+			border-radius: 20rpx;
+			background-color: #cacaca;
+			color: #666;
+		}
+
+		.selcetRight {
+			background-color: #039bfe;
+			color: #fff;
+			font-weight: bold;
+		}
+	}
+
+	.nowExchange {
+		height: 90rpx;
+		background-color: #fff;
+		position: fixed;
+		bottom: 40rpx;
+		width: 100%;
+		padding:20rpx 30rpx;
+
+		.btn {
+			background-color: #039bfe;
+			font-size: 34rpx;
+			font-weight: bold;
+			color: #FFF;
+			padding: 20rpx 30rpx;
+			box-sizing: border-box;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: center;
+			box-sizing: border-box;
+			border-radius: 8rpx;
+		}
+	}
+</style>
diff --git a/pages/property/coupon/detail.vue b/pages/property/coupon/detail.vue
index cb2d3e2..a30761f 100644
--- a/pages/property/coupon/detail.vue
+++ b/pages/property/coupon/detail.vue
@@ -38,7 +38,7 @@
 		<view class="showCode " v-if="showCode">
 			<view class="showCodeBg" @click="showCode = false"></view>
 			<view :class="['showCodeContent', showCode?'showCodeContentSelect':'showCodeContentSelectNo']">
-				<view class="showCodeTitle">商品兑换码</view>
+				<view class="showCodeTitle">优惠券兑换码</view>
 				<image :src="code" mode="widthFix"></image>
 			</view>
 		</view>
@@ -70,6 +70,14 @@
 			this.coupon_grant_id = e.id
 			this.getList()
 		},
+		// 监听弹窗页面为false时候，重新请求当前页面
+		watch: {
+			showCode(newVal, oldVal) {
+				if(!newVal && oldVal){
+					uni.setStorageSync('refresh',true)
+				}
+			}
+		},
 		methods: {
 			// 获取列表
 			getList() {
diff --git a/pages/property/order/numberWeightInfo.vue b/pages/property/order/numberWeightInfo.vue
index 447efe0..fa67947 100644
--- a/pages/property/order/numberWeightInfo.vue
+++ b/pages/property/order/numberWeightInfo.vue
@@ -155,6 +155,15 @@
 			this.getInfo(e.symbol)
 			// this.getInfo('G22S20')
 		},
+		// 监听弹窗页面为false时候，重新请求当前页面
+		watch: {
+			showCode(newVal, oldVal) {
+				if(!newVal && oldVal){
+					this.getInfo(this.symbol)
+					uni.setStorageSync('refresh',true)
+				}
+			}
+		},
 		methods: {
 			getInfo(symbol) {
 				mallWarrantsList(symbol).then(res => {
@@ -174,6 +183,7 @@
 						duration: 3000
 					})
 					setTimeout(res => {
+						uni.setStorageSync('refresh',true)
 						uni.navigateBack({})
 					}, 2000)
 				})
diff --git a/pages/property/setting/setting.vue b/pages/property/setting/setting.vue
index bc0bf57..9fc88b9 100644
--- a/pages/property/setting/setting.vue
+++ b/pages/property/setting/setting.vue
@@ -59,11 +59,6 @@
 			}
 		},
 		onShow() {
-			wx.login({
-				success: res => {
-					this.loginCode = res.code
-				}
-			})
 			this.getUserInfo()
 		},
 		onPullDownRefresh() {
@@ -85,86 +80,6 @@
 					})
 				})
 			},
-			// 点击绑定用户得授权信息，且绑定带修改
-			getUser() {
-				uni.getUserProfile({
-					desc: "获取你的昵称、头像、地区及性别",
-					success: e => {
-						console.log(e)
-						if (e.errMsg == "getUserProfile:ok") {
-							this.userInfo = e.userInfo
-							//   // 检查用户登录Code是否过期
-							wx.checkSession({
-								success: res => {
-									this.userLogin(e)
-								},
-								fail: err => {
-									// 登录过期重新获取code
-									uni.login({
-										success: res => {
-											this.loginCode = res.code
-											// 登录
-											this.userLogin()
-										}
-									})
-								}
-							})
-						} else {
-							uni.showToast({
-								duration: 1500,
-								title: "绑定手机号失败了",
-								icon: 'none'
-							})
-						}
-					},
-					fail() {
-						uni.showToast({
-							duration: 1500,
-							title: "您拒绝了请求",
-							icon: 'none'
-						})
-					}
-				})
-			},
-			// 登陆接口
-			userLogin(info) {
-				let that = this
-				uni.login({
-					success: res => {
-						let data = {
-							iv: info.iv,
-							encryptedData: info.encryptedData,
-							code: res.code
-						}
-						uni.showLoading({
-							title: '绑定中'
-						})
-						wechatbind(data).then(res => {
-							setTimeout(res => {
-								uni.hideLoading()
-							}, 1000)
-							this.$refs.uToast.show({
-								title: '绑定成功',
-								type: 'primary',
-								duration: 3000
-							})
-							setTimeout(res => {
-								this.getUserInfo()
-							}, 3000)
-						}).catch(err => {
-							this.$refs.uToast.show({
-								title: err.message,
-								type: 'primary',
-								duration: 3000
-							})
-							uni.hideLoading()
-						})
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-
-			},
 			loginOut() {
 				uni.removeStorageSync('token')
 				uni.reLaunch({
diff --git a/pages/verification/index.vue b/pages/verification/index.vue
index 8b7056e..458df22 100644
--- a/pages/verification/index.vue
+++ b/pages/verification/index.vue
@@ -1,34 +1,402 @@
 <template>
 	<view class="Verification">
-		
-		<image  src="/static/images/hexiao_bg.png" mode="widthFix" />
-		
-		<view class="">
-			<view class="">扫描券码和权证 一键核销</view>
-			<view class="">降低核销门槛  低成本留存优质客户</view>
+		<image class="top-img" src="/static/images/hexiao_bg.png" mode="widthFix" />
+		<view class="txt">
+			<view class="title">扫描券码和权证 一键核销</view>
+			<view class="des">降低核销门槛 <span class='dian'>·</span>低成本留存优质客户</view>
+		</view>
+		<view class="btn">
+			<view class="goods" @click="scanCode('goods','get')"> 权证核销 </view>
+			<view class="coupons" @click="scanCode('coupons','get')"> 优惠券核销 </view>
+		</view>
+		<view class="history">核销记录</view>
+		<u-toast ref="uToast" />
+
+		<!-- 二维码展示动画效果 -->
+		<view class="showCode " v-if="showCode">
+			<view class="showCodeBg" @click="showCode = false"></view>
+			<view :class="['showCodeContent', showCode?'showCodeContentSelect':'showCodeContentSelectNo']">
+				<view class="showCodeTitle"> {{scanType === 'goods'?'确认核销该权证':'确认核销该优惠券'}}</view>
+				<view class="goodsInfo" v-if="scanType === 'goods'">
+					<image class="left" :src="info.goods.cover" mode="widthFix" />
+					<view class="right">
+						<view class="title ellipsis-2">{{info.goods.goods_name}}</view>
+						<view class="number">核销数量: X {{info.qty}}</view>
+					</view>
+				</view>
+				<view class="goodsInfo" v-else>
+					<view class="right">
+						<view class="title ellipsis-2">优惠券名称：‘ {{info.coupon.title}} ’</view>
+						<view class="number">
+							优惠券类型：{{info.coupon.type.text}}
+							<span style='padding-left: 20rpx;'>数量：1</span>
+						</view>
+						<view class="number">备注：{{info.coupon.remark}}</view>
+
+					</view>
+				</view>
+				<view class="sureVer" @click="scanInfo(code,'post',)">确认核销</view>
+				<view class="showCodeDes">请谨慎核销,操作成功后无法撤回</view>
+			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		scanInfo
+	} from '@/apis/interfaces/scan'
 	export default {
 		data() {
 			return {
-				
+				scanType: 'goods', // coupons 优惠券核销  goods 权证核销
+				showCode: false,
+				info: '', // 权证核销返回前置
+				code: '', // 扫码返回的code
 			};
+		},
+		onLoad() {
+			uni.hideLoading()
+		},
+		methods: {
+			scanCode(e) {
+				console.log(e)
+				this.scanType = e
+				uni.scanCode({
+					success: (res) => {
+						console.log('条码类型：' + res.scanType);
+						console.log('条码内容：' + res.result);
+						// uni.showLoading({
+						// 	title: '核销请求中..'
+						// })
+						this.code = res.result
+						this.scanInfo(res.result, 'get')
+					}
+				});
+			},
+			// 请求核销前置，优惠券前置和权证前置
+			scanInfo(token, method) {
+				console.log(token, this.scanType)
+				let apiUrl = ''
+				let data = {
+					code: token
+				}
+				if (this.scanType === 'goods') {
+					console.log('权证核销')
+					apiUrl = 'manages/warrants/verification'
+				} else {
+					console.log('优惠券核销！')
+					apiUrl = 'coupons/verify/coupon'
+				}
+				scanInfo(apiUrl, data, method).then(res => {
+					if (this.scanType === 'goods') {
+						uni.hideLoading()
+						if (method === 'post') {
+							this.showCode = false
+							this.$refs.uToast.show({
+								title: '权证核销成功',
+								type: 'error',
+								icon: false,
+								duration: 3000
+							})
+						} else {
+							this.showCode = true
+							this.info = res
+						}
+					} else {
+						console.log('优惠券核销 有商品跳转优惠券详情页面，没有商品直接弹出核销页面！')
+						console.log(res, 'res')
+						if (method === 'post') {
+							this.showCode = false
+							this.$refs.uToast.show({
+								title: '优惠券核销成功',
+								type: 'error',
+								icon: false,
+								duration: 3000
+							})
+						} else {
+							if (res.goods.length > 0) {
+								uni.showModal({
+									title: '温馨提示',
+									content: '该优惠券下绑定了商品，是否勾选相应商品',
+									success: (res1) => {
+										if (res1.confirm) {
+											uni.navigateTo({
+												url:'/pages/property/coupon/canUseList?code='+this.code
+											})
+										} else {
+											this.showCode = true
+											this.info = res.info
+										}
+									}
+								})
+							} else {
+								this.showCode = true
+								this.info = res.info
+							}
+						}
+					}
+				}).catch(err => {
+					this.$refs.uToast.show({
+						title: err.message,
+						type: 'error',
+						icon: false,
+						duration: 3000
+					})
+					this.showCode = false
+				})
+			}
 		}
 	}
 </script>
 
 <style lang="scss">
-.Verification{
-	width: 100%;
-	height: 100vh;
-	background-color: #fff;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	box-sizing: border-box;
-}
+	.Verification {
+		width: 100%;
+		min-height: 100vh;
+		background-color: #fff;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+
+		.top-img {
+			margin-top: 100rpx;
+		}
+
+		.txt {
+			padding-top: 120rpx;
+			width: 100%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			box-sizing: border-box;
+
+			.title {
+				font-size: 42rpx;
+				font-weight: 500;
+			}
+
+			.des {
+				font-size: 34rpx;
+				color: rgba($color: #255a7c, $alpha: .4);
+				padding-top: 20rpx;
+				font-weight: bold;
+
+				.dian {
+					color: #039bfe;
+					padding: 0 10rpx;
+				}
+			}
+		}
+
+		.btn {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: center;
+			box-sizing: border-box;
+			margin-top: 140rpx;
+
+			.goods,
+			.coupons {
+				width: 310rpx;
+				height: 90rpx;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: center;
+				box-sizing: border-box;
+				border-radius: 8rpx;
+				border: solid 1rpx #039bfe;
+				color: #039bfe;
+				font-size: 34rpx;
+				font-weight: bold;
+			}
+
+			.coupons {
+				background-color: #039bfe;
+				color: #fff;
+				margin-left: 30rpx;
+			}
+		}
+
+		.history {
+			text-align: center;
+			padding: $padding;
+			width: 100%;
+			color: #cacaca;
+		}
+	}
+
+	// 动画效果
+	.showCode {
+		width: 100%;
+		height: 100vh;
+		position: fixed;
+		top: 0;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+		z-index: 1;
+
+		.showCodeBg {
+			background-color: rgba($color:#000, $alpha: 0.3);
+			width: 100%;
+			height: 100%;
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: 2;
+		}
+
+		.showCodeContentSelect {
+			animation: sk-foldCubeAngle .6s linear both;
+		}
+
+		.showCodeContentSelectNo {
+			animation: sk-foldCubeAngleNo .6s linear both;
+		}
+
+		.showCodeContent {
+			padding: 50rpx 30rpx 30rpx 30rpx;
+			width: 640rpx;
+			min-height: 500rpx;
+			background-color: #fff;
+			border-radius: 20rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			box-sizing: border-box;
+			padding: 30rpx;
+			position: relative;
+			z-index: 199;
+
+			image {
+				width: 60%;
+			}
+
+			.showCodeTitle {
+				font-weight: bold;
+				padding-bottom: 20rpx;
+				font-size: 40rpx;
+				margin-bottom: 20rpx;
+				margin-top: 30rpx;
+			}
+
+			.goodsInfo {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-start;
+				box-sizing: border-box;
+				margin: $margin;
+
+				// background-color:red;
+				.left {
+					width: 200rpx;
+					height: 200rpx;
+					margin-right: 20rpx;
+					border-radius: 2rpx;
+				}
+
+				.right {
+					flex: 1;
+					display: flex;
+					flex-direction: column;
+					align-items: flex-start;
+					justify-content: center;
+					box-sizing: border-box;
+
+					.title {
+						font-size: 30rpx;
+						font-weight: bold;
+					}
+
+					.number {
+						padding-top: 10rpx;
+						color: #999;
+					}
+				}
+			}
+
+			.sureVer {
+				background-color: #039bfe;
+				width: 500rpx;
+				height: 90rpx;
+				border-radius: 8rpx;
+				color: #fff;
+				margin: 30rpx 0;
+				font-size: 40rpx;
+				font-weight: bold;
+				text-align: center;
+				line-height: 90rpx;
+			}
+
+			.showCodeDes {
+				padding: 20rpx 0 20rpx 0;
+				color: gray;
+				font-size: 24rpx;
+			}
+		}
+
+		@keyframes sk-foldCubeAngle {
+			0% {
+				-webkit-transform: perspective(140px) rotateX(-180deg);
+				transform: perspective(140px) rotateX(-180deg);
+				opacity: 0;
+			}
+
+			100% {
+				-webkit-transform: perspective(140px) rotateX(0deg);
+				transform: perspective(140px) rotateX(0deg);
+				opacity: 1;
+			}
+		}
+
+		@keyframes sk-foldCubeAngleNo {
+			0% {
+				transform: scale(1);
+				opacity: 1;
+			}
+
+			25% {
+				transform: scale(0);
+				opacity: 0;
+			}
+		}
+
+		@keyframes turn {
+			0% {
+				-webkit-transform: rotate(0deg);
+				opacity: 1;
+			}
+
+			25% {
+				-webkit-transform: rotate(90deg);
+				opacity: .9;
+			}
+
+			50% {
+				-webkit-transform: rotate(180deg);
+				opacity: .8;
+			}
+
+			75% {
+				-webkit-transform: rotate(270deg);
+				opacity: .9;
+			}
+
+			100% {
+				-webkit-transform: rotate(360deg);
+				opacity: 1;
+			}
+		}
+
+	}
 </style>