diff --git a/App.vue b/App.vue
index 73847e1..263e37f 100644
--- a/App.vue
+++ b/App.vue
@@ -4,11 +4,11 @@
 			// url: 'http://192.168.3.4:9301/crest',
 			// imgUrl: 'https://192.168.3.4:9301/filesystem/',
 			//正式
-			url: 'https://pay.dctpay.com/crest',
-			imgUrl: 'https://gratia-pay.obs.cn-southwest-2.myhuaweicloud.com',
+			// url: 'https://pay.dctpay.com/crest',
+			// imgUrl: 'https://gratia-pay.obs.cn-southwest-2.myhuaweicloud.com',
 			//测试
-			// url: 'https://gratia-pay.dctpay.com/crest',
-			// imgUrl: 'https://gratia-pay-test.obs.cn-east-3.myhuaweicloud.com',
+			url: 'https://gratia-pay.dctpay.com/crest',
+			imgUrl: 'https://gratia-pay-test.obs.cn-east-3.myhuaweicloud.com',
 			userInfo: "",
 			openId: '',
 			h5code: '',
@@ -57,6 +57,13 @@
 				}
 			});
 
+			const res = uni.getSystemInfoSync();
+			uni.setStorageSync('platform', res.platform);
+			plus.runtime.getProperty(plus.runtime.appid, function(inf) {
+				uni.setStorageSync('version', inf.version); // 大版本号
+				uni.setStorageSync('versionCode', inf.versionCode); // 小版本号
+			});
+			let uuid = plus.device.uuid;
 
 		},
 		onShow: function() {},
diff --git a/pages.json b/pages.json
index d022405..2b2f587 100644
--- a/pages.json
+++ b/pages.json
@@ -422,7 +422,16 @@
 			}
 
 		}
-	],
+	    ,{
+            "path" : "pages/index/scanCodeAllocation/scanCodeAllocation",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"subpackages": [{
 		"root": "subPages",
 
diff --git a/pages/index/addService/addService.vue b/pages/index/addService/addService.vue
index e901b1b..e8dce5d 100644
--- a/pages/index/addService/addService.vue
+++ b/pages/index/addService/addService.vue
@@ -134,7 +134,7 @@
 					"deviceType": this.serviceid,
 					"deviceNum": "1"
 				}
-				createDeviceOrder(datas).then(res => {
+				createDeviceOrder(datas).then(res => {
 					if (res.return_code == '000000') {
 						this.payOrder(res.return_data.orderNo);
 					} else {
diff --git a/pages/index/merchant-details/merchant-details.vue b/pages/index/merchant-details/merchant-details.vue
index 0848af4..3d14d04 100644
--- a/pages/index/merchant-details/merchant-details.vue
+++ b/pages/index/merchant-details/merchant-details.vue
@@ -9,41 +9,41 @@
 
 		<!-- 商户信息 -->
 		<view class="mart15 width100 backcorfff" v-if="current == 0">
-			<view class="notes">
+			<view class="notes" v-if="merDesInfo.account">
 				<view class="fcor666 width25">账号</view>
 				<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.account.loginName}}</view>
 			</view>
 			<view class="notes">
 				<view class="fcor666 width25">商户ID</view>
 				<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.merNo}}</view>
-			</view>
-			<view class="notes">
-				<view class="fcor666 width25">商户名称</view>
-				<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.merName}}</view>
 			</view>
-			
 			<view class="notes">
+				<view class="fcor666 width25">商户名称</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.merName}}</view>
+			</view>
+
+			<view class="notes" v-if="merDesInfo.account">
 				<view class="fcor666 width25">商户状态</view>
 				<view class="font14 fcor333 text2 width75 fotrt" v-if="merDesInfo.account.status == 1">正常</view>
 				<view class="font14 fcor333 text2 width75 fotrt" v-if="merDesInfo.account.status == 4">违规</view>
 			</view>
-			<view class="notes">
+			<view class="notes" v-if="merDesInfo.account">
 				<view class="fcor666 width25">联系人</view>
 				<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.account.userName}}</view>
-			</view>
-			<view class="notes">
-				<view class="fcor666 width25">手机号</view>
-				<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.regPhone}}</view>
+			</view>
+			<view class="notes">
+				<view class="fcor666 width25">手机号</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.regPhone}}</view>
 			</view>
 			<!-- <view class="notes">
 				<view class="fcor666 width25">身份证号</view>
 				<view class="font14 fcor333 text2 width75 fotrt">-</view>
 			</view> -->
-			<view class="notes">
+			<view class="notes" v-if="merDesInfo.merSettleAcct">
 				<view class="fcor666 width25">银行卡号</view>
 				<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.merSettleAcct.bankCardNo}}</view>
 			</view>
-			<view class="notes">
+			<view class="notes" v-if="merDesInfo.merSettleAcct">
 				<view class="fcor666 width25">所属银行</view>
 				<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.merSettleAcct.bankName}}</view>
 			</view>
diff --git a/pages/index/salesOrderList/salesOrderList.vue b/pages/index/salesOrderList/salesOrderList.vue
index 4a3d464..52ba767 100644
--- a/pages/index/salesOrderList/salesOrderList.vue
+++ b/pages/index/salesOrderList/salesOrderList.vue
@@ -29,11 +29,17 @@
 				<view class="margle10 font13 fcor999">申请数量: 1台</view>
 			</view>
 			<view class="width90 paddbotm10 alijusstart">
-				<view class="otstatucs border-r marRight10" @click.stop="orderRefund(item.orderNo)" v-if="item.status == 2">
+				<view class="otstatucs border-r marRight10" @click.stop="scanNo(item)"
+					v-if="item.status == 2 &&  item.deviceType == 2">
+					分配桌码
+				</view>
+
+				<view class="otstatucs border-r marRight10" @click.stop="orderRefund(item.orderNo)"
+					v-if="item.status == 2 && item.deviceType == 1">
 					订单退款
 				</view>
 				<view class="otstatucs border-r marRight10" @click.stop="replace(item.orderAssignList[0].id)"
-					v-if="item.status == 3">
+					v-if="item.status == 3 && item.deviceType == 1">
 					更换设备
 				</view>
 			</view>
@@ -66,7 +72,7 @@
 				], //状态
 				pageNum: 1,
 				pagesize: 15,
-				goodtyid: 2, //当前状态
+				goodtyid: 2, //当前状态
 				isLoadMore: false, //是否加载中
 				serviceList: [] //设备列表˚
 			}
@@ -98,7 +104,7 @@
 		methods: {
 			//切换id
 			switchid(item) {
-				this.goodtyid = item.id;
+				this.goodtyid = item.id;
 				this.pageNum = 1;
 				this.serviceList = [];
 				this.getOrderList();
@@ -128,6 +134,21 @@
 					}
 				})
 			},
+			//扫码分配
+			scanNo(item) {
+				// 允许从相机和相册扫码
+				uni.scanCode({
+					success: function(res) {
+						let scanCont = res.result.split('=');
+						let scanNo = scanCont[1];
+						uni.navigateTo({
+							url: '/pages/index/scanCodeAllocation/scanCodeAllocation?storename=' +
+								item.storeName + '&scanno=' + scanNo + '&orderno=' + item.orderNo
+						})
+					}
+				});
+
+			},
 			//分配设备
 			jumpService(item) {
 				if (this.goodtyid == 2) {
diff --git a/pages/index/scanCodeAllocation/scanCodeAllocation.vue b/pages/index/scanCodeAllocation/scanCodeAllocation.vue
new file mode 100644
index 0000000..9907c5a
--- /dev/null
+++ b/pages/index/scanCodeAllocation/scanCodeAllocation.vue
@@ -0,0 +1,107 @@
+<template>
+	<view>
+
+		<view class="username">
+			<view class="namecont">绑定门店</view>
+			<view class="font14 fcor333 text2 width75 fotrt">{{storeName}}</view>
+		</view>
+
+		<view class="username">
+			<view class="namecont">绑定编号</view>
+			<view class="font14 fcor333 text2 width75 fotrt">{{scanNo}}</view>
+		</view>
+
+		<view class="btn" @tap="assignOrder">提交绑定</view>
+	</view>
+</template>
+
+<script>
+	import {
+		assignOrder
+	} from '../../../Utils/Api.js';
+	export default {
+		data() {
+			return {
+				scanNo: '', //扫码编号,
+				storeName: '', //门店名称
+				orderNo: '' //订单编号
+			}
+		},
+		onLoad(options) {
+			this.scanNo = options.scanno;
+			this.storeName = options.storename;
+			this.orderNo = options.orderno;
+		},
+		methods: {
+			//分配设备
+			assignOrder() {
+				uni.showModal({
+					title: '温馨提示',
+					content: '是否分配当前设备',
+					success: (res) => {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '加载中'
+							})
+							let serviceList = [];
+							serviceList.push(this.scanNo);
+							let datas = {
+								"orderNo": this.orderNo,
+								"deviceNoList": serviceList
+							}
+							assignOrder(datas).then(res => {
+								uni.hideLoading();
+								if (res.return_code == '000000') {
+									uni.showToast({
+										title: '分配成功',
+										duration: 2000,
+										icon: 'none'
+									})
+									uni.navigateBack({})
+								} else {
+									uni.showToast({
+										title: res.return_msg,
+										duration: 2000,
+										icon: 'none'
+									})
+								}
+							})
+						} else if (res.cancel) {}
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.username {
+		width: calc(100% - 90upx);
+		height: 100upx;
+		display: flex;
+		align-items: center;
+		background-color: rgba($color: #ffffff, $alpha: 0.1);
+		border-bottom: 1px solid #f6f6f6;
+		padding: 8upx 45upx;
+
+		.namecont {
+			color: #666666;
+			width: 28%;
+		}
+	}
+
+	.btn {
+		color: #FFFFFF;
+		background-color: #0083f5;
+		width: 90%;
+		margin-left: 5%;
+		margin-top: 80rpx;
+		margin-bottom: 50rpx;
+		height: 90rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 10rpx;
+		font-size: 40rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/serviceApplicationList/serviceApplicationList.vue b/pages/index/serviceApplicationList/serviceApplicationList.vue
index 3e88563..03d6b1d 100644
--- a/pages/index/serviceApplicationList/serviceApplicationList.vue
+++ b/pages/index/serviceApplicationList/serviceApplicationList.vue
@@ -77,13 +77,15 @@
 				})
 			},
 			// 添加设备
-			jumpaddservice() {
-				uni.showToast({
-					title:'请前往微信小程序申请设备'
-				})
-				// uni.navigateTo({
-				// 	url: '../addService/addService'
+			jumpaddservice() {
+				// uni.showToast({
+				// 	title: '请前往微信小程序申请设备',
+				// 	duration: 2000,
+				// 	icon: 'none'
 				// })
+				uni.navigateTo({
+					url: '../addService/addService'
+				})
 			},
 			//进入详情
 			jumpdetails(item) {
@@ -134,4 +136,4 @@
 		position: fixed;
 		right: 40rpx;
 	}
-</style>
+</style>
\ No newline at end of file