From 3eaaa2529940c5fb829d45ccc3a7819bd5eaa0ac Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Wed, 24 May 2023 16:57:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E5=A7=94=E6=89=98?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E8=A1=A8=E5=8D=95=E9=A1=B5=E9=9D=A2=E5=8F=AF?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .hbuilderx/launch.json            | 2 +-
 pages/synthesize/entrustCivil.vue | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 4ccd172..9b0d791 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -13,7 +13,7 @@
             "type" : "uniCloud"
         },
         {
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         }
     ]
diff --git a/pages/synthesize/entrustCivil.vue b/pages/synthesize/entrustCivil.vue
index ffe60e8..64cd4aa 100644
--- a/pages/synthesize/entrustCivil.vue
+++ b/pages/synthesize/entrustCivil.vue
@@ -191,6 +191,8 @@
 				}
 			}
 		},
+        
+        
 		
 		methods: {
 			// 民事类型列表
@@ -368,7 +370,7 @@
 		background-color: #111e4b;
 		width: 100vw;
 		overflow-y: scroll;
-		position: fixed;
+		// position: fixed;
 	}
 	
 	.top {

From b33b570374b7bc581e00f108c23bd259b1e0956c Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Thu, 25 May 2023 13:55:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/pay/pay.vue | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pages/pay/pay.vue b/pages/pay/pay.vue
index 97109ff..92e0f4a 100644
--- a/pages/pay/pay.vue
+++ b/pages/pay/pay.vue
@@ -20,7 +20,7 @@
 					</view>
 					<radio class="choose-radio" value="coin" :checked="payMethod == 'coin'"></radio>
 				</label>
-				<label class="choose-item nowrap">
+				<!-- <label class="choose-item nowrap">
 					<view class="choose-text">
 						<image src="@/static/icons/pay_wechat.png" mode="aspectFill"></image>
 						微信支付(银联)
@@ -33,28 +33,31 @@
 						微信支付(汇付)
 					</view>
 					<radio class="choose-radio" value="dgwx" :checked="payMethod == 'dgwx'"></radio>
-				</label>
-				<label class="choose-item nowrap" v-if="Number(total) <= 10000">
-					<view class="choose-text">
-						<image src="@/static/icons/pay_ali.png" mode="aspectFill"></image>
-						支付宝支付(银联)
-					</view>
-					<radio class="choose-radio" value="ali" :checked="payMethod == 'ali'"></radio>
-				</label>
-				<label class="choose-item nowrap">
+				</label>-->
+                 <label class="choose-item nowrap" v-if="Number(total) <= 10000">
+                 	<view class="choose-text">
+                 		<image src="@/static/icons/pay_ali.png" mode="aspectFill"></image>
+                 		支付宝支付(银联)
+                 	</view>
+                 	<radio class="choose-radio" value="ali" :checked="payMethod == 'ali'"></radio>
+                 </label>
+				
+				<!--
+                <label class="choose-item nowrap">
 					<view class="choose-text">
 						<image src="@/static/icons/pay_ali.png" mode="aspectFill"></image>
 						支付宝支付(汇付)
 					</view>
 					<radio class="choose-radio" value="dgali" :checked="payMethod == 'dgali'"></radio>
 				</label>
-				<label class="choose-item nowrap">
+                 
+                 <label class="choose-item nowrap">
 					<view class="choose-text">
 						<image src="@/static/icons/pay_code.png" mode="aspectFill"></image>
 						付款码支付
 					</view>
 					<radio class="choose-radio" value="code"></radio>
-				</label>
+				</label> -->
 			</radio-group>
 		</view>
 		<view class="deduction" v-if="(payMethod == 'wx' || payMethod == 'ali' || payMethod == 'dgwx' || payMethod == 'dgali') && payType != 'free'">