This commit is contained in:
faiz 2024-06-11 09:58:28 +08:00
parent 18048f48e5
commit 150e4aaf6d
6 changed files with 44 additions and 11 deletions

View File

@ -3,12 +3,12 @@ ENV = 'development'
# http://192.168.1.43:8324/admin # http://192.168.1.43:8324/admin
# http://mer.crmeb.net/admin # http://mer.crmeb.net/admin
# base api # base api
VUE_APP_BASE_API = 'http://192.168.1.50:8080' # VUE_APP_BASE_API = 'http://192.168.1.9:8080'
# VUE_APP_BASE_API = 'https://api.tropjoin.com/' VUE_APP_BASE_API = 'https://api.tropjoin.com/'
# socket 连接地址 # socket 连接地址
VUE_APP_WS_URL = 'ws://http://192.168.1.50:8080' # VUE_APP_WS_URL = 'ws://http://192.168.1.9:8080'
# VUE_APP_WS_URL = 'ws://https://api.tropjoin.com/' VUE_APP_WS_URL = 'ws://https://api.tropjoin.com/'
# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
# to control whether the babel-plugin-dynamic-import-node plugin is enabled. # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

View File

@ -173,7 +173,9 @@ export function orderPayType(type) {
'4': '支付宝', '4': '支付宝',
'5': '支付宝扫码', '5': '支付宝扫码',
'6': '微信扫码', '6': '微信扫码',
'7': '铸源星支付' '7': '铸源星支付',
'12': '汇付支付',
'13': '汇付支付'
} }
return typeMap[type] return typeMap[type]
} }

View File

@ -81,11 +81,11 @@
<el-input-number v-model="oneFormBatch[0].stock" :min="0" class="priceBox" controls-position="right"/> <el-input-number v-model="oneFormBatch[0].stock" :min="0" class="priceBox" controls-position="right"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="成长值" min-width="100" align="center"> <!-- <el-table-column label="成长值" min-width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number v-model="oneFormBatch[0].growth" :min="0" class="priceBox" controls-position="right"/> <el-input-number v-model="oneFormBatch[0].growth" :min="0" class="priceBox" controls-position="right"/>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="商品编号" min-width="100" align="center"> <el-table-column label="商品编号" min-width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="oneFormBatch[0].bar_code" /> <el-input v-model="oneFormBatch[0].bar_code" />
@ -251,7 +251,7 @@ const defaultObj = {
proportion:0.6, proportion:0.6,
coupon:0, coupon:0,
stock: 0, stock: 0,
growth:0, // growth:0,
bar_code: '', bar_code: '',
weight: 0, weight: 0,
volume: 0 volume: 0
@ -295,6 +295,30 @@ export default {
data() { data() {
return { return {
proportionList:[ proportionList:[
{
value: '0.80',
label: '0.80',
coupon:0.1,
growth:0.3
},
{
value: '0.75',
label: '0.75',
coupon:0.15,
growth:0.35
},
{
value: '0.70',
label: '0.70',
coupon:0.2,
growth:0.4
},
{
value: '0.65',
label: '0.65',
coupon:0.25,
growth:0.45
},
{ {
value: '0.60', value: '0.60',
label: '0.60', label: '0.60',

View File

@ -715,7 +715,7 @@ const defaultObj = {
proportion: 0.6, proportion: 0.6,
coupon:'', coupon:'',
stock: 0, stock: 0,
growth: 0, // growth: 0,
bar_code: "", bar_code: "",
weight: null, weight: null,
volume: null, volume: null,

View File

@ -1201,7 +1201,7 @@ const defaultObj = {
proportion: 0.6, proportion: 0.6,
coupon:'', coupon:'',
stock: 0, stock: 0,
growth: 0, // growth: 0,
bar_code: "", bar_code: "",
gist_url:null, gist_url:null,
weight: null, weight: null,

View File

@ -686,9 +686,15 @@ export default {
}, },
// //
async exportList() { async exportList() {
const loading = this.$loading({
lock: true,
text: '正在拼命导出中,请耐心等待...',
spinner: 'el-icon-loading',
background: 'hsla(0, 0%, 100%, .9)'
});
let excelData = JSON.parse(JSON.stringify(this.userFrom)), data = [] let excelData = JSON.parse(JSON.stringify(this.userFrom)), data = []
excelData.page = 1 excelData.page = 1
excelData.limit = 100 excelData.limit = 500
let pageCount = 1 let pageCount = 1
let lebData = {}; let lebData = {};
for (let i = 0; i < pageCount; i++) { for (let i = 0; i < pageCount; i++) {
@ -700,6 +706,7 @@ export default {
} }
} }
createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename); createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename);
loading.close();
return return
}, },
/**导出用户列表 */ /**导出用户列表 */