diff --git a/src/router/index.js b/src/router/index.js
index 04a4142..cddeda5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -39,7 +39,6 @@ export const constantRoutes = [
       }
     ]
   },
-
   {
     path: '/login',
     component: (resolve) => require(['@/views/login'], resolve),
diff --git a/src/views/order/payOrder/csOrder.vue b/src/views/order/payOrder/csOrder.vue
index ad5f12e..005cd32 100644
--- a/src/views/order/payOrder/csOrder.vue
+++ b/src/views/order/payOrder/csOrder.vue
@@ -269,6 +269,9 @@
         <el-form-item label="支付金额" prop="paymentAmount">
           <el-input v-model="form.paymentAmount" placeholder="" style="width:350px" @input="change" />
         </el-form-item>
+        <div style="color:red" v-if="form.sameMarkDescribe">
+          {{ form.sameMarkDescribe }}
+        </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm('form')">保 存</el-button>
@@ -512,6 +515,7 @@ export default {
       const id = row.orderNo;
       getPayOrder(id).then((response) => {
         this.form = response.data;
+        this.form.sameMarkDescribe = row.sameMarkDescribe
         let a = response.data.reqAmount
         let b = response.data.reqAmount
         this.form.reqAmount = this.NumberDiv(a, 100)
diff --git a/src/views/order/payOrder/index.vue b/src/views/order/payOrder/index.vue
index a4c9d0c..faaa845 100644
--- a/src/views/order/payOrder/index.vue
+++ b/src/views/order/payOrder/index.vue
@@ -86,7 +86,8 @@
           <el-row :gutter="10" class="mb8">
             <el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
-            <el-button type="primary" plain icon="" size="medium" @click="handleExport()" v-hasPermi="['order:payOrder:export']">导出</el-button>
+            <el-button type="primary" plain icon="" size="medium" @click="handleExport()"
+              v-hasPermi="['order:payOrder:export']">导出</el-button>
           </el-row>
         </div>
       </el-form-item>
@@ -139,7 +140,8 @@
 
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="scope">
-            <el-button size="small" type="text" @click="handleView(scope.row)" style="color: #006eff" v-hasPermi="['order:payOrder:query']">详情</el-button>
+            <el-button size="small" type="text" @click="handleView(scope.row)" style="color: #006eff"
+              v-hasPermi="['order:payOrder:query']">详情</el-button>
             <el-button size="small" type="text" @click="handleOver(scope.row)" style="color: #006eff"
               v-if="scope.row.orderStatus == 3" v-hasPermi="['order:payOrder:overtimePayment']">超时支付</el-button>
             <el-button size="small" type="text" @click="handleNotify(scope.row)" style="color: #006eff"
@@ -257,10 +259,12 @@
         <el-form-item label="订单金额" prop="reqAmount">
           <el-input v-model="form.reqAmount" placeholder="" style="width:350px" :disabled="true" />
         </el-form-item>
-
         <el-form-item label="支付金额" prop="paymentAmount">
           <el-input v-model="form.paymentAmount" placeholder="" style="width:350px" @input="change" />
         </el-form-item>
+        <div style="color:red" v-if="form.sameMarkDescribe">
+          {{ form.sameMarkDescribe }}
+        </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm('form')">保 存</el-button>
@@ -598,6 +602,7 @@ export default {
       const id = row.orderNo;
       getPayOrder(id).then((response) => {
         this.form = response.data;
+        this.form.sameMarkDescribe = row.sameMarkDescribe
         let a = response.data.reqAmount
         let b = response.data.reqAmount
         this.form.reqAmount = this.NumberDiv(a, 100)
diff --git a/src/views/platform/platformWaterDetail/index.vue b/src/views/platform/platformWaterDetail/index.vue
index c08a9cc..0a5afc1 100644
--- a/src/views/platform/platformWaterDetail/index.vue
+++ b/src/views/platform/platformWaterDetail/index.vue
@@ -57,8 +57,7 @@
           <el-row :gutter="10" class="mb8" style="margin-left:8px">
             <el-col :span="1.5">
               <el-button type="primary" plain icon="" size="medium" @click="handleExport()"
-              v-hasPermi="['platform:platformChannel:exportPlatformWalletLogList']"
-              >导出</el-button>
+                v-hasPermi="['platform:platformChannel:exportPlatformWalletLogList']">导出</el-button>
             </el-col>
           </el-row>
           <!-- <el-row :gutter="10" class="mb8">
@@ -86,12 +85,14 @@
             {{ scope.row.accountType == 2 ? '码商' : '商户' }}
           </template>
         </el-table-column>
+
         <el-table-column :label="'金额类型'" align="center" prop="amountType">
           <template slot-scope="scope">
             {{ scope.row.amountType == 1 ? (scope.row.accountType == 2 ? '分佣' : '余额') : scope.row.amountType == 2 ? '冻结' :
               '押金' }}
           </template>
         </el-table-column>
+
         <el-table-column :label="'变动金额'" align="center" prop="change_amount">
           <template slot-scope="scope">
             {{ parseFloat(NumberDiv(scope.row.changeAmount, 100)).toFixed(2) }}
@@ -127,6 +128,9 @@
           </template>
         </el-table-column>
 
+        <!-- <el-table-column :label="'订单类型'" align="center" prop="source" :formatter="formatter"></el-table-column> -->
+
+
         <el-table-column label="备注" align="center" prop="remark" />
 
         <el-table-column label="创建时间" align="center" prop="createTime" min-width="180" />
@@ -292,6 +296,9 @@ export default {
     this.init()
   },
   methods: {
+    // formatter(row, column) {
+    //   return this.selectDictLabel(this.dict.type.source,row.source)
+    // },
     sortNum(a, b) {//排序方法
       return a - b;
     },
diff --git a/正式kakapay.zip b/测试kakapay.zip
similarity index 94%
rename from 正式kakapay.zip
rename to 测试kakapay.zip
index a7d6c76..7dc6376 100644
Binary files a/正式kakapay.zip and b/测试kakapay.zip differ