diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..efe7735 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +unpackage \ No newline at end of file diff --git a/apis/interfaces/coupon.js b/apis/interfaces/coupon.js index 2520e5a..460f2d6 100644 --- a/apis/interfaces/coupon.js +++ b/apis/interfaces/coupon.js @@ -33,7 +33,7 @@ const getCouponsInfoById = (id) => { // 根据企业id获取企业首页的轮播图列表 const couponsByCompanyId = (data) => { return request({ - url: 'coupons', + url: 'coupons/all', method: 'get', data: data }) diff --git a/apis/interfaces/mine.js b/apis/interfaces/mine.js new file mode 100644 index 0000000..9ffb88c --- /dev/null +++ b/apis/interfaces/mine.js @@ -0,0 +1,97 @@ +/** + * Web-zdx + * moduleName:个人中心相关操作 + */ + +import request from '../request.js' + +// 关注店铺 +const shopSubscribe = (id) => { + return request({ + url: 'mall/shops/subscribe/' + id, + method: 'POST' + }) +} + +// 我的关注店铺列表 +const shopSubscribeList = (page) => { + return request({ + url: 'mall/shops/subscribe', + method:'get', + data:{ + page:page + } + }) +} + +// 关于我们 +const aboutUs = () => { + return request({ + url: 'articles/about' + }) +} + +// 获取用户信息 +const getUserInfo = () => { + return request({ + url: 'user/app' + }) +} + +// 获取用户设置中心的信息 +const getUserSettingInfo = () => { + return request({ + url: 'user/setting' + }) +} + +// 账号余额等信息 +const chaineb = (data) => { + return request({ + url: 'user/account/chaineb', + method:'get', + data:data + }) +} + +// 我的足迹 +const browsers = (page) => { + return request({ + url: 'mall/goods/browsers', + method: 'get', + data: { + page:page, + page_size:20 + } + }) +} + +// 修改用户头像或昵称 +const resetUserInfo= (data) => { + return request({ + url: 'user/'+data.key, + method: 'PUT', + data:{ + value:data.value + } + }) +} + +// 我的推广码 +const appcode = () => { + return request({ + url: 'user/appcode' + }) +} + +export { + shopSubscribe, + shopSubscribeList, + aboutUs, + getUserInfo, + getUserSettingInfo, + chaineb, + browsers, + resetUserInfo, + appcode +} diff --git a/apis/interfaces/numberWeight.js b/apis/interfaces/numberWeight.js index da795d3..f2878b9 100644 --- a/apis/interfaces/numberWeight.js +++ b/apis/interfaces/numberWeight.js @@ -13,6 +13,7 @@ const mallWarrants = (data) => { data: data }) } + // 我的数权Id获取数权详情 const mallWarrantsList = (symbol) => { return request({ @@ -23,6 +24,7 @@ const mallWarrantsList = (symbol) => { } }) } + // 确认提货 const mallWarrantsSure = (data) => { return request({ @@ -31,6 +33,7 @@ const mallWarrantsSure = (data) => { data: data }) } + // 我的邮寄订单，我的提货单 const mallShipmentsPostShop = (apiUrl,data) => { return request({ @@ -39,6 +42,7 @@ const mallShipmentsPostShop = (apiUrl,data) => { data: data }) } + // 根据提货单的no 获取提货单的详情 const mallShipmentsInfo = (no) => { return request({ @@ -46,6 +50,7 @@ const mallShipmentsInfo = (no) => { method: 'GET' }) } + // 取消提货单 const mallShipmentsCancel = (shipmentNo) => { return request({ @@ -103,6 +108,7 @@ const mallRefundsInfo = (no) => { method: 'GET' }) } + // 确认退货mall/refunds/{refund}/deliver const mallRefundsDeliver = (data) => { return request({ diff --git a/components/coupon-template/coupon-template-1.vue b/components/coupon-template/coupon-template-1.vue index b08367f..7c50784 100644 --- a/components/coupon-template/coupon-template-1.vue +++ b/components/coupon-template/coupon-template-1.vue @@ -21,12 +21,10 @@ {{item.price_text}} 剩余{{item.time.expire}}天 - - 去使用 - + 去使用 - + 查看全部{{item.coupon_count}}张优惠券 @@ -34,7 +32,7 @@ - + @@ -54,11 +52,26 @@ return { }; + }, + methods:{ + couponDetailGo(id) { + // this.$router.push({name: 'CouponDetail', query: {id: id}}) + uni.navigateTo({ + url:'/pages/property/coupon/detail?id='+id + }) + }, + couponMoreListGo(id) { + // this.$router.push({name:'CouponMoreList', query:{id: id}}) + uni.navigateTo({ + url: '/pages/property/coupon/couponMore?id='+id + }) + } } } diff --git a/pages/equity/index.vue b/pages/equity/index.vue index 0fd4374..e50f716 100644 --- a/pages/equity/index.vue +++ b/pages/equity/index.vue @@ -142,7 +142,7 @@ 限时抢购海量商家优惠券 - 查看更多 + 查看更多 diff --git a/pages/order/couponMore.vue b/pages/order/couponMore.vue new file mode 100644 index 0000000..d9418ed --- /dev/null +++ b/pages/order/couponMore.vue @@ -0,0 +1,253 @@ + + + + + diff --git a/pages/property/collection/collection.vue b/pages/property/collection/collection.vue new file mode 100644 index 0000000..9bd420b --- /dev/null +++ b/pages/property/collection/collection.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/pages/property/coupon/couponMore.vue b/pages/property/coupon/couponMore.vue index 286ebe2..41ce3f1 100644 --- a/pages/property/coupon/couponMore.vue +++ b/pages/property/coupon/couponMore.vue @@ -2,7 +2,7 @@ - + @@ -34,7 +34,7 @@ }, onLoad(e) { console.log(e) - this.id = this.$route.query.id + this.id = e.id this.getMyCoupon() }, onShow() { @@ -56,6 +56,7 @@ } else { this.$refs.uToast.show({ title: '吼吼吼~我是有底的~', + type: 'primary', duration: 3000 }) } @@ -80,9 +81,9 @@ }).catch(err => { this.$refs.uToast.show({ title: err.message, + type: 'primary', duration: 3000 }) - }) }, // 选择顶部菜单 @@ -124,7 +125,6 @@ min-height: 100vh; box-sizing: border-box; background-color: #F7F7F7; - padding-bottom: 20rpx; .coupon-nav { display: flex; diff --git a/pages/property/coupon/detail.vue b/pages/property/coupon/detail.vue index 946afd8..cb2d3e2 100644 --- a/pages/property/coupon/detail.vue +++ b/pages/property/coupon/detail.vue @@ -12,9 +12,9 @@ 可用商品 （多选一） - + - {{item.name}} + {{item.name}} ￥{{item.price}} 立即购买 @@ -67,8 +67,7 @@ GoodTemplate }, onLoad(e) { - console.log(this.$route) - this.coupon_grant_id = this.$route.query.id + this.coupon_grant_id = e.id this.getList() }, methods: { @@ -87,16 +86,14 @@ }, // 点击立即购买去商品确认页面 nowBuy(items) { - console.log(items, 'items....') - let data = { - skuId: items.goods_sku_id, - qty: 1 - } - this.$router.push({ - name: 'Buy', - params: data + uni.navigateTo({ + url:'/pages/order/buy?qty=1&skuId='+items.goods_sku_id, + }) + }, + goDetail(id){ + uni.navigateTo({ + url:'/pages/goods/details?id='+id }) - console.log(data) }, // 点击二维码特效 clickCode(grantid) { @@ -152,7 +149,7 @@ // 优惠券 .coupon { - margin: 0 $margin * 2; + margin: 0 $margin; background-color: #Fff; position: relative; z-index: 1; @@ -182,7 +179,7 @@ // 可用商品 .goods-item { background-color: #fff; - margin: $margin*1.5 $margin * 2; + margin: $margin*1.5 $margin; border-radius: 20rpx; display: flex; flex-direction: row; @@ -237,18 +234,18 @@ font-size: 34rpx; font-weight: bold; text-align: left; - margin: $margin*2; + margin: $margin $margin; // text-shadow:10rpx 10rpx linear-gradient(to right, #f39e17, #f85b05); text-shadow: 2rpx 2rpx 10rpx $main-color; } // 描述 .describe { - margin: $margin * 2 0; + margin: $margin 0; .describe-des { color: #999; - padding: 10rpx $margin * 2; + padding: 10rpx $margin ; font-size: 28rpx; } } diff --git a/pages/property/eb.vue b/pages/property/eb.vue index e3e12e6..57d7706 100644 --- a/pages/property/eb.vue +++ b/pages/property/eb.vue @@ -1,22 +1,327 @@ - diff --git a/pages/property/historyShop/historyShop.vue b/pages/property/historyShop/historyShop.vue new file mode 100644 index 0000000..fb7760a --- /dev/null +++ b/pages/property/historyShop/historyShop.vue @@ -0,0 +1,139 @@ + + + + + diff --git a/pages/property/index.vue b/pages/property/index.vue index 74958f5..a11e96c 100644 --- a/pages/property/index.vue +++ b/pages/property/index.vue @@ -1,17 +1,17 @@