Commit 8c3a039f authored by 郝聪敏's avatar 郝聪敏

feature: 升级业务库

parent 609b226d
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
import { AutoIncrement, Column, DataType, Model, PrimaryKey, Table, AllowNull } from 'sequelize-typescript'; import { AutoIncrement, Column, DataType, Model, PrimaryKey, Table, AllowNull } from 'sequelize-typescript';
@Table({ @Table({
modelName: 'page_config_info', modelName: 'page_info',
freezeTableName: true freezeTableName: true
}) })
......
...@@ -2,7 +2,7 @@ const protocol = EASY_ENV_IS_BROWSER ? window.location.protocol : 'https'; ...@@ -2,7 +2,7 @@ const protocol = EASY_ENV_IS_BROWSER ? window.location.protocol : 'https';
export default { export default {
apiHost: `https://quantum-blocks.q-gp.com/`, apiHost: `https://quantum-blocks.q-gp.com/`,
h5Host: 'https://quantum-h5-vcc2.liangkebang.net/', h5Host: 'https://quantum-h5.q-gp.com/',
qiniuHost: `https://appsync.lkbang.net/`, qiniuHost: `https://appsync.lkbang.net/`,
shenceUrl: `${protocol}//bn.xyqb.com/sa?project=production`, shenceUrl: `${protocol}//bn.xyqb.com/sa?project=production`,
opapiHost: `${protocol}//opapi.q-gp.com`, opapiHost: `${protocol}//opapi.q-gp.com`,
......
...@@ -124,8 +124,12 @@ const columns: object[] = [ ...@@ -124,8 +124,12 @@ const columns: object[] = [
}, },
{ {
title: '领取方式', title: '领取方式',
formType: 'select',
key: 'receiverType', key: 'receiverType',
hideSearch: true, valueEnum: receiverTypeList.reduce((pre, cur) => {
pre[cur.id] = cur.name;
return pre;
}, {}),
render: (h, params) => { render: (h, params) => {
const obj = receiverTypeList.find(item => item.id === params.row.receiverType) || {}; const obj = receiverTypeList.find(item => item.id === params.row.receiverType) || {};
return h('div', obj.name); return h('div', obj.name);
......
...@@ -28,7 +28,7 @@ export default class CouponTableModal extends Vue { ...@@ -28,7 +28,7 @@ export default class CouponTableModal extends Vue {
async query(data) { async query(data) {
// receiverType 领取方式 1:主动领取 2:自动发放 3:不限 // receiverType 领取方式 1:主动领取 2:自动发放 3:不限
const res = await operationApi.couponList({...data, receiverType: 1}); const res = await operationApi.couponList({ ...data });
const couponInfoList = res?.couponInfoList?.map(item => { const couponInfoList = res?.couponInfoList?.map(item => {
item.receiverTime = `${item.receiverStartTime.slice(0, 10)}--${item.receiverEndTime.slice(0, 10)}`; item.receiverTime = `${item.receiverStartTime.slice(0, 10)}--${item.receiverEndTime.slice(0, 10)}`;
item.useTime = item.useTimeStart item.useTime = item.useTimeStart
......
...@@ -1456,9 +1456,9 @@ ...@@ -1456,9 +1456,9 @@
} }
}, },
"@qg/citrus-ui": { "@qg/citrus-ui": {
"version": "0.0.51", "version": "0.0.55",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.0.51.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.0.55.tgz",
"integrity": "sha512-Xp1yZ0jvejk1iO6tIa3bTmTM61oFvrPLFRlKbA0XUulbZmSlIOK9W49TZTUb2D/jxGZaGYrNd/raD8/Cr99/xg==", "integrity": "sha512-CLQ5vFJRgXGULmeQMO/nthiFE0eNTbRcDBukBaLmy2IQUUzu3qSr7Rw3uaFt9N+v4PVLrC3qVLS90oI6CRfbyA==",
"requires": { "requires": {
"@better-scroll/core": "^2.1.1", "@better-scroll/core": "^2.1.1",
"@qg/cherry-ui": "^2.20.5", "@qg/cherry-ui": "^2.20.5",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment