jiazhizhong/crmeb_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

圣诞快乐

Browse Source 
# v1.3 更新列表
    1. 【新增】砍价
	2. 【新增】拼团
	3. 【新增】一号通
	4. 【修复】商品sku 编辑时出现商品属性对应错误的问题
	5. 【修复】商品推广海报生成二维码可能会出错的问题【小程序调试中】
	6. 【修复】微信公众号和小程序头像可能获取不到的问题
	7. 【修复】下单时可能会出错的问题
	8. 【修复】pc管理端用户访问量
	9. 【修复】微信退款
	10. 【修复】管理端订单状态可能出现不正确的情况
	11. 【修复】WEB管理端-菜单色调，短信API更新，首页用户访问量，系统设置tab是自动选择下一及表单
	12. 【修复】系统设置出现更新不正确的问题
This commit is contained in:
stivepeim
2020-12-23 15:56:45 +08:00
parent f3975936c2
commit 0d32da772d
768 changed files with 40200 additions and 46123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
admin/src/views/financial/brokerage/index.vue
View File

@@ -105,11 +105,6 @@
</el-radio-group>
<el-date-picker v-model="timeValUser" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 250px;" @change="onchangeTimeUser" />
</el-form-item>
<el-form-item label="关键字：">
<el-input v-model="userTableFrom.keywords" placeholder="请输入订单id" class="selWidth" size="small">
<el-button slot="append" icon="el-icon-search" size="small" @click="getUserList(1)" />
</el-input>
</el-form-item>
</el-form>
<el-divider></el-divider>
<el-table
@@ -148,8 +143,8 @@
:current-page="userTableFrom.page"
layout="total, sizes, prev, pager, next, jumper"
:total="userDetailData.total"
@size-change="handleSizeChange"
@current-change="pageChange"
@size-change="userHandleSizeChange"
@current-change="userPageChange"
/>
</div>
</div>
@@ -184,7 +179,6 @@
userTableFrom: {
page: 1,
limit: 10,
keywords: '',
dateLimit: ''
},
fromList: fromList,
@@ -207,6 +201,7 @@
this.userDetail = row
this.Visible = true
this.tablistLoading = true
this.userTableFrom.limit = 10
this.getUserList()
},
getUserList(num){
@@ -225,6 +220,14 @@
this.userTableFrom.page = 1;
this.getUserList()
},
userPageChange(page) {
this.userTableFrom.page = page
this.getUserList()
},
userHandleSizeChange(val) {
this.userTableFrom.limit = val
this.getUserList()
},
// 具体日期
onchangeTimeUser(e) {
this.timeValUser = e

6
admin/src/views/financial/commission/withdrawal/index.vue
View File

@@ -11,7 +11,7 @@
<el-date-picker v-model="timeVal" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 250px;" @change="onchangeTime" />
</el-form-item>
<el-form-item label="提现状态：">
<el-radio-group v-model="tableFrom.status" type="button" size="small" @change="getList(1)">
<el-radio-group v-model="tableFrom.status" type="button" size="small" @change="getList(1)" clearable>
<el-radio-button label="">全部</el-radio-button>
<el-radio-button label="0">审核中</el-radio-button>
<el-radio-button label="1">已提现</el-radio-button>
@@ -19,7 +19,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="提现方式：">
<el-radio-group v-model="tableFrom.extractType" type="button" size="small" @change="getList(1)">
<el-radio-group v-model="tableFrom.extractType" type="button" size="small" @change="getList(1)" clearable>
<el-radio-button label="">全部</el-radio-button>
<el-radio-button label="bank">银行卡</el-radio-button>
<el-radio-button label="alipay">支付宝</el-radio-button>
@@ -27,7 +27,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="关键字：" class="width100">
<el-input v-model="tableFrom.keywords" placeholder="微信号/姓名/支付宝账号/银行卡号/失败原因" class="selWidth" size="small">
<el-input v-model="tableFrom.keywords" placeholder="微信号/姓名/支付宝账号/银行卡号/失败原因" class="selWidth" size="small" clearable>
<el-button slot="append" icon="el-icon-search" size="small" @click="getList(1)" />
</el-input>
</el-form-item>

58
admin/src/views/financial/record/charge/index.vue
View File

@@ -18,7 +18,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="关键字：" class="width100">
<el-input v-model="tableFrom.keywords" placeholder="微信昵称/姓名/订单号" class="selWidth" size="small">
<el-input v-model="tableFrom.keywords" placeholder="微信昵称/姓名/订单号" class="selWidth" size="small" clearable>
<el-button slot="append" icon="el-icon-search" size="small" @click="getList(1)" />
</el-input>
</el-form-item>
@@ -103,7 +103,7 @@
<el-table-column label="操作" min-width="120" fixed="right" align="center">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleDelete(scope.row)" v-if="!scope.row.paid">删除</el-button>
<el-button type="text" size="small" @click="handleRefund(scope.row)" v-else>退款</el-button>
<el-button type="text" size="small" @click="handleRefund(scope.row)" v-if="parseFloat(scope.row.refundPrice) <= 0 && scope.row.paid">退款</el-button>
</template>
</el-table-column>
</el-table>
@@ -119,18 +119,36 @@
/>
</div>
</el-card>
<!--退款-->
<el-dialog
title="退款"
:visible.sync="dialogVisible"
width="500px"
:before-close="handleClose">
<zb-parser
v-if="dialogVisible"
:form-id="130"
:is-create="isCreate"
:edit-data="editData"
@submit="handlerSubmit"
@resetForm="resetForm"
/>
</el-dialog>
</div>
</template>
<script>
import { topUpLogListApi, balanceApi, topUpLogDeleteApi } from '@/api/financial'
import { topUpLogListApi, balanceApi, topUpLogDeleteApi, refundApi } from '@/api/financial'
import cardsData from '@/components/cards/index'
import { fromList } from '@/utils/constants.js'
import zbParser from '@/components/FormGenerator/components/parser/ZBParser'
export default {
name: 'AccountsBill',
components: { cardsData },
components: { cardsData, zbParser },
data() {
return {
editData: {},
isCreate: 1,
cardLists: [],
timeVal: [],
tableData: {
@@ -145,7 +163,8 @@
page: 1,
limit: 20
},
fromList: fromList
fromList: fromList,
dialogVisible: false
}
},
mounted() {
@@ -153,8 +172,27 @@
this.getStatistics()
},
methods: {
resetForm(formValue) {
this.handleClose();
},
handlerSubmit(formValue) {
refundApi(formValue).then(data => {
this.$message.success('操作成功')
this.dialogVisible = false
this.editData = {}
this.getList()
})
},
handleClose() {
this.dialogVisible = false
this.editData = {}
},
handleRefund(row) {
if(row.price == row.refundPrice) return this.$message.waiting('已退完支付金额！不能再退款了 ！');
if(row.rechargeType === 'balance') return this.$message.waiting('佣金转入余额，不能退款 ！');
this.editData.orderId = row.orderId
this.editData.id = row.id
this.dialogVisible = true
},
handleDelete(row, idx) {
this.$modalSure().then(() => {
@@ -203,10 +241,10 @@
balanceApi().then(res => {
const stat = res
this.cardLists = [
{ name: '充值总金额', count: stat.totalPayPrice, icon: 'el-icon-s-goods' },
{ name: '充值退款金额', count: stat.totalRefundPrice, icon: 'el-icon-s-order' },
{ name: '小程序充值金额', count: stat.totalRoutinePrice, icon: 'el-icon-s-cooperation' },
{ name: '公众号充值金额', count: stat.totalWxPrice, icon: 'el-icon-s-finance' }
{ name: '充值总金额', count: stat.total, icon: 'el-icon-s-goods' },
{ name: '充值退款金额', count: stat.refund, icon: 'el-icon-s-order' },
{ name: '小程序充值金额', count: stat.routine, icon: 'el-icon-s-cooperation' },
{ name: '公众号充值金额', count: stat.weChat, icon: 'el-icon-s-finance' }
]
})
}

24
admin/src/views/financial/record/monitor/index.vue
View File

@@ -10,18 +10,18 @@
</el-radio-group>
<el-date-picker v-model="timeVal" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 250px;" @change="onchangeTime" />
</el-form-item>
<el-form-item label="明细类型：">
<el-select class="selWidth" v-model="tableFrom.type" filterable clearable placeholder="请选择" @change="getList(1)">
<el-option
v-for="(item, index) in optionList"
:key="index"
:label="item.title"
:value="item.type"
/>
</el-select>
</el-form-item>
<!--<el-form-item label="明细类型：">-->
<!--<el-select class="selWidth" v-model="tableFrom.type" filterable clearable placeholder="请选择" @change="getList(1)">-->
<!--<el-option-->
<!--v-for="(item, index) in optionList"-->
<!--:key="index"-->
<!--:label="item.title"-->
<!--:value="item.type"-->
<!--/>-->
<!--</el-select>-->
<!--</el-form-item>-->
<el-form-item label="关键字：" class="width100">
<el-input v-model="tableFrom.keywords" placeholder="微信昵称/ID" class="selWidth" size="small">
<el-input v-model="tableFrom.keywords" placeholder="微信昵称/ID" class="selWidth" size="small" clearable>
<el-button slot="append" icon="el-icon-search" size="small" @click="getList(1)" />
</el-input>
</el-form-item>
@@ -98,7 +98,7 @@
},
listLoading: true,
tableFrom: {
type: '',
// type: '',
dateLimit: '',
keywords: '',
page: 1,