1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity GitHub Gitee

Compare commits

...

17 Commits

Author SHA1 Message Date
9e0663bbc0 小问题修改 2023-07-16 12:12:37 +08:00
0e9115bb06 Merge branch '毕业答辩' into production 2023-05-06 20:29:52 +08:00
bc66e20b07 小程序商品列表页 划线价格 和 未划线价格 写反了,所以接口这里也反过来写 2023-05-06 20:29:27 +08:00
f4e833b8db Merge branch 'main' into production 2023-04-26 01:14:40 +08:00
a94f36f9d3 Merge branch 'main' into production 2023-04-26 01:02:23 +08:00
5727e2e325 Merge branch 'main' into production 2023-04-25 16:47:06 +08:00
d52c22ff35 小程序小商店同时可以搜商品名称和商品图片;后台管理显示商品简介;其他一些小调整 2023-04-25 05:48:23 +08:00
8ed15d290a Merge branch 'main' into production 2023-04-25 04:56:01 +08:00
bc5de2f4d6 删除多余文件;小修改 2023-04-25 02:29:19 +08:00
2887104bb3 Merge branch 'main' into production 2023-04-25 02:27:04 +08:00
08584c8042 epp-prod.only4.work 改为 epp.only4.work 2023-04-25 02:24:23 +08:00
eae5ac5310 Merge branch 'main' into production 2023-04-25 02:21:39 +08:00
f09dd671a3 Merge branch 'main' into production 2023-04-19 01:09:40 +08:00
fc18ea402b Merge branch 'main' into production 2023-04-18 23:11:39 +08:00
35fdba483b 门禁端小程序环境改为release 2023-04-18 23:11:31 +08:00
d43c140302 Merge branch 'main' into production 2023-04-18 04:02:48 +08:00
24df9fae83 切换为线上域名 2023-04-18 03:53:35 +08:00
6 changed files with 13 additions and 6 deletions

View File

@ -6,7 +6,7 @@
* - 开发环境'ws://127.0.0.1:80/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 实例对象

View File

@ -9,7 +9,7 @@
* - 开发环境"develop"
*/
// 定义常量
const baseUrl = "/"
const baseUrl = "https://epp.only4.work/"
const url = baseUrl + "access/wechat/getUnlimitedQRCode"
const page = "pages/index/index" // "pages/scan/entrance"
const envVersion = "release" // 正式版为 "release",体验版为 "trial",开发版为 "develop"

View File

@ -57,7 +57,14 @@ public class GoodController {
}
}
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()));
}
/**

View File

@ -506,7 +506,7 @@ const handleDelete = (index: number, row: any) => {
//
const handleExport = async () => {
let params = {};
//
//
if (exportConfig.value.withFilter) {
params = JSON.parse(JSON.stringify(query))
//

View File

@ -29,5 +29,5 @@ export default {
* - 线上环境"https://epp.only4.work/"
* - 开发环境"http://localhost/"
*/
backendHost: "http://localhost/",
backendHost: "https://epp.only4.work/",
};

View File

@ -29,7 +29,7 @@ App({
* - 线上环境'https://epp.only4.work'
* - 开发环境'http://localhost'
*/
baseUrl: "http://localhost", // Api 请求域名 不带最后的 /
baseUrl: "https://epp.only4.work", // Api 请求域名 不带最后的 /
userInfo: null
}
})