From 743dba1045d78310263c0ec63413487bab5b0758 Mon Sep 17 00:00:00 2001 From: Lirui <2417307363@qq.com> Date: Sun, 31 Mar 2024 09:15:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 9 ---- pages/activity/groupon/order.vue | 7 --- pages/announcement/detail.vue | 2 +- pages/commission/teamNew.vue | 1 + pages/coupon/list.vue | 12 +++-- pages/goods/index.vue | 2 +- pages/index/category.vue | 2 +- pages/order/confirm.vue | 17 +++++-- pages/order/detail.vue | 48 ------------------ pages/order/list.vue | 49 ------------------- pages/user/info.vue | 4 +- sheep/api/order.js | 9 ---- .../s-businessSchool/s-businessSchool.vue | 6 +-- .../s-coupon-choose/s-coupon-choose.vue | 26 +++++++++- .../s-goods-column/s-goods-column.vue | 3 +- .../s-image-banner/s-image-banner.vue | 6 ++- .../components/s-menu-tools/s-menu-tools.vue | 20 -------- .../s-platform-announcement-item.vue | 5 +- .../s-ztaddress-info/s-ztaddress-info.vue | 39 ++++++++------- sheep/ui/su-swiper/su-swiper.vue | 16 +++--- 20 files changed, 94 insertions(+), 189 deletions(-) diff --git a/pages.json b/pages.json index be17dd4..c3f38d4 100644 --- a/pages.json +++ b/pages.json @@ -157,15 +157,6 @@ "group": "商品" } }, - { - "path": "comment/add", - "style": { - "navigationBarTitleText": "评价商品" - }, - "meta": { - "auth": true - } - }, { "path": "comment/list", "style": { diff --git a/pages/activity/groupon/order.vue b/pages/activity/groupon/order.vue index a19aa45..a549801 100644 --- a/pages/activity/groupon/order.vue +++ b/pages/activity/groupon/order.vue @@ -140,13 +140,6 @@ }); } - // 评价 - function onComment(orderSN) { - sheep.$router.go('/pages/order/comment/add', { - orderSN, - }); - } - // 确认收货 async function onConfirm(orderId) { const { code, data } = await sheep.$api.order.confirm(orderId); diff --git a/pages/announcement/detail.vue b/pages/announcement/detail.vue index 411ffb6..b139a5a 100644 --- a/pages/announcement/detail.vue +++ b/pages/announcement/detail.vue @@ -4,7 +4,7 @@ {{ state.title }} - {{ dayjs(state.time).format('YYYY.MM.DD') }} + {{ dayjs(state.time).format('YYYY/MM/DD') }} diff --git a/pages/commission/teamNew.vue b/pages/commission/teamNew.vue index 7cd16e0..11d455d 100644 --- a/pages/commission/teamNew.vue +++ b/pages/commission/teamNew.vue @@ -81,6 +81,7 @@ background: #fff; border-radius: 15rpx 15rpx 15rpx 15rpx; padding: 38rpx 40rpx 34rpx; + margin-bottom: 15rpx; &-top { padding-bottom: 38rpx; border-bottom: 1rpx solid #eee; diff --git a/pages/coupon/list.vue b/pages/coupon/list.vue index 9214089..3a98f4f 100644 --- a/pages/coupon/list.vue +++ b/pages/coupon/list.vue @@ -168,13 +168,14 @@ } } async function commissionCouponList() { - const { code, data ,msg } = await sheep.$api.coupon.commissionCouponList(); + const { code, data, msg } = await sheep.$api.coupon.commissionCouponList(); if (code === 1 && data && `${data.is_get}` === '0') { state.dataList.forEach((item) => { item.typeList = data[item.key].map(val => ({ name: val.name, time: `${val.get_start_time}~${val.get_end_time}`, id: val.id })) }); state.show = true; state.level = data.level_name; + console.log(111111111); } else { getCoupon(); } @@ -191,9 +192,14 @@ } async function getProgramIds(key) { const { typeList } = state.dataList.find((val) => val.key === key); - const { code, data } = await sheep.$api.coupon.getIds(typeList.map(val => (val.id)).join()); + const { code, data, msg } = await sheep.$api.coupon.getIds(typeList.map(val => (val.id)).join()); state.show = false; - getCoupon(); + if (code !== 1) { + sheep.$helper.toast(msg); + } + setTimeout(() => { + getCoupon(); + }, 500) } onLoad((Option) => { state.type = Option.type; diff --git a/pages/goods/index.vue b/pages/goods/index.vue index d3e31a4..7aa4fa0 100644 --- a/pages/goods/index.vue +++ b/pages/goods/index.vue @@ -31,7 +31,7 @@ ￥{{ state.selectedSkuPrice.price || (state.goodsInfo && formatPrice(state.goodsInfo.price)) }} - 返{{ state.selectedSkuPrice.back_score || 0 }}积分 + 返{{ state.goodsInfo.back_score || 0 }}积分 {{ state.selectedSkuPrice.original_price || state.goodsInfo.original_price }} diff --git a/pages/index/category.vue b/pages/index/category.vue index 2f20fed..f278e12 100644 --- a/pages/index/category.vue +++ b/pages/index/category.vue @@ -11,7 +11,7 @@ {{ unit.title }} ￥{{ unit.price[0] }} - 返{{ unit.title.back_score || 0 }}积分 + 返{{ unit.back_score || 0 }}积分 diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue index 983960d..6f33fb0 100644 --- a/pages/order/confirm.vue +++ b/pages/order/confirm.vue @@ -20,6 +20,7 @@ + { + state.orderPayload = {...state.orderPayload, ...e }; + console.log(e, state.orderPayload, 2222) + }); + } + // 更改收货人地址&计算订单信息 async function changeConsignee(addressInfo = {}) { if (isEmpty(addressInfo)) { @@ -363,9 +372,8 @@ } .uni-easyinput__content-input { - font-size: 28rpx; - height: 72rpx; - text-align: right !important; + font-size: 26rpx !important; + height: 60rpx !important; padding-right: 0 !important; .uni-input-input { @@ -387,6 +395,9 @@ font-size: 30rpx !important; color: var(--ui-BG-Main) !important; } + .uni-calendar--fixed { + bottom: 130rpx; + } } .score-img { width: 36rpx; diff --git a/pages/order/detail.vue b/pages/order/detail.vue index 14caa82..4c4a6a1 100644 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -101,17 +101,6 @@ @@ -52,6 +60,10 @@ typeList: [] }], }, + level: { + type: String, + default: '', + }, }); const emits = defineEmits(['get', 'close']); const state = reactive({ @@ -59,7 +71,9 @@ }); function onChange(key) { state.current_type = key; - emits('get', key); + } + function onConfirm() { + emits('get', state.current_type); } diff --git a/sheep/components/s-goods-column/s-goods-column.vue b/sheep/components/s-goods-column/s-goods-column.vue index d2c3c6c..b43ccf4 100644 --- a/sheep/components/s-goods-column/s-goods-column.vue +++ b/sheep/components/s-goods-column/s-goods-column.vue @@ -216,7 +216,8 @@ :dotStyle="'long'" imageMode="widthFix" dotCur="bg-mask-40" - :seizeHeight="200" + :seizeHeight="350" + :imgHeight="350" :autoplay="false" :interval="3000" /> diff --git a/sheep/components/s-image-banner/s-image-banner.vue b/sheep/components/s-image-banner/s-image-banner.vue index 69e2173..0915803 100644 --- a/sheep/components/s-image-banner/s-image-banner.vue +++ b/sheep/components/s-image-banner/s-image-banner.vue @@ -5,8 +5,9 @@ :dotStyle="dotMap[data.indicator]" imageMode="widthFix" dotCur="bg-mask-40" - :seizeHeight="300" + :seizeHeight="350" :autoplay="data.autoplay" + :imgHeight="350" :interval="Number(data.interval)" /> @@ -41,4 +42,5 @@ ); - + diff --git a/sheep/components/s-menu-tools/s-menu-tools.vue b/sheep/components/s-menu-tools/s-menu-tools.vue index f09c7a9..bef7b3d 100644 --- a/sheep/components/s-menu-tools/s-menu-tools.vue +++ b/sheep/components/s-menu-tools/s-menu-tools.vue @@ -48,26 +48,6 @@ icon: '/assets/addons/shopro/uniapp/tools/user.png', title: '个人中心', }, - { - url: '/pages/index/cart', - icon: '/assets/addons/shopro/uniapp/tools/cart.png', - title: '购物车', - }, - { - url: '/pages/user/goods-log', - icon: '/assets/addons/shopro/uniapp/tools/browse.png', - title: '浏览记录', - }, - { - url: '/pages/user/goods-collect', - icon: '/assets/addons/shopro/uniapp/tools/collect.png', - title: '我的收藏', - }, - { - url: '/pages/public/feedback', - icon: '/assets/addons/shopro/uniapp/tools/feedback.png', - title: '意见反馈', - }, { url: '/pages/chat/index', icon: '/assets/addons/shopro/uniapp/tools/service.png', diff --git a/sheep/components/s-platform-announcement-item/s-platform-announcement-item.vue b/sheep/components/s-platform-announcement-item/s-platform-announcement-item.vue index 860763c..47a3193 100644 --- a/sheep/components/s-platform-announcement-item/s-platform-announcement-item.vue +++ b/sheep/components/s-platform-announcement-item/s-platform-announcement-item.vue @@ -6,10 +6,9 @@ - 上传时间：{{ dayjs(item.createtime).format('YYYY.MM.DD') }} + {{ dayjs(item.createtime).format('YYYY/MM/DD').replaceAll('/', '.') }} - 上传时间：{{ dayjs(item.createtime).format('YYYY.MM.DD') }} - 更新时间：{{ dayjs(item.updatetime).format('YYYY.MM.DD') }} + 上传时间：{{ dayjs(item.createtime).format('YYYY/MM/DD').replaceAll('/', '.') }} diff --git a/sheep/components/s-ztaddress-info/s-ztaddress-info.vue b/sheep/components/s-ztaddress-info/s-ztaddress-info.vue index 32e35ec..976cf6e 100644 --- a/sheep/components/s-ztaddress-info/s-ztaddress-info.vue +++ b/sheep/components/s-ztaddress-info/s-ztaddress-info.vue @@ -8,7 +8,7 @@ 自取时间 - +