diff --git a/api/saas.js b/api/saas.js index 23d9abe..2321c50 100644 --- a/api/saas.js +++ b/api/saas.js @@ -90,7 +90,7 @@ const getReceiptReport = (params) => mGet(`/ztb-factory/get/receipt-daily-report const getSalesReport = (params) => mGet(`/ztb-factory/get/sales-daily-report`, params, sconfig) const getGrossReport = (params) => mGet(`/ztb-factory/get/gross-profit-daily-report`, params, sconfig) const getAgentReport = (params) => mGet(`/ztb-factory/get/agency-sales-daily-report`, params, sconfig) -const getMemberList = () => mGet(`/ztb-factory/get/expense-config-list`, null, sconfig) +const getMemberList = (params) => mGet(`/ztb-factory/get/expense-config-list`, params, sconfig) const buyMemberInfo = (params) => mPost(`/ztb-factory/buy/member`, params, sconfig) export { diff --git a/pages/process/order-check/index.json b/pages/process/order-check/index.json index c8794b5..5a9516c 100644 --- a/pages/process/order-check/index.json +++ b/pages/process/order-check/index.json @@ -12,6 +12,7 @@ "van-popup": "/components/popup/index", "vehicle-keyboard": "/components/vehicle-keyboard/index", "submit-layout": "/components/submit-layout/index", + "vip-dialog": "/pages/message/vip-dialog/index", "notification": "/pages/message/notification/index" } } \ No newline at end of file diff --git a/pages/process/order-check/index.wxml b/pages/process/order-check/index.wxml index 2b7dfa0..d59c107 100644 --- a/pages/process/order-check/index.wxml +++ b/pages/process/order-check/index.wxml @@ -134,4 +134,6 @@ + + \ No newline at end of file diff --git a/pages/process/order-price/index.wxml b/pages/process/order-price/index.wxml index 327109c..453b6db 100644 --- a/pages/process/order-price/index.wxml +++ b/pages/process/order-price/index.wxml @@ -169,5 +169,6 @@ + \ No newline at end of file diff --git a/pages/process/outside-add/index.json b/pages/process/outside-add/index.json index 2a00dd4..cc7fee0 100644 --- a/pages/process/outside-add/index.json +++ b/pages/process/outside-add/index.json @@ -15,6 +15,7 @@ "van-field": "/components/field/index", "van-switch": "/components/switch/index", "submit-layout": "/components/submit-layout/index", + "vip-dialog": "/pages/message/vip-dialog/index", "notification": "/pages/message/notification/index" } } \ No newline at end of file diff --git a/pages/process/outside-add/index.wxml b/pages/process/outside-add/index.wxml index ec26539..a23cad9 100644 --- a/pages/process/outside-add/index.wxml +++ b/pages/process/outside-add/index.wxml @@ -111,4 +111,6 @@ + + \ No newline at end of file diff --git a/pages/process/outside-check/index.json b/pages/process/outside-check/index.json index 6a8e677..d01f440 100644 --- a/pages/process/outside-check/index.json +++ b/pages/process/outside-check/index.json @@ -6,6 +6,7 @@ "van-dialog": "/components/dialog/index", "outside-check-item": "/pages/process/outside-check-item/index", "submit-layout": "/components/submit-layout/index", + "vip-dialog": "/pages/message/vip-dialog/index", "notification": "/pages/message/notification/index" } } \ No newline at end of file diff --git a/pages/process/outside-price/index.json b/pages/process/outside-price/index.json index 1be317f..aa49286 100644 --- a/pages/process/outside-price/index.json +++ b/pages/process/outside-price/index.json @@ -15,6 +15,7 @@ "outside-item": "/pages/process/outside-item/index", "van-uploader": "/components/uploader/index", "submit-layout": "/components/submit-layout/index", + "vip-dialog": "/pages/message/vip-dialog/index", "notification": "/pages/message/notification/index" } } \ No newline at end of file diff --git a/pages/process/outside-price/index.wxml b/pages/process/outside-price/index.wxml index 3a26509..023552d 100644 --- a/pages/process/outside-price/index.wxml +++ b/pages/process/outside-price/index.wxml @@ -169,5 +169,6 @@ + \ No newline at end of file diff --git a/pages/process/payment/index.json b/pages/process/payment/index.json index 4b0823e..78ea120 100644 --- a/pages/process/payment/index.json +++ b/pages/process/payment/index.json @@ -9,6 +9,7 @@ "van-textarea": "/components/textarea/index", "van-dialog": "/components/dialog/index", "submit-layout": "/components/submit-layout/index", + "vip-dialog": "/pages/message/vip-dialog/index", "notification": "/pages/message/notification/index" } } \ No newline at end of file diff --git a/pages/process/payment/index.wxml b/pages/process/payment/index.wxml index fd99da3..82f755a 100644 --- a/pages/process/payment/index.wxml +++ b/pages/process/payment/index.wxml @@ -50,7 +50,7 @@ 点击订单项可以查看详情 - + @@ -97,7 +97,7 @@ custom-style="color: #323233" bind:click="onPopupClose">取消 --> - + \ No newline at end of file diff --git a/pages/storage/order-create/index.json b/pages/storage/order-create/index.json index 2417f14..576c3b7 100644 --- a/pages/storage/order-create/index.json +++ b/pages/storage/order-create/index.json @@ -15,6 +15,7 @@ "van-collapse": "/components/collapse/index", "van-collapse-item": "/components/collapse-item/index", "submit-layout": "/components/submit-layout/index", + "vip-dialog": "/pages/message/vip-dialog/index", "notification": "/pages/message/notification/index" } } \ No newline at end of file diff --git a/pages/storage/order-create/index.wxml b/pages/storage/order-create/index.wxml index ff110e7..20aea60 100644 --- a/pages/storage/order-create/index.wxml +++ b/pages/storage/order-create/index.wxml @@ -124,4 +124,6 @@ + + diff --git a/pages/ztbvip/member/index.js b/pages/ztbvip/member/index.js index d265007..517af6d 100644 --- a/pages/ztbvip/member/index.js +++ b/pages/ztbvip/member/index.js @@ -31,7 +31,7 @@ Scene({ this.setData({ expirationTime:app.userInfo.expirationTime, isExpiration: result.isExpiration }) }) } - getMemberList().then(res => { + getMemberList({enable: 1}).then(res => { var memberList = res.data.records wx.hideLoading() this.setData({ factoryName: app.userInfo.factoryName,