first commit

src/utils/request.js

@@ -31,7 +31,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 20000
 })
 
 // request拦截器

src/views/pay/payAgentUser/operate.vue

@@ -20,6 +20,22 @@
               inactive-value="close" @change="switchStatusChange('statusOut', detailInfoList)">
             </el-switch>
           </el-form-item>
+
+          <el-form-item label="向上取整开关" prop="roundUpStatus">
+            <el-switch v-model="infoList.roundUpStatus" active-text="开" inactive-text="关" active-value="open"
+              inactive-value="close">
+            </el-switch>
+          </el-form-item>
+
+          <el-form-item label="向下取整开关" prop="roundDownStatus">
+            <el-switch v-model="infoList.roundDownStatus" active-text="开" inactive-text="关" active-value="open"
+              inactive-value="close">
+            </el-switch>
+          </el-form-item>
+
+
+
+
           <el-form-item label="手工代付开关" prop="artistName">
             <el-switch v-model="infoList.paymentManualStatus" active-text="开" inactive-text="关" active-value="open"
               inactive-value="close">
@@ -243,6 +259,10 @@ export default {
         this.$message.error("请填写谷歌动态验证码");
         return;
       }
+      if (this.infoList.roundDownStatus == 'open' && this.infoList.roundUpStatus == 'open') {
+        this.$message.error("向上取整和向下取整开关不能同时开启");
+        return;
+      }
       this.loading = true
       this.infoList.storeId = this.val;
       this.infoList.id = this.infoList.id < 1 ? null : this.infoList.id;

src/views/pay/payOrder/payOrderWater.vue

@@ -131,11 +131,15 @@
                 </el-table-column>
                 <el-table-column label="付款人" align="center" prop="userKey" min-width="80"></el-table-column>
 
-                <el-table-column :label="'交易金额\n实付金额\n到账金额'" align="center" prop="storeNo" min-width="80">
+                <el-table-column :label="'请求金额\n交易金额\n实付金额\n到账金额'" align="center" prop="storeNo" min-width="80">
                     <template slot-scope="scope">
-                        {{ scope.row.tranAmt }}<br />
-                        {{ scope.row.payAmt }}<br />
-                        {{ scope.row.realAmt }}
+                        <span> {{ scope.row.requestAmt }}</span>
+                        <br />
+                        <span> {{ scope.row.tranAmt }}</span>
+                        <br />
+                        <span> {{ scope.row.payAmt }}</span>
+                        <br />
+                        <span> {{ scope.row.realAmt }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column :label="'手续费率(%)\n通道费率(%)'" align="center" prop="storeNo" min-width="80">