Compare commits
17 Commits
main
...
production
Author | SHA1 | Date | |
---|---|---|---|
9e0663bbc0 | |||
0e9115bb06 | |||
bc66e20b07 | |||
f4e833b8db | |||
a94f36f9d3 | |||
5727e2e325 | |||
d52c22ff35 | |||
8ed15d290a | |||
bc5de2f4d6 | |||
2887104bb3 | |||
08584c8042 | |||
eae5ac5310 | |||
f09dd671a3 | |||
fc18ea402b | |||
35fdba483b | |||
d43c140302 | |||
24df9fae83 |
@ -6,7 +6,7 @@
|
|||||||
* - 开发环境:'ws://127.0.0.1:80/access/websocket/'
|
* - 开发环境:'ws://127.0.0.1:80/access/websocket/'
|
||||||
* 'ws://127.0.0.1:8002/access/websocket/'
|
* 'ws://127.0.0.1:8002/access/websocket/'
|
||||||
*/
|
*/
|
||||||
window.wsUrl = 'ws://127.0.0.1:80/access/websocket/';
|
window.wsUrl = 'wss://epp.only4.work/access/websocket/';
|
||||||
|
|
||||||
window.ws = null; // WebSocket 实例对象
|
window.ws = null; // WebSocket 实例对象
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
* - 开发环境:"develop"
|
* - 开发环境:"develop"
|
||||||
*/
|
*/
|
||||||
// 定义常量
|
// 定义常量
|
||||||
const baseUrl = "/"
|
const baseUrl = "https://epp.only4.work/"
|
||||||
const url = baseUrl + "access/wechat/getUnlimitedQRCode"
|
const url = baseUrl + "access/wechat/getUnlimitedQRCode"
|
||||||
const page = "pages/index/index" // "pages/scan/entrance"
|
const page = "pages/index/index" // "pages/scan/entrance"
|
||||||
const envVersion = "release" // 正式版为 "release",体验版为 "trial",开发版为 "develop"
|
const envVersion = "release" // 正式版为 "release",体验版为 "trial",开发版为 "develop"
|
||||||
|
@ -57,7 +57,14 @@ public class GoodController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
List<GoodVO> list = goodService.listOnSale(cateId, searchText);
|
List<GoodVO> list = goodService.listOnSale(cateId, searchText);
|
||||||
return Res.success(list);
|
// return Res.success(list);
|
||||||
|
|
||||||
|
// 小程序商品列表页 划线价格 和 未划线价格 写反了,所以接口这里也反过来写
|
||||||
|
return Res.success(list.stream().peek(i -> {
|
||||||
|
Double retailPrice = i.getRetailPrice();
|
||||||
|
i.setRetailPrice(i.getCounterPrice());
|
||||||
|
i.setCounterPrice(retailPrice);
|
||||||
|
}).collect(Collectors.toList()));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -506,7 +506,7 @@ const handleDelete = (index: number, row: any) => {
|
|||||||
// 导出数据到文件
|
// 导出数据到文件
|
||||||
const handleExport = async () => {
|
const handleExport = async () => {
|
||||||
let params = {};
|
let params = {};
|
||||||
// 如果选择仅导出满肚条件的数据,那么这里就填上查询参数
|
// 如果选择仅导出满足条件的数据,那么这里就填上查询参数
|
||||||
if (exportConfig.value.withFilter) {
|
if (exportConfig.value.withFilter) {
|
||||||
params = JSON.parse(JSON.stringify(query))
|
params = JSON.parse(JSON.stringify(query))
|
||||||
// 去除分页参数
|
// 去除分页参数
|
||||||
|
@ -29,5 +29,5 @@ export default {
|
|||||||
* - 线上环境:"https://epp.only4.work/"
|
* - 线上环境:"https://epp.only4.work/"
|
||||||
* - 开发环境:"http://localhost/"
|
* - 开发环境:"http://localhost/"
|
||||||
*/
|
*/
|
||||||
backendHost: "http://localhost/",
|
backendHost: "https://epp.only4.work/",
|
||||||
};
|
};
|
||||||
|
@ -29,7 +29,7 @@ App({
|
|||||||
* - 线上环境:'https://epp.only4.work'
|
* - 线上环境:'https://epp.only4.work'
|
||||||
* - 开发环境:'http://localhost'
|
* - 开发环境:'http://localhost'
|
||||||
*/
|
*/
|
||||||
baseUrl: "http://localhost", // Api 请求域名 不带最后的 /
|
baseUrl: "https://epp.only4.work", // Api 请求域名 不带最后的 /
|
||||||
userInfo: null
|
userInfo: null
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
Loading…
Reference in New Issue
Block a user