Commit d8e7243a by 李嘉林

暂存

parent 74e1b7d6
...@@ -16,12 +16,12 @@ module.exports = merge(prodEnv, {//zjgyl ...@@ -16,12 +16,12 @@ module.exports = merge(prodEnv, {//zjgyl
// BASE_URL:"'https://shop.mayi888.com'", // BASE_URL:"'https://shop.mayi888.com'",
// BASE_URL:"'http://192.168.1.146:3005'", // BASE_URL:"'http://192.168.1.146:3005'",
// BASE_URL:"'http://172.16.1.18:3000'", // BASE_URL:"'http://172.16.1.18:3000'",
BASE_URL:"'https://test-m-shop.mayi888.cn'", BASE_URL:"'http://test-m-shop.mayi888.cn'",
ADMIN_URL:"'https://test-ant.mayi888.cn'", ADMIN_URL:"'https://test-ant.mayi888.cn'",
GUIDE_URL:"'https://guide-m.mayi888.cn'", GUIDE_URL:"'https://guide-m.mayi888.cn'",
// BASE_URL:"'http://192.168.137.1:3004'", // BASE_URL:"'http://192.168.137.1:3004'",
OLSHOP_URL:'"https://test-m-shop.mayi888.cn/innerApi/shopApiService"', OLSHOP_URL:'"http://test-m-shop.mayi888.cn/innerApi/shopApiService"',
// OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"', // OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"',
IMG_DOMAIN: '"http://test-bucket-ant.oss-cn-shanghai.aliyuncs.com"', IMG_DOMAIN: '"http://test-bucket-ant.oss-cn-shanghai.aliyuncs.com"',
POSTHOG_KEY: '"phc_nTr1oY7NkSuDMZsqCskE6iUIGKgWPmFHlRAKFVuZD2B"', POSTHOG_KEY: '"phc_nTr1oY7NkSuDMZsqCskE6iUIGKgWPmFHlRAKFVuZD2B"',
......
...@@ -12,6 +12,6 @@ export default { ...@@ -12,6 +12,6 @@ export default {
return requestPOST1(`${process.env.OLSHOP_URL}/burgeonStatements/queryFollowByCustomerStatement?month=${options}`); return requestPOST1(`${process.env.OLSHOP_URL}/burgeonStatements/queryFollowByCustomerStatement?month=${options}`);
}, },
getDzDPdf(options){ getDzDPdf(options){
return requestGET(`https://test-m-shop.mayi888.cn/innerApi/utilsService/genPdf?url=${options}`); return requestGET(`http://test-m-shop.mayi888.cn/innerApi/utilsService/genPdf?url=${options}`);
} }
} }
...@@ -57,9 +57,13 @@ export default { ...@@ -57,9 +57,13 @@ export default {
async init() { async init() {
// 获取待办数据 // 获取待办数据
try { try {
let res = wly.selectToDoList(); let res = await wly.selectToDoList();
if (res.code == 200) { if (res.code == 200) {
this.list[0].count = res.data.countBooking;
this.list[1].count = res.data.countMealSecondConfirm;
}
if (res.data.total > 0) {
this.show = true;
} }
} catch (error) { } catch (error) {
console.log('error', error); console.log('error', error);
......
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