diff --git a/api/user.js b/api/user.js index 3717a11..64bbbc8 100644 --- a/api/user.js +++ b/api/user.js @@ -1,20 +1,4 @@ -// +---------------------------------------------------------------------- -// | likeshop开源商城系统 -// +---------------------------------------------------------------------- -// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力 -// | gitee下载：https://gitee.com/likeshop_gitee -// | github下载：https://github.com/likeshop-github -// | 访问官网：https://www.likeshop.cn -// | 访问社区：https://home.likeshop.cn -// | 访问手册：http://doc.likeshop.cn -// | 微信公众号：likeshop技术社区 -// | likeshop系列产品在gitee、github等公开渠道开源版本可免费商用，未经许可不能去除前后端官方版权标识 -// | likeshop系列产品收费版本务必购买商业授权，购买去版权授权后，方可去除前后端官方版权标识 -// | 禁止对系统程序代码以任何目的，任何形式的再发布 -// | likeshop团队版权所有并拥有最终解释权 -// +---------------------------------------------------------------------- -// | author: likeshop.cn.team -// +---------------------------------------------------------------------- + import request from '../utils/request' import { client } from '@/utils/tools' //个人中心 @@ -392,3 +376,8 @@ export function getCopyright() { export function bindOawechat(data) { return request.post('account/oaAuthLogin', data) } + +// 绑定微信 +export function getPhone(data) { + return request.post('user/getPhone', data) +} diff --git a/bundle/pages/apply_refund/apply_refund.vue b/bundle/pages/apply_refund/apply_refund.vue index 13766a9..f7d3e2d 100644 --- a/bundle/pages/apply_refund/apply_refund.vue +++ b/bundle/pages/apply_refund/apply_refund.vue @@ -19,13 +19,13 @@ - + @@ -34,24 +34,26 @@ 退款金额 - + 退款原因 - {{ + + - + 上传凭证 @@ -157,15 +159,15 @@ export default { applyAgainFun() { let { reason, reasonIndex, optTyle, remark, fileList } = this; - if (!reason[reasonIndex]) { - return this.$toast({ - title: "请选择退款原因", - }); - } + // if (!reason[reasonIndex]) { + // return this.$toast({ + // title: "请选择退款原因", + // }); + // } const data = { id: this.afterSaleId, - reason: reason[reasonIndex], + reason: reason, refund_type: optTyle, remark: remark, img: fileList.length <= 0 ? "" : fileList[0].base_url, @@ -196,20 +198,32 @@ export default { }, applyAfterSaleFun() { - let { reason, reasonIndex, optTyle, remark, fileList } = this; + let { refundMoney, reason, reasonIndex, optTyle, remark, fileList } = this; - if (!reason[reasonIndex]) { + if (!refundMoney) { return this.$toast({ - title: "请选择退款原因", + title: "请输入退款金额", }); } + if (!reason) { + return this.$toast({ + title: "请输入退款原因", + }); + } + // if (!reason[reasonIndex]) { + // return this.$toast({ + // title: "请选择退款原因", + // }); + // } + const data = { item_id: this.itemId, order_id: this.orderId, + refund_money: this.refundMoney, reason: reason[reasonIndex], refund_type: optTyle, - remark: remark, + // remark: remark, img: fileList.length <= 0 ? "" : fileList[0].url, }; applyAfterSale(data).then((res) => { @@ -255,7 +269,7 @@ export default { }).then((res) => { if (res.code == 1) { this.goods = res.data.goods; - this.reason = res.data.reason; + // this.reason = res.data.reason; } }); }, diff --git a/bundle/pages/coupon/coupon.vue b/bundle/pages/coupon/coupon.vue index 5fb7dad..c00be3a 100644 --- a/bundle/pages/coupon/coupon.vue +++ b/bundle/pages/coupon/coupon.vue @@ -1,199 +1,331 @@ \ No newline at end of file diff --git a/bundle/pages/coupon/coupon_20250718.vue b/bundle/pages/coupon/coupon_20250718.vue new file mode 100644 index 0000000..b03d265 --- /dev/null +++ b/bundle/pages/coupon/coupon_20250718.vue @@ -0,0 +1,198 @@ + + + + + \ No newline at end of file diff --git a/bundle/pages/coupon/coupon_exchange.vue b/bundle/pages/coupon/coupon_exchange.vue new file mode 100644 index 0000000..5373e55 --- /dev/null +++ b/bundle/pages/coupon/coupon_exchange.vue @@ -0,0 +1,89 @@ + + + + + \ No newline at end of file diff --git a/bundle/pages/coupon/coupon_list.vue b/bundle/pages/coupon/coupon_list.vue new file mode 100644 index 0000000..e4f22b6 --- /dev/null +++ b/bundle/pages/coupon/coupon_list.vue @@ -0,0 +1,118 @@ + + + + + \ No newline at end of file diff --git a/bundle/pages/coupon/coupon_package.vue b/bundle/pages/coupon/coupon_package.vue new file mode 100644 index 0000000..c5b1d13 --- /dev/null +++ b/bundle/pages/coupon/coupon_package.vue @@ -0,0 +1,143 @@ + + + + + \ No newline at end of file diff --git a/bundle/pages/points/points_shop.vue b/bundle/pages/points/points_shop.vue index 0fc7a5e..248dc27 100644 --- a/bundle/pages/points/points_shop.vue +++ b/bundle/pages/points/points_shop.vue @@ -27,7 +27,7 @@ return { list: [ { - image: "http://jianbing-media.stnav.com/frontend/img/banner.png", + image: "https://jianbing-media.stnav.com/frontend/img/banner.png", title: "昨夜星辰昨夜风，画楼西畔桂堂东", }, ], diff --git a/bundle/pages/points/points_store.vue b/bundle/pages/points/points_store.vue index 96cca60..74d28b9 100644 --- a/bundle/pages/points/points_store.vue +++ b/bundle/pages/points/points_store.vue @@ -9,28 +9,28 @@ - + - + - + - 小熊早餐必备煮蛋器 + {{item.title}} 兑换66人 - - 100.00 + + {{item.point}} 积分+ - 100.00 + {{item.money}} 元 - + 兑换 @@ -45,7 +45,7 @@ export default { data() { return { - list: [ + tab: [ { name: '全部' }, @@ -53,7 +53,12 @@ name: '热门推荐' } ], - current: 0 + current: 0, + list: [ + {image: 'img/banner.png', title: '小熊早餐必备煮蛋器', needMoney: true, point: 100, money: 200}, + {image: 'img/banner.png', title: '满9-2优惠券', needMoney: false, point: 0, money: 0}, + {image: 'img/banner.png', title: '满15-3优惠券', needMoney: false, point: 0, money: 0}, + ] } }, methods: { diff --git a/components/cate-one/cate-one.vue b/components/cate-one/cate-one.vue index 270c328..0c19932 100644 --- a/components/cate-one/cate-one.vue +++ b/components/cate-one/cate-one.vue @@ -125,6 +125,10 @@ + + + 去结算 + @@ -171,6 +175,7 @@ page:1, status: loadingType.LOADING, selectIndex: 0, + categoryId: 0, cateList: [], goodsList: [], goods_spec: [], @@ -251,6 +256,21 @@ // 添加到购物车(默认商品数量+1,可以让后端连表查询商品数量字段) async addCartFun(item) { + console.log("🚀 ~ addCartFun ~ item:", item) + + // 限购逻辑 + if (item.first_category_id === 1 || item.first_category_id === 2) { + // 统计购物车中同类商品的总数量 + const totalNum = this.cartLists + .filter(i => i.first_category_id === item.first_category_id) + .reduce((sum, i) => sum + (i.goods_num || 0), 0); + + if (totalNum >= 2) { + this.$toast({ title: '该类商品每人限购2件' }); + return; + } + } + const { code, data, @@ -285,6 +305,7 @@ // 获取购物车列表数据 getCartListFun() { + // 获取商品的分类ID getCartList().then((res) => { if (res.code == 1) { @@ -307,7 +328,7 @@ // // this.cartType = cartType; this.totalPrice = total_amount // // this.isShow = true; - // this.getCartNum(); + this.getCartNum(); } }); }, @@ -325,6 +346,8 @@ // 去结算 goSettle() { + console.log(this.cartLists) + this.showCart = false const goods = this.cartLists.map(item => { return { item_id: item.item_id, @@ -334,12 +357,12 @@ uni.navigateTo({ url: "/pages/order_now/order_now?data=" + - encodeURIComponent( - JSON.stringify({ - goods, - type: "cart", - }) - ), + encodeURIComponent( + JSON.stringify({ + goods, + type: "cart", + }) + ), }); }, @@ -457,4 +480,7 @@ border-radius: 100%; } + .settle-btn { + padding: 20rpx; + } \ No newline at end of file diff --git a/components/mobile-login/mobile-login.vue b/components/mobile-login/mobile-login.vue index 31994c7..b6365e8 100644 --- a/components/mobile-login/mobile-login.vue +++ b/components/mobile-login/mobile-login.vue @@ -33,6 +33,8 @@ @@ -183,4 +263,13 @@ right: 0; padding-bottom: env(safe-area-inset-bottom); } + + .number { + background-color: #FF2C3C; + width: 40rpx; + height: 40rpx; + line-height: 40rpx; + border-radius: 100%; + } + \ No newline at end of file diff --git a/pages/signin/signin.vue b/pages/signin/signin.vue index 3122206..f12fd10 100644 --- a/pages/signin/signin.vue +++ b/pages/signin/signin.vue @@ -155,7 +155,7 @@ .signin { height: 570rpx; margin: 24rpx 20rpx 0; - background-image: url(http://jianbing-media.stnav.com/frontend/img/signin-bg.png); + background-image: url(https://jianbing-media.stnav.com/frontend/img/signin-bg.png); background-repeat: no-repeat; background-size: cover; diff --git a/pages/store/store.vue b/pages/store/store.vue index 159923b..2672bea 100644 --- a/pages/store/store.vue +++ b/pages/store/store.vue @@ -19,6 +19,9 @@ 自取 + + + diff --git a/static/coupon_bg.png b/static/coupon_bg.png new file mode 100644 index 0000000..f1538dc Binary files /dev/null and b/static/coupon_bg.png differ diff --git a/uni.scss b/uni.scss index 62cb866..1ae5223 100644 --- a/uni.scss +++ b/uni.scss @@ -71,4 +71,4 @@ $u-form-item-height: 70rpx; $-color-theme: #254062; -$cloudPath: 'http://jianbing-media.stnav.com/frontend/'; \ No newline at end of file +$cloudPath: 'https://jianbing-media.stnav.com/frontend/'; \ No newline at end of file