修复部分页面报错问题，订单页已关闭状态显示修改

jeepay-ui-manager/src/views/mchApp/MchPayConfigAddOrEdit.vue

@@ -10,11 +10,6 @@
   >
     <a-form-model ref="infoFormModel" :model="saveObject" layout="vertical" :rules="rules">
       <a-row :gutter="16">
-        <a-col :span="12">
-          <a-form-model-item label="支付接口费率" prop="ifRate">
-            <a-input v-model="saveObject.ifRate" placeholder="请输入" suffix="%" />
-          </a-form-model-item>
-        </a-col>
         <a-col :span="12">
           <a-form-model-item label="状态" prop="state">
             <a-radio-group v-model="saveObject.state">
@@ -102,8 +97,8 @@ export default {
       ifParams: {}, // 参数配置对象
       rules: {
         infoId: [{ required: true, trigger: 'blur' }],
-        ifCode: [{ required: true, trigger: 'blur' }],
-        ifRate: [{ required: false, pattern: /^(([1-9]{1}\d{0,1})|(0{1}))(\.\d{1,4})?$/, message: '请输入0-100之间的数字，最多四位小数', trigger: 'blur' }]
+        ifCode: [{ required: true, trigger: 'blur' }]
+        // ifRate: [{ required: false, pattern: /^(([1-9]{1}\d{0,1})|(0{1}))(\.\d{1,4})?$/, message: '请输入0-100之间的数字，最多四位小数', trigger: 'blur' }]
       },
       ifParamsRules: {}
     }
@@ -189,7 +184,7 @@ export default {
             const reqParams = {}
             reqParams.infoId = that.saveObject.infoId
             reqParams.ifCode = that.saveObject.ifCode
-            reqParams.ifRate = that.saveObject.ifRate
+            // reqParams.ifRate = that.saveObject.ifRate
             reqParams.state = that.saveObject.state
             reqParams.remark = that.saveObject.remark
             // 支付参数配置不能为空

jeepay-ui-manager/src/views/mchApp/MchPayIfConfigList.vue

@@ -171,7 +171,9 @@ export default {
     },
     // 刷新支付接口card列表
     refCardList () {
-      this.$refs.infoCard.refCardList()
+      if (this.$refs.infoCard) {
+        this.$refs.infoCard.refCardList()
+      }
     },
     // 请求支付通道数据
     reqTableDataFunc (params) {

jeepay-ui-manager/src/views/mchApp/custom/AlipayPayConfig.vue

@@ -10,11 +10,6 @@
   >
     <a-form-model ref="infoFormModel" :model="saveObject" layout="vertical" :rules="rules">
       <a-row :gutter="16">
-        <a-col :span="12">
-          <a-form-model-item label="支付接口费率" prop="ifRate">
-            <a-input v-model="saveObject.ifRate" placeholder="请输入" suffix="%" />
-          </a-form-model-item>
-        </a-col>
         <a-col :span="12">
           <a-form-model-item label="状态" prop="state">
             <a-radio-group v-model="saveObject.state">
@@ -162,7 +157,7 @@ export default {
       saveObject: {}, // 保存的对象
       ifParams: {}, // 参数配置对象
       rules: {
-        ifRate: [{ required: false, pattern: /^(([1-9]{1}\d{0,1})|(0{1}))(\.\d{1,4})?$/, message: '请输入0-100之间的数字，最多四位小数', trigger: 'blur' }]
+        // ifRate: [{ required: false, pattern: /^(([1-9]{1}\d{0,1})|(0{1}))(\.\d{1,4})?$/, message: '请输入0-100之间的数字，最多四位小数', trigger: 'blur' }]
       },
       ifParamsRules: {
         appId: [{ trigger: 'blur',
@@ -284,7 +279,7 @@ export default {
             const reqParams = {}
             reqParams.infoId = that.saveObject.infoId
             reqParams.ifCode = that.saveObject.ifCode
-            reqParams.ifRate = that.saveObject.ifRate
+            // reqParams.ifRate = that.saveObject.ifRate
             reqParams.state = that.saveObject.state
             reqParams.remark = that.saveObject.remark
             // 支付参数配置不能为空

jeepay-ui-manager/src/views/mchApp/custom/WxpayPayConfig.vue

@@ -10,11 +10,6 @@
   >
     <a-form-model ref="infoFormModel" :model="saveObject" layout="vertical" :rules="rules">
       <a-row :gutter="16">
-        <a-col :span="12">
-          <a-form-model-item label="支付接口费率" prop="ifRate">
-            <a-input v-model="saveObject.ifRate" placeholder="请输入" suffix="%" />
-          </a-form-model-item>
-        </a-col>
         <a-col :span="12">
           <a-form-model-item label="状态" prop="state">
             <a-radio-group v-model="saveObject.state">
@@ -157,7 +152,7 @@ export default {
       saveObject: {}, // 保存的对象
       ifParams: { apiVersion: 'V2' }, // 参数配置对象
       rules: {
-        ifRate: [{ required: false, pattern: /^(([1-9]{1}\d{0,1})|(0{1}))(\.\d{1,4})?$/, message: '请输入0-100之间的数字，最多四位小数', trigger: 'blur' }]
+        // ifRate: [{ required: false, pattern: /^(([1-9]{1}\d{0,1})|(0{1}))(\.\d{1,4})?$/, message: '请输入0-100之间的数字，最多四位小数', trigger: 'blur' }]
       },
       ifParamsRules: {
         mchId: [{ trigger: 'blur',
@@ -290,7 +285,7 @@ export default {
             const reqParams = {}
             reqParams.infoId = that.saveObject.infoId
             reqParams.ifCode = that.saveObject.ifCode
-            reqParams.ifRate = that.saveObject.ifRate
+            // reqParams.ifRate = that.saveObject.ifRate
             reqParams.state = that.saveObject.state
             reqParams.remark = that.saveObject.remark
             // 支付参数配置不能为空

jeepay-ui-manager/src/views/order/pay/PayOrderList.vue

@@ -81,7 +81,7 @@
         <template slot="stateSlot" slot-scope="{record}">
           <a-tag
             :key="record.state"
-            :color="record.state === 0?'blue':record.state === 1?'orange':record.state === 2?'green':'volcano'"
+            :color="record.state === 0?'blue':record.state === 1?'orange':record.state === 2?'green':record.state === 6?'':'volcano'"
           >
             {{ record.state === 0?'订单生成':record.state === 1?'支付中':record.state === 2?'支付成功':record.state === 3?'支付失败':record.state === 4?'已撤销':record.state === 5?'已退款':record.state === 6?'订单关闭':'未知' }}
           </a-tag>
@@ -204,7 +204,7 @@
           <a-col :sm="12">
             <a-descriptions>
               <a-descriptions-item label="订单状态">
-                <a-tag :color="detailData.state === 0?'blue':detailData.state === 1?'orange':detailData.state === 2?'green':'volcano'">
+                <a-tag :color="detailData.state === 0?'blue':detailData.state === 1?'orange':detailData.state === 2?'green':detailData.state === 6?'':'volcano'">
                   {{ detailData.state === 0?'订单生成':detailData.state === 1?'支付中':detailData.state === 2?'支付成功':detailData.state === 3?'支付失败':detailData.state === 4?'已撤销':detailData.state === 5?'已退款':detailData.state === 6?'订单关闭':'未知' }}
                 </a-tag>
               </a-descriptions-item>

jeepay-ui-merchant/src/views/mchApp/List.vue

@@ -34,7 +34,7 @@
         :tableColumns="tableColumns"
         :searchData="searchData"
         :scrollX="1200"
-        rowKey="mchName"
+        rowKey="appId"
       >
         <template slot="appIdSlot" slot-scope="{record}">
           <b>{{ record.appId }}</b>

jeepay-ui-merchant/src/views/mchApp/MchPayConfigAddOrEdit.vue

@@ -10,11 +10,6 @@
   >
     <a-form-model ref="infoFormModel" :model="saveObject" layout="vertical" :rules="rules">
       <a-row :gutter="16">
-        <a-col :span="12">
-          <a-form-model-item label="支付接口费率" prop="ifRate">
-            <a-input v-model="saveObject.ifRate" placeholder="请输入" suffix="%" />
-          </a-form-model-item>
-        </a-col>
         <a-col :span="12">
           <a-form-model-item label="状态" prop="state">
             <a-radio-group v-model="saveObject.state">
@@ -102,8 +97,8 @@ export default {
       ifParams: {}, // 参数配置对象
       rules: {
         infoId: [{ required: true, trigger: 'blur' }],
-        ifCode: [{ required: true, trigger: 'blur' }],
-        ifRate: [{ required: false, pattern: /^(([1-9]{1}\d{0,1})|(0{1}))(\.\d{1,4})?$/, message: '请输入0-100之间的数字，最多四位小数', trigger: 'blur' }]
+        ifCode: [{ required: true, trigger: 'blur' }]
+        // ifRate: [{ required: false, pattern: /^(([1-9]{1}\d{0,1})|(0{1}))(\.\d{1,4})?$/, message: '请输入0-100之间的数字，最多四位小数', trigger: 'blur' }]
       },
       ifParamsRules: {}
     }
@@ -189,7 +184,7 @@ export default {
             const reqParams = {}
             reqParams.infoId = that.saveObject.infoId
             reqParams.ifCode = that.saveObject.ifCode
-            reqParams.ifRate = that.saveObject.ifRate
+            // reqParams.ifRate = that.saveObject.ifRate
             reqParams.state = that.saveObject.state
             reqParams.remark = that.saveObject.remark
             // 支付参数配置不能为空

jeepay-ui-merchant/src/views/mchApp/MchPayIfConfigList.vue

@@ -169,7 +169,9 @@ export default {
     },
     // 刷新支付接口card列表
     refCardList () {
-      this.$refs.infoCard.refCardList()
+      if (this.$refs.infoCard) {
+        this.$refs.infoCard.refCardList()
+      }
     },
     // 请求支付通道数据
     reqTableDataFunc (params) {

jeepay-ui-merchant/src/views/mchApp/custom/AlipayPayConfig.vue

@@ -10,11 +10,6 @@
   >
     <a-form-model ref="infoFormModel" :model="saveObject" layout="vertical" :rules="rules">
       <a-row :gutter="16">
-        <a-col :span="12">
-          <a-form-model-item label="支付接口费率" prop="ifRate">
-            <a-input v-model="saveObject.ifRate" placeholder="请输入" suffix="%" />
-          </a-form-model-item>
-        </a-col>
         <a-col :span="12">
           <a-form-model-item label="状态" prop="state">
             <a-radio-group v-model="saveObject.state">
@@ -162,7 +157,7 @@ export default {
       saveObject: {}, // 保存的对象
       ifParams: {}, // 参数配置对象
       rules: {
-        ifRate: [{ required: false, pattern: /^(([1-9]{1}\d{0,1})|(0{1}))(\.\d{1,4})?$/, message: '请输入0-100之间的数字，最多四位小数', trigger: 'blur' }]
+        // ifRate: [{ required: false, pattern: /^(([1-9]{1}\d{0,1})|(0{1}))(\.\d{1,4})?$/, message: '请输入0-100之间的数字，最多四位小数', trigger: 'blur' }]
       },
       ifParamsRules: {
         appId: [{ trigger: 'blur',
@@ -284,7 +279,7 @@ export default {
             const reqParams = {}
             reqParams.infoId = that.saveObject.infoId
             reqParams.ifCode = that.saveObject.ifCode
-            reqParams.ifRate = that.saveObject.ifRate
+            // reqParams.ifRate = that.saveObject.ifRate
             reqParams.state = that.saveObject.state
             reqParams.remark = that.saveObject.remark
             // 支付参数配置不能为空

jeepay-ui-merchant/src/views/mchApp/custom/WxpayPayConfig.vue

@@ -10,11 +10,6 @@
   >
     <a-form-model ref="infoFormModel" :model="saveObject" layout="vertical" :rules="rules">
       <a-row :gutter="16">
-        <a-col :span="12">
-          <a-form-model-item label="支付接口费率" prop="ifRate">
-            <a-input v-model="saveObject.ifRate" placeholder="请输入" suffix="%" />
-          </a-form-model-item>
-        </a-col>
         <a-col :span="12">
           <a-form-model-item label="状态" prop="state">
             <a-radio-group v-model="saveObject.state">
@@ -157,7 +152,7 @@ export default {
       saveObject: {}, // 保存的对象
       ifParams: { apiVersion: 'V2' }, // 参数配置对象
       rules: {
-        ifRate: [{ required: false, pattern: /^(([1-9]{1}\d{0,1})|(0{1}))(\.\d{1,4})?$/, message: '请输入0-100之间的数字，最多四位小数', trigger: 'blur' }]
+        // ifRate: [{ required: false, pattern: /^(([1-9]{1}\d{0,1})|(0{1}))(\.\d{1,4})?$/, message: '请输入0-100之间的数字，最多四位小数', trigger: 'blur' }]
       },
       ifParamsRules: {
         mchId: [{ trigger: 'blur',
@@ -290,7 +285,7 @@ export default {
             const reqParams = {}
             reqParams.infoId = that.saveObject.infoId
             reqParams.ifCode = that.saveObject.ifCode
-            reqParams.ifRate = that.saveObject.ifRate
+            // reqParams.ifRate = that.saveObject.ifRate
             reqParams.state = that.saveObject.state
             reqParams.remark = that.saveObject.remark
             // 支付参数配置不能为空

jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue

@@ -74,7 +74,7 @@
         <template slot="stateSlot" slot-scope="{record}">
           <a-tag
             :key="record.state"
-            :color="record.state === 0?'blue':record.state === 1?'orange':record.state === 2?'green':'volcano'"
+            :color="record.state === 0?'blue':record.state === 1?'orange':record.state === 2?'green':record.state === 6?'':'volcano'"
           >
             {{ record.state === 0?'订单生成':record.state === 1?'支付中':record.state === 2?'支付成功':record.state === 3?'支付失败':record.state === 4?'已撤销':record.state === 5?'已退款':record.state === 6?'订单关闭':'未知' }}
           </a-tag>
@@ -182,7 +182,7 @@
           <a-col :sm="12">
             <a-descriptions>
               <a-descriptions-item label="订单状态">
-                <a-tag :color="detailData.state === 0?'blue':detailData.state === 1?'orange':detailData.state === 2?'green':'volcano'">
+                <a-tag :color="detailData.state === 0?'blue':detailData.state === 1?'orange':detailData.state === 2?'green':detailData.state === 6?'':'volcano'">
                   {{ detailData.state === 0?'订单生成':detailData.state === 1?'支付中':detailData.state === 2?'支付成功':detailData.state === 3?'支付失败':detailData.state === 4?'已撤销':detailData.state === 5?'已退款':detailData.state === 6?'订单关闭':'未知' }}
                 </a-tag>
               </a-descriptions-item>