From c0dddf30071fb9dc6d429dba33322eafe7d2b0aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Sat, 18 Feb 2023 14:12:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B5=E9=9D=A2=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E9=94=99=E8=AF=AF=EF=BC=8C=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/pages/setting/membershipLevel/index.vue | 4 ++--
 template/uni-app/pages/goods/admin_order_detail/index.vue  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/template/admin/src/pages/setting/membershipLevel/index.vue b/template/admin/src/pages/setting/membershipLevel/index.vue
index db9721f2f..26fc98d88 100644
--- a/template/admin/src/pages/setting/membershipLevel/index.vue
+++ b/template/admin/src/pages/setting/membershipLevel/index.vue
@@ -78,8 +78,8 @@
           <div class="search">
             <div>
               <span>是否显示：</span>
-              <Select v-model="taskData.status" style="width: 200px">
-                <Option value="">全部</Option>
+              <Select v-model="taskData.status" style="width: 200px" clearable>
+                <!-- <Option :value="''">全部</Option> -->
                 <Option :value="1">显示</Option>
                 <Option :value="0">不显示</Option>
               </Select>
diff --git a/template/uni-app/pages/goods/admin_order_detail/index.vue b/template/uni-app/pages/goods/admin_order_detail/index.vue
index ebe94947f..8d7e81962 100644
--- a/template/uni-app/pages/goods/admin_order_detail/index.vue
+++ b/template/uni-app/pages/goods/admin_order_detail/index.vue
@@ -107,7 +107,7 @@
 				<view class='conter'>{{$t(`￥`)}}{{orderInfo.pay_postage}}</view>
 			</view>
 			<view class="actualPay acea-row row-right">
-				{{$t(`real_payment`)}}：<span class="money">{{$t(`￥`)}}{{ orderInfo.pay_price }}</span>
+				{{$t(`实际支付`)}}：<span class="money">{{$t(`￥`)}}{{ orderInfo.pay_price }}</span>
 			</view>
 		</view>
 		<view class="wrapper" v-if="