From 196093f35134e8a122f8409779e858ad56367fe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 21 Jan 2024 16:39:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mdp/mo/moOrder/Form.vue        |  2 +-
 src/views/mdp/mo/moOrderModule/Index.vue |  2 +-
 src/views/order/createOrder.vue          | 12 +++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/views/mdp/mo/moOrder/Form.vue b/src/views/mdp/mo/moOrder/Form.vue
index 08a9b96..12723bd 100644
--- a/src/views/mdp/mo/moOrder/Form.vue
+++ b/src/views/mdp/mo/moOrder/Form.vue
@@ -177,7 +177,7 @@
 					<el-tab-pane label="折扣信息" name="4" > 
 						
 						<el-form-item label="最新折扣率" prop="odisRate">
-							<el-input style="width:30%;" type="number" v-model="odisRate" :min="0" :max="200"></el-input> %
+							<el-input style="width:30%;" type="number" v-model="odisRate" title="折扣率0.01-100之间，9.9折填99，9折填90,最小填0.01折"></el-input> %
 							<el-button @click="odisRateConfirm">确认修改折扣率</el-button>
 						</el-form-item>  
 					</el-tab-pane>
diff --git a/src/views/mdp/mo/moOrderModule/Index.vue b/src/views/mdp/mo/moOrderModule/Index.vue
index 65d4c16..c253df6 100644
--- a/src/views/mdp/mo/moOrderModule/Index.vue
+++ b/src/views/mdp/mo/moOrderModule/Index.vue
@@ -1,7 +1,7 @@
 <template>
 	<section class="border padding">
 		<el-row>
-            			<el-input v-model="filters.orderId" style="width: 20%;" placeholder="订单编号查询 输入 *字符* >10 <9 等" clearable title="支持>、<、 >=、<=、!=、*字符*、$IS NULL、$IN 1,2,3、$between 1,5等操作符"/>
+            <el-input v-model="filters.orderId" style="width: 20%;" placeholder="订单编号查询 输入 *字符* >10 <9 等" clearable title="支持>、<、 >=、<=、!=、*字符*、$IS NULL、$IN 1,2,3、$between 1,5等操作符"/>
 			<el-input v-model="filters.moduleId" style="width: 20%;" placeholder="模块编号查询 输入 *字符* >10 <9 等" clearable title="支持>、<、 >=、<=、!=、*字符*、$IS NULL、$IN 1,2,3、$between 1,5等操作符"/>
  			<el-button v-loading="load.list" :disabled="load.list==true" @click="searchTableDatas()" icon="el-icon-search" type="primary">查询</el-button>
 			<span style="float:right;" v-if="currOpType=='mng'">
diff --git a/src/views/order/createOrder.vue b/src/views/order/createOrder.vue
index c084740..74dad10 100644
--- a/src/views/order/createOrder.vue
+++ b/src/views/order/createOrder.vue
@@ -87,13 +87,15 @@
     <el-dialog
       title="微信支付"
       :visible.sync="weixinPayVisible"
-      :show-close="false"
+      :show-close="true"
+      :close-on-click-modal="false"
       @close="closeDialog"
        width="350px"
-     >
-      <qriously :value="codeUrl" :size="300" />
-
-
+     > 
+     <el-row> 
+      <h2>总金额￥: <b>{{data.order?data.order.ofinalFee:''}}元</b></h2>
+     </el-row>
+      <qriously :value="codeUrl" :size="300" /> 
     </el-dialog>
 
   </div>