Browse Source

更换icon图标,首页添加直播入口

master
邓平艺 4 years ago
parent
commit
3604fa27d7
  1. 4
      common/styles/common.css
  2. 214
      common/styles/iconfont.css
  3. 2
      components/lf-indexFind/lf-indexFind.vue
  4. 4
      components/lf-nav/lf-nav.vue
  5. 2
      components/lf-tabbar/lf-tabbar.vue
  6. 2
      pages/business/balance/balance.vue
  7. 6
      pages/business/center/center.vue
  8. 25
      pages/discover/discover.vue
  9. 20
      pages/discover/discoverdetails.vue
  10. 2
      pages/index/category/category.vue
  11. 92
      pages/index/index/index.vue
  12. 5
      pages/index/list/selected.vue
  13. 14
      pages/point/detail/detail.vue
  14. 8
      pages/point/shoppingMall/shoppingMall.vue
  15. 4
      pages/recharge/balance/balance.vue
  16. 135
      pages/shop/goodsdetail.vue
  17. 2
      pages/shop/search.vue
  18. 7
      pages/shop/shopdetail.vue
  19. 13
      pages/user/member/code.vue
  20. 50
      pages/user/my/center.vue
  21. 5
      pages/user/my/collect.vue
  22. 6
      pages/user/my/my.vue
  23. 6
      store/index.js

4
common/styles/common.css

@ -98,6 +98,10 @@
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
.lf-font-20 {
font-size: 20rpx !important;
}
.lf-font-24 { .lf-font-24 {
font-size: 24rpx !important; font-size: 24rpx !important;
} }

214
common/styles/iconfont.css

@ -1,8 +1,8 @@
@font-face { @font-face {
font-family: "lf-iconfont"; /* Project id 2779107 */ 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 { .lf-iconfont {
@ -13,80 +13,216 @@
-moz-osx-font-smoothing: grayscale; -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 { .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"; 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 { .icon-daifukuan:before {

2
components/lf-indexFind/lf-indexFind.vue

@ -3,8 +3,8 @@
<view class="title" @click="$url('/pages/discover/discover')">精选发现好物</view> <view class="title" @click="$url('/pages/discover/discover')">精选发现好物</view>
<scroll-view class="find-scroll" :scroll-x="true"> <scroll-view class="find-scroll" :scroll-x="true">
<view class="find-content"> <view class="find-content">
<!-- :class="{'max-item': index == 0}" -->
<view class="find-item" <view class="find-item"
:class="{'max-item': index == 0}"
@click="$url('/pages/discover/discoverdetails')" @click="$url('/pages/discover/discoverdetails')"
v-for="(item, index) in 5" :key="index"> v-for="(item, index) in 5" :key="index">
<image class="img" src="https://picsum.photos/200/300"></image> <image class="img" src="https://picsum.photos/200/300"></image>

4
components/lf-nav/lf-nav.vue

@ -9,8 +9,8 @@
</block> </block>
<block v-else> <block v-else>
<view class="head-nav" :style="{'top': headHeight - 40 + 'px'}" v-if="showIcon"> <view class="head-nav" :style="{'top': headHeight - 40 + 'px'}" v-if="showIcon">
<text class="lf-iconfont icon-daifukuan font-40size" @click="clickDropOut"></text>
<text class="lf-iconfont icon-sousuo font-40size" @click="clickHome"></text>
<text class="lf-iconfont icon-fanhui font-43size" @click="clickDropOut"></text>
<text class="lf-iconfont icon-shouye font-30size" @click="clickHome"></text>
</view> </view>
<view class="title-box" :style="{'margin': headHeight - 36 + 'px auto 0'}"> <view class="title-box" :style="{'margin': headHeight - 36 + 'px auto 0'}">
<!-- <input class="search" placeholder="搜你想要的" confirm-type="search" v-model="value" @confirm="onSearch" v-if="search" /> --> <!-- <input class="search" placeholder="搜你想要的" confirm-type="search" v-model="value" @confirm="onSearch" v-if="search" /> -->

2
components/lf-tabbar/lf-tabbar.vue

@ -113,7 +113,7 @@
color: #FFFFFF; color: #FFFFFF;
overflow: hidden; overflow: hidden;
text{ text{
transform: scale(0.6);
transform: scale(0.8);
} }
} }
.tab-name{ .tab-name{

2
pages/business/balance/balance.vue

@ -6,7 +6,7 @@
<view class="bg-right"></view> <view class="bg-right"></view>
<view class="head-content"> <view class="head-content">
<view> <view>
<text class="lf-iconfont icon-- lf-font-50"></text>
<text class="lf-iconfont icon-yuebao lf-font-50"></text>
</view> </view>
<view class="point"> <view class="point">
<text>78326478</text> <text>78326478</text>

6
pages/business/center/center.vue

@ -11,11 +11,11 @@
</view> </view>
<view class="lf-flex"> <view class="lf-flex">
<view class="head-menu" @click="$url('/pages/business/balance/balance')"> <view class="head-menu" @click="$url('/pages/business/balance/balance')">
<text class="lf-iconfont icon-daifukuan"></text>
<text class="lf-iconfont icon-yue"></text>
<text>余额</text> <text>余额</text>
</view> </view>
<view class="head-menu" @click="onScanCode"> <view class="head-menu" @click="onScanCode">
<text class="lf-iconfont icon-daifukuan"></text>
<text class="lf-iconfont icon-saoyisao"></text>
<text>扫一扫</text> <text>扫一扫</text>
</view> </view>
</view> </view>
@ -29,7 +29,7 @@
<view class="title">待处理</view> <view class="title">待处理</view>
<view class="lf-color-777" @click="$url('/pages/business/order/list')"> <view class="lf-color-777" @click="$url('/pages/business/order/list')">
<text class="lf-font-24 lf-m-r-10">订单管理</text> <text class="lf-font-24 lf-m-r-10">订单管理</text>
<text class="lf-iconfont icon-xiangyou lf-font-24"></text>
<text class="lf-iconfont icon-xiangyou lf-font-20"></text>
</view> </view>
</view> </view>
<view class="lf-flex lf-m-t-50"> <view class="lf-flex lf-m-t-50">

25
pages/discover/discover.vue

@ -16,8 +16,13 @@
<view class="head-tag">V</view> <view class="head-tag">V</view>
</view> </view>
<view class="lf-flex-column lf-m-l-20"> <view class="lf-flex-column lf-m-l-20">
<view class="lf-font-32 lf-color-black lf-font-bold">最新FUEJFEI</view>
<view class="lf-font-24 lf-color-777 lf-m-t-15">{{item.created_at}}</view>
<view class="lf-font-32 lf-color-black lf-font-bold">
<text class="lf-m-r-10">最新FUEJFEI</text>
<text class="lf-iconfont icon-xiangyou lf-font-20"></text>
</view>
<view class="lf-font-24 lf-color-777 lf-m-t-15">
<text>{{item.created_at}}</text>
</view>
</view> </view>
</view> </view>
<view class="lf-font-28 lf-color-333 lf-m-t-20" @click="$url('/pages/discover/discoverdetails')"> <view class="lf-font-28 lf-color-333 lf-m-t-20" @click="$url('/pages/discover/discoverdetails')">
@ -28,15 +33,15 @@
</view> </view>
<view class="lf-m-t-30 lf-row-between lf-p-l-50 lf-p-r-50"> <view class="lf-m-t-30 lf-row-between lf-p-l-50 lf-p-r-50">
<view class="lf-row-center"> <view class="lf-row-center">
<text class="lf-iconfont icon-shoucang"></text>
<text class="lf-iconfont icon-xihuan"></text>
<text class="lf-font-24 lf-color-777 lf-m-l-10">{{item.likes_count}}</text> <text class="lf-font-24 lf-color-777 lf-m-l-10">{{item.likes_count}}</text>
</view> </view>
<view class="lf-row-center"> <view class="lf-row-center">
<text class="lf-iconfont icon-fabu"></text>
<text class="lf-iconfont icon-chakan"></text>
<text class="lf-font-24 lf-color-777 lf-m-l-10">{{item.view_count}}</text> <text class="lf-font-24 lf-color-777 lf-m-l-10">{{item.view_count}}</text>
</view> </view>
<view class="lf-row-center"> <view class="lf-row-center">
<text class="lf-iconfont icon-fenxiang"></text>
<text class="lf-iconfont icon-pinglun-"></text>
<text class="lf-font-24 lf-color-777 lf-m-l-10">{{item.comments_count}}</text> <text class="lf-font-24 lf-color-777 lf-m-l-10">{{item.comments_count}}</text>
</view> </view>
</view> </view>
@ -49,15 +54,15 @@
:class="{'loading-more-text': tab.loadingClass}">{{ tab.loadingText }}</text> :class="{'loading-more-text': tab.loadingClass}">{{ tab.loadingText }}</text>
<lf-nocontent v-else></lf-nocontent> <lf-nocontent v-else></lf-nocontent>
</view> </view>
<view class="fixed-right">
<view class="fixed-btn" hover-class="lf-opacity" @click="$url('/pages/discover/publish')">
<text class="lf-iconfont icon-fabu lf-font-50"></text>
</view>
</view>
<view style="height: 30rpx;"></view> <view style="height: 30rpx;"></view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
</swiper> </swiper>
<view class="fixed-right">
<view class="fixed-btn" hover-class="lf-opacity" @click="$url('/pages/discover/publish')">
<text class="lf-iconfont icon-fabu lf-font-50"></text>
</view>
</view>
<lf-tabbar></lf-tabbar> <lf-tabbar></lf-tabbar>
</view> </view>
</template> </template>

20
pages/discover/discoverdetails.vue

@ -23,15 +23,15 @@
</view> </view>
<view class="lf-m-t-30 lf-row-between lf-p-l-50 lf-p-r-50"> <view class="lf-m-t-30 lf-row-between lf-p-l-50 lf-p-r-50">
<view class="lf-row-center"> <view class="lf-row-center">
<text class="lf-iconfont icon-shoucang"></text>
<text class="lf-iconfont icon-xihuan"></text>
<text class="lf-font-24 lf-color-777 lf-m-l-10">379</text> <text class="lf-font-24 lf-color-777 lf-m-l-10">379</text>
</view> </view>
<view class="lf-row-center"> <view class="lf-row-center">
<text class="lf-iconfont icon-fabu"></text>
<text class="lf-iconfont icon-chakan"></text>
<text class="lf-font-24 lf-color-777 lf-m-l-10">3579</text> <text class="lf-font-24 lf-color-777 lf-m-l-10">3579</text>
</view> </view>
<view class="lf-row-center"> <view class="lf-row-center">
<text class="lf-iconfont icon-fenxiang"></text>
<text class="lf-iconfont icon-pinglun-"></text>
<text class="lf-font-24 lf-color-777 lf-m-l-10">63</text> <text class="lf-font-24 lf-color-777 lf-m-l-10">63</text>
</view> </view>
</view> </view>
@ -55,7 +55,7 @@
</view> </view>
<view class="lf-m-l-32" style="position: absolute;right:33rpx;"> <view class="lf-m-l-32" style="position: absolute;right:33rpx;">
<view> <view>
<text class="lf-iconfont icon-shoucang"></text>
<text class="lf-iconfont icon-xihuan"></text>
</view> </view>
<view class="lf-color-555 lf-font-24">10</view> <view class="lf-color-555 lf-font-24">10</view>
</view> </view>
@ -74,7 +74,7 @@
</view> </view>
<view class="lf-m-l-32" style="position: absolute;right:33rpx;"> <view class="lf-m-l-32" style="position: absolute;right:33rpx;">
<view> <view>
<text class="lf-iconfont icon-shoucang"></text>
<text class="lf-iconfont icon-xihuan"></text>
</view> </view>
<view class="lf-color-555 lf-font-24">10</view> <view class="lf-color-555 lf-font-24">10</view>
</view> </view>
@ -96,7 +96,7 @@
</view> </view>
<view class="lf-m-t-30" style="position: absolute;right:33rpx;"> <view class="lf-m-t-30" style="position: absolute;right:33rpx;">
<view> <view>
<text class="lf-iconfont icon-shoucang"></text>
<text class="lf-iconfont icon-xihuan"></text>
</view> </view>
<view class="lf-color-555 lf-font-24">10</view> <view class="lf-color-555 lf-font-24">10</view>
</view> </view>
@ -118,7 +118,7 @@
</view> </view>
<view class="lf-m-l-32" style="position: absolute;right:33rpx;"> <view class="lf-m-l-32" style="position: absolute;right:33rpx;">
<view> <view>
<text class="lf-iconfont icon-shoucang"></text>
<text class="lf-iconfont icon-xihuan"></text>
</view> </view>
<view class="lf-color-555 lf-font-24">10</view> <view class="lf-color-555 lf-font-24">10</view>
</view> </view>
@ -133,15 +133,15 @@
</view> </view>
<view class="lf-row-center"> <view class="lf-row-center">
<view class="lf-row-center lf-m-r-35"> <view class="lf-row-center lf-m-r-35">
<text class="lf-iconfont icon-shoucang"></text>
<text class="lf-iconfont icon-xihuan"></text>
<text class="lf-m-l-10 lf-font-24 lf-color-black">379</text> <text class="lf-m-l-10 lf-font-24 lf-color-black">379</text>
</view> </view>
<view class="lf-row-center lf-m-r-35"> <view class="lf-row-center lf-m-r-35">
<text class="lf-iconfont icon-fenxiang"></text>
<text class="lf-iconfont icon-chakan"></text>
<text class="lf-m-l-10 lf-font-24 lf-color-black">3579</text> <text class="lf-m-l-10 lf-font-24 lf-color-black">3579</text>
</view> </view>
<view class="lf-row-center lf-m-r-35"> <view class="lf-row-center lf-m-r-35">
<text class="lf-iconfont icon-fabu"></text>
<text class="lf-iconfont icon-pinglun-"></text>
<text class="lf-m-l-10 lf-font-24 lf-color-black">379</text> <text class="lf-m-l-10 lf-font-24 lf-color-black">379</text>
</view> </view>
</view> </view>

2
pages/index/category/category.vue

@ -65,7 +65,7 @@
<view class="lf-font-36 lf-font-bold lf-color-black">{{ item.name }}</view> <view class="lf-font-36 lf-font-bold lf-color-black">{{ item.name }}</view>
<view class="lf-font-24 lf-color-gray">{{ item.category }}{{ item.goods_count || 0 }}件在售</view> <view class="lf-font-24 lf-color-gray">{{ item.category }}{{ item.goods_count || 0 }}件在售</view>
<view class="lf-font-24"> <view class="lf-font-24">
<text class="lf-iconfont icon-dizhi lf-font-24"></text>
<text class="lf-iconfont icon-dizhi lf-font-24 lf-color-primary"></text>
<text class="lf-color-gray lf-m-l-10">{{ item.floor }}</text> <text class="lf-color-gray lf-m-l-10">{{ item.floor }}</text>
</view> </view>
</view> </view>

92
pages/index/index/index.vue

@ -6,11 +6,11 @@
<text class="lf-m-l-4">会员</text> <text class="lf-m-l-4">会员</text>
</view> </view>
<view class="lf-nav-capsule" @click="$msg('敬请期待')"> <view class="lf-nav-capsule" @click="$msg('敬请期待')">
<text class="lf-iconfont icon-nv"></text>
<text class="lf-iconfont icon-tingche"></text>
<text class="lf-m-l-4">停车</text> <text class="lf-m-l-4">停车</text>
</view> </view>
<view class="lf-nav-capsule lf-bg-search" @click="$url('/pages/shop/search')"> <view class="lf-nav-capsule lf-bg-search" @click="$url('/pages/shop/search')">
<text class="lf-iconfont icon-nv"></text>
<text class="lf-iconfont icon-sousuo"></text>
<text class="lf-m-l-4">搜索</text> <text class="lf-m-l-4">搜索</text>
</view> </view>
</lf-nav> </lf-nav>
@ -373,15 +373,20 @@
</view> </view>
<!-- 悬浮购物车入口 --> <!-- 悬浮购物车入口 -->
<view class="fixed-right"> <view class="fixed-right">
<view class="fixed-btn" hover-class="lf-opacity" @click="$url('/pages/store/cart/cart')">
<text class="lf-iconfont icon-daishouhuo lf-font-50"></text>
<view class="fixed-cart fixed-live" hover-class="lf-opacity" @click="$msg('敬请期待')">
<text class="lf-iconfont icon-zhibo icon-text"></text>
<text class="tips">直播间</text>
</view>
<view class="fixed-cart" hover-class="lf-opacity" @click="$url('/pages/store/cart/cart')">
<text class="lf-iconfont icon-gouwulan icon-text"></text>
<text class="tips">购物车</text>
<view class="angle-mark">99+</view> <view class="angle-mark">99+</view>
</view> </view>
</view> </view>
<!-- ad广告弹出组件 TODO 暂时先注释 --> <!-- ad广告弹出组件 TODO 暂时先注释 -->
<lf-ad-modal :value.sync="show_ad" :list="ad_modal_list"></lf-ad-modal> <lf-ad-modal :value.sync="show_ad" :list="ad_modal_list"></lf-ad-modal>
<!-- 回到顶部组件 --> <!-- 回到顶部组件 -->
<u-back-top :scrollTop="pageScrollTop"></u-back-top>
<u-back-top :scrollTop="pageScrollTop" :icon-style="{color: '#fff', 'font-size': '50rpx'}" tips="TOP"></u-back-top>
<!-- tabbar组件 --> <!-- tabbar组件 -->
<lf-tabbar /> <lf-tabbar />
</block> </block>
@ -1164,7 +1169,7 @@
}; };
</script> </script>
<style rel="stylesheet/less" lang="less">
<style lang="scss" scoped>
/*@import "index.less";*/ /*@import "index.less";*/
.lf-bg-search{ .lf-bg-search{
background-color: rgba(0,0,0,0.5) !important; background-color: rgba(0,0,0,0.5) !important;
@ -1234,35 +1239,92 @@
.fixed-right{ .fixed-right{
position: fixed; position: fixed;
right: 32rpx; right: 32rpx;
bottom: 300rpx;
bottom: 400rpx;
width: max-content; width: max-content;
height: max-content; height: max-content;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
z-index: 9; z-index: 9;
.fixed-btn{
width: 100rpx;
height: 100rpx;
.fixed-cart{
width: 110rpx;
height: 110rpx;
border-radius: 50%; border-radius: 50%;
background-color: #15716E;
background-color: #FFFFFF;
border: 1rpx solid #DEDEDE;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
color: #FFFFFF;
flex-direction: column;
color: #333333;
position: relative; position: relative;
margin-top: 30rpx;
.icon-text{
font-size: 50rpx;
line-height: 1;
}
.tips{
font-size: 20rpx;
color: #333333;
}
.angle-mark{ .angle-mark{
position: absolute; position: absolute;
right: 4rpx; right: 4rpx;
top: 4rpx; top: 4rpx;
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
background-color: #007AFF;
background-color: #15716E;
border-radius: 50%; border-radius: 50%;
font-size: 20rpx; font-size: 20rpx;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
color: #FFFFFF;
}
}
.fixed-live{
background: #15716E;
border-radius: 100rpx 5rpx 100rpx 100rpx;
border: none;
color: #FFFFFF;
// animation: bounceIn 1s .2s ease both;
backface-visibility:visible;
transform-origin:center center;
animation: demo 2s 0s infinite ease normal none ;
// &>text:nth-child(1){
// animation: fadeInRightBig 1s .1s ease both;
// }
.tips{
color: #FFFFFF;
} }
} }
} }
@keyframes bounceIn{
0%{opacity:0; transform:scale(.3)}
50%{opacity:1; transform:scale(1.05)}
70%{transform:scale(.9)}
100%{transform:scale(1)}
}
@keyframes fadeInRightBig{
0%{opacity:0; transform:translateX(2000px)}
100%{opacity:1; transform:translateX(0)}
}
@keyframes demo{
0%{ opacity:0; transform:translateX(.3px) scaleX(.3);
} 13%{ transform:translateX(1.05px) scaleX(1.05);
} 29%{ transform:translateX(0.9px) scaleX(.9);
} 41%{ transform:translateX(1px) scaleX(1);
} 100%{ opacity:1; transform:translateX(1px) scaleX(1);
} 67%{
opacity:1;
}
}
/deep/.u-back-top{
width: 110rpx !important;
height: 110rpx !important;
background-color: rgba(0,0,0,0.5) !important;
right: 32rpx !important;
color: #FFFFFF !important;
margin-bottom: 60rpx;
}
</style> </style>

5
pages/index/list/selected.vue

@ -7,7 +7,10 @@
</view> </view>
<view class="content"> <view class="content">
<view class="card" v-for="(c_item, c_index) in 3" :key="c_index"> <view class="card" v-for="(c_item, c_index) in 3" :key="c_index">
<view class="title" @click="$url('/pages/index/list/monthlyList')">灯具榜 ></view>
<view class="title" @click="$url('/pages/index/list/monthlyList')">
<text class="lf-m-r-10">灯具榜</text>
<text class="lf-iconfont icon-xiangyou lf-font-20"></text>
</view>
<scroll-view class="scroll-view" :scroll-x="true"> <scroll-view class="scroll-view" :scroll-x="true">
<view class="scroll-content"> <view class="scroll-content">
<view class="goods-item" v-for="(item, index) in 5" :key="index" @click="$url('/pages/shop/goodsdetail?type=mail')"> <view class="goods-item" v-for="(item, index) in 5" :key="index" @click="$url('/pages/shop/goodsdetail?type=mail')">

14
pages/point/detail/detail.vue

@ -6,12 +6,18 @@
<view class="bg-right"></view> <view class="bg-right"></view>
<view class="head-content"> <view class="head-content">
<view> <view>
<text class="lf-iconfont icon-- lf-font-50"></text>
<text class="lf-iconfont icon-jifen lf-font-50"></text>
</view> </view>
<view class="point">78326478</view> <view class="point">78326478</view>
<view class="head-menu"> <view class="head-menu">
<view @click="$url('/pages/point/shoppingMall/shoppingMall')">兑换礼品 ></view>
<view @click="$url('/pages/point/rule/rule')">积分规则 ></view>
<view @click="$url('/pages/point/shoppingMall/shoppingMall')">
<text class="lf-m-r-10">兑换礼品</text>
<text class="lf-iconfont icon-xiangyou lf-font-20"></text>
</view>
<view @click="$url('/pages/point/rule/rule')">
<text class="lf-m-r-10">积分规则</text>
<text class="lf-iconfont icon-xiangyou lf-font-20"></text>
</view>
</view> </view>
</view> </view>
</view> </view>
@ -21,7 +27,7 @@
<picker mode='date' :value="date" @change="dateChange"> <picker mode='date' :value="date" @change="dateChange">
<view style="width: 440rpx; text-align: right;"> <view style="width: 440rpx; text-align: right;">
<text>{{ date || '2021-09-01' }}</text> <text>{{ date || '2021-09-01' }}</text>
<text class="lf-iconfont icon--1 lf-m-l-10"></text>
<text class="lf-iconfont icon-xiangyou lf-font-24 lf-m-l-10"></text>
</view> </view>
</picker> </picker>
</view> </view>

8
pages/point/shoppingMall/shoppingMall.vue

@ -7,19 +7,19 @@
<view class="menu"> <view class="menu">
<view class="left"> <view class="left">
<view> <view>
<text class="lf-iconfont icon--"></text>
<text class="lf-iconfont icon-jifen"></text>
<text class="point-num">783</text> <text class="point-num">783</text>
<text class="lf-iconfont icon--"></text>
<text class="lf-iconfont icon-xiangyou lf-font-24"></text>
</view> </view>
<view class="lf-font-24">当前积分</view> <view class="lf-font-24">当前积分</view>
</view> </view>
<view class="lf-flex"> <view class="lf-flex">
<view class="item" @click="$url('/pages/point/exchangeRecord/exchangeRecord')"> <view class="item" @click="$url('/pages/point/exchangeRecord/exchangeRecord')">
<text class="lf-iconfont icon-- lf-font-50"></text>
<text class="lf-iconfont icon-jilu2 lf-font-50"></text>
<text>兑换记录</text> <text>兑换记录</text>
</view> </view>
<view class="item" @click="$url('/pages/store/cart/cart')"> <view class="item" @click="$url('/pages/store/cart/cart')">
<text class="lf-iconfont icon-- lf-font-50"></text>
<text class="lf-iconfont icon-gouwulan lf-font-50"></text>
<text>购物车</text> <text>购物车</text>
<view class="angle-mark">99+</view> <view class="angle-mark">99+</view>
</view> </view>

4
pages/recharge/balance/balance.vue

@ -6,7 +6,7 @@
<view class="bg-right"></view> <view class="bg-right"></view>
<view class="head-content"> <view class="head-content">
<view> <view>
<text class="lf-iconfont icon-- lf-font-50"></text>
<text class="lf-iconfont icon-yuebao lf-font-50"></text>
</view> </view>
<view class="point"> <view class="point">
<text>{{ num || 0 }}</text> <text>{{ num || 0 }}</text>
@ -20,7 +20,7 @@
<picker mode='date' :value="date" @change="dateChange"> <picker mode='date' :value="date" @change="dateChange">
<view style="width: 440rpx; text-align: right;"> <view style="width: 440rpx; text-align: right;">
<text>{{ date || '2021-09-01' }}</text> <text>{{ date || '2021-09-01' }}</text>
<text class="lf-iconfont icon--1 lf-m-l-10"></text>
<text class="lf-iconfont icon-xiangyou lf-font-24 lf-m-l-10"></text>
</view> </view>
</picker> </picker>
</view> </view>

135
pages/shop/goodsdetail.vue

@ -33,11 +33,11 @@
<text class="lf-font-48 lf-color-primary lf-font-bold">8493</text> <text class="lf-font-48 lf-color-primary lf-font-bold">8493</text>
<text class="lf-font-28 lf-color-777 lf-m-l-10">个兑换</text> <text class="lf-font-28 lf-color-777 lf-m-l-10">个兑换</text>
</view> </view>
<lf-price :iftext="false" :price="111" v-else></lf-price>
<lf-price :iftext="false" :price="goods_detail.min_price || 0" v-else></lf-price>
<text class="lf-iconfont icon-fenxiang lf-font-40" @click="shareGraphic()"></text> <text class="lf-iconfont icon-fenxiang lf-font-40" @click="shareGraphic()"></text>
</view> </view>
<view class="lf-row-between lf-font-24 lf-m-t-20 lf-p-b-20"> <view class="lf-row-between lf-font-24 lf-m-t-20 lf-p-b-20">
<view class="lf-font-bold lf-font-32 lf-color-222">颐莲喷雾 500ml</view>
<view class="lf-font-bold lf-font-32 lf-color-222">{{ goods_detail.name }}</view>
</view> </view>
<view class="lf-row-between lf-font-24 lf-p-b-30"> <view class="lf-row-between lf-font-24 lf-p-b-30">
<view class="lf-font-28 lf-color-777" v-if="type == 'self'">门店自提</view> <view class="lf-font-28 lf-color-777" v-if="type == 'self'">门店自提</view>
@ -45,42 +45,45 @@
<view v-if="type == 'seckill'">已有38人购买</view> <view v-if="type == 'seckill'">已有38人购买</view>
</view> </view>
</view> </view>
<self-line></self-line>
<view class="bg-white" v-if="type == 'self'">
<view class="cu-bar padding-lr">
<view class="lf-flex">
<text class="lf-color-777 lf-font-28">优惠</text>
<view v-if="orderDetails.coupon == ''">
<text class="lf-color-price lf-font-28 lf-m-l-10" v-for="(item,index) of orderDetails.coupon">{{item.tag}}</text>
<block v-if="type == 'self'">
<self-line></self-line>
<view class="bg-white" >
<view class="cu-bar padding-lr">
<view class="lf-flex">
<text class="lf-color-777 lf-font-28">优惠</text>
<view v-if="orderDetails.coupon == ''">
<text class="lf-color-price lf-font-28 lf-m-l-10" v-for="(item,index) of orderDetails.coupon">{{item.tag}}</text>
</view>
<view v-else>
<text class="lf-color-222 lf-font-26 lf-m-l-30">化妆品教师节满1200减200</text>
</view>
</view> </view>
<view v-else>
<text class="lf-color-222 lf-font-26 lf-m-l-30">化妆品教师节满1200减200</text>
<view>
<text class="lf-font-24 lf-color-777 lf-iconfont icon-xiangyou"></text>
</view> </view>
</view> </view>
<view>
<text class="lf-font-24 lf-color-777 lf-iconfont icon-xiangyou"></text>
</view>
</view> </view>
</view>
<self-line></self-line>
<view class="bg-white" v-if="type == 'self'">
<view class="cu-bar padding-lr">
<view class="lf-flex">
<text class="lf-color-777 lf-font-28">服务</text>
<view style="width: 600rpx;flex-wrap: wrap;display: flex;margin-top: 32rpx;">
<view class="lf-m-l-30" v-for="i of 5">
<text class="lf-iconfont icon-xuanzhong lf-font-30" style="color: #15716E;"></text>
<text class="lf-m-l-10 lf-font-26 lf-color-black">正品保障</text>
<self-line></self-line>
<view class="bg-white">
<view class="cu-bar padding-lr">
<view class="lf-flex">
<text class="lf-color-777 lf-font-28">服务</text>
<view style="width: 600rpx;flex-wrap: wrap;display: flex;margin-top: 32rpx;">
<view class="lf-m-l-30" v-for="i of 5">
<text class="lf-iconfont icon-xuanzhong lf-font-30" style="color: #15716E;"></text>
<text class="lf-m-l-10 lf-font-26 lf-color-black">正品保障</text>
</view>
</view> </view>
</view> </view>
</view>
<view>
<text class="lf-font-24 lf-color-777 lf-iconfont icon-xiangyou"></text>
<view>
<text class="lf-font-24 lf-color-777 lf-iconfont icon-xiangyou"></text>
</view>
</view> </view>
</view> </view>
</view>
</block>
<block v-else> <block v-else>
<view class="bg-white">
<self-line></self-line>
<!-- <view class="bg-white">
<view class="cu-bar padding-lr"> <view class="cu-bar padding-lr">
<view class="lf-flex"> <view class="lf-flex">
<view class="lf-color-777 lf-font-28">送至</view> <view class="lf-color-777 lf-font-28">送至</view>
@ -90,12 +93,14 @@
<text class="lf-font-24 lf-color-777 lf-iconfont icon-xiangyou"></text> <text class="lf-font-24 lf-color-777 lf-iconfont icon-xiangyou"></text>
</view> </view>
</view> </view>
</view>
</view> -->
<view class="bg-white"> <view class="bg-white">
<view class="cu-bar padding-lr">
<view class="cu-bar padding-lr" @click="showFreight">
<view class="lf-flex"> <view class="lf-flex">
<view class="lf-color-777 lf-font-28">运费</view> <view class="lf-color-777 lf-font-28">运费</view>
<view class="lf-color-222 lf-font-26 lf-m-l-30 lf-line-1" style="width: 550rpx;">在5kg10kg内包含5kg重量在5kg以内按3kg</view>
<view class="lf-color-222 lf-font-26 lf-m-l-30 lf-line-1" style="width: 550rpx;">
<text>1KM以内包含1KM重量在5KG以内按6元计费每超出1KG加收2元</text>
</view>
</view> </view>
<view> <view>
<text class="lf-font-24 lf-color-777 lf-iconfont icon-xiangyou"></text> <text class="lf-font-24 lf-color-777 lf-iconfont icon-xiangyou"></text>
@ -124,13 +129,17 @@
</view> </view>
<view class="lf-flex-column lf-m-l-20"> <view class="lf-flex-column lf-m-l-20">
<text class="lf-font-28 lf-color-black lf-font-bold">颐莲官方店</text> <text class="lf-font-28 lf-color-black lf-font-bold">颐莲官方店</text>
<view class="lf-font-24 lf-color-777"><u-icon name="map" class="lf-m-r-10"></u-icon>L2</view>
<view class="lf-font-24 lf-color-777">
<text class="lf-iconfont icon-dizhi lf-font-24 lf-color-primary"></text>
<text class="lf-m-l-10">L2</text>
</view>
</view> </view>
</view> </view>
<view> <view>
<button class="head-btn" @click="$url('/pages/user/my/chatonline')"> <button class="head-btn" @click="$url('/pages/user/my/chatonline')">
<u-icon name="chat" class="lf-m-r-10"></u-icon>
<text>客服</text>
<!-- <u-icon name="chat" class="lf-m-r-10"></u-icon> -->
<text class="lf-iconfont icon-kefuhdpi lf-font-24"></text>
<text class="lf-m-l-10">客服</text>
</button> </button>
</view> </view>
</view> </view>
@ -156,7 +165,7 @@
<!-- 商品详情 --> <!-- 商品详情 -->
<view class="goods-detail"> <view class="goods-detail">
<view class="lf-font-32 lf-font-bold lf-m-b-20">商品详情</view> <view class="lf-font-32 lf-font-bold lf-m-b-20">商品详情</view>
<rich-text :nodes="formatRichText('商品详情商品详情商品详情商品详情商品详情商品详情商品详情商品详情商品详情商品详情商品详情商品详情')"></rich-text>
<rich-text :nodes="goods_detail.content"></rich-text>
<!-- <image class="goods-img" :src="item" v-for="(item, index) in goods_detail.content" :key="index" v-if="goods_detail.content_type == 'img'"></image> --> <!-- <image class="goods-img" :src="item" v-for="(item, index) in goods_detail.content" :key="index" v-if="goods_detail.content_type == 'img'"></image> -->
</view> </view>
<!-- 修饰专用 --> <!-- 修饰专用 -->
@ -165,16 +174,16 @@
<view class="lf-row-between fixed-bottom"> <view class="lf-row-between fixed-bottom">
<view class="lf-flex lf-p-t-10 lf-p-b-10"> <view class="lf-flex lf-p-t-10 lf-p-b-10">
<view class="lf-flex-column lf-row-center icon-item" open-type="contact"> <view class="lf-flex-column lf-row-center icon-item" open-type="contact">
<text class="lf-iconfont icon-shoucang icon-img"></text>
<text class="lf-iconfont icon-pinglun- icon-img"></text>
<view class="lf-m-t-1">客服</view> <view class="lf-m-t-1">客服</view>
</view> </view>
<view class="lf-flex-column lf-row-center icon-item" @click="switchCollect"> <view class="lf-flex-column lf-row-center icon-item" @click="switchCollect">
<text class="lf-iconfont icon-shoucang icon-img" v-if="is_collect"></text>
<text class="lf-iconfont icon-shoucang icon-img" v-else></text>
<text class="lf-iconfont icon-shoucang2 icon-img" v-if="is_collect"></text>
<text class="lf-iconfont icon-shoucang11 icon-img" v-else></text>
<view class="lf-m-t-1">{{ is_collect ? '已收藏' : '收藏' }}</view> <view class="lf-m-t-1">{{ is_collect ? '已收藏' : '收藏' }}</view>
</view> </view>
<button class="lf-flex-column lf-row-center icon-item"> <button class="lf-flex-column lf-row-center icon-item">
<text class="lf-iconfont icon-shoucang icon-img"></text>
<text class="lf-iconfont icon-gouwulan icon-img"></text>
<view class="lf-m-t-1">购物车</view> <view class="lf-m-t-1">购物车</view>
</button> </button>
</view> </view>
@ -221,13 +230,13 @@
<view class="lf-font-28 lf-color-555">数量</view> <view class="lf-font-28 lf-color-555">数量</view>
<view class="lf-flex"> <view class="lf-flex">
<view class="num-btn"> <view class="num-btn">
<text class="lf-iconfont icon-xiangyou lf-font-24"></text>
<text class="lf-iconfont icon-jian1 lf-font-30"></text>
</view> </view>
<view> <view>
<input class="input" value="1" /> <input class="input" value="1" />
</view> </view>
<view class="num-btn lf-text-right"> <view class="num-btn lf-text-right">
<text class="lf-iconfont icon-xiangyou lf-font-24"></text>
<text class="lf-iconfont icon-jia lf-font-30"></text>
</view> </view>
</view> </view>
</view> </view>
@ -235,6 +244,18 @@
<button class="comfirm-btn" @click="confirm">{{ click_type == 1 ? '加入购物车' : '立即购买' }}</button> <button class="comfirm-btn" @click="confirm">{{ click_type == 1 ? '加入购物车' : '立即购买' }}</button>
</view> </view>
</u-popup> </u-popup>
<!-- 运费说明 -->
<u-popup v-model="show_freight" mode="bottom" :round="true" borderRadius="20">
<view class="popup-content">
<view class="lf-row-between lf-m-b-30">
<view class="lf-color-555 lf-font-32 lf-font-bold">店铺运费说明</view>
<view @click="show_freight = false">
<text class="lf-iconfont icon-cuo lf-font-50"></text>
</view>
</view>
<view class="lf-font-28 lf-color-777">1KM以内包含1KM重量在5KG以内按6元计费每超出1KG加收2元</view>
</view>
</u-popup>
<!-- 回到顶部 --> <!-- 回到顶部 -->
<u-back-top :scroll-top="pageScrollTop"></u-back-top> <u-back-top :scroll-top="pageScrollTop"></u-back-top>
</block> </block>
@ -255,12 +276,9 @@
goods_detail: {}, goods_detail: {},
is_collect: false, // 10 is_collect: false, // 10
skeletonLoading: false, 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_popup: false, //
show_freight: false, //
spec_current: null, // spec_current: null, //
click_type: null, // [1][2] click_type: null, // [1][2]
type: 'mail', // mailselfpointseckill type: 'mail', // mailselfpointseckill
@ -272,6 +290,7 @@
this.type = options.type || 'mail'; this.type = options.type || 'mail';
console.log('商品',this.goods_id) console.log('商品',this.goods_id)
// this.getGoodsDetail(); // this.getGoodsDetail();
this.getNewdetail();
}, },
computed: { computed: {
isRight() { isRight() {
@ -281,6 +300,9 @@
} }
}, },
methods: { methods: {
showFreight(){
this.show_freight = true;
},
shoot(type){ shoot(type){
// TODO type // TODO type
this.click_type = type; this.click_type = type;
@ -352,6 +374,18 @@
}, 1000); }, 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(){ switchCollect(){
let userInfo = uni.getStorageSync('userinfo') || {}; let userInfo = uni.getStorageSync('userinfo') || {};
@ -398,8 +432,9 @@
// //
lookImg(index){ lookImg(index){
this.$u.throttle(() => { 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({ uni.previewImage({
urls: banners, urls: banners,
current: index current: index
@ -686,6 +721,8 @@
.icon-img{ .icon-img{
height: 50rpx; height: 50rpx;
width: 50rpx; width: 50rpx;
font-size: 40rpx;
line-height: 1;
} }
} }
.btn1{ .btn1{

2
pages/shop/search.vue

@ -20,7 +20,7 @@
<!-- 我搜过的 --> <!-- 我搜过的 -->
<view class="lf-row-between"> <view class="lf-row-between">
<text class="title">我搜过的</text> <text class="title">我搜过的</text>
<text class="lf-iconfont icon--1 lf-color-777"></text>
<text class="lf-iconfont icon-shanchu lf-color-777"></text>
</view> </view>
<view class="list"> <view class="list">
<view class="item item-2">秋上新</view> <view class="item item-2">秋上新</view>

7
pages/shop/shopdetail.vue

@ -11,12 +11,15 @@
</view> </view>
<view> <view>
<view class="lf-color-black lf-font-36">AIMER MEN爱慕先生</view> <view class="lf-color-black lf-font-36">AIMER MEN爱慕先生</view>
<view class="lf-font-24 lf-color-black">L2</view>
<view class="lf-font-24 lf-color-black">
<text class="lf-iconfont icon-dizhi lf-font-24 lf-color-primary"></text>
<text class="lf-m-l-10">L2</text>
</view>
</view> </view>
</view> </view>
<view class="function-total"> <view class="function-total">
<view class="lf-row-center lf-flex-column"> <view class="lf-row-center lf-flex-column">
<view><text class="lf-iconfont icon-shoucang shop-function"></text></view>
<view><text class="lf-iconfont icon-pinglun shop-function"></text></view>
<view class="lf-font-24 lf-color-33">客服</view> <view class="lf-font-24 lf-color-33">客服</view>
</view> </view>
<view class="lf-row-center lf-flex-column"> <view class="lf-row-center lf-flex-column">

13
pages/user/member/code.vue

@ -65,12 +65,25 @@
}, },
onLoad(){ onLoad(){
this.refreshCode(); 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(){ onUnload(){
if(this.timer){ if(this.timer){
clearInterval(this.timer); clearInterval(this.timer);
this.timer = null; this.timer = null;
} }
uni.setScreenBrightness({
value: this.brightness
})
}, },
methods: { methods: {
// rpx px // rpx px

50
pages/user/my/center.vue

@ -12,11 +12,11 @@
</view> </view>
<view class="lf-row-center"> <view class="lf-row-center">
<view class="lf-color-white lf-font-36 lf-m-l-20">182****5380 </view> <view class="lf-color-white lf-font-36 lf-m-l-20">182****5380 </view>
<view class="lf-iconfont icon-xiangyou lf-font-24 lf-m-l-10 lf-color-white"></view>
<view class="lf-iconfont icon-xiangyou lf-font-20 lf-m-l-10 lf-color-white"></view>
</view> </view>
</view> </view>
<view class="lf-row-center lf-flex-column" style="position: relative; z-index: 9;" @click="$url('/pages/user/member/code')"> <view class="lf-row-center lf-flex-column" style="position: relative; z-index: 9;" @click="$url('/pages/user/member/code')">
<view class="lf-iconfont icon-shoucang lf-color-white"></view>
<view class="lf-iconfont icon-erweima lf-color-white"></view>
<view class="lf-font-24 lf-color-white">支付码</view> <view class="lf-font-24 lf-color-white">支付码</view>
</view> </view>
</view> </view>
@ -58,14 +58,17 @@
商城订单 商城订单
</view> </view>
<view class="lf-flex" @click="$url('/pages/order/index/onlineorder')"> <view class="lf-flex" @click="$url('/pages/order/index/onlineorder')">
<view class="lf-font-24 lf-color-777">全部订单</view><text class="lf-iconfont icon-xiangyou lf-font-24 lf-m-l-10 lf-color-777"></text>
<view class="lf-font-24 lf-color-777">全部订单</view>
<text class="lf-iconfont icon-xiangyou lf-font-20 lf-m-l-10 lf-color-777"></text>
</view> </view>
</view> </view>
<view class="order-tag lf-flex-wrap"> <view class="order-tag lf-flex-wrap">
<view class="order-children" v-for="i of 4" @click="$url('/pages/order/index/onlineorder')">
<view class="order-children"
v-for="(item, index) in order_tablist" :key="index"
@click="$url('/pages/order/index/onlineorder')">
<!-- <view class="function-tag"></view> --> <!-- <view class="function-tag"></view> -->
<view class="lf-iconfont icon-huiyuan"></view>
<view class="lf-color-black lf-font-28 lf-m-t-20">待付款</view>
<view class="lf-iconfont lf-font-50" :class="item.icon"></view>
<view class="lf-color-black lf-font-28 lf-m-t-20">{{ item.name }}</view>
</view> </view>
</view> </view>
</view> </view>
@ -84,7 +87,7 @@
v-for="(item, index) in my_service_list" :key="index" v-for="(item, index) in my_service_list" :key="index"
@click="$url(item.path)"> @click="$url(item.path)">
<!-- <view class="function-tag"></view> --> <!-- <view class="function-tag"></view> -->
<view class="lf-iconfont" :class="item.icon"></view>
<view class="lf-iconfont lf-font-60" :class="item.icon"></view>
<view class="lf-color-black lf-font-28 lf-m-t-20" style="white-space: nowrap">{{ item.name }}</view> <view class="lf-color-black lf-font-28 lf-m-t-20" style="white-space: nowrap">{{ item.name }}</view>
</view> </view>
</view> </view>
@ -103,33 +106,46 @@
data(){ data(){
return { return {
nav_bg_color: 'transparent' ,// 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: [{ my_service_list: [{
name: '会员服务', name: '会员服务',
icon: 'icon-huiyuan',
icon: 'icon-huiyuan1',
path: '/pages/user/member/service' path: '/pages/user/member/service'
},{ },{
name: '在线客服', name: '在线客服',
icon: 'icon-huiyuan',
icon: 'icon-pinglun',
path: '/pages/user/my/chatonline' path: '/pages/user/my/chatonline'
},{ },{
name: '我的收藏', name: '我的收藏',
icon: 'icon-huiyuan',
icon: 'icon-shoucang',
path: '/pages/user/my/collect' path: '/pages/user/my/collect'
},{ },{
name: '地址管理', name: '地址管理',
icon: 'icon-huiyuan',
icon: 'icon-dizhi',
path: '/pages/address/list/list' path: '/pages/address/list/list'
},{ },{
name: '活动报名', name: '活动报名',
icon: 'icon-huiyuan',
icon: 'icon-fabujilu',
path: '/pages/user/my/myEventRegistrationList' path: '/pages/user/my/myEventRegistrationList'
},{ },{
name: '积分商城订单', name: '积分商城订单',
icon: 'icon-huiyuan',
icon: 'icon-jifen',
path: '/pages/point/exchangeRecord/exchangeRecord' path: '/pages/point/exchangeRecord/exchangeRecord'
},{ },{
name: '商家中心', name: '商家中心',
icon: 'icon-huiyuan',
icon: 'icon-Group-',
path: '/pages/business/center/center' path: '/pages/business/center/center'
}] }]
} }
@ -159,6 +175,9 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-right: 27rpx; margin-right: 27rpx;
&>view:nth-child(1){
line-height: 1;
}
&:nth-child(4n) { &:nth-child(4n) {
margin-right: 0; margin-right: 0;
} }
@ -168,6 +187,9 @@
} }
.my-service{ .my-service{
width: 190rpx; width: 190rpx;
&>view:nth-child(1){
line-height: 1;
}
&:nth-child(3n){ &:nth-child(3n){
margin-right: 0; margin-right: 0;
} }

5
pages/user/my/collect.vue

@ -11,7 +11,10 @@
<view class="lf-flex-column lf-m-l-20" style="width: 480rpx;min-height: 160rpx;justify-content: space-between;"> <view class="lf-flex-column lf-m-l-20" style="width: 480rpx;min-height: 160rpx;justify-content: space-between;">
<view class="lf-font-36 lf-color-black lf-line-1">luckin coffee 瑞幸瑞幸咖啡瑞幸咖啡瑞幸咖啡瑞幸咖啡咖啡</view> <view class="lf-font-36 lf-color-black lf-line-1">luckin coffee 瑞幸瑞幸咖啡瑞幸咖啡瑞幸咖啡瑞幸咖啡咖啡</view>
<view class="lf-font-24 lf-color-777">餐饮·美食18件在售</view> <view class="lf-font-24 lf-color-777">餐饮·美食18件在售</view>
<view class="lf-font-24 lf-color-777"><u-icon name="map" class="lf-m-r-10"></u-icon>L2</view>
<view class="lf-font-24 lf-color-777">
<text class="lf-iconfont icon-dizhi lf-font-20 lf-color-primary"></text>
<text class="lf-m-l-10">L2</text>
</view>
</view> </view>
<view class="lf-iconfont icon-shoucang lf-font-38" style="color: #FF9D9D;"></view> <view class="lf-iconfont icon-shoucang lf-font-38" style="color: #FF9D9D;"></view>
</view> </view>

6
pages/user/my/my.vue

@ -30,15 +30,15 @@
</view> </view>
<view class="lf-m-t-30 lf-row-between lf-p-l-50 lf-p-r-50"> <view class="lf-m-t-30 lf-row-between lf-p-l-50 lf-p-r-50">
<view class="lf-row-center"> <view class="lf-row-center">
<text class="lf-iconfont icon-shoucang"></text>
<text class="lf-iconfont icon-xihuan"></text>
<text class="lf-font-24 lf-color-777 lf-m-l-10">379</text> <text class="lf-font-24 lf-color-777 lf-m-l-10">379</text>
</view> </view>
<view class="lf-row-center"> <view class="lf-row-center">
<text class="lf-iconfont icon-fabu"></text>
<text class="lf-iconfont icon-chakan"></text>
<text class="lf-font-24 lf-color-777 lf-m-l-10">3579</text> <text class="lf-font-24 lf-color-777 lf-m-l-10">3579</text>
</view> </view>
<view class="lf-row-center"> <view class="lf-row-center">
<text class="lf-iconfont icon-fenxiang"></text>
<text class="lf-iconfont icon-pinglun-"></text>
<text class="lf-font-24 lf-color-777 lf-m-l-10">63</text> <text class="lf-font-24 lf-color-777 lf-m-l-10">63</text>
</view> </view>
</view> </view>

6
store/index.js

@ -8,19 +8,19 @@ let state = {
{ {
name: 'home', name: 'home',
text: '首页', text: '首页',
icon: 'icon-Group-',
icon: 'icon-xianxingicon-03',
path: '/pages/index/index/index' path: '/pages/index/index/index'
}, },
{ {
name: 'brand', name: 'brand',
text: '品牌', text: '品牌',
icon: 'icon-tihuo',
icon: 'icon-pinpailiebiao',
path: '/pages/index/category/category' path: '/pages/index/category/category'
}, },
{ {
name: 'find', name: 'find',
text: '发现', text: '发现',
icon: 'icon-fabu',
icon: 'icon-faxian',
path: '/pages/discover/discover' path: '/pages/discover/discover'
}, },
{ {

Loading…
Cancel
Save