diff --git a/pages.json b/pages.json index 4e14da1..5d2d359 100644 --- a/pages.json +++ b/pages.json @@ -110,7 +110,7 @@ { "path": "pages/login/index", "style": { - "navigationStyle": "custom", + "navigationStyle": "custom", "navigationBarTitleText": "会员登录" } }, @@ -492,245 +492,77 @@ "style": { "navigationBarTitleText": "", "navigationStyle": "custom", - "enablePullDownRefresh": false - } - - } - ], - "subPackages": [ - { - "root": "pages/news/", - "pages": [ - { - "path" : "consult/store", - "style" : - { - "navigationBarTitleText": "门店相册", - "enablePullDownRefresh": false - } - }, - { - "path" : "consult/comment", - "style" : - { - "navigationBarTitleText": "评论", - "enablePullDownRefresh": false - } - }, - { - "path" : "consult/about", - "style" : - { - "navigationBarTitleText": "联系我们", - "navigationStyle": "custom", - "enablePullDownRefresh": false - } - }, - { - "path" : "consult/index", - "style" : - { - "navigationBarTitleText": "咨询", - "navigationStyle": "custom", - "enablePullDownRefresh": false - } - }, - { - "path" : "park/index", - "style" : - { - "navigationBarTitleText": "停车指引", - "navigationStyle": "custom", - "enablePullDownRefresh": false - } - }, - { - "path" : "park/recordHistory", - "style" : - { - "navigationBarTitleText": "预约记录", - "enablePullDownRefresh": false - } - },{ - "path" : "park/addressList", - "style" : - { - "navigationBarTitleText": "地址", - "enablePullDownRefresh": false - } - },{ - "path" : "park/addressEdit", - "style" : - { - "navigationBarTitleText": "地址", - "enablePullDownRefresh": false - } - },{ - "path" : "park/personal", - "style" : - { - "navigationBarTitleText": "编辑信息", - "enablePullDownRefresh": false - } - }, - { - "path" : "coupon/index", - "style" : - { - "navigationBarTitleText": "领券中心", - "navigationBarBackgroundColor": "#FB3A22", - "navigationBarTextStyle": "white", - "enablePullDownRefresh": false - } - }, - { - "path" : "coupon/list", - "style" : - { - "navigationBarTitleText": "领券中心", - "navigationBarBackgroundColor": "#FB3A22", - "navigationBarTextStyle": "white", - "enablePullDownRefresh": false - } - }, - { - "path" : "recycling/index", - "style" : - { - "navigationBarTitleText": "上门回收", - "navigationStyle": "custom", - "enablePullDownRefresh": false - } - }, + "enablePullDownRefresh": false + } + + } + ], + "subPackages": [{ + "root": "pages/news/", + "pages": [{ + "path": "consult/store", + "style": { + "navigationBarTitleText": "门店相册", + "enablePullDownRefresh": false + } + }, { - "path" : "recycling/detail", - "style" : - { - "navigationBarTitleText": "上门回收", - "navigationStyle": "custom", - "enablePullDownRefresh": false - } - }, + "path": "consult/comment", + "style": { + "navigationBarTitleText": "评论", + "enablePullDownRefresh": false + } + }, { - "path" : "recycling/confirm", - "style" : - { - "navigationBarTitleText": "确认服务订单", + "path": "consult/about", + "style": { + "navigationBarTitleText": "联系我们", "navigationStyle": "custom", - "enablePullDownRefresh": false - } - }, + "enablePullDownRefresh": false + } + }, { - "path" : "recycling/timer", - "style" : - { - "navigationBarTitleText": "选择时间", + "path": "consult/index", + "style": { + "navigationBarTitleText": "咨询", "navigationStyle": "custom", - "enablePullDownRefresh": false - } - }, + "enablePullDownRefresh": false + } + }, { - "path" : "recycling/order", - "style" : - { - "navigationBarTitleText": "订单详情", + "path": "park/index", + "style": { + "navigationBarTitleText": "停车指引", "navigationStyle": "custom", - "enablePullDownRefresh": false - } - } - ] - }, - { - "root": "pages/activity/", - "pages": [ - { - "path" : "presale", - "style" : - { - "navigationBarTitleText": "预售专区", - "enablePullDownRefresh": false - } - }, - { - "path" : "presaleRule", - "style" : - { - "navigationBarTitleText": "预售规则", - "enablePullDownRefresh": false - } - }, - { - "path" : "intimate", - "style" : - { - "navigationBarTitleText": "贴心服务", - "navigationStyle": "custom", - "enablePullDownRefresh": false - } - }, - { - "path" : "newsshop", - "style" : - { - "navigationBarTitleText": "新年换新", - "navigationStyle": "custom", - "enablePullDownRefresh": false - } - }, - { - "path" : "newPeople", - "style" : - { - "navigationBarTitleText": "新人首单礼", - "navigationStyle": "custom", - "enablePullDownRefresh": false - } - } - - ] - }, - { - "root": "pages/news1/", - "pages": [ - { - "path" : "logistics", - "style" : - { - "navigationStyle": "default", - "navigationBarTextStyle": "black", - "navigationBarTitleText": "物流问题" - } - }, - { - "path": "help", + "enablePullDownRefresh": false + } + }, + { + "path": "park/recordHistory", "style": { - // "enablePullDownRefresh": true, - "navigationStyle": "default", - "navigationBarTextStyle": "black", - "navigationBarTitleText": "帮助与客服" + "navigationBarTitleText": "预约记录", + "enablePullDownRefresh": false } - }, - { - "path": "jinqun", - "style": { - // "enablePullDownRefresh": true, - "navigationStyle": "default", - "navigationBarTextStyle": "black", - "navigationBarTitleText": "进社群享更多福利" - } - } - - ] - } - "navigationStyle": "custom", - "enablePullDownRefresh": false - } - - } - ], - "subPackages": [{ - "root": "pages/news/", - "pages": [{ + }, { + "path": "park/addressList", + "style": { + "navigationBarTitleText": "地址", + "enablePullDownRefresh": false + } + }, { + "path": "park/addressEdit", + "style": { + "navigationBarTitleText": "地址", + "enablePullDownRefresh": false + } + }, { + "path": "park/personal", + "style": { + "navigationBarTitleText": "编辑信息", + "enablePullDownRefresh": false + } + }, + { "path": "coupon/index", "style": { "navigationBarTitleText": "领券中心", @@ -829,31 +661,8 @@ "navigationStyle": "custom", "enablePullDownRefresh": false } - }, - { - "path": "seckill", - "style": { - "navigationBarTitleText": "限时秒杀", - "navigationStyle": "custom", - "enablePullDownRefresh": false - } - }, - { - "path": "ranking", - "style": { - "navigationBarTitleText": "排行", - "navigationStyle": "custom", - "enablePullDownRefresh": false - } - }, - { - "path": "newGoods", - "style": { - "navigationBarTitleText": "新品首发", - "navigationStyle": "custom", - "enablePullDownRefresh": false - } } + ] }, { @@ -874,70 +683,233 @@ "navigationBarTextStyle": "black", "navigationBarTitleText": "帮助与客服" } - }, - { + }, + { "path": "jinqun", "style": { - // "enablePullDownRefresh": true, - "navigationStyle": "default", - "navigationBarTextStyle": "black", - "navigationBarTitleText": "进社群享更多福利" - } - },{ - "path": "wallet", - "style": { - // "enablePullDownRefresh": true, - "navigationStyle": "custom", - "navigationBarTextStyle": "black", - "navigationBarTitleText": "我的钱包" - } - }, - { - "path": "huoyuan", - "style": { - // "enablePullDownRefresh": true, - "navigationStyle": "custom", - "navigationBarTextStyle": "black", - "navigationBarTitleText": "我要货源" - } - }, - { - "path": "feedback", - "style": { - // "enablePullDownRefresh": true, - "navigationStyle": "default", - "navigationBarTextStyle": "black", - "navigationBarTitleText": "我要反馈" - } - }, - { - "path": "MerchantSettlement", - "style": { - "navigationStyle": "default", - "navigationBarTextStyle": "black", - "navigationBarTitleText": "商家入驻" + // "enablePullDownRefresh": true, + "navigationStyle": "default", + "navigationBarTextStyle": "black", + "navigationBarTitleText": "进社群享更多福利" } - } - - ] - } + } + + ] + } + + ] + +}], +"subPackages": [{ + "root": "pages/news/", + "pages": [{ + "path": "coupon/index", + "style": { + "navigationBarTitleText": "领券中心", + "navigationBarBackgroundColor": "#FB3A22", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false + } + }, + { + "path": "coupon/list", + "style": { + "navigationBarTitleText": "领券中心", + "navigationBarBackgroundColor": "#FB3A22", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false + } + }, + { + "path": "recycling/index", + "style": { + "navigationBarTitleText": "上门回收", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "recycling/detail", + "style": { + "navigationBarTitleText": "上门回收", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "recycling/confirm", + "style": { + "navigationBarTitleText": "确认服务订单", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "recycling/timer", + "style": { + "navigationBarTitleText": "选择时间", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "recycling/order", + "style": { + "navigationBarTitleText": "订单详情", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + } + ] + }, + { + "root": "pages/activity/", + "pages": [{ + "path": "presale", + "style": { + "navigationBarTitleText": "预售专区", + "enablePullDownRefresh": false + } + }, + { + "path": "presaleRule", + "style": { + "navigationBarTitleText": "预售规则", + "enablePullDownRefresh": false + } + }, + { + "path": "intimate", + "style": { + "navigationBarTitleText": "贴心服务", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "newsshop", + "style": { + "navigationBarTitleText": "新年换新", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "newPeople", + "style": { + "navigationBarTitleText": "新人首单礼", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "seckill", + "style": { + "navigationBarTitleText": "限时秒杀", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "ranking", + "style": { + "navigationBarTitleText": "排行", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "newGoods", + "style": { + "navigationBarTitleText": "新品首发", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + } + ] + }, + { + "root": "pages/news1/", + "pages": [{ + "path": "logistics", + "style": { + "navigationStyle": "default", + "navigationBarTextStyle": "black", + "navigationBarTitleText": "物流问题" + } + }, + { + "path": "help", + "style": { + // "enablePullDownRefresh": true, + "navigationStyle": "default", + "navigationBarTextStyle": "black", + "navigationBarTitleText": "帮助与客服" + } + }, + { + "path": "jinqun", + "style": { + // "enablePullDownRefresh": true, + "navigationStyle": "default", + "navigationBarTextStyle": "black", + "navigationBarTitleText": "进社群享更多福利" + } + }, { + "path": "wallet", + "style": { + // "enablePullDownRefresh": true, + "navigationStyle": "custom", + "navigationBarTextStyle": "black", + "navigationBarTitleText": "我的钱包" + } + }, + { + "path": "huoyuan", + "style": { + // "enablePullDownRefresh": true, + "navigationStyle": "custom", + "navigationBarTextStyle": "black", + "navigationBarTitleText": "我要货源" + } + }, + { + "path": "feedback", + "style": { + // "enablePullDownRefresh": true, + "navigationStyle": "default", + "navigationBarTextStyle": "black", + "navigationBarTitleText": "我要反馈" + } + }, + { + "path": "MerchantSettlement", + "style": { + "navigationStyle": "default", + "navigationBarTextStyle": "black", + "navigationBarTitleText": "商家入驻" + } + } + + ] + } - ], - "globalStyle": { - // #ifdef H5 - // "navigationStyle": "custom", - "maxWidth": 750, - "rpxCalcMaxDeviceWidth": 750, // rpx 计算所支持的最大设备宽度,单位 px,默认值为 960 - "rpxCalcBaseDeviceWidth": 560, // rpx 计算使用的基准设备宽度,设备实际宽度超出 rpx 计算所支持的最大设备宽度时将按基准宽度计算,单位 px,默认值为 375 - "rpxCalcIncludeWidth": 9999, // rpx 计算特殊处理的值,始终按实际的设备宽度计算,单位 rpx,默认值为 750 - // #endif - "navigationBarBackgroundColor": "#ffffff", - "navigationBarTitleText": "", - "navigationBarTextStyle": "black", - "backgroundTextStyle": "dark" - }, - "easycom": { - "autoscan": true, - "custom": {} - } +], +"globalStyle": { + // #ifdef H5 + // "navigationStyle": "custom", + "maxWidth": 750, + "rpxCalcMaxDeviceWidth": 750, // rpx 计算所支持的最大设备宽度,单位 px,默认值为 960 + "rpxCalcBaseDeviceWidth": 560, // rpx 计算使用的基准设备宽度,设备实际宽度超出 rpx 计算所支持的最大设备宽度时将按基准宽度计算,单位 px,默认值为 375 + "rpxCalcIncludeWidth": 9999, // rpx 计算特殊处理的值,始终按实际的设备宽度计算,单位 rpx,默认值为 750 + // #endif + "navigationBarBackgroundColor": "#ffffff", + "navigationBarTitleText": "", + "navigationBarTextStyle": "black", + "backgroundTextStyle": "dark" +}, +"easycom": { + "autoscan": true, + "custom": {} +} } \ No newline at end of file diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue index b3f05ad..a3798e5 100644 --- a/pages/goods/detail.vue +++ b/pages/goods/detail.vue @@ -184,8 +184,8 @@ - - + + @@ -196,6 +196,91 @@ 我知道了 + + + 设置秒杀价格 + + + + + + 秒杀价: + + + + 秒杀区间: + + + 开始时间 + + - + + 结束时间 + + + + + 秒杀限购: + + + + 每人限购 + + 1 + + + + + + 取消 + + + 确定 + + + + + + + + + + 夏普4T-M70H7DA 70英寸 4K 高清进口屏智能语音平板液晶电视机6575 + + + ¥4980 + + + + + + + + + 复制文案 + + + + + + + + 微信好友 + + + + + + + + 生成海报 + + + + + 取消 + + @@ -203,8 +288,11 @@ export default { data() { return { + diaShow:false, searchValue: '', isPre:false, + setPrice:false, + openDialog:false, } }, onLoad(options){ @@ -245,6 +333,9 @@ url:'/pages/sureOrder/index' }) }, + shareCancel(){ + // + }, } } @@ -902,5 +993,226 @@ margin-top: 70rpx; } } + .setMs{ + width: 656rpx; + height: 690rpx; + background: #FFFFFF; + border-radius: 12rpx 12rpx 12rpx 12rpx; + opacity: 1; + .msprice{ + width: 100%; + height: 44rpx; + font-size: 32rpx; + font-family: PingFang SC, PingFang SC; + font-weight: 600; + color: #262626; + line-height: 38rpx; + text-align: center; + margin-top: 24rpx; + margin-bottom: 26rpx; + } + .msLine{ + margin-bottom: 30rpx; + } + .msp{ + display: flex; + align-items: center; + justify-content: center; + margin-bottom: 30rpx; + .inp{ + width: 440rpx; + height: 72rpx; + background: #FFFFFF; + border-radius: 4rpx 4rpx 4rpx 4rpx; + opacity: 1; + border: 2rpx solid #EBEBEB; + margin-left: 20rpx; + line-height: 72rpx; + } + } + .qj{ + font-size: 28rpx; + font-weight: 400; + color: #262626; + line-height: 33rpx; + margin-bottom: 34rpx; + .msQj{ + position: relative; + left:-218rpx; + } + .date{ + display: flex; + align-items: center; + justify-content: center; + margin-top: 16rpx; + .timeCommn{ + width: 260rpx; + height: 68rpx; + background: #F1F1F1; + border-radius: 62rpx 62rpx 62rpx 62rpx; + opacity: 1; + line-height: 68rpx; + font-size: 24rpx; + font-family: PingFang SC, PingFang SC; + font-weight: 400; + color: #929292; + padding-left: 34rpx; + } + .beginTime{ + margin-right: 16rpx; + } + .endTime{ + margin-left: 20rpx; + } + } + } + .msLimit{ + display: flex; + justify-content: space-between; + padding: 0 38rpx 0 42rpx; + font-size: 28rpx; + font-family: PingFang SC, PingFang SC; + font-weight: 400; + color: #262626; + line-height: 33rpx; + } + .peoLimit{ + display: flex; + margin-left: 42rpx; + align-items: center; + .num{ + width: 106rpx; + height: 60rpx; + background: #FFFFFF; + border-radius: 4rpx 4rpx 4rpx 4rpx; + opacity: 1; + border: 2rpx solid #EBEBEB; + text-align: center; + line-height: 60rpx; + margin: 0 18rpx 0 16rpx; + } + } + .operaBtn{ + display: flex; + justify-content: center; + margin-top: 52rpx; + .btnComm{ + width: 216rpx; + height: 70rpx; + background: #EEEEEE; + border-radius: 44rpx 44rpx 44rpx 44rpx; + opacity: 1; + line-height: 70rpx; + text-align: center; + } + .sureBtn{ + width: 214rpx; + height: 74rpx; + background: linear-gradient(180deg, #FD5D06 0%, #F3211A 100%); + border-radius: 100rpx 100rpx 100rpx 100rpx; + opacity: 1; + text-align: center; + line-height:74rpx ; + font-size: 28rpx; + font-weight: 500; + color: #FFFFFF; + margin-left: 24rpx; + } + } + } + .shareWechat{ + width: 656rpx; + height: 884rpx; + background: #FFFFFF; + border-radius: 12rpx 12rpx 12rpx 12rpx; + opacity: 1; + display: flex; + flex-direction: column; + padding-top: 24rpx; + .shareGoods{ + margin-left: 28rpx; + width: 604rpx; + height: 382rpx; + border-radius: 0rpx 0rpx 0rpx 0rpx; + opacity: 1; + image{ + width: 100%; + height: 100%; + } + } + .shareInfo{ + display: flex; + align-items: center; + margin-top: 12rpx; + .shareGoodsInfo{ + width: 410rpx; + height: 120rpx; + font-size: 28rpx; + font-weight: 400; + color: #000000; + line-height: 33rpx; + } + .sharePrice{ + height: 64rpx; + font-size: 46rpx; + font-family: PingFang SC, PingFang SC; + font-weight: 500; + color: #FF645A; + line-height: 54rpx; + } + } + .shareOpera{ + display: flex; + align-items: center; + justify-content: space-around; + margin-top: 36rpx; + margin-bottom: 46rpx; + .operaItem{ + .imgIcon{ + width: 88rpx; + height: 88rpx; + background: linear-gradient(180deg, #EC6244 0%, #FA938C 100%); + border-radius: 50%; + opacity: 1; + line-height: 88rpx; + text-align: center; + color: #fff; + .iconIm{ + font-size: 32rpx; + } + } + .weChatIcon{ + background: #28C445; + } + .hb{ + background: linear-gradient(180deg, #53A2EE 0%, #6FB2F4 100%); + } + .shareText{ + width: 96rpx; + height: 34rpx; + font-size: 24rpx; + font-family: PingFang SC, PingFang SC; + font-weight: 400; + color: #000000; + line-height: 28rpx; + } + } + } + .shareCancel{ + width: 556rpx; + height: 82rpx; + background: #EEEEEE; + border-radius: 44rpx 44rpx 44rpx 44rpx; + opacity: 1; + font-size: 28rpx; + font-weight: 500; + color: #585858; + line-height: 82rpx; + text-align: center; + left: 0; + right: 0; + margin: auto; + } + } } \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 53275dd..b0083de 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -350,7 +350,7 @@ - + 门店相册 @@ -500,6 +500,11 @@ url: '/pages/activity/intimate' }) }, + shopPicture(){ + uni.navigateTo({ + url:'/pages/news/consult/store' + }) + }, } } diff --git a/pages/user/index.vue b/pages/user/index.vue index 249282c..09b52f9 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -278,13 +278,13 @@ 我的服务 - + 发货记录 - + 物流查询 @@ -302,7 +302,7 @@ 分销价 - + 商家入驻 @@ -320,13 +320,13 @@ 店铺设置 - + 地址 - + 邀请会员 @@ -359,19 +359,19 @@ 投诉 - + 联系我们 - + 帮助中心 - + 我要找货 @@ -473,7 +473,7 @@ myWallet() { // 我的钱包 uni.navigateTo({ - url: '/pages/wallet/index' + url: '/pages/news1/wallet' }) }, goGoodsOrder(val) { @@ -488,6 +488,11 @@ url: '/pages/goods/detail' }) }, + goPage(url){ + uni.navigateTo({ + url:url + }) + }, } }