From 3616646dd0c02350a18ca377692a9119f880df2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Fri, 2 Jun 2023 16:21:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A1=A5=E5=B7=AE=E4=BB=B7?=
 =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                   | 16 +---------------
 pages/synthesize/difference.vue | 16 ++++++++++++----
 pages/user/contract.vue         |  7 -------
 3 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/manifest.json b/manifest.json
index 1c9e83a..5ac2de2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "抖火",
     "appid" : "__UNI__C305C03",
     "description" : "纵有疾风起，人生不言弃",
-    "versionName" : "1.4.6",
+    "versionName" : "1.4.7",
     "versionCode" : 104,
     "transformPx" : false,
     /* 5+App特有相关 */
@@ -95,20 +95,6 @@
             }
         },
         "nativePlugins" : {
-            "Pdf-Plugin" : {
-                "__plugin_info__" : {
-                    "name" : "Pdf-Plugin",
-                    "description" : "此插件为uni小程序Android原生插件,用于加载网络pdf,支持水印和缩放",
-                    "platforms" : "Android",
-                    "url" : "https://ext.dcloud.net.cn/plugin?id=11384",
-                    "android_package_name" : "io.douhuofalv.com",
-                    "ios_bundle_id" : "io.douhuofalv.com",
-                    "isCloud" : true,
-                    "bought" : 1,
-                    "pid" : "11384",
-                    "parameters" : {}
-                }
-            },
             "Html5App-openFile" : {
                 "__plugin_info__" : {
                     "name" : "Android 和 IOS 办公Office文档 doc docx ppt pdf 浏览支持离线浏览",
diff --git a/pages/synthesize/difference.vue b/pages/synthesize/difference.vue
index e88bcdb..81c5fb2 100644
--- a/pages/synthesize/difference.vue
+++ b/pages/synthesize/difference.vue
@@ -157,11 +157,12 @@
 					})
 					return
 				}
-				if(can.pay_status == 3 || can.pay_status == 6){
+				if(can.pay_status == 3){
 					uni.showModal({
-						title		: '提示',
-						content		: '驳回原因：' + offline_pays.remark,
+						title		: '驳回提示',
+						content		: '线下银行打款被驳回，驳回原因：' + offline_pays.remark,
 						showCancel	: false,
+						confirmText : '编辑',
 						success		: res => {
 							if(res.confirm && can.pay_status == 3){
 								this.$Router.push({
@@ -178,7 +179,14 @@
 					})
 					return
 				}
-				
+				if(can.pay_status == 6){
+					uni.showModal({
+						title		: '驳回提示',
+						content		: '补差价被驳回，驳回原因：' + remark,
+						showCancel	: false,
+					})
+					return
+				}
 				this.onPay(synthesis_diff_price_id, order_type, can, price)
 			},
 			// 差价支付
diff --git a/pages/user/contract.vue b/pages/user/contract.vue
index 1b2fd7b..89628d1 100644
--- a/pages/user/contract.vue
+++ b/pages/user/contract.vue
@@ -154,13 +154,6 @@
 						})
 					}
 				})
-				// plugin.showPdf({
-				// 	title		: name,
-				// 	url  		: url,
-				// 	maxScale	: '20',
-				// 	waterMark	: '河北抖火法律咨询服务有限公司',
-				// 	// this.user.name + ' ' + this.user.mobile,
-				// })
 			}
 		},
 		onUnload() {