diff --git a/App.vue b/App.vue index b9ecc033..9f8b1f5c 100644 --- a/App.vue +++ b/App.vue @@ -1,46 +1,39 @@ \ No newline at end of file + @import '@/sheep/scss/index.scss'; + diff --git a/pages/pay/recharge.vue b/pages/pay/recharge.vue index 15edc233..32c27232 100644 --- a/pages/pay/recharge.vue +++ b/pages/pay/recharge.vue @@ -85,7 +85,7 @@ // #endif sheep.$router.go('/pages/pay/index', { id: data.payOrderId, - type: 'recharge' + orderType: 'recharge' }); } diff --git a/pages/user/wallet/score.vue b/pages/user/wallet/score.vue index fc75d75a..335bc81a 100644 --- a/pages/user/wallet/score.vue +++ b/pages/user/wallet/score.vue @@ -8,12 +8,11 @@ }, ]"> - + 当前积分 - {{ userInfo.point || 0 }} @@ -100,7 +99,6 @@ name: '全部', value: 'all', }, - // { // name: '收入', // value: 'income', @@ -147,6 +145,7 @@ // } } } + onLoad(async (options) => { state.today = dayjs().format('YYYY-MM-DD'); state.date = [state.today, state.today]; @@ -166,10 +165,6 @@ getLogList(); } - function appendTimeHMS(arr) { - return [arr[0] + ' 00:00:00', arr[1] + ' 23:59:59']; - } - function onLoadMore() { // if (state.loadStatus !== 'noMore') { getLogList(pagination.current_page + 1); diff --git a/sheep/api/app.js b/sheep/api/app.js index a456039a..05081248 100644 --- a/sheep/api/app.js +++ b/sheep/api/app.js @@ -13,19 +13,6 @@ export default { showLoading: false, }, }), - // 同步客户端页面到后端 - pageSync: (pages) => - request({ - url: 'pageSync', - method: 'POST', - data: { - pages, - }, - custom: { - showError: false, - showLoading: false, - }, - }), // 自定义页面 page: (id) => request({ diff --git a/sheep/components/s-coupon-block/s-coupon-block.vue b/sheep/components/s-coupon-block/s-coupon-block.vue index af29c097..22a7731f 100644 --- a/sheep/components/s-coupon-block/s-coupon-block.vue +++ b/sheep/components/s-coupon-block/s-coupon-block.vue @@ -1,4 +1,4 @@ - +