Browse Source

‘首页时区bug’

master
j1ack 2 years ago
parent
commit
44595a5225
  1. 2
      src/views/coin/coinAddress/index.vue
  2. 2
      src/views/pay/payAgentUser/add.vue
  3. 6
      src/views/pay/payAgentUser/operate.vue
  4. 15
      src/views/pay/payAgentUser/payAgentUserList.vue
  5. 2
      src/views/pay/payAgentUser/rate.vue
  6. 2
      src/views/pay/payOrder/my-date-picker.vue
  7. 2
      src/views/pay/payOrder/orderReport.vue
  8. 2
      src/views/pay/payOrder/payDaiFuWater.vue
  9. 19
      src/views/pay/payOrder/payOrderWater.vue
  10. 2
      src/views/pay/payOrder/payuwater.vue
  11. 4
      src/views/pay/payOrder/pkCouponScopeRangeStoreList.vue
  12. 6
      src/views/pay/payTest/payCode.vue
  13. 2
      src/views/pay/payTest/payDai.vue
  14. 2
      src/views/pay/payTest/payucode.vue
  15. 12
      src/views/pay/payTest/payupay.vue
  16. 22
      src/views/pay/payType/payBankManualUser.vue
  17. 18
      src/views/system/role/index.vue
  18. BIN
      正式7uppay.zip
  19. BIN
      测试7uppay.zip

2
src/views/coin/coinAddress/index.vue

@ -68,7 +68,7 @@
<el-table-column label="已支付统计" align="center" prop="paidCnt" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="handleKill(scope.row)">清除</el-button>
<el-button size="mini" type="text" @click="handleKill(scope.row)" v-hasPermi="['coin:coinAddress:clearCoinAddressInfo']">清除</el-button>
<el-button size="mini" type="text" @click="handleUpdate(scope.row)"
v-hasPermi="['coin:coinAddress:edit']">设置</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)"

2
src/views/pay/payAgentUser/add.vue

@ -28,7 +28,7 @@
</div>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="savePayConfig"> </el-button>
<el-button type="primary" @click="savePayConfig" v-hasPermi="['store:store:edit']"> </el-button>
<el-button type="plain" @click="back"> </el-button>
</div>
</div>

6
src/views/pay/payAgentUser/operate.vue

@ -45,8 +45,8 @@
</el-form-item>
<el-form-item label="管理后台代付开关" prop="artistName">
<el-switch v-model="infoList.sysPaymentManualStatus" active-text="" inactive-text=""
active-value="open" inactive-value="close">
<el-switch v-model="infoList.sysPaymentManualStatus" active-text="" inactive-text="" active-value="open"
inactive-value="close">
</el-switch>
</el-form-item>
@ -112,7 +112,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="savePayConfig"> </el-button>
<el-button type="primary" @click="savePayConfig" v-hasPermi="['store:store:edit']"> </el-button>
</div>
</div>
</div>

15
src/views/pay/payAgentUser/payAgentUserList.vue

@ -167,7 +167,8 @@
<!-- 商户 -->
<el-button size="small" v-if="scope.row.userType == 'store'" type="text"
@click="handleAgent('分配代理商', 'divide', scope.row)" style="color: #006EFF;">分配代理商</el-button>
v-hasPermi="['system:user:assignAgents']" @click="handleAgent('分配代理商', 'divide', scope.row)"
style="color: #006EFF;">分配代理商</el-button>
<el-button size="small" type="text" style="color: #006EFF;" @click="handleCode('身份验证', scope.row)"
v-hasPermi="['system:user:getGoogleCaptcha']">查看密钥</el-button>
<el-button size="small" type="text" style="color: #006EFF;" @click="handleDelete(scope.row)"
@ -179,11 +180,17 @@
v-hasPermi="['order:rechargeRecord:capitalList']" v-if="scope.row.userType == 'store'">子钱包</el-button>
<el-button size="small" type="text" style="color: #006EFF;" @click="go('/add', scope.row.storeId)"
v-if="scope.row.userType == 'store'">通道</el-button>
v-if="scope.row.userType == 'store'"
v-hasPermi="['store:store:query']"
>通道</el-button>
<el-button size="small" type="text" style="color: #006EFF;" @click="go('/rate', scope.row.storeId)"
v-if="scope.row.userType == 'store'">费率</el-button>
v-if="scope.row.userType == 'store'"
v-hasPermi="['store:store:query']"
>费率</el-button>
<el-button size="small" type="text" style="color: #006EFF;" @click="go('/operate', scope.row.storeId)"
v-if="scope.row.userType == 'store'">配置</el-button>
v-if="scope.row.userType == 'store'"
v-hasPermi="['store:store:query']"
>配置</el-button>
</template>
</el-table-column>
</el-table>

2
src/views/pay/payAgentUser/rate.vue

@ -169,7 +169,7 @@
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="savePayConfig"> </el-button>
<el-button type="primary" @click="savePayConfig" v-hasPermi="['store:store:edit']"> </el-button>
<el-button type="plain" @click="back"> </el-button>
</div>
</div>

2
src/views/pay/payOrder/my-date-picker.vue

@ -135,7 +135,7 @@ export default {
this.systemDate2 = date.year + '-' + 0 + date.month + '-' + date.date;
}
this.dateRange=[ this.systemDate2 + ' ' + '00' + ':' + '00' + ':' + '00',this.systemDate+ ' ' + '23' + ':' + '59' + ':' + '59']
this.dateRange=[ this.systemDate + ' ' + '00' + ':' + '00' + ':' + '00',this.systemDate+ ' ' + '23' + ':' + '59' + ':' + '59']
this.$forceUpdate()
},
},

2
src/views/pay/payOrder/orderReport.vue

@ -201,7 +201,7 @@ export default {
} else {
this.systemDate2 = date.year + '-' + 0 + date.month + '-' + date.date;
}
this.queryParams.beginTime = this.systemDate2 + ' ' + '00' + ':' + '00' + ':' + '00'
this.queryParams.beginTime = this.systemDate + ' ' + '00' + ':' + '00' + ':' + '00'
this.queryParams.endTime = this.systemDate+ ' ' + '23' + ':' + '59' + ':' + '59'
this.$forceUpdate()
},

2
src/views/pay/payOrder/payDaiFuWater.vue

@ -176,7 +176,7 @@
<el-button size="small"
v-if="scope.row.orderStatus == 'processsuccess' || scope.row.orderStatus == 'processfailed'"
type="text" style="color: #006EFF;" @click="handleRecharge(scope.row)"
v-hasPermi="['record:paymentReissueNotice']">补发通知</el-button>
v-hasPermi="['order:rechargeRecord:reissueNotice']">补发通知</el-button>
</template>
</el-table-column>

19
src/views/pay/payOrder/payOrderWater.vue

@ -36,6 +36,11 @@
<el-input size="medium" v-model="queryParams.storeName" placeholder="请输入商户名称"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item>
<el-form-item label="付款人" prop="userKey">
<el-input size="medium" v-model="queryParams.userKey" placeholder="请输入付款人"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item>
<!-- <el-form-item label="商户编号" prop="storeNo">
<el-input size="medium" v-model="queryParams.storeNo" placeholder="请输入商户编号"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
@ -124,6 +129,8 @@
{{ scope.row.storeNo }}
</template>
</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">
<template slot-scope="scope">
{{ scope.row.tranAmt }}<br />
@ -165,6 +172,9 @@
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="orderMsg" min-width="80"></el-table-column>
<el-table-column :label="'交易时间\n结算时间'" align="center" prop="storeNo" min-width="120">
<template slot-scope="scope">
{{ scope.row.createTime }}<br />
@ -186,7 +196,6 @@
</template>
</el-table-column> -->
<!-- <el-table-column label="商户类型" align="center" prop="divideType" /> -->
<!-- <el-table-column label="订单描述" align="center" prop="orderMsg" /> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"
min-width="80">
<template slot-scope="scope">
@ -300,10 +309,12 @@
<el-form-item label="支付类型">
{{ detailInfoList.payTypeName }}
</el-form-item>
<!-- <el-form-item label="备注">
{{ detailInfoList.attach }}
</el-form-item> -->
<el-form-item label="订单描述">
<el-form-item label="备注">
{{ detailInfoList.orderMsg }}
</el-form-item>
<!-- <el-form-item label="keyId">
@ -311,6 +322,9 @@
</el-form-item> -->
</div>
<div>
<el-form-item label="付款人">
{{ detailInfoList.userKey }}
</el-form-item>
<el-form-item label="通知备注">
{{ detailInfoList.notifyRemark }}
</el-form-item>
@ -637,6 +651,7 @@ export default {
storeSettle: null,
payType: null,
channelType: null,
userKey: null,
},
//

2
src/views/pay/payOrder/payuwater.vue

@ -83,7 +83,7 @@
<el-row :gutter="10" class="mb8" style="margin-left:20px">
<el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleExport"
v-hasPermi="['order:rechargeRecord:exportCoin']">导出</el-button>
v-hasPermi="['order:rechargeRecord:export']">导出</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleSay" :disabled="single"

4
src/views/pay/payOrder/pkCouponScopeRangeStoreList.vue

@ -52,8 +52,8 @@
<el-table-column label="账户可提余额(元)" align="center" prop="useCapital" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="150">
<template slot-scope="scope">
<el-button size="small" type="text" style="color: #006EFF;"
@click="updateBalance(scope.row, 'formUpdate')">修改余额</el-button>
<el-button size="small" type="text" style="color: #006EFF;" @click="updateBalance(scope.row, 'formUpdate')"
v-hasPermi="['order:rechargeRecord:updateBalance']">修改余额</el-button>
<el-button size="small" type="text" style="color: #006EFF;"
@click="handlePrivateTransfer(scope.row, 'formDai')"
v-hasPermi="['order:rechargeRecord:storePaymentSave']">私户转入</el-button>

6
src/views/pay/payTest/payCode.vue

@ -89,7 +89,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" plain icon="" size="medium" style="color:#fff;margin-left:10px"
@click="payCode">支付</el-button>
@click="payCode" v-hasPermi="['pay:test:pay']">支付</el-button>
</el-form-item>
<el-form-item label="扫码支付响应" prop="resp">
<el-input type="textarea" v-model="resMsg" placeholder=""
@ -185,7 +185,7 @@ export default {
productDesc: '商品描述',
req_data: null,
mediaType: null,
payerName:null,
payerName: null,
},
list: [
{
@ -267,7 +267,7 @@ export default {
},
//
handleSay() {
this.form.payKey=this.keys[this.form.spid]
this.form.payKey = this.keys[this.form.spid]
payTest
.paySign(this.form)
.then((response) => {

2
src/views/pay/payTest/payDai.vue

@ -78,7 +78,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" plain icon="" size="medium" style="color:#fff;margin-left:10px"
@click="payCode">支付</el-button>
@click="payCode" v-hasPermi="['pay:test:payment']">支付</el-button>
</el-form-item>
<el-form-item label="代付响应" prop="resp">
<el-input type="textarea" v-model="form.resp" placeholder=""

2
src/views/pay/payTest/payucode.vue

@ -68,7 +68,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" plain icon="" size="medium" style="color:#fff;margin-left:10px"
@click="payCode">支付</el-button>
@click="payCode" v-hasPermi="['pay:test:coinPay']">支付</el-button>
</el-form-item>
<el-form-item label="支付响应" prop="resp">
<el-input type="textarea" v-model="resMsg" placeholder=""

12
src/views/pay/payTest/payupay.vue

@ -81,11 +81,11 @@
<el-input v-model="form.req_data" type="textarea" :disabled="true" placeholder=""
style="width: 315px;border-color: #E6F1FF;" />
<el-button type="primary" plain icon="" size="medium" style="color:#fff;margin-left:10px"
@click="handleSay" v-hasPermi="['pay:test:paymentSign']">获取签名</el-button>
@click="handleSay" v-hasPermi="['pay:test:coinPaymentSign']">获取签名</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" plain icon="" size="medium" style="color:#fff;margin-left:10px"
@click="payCode">支付</el-button>
@click="payCode" v-hasPermi="['pay:test:coinpayment']">支付</el-button>
</el-form-item>
<el-form-item label="代付响应" prop="resp">
<el-input type="textarea" v-model="form.resp" placeholder=""
@ -148,7 +148,7 @@ export default {
value: 'xml',
}
],
keys:{},
keys: {},
radio: '',
//
loading: false,
@ -218,7 +218,7 @@ export default {
this.$message.error('请输入address')
return;
}
this.form.payKey=this.keys[this.form.spid]
this.form.payKey = this.keys[this.form.spid]
payTest
.coinPaymentSign(this.form)
.then((response) => {
@ -228,8 +228,8 @@ export default {
init() {
common_api.getAllPayTestStore().then((response) => {
this.allstore = response.data
for(var i=0;i<this.allstore.length;i++){
this.keys[this.allstore[i].storeNo]=this.allstore[i].storeKey
for (var i = 0; i < this.allstore.length; i++) {
this.keys[this.allstore[i].storeNo] = this.allstore[i].storeKey
}
});
this.form.mediaType = 'json'

22
src/views/pay/payType/payBankManualUser.vue

@ -41,7 +41,8 @@
<el-row :gutter="10" class="mb8" style="margin-left:20px">
<el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleAdd" v-hasPermi="['pay:bankManualUser:add']">新增</el-button>
<el-button type="primary" plain icon="" size="medium" @click="handleAdd"
v-hasPermi="['pay:bankManualUser:add']">新增</el-button>
</el-col>
</el-row>
</div>
@ -56,10 +57,9 @@
<el-table-column label="账号" align="center" prop="acctId" min-width="180" />
<el-table-column label="支行名称" align="center" prop="bankBranchName" min-width="180" />
<el-table-column label="联行号" align="center" prop="bankSettleNo" />
<el-table-column label="公私户" align="center" prop="flagCard" >
<el-table-column label="公私户" align="center" prop="flagCard">
<template slot-scope="scope">
<el-tag :type="
scope.row.flagCard == 'public_account'
<el-tag :type="scope.row.flagCard == 'public_account'
? 'success' : 'primary'
">
{{ scope.row.flagCard == 'public_account' ? '公户' : '私户' }}
@ -68,8 +68,7 @@
</el-table-column>
<el-table-column label="类型" align="center" prop="settleCode" min-width="120">
<template slot-scope="scope">
<el-tag :type="
scope.row.settleCode == 'part'
<el-tag :type="scope.row.settleCode == 'part'
? 'success' : 'primary'
">
{{ scope.row.settleCode == 'part' ? '通用配置' : '通用配置' }}
@ -79,7 +78,8 @@
<el-table-column label="状态" align="center" prop="dataStatus" width="140px">
<template slot-scope="scope">
<el-switch v-model="scope.row.status" active-text="" inactive-text="" active-value="open"
inactive-value="close" @change="switchStatusChange(scope.row)" v-hasPermi="['pay:bankManualUser:edit']">
inactive-value="close" @change="switchStatusChange(scope.row)"
v-hasPermi="['pay:bankManualUser:edit']">
</el-switch>
</template>
</el-table-column>
@ -87,8 +87,8 @@
<el-table-column label="更新时间" align="center" prop="updateTime" min-width="150" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
<el-button size="small" type="text" icon="el-icon-edit"
@click="handleUpdate(scope.row)" v-hasPermi="['pay:bankManualUser:edit']">编辑</el-button>
<el-button size="small" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['pay:bankManualUser:edit']">编辑</el-button>
</template>
</el-table-column>
</el-table>
@ -100,7 +100,7 @@
:close-on-click-modal="false" :before-close="cancel">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="用户编号" prop="userId">
<el-input v-model="form.userId" placeholder="请输入用户编号" style="width:220px"/>
<el-input v-model="form.userId" placeholder="请输入用户编号" style="width:220px" />
</el-form-item>
<el-form-item label="收款账户" prop="bankId">
<el-select v-model="form.bankId" placeholder="请选择收款账户" clearable size="medium">
@ -127,7 +127,7 @@ export default {
name: "PkAdWeiList",
data() {
return {
sortLevType:[],
sortLevType: [],
dateRange: [],
// 广
imageUrl: "",

18
src/views/system/role/index.vue

@ -20,10 +20,10 @@
<el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable
style="width: 240px;border-color: #E6F1FF;" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="权限字符" prop="roleKey">
<!-- <el-form-item label="权限字符" prop="roleKey">
<el-input v-model="queryParams.roleKey" placeholder="请输入权限字符" clearable
style="width: 240px;border-color: #E6F1FF;" @keyup.enter.native="handleQuery" />
</el-form-item>
</el-form-item> -->
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="角色状态" clearable
style="width: 240px;border-color: #E6F1FF;">
@ -67,10 +67,10 @@
</el-form>
<el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="角色编号" prop="roleId" width="120" />
<!-- <el-table-column label="角色编号" prop="roleId" width="120" /> -->
<el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
<el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
<el-table-column label="显示顺序" prop="roleSort" width="100" />
<!-- <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" /> -->
<!-- <el-table-column label="显示顺序" prop="roleSort" width="100" /> -->
<el-table-column label="状态" align="center" width="100">
<template slot-scope="scope">
<el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
@ -112,7 +112,7 @@
<el-form-item label="角色名称" prop="roleName">
<el-input v-model="form.roleName" placeholder="请输入角色名称" />
</el-form-item>
<el-form-item prop="roleKey">
<!-- <el-form-item prop="roleKey">
<span slot="label">
<el-tooltip content="控制器中定义的权限字符,如:@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
<i class="el-icon-question"></i>
@ -120,10 +120,10 @@
权限字符
</span>
<el-input v-model="form.roleKey" placeholder="请输入权限字符" />
</el-form-item>
<el-form-item label="角色顺序" prop="roleSort">
</el-form-item> -->
<!-- <el-form-item label="角色顺序" prop="roleSort">
<el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
</el-form-item>
</el-form-item> -->
<el-form-item label="状态">
<el-radio-group v-model="form.status">
<el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label

BIN
正式7uppay.zip

Binary file not shown.

BIN
测试7uppay.zip

Binary file not shown.
Loading…
Cancel
Save