diff --git a/pages/canteenRent/rentList.vue b/pages/canteenRent/rentList.vue index da109be..3909a94 100644 --- a/pages/canteenRent/rentList.vue +++ b/pages/canteenRent/rentList.vue @@ -223,7 +223,6 @@ page: listQuery.value.page, limit: listQuery.value.limit, cate_ids: listQuery.value.cate_ids, - my: 1, order: 'normal', status: 1, province: listQuery.value.province, diff --git a/pages/index/index.vue b/pages/index/index.vue index 4172823..f46ec31 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -76,7 +76,7 @@ 平台推荐 - + 查看更多 未认证 已认证 --> - 剩余拨打次数: {{ userInfo.mobile_num ? userInfo.mobile_num : 0 }}次 + 剩余拨打次数: {{ userInfo.all_mobile_num ? userInfo.all_mobile_num : 0 }}次 - 14 + {{ userInfo.collect_number ? userInfo.collect_number : 0 }} 收藏 - 14 + {{ userInfo.footprint_number ? userInfo.footprint_number : 0 }} 足迹 @@ -51,7 +51,7 @@ 积分 - 14 + {{ userInfo.coupon_number ? userInfo.coupon_number : 0 }} 优惠券 diff --git a/pages/user/goods-log.vue b/pages/user/goods-log.vue index 3bef1af..c79f1b3 100644 --- a/pages/user/goods-log.vue +++ b/pages/user/goods-log.vue @@ -2,14 +2,14 @@ - - + - - - - - - - - - - - + { - if (!state.selectedCollectList.includes(id)) { - state.selectedCollectList.push(id); - } else { - state.selectedCollectList.splice(state.selectedCollectList.indexOf(id), 1); - } - state.selectAll = state.selectedCollectList.length === state.pagination.data.length; - }; - // 全选 - const onSelectAll = () => { - state.selectAll = !state.selectAll; - if (!state.selectAll) { - state.selectedCollectList = []; - } else { - state.pagination.data.forEach((item) => { - if (state.selectedCollectList.includes(item.goods_id)) { - state.selectedCollectList.splice(state.selectedCollectList.indexOf(item.goods_id), 1); - } - state.selectedCollectList.push(item.goods_id); - }); - } - }; - async function onCancel() { - if (state.selectedCollectList) { - state.selectedCollectList = state.selectedCollectList.toString(); - const { code } = await sheep.$api.user.view.delete({ - goods_id: state.selectedCollectList, - }); - if (code === 1) { - state.editMode = false; - state.selectedCollectList = []; - state.selectAll = false; - state.pagination = pagination; - getData(); - } - } - } // 加载更多 function loadmore() { if (state.loadStatus !== 'noMore') { diff --git a/pages/user/info.vue b/pages/user/info.vue index bb8e08a..fc2b809 100644 --- a/pages/user/info.vue +++ b/pages/user/info.vue @@ -95,10 +95,10 @@ > diff --git a/sheep/api/user.js b/sheep/api/user.js index 2c35150..7e02786 100644 --- a/sheep/api/user.js +++ b/sheep/api/user.js @@ -261,12 +261,18 @@ export default { }), }, goodsLog: { - list: (params) => - request({ - url: 'user.goods_log', - method: 'GET', - params, - }), + list: (params) => + request({ + url: 'meal.information/footprint_list', + method: 'GET', + params, + }), + // list: (params) => + // request({ + // url: 'user.goods_log', + // method: 'GET', + // params, + // }), }, favorite: { do: (id) => diff --git a/sheep/ui/su-tabbar/su-tabbar.vue b/sheep/ui/su-tabbar/su-tabbar.vue index 3b6d245..6fb725c 100644 --- a/sheep/ui/su-tabbar/su-tabbar.vue +++ b/sheep/ui/su-tabbar/su-tabbar.vue @@ -83,7 +83,7 @@ // 元素层级z-index zIndex: { type: [String, Number], - default: 10, + default: 100000, }, // 选中标签的颜色 activeColor: {