From 0b7da8dfcf42c85191dc9b939ce5fc98cb8f4fa2 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Sun, 25 Jun 2023 16:33:26 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AF=B9=E6=8E=A5=E6=A1=8C=E7=A0=81=202.?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=203.?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=89=AB=E7=A0=81=E5=88=86=E9=85=8D=E4=BA=8C?=
 =?UTF-8?q?=E7=BB=B4=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |   5 +-
 Utils/Api.js                                  |  43 +-
 components/downloadUp.vue                     | 616 +++++++++---------
 manifest.json                                 | 266 ++++----
 pages/index/bindScan/bindScan.vue             |  16 +-
 .../merchant-details/merchant-details.vue     |  26 +-
 pages/index/salesOrderList/salesOrderList.vue |  24 +-
 .../scanCodeAllocation/scanCodeAllocation.vue |  18 +-
 pages/tabBar/home/home.vue                    |   6 +
 9 files changed, 523 insertions(+), 497 deletions(-)

diff --git a/App.vue b/App.vue
index 263e37f..f9e1a21 100644
--- a/App.vue
+++ b/App.vue
@@ -59,9 +59,8 @@
 
 			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); // 小版本号
+			plus.runtime.getProperty(plus.runtime.appid, function(inf) {
+				uni.setStorageSync('version', inf.versionCode); 
 			});
 			let uuid = plus.device.uuid;
 
diff --git a/Utils/Api.js b/Utils/Api.js
index ff9dc61..3abfc92 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -177,18 +177,6 @@ export const deviceRefund = params => {
 
 
 
-// //门店添加设备
-// export const bindStoreDevice = params => {
-// 	return POST('POST', `${base}/device/bindStoreDevice`, params).then(res => res.data);
-// }
-// //业务员查询设备列表
-// export const getSalesmanDeviceList = params => {
-// 	return POST('GET', `${base}/device/getSalesmanDeviceList`, params).then(res => res.data);
-// }
-// //门店查询设备列表
-// export const getStoreDeviceList = params => {
-// 	return POST('GET', `${base}/device/getStoreDeviceList`, params).then(res => res.data);
-// }
 
 //业务员查询统计
 export const moveHomeCount = params => {
@@ -264,25 +252,34 @@ export const enrollActivity = params => {
 // 配置费率
 export const configRosterRate = params => {
 	return POST('POST', `${base}/bankActivity/configRosterRate`, params).then(res => res.data);
-}
-
-//进件复议
+}
+
+//进件复议
 export const reconsider = params => {
 	return POST('POST', `${base}/mer/reconsider`, params).then(res => res.data);
-}
-//根据商户查询结算
+}
+//根据商户查询结算
 export const getSettleAcctByMer = params => {
 	return POST('GET', `${base}/merSettleAcct/getSettleAcctByMer`, params).then(res => res.data);
-}
-//上传cid
+}
+//上传cid
 export const uniPush = params => {
 	return POST('GET', `${base}/test/uniPush`, params).then(res => res.data);
-}
-//绑定门店关系 
+}
+//绑定门店关系 
 export const connectStoreCid = params => {
 	return POST('POST', `${base}/storeCid/connectStoreCid`, params).then(res => res.data);
-}
-//结束播报语音
+}
+//解除绑定
+export const unbindStore = params => {
+	return POST('POST', `${base}/payQrCode/unbindStore`, params).then(res => res.data);
+}
+
+//结束播报语音
 export const voiceSucceed = params => {
 	return POST('GET', `${base}/storeCid/voiceSucceed`, params).then(res => res.data);
 }
+//查询版本号?termType=APP
+export const queryVersion = params => {
+	return POST('GET', `${base}/sysVersion/queryVersion`, params).then(res => res.data);
+}
diff --git a/components/downloadUp.vue b/components/downloadUp.vue
index adb346c..da79ecc 100644
--- a/components/downloadUp.vue
+++ b/components/downloadUp.vue
@@ -1,294 +1,324 @@
-<template>
-    <view class="content" v-if="bannerShow">
-        <!-- 弹出层 -->
-        <view class="uni-banner">
-            <image src="/static/img/startUpHeader01.png" class="startUpHeaderLogo" />
-            <view class="banner_box">
-                <view class="startUpHeaderBox h6">发现新版本</view>
-                <view class="conter">{{ msg }}</view>
-                <view class="banner_foot"><button @click="goUpdate(updateApkObj)" class="banner_foot_button">前往升级</button></view>
-            </view>
-        </view>
-        <view class="uni-mask"></view>
-    </view>
-</template>
-<script>
-import { comparisonVersionHandler } from '@/common/js/tools';
-import { getUpgrade } from '@/common/js/apis';
-
-export default {
-    data() {
-        return {
-            bannerShow: false, // 是否需要強制更新app
-            msg: '',  // 更新描述
-            type: '', // 设备类型  android:2, ios:1
-            updateApkObj: null // 后台数据
-        };
-    },
-    created() {
-        const appUpdate = uni.getStorageSync('platform');
-        // #ifdef APP-PLUS
-        this.type = appUpdate == 'android' ? 2 : 1;
-        this.checkUpdate();
-        // #endif
-        
-    },
-    methods: {
-        checkUpdate() {
-            const self = this,
-                localAppVersonName = uni.getStorageSync('version'),
-                localAppVerson = uni.getStorageSync('versionCode');
-                
-            // #ifdef APP-PLUS
-            plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) {
-                getUpgrade({
-                    appType: self.type
-                }).then(res => {
-                    const { data } = res.data;
-                    if (res.data.code !== '200') return;
-                    // 大版本更新
-                    if (data.apkVersion && comparisonVersionHandler(localAppVersonName, data.apkVersion.appVersonName)) {
-                        uni.hideTabBar()
-                        self.updateApkObj = data.apkVersion;
-                        self.msg = data.apkVersion.versonLog;
-                        self.bannerShow = true;
-                        return;
-                    // app热更新
-                    } else if (data.wgtVersion && comparisonVersionHandler(localAppVerson, data.wgtVersion.appVerson)) {
-                        self.downloadWgt(data.wgtVersion.downloadUrl);
-                        return;
-                    } else {
-                        return;
-                    }
-                });
-            });
-            // #endif
-        },
-        downloadWgt(updateWgtUrl) {
-            // 热更新
-            // 下载wgt方法
-            const that = this;
-            // 更新文件 wgt 文件地址
-            plus.nativeUI.showWaiting('正在更新...');
-            plus.downloader
-                .createDownload(
-                    updateWgtUrl,
-                    {
-                        filename: '_doc/update/'
-                    },
-                    function(d, status) {
-                        if (status == 200) {
-                            that.installWgt(d.filename); // 安装wgt方法
-                        }
-                        plus.nativeUI.closeWaiting();
-                    }
-                )
-                .start();
-        },
-        installWgt(path) {
-            // 安装wgt方法
-            plus.nativeUI.showWaiting('安装文件...');
-            plus.runtime.install(
-                path,
-                { force: true },
-                function() {
-                    plus.nativeUI.closeWaiting();
-                    plus.nativeUI.alert('应用资源更新完成！', function() {
-                        plus.runtime.restart();
-                    });
-                },
-                function(e) {
-                    plus.nativeUI.closeWaiting();
-                }
-            );
-        },
-        goUpdate(updateApkObj) {
-            if (this.type == 2) {
-                // 弹出系统等待对话框
-                var dtask = plus.downloader.createDownload(updateApkObj.downloadUrl, {}, function(d, status) {
-                    this.bannerShow = false;
-                    // 下载完成
-                    if (status == 200) {
-                        plus.runtime.install(plus.io.convertLocalFileSystemURL(d.filename), {}, {}, function(error) {
-                            uni.showToast({
-                                title: '安装失败',
-                                mask: false,
-                                duration: 1500
-                            });
-                        });
-                    } else {
-                        uni.showToast({
-                            title: '更新失败',
-                            mask: false,
-                            duration: 1500
-                        });
-                    }
-                });
-                try {
-                    dtask.start(); // 开启下载的任务
-                    let prg = 0;
-                    const showLoading = plus.nativeUI.showWaiting('正在下载'); //创建一个showWaiting对象
-                    dtask.addEventListener('statechanged', function(task, status) {
-                        // 给下载任务设置一个监听 并根据状态  做操作
-                        switch (task.state) {
-                            case 1:
-                                showLoading.setTitle('正在下载');
-                                break;
-                            case 2:
-                                showLoading.setTitle('已连接到服务器');
-                                break;
-                            case 3:
-                                prg = parseInt((parseFloat(task.downloadedSize) / parseFloat(task.totalSize)) * 100);
-                                showLoading.setTitle('  正在下载' + prg + '%  ');
-                                break;
-                            case 4:
-                                plus.nativeUI.closeWaiting();
-                                //下载完成
-                                break;
-                        }
-                    });
-                } catch (err) {
-                    plus.nativeUI.closeWaiting();
-                    uni.showToast({
-                        title: '更新失败-03',
-                        mask: false,
-                        duration: 1500
-                    });
-                }
-            } else if (this.type == 1) {  // ios跳转到app store
-                plus.runtime.openURL(updateApkObj.downloadUrl);
-            }
-        }
-    }
-};
-</script>
-
-<style lang="scss" scoped>
-.content,
-#img {
-    width: 100%;
-    height: 100%;
-}
-
-.content .con {
-    font-size: 0;
-    display: flex;
-    align-items: center;
-}
-
-
-#info {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 72rpx;
-    height: 72rpx;
-    line-height: 72rpx;
-    border-radius: 50%;
-    background-color: rgba(0, 0, 0, 0.3);
-    text-align: center;
-    color: #fff;
-    font-size: 24rpx;
-}
-
-
-.wrapper {
-    width: 36rpx;
-    height: 72rpx;
-    position: absolute;
-    top: 0;
-    overflow: hidden;
-}
-
-.right {
-    right: 0;
-}
-
-.left {
-    left: 0;
-}
-
-
-
-
-
-
-
-/* 弹出层形式的广告 */
-.uni-banner {
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    position: fixed;
-    left: 50%;
-    top: 50%;
-    z-index: 1000;
-    transform: translate(-50%, -50%);
-    width: 80%;
-
-    .startUpHeaderLogo {
-        width: 256rpx;
-        height: 194rpx;
-    }
-
-    .banner_box {
-        width: 100%;
-        background: #fff;
-        border-radius: 20rpx;
-    }
-
-    .startUpHeaderBox {
-        width: 100%;
-        height: 96rpx;
-        background-image: url('/static/img/startUpHeader02.png');
-        background-position: left top;
-        background-repeat: no-repeat;
-        background-size: cover;
-    }
-}
-
-.banner_box .h6 {
-    text-align: center;
-    line-height: 96rpx;
-    font-size: 36rpx;
-    color: #fff;
-    font-weight: bold;
-}
-
-.banner_box .conter {
-    font-size: 28rpx;
-    color: #333;
-    margin: 48rpx;
-}
-
-.banner_foot {
-    width: 238rpx;
-    margin: 48rpx auto;
-}
-
-.banner_foot_button {
-    background-image: linear-gradient(to right, #3aaf7a, #41bf7f);
-    line-height: 72rpx;
-    height: 72rpx;
-    font-size: 30rpx;
-    color: #fff;
-    font-weight: bold;
-    border-radius: 40rpx;
-    border: none;
-    box-shadow: 0 8rpx 20rpx 0 rgba(46, 189, 88, 0.36);
-}
-
-.banner_foot_button:active {
-    background-image: linear-gradient(to right, #41bf7f, #3aaf7a);
-}
-
-.uni-mask {
-    background: rgba(0, 0, 0, 0.6);
-    position: fixed;
-    width: 100%;
-    height: 100%;
-    left: 0;
-    top: 0;
-    z-index: 2;
-}
+<template>
+	<view class="content" v-if="bannerShow">
+		<!-- 弹出层 -->
+		<view class="uni-banner">
+			<!-- <image src="../static/logo.png" class="startUpHeaderLogo" /> -->
+			<view class="banner_box">
+				<view class="startUpHeaderBox h6">发现新版本</view>
+				<view class="conter">{{ msg }}</view>
+				<view class="banner_foot"><button @click="goUpdate()" class="banner_foot_button">前往升级</button></view>
+			</view>
+		</view>
+		<view class="uni-mask"></view>
+	</view>
+</template>
+<script>
+	// import {
+	// 	getUpgrade
+	// } from '@/common/js/apis';
+	import {
+		queryVersion
+	} from '../Utils/Api.js'
+	export default {
+		data() {
+			return {
+				bannerShow: false, // 是否需要強制更新app
+				msg: '', // 更新描述
+				type: '', // 设备类型  android:2, ios:1
+				updateApkObj: null // 后台数据
+			};
+		},
+		created() {
+			const appUpdate = uni.getStorageSync('platform');
+			// #ifdef APP-PLUS
+			this.checkUpdate();
+			// #endif
+
+		},
+		methods: {
+			checkUpdate() {
+				let that = this;
+				let localAppVersonName = uni.getStorageSync('version');
+				// #ifdef APP-PLUS
+				let datas = {
+					termType: "app"
+				}
+				queryVersion(datas).then(res => {
+					if (res.return_code == '000000') {
+						if (res.return_data.versionType == 1 && that.comparisonVersionHandler(localAppVersonName,
+								res.return_data.version)) {
+							that.downloadWgt(res.return_data.fileUrl);
+							return;
+						}
+						if (res.return_data.versionType == 2 && that.comparisonVersionHandler(localAppVersonName,
+								res.return_data.version)) {
+							that.updateApkObj = res.return_data;
+							that.bannerShow = true; // 显示弹窗
+							return;
+						}
+					}
+				})
+				// #endif
+			},
+
+			downloadWgt(updateWgtUrl) {
+				// 热更新
+				// 下载wgt方法
+				const that = this;
+				// 更新文件 wgt 文件地址
+				plus.nativeUI.showWaiting('正在更新...');
+				plus.downloader
+					.createDownload(
+						updateWgtUrl, {
+							filename: '_doc/update/'
+						},
+						function(d, status) {
+							if (status == 200) {
+								that.installWgt(d.filename); // 安装wgt方法
+							}
+							plus.nativeUI.closeWaiting();
+						}
+					)
+					.start();
+			},
+			installWgt(path) {
+				// 安装wgt方法
+				plus.nativeUI.showWaiting('安装文件...');
+				plus.runtime.install(
+					path, {
+						force: true
+					},
+					function() {
+						plus.nativeUI.closeWaiting();
+						plus.nativeUI.alert('应用资源更新完成！', function() {
+							plus.runtime.restart();
+						});
+					},
+					function(e) {
+						plus.nativeUI.closeWaiting();
+					}
+				);
+			},
+			goUpdate() {
+				if (this.type == 2) {
+					// 弹出系统等待对话框
+					var dtask = plus.downloader.createDownload(
+						this.updateApkObj.fileUrl, {},
+						function(d, status) {
+							this.bannerShow = false;
+							// 下载完成
+							if (status == 200) {
+								plus.runtime.install(plus.io.convertLocalFileSystemURL(d.filename), {}, {}, function(
+									error) {
+									uni.showToast({
+										title: '安装失败',
+										mask: false,
+										duration: 1500
+									});
+								});
+							} else {
+								uni.showToast({
+									title: '更新失败',
+									mask: false,
+									duration: 1500
+								});
+							}
+						});
+					try {
+						dtask.start(); // 开启下载的任务
+						let prg = 0;
+						const showLoading = plus.nativeUI.showWaiting('正在下载'); //创建一个showWaiting对象
+						dtask.addEventListener('statechanged', function(task, status) {
+							// 给下载任务设置一个监听 并根据状态  做操作
+							switch (task.state) {
+								case 1:
+									showLoading.setTitle('正在下载');
+									break;
+								case 2:
+									showLoading.setTitle('已连接到服务器');
+									break;
+								case 3:
+									prg = parseInt((parseFloat(task.downloadedSize) / parseFloat(task.totalSize)) *
+										100);
+									showLoading.setTitle('  正在下载' + prg + '%  ');
+									break;
+								case 4:
+									plus.nativeUI.closeWaiting();
+									//下载完成
+									break;
+							}
+						});
+					} catch (err) {
+						plus.nativeUI.closeWaiting();
+						uni.showToast({
+							title: '更新失败-03',
+							mask: false,
+							duration: 1500
+						});
+					}
+				} else if (this.type == 1) { // ios跳转到app store
+					plus.runtime.openURL(updateApkObj.downloadUrl);
+				}
+			},
+			//判断是否升级
+			comparisonVersionHandler(reqV, curV) {
+				/* 版本号名比较是否需要升级
+				curV string :当前最新
+				reqV string :之前
+				
+				返回 true 表示需要升级
+				*/
+				if (curV && reqV) {
+					curV = String(curV);
+					reqV = String(reqV);
+					//将两个版本号拆成数字
+					let arr1 = curV.split('.'), //當前
+						arr2 = reqV.split('.');
+					let minLength = Math.min(arr1.length, arr2.length),
+						position = 0,
+						diff = 0;
+					//依次比较版本号每一位大小，当对比得出结果后跳出循环
+					while (position < minLength && ((diff = parseInt(arr1[position]) - parseInt(arr2[position])) == 0)) {
+						position++;
+					}
+					diff = (diff != 0) ? diff : (arr1.length - arr2.length);
+					//若curV大于reqV，则返回true
+					return diff > 0;
+				} else {
+					//输入为空
+					return false;
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.content,
+	#img {
+		width: 100%;
+		height: 100%;
+	}
+
+	.content .con {
+		font-size: 0;
+		display: flex;
+		align-items: center;
+	}
+
+
+	#info {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 72rpx;
+		height: 72rpx;
+		line-height: 72rpx;
+		border-radius: 50%;
+		background-color: rgba(0, 0, 0, 0.3);
+		text-align: center;
+		color: #fff;
+		font-size: 24rpx;
+	}
+
+
+	.wrapper {
+		width: 36rpx;
+		height: 72rpx;
+		position: absolute;
+		top: 0;
+		overflow: hidden;
+	}
+
+	.right {
+		right: 0;
+	}
+
+	.left {
+		left: 0;
+	}
+
+
+
+
+
+
+
+	/* 弹出层形式的广告 */
+	.uni-banner {
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+		position: fixed;
+		left: 50%;
+		top: 50%;
+		z-index: 1000;
+		transform: translate(-50%, -50%);
+		width: 80%;
+
+		.startUpHeaderLogo {
+			width: 256rpx;
+			height: 194rpx;
+		}
+
+		.banner_box {
+			width: 100%;
+			background: #fff;
+			border-radius: 20rpx;
+		}
+
+		.startUpHeaderBox {
+			width: 100%;
+			height: 96rpx;
+			background-image: url('/static/logo.png');
+			background-position: left top;
+			background-repeat: no-repeat;
+			background-size: cover;
+		}
+	}
+
+	.banner_box .h6 {
+		text-align: center;
+		line-height: 96rpx;
+		font-size: 36rpx;
+		color: #fff;
+		font-weight: bold;
+	}
+
+	.banner_box .conter {
+		font-size: 28rpx;
+		color: #333;
+		margin: 48rpx;
+	}
+
+	.banner_foot {
+		width: 238rpx;
+		margin: 48rpx auto;
+	}
+
+	.banner_foot_button {
+		background-image: linear-gradient(to right, #3aaf7a, #41bf7f);
+		line-height: 72rpx;
+		height: 72rpx;
+		font-size: 30rpx;
+		color: #fff;
+		font-weight: bold;
+		border-radius: 40rpx;
+		border: none;
+		box-shadow: 0 8rpx 20rpx 0 rgba(46, 189, 88, 0.36);
+	}
+
+	.banner_foot_button:active {
+		background-image: linear-gradient(to right, #41bf7f, #3aaf7a);
+	}
+
+	.uni-mask {
+		background: rgba(0, 0, 0, 0.6);
+		position: fixed;
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top: 0;
+		z-index: 2;
+	}
 </style>
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index d49c779..e8d4b83 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,133 +1,133 @@
-{
-    "name" : "惠支付",
-    "appid" : "__UNI__190622D",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {
-            "Push" : {}
-        },
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            /* ios打包配置 */
-            "ios" : {
-                "dSYMs" : false
-            },
-            /* SDK配置 */
-            "sdkConfigs" : {
-                "push" : {
-                    "unipush" : {
-                        "offline" : false,
-                        "hms" : {}
-                    }
-                },
-                "ad" : {}
-            },
-            "icons" : {
-                "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
-                },
-                "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
-                    "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
-                    },
-                    "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
-                    }
-                }
-            }
-        }
-    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "usingComponents" : true
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
-    "vueVersion" : "2",
-    "h5" : {
-        "router" : {
-            "base" : "/cweb",
-            "mode" : "hash"
-        },
-        "title" : "惠支付",
-        "devServer" : {
-            "https" : false
-        },
-        "sdkConfigs" : {
-            "maps" : {
-                "qqmap" : {
-                    "key" : "7UMBZ-HFEHX-HSD4Q-Z3QY6-OQKN7-2QBDB"
-                }
-            }
-        }
-    }
-}
+{
+	"name": "惠支付",
+	"appid": "__UNI__190622D",
+	"description": "",
+	"versionName": "1.0.0",
+	"versionCode": 101,
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		/* 模块配置 */
+		"modules": {
+			"Push": {}
+		},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				]
+			},
+			/* ios打包配置 */
+			"ios": {
+				"dSYMs": false
+			},
+			/* SDK配置 */
+			"sdkConfigs": {
+				"push": {
+					"unipush": {
+						"offline": false,
+						"hms": {}
+					}
+				},
+				"ad": {}
+			},
+			"icons": {
+				"android": {
+					"hdpi": "unpackage/res/icons/72x72.png",
+					"xhdpi": "unpackage/res/icons/96x96.png",
+					"xxhdpi": "unpackage/res/icons/144x144.png",
+					"xxxhdpi": "unpackage/res/icons/192x192.png"
+				},
+				"ios": {
+					"appstore": "unpackage/res/icons/1024x1024.png",
+					"ipad": {
+						"app": "unpackage/res/icons/76x76.png",
+						"app@2x": "unpackage/res/icons/152x152.png",
+						"notification": "unpackage/res/icons/20x20.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"proapp@2x": "unpackage/res/icons/167x167.png",
+						"settings": "unpackage/res/icons/29x29.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"spotlight": "unpackage/res/icons/40x40.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png"
+					},
+					"iphone": {
+						"app@2x": "unpackage/res/icons/120x120.png",
+						"app@3x": "unpackage/res/icons/180x180.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"notification@3x": "unpackage/res/icons/60x60.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"settings@3x": "unpackage/res/icons/87x87.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png",
+						"spotlight@3x": "unpackage/res/icons/120x120.png"
+					}
+				}
+			}
+		}
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "",
+		"setting": {
+			"urlCheck": false
+		},
+		"usingComponents": true
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"uniStatistics": {
+		"enable": false
+	},
+	"vueVersion": "2",
+	"h5": {
+		"router": {
+			"base": "/cweb",
+			"mode": "hash"
+		},
+		"title": "惠支付",
+		"devServer": {
+			"https": false
+		},
+		"sdkConfigs": {
+			"maps": {
+				"qqmap": {
+					"key": "7UMBZ-HFEHX-HSD4Q-Z3QY6-OQKN7-2QBDB"
+				}
+			}
+		},
+	}
+}
\ No newline at end of file
diff --git a/pages/index/bindScan/bindScan.vue b/pages/index/bindScan/bindScan.vue
index 424be23..ac8e152 100644
--- a/pages/index/bindScan/bindScan.vue
+++ b/pages/index/bindScan/bindScan.vue
@@ -17,16 +17,16 @@
 			<view class="mart10 fcor666  padleft15 font14" v-else>创建: {{item.createTime | timeFormat('yyyy-mm-dd')}}
 				{{item.createTime | timeFormat('hh:mm')}}
 			</view>
-			<button class="btns" @click="bindStore(item.id)" v-if="typeId == 1">绑定二维码</button>
+			<button class="btns" @click="unbindStore(item.id)">解除绑定</button>
 		</view>
 	</view>
 </template>
 
 <script>
 	import {
-		bindStore,
 		getSalesmanQrCodeList,
-		getStoreQrCodeList
+		getStoreQrCodeList,
+		unbindStore
 	} from '../../../Utils/Api.js';
 	let app = getApp();
 	export default {
@@ -135,12 +135,12 @@
 					}
 				});
 			},
-			//绑定设备
-			bindStore(item) {
+			//解除绑定设备
+			unbindStore(item) {
 				let that = this;
 				uni.showModal({
-					title: '绑定二维码',
-					content: '是否绑定当前二维码。',
+					title: '解绑二维码',
+					content: '是否解绑当前二维码。',
 					success: (res) => {
 						if (res.confirm) {
 							uni.showLoading({
@@ -150,7 +150,7 @@
 								"qrCodeId": item,
 								"storeId": that.storeId
 							}
-							bindStore(params).then(res => {
+							unbindStore(params).then(res => {
 								uni.hideLoading();
 								if (res.return_code == '000000') {
 									uni.showToast({
diff --git a/pages/index/merchant-details/merchant-details.vue b/pages/index/merchant-details/merchant-details.vue
index 3d14d04..90adcf0 100644
--- a/pages/index/merchant-details/merchant-details.vue
+++ b/pages/index/merchant-details/merchant-details.vue
@@ -90,7 +90,7 @@
 					<view class="margle10 font14 fcor999 width90p">{{item.storeRegion.address}}</view>
 				</view>
 				<view class="height45 width100">
-					<button class="btns mart10 margle10" @click.stop="jumpBindScan(item.id,1)">绑定二维码</button>
+					<button class="btns mart10 margle10" @click.stop="jumpBindScan(item,1)">绑定二维码</button>
 					<button class="btns mart10 margle10" @click.stop="jumpBindScan(item.id,2)">二维码列表</button>
 					<!-- <button class="btns mart10 marRight10" @click.stop="jumpService(item.id,1)">绑定设备</button> -->
 					<!-- <button class="btns mart10 marRight10" @click.stop="jumpService(item.id,2)">设备列表</button> -->
@@ -166,7 +166,7 @@
 					pageNum: 1,
 					pageSize: 10
 				}
-				getStoreListByMer(datas).then(res => {
+				getStoreListByMer(datas).then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000' && res.return_data.list) {
 						this.storeList = res.return_data.list;
@@ -199,9 +199,25 @@
 			},
 			//跳转绑定二维码
 			jumpBindScan(item, items) {
-				uni.navigateTo({
-					url: '../bindScan/bindScan?storeid=' + item + '&type=' + items
-				})
+				if (items == 1) {
+					// 允许从相机和相册扫码
+					uni.scanCode({
+						success: function(res) {
+							let scanCont = res.result.split('=');
+							let scanNo = scanCont[1];
+							uni.navigateTo({
+								url: '/pages/index/scanCodeAllocation/scanCodeAllocation?storename=' +
+									item.name + '&scanno=' + scanNo +
+									'&storeId=' + item.id
+							})
+						}
+					});
+				} else {
+					uni.navigateTo({
+						url: '../bindScan/bindScan?storeid=' + item + '&type=' + items
+					})
+				}
+
 			}
 		}
 	}
diff --git a/pages/index/salesOrderList/salesOrderList.vue b/pages/index/salesOrderList/salesOrderList.vue
index 52ba767..4ec46a5 100644
--- a/pages/index/salesOrderList/salesOrderList.vue
+++ b/pages/index/salesOrderList/salesOrderList.vue
@@ -29,17 +29,12 @@
 				<view class="margle10 font13 fcor999">申请数量: 1台</view>
 			</view>
 			<view class="width90 paddbotm10 alijusstart">
-				<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">
+					v-if="item.status == 2">
 					订单退款
 				</view>
 				<view class="otstatucs border-r marRight10" @click.stop="replace(item.orderAssignList[0].id)"
-					v-if="item.status == 3 && item.deviceType == 1">
+					v-if="item.status == 3">
 					更换设备
 				</view>
 			</view>
@@ -134,21 +129,6 @@
 					}
 				})
 			},
-			//扫码分配
-			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
index 9907c5a..70d4626 100644
--- a/pages/index/scanCodeAllocation/scanCodeAllocation.vue
+++ b/pages/index/scanCodeAllocation/scanCodeAllocation.vue
@@ -11,30 +11,30 @@
 			<view class="font14 fcor333 text2 width75 fotrt">{{scanNo}}</view>
 		</view>
 
-		<view class="btn" @tap="assignOrder">提交绑定</view>
+		<view class="btn" @tap="bindStore">提交绑定</view>
 	</view>
 </template>
 
 <script>
 	import {
-		assignOrder
+		bindStore
 	} from '../../../Utils/Api.js';
 	export default {
 		data() {
 			return {
 				scanNo: '', //扫码编号,
 				storeName: '', //门店名称
-				orderNo: '' //订单编号
+				storeId: '' //订单编号
 			}
 		},
 		onLoad(options) {
 			this.scanNo = options.scanno;
 			this.storeName = options.storename;
-			this.orderNo = options.orderno;
+			this.storeId = options.storeId;
 		},
 		methods: {
 			//分配设备
-			assignOrder() {
+			bindStore() {
 				uni.showModal({
 					title: '温馨提示',
 					content: '是否分配当前设备',
@@ -43,13 +43,11 @@
 							uni.showLoading({
 								title: '加载中'
 							})
-							let serviceList = [];
-							serviceList.push(this.scanNo);
 							let datas = {
-								"orderNo": this.orderNo,
-								"deviceNoList": serviceList
+								"serialNumber": this.scanNo,
+								"storeId": this.storeId
 							}
-							assignOrder(datas).then(res => {
+							bindStore(datas).then(res => {
 								uni.hideLoading();
 								if (res.return_code == '000000') {
 									uni.showToast({
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index ccf2afb..206337f 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -64,6 +64,8 @@
 			</view>
 		</view>
 		<view class="width100 height40p"></view>
+
+		<downloadup></downloadup>
 	</view>
 </template>
 
@@ -76,8 +78,12 @@
 		connectStoreCid,
 		voiceSucceed
 	} from '../../../Utils/Api.js'
+	import downloadup from '../../../components/downloadUp.vue'
 	let app = getApp();
 	export default {
+		components: {
+			downloadup
+		},
 		data() {
 			return {
 				funcList: [],