diff --git a/pages.json b/pages.json index 2085d81..ef6fdec 100644 --- a/pages.json +++ b/pages.json @@ -177,6 +177,17 @@ "group": "商品" } }, + { + "path": "sales", + "style": { + "navigationBarTitleText": "促销商品" + }, + "meta": { + "sync": true, + "title": "促销商品", + "group": "商品" + } + }, { "path": "list", "style": { diff --git a/pages/activity/groupon/detail.vue b/pages/activity/groupon/detail.vue index 0cf22f1..bade0a3 100644 --- a/pages/activity/groupon/detail.vue +++ b/pages/activity/groupon/detail.vue @@ -1,516 +1,531 @@ + .order-btn { + width: 668rpx; + height: 70rpx; + border: 2rpx solid #dfdfdf; + border-radius: 35rpx; + color: #999999; + font-weight: 500; + font-size: 26rpx; + line-height: normal; + } + + .disabled-btn { + width: 668rpx; + height: 70rpx; + background: #dddddd; + border-radius: 35rpx; + color: #999999; + font-weight: 500; + font-size: 28rpx; + line-height: normal; + } + + .join-btn { + width: 668rpx; + height: 70rpx; + background: linear-gradient(90deg, #ff6000 0%, #fe832a 100%); + box-shadow: 0px 8rpx 6rpx 0px rgba(255, 104, 4, 0.22); + border-radius: 35rpx; + color: #fff; + font-weight: 500; + font-size: 28rpx; + line-height: normal; + } + + .detail-cell-wrap { + width: 100%; + padding: 10rpx 20rpx; + box-sizing: border-box; + border-top: 2rpx solid #dfdfdf; + background-color: #fff; + // min-height: 60rpx; + + .label-text { + font-size: 28rpx; + font-weight: 400; + } + + .cell-content { + font-size: 28rpx; + font-weight: 500; + color: $dark-6; + } + + .right-forwrad-icon { + font-size: 28rpx; + font-weight: 500; + color: $dark-9; + } + } + \ No newline at end of file diff --git a/pages/activity/groupon/list.vue b/pages/activity/groupon/list.vue index b5a2746..08aee39 100644 --- a/pages/activity/groupon/list.vue +++ b/pages/activity/groupon/list.vue @@ -119,7 +119,7 @@ width: 100%; height: 458rpx; margin-top: -88rpx; - background: v-bind(headerBg) no-repeat; + background: url('https://zysc.fjptzykj.com:3000/shangcheng/fea9ad54f32d4705a633874efd534e70e507030ea5a7604b0110fdf7292f1f4d.png'); background-size: 100% 100%; } .list-content { diff --git a/pages/goods/groupon.vue b/pages/goods/groupon.vue index 97c5851..aa8cb12 100644 --- a/pages/goods/groupon.vue +++ b/pages/goods/groupon.vue @@ -85,7 +85,12 @@ - + + + + + + diff --git a/pages/goods/sales.vue b/pages/goods/sales.vue new file mode 100644 index 0000000..811f198 --- /dev/null +++ b/pages/goods/sales.vue @@ -0,0 +1,295 @@ + + + + + + diff --git a/pages/subscribe/subscribe.vue b/pages/subscribe/subscribe.vue index c41de5f..0a024d9 100644 --- a/pages/subscribe/subscribe.vue +++ b/pages/subscribe/subscribe.vue @@ -1,35 +1,36 @@ diff --git a/sheep/components/s-groupon-block/s-groupon-block.vue b/sheep/components/s-groupon-block/s-groupon-block.vue index 1345483..0bc5e21 100644 --- a/sheep/components/s-groupon-block/s-groupon-block.vue +++ b/sheep/components/s-groupon-block/s-groupon-block.vue @@ -1,154 +1,164 @@ + .goods-list { + position: relative; + + .cart-btn { + position: absolute; + bottom: 10rpx; + right: 20rpx; + z-index: 11; + height: 50rpx; + line-height: 50rpx; + padding: 0 20rpx; + border-radius: 25rpx; + font-size: 24rpx; + color: #fff; + } + } + + .goods-list { + &:nth-last-of-type(1) { + margin-bottom: 0 !important; + } + } + + .goods-sm-box { + margin: 0 auto; + box-sizing: border-box; + + .goods-card-box { + flex-shrink: 0; + overflow: hidden; + width: 33.3%; + box-sizing: border-box; + } + } + \ No newline at end of file diff --git a/sheep/ui/su-coupon/su-coupon.vue b/sheep/ui/su-coupon/su-coupon.vue index 472d17f..c94806c 100644 --- a/sheep/ui/su-coupon/su-coupon.vue +++ b/sheep/ui/su-coupon/su-coupon.vue @@ -1,7 +1,7 @@ @@ -175,6 +203,7 @@ \ No newline at end of file diff --git a/uni_modules/zmxy-slideshow/package.json b/uni_modules/zmxy-slideshow/package.json new file mode 100644 index 0000000..85db18b --- /dev/null +++ b/uni_modules/zmxy-slideshow/package.json @@ -0,0 +1,85 @@ +{ + "id": "zmxy-slideshow", + "displayName": "zmxy-slideshow-个性化幻灯片", + "version": "1.0.3", + "description": "zmxy-slideshow-个性化幻灯片，常用于轮播图，广告播放", + "keywords": [ + "幻灯片", + "轮播图", + "广告横幅", + "渐变", + "放大" +], + "repository": "", + "engines": { + "HBuilderX": "^3.8.0" + }, + "dcloudext": { + "type": "component-vue", + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "" + }, + "uni_modules": { + "dependencies": [], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "Vue": { + "vue2": "y", + "vue3": "y" + }, + "App": { + "app-vue": "y", + "app-nvue": "n" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "n", + "QQ": "y", + "钉钉": "y", + "快手": "y", + "飞书": "n", + "京东": "n" + }, + "快应用": { + "华为": "u", + "联盟": "u" + } + } + } + } +} \ No newline at end of file diff --git a/uni_modules/zmxy-slideshow/readme.md b/uni_modules/zmxy-slideshow/readme.md new file mode 100644 index 0000000..21ee561 --- /dev/null +++ b/uni_modules/zmxy-slideshow/readme.md @@ -0,0 +1,65 @@ +# zmxy-slideshow 幻灯片 + +> 该组件是对原生 +> [swiper](https://uniapp.dcloud.net.cn/component/swiper.html) +> 进行封装，继承了原组件部分属性及功能。 + +## 属性说明 + +| 属性名 | 类型 | 默认值 | 说明 | 平台差异说明 | +|:-------------------:|:-----------:|:--------:|:----------------------------------------------------------------------------------------------------:|:------------------------------------------------:| +| autoplay | Boolean | true | 是否自动切换 | | +| interval | Number | 5000 | 自动切换时间间隔 | | +| vertical | Boolean | false | 滑动方向是否为纵向 | | +| margin | String | 60rpx | 前后边距，接受 px 和 rpx 值 | app-nvue、抖音小程序、飞书小程序不支持 | +| easing-function | String | default | 指定 swiper 切换缓动动画类型，有效值：default、linear、easeInCubic、easeOutCubic、easeInOutCubic | 微信小程序、快手小程序、京东小程序 | +| height | String | 300rpx | 组件整体高度，接受 px 和 rpx 值 | | +| items | Array | [] | 图片地址、标题、链接等数据组成的对象数组（[{url,title,link,...},{url,title,link,...},...]），也支持字符串数组（[url1,url2,url3,...]） | | +| @clickItem | EventHandle | | 点击幻灯片触发 clickItem 事件，item = {url,title,link,...} 或者 item = url | + +### easing-function 属性 + +| 值 | 说明 | +|:---------------:|:-------:| +| default | 默认缓动函数 | +| linear | 线性动画 | +| easeInCubic | 缓入动画 | +| easeOutCubic | 缓出动画 | +| easeInOutCubic | 缓入缓出动画 | + +### 案例代码 + +```vue +# 基础使用 + +# 字符串数组，线性动画 + +``` +```javascript +export default { + data() { + return { + items: [{ + url: 'https://web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg', + title: '内容标题', + }, { + url: 'https://web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg', + title: '内容标题', + }, { + url: 'https://web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg', + title: '内容标题', + }, ], + items2: [ + 'https://web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg', + 'https://web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg', + 'https://web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg', + ], + }; + }, + methods: { + clickItem(item) { + console.log(item); + } + } +} +```