:recycle: 重构代码。 支付模块 字段调整

package.json

@@ -16,7 +16,7 @@
     "clipboard": "^2.0.4",
     "crypto-js": "^3.1.9-1",
     "echarts": "^4.2.1",
-    "element-ui": "~2.9.1",
+    "element-ui": "~2.10.0",
     "js-cookie": "^2.2.0",
     "nprogress": "^0.2.0",
     "script-loader": "^0.7.2",

src/const/crud/pay/paygoodsorder.js

@@ -21,11 +21,15 @@ export const tableOption = {
   indexLabel: '序号',
   stripe: true,
   menuAlign: 'center',
+  viewBtn: true,
   align: 'center',
   column: [
     {
-      label: '商品订单ID',
-      prop: 'goodsOrderId'
+      label: 'ID',
+      prop: 'goodsOrderId',
+      hide: true,
+      editDisabled: true,
+      addDisplay: false
     },
     {
       label: '商品ID',
@@ -36,36 +40,38 @@ export const tableOption = {
       prop: 'goodsName'
     },
     {
-      label: '金额,单位元',
+      label: '金额/元',
       prop: 'amount'
     },
     {
       label: '用户ID',
-      prop: 'userId'
+      prop: 'userId',
+      hide: true,
+      editDisabled: true,
+      addDisplay: false
     },
     {
-      label: '订单状态,订单生成(0),支付成功(1),处理完成(2),处理失败(-1)',
-      prop: 'status'
+      label: '订单状态',
+      prop: 'status',
+      type: 'select',
+      search: true,
+      dicUrl: '/admin/dict/type/order_status'
     },
     {
       label: '支付订单号',
-      prop: 'payOrderId'
-    },
-    {
-      label: '0-正常,1-删除',
-      prop: 'delFlag'
+      prop: 'payOrderId',
+      overHidden: true,
+      search: true
     },
     {
       label: '创建时间',
-      prop: 'createTime'
-    },
-    {
-      label: '更新时间',
-      prop: 'updateTime'
-    },
-    {
-      label: '租户ID',
-      prop: 'tenantId'
+      prop: 'createTime',
+      type: 'datetime',
+      format: 'yyyy-MM-dd HH:mm:ss',
+      valueFormat: 'yyyy-MM-dd HH:mm:ss',
+      editDisplay: false,
+      overHidden: true,
+      addDisplay: false
     }
   ]
 }

src/const/crud/pay/paynotifyrecord.js

@@ -22,46 +22,45 @@ export const tableOption = {
   stripe: true,
   menuAlign: 'center',
   align: 'center',
+  viewBtn: true,
   column: [
     {
       label: 'ID',
-      prop: 'id'
+      prop: 'id',
+      hide: true,
+      editDisabled: true,
+      addDisplay: false
     },
     {
       label: '响应ID',
       prop: 'notifyId'
     },
     {
-      label: '请求报文',
-      prop: 'request'
+      label: '订单号',
+      prop: 'orderNo',
+      search: true
     },
     {
-      label: '响应报文',
-      prop: 'response'
-    },
-    {
-      label: '系统订单号',
-      prop: 'orderNo'
-    },
-    {
-      label: 'http状态',
-      prop: 'httpStatus'
+      label: '回调报文',
+      prop: 'request',
+      overHidden: true,
+      type: 'textarea',
+      span: 24,
+      minRows: 5
     },
     {
-      label: '删除标记',
-      prop: 'delFlag'
+      label: '响应报文',
+      prop: 'response'
     },
     {
       label: '创建时间',
-      prop: 'createTime'
-    },
-    {
-      label: '更新时间',
-      prop: 'updateTime'
-    },
-    {
-      label: '租户ID',
-      prop: 'tenantId'
+      prop: 'createTime',
+      type: 'datetime',
+      format: 'yyyy-MM-dd HH:mm:ss',
+      valueFormat: 'yyyy-MM-dd HH:mm:ss',
+      editDisplay: false,
+      overHidden: true,
+      addDisplay: false
     }
   ]
 }

src/const/crud/pay/paytradeorder.js

@@ -24,104 +24,82 @@ export const tableOption = {
   align: 'center',
   column: [
     {
-      label: '支付订单号',
-      prop: 'orderId'
+      label: '订单号',
+      prop: 'orderId',
+      overHidden: true,
+      width: 150
     },
     {
       label: '渠道ID',
-      prop: 'channelId'
+      prop: 'channelId',
+      width: 120
     },
     {
-      label: '支付金额,单位分',
-      prop: 'amount'
-    },
-    {
-      label: '三位货币代码,人民币:cny',
-      prop: 'currency'
+      label: '渠道商户',
+      prop: 'channelMchId',
+      width: 120
     },
     {
-      label: '支付状态,0-订单生成,1-支付中(目前未使用),2-支付成功,3-业务处理完成',
-      prop: 'status'
-    },
-    {
-      label: '客户端IP',
-      prop: 'clientIp'
+      label: '渠道订单号',
+      prop: 'channelOrderNo',
+      width: 150,
     },
     {
-      label: '设备',
-      prop: 'device'
+      label: '商品描述',
+      prop: 'body',
+      overHidden:true
     },
     {
-      label: '商品标题',
-      prop: 'subject'
+      label: '金额',
+      prop: 'amount'
     },
     {
-      label: '商品描述信息',
-      prop: 'body'
+      label: '币种',
+      prop: 'currency'
     },
     {
-      label: '特定渠道发起时额外参数',
-      prop: 'extra'
+      label: '支付状态',
+      prop: 'status',
+      type: 'select',
+      search: true,
+      dicUrl: '/admin/dict/type/order_status'
     },
     {
-      label: '渠道商户ID',
-      prop: 'channelMchId'
+      label: '客户端IP',
+      prop: 'clientIp',
+      width: 120,
     },
     {
-      label: '渠道订单号',
-      prop: 'channelOrderNo'
+      label: '商品标题',
+      prop: 'subject'
     },
     {
-      label: '渠道支付错误码',
+      label: '错误码',
       prop: 'errCode'
     },
     {
-      label: '渠道支付错误描述',
+      label: '错误描述',
       prop: 'errMsg'
     },
     {
-      label: '扩展参数1',
-      prop: 'param1'
-    },
-    {
-      label: '扩展参数2',
-      prop: 'param2'
-    },
-    {
-      label: '通知地址',
-      prop: 'notifyUrl'
-    },
-    {
-      label: '通知次数',
-      prop: 'notifyCount'
-    },
-    {
-      label: '最后一次通知时间',
-      prop: 'lastNotifyTime'
-    },
-    {
-      label: '订单失效时间',
+      label: '失效时间',
       prop: 'expireTime'
     },
     {
-      label: '订单支付成功时间',
-      prop: 'paySuccTime'
+      label: '成功时间',
+      prop: 'paySuccTime',
+      width: 150
     },
     {
       label: '创建时间',
-      prop: 'createTime'
-    },
-    {
-      label: '更新时间',
-      prop: 'updateTime'
-    },
-    {
-      label: '删除标记',
-      prop: 'delFlaag'
-    },
-    {
-      label: '租户ID',
-      prop: 'tenantId'
+      width: 150,
+      prop: 'createTime',
+      type: 'datetime',
+      format: 'yyyy-MM-dd HH:mm:ss',
+      valueFormat: 'yyyy-MM-dd HH:mm:ss',
+      editDisplay: false,
+      overHidden: true,
+      addDisplay: false
     }
   ]
 }

src/router/axios.js

@@ -28,8 +28,9 @@ axios.interceptors.request.use(config => {
     config.headers['Authorization'] = 'Bearer ' + token// token
   }
   if (TENANT_ID) {
-    config.headers['TENANT_ID'] = TENANT_ID // 租户ID
+    config.headers['TENANT-ID'] = TENANT_ID // 租户ID
   }
+  config.headers['VERSION'] = 'V1.2' // 租户ID
   // headers中配置serialize为true开启序列化
   if (config.method === 'post' && config.headers.serialize) {
     config.data = serialize(config.data)

src/views/admin/dict/index.vue

@@ -164,7 +164,6 @@ export default {
        **/
     handleUpdate: function(row, index, done) {
       putObj(row).then(() => {
-        this.tableData.splice(index, 1, Object.assign({}, row))
         this.$message({
           showClose: true,
           message: '修改成功',
@@ -182,7 +181,6 @@ export default {
        **/
     handleSave: function(row, done) {
       addObj(row).then(() => {
-        this.tableData.push(Object.assign({}, row))
         this.$message({
           showClose: true,
           message: '添加成功',
@@ -194,19 +192,17 @@ export default {
     },
     handleItemSave: function(row, done) {
       addItemObj(row).then(() => {
-        this.tableDictItemData.push(Object.assign({}, row))
         this.$message({
           showClose: true,
           message: '添加成功',
           type: 'success'
         })
-        this.getList(this.page)
+        this.getDictItemList(row.dictId, row.type)
         done()
       })
     },
     handleItemUpdate: function(row, index, done) {
       putItemObj(row).then(() => {
-        this.tableData.splice(index, 1, Object.assign({}, row))
         this.$message({
           showClose: true,
           message: '修改成功',

src/views/pay/cd/index.vue

@@ -1,29 +1,30 @@
 <template>
   <basic-container>
-    <el-row>
-      <el-col :span="24"><h2>扫码支付</h2></el-col>
-    </el-row>
-
-    <el-row>
-      <el-col :span="24">
-        <qrcode :value="msg" :options="options"/>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="24"><h4>请使用支付宝（沙箱）或微信手机客户端扫一扫</h4></el-col>
-    </el-row>
-    <el-row>
-      1. 请勿大额支付，无法退还请知悉
-    </el-row>
-    <el-row>
-      2. 支付宝目前是沙箱，有正式账号的老铁欢迎提供测试 - -
-    </el-row>
-    <el-row>
-      <el-radio v-model="amount" label="1">0.01 元</el-radio>
-      <el-radio v-model="amount" label="2">0.02 元</el-radio>
-      <el-radio v-model="amount" label="3">0.03 元</el-radio>
-    </el-row>
+    <div style="text-align: center;">
+      <el-row>
+        <el-col :span="24"><h2>扫码支付</h2></el-col>
+      </el-row>
 
+      <el-row>
+        <el-col :span="24">
+          <qrcode :value="msg" :options="options"/>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24"><h4>请使用支付宝（沙箱）或微信手机客户端扫一扫</h4></el-col>
+      </el-row>
+      <el-row>
+        1. 请勿大额支付，无法退还请知悉
+      </el-row>
+      <el-row>
+        2. 支付宝目前是沙箱，有正式账号的老铁欢迎提供测试 - -
+      </el-row>
+      <el-row>
+        <el-radio v-model="amount" label="1">0.01 元</el-radio>
+        <el-radio v-model="amount" label="2">0.02 元</el-radio>
+        <el-radio v-model="amount" label="3">0.03 元</el-radio>
+      </el-row>
+    </div>
   </basic-container>
 </template>
 
@@ -31,30 +32,25 @@
 </style>
 
 <script>
-import VueQrcode from '@xkeshi/vue-qrcode'
+  import VueQrcode from '@xkeshi/vue-qrcode'
 
-export default {
-  components: {
-    'qrcode': VueQrcode
-  },
-  data() {
-    return {
-      amount: '1',
-      msg: 'http://pigx.huaxiadaowei.com/pay/goods/buy?amount=1',
-      options: {
-        size: 300
+  export default {
+    components: {
+      'qrcode': VueQrcode
+    },
+    data() {
+      return {
+        amount: '1',
+        msg: 'http://pigx.huaxiadaowei.com/pay/goods/buy?amount=1',
+        options: {
+          size: 300
+        }
+      }
+    },
+    watch: {
+      amount: function(amount) {
+        this.msg = 'http://pigx.huaxiadaowei.com/pay/goods/buy?amount=' + amount
       }
-    }
-  },
-  watch: {
-    amount: function(amount) {
-      this.msg = 'http://pigx.huaxiadaowei.com/pay/goods/buy?amount=' + amount
     }
   }
-}
 </script>
-<style>
-  .basic-container {
-    text-align: center;
-  }
-</style>