diff --git a/src/views/dashboard/PieChartCreate.vue b/src/views/dashboard/PieChartCreate.vue
index c7348d2..15aada0 100644
--- a/src/views/dashboard/PieChartCreate.vue
+++ b/src/views/dashboard/PieChartCreate.vue
@@ -13,14 +13,17 @@
           </span>
         </div>
 
-        <!-- <div class="module">
-        <demo :rate="chartData.collectionSuccessOrderNum / chartData.collectionTotalOrder" :circleColor="'#46F2BC'">
-          <span class="slot-font1">{{Math.floor((chartData.collectionSuccessOrderNum / chartData.collectionTotalOrder) * 100)}}%</span>
-        </demo>
-      </div> -->
-     
+        <div class="module">
+          <demo :rate="chartData.collectionSuccessOrderNum / chartData.collectionTotalOrder" :circleColor="'#46F2BC'">
+            <span class="slot-font1"
+              v-if="isNaN(Math.floor((chartData.collectionSuccessOrderNum / chartData.collectionTotalOrder) * 100)) != true">{{ Math.floor((chartData.collectionSuccessOrderNum
+                / chartData.collectionTotalOrder) * 100) }}%</span>
+            <span class="slot-font1" v-else>0%</span>
+          </demo>
+        </div>
+
         <div class="pieCon1 center" id="myChart1" style="width:150px;height:150px;margin-bottom: 15px;"></div>
-        
+
         <div class="center">
           <count-to :start-val="0" :end-val="chartData.collectionSuccessOrderNum" :duration="3600"
             class="card-panel-num" />
@@ -38,30 +41,34 @@
           </span>
           <span class="t2">
             总金额：
-            
-            <span v-if="chartData.collectionAllPrice>=10000">{{ NumberDiv(chartData.collectionAllPrice,10000) }}</span>
+
+            <span v-if="chartData.collectionAllPrice >= 10000">{{ NumberDiv(chartData.collectionAllPrice, 10000) }}</span>
             <span v-else>{{ chartData.collectionAllPrice }}</span>
 
-            <span v-if="chartData.collectionAllPrice>=10000">万元</span>
+            <span v-if="chartData.collectionAllPrice >= 10000">万元</span>
             <span v-else>元</span>
           </span>
         </div>
 
 
-        <!-- <div class="module">
-        <demo :rate="chartData.collectionSuccessPrice / chartData.collectionAllPrice" :circleColor="'#FFD670'">
-          <span class="slot-font1">{{Math.floor((chartData.collectionSuccessPrice / chartData.collectionAllPrice) * 100)}}%</span>
-        </demo>
-      </div> -->
+        <div class="module">
+          <demo :rate="chartData.collectionSuccessPrice / chartData.collectionAllPrice" :circleColor="'#FFD670'">
+            <span class="slot-font1"
+              v-if="isNaN(Math.floor((chartData.collectionSuccessPrice / chartData.collectionAllPrice) * 100)) != true">{{ Math.floor((chartData.collectionSuccessPrice
+                / chartData.collectionAllPrice) * 100) }}%</span>
+            <span class="slot-font1" v-else>0%</span>
+          </demo>
+        </div>
 
         <div class="pieCon1 center" id="myChart2" style="width:150px;height:150px;margin-bottom: 15px;"></div>
         <div class="center">
-          <count-to :start-val="0" :end-val="chartData.collectionSuccessPrice/10000" :duration="3600"
-            class="card-panel-num" v-if="chartData.collectionSuccessPrice>=10000" :decimals="2" />
-          <count-to :start-val="0" :end-val="chartData.collectionSuccessPrice" :duration="3600"
-            class="card-panel-num" v-else :decimals="2" />
+          <count-to :start-val="0" :end-val="chartData.collectionSuccessPrice / 10000" :duration="3600"
+            class="card-panel-num" v-if="chartData.collectionSuccessPrice >= 10000" :decimals="2" />
+          <count-to :start-val="0" :end-val="chartData.collectionSuccessPrice" :duration="3600" class="card-panel-num"
+            v-else :decimals="2" />
 
-          <span style="font-size:14px;color:rgba(125, 140, 161, 1)" v-if="chartData.collectionSuccessPrice>=10000">万元</span>
+          <span style="font-size:14px;color:rgba(125, 140, 161, 1)"
+            v-if="chartData.collectionSuccessPrice >= 10000">万元</span>
           <span style="font-size:14px;color:rgba(125, 140, 161, 1)" v-else>元</span>
 
         </div>
@@ -78,6 +85,18 @@
             总订单：{{ chartData.paymentTotalOrder }}笔
           </span>
         </div>
+
+
+        <div class="module">
+          <demo :rate="chartData.paymentSuccessOrderNum / chartData.paymentTotalOrder" :circleColor="'#FF939D'">
+            <span class="slot-font1"
+              v-if="isNaN(Math.floor((chartData.paymentSuccessOrderNum / chartData.paymentTotalOrder) * 100)) != true">{{
+                Math.floor((chartData.paymentSuccessOrderNum / chartData.paymentTotalOrder) * 100) }}%</span>
+            <span class="slot-font1" v-else>0%</span>
+
+          </demo>
+        </div>
+
         <div class="pieCon1 center" id="myChart3" style="width:150px;height:150px;margin-bottom: 15px;"></div>
         <div class="center">
           <count-to :start-val="0" :end-val="chartData.paymentSuccessOrderNum" :duration="3600" class="card-panel-num" />
@@ -95,22 +114,32 @@
           </span>
           <span class="t2">
             总金额：
-            <span v-if="chartData.paymentAllPrice>=10000">{{ NumberDiv(chartData.paymentAllPrice,10000)  }}</span>
+            <span v-if="chartData.paymentAllPrice >= 10000">{{ NumberDiv(chartData.paymentAllPrice, 10000) }}</span>
             <span v-else>{{ chartData.paymentAllPrice }}</span>
 
-            <span v-if="chartData.paymentAllPrice>=10000">万元</span>
+            <span v-if="chartData.paymentAllPrice >= 10000">万元</span>
             <span v-else>元</span>
           </span>
         </div>
+
+        <div class="module">
+          <demo :rate="chartData.paymentSuccessPrice / chartData.paymentAllPrice" :circleColor="'#FFD670'">
+            <span class="slot-font1"
+              v-if="isNaN(Math.floor((chartData.paymentSuccessPrice / chartData.paymentAllPrice) * 100)) != true">{{
+                Math.floor((chartData.paymentSuccessPrice / chartData.paymentAllPrice) * 100) }}%</span>
+            <span class="slot-font1" v-else>0%</span>
+          </demo>
+        </div>
+
         <div class="pieCon1 center" id="myChart4" style="width:150px;height:150px;margin-bottom: 15px;"></div>
         <div class="center">
 
-          <count-to :start-val="0" :end-val="chartData.paymentSuccessPrice/10000" :duration="3600"
-            class="card-panel-num" v-if="chartData.paymentSuccessPrice>=10000" :decimals="2" />
-          <count-to :start-val="0" :end-val="chartData.paymentSuccessPrice" :duration="3600"
-            class="card-panel-num" v-else :decimals="2" />
+          <count-to :start-val="0" :end-val="chartData.paymentSuccessPrice / 10000" :duration="3600" class="card-panel-num"
+            v-if="chartData.paymentSuccessPrice >= 10000" :decimals="2" />
+          <count-to :start-val="0" :end-val="chartData.paymentSuccessPrice" :duration="3600" class="card-panel-num" v-else
+            :decimals="2" />
 
-          <span style="font-size:14px;color:rgba(125, 140, 161, 1)" v-if="chartData.paymentSuccessPrice>=10000">万元</span>
+          <span style="font-size:14px;color:rgba(125, 140, 161, 1)" v-if="chartData.paymentSuccessPrice >= 10000">万元</span>
           <span style="font-size:14px;color:rgba(125, 140, 161, 1)" v-else>元</span>
 
         </div>
@@ -205,11 +234,9 @@ export default {
       let title;
       if (this.chartData.collectionSuccessOrderNum) {
         title = Math.floor((this.chartData.collectionSuccessOrderNum / this.chartData.collectionTotalOrder) * 100) + '%'
-        console.log(Math.floor((this.chartData.collectionSuccessOrderNum / this.chartData.collectionTotalOrder) * 100))
       } else {
         title = 0 + '%'
       }
-
       this.myChart = echarts.init(document.getElementById('myChart1'))
       this.myChart.setOption({
         title: {
@@ -266,68 +293,40 @@ export default {
             silent: 'true',
             data: [
               {
-              name: '',
-              value: Math.floor((this.chartData.collectionSuccessOrderNum / this.chartData.collectionTotalOrder) * 100),
-              itemStyle: {
-                normal: {
-                  color: {
-                    // 完成的圆环的颜色
-                    colorStops: [
-                      {
-                        offset: 0,
-                        color: "#46F2BC" // 0% 处的颜色
-                      },
-                      {
-                        offset: 0.5,
-                        color: "#2ED383" // 0% 处的颜色
-                      },
-                      {
-                        offset: 0.7,
-                        color: "#2ED383" // 0% 处的颜色
-                      },
-                      {
-                        offset: 1,
-                        color: "#46F2BC" // 100% 处的颜色
-                      }
-                    ]
+                name: '',
+                value: Math.floor((this.chartData.collectionSuccessOrderNum / this.chartData.collectionTotalOrder) * 100),
+                itemStyle: {
+                  normal: {
+                    color: {
+                      // 完成的圆环的颜色
+                      colorStops: [
+                        {
+                          offset: 0,
+                          color: "#46F2BC" // 0% 处的颜色
+                        },
+                        {
+                          offset: 0.5,
+                          color: "#2ED383" // 0% 处的颜色
+                        },
+                        {
+                          offset: 0.7,
+                          color: "#2ED383" // 0% 处的颜色
+                        },
+                        {
+                          offset: 1,
+                          color: "#46F2BC" // 100% 处的颜色
+                        }
+                      ]
+                    },
                   },
                 },
-              },
-            }],
+              }],
             coordinateSystem: 'polar',
             roundCap: true,
             barWidth: 15,
             barGap: '-100%', // 两环重叠
             z: 2,
           },
-          // {
-          //   type: 'bar',
-          //   silent: 'true',
-          //   data: [
-          //     {
-          //     name: '',
-          //     value: Math.floor((this.chartData.collectionSuccessOrderNum / this.chartData.collectionTotalOrder) * 100),
-          //     itemStyle: {
-          //       normal: {
-          //         color: {
-          //           // 完成的圆环的颜色
-          //           colorStops: [
-          //             {
-          //               offset: 1,
-          //               color: "red" // 0% 处的颜色
-          //             },
-          //           ]
-          //         },
-          //       },
-          //     },
-          //   },
-          // ],
-          //   coordinateSystem: 'polar',
-          //   roundCap: true,
-          //   barWidth: 1,
-          //   barGap: '-100%', // 两环重叠
-          //   z: 3,
-          // },
           { // 灰色环
             type: 'bar',
             silent: 'true',
@@ -702,27 +701,29 @@ export default {
 }
 </script>
 <style scoped>
-
 .page-box {
   width: 100%;
   height: 100%;
   overflow: auto;
 }
+
 .main-box {
   display: flex;
   flex-wrap: wrap;
   width: 100%;
 }
+
 .module {
-  width: 100%;
-  height: 100%;
+  /* width: 100%;
+    height: 100%; */
   box-sizing: border-box;
   padding: 20px;
   position: absolute;
-  left: 135px;
-    z-index: 9999;
-    top: 67px;
+  left: 118px;
+  z-index: 99;
+  top: 69px;
 }
+
 .slot-bg {
   display: flex;
   align-items: center;
@@ -732,11 +733,13 @@ export default {
   border-radius: 50%;
   background: #fbedea;
 }
+
 .slot-font1 {
   color: #333;
   font-size: 20px;
   font-weight: bold;
 }
+
 .slot-font2 {
   color: #e45638;
   font-size: 20px;
@@ -770,5 +773,4 @@ export default {
   font-family: PingFang TC;
   font-size: 13px;
   font-weight: 400;
-}
-</style>
\ No newline at end of file
+}</style>
\ No newline at end of file
diff --git a/src/views/dashboard/demo.vue b/src/views/dashboard/demo.vue
index 1ed1b28..95aff89 100644
--- a/src/views/dashboard/demo.vue
+++ b/src/views/dashboard/demo.vue
@@ -44,7 +44,8 @@
         let obj = Object.assign({}, this.defaultConfig, this.config);
         let rotate = `rotate(${360 * rate}deg)`;
         let chartRotate = obj.clockwise ? "rotateY(0deg)" : "rotateY(180deg)";
-        let showEyes = obj.showEyes ? 1 : 0;
+        // obj.showEyes ?
+        let showEyes = isNaN(this.rate)!=true&&Math.floor(this.rate * 100)>=1 ?  1 : 0;
         return {
           "--background-image": `conic-gradient(${obj.startColor} 0%, ${obj.endColor} ${endPos}, transparent ${endPos})`,
           "--border-width": obj.borderWidth,
@@ -52,7 +53,7 @@
           "--pointer-rotate": rotate,
           "--background-color": obj.borderBackground,
           "--center-gap-bg": obj.centerCircleBg,
-          "--circle-color": obj.circleColor,
+          "--circle-color": this.circleColor,
           "--clockwise-wise": chartRotate,
           "--show-eyes": showEyes,
           "--eyes-size": obj.eyesSize,
@@ -82,8 +83,8 @@
   <style scoped>
   .chart-box {
     position: relative;
-    width: 110px;
-    height: 110px;
+    width: 106px;
+    height: 106px;
   }
   /* 核心代码、控制进度条样式及进度 */
   .outer-box {
@@ -133,15 +134,16 @@
     content: "";
     position: absolute;
     left: 0%;
-    top: -6px;
+    top: -8px;
     width: var(--dot-width);
     height: var(--dot-width);
     border-radius: 50%;
-    background: var(--circle-color);
     transform: translate(-50%, -50%);
     background: var(--circle-color);
 border: 1px solid #FFFFFF;
 box-shadow: 0px 0px 6px 0px #00000040;
+opacity: var(--show-eyes);
+
   }
   /* 进度条结尾处添加一个小眼睛，背景白色 */
   .pointer-box::before {
@@ -154,7 +156,6 @@ box-shadow: 0px 0px 6px 0px #00000040;
     border-radius: 50%;
     transform: translate(-50%, -50%);
     z-index: 1;
-    opacity: var(--show-eyes);
 
 
   }
diff --git a/src/views/otc/otcStore/index.vue b/src/views/otc/otcStore/index.vue
index 9440da6..6ea3c0e 100644
--- a/src/views/otc/otcStore/index.vue
+++ b/src/views/otc/otcStore/index.vue
@@ -33,7 +33,7 @@
         <div class="bg bg-white">
             <el-row :gutter="10" class="m-b-16">
             <el-col :span="1.5">
-                <el-button type="primary"  icon="" size="medium" @click="handleAdd('', 'add')">新增商户</el-button>
+                <el-button type="primary"  icon="" size="medium" @click="handleAdd('', 'add')">新增</el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
diff --git a/src/views/otc/otcStoreDaiFuOrder/index.vue b/src/views/otc/otcStoreDaiFuOrder/index.vue
index 2661d15..9796d0e 100644
--- a/src/views/otc/otcStoreDaiFuOrder/index.vue
+++ b/src/views/otc/otcStoreDaiFuOrder/index.vue
@@ -60,7 +60,7 @@
                 <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
             </el-row>
 
-            <el-table :data="infoList" v-loading="loading" :row-class-name="tableRowClassName">
+            <el-table :data="infoList" v-loading="loading">
 
                 <el-table-column label="平台订单号" align="center" prop="noOrder" />
 
diff --git a/src/views/otc/otcStoreRechargeOrder/index.vue b/src/views/otc/otcStoreRechargeOrder/index.vue
index 9bb9f98..a678694 100644
--- a/src/views/otc/otcStoreRechargeOrder/index.vue
+++ b/src/views/otc/otcStoreRechargeOrder/index.vue
@@ -1,116 +1,117 @@
 <template>
     <div class="app-container">
-    <div class="search_con m-b-28">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="108px">
-            <el-form-item label="平台订单号" prop="orderNo">
-                <el-input v-model="queryParams.orderNo" placeholder="请输入平台订单号" clearable size="medium"
-                    @keyup.enter.native="handleQuery" />
-            </el-form-item>
-            <el-form-item label="商户订单号" prop="outTradeNo">
-                <el-input v-model="queryParams.outTradeNo" placeholder="请输入商户订单号" clearable size="medium"
-                    @keyup.enter.native="handleQuery" />
-            </el-form-item>
-            <el-form-item label="付款地址" prop="payAddress">
-                <el-input v-model="queryParams.payAddress" placeholder="请输入付款地址" clearable size="medium"
-                    @keyup.enter.native="handleQuery" />
-            </el-form-item>
+        <div class="search_con m-b-28">
+            <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="108px">
+                <el-form-item label="平台订单号" prop="orderNo">
+                    <el-input v-model="queryParams.orderNo" placeholder="请输入平台订单号" clearable size="medium"
+                        @keyup.enter.native="handleQuery" />
+                </el-form-item>
+                <el-form-item label="商户订单号" prop="outTradeNo">
+                    <el-input v-model="queryParams.outTradeNo" placeholder="请输入商户订单号" clearable size="medium"
+                        @keyup.enter.native="handleQuery" />
+                </el-form-item>
+                <el-form-item label="付款地址" prop="payAddress">
+                    <el-input v-model="queryParams.payAddress" placeholder="请输入付款地址" clearable size="medium"
+                        @keyup.enter.native="handleQuery" />
+                </el-form-item>
 
-            <el-form-item label="支付商户名" prop="merchantName">
-                <el-input v-model="queryParams.merchantName" placeholder="请输入支付商户名" clearable size="medium"
-                    @keyup.enter.native="handleQuery" />
-            </el-form-item>
+                <el-form-item label="支付商户名" prop="merchantName">
+                    <el-input v-model="queryParams.merchantName" placeholder="请输入支付商户名" clearable size="medium"
+                        @keyup.enter.native="handleQuery" />
+                </el-form-item>
 
-            <el-form-item label="订单金额" prop="tranAmt">
-                <el-input v-model="queryParams.tranAmt" placeholder="请输入订单金额" clearable size="medium"
-                    @keyup.enter.native="handleQuery" />
-            </el-form-item>
+                <el-form-item label="订单金额" prop="tranAmt">
+                    <el-input v-model="queryParams.tranAmt" placeholder="请输入订单金额" clearable size="medium"
+                        @keyup.enter.native="handleQuery" />
+                </el-form-item>
 
-            <el-form-item label="订单状态" prop="orderStatus">
-                <el-select v-model="queryParams.orderStatus" placeholder="请选择状态" clearable size="medium">
-                    <el-option v-for="dict in sysOrderStatus" :key="dict.dictValue" :label="dict.dictLabel"
-                        :value="dict.dictValue" />
-                </el-select>
-            </el-form-item>
+                <el-form-item label="订单状态" prop="orderStatus">
+                    <el-select v-model="queryParams.orderStatus" placeholder="请选择状态" clearable size="medium">
+                        <el-option v-for="dict in sysOrderStatus" :key="dict.dictValue" :label="dict.dictLabel"
+                            :value="dict.dictValue" />
+                    </el-select>
+                </el-form-item>
 
-            <!-- <el-form-item label="订单来源" prop="sourceType">
+                <!-- <el-form-item label="订单来源" prop="sourceType">
                 <el-select v-model="queryParams.sourceType" placeholder="请选择订单来源" clearable size="medium">
                     <el-option v-for="dict in sourceTypeOptions" :key="dict.dictValue" :label="dict.dictLabel"
                         :value="dict.dictValue" />
                 </el-select>
             </el-form-item> -->
 
-            <el-form-item label="创建时间">
-                <el-date-picker v-model="dateRange" size="medium" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
-                    type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
-                    :unlink-panels="true" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
-            </el-form-item>
+                <el-form-item label="创建时间">
+                    <el-date-picker v-model="dateRange" size="medium" style="width: 340px"
+                        value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期"
+                        end-placeholder="结束日期" :unlink-panels="true"
+                        :default-time="['00:00:00', '23:59:59']"></el-date-picker>
+                </el-form-item>
 
-            <el-form-item>
-                <el-button type="primary" size="medium" @click="handleQuery">搜索</el-button>
-                <el-button  size="medium" @click="resetQuery">重置</el-button>
-            </el-form-item>
-        </el-form>
+                <el-form-item>
+                    <el-button type="primary" size="medium" @click="handleQuery">搜索</el-button>
+                    <el-button size="medium" @click="resetQuery">重置</el-button>
+                </el-form-item>
+            </el-form>
         </div>
 
         <div class="bg bg-white">
-      <el-row :gutter="10" class="m-b-16">
-            <el-col :span="1.5">
-                <el-button type="primary"   size="medium" @click="handleExport">导出</el-button>
-                <el-button type="primary"  size="medium" @click="handleTest">测试下单</el-button>
-            </el-col>
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
+            <el-row :gutter="10" class="m-b-16">
+                <el-col :span="1.5">
+                    <el-button type="primary" size="medium" @click="handleExport">导出</el-button>
+                    <el-button type="primary" size="medium" @click="handleTest">测试下单</el-button>
+                </el-col>
+                <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+            </el-row>
 
-        <el-table v-loading="loading" :data="otcCoinList">
-            <el-table-column label="平台订单号" align="center" prop="orderNo" />
-            <el-table-column label="商户订单号" align="center" prop="outTradeNo" />
-            <el-table-column label="商户编号" align="center" prop="merchantNo" />
-            <el-table-column :label="'订单金额'" align="center" prop="tranAmt">
-                <template slot-scope="scope">
-                    {{ scope.row.tranAmt }}
-                </template>
-            </el-table-column>
-            <el-table-column :label="'实付金额'" align="center" prop="payAmt">
-                <template slot-scope="scope">
-                    {{ scope.row.payAmt }}
-                </template>
-            </el-table-column>
-            <el-table-column label="地址" align="center" prop="address" />
-            <el-table-column label="付款地址" align="center" prop="payAddress" />
-            <el-table-column label="支付商户名" align="center" prop="merchantName" />
-            <el-table-column :label="'商户费率（%）'" align="center" prop="merchantSingleFee">
-                <template slot-scope="scope">
-                    {{ parseFloat(NumberMul(scope.row.merchantRate, 100)).toFixed(2) }}
-                </template>
-            </el-table-column>
-            <el-table-column :label="'商户单笔手续费'" align="center" prop="merchantSingleFee">
-                <template slot-scope="scope">
-                    {{ scope.row.merchantSingleFee }}
-                </template>
-            </el-table-column>
-            <el-table-column label="异步通知状态" align="center" prop="notifyStatus" :formatter="notifyStatusFormat" />
+            <el-table v-loading="loading" :data="otcCoinList">
+                <el-table-column label="平台订单号" align="center" prop="orderNo" />
+                <el-table-column label="商户订单号" align="center" prop="outTradeNo" />
+                <el-table-column label="商户编号" align="center" prop="merchantNo" />
+                <el-table-column :label="'订单金额'" align="center" prop="tranAmt">
+                    <template slot-scope="scope">
+                        {{ scope.row.tranAmt }}
+                    </template>
+                </el-table-column>
+                <el-table-column :label="'实付金额'" align="center" prop="payAmt">
+                    <template slot-scope="scope">
+                        {{ scope.row.payAmt }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="地址" align="center" prop="address" />
+                <el-table-column label="付款地址" align="center" prop="payAddress" />
+                <el-table-column label="支付商户名" align="center" prop="merchantName" />
+                <el-table-column :label="'商户费率（%）'" align="center" prop="merchantSingleFee">
+                    <template slot-scope="scope">
+                        {{ parseFloat(NumberMul(scope.row.merchantRate, 100)).toFixed(2) }}
+                    </template>
+                </el-table-column>
+                <el-table-column :label="'商户单笔手续费'" align="center" prop="merchantSingleFee">
+                    <template slot-scope="scope">
+                        {{ scope.row.merchantSingleFee }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="异步通知状态" align="center" prop="notifyStatus" :formatter="notifyStatusFormat" />
 
-            <el-table-column label="订单来源" align="center" prop="sourceType" :formatter="sourceTypeFormat" />
-            <!-- <el-table-column label="变动来源" align="center" prop="source" :formatter="sysOrderStatusFormat" /> -->
-            <el-table-column :label="'变动来源'" align="center" prop="merchantSingleFee">
-                <template slot-scope="scope">
-                    <span :style="classObje(scope.row.orderStatus)"> {{ sysOrderStatusFormat(scope.row)  }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="创建时间" align="center" prop="createTime" min-width="180" />
-            <!-- <el-table-column label="更新时间" align="center" prop="updateTime" min-width="180" /> -->
+                <el-table-column label="订单来源" align="center" prop="sourceType" :formatter="sourceTypeFormat" />
+                <!-- <el-table-column label="变动来源" align="center" prop="source" :formatter="sysOrderStatusFormat" /> -->
+                <el-table-column :label="'变动来源'" align="center" prop="merchantSingleFee">
+                    <template slot-scope="scope">
+                        <span :style="classObje(scope.row.orderStatus)"> {{ sysOrderStatusFormat(scope.row) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="创建时间" align="center" prop="createTime" min-width="180" />
+                <!-- <el-table-column label="更新时间" align="center" prop="updateTime" min-width="180" /> -->
 
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                <template slot-scope="scope">
-                    <el-button size="medium" type="text" style="  ;" v-if="scope.row.orderStatus == 1"
-                        @click="handleOrder(scope.row)">手工处理</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
+                <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                    <template slot-scope="scope">
+                        <el-button size="medium" type="text" style="  ;" v-if="scope.row.orderStatus == 1"
+                            @click="handleOrder(scope.row)">手工处理</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
-            </div>
+            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+                :limit.sync="queryParams.pageSize" @pagination="getList" />
+        </div>
 
         <!-- 处理当前订单 -->
         <el-dialog v-dialogDrag title="手工处理" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false"
@@ -164,18 +165,18 @@ export default {
     name: "otcStoreRechargeOrder",
     components: {
     },
-    computed:{
-        classObje(status){
-            return(status)=>{
-            if(status==1){
-                return {'color':'#FF7C1E'}
-            }
-            if(status==2){
-                return {'color':'#50BC92'}
-            }
-            if(status==3){
-                return {'color':'#ED5059'}
-            }
+    computed: {
+        classObje(status) {
+            return (status) => {
+                if (status == 1) {
+                    return { 'color': '#FF7C1E' }
+                }
+                if (status == 2) {
+                    return { 'color': '#50BC92' }
+                }
+                if (status == 3) {
+                    return { 'color': '#ED5059' }
+                }
             }
         }
     },
@@ -244,27 +245,26 @@ export default {
     },
     created() {
         this.getList();
-
         this.getDicts("notify_status").then(response => {
             this.notifyStatusOptions = response.data;
             this.notifyStatusOptions.unshift({
-        dictLabel:'全部',
-        dictValue:null,
-      });
+                dictLabel: '全部',
+                dictValue: null,
+            });
         });
         this.getDicts("sys_source_type").then(response => {
             this.sourceTypeOptions = response.data;
             this.sourceTypeOptions.unshift({
-        dictLabel:'全部',
-        dictValue:null,
-      });
+                dictLabel: '全部',
+                dictValue: null,
+            });
         });
         this.getDicts("sys_order_status").then(response => {
             this.sysOrderStatus = response.data;
             this.sysOrderStatus.unshift({
-        dictLabel:'全部',
-        dictValue:null,
-      });
+                dictLabel: '全部',
+                dictValue: null,
+            });
         });
         this.init();
     },
diff --git a/src/views/user/mail/index.vue b/src/views/user/mail/index.vue
index 27e5d63..da7bb44 100644
--- a/src/views/user/mail/index.vue
+++ b/src/views/user/mail/index.vue
@@ -34,7 +34,7 @@
       </el-form-item>
 
 
-      <el-form-item label="状态" prop="mailState">
+      <el-form-item label="状态" prop="dataStatus">
         <el-select v-model="queryParams.dataStatus" placeholder="请选择状态" clearable size="medium">
           <el-option
             v-for="dict in dataStatusOptions"
@@ -45,7 +45,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="模板类型" prop="mailState">
+      <el-form-item label="模板类型" prop="mailType">
         <el-select v-model="queryParams.mailType" placeholder="请选择模板类型" clearable size="medium">
           <el-option
             v-for="dict in mailTypeOptions"