diff --git a/common/styles/common.css b/common/styles/common.css index 56b2730..2f246af 100644 --- a/common/styles/common.css +++ b/common/styles/common.css @@ -98,6 +98,10 @@ -webkit-box-orient: vertical; } +.lf-font-20 { + font-size: 20rpx !important; +} + .lf-font-24 { font-size: 24rpx !important; } diff --git a/common/styles/iconfont.css b/common/styles/iconfont.css index 22fd06c..b75ff59 100644 --- a/common/styles/iconfont.css +++ b/common/styles/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "lf-iconfont"; /* Project id 2779107 */ - src: url('//at.alicdn.com/t/font_2779107_uog0nj8djep.woff2?t=1631159318557') format('woff2'), - url('//at.alicdn.com/t/font_2779107_uog0nj8djep.woff?t=1631159318557') format('woff'), - url('//at.alicdn.com/t/font_2779107_uog0nj8djep.ttf?t=1631159318557') format('truetype'); + src: url('//at.alicdn.com/t/font_2779107_g6issu2jkr.woff2?t=1631610243868') format('woff2'), + url('//at.alicdn.com/t/font_2779107_g6issu2jkr.woff?t=1631610243868') format('woff'), + url('//at.alicdn.com/t/font_2779107_g6issu2jkr.ttf?t=1631610243868') format('truetype'); } .lf-iconfont { @@ -13,80 +13,216 @@ -moz-osx-font-smoothing: grayscale; } -.icon-weixinzhifu:before { - content: "\e689"; +.icon-daifahuo:before { + content: "\e642"; } -.icon-fabujilu:before { - content: "\e601"; +.icon-daishouhuo:before { + content: "\e636"; } -.icon-dianpu:before { - content: "\e6b6"; +.icon-fanhui:before { + content: "\e613"; +} + +.icon-shouye:before { + content: "\e61d"; +} + +.icon-faxian:before { + content: "\e6b8"; +} + +.icon-yingerche:before { + content: "\e603"; +} + +.icon-fenleiorguangchangorqitatianchong:before { + content: "\e67d"; +} + +.icon-jifen1:before { + content: "\e6a4"; +} + +.icon-tingchechang:before { + content: "\e6ca"; +} + +.icon-VIP:before { + content: "\e68e"; +} + +.icon-tubiao-:before { + content: "\e610"; +} + +.icon-packing:before { + content: "\e625"; +} + +.icon-liwu:before { + content: "\e674"; +} + +.icon-activity-s:before { + content: "\e641"; +} + +.icon-peishi-shoubiao:before { + content: "\e60a"; +} + +.icon-shujia:before { + content: "\e620"; +} + +.icon-V:before { + content: "\e719"; } .icon-huiyuan2:before { + content: "\e731"; +} + +.icon-yinliao:before { + content: "\e60e"; +} + +.icon-meishi:before { + content: "\e611"; +} + +.icon-shuji:before { + content: "\fbb7"; +} + +.icon-jian1:before { + content: "\e633"; +} + +.icon-xiangxia:before { + content: "\e81c"; +} + +.icon-chakan:before { + content: "\e68a"; +} + +.icon-dizhi:before { + content: "\e606"; +} + +.icon-jifen:before { + content: "\e721"; +} + +.icon-xihuanlike:before { + content: "\e622"; +} + +.icon-pinglun:before { + content: "\e8b4"; +} + +.icon-pinglun-:before { + content: "\e60c"; +} + +.icon-shoucang2:before { + content: "\e629"; +} + +.icon-shoucang11:before { + content: "\e62a"; +} + +.icon-pinglun2:before { + content: "\f4bb"; +} + +.icon-xihuan:before { content: "\e640"; } -.icon-jilu2:before { - content: "\e65c"; +.icon-kefuhdpi:before { + content: "\e618"; } -.icon-shouye:before { - content: "\e636"; +.icon-tingche:before { + content: "\e8f8"; } -.icon-huiyuan3:before { - content: "\f0ae"; +.icon-gouwulan:before { + content: "\e64d"; } -.icon-shouye1:before { - content: "\e60a"; +.icon-jia:before { + content: "\e608"; } -.icon-xianxingicon-03:before { - content: "\e60d"; +.icon-yue:before { + content: "\e6b0"; } -.icon-shouye2:before { - content: "\e677"; +.icon-zhibo:before { + content: "\e8c1"; } -.icon-pinpai:before { - content: "\e664"; +.icon-zhiding:before { + content: "\e602"; } -.icon-yuebao:before { - content: "\e624"; +.icon-tongzhi:before { + content: "\ec1b"; } -.icon-pinpailiebiao:before { - content: "\e630"; +.icon-status-error:before { + content: "\e609"; } -.icon-tubiaozhizuomobandefuben-:before { - content: "\e61e"; +.icon-status-correct:before { + content: "\e60b"; } -.icon-huiyuan:before { - content: "\e65d"; +.icon-saoyisao:before { + content: "\e623"; } -.icon-Group-:before { - content: "\e6ae"; +.icon-weixinzhifu:before { + content: "\e689"; } -.icon-Member:before { - content: "\e613"; +.icon-fabujilu:before { + content: "\e601"; } -.icon-daishouhuo:before { - content: "\e651"; +.icon-jilu2:before { + content: "\e65c"; +} + +.icon-huiyuan3:before { + content: "\f0ae"; +} + +.icon-xianxingicon-03:before { + content: "\e60d"; } -.icon-shoucang1:before { - content: "\f49a"; +.icon-yuebao:before { + content: "\e624"; +} + +.icon-pinpailiebiao:before { + content: "\e630"; +} + +.icon-huiyuan:before { + content: "\e65d"; +} + +.icon-Group-:before { + content: "\e6ae"; } .icon-daifukuan:before { diff --git a/components/lf-indexFind/lf-indexFind.vue b/components/lf-indexFind/lf-indexFind.vue index f1bebd9..dbe0f3f 100644 --- a/components/lf-indexFind/lf-indexFind.vue +++ b/components/lf-indexFind/lf-indexFind.vue @@ -3,8 +3,8 @@ 精选发现好物 + diff --git a/components/lf-nav/lf-nav.vue b/components/lf-nav/lf-nav.vue index 313bf85..084b1a5 100644 --- a/components/lf-nav/lf-nav.vue +++ b/components/lf-nav/lf-nav.vue @@ -9,8 +9,8 @@ - - + + diff --git a/components/lf-tabbar/lf-tabbar.vue b/components/lf-tabbar/lf-tabbar.vue index 53a248d..81a797d 100644 --- a/components/lf-tabbar/lf-tabbar.vue +++ b/components/lf-tabbar/lf-tabbar.vue @@ -113,7 +113,7 @@ color: #FFFFFF; overflow: hidden; text{ - transform: scale(0.6); + transform: scale(0.8); } } .tab-name{ diff --git a/pages/business/balance/balance.vue b/pages/business/balance/balance.vue index 683c803..225fa11 100644 --- a/pages/business/balance/balance.vue +++ b/pages/business/balance/balance.vue @@ -6,7 +6,7 @@ - + 78326478 diff --git a/pages/business/center/center.vue b/pages/business/center/center.vue index e00be0f..81f4048 100644 --- a/pages/business/center/center.vue +++ b/pages/business/center/center.vue @@ -11,11 +11,11 @@ - + 余额 - + 扫一扫 @@ -29,7 +29,7 @@ 待处理 订单管理 - + diff --git a/pages/discover/discover.vue b/pages/discover/discover.vue index 27f8e89..927f395 100644 --- a/pages/discover/discover.vue +++ b/pages/discover/discover.vue @@ -16,8 +16,13 @@ V - 最新FUEJFEI - {{item.created_at}} + + 最新FUEJFEI + + + + {{item.created_at}} + @@ -28,15 +33,15 @@ - + {{item.likes_count}} - + {{item.view_count}} - + {{item.comments_count}} @@ -49,15 +54,15 @@ :class="{'loading-more-text': tab.loadingClass}">{{ tab.loadingText }} - - - - - + + + + + diff --git a/pages/discover/discoverdetails.vue b/pages/discover/discoverdetails.vue index 878fd57..0a3cf2e 100644 --- a/pages/discover/discoverdetails.vue +++ b/pages/discover/discoverdetails.vue @@ -23,15 +23,15 @@ - + 379 - + 3579 - + 63 @@ -55,7 +55,7 @@ - + 10 @@ -74,7 +74,7 @@ - + 10 @@ -96,7 +96,7 @@ - + 10 @@ -118,7 +118,7 @@ - + 10 @@ -133,15 +133,15 @@ - + 379 - + 3579 - + 379 diff --git a/pages/index/category/category.vue b/pages/index/category/category.vue index 683c43f..ccc6329 100644 --- a/pages/index/category/category.vue +++ b/pages/index/category/category.vue @@ -65,7 +65,7 @@ {{ item.name }} {{ item.category }}｜{{ item.goods_count || 0 }}件在售 - + {{ item.floor }} diff --git a/pages/index/index/index.vue b/pages/index/index/index.vue index 4495c71..02a6681 100644 --- a/pages/index/index/index.vue +++ b/pages/index/index/index.vue @@ -6,11 +6,11 @@ 会员 - + 停车 - + 搜索 @@ -373,15 +373,20 @@ - - + + + 直播间 + + + + 购物车 99+ - + @@ -1164,7 +1169,7 @@ }; - diff --git a/pages/index/list/selected.vue b/pages/index/list/selected.vue index eac7f41..56e053e 100644 --- a/pages/index/list/selected.vue +++ b/pages/index/list/selected.vue @@ -7,7 +7,10 @@ - 灯具榜 > + + 灯具榜 + + diff --git a/pages/point/detail/detail.vue b/pages/point/detail/detail.vue index beefdc9..dc2028f 100644 --- a/pages/point/detail/detail.vue +++ b/pages/point/detail/detail.vue @@ -6,12 +6,18 @@ - + 78326478 - 兑换礼品 > - 积分规则 > + + 兑换礼品 + + + + 积分规则 + + @@ -21,7 +27,7 @@ {{ date || '2021-09-01' }} - + diff --git a/pages/point/shoppingMall/shoppingMall.vue b/pages/point/shoppingMall/shoppingMall.vue index d49f988..b0268a0 100644 --- a/pages/point/shoppingMall/shoppingMall.vue +++ b/pages/point/shoppingMall/shoppingMall.vue @@ -7,19 +7,19 @@ - + 783 - + 当前积分 - + 兑换记录 - + 购物车 99+ diff --git a/pages/recharge/balance/balance.vue b/pages/recharge/balance/balance.vue index dbc5ab9..ce325dc 100644 --- a/pages/recharge/balance/balance.vue +++ b/pages/recharge/balance/balance.vue @@ -6,7 +6,7 @@ - + {{ num || 0 }} @@ -20,7 +20,7 @@ {{ date || '2021-09-01' }} - + diff --git a/pages/shop/goodsdetail.vue b/pages/shop/goodsdetail.vue index 2d0adb8..34f1fd9 100644 --- a/pages/shop/goodsdetail.vue +++ b/pages/shop/goodsdetail.vue @@ -33,11 +33,11 @@ 8493 个兑换 - + - 颐莲喷雾 500ml + {{ goods_detail.name }} 门店自提 @@ -45,42 +45,45 @@ 已有38人购买 - - - - - 优惠 - - {{item.tag}} + + + + + + 优惠 + + {{item.tag}} + + + 化妆品教师节满1200减200 + - - 化妆品教师节满1200减200 + + - - - - - - - - - 服务 - - - - 正品保障 + + + + + 服务 + + + + 正品保障 + - - - + + + - + - + + - + 运费 - 在5kg～10kg内，包含5kg；重量在5kg以内按3kg + + 1KM以内，包含1KM；重量在5KG以内按6元计费，每超出1KG加收2元 + @@ -124,13 +129,17 @@ 颐莲官方店 - L2 + + + L2 + @@ -156,7 +165,7 @@ 商品详情 - + @@ -165,16 +174,16 @@ - + 客服 - - + + {{ is_collect ? '已收藏' : '收藏' }} @@ -221,13 +230,13 @@ 数量 - + - + @@ -235,6 +244,18 @@ + + + + + 店铺运费说明 + + + + + 1KM以内，包含1KM；重量在5KG以内按6元计费，每超出1KG加收2元 + + @@ -255,12 +276,9 @@ goods_detail: {}, is_collect: false, // 1为当前收藏商品了，0为否 skeletonLoading: false, - pictures: [ - 'https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png', - 'https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png', - 'https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png' - ], + pictures: [], show_popup: false, // 是否显示选规格模态框 + show_freight: false, // 是否显示运费说明模态框 spec_current: null, // 规格下标 click_type: null, // 当前点击的是加入购物车[1]还是立即购买[2] type: 'mail', // 页面显示类型，mail普通可邮寄商品，self自提商品，point积分商品，seckill秒杀商品 @@ -272,6 +290,7 @@ this.type = options.type || 'mail'; console.log('商品',this.goods_id) // this.getGoodsDetail(); + this.getNewdetail(); }, computed: { isRight() { @@ -281,6 +300,9 @@ } }, methods: { + showFreight(){ + this.show_freight = true; + }, shoot(type){ // TODO 判断type做不同的逻辑 this.click_type = type; @@ -352,6 +374,18 @@ }, 1000); }) }, + getNewdetail(){ + this.$http.get({ + api: '/api/store/detail/4' + }).then(res => { + console.log("===---", res); + this.goods_detail = res.data.data; + this.pictures = [res.data.data.img]; + console.log("this.pictures", this.pictures); + }).catch(err => { + console.log("====", err); + }) + }, // 切换商品收藏 switchCollect(){ let userInfo = uni.getStorageSync('userinfo') || {}; @@ -398,8 +432,9 @@ // 预览图片 lookImg(index){ this.$u.throttle(() => { - let goods_banner = this.goods_detail.banners || []; - let banners = goods_banner.map(item => item.cover); + // let goods_banner = this.goods_detail.banners || []; + // let banners = goods_banner.map(item => item.cover); + let banners = this.pictures; uni.previewImage({ urls: banners, current: index @@ -686,6 +721,8 @@ .icon-img{ height: 50rpx; width: 50rpx; + font-size: 40rpx; + line-height: 1; } } .btn1{ diff --git a/pages/shop/search.vue b/pages/shop/search.vue index 788b555..32f676f 100644 --- a/pages/shop/search.vue +++ b/pages/shop/search.vue @@ -20,7 +20,7 @@ 我搜过的 - + 秋上新 diff --git a/pages/shop/shopdetail.vue b/pages/shop/shopdetail.vue index cbf8264..65ab550 100644 --- a/pages/shop/shopdetail.vue +++ b/pages/shop/shopdetail.vue @@ -11,12 +11,15 @@ AIMER MEN爱慕先生 - L2 + + + L2 + - + 客服 diff --git a/pages/user/member/code.vue b/pages/user/member/code.vue index b5365ab..59976f4 100644 --- a/pages/user/member/code.vue +++ b/pages/user/member/code.vue @@ -65,12 +65,25 @@ }, onLoad(){ this.refreshCode(); + // 设置手机屏幕亮度 + uni.getScreenBrightness({ + success: (res) => { + this.brightness = res.value; + let value = res.value < 0.7 ? 0.7 : res.value; + uni.setScreenBrightness({ + value: value + }) + } + }) }, onUnload(){ if(this.timer){ clearInterval(this.timer); this.timer = null; } + uni.setScreenBrightness({ + value: this.brightness + }) }, methods: { // rpx 转 px diff --git a/pages/user/my/center.vue b/pages/user/my/center.vue index f7bcc36..ba3f040 100644 --- a/pages/user/my/center.vue +++ b/pages/user/my/center.vue @@ -12,11 +12,11 @@ 182****5380 - + - + 支付码 @@ -58,14 +58,17 @@ 商城订单 - 全部订单 + 全部订单 + - + - - 待付款 + + {{ item.name }} @@ -84,7 +87,7 @@ v-for="(item, index) in my_service_list" :key="index" @click="$url(item.path)"> - + {{ item.name }} @@ -103,33 +106,46 @@ data(){ return { nav_bg_color: 'transparent' ,// 导航背景颜色 + order_tablist: [{ + name: '待付款', + icon: 'icon-daifukuan' + },{ + name: '待发货', + icon: 'icon-daifahuo' + },{ + name: '待收货', + icon: 'icon-daishouhuo' + },{ + name: '待提货', + icon: 'icon-tihuo' + }], my_service_list: [{ name: '会员服务', - icon: 'icon-huiyuan', + icon: 'icon-huiyuan1', path: '/pages/user/member/service' },{ name: '在线客服', - icon: 'icon-huiyuan', + icon: 'icon-pinglun', path: '/pages/user/my/chatonline' },{ name: '我的收藏', - icon: 'icon-huiyuan', + icon: 'icon-shoucang', path: '/pages/user/my/collect' },{ name: '地址管理', - icon: 'icon-huiyuan', + icon: 'icon-dizhi', path: '/pages/address/list/list' },{ name: '活动报名', - icon: 'icon-huiyuan', + icon: 'icon-fabujilu', path: '/pages/user/my/myEventRegistrationList' },{ name: '积分商城订单', - icon: 'icon-huiyuan', + icon: 'icon-jifen', path: '/pages/point/exchangeRecord/exchangeRecord' },{ name: '商家中心', - icon: 'icon-huiyuan', + icon: 'icon-Group-', path: '/pages/business/center/center' }] } @@ -159,6 +175,9 @@ justify-content: center; align-items: center; margin-right: 27rpx; + &>view:nth-child(1){ + line-height: 1; + } &:nth-child(4n) { margin-right: 0; } @@ -168,6 +187,9 @@ } .my-service{ width: 190rpx; + &>view:nth-child(1){ + line-height: 1; + } &:nth-child(3n){ margin-right: 0; } diff --git a/pages/user/my/collect.vue b/pages/user/my/collect.vue index 00564c0..df97808 100644 --- a/pages/user/my/collect.vue +++ b/pages/user/my/collect.vue @@ -11,7 +11,10 @@ luckin coffee 瑞幸瑞幸咖啡瑞幸咖啡瑞幸咖啡瑞幸咖啡咖啡 餐饮·美食｜18件在售 - L2 + + + L2 + diff --git a/pages/user/my/my.vue b/pages/user/my/my.vue index 1e49f6c..3c7ecc8 100644 --- a/pages/user/my/my.vue +++ b/pages/user/my/my.vue @@ -30,15 +30,15 @@ - + 379 - + 3579 - + 63 diff --git a/store/index.js b/store/index.js index cab1970..6a3e82b 100644 --- a/store/index.js +++ b/store/index.js @@ -8,19 +8,19 @@ let state = { { name: 'home', text: '首页', - icon: 'icon-Group-', + icon: 'icon-xianxingicon-03', path: '/pages/index/index/index' }, { name: 'brand', text: '品牌', - icon: 'icon-tihuo', + icon: 'icon-pinpailiebiao', path: '/pages/index/category/category' }, { name: 'find', text: '发现', - icon: 'icon-fabu', + icon: 'icon-faxian', path: '/pages/discover/discover' }, {