Leadfyy.co
/
ec.uniapp-master
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/ec.uniapp-master

master
邓平艺 4 years ago
parent
2d384bd75f eb8bcae3f0
commit
f177b7bc9d
28 changed files with 98 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      pages/business/activity/add.vue
  2. 2
      pages/business/center/center.vue
  3. 2
      pages/business/withdrawal/withdrawal.vue
  4. 5
      pages/coupon/index/index.vue
  5. 50
      pages/discover/discover.vue
  6. 10
      pages/discover/discoverdetails.vue
  7. 2
      pages/index/activity/goods.vue
  8. 2
      pages/index/activity/hot.vue
  9. 2
      pages/index/cateringFacilities/cateringFacilities.vue
  10. 9
      pages/index/collectCoupons/collectCoupons.vue
  11. 2
      pages/index/list/monthlyList.vue
  12. 2
      pages/index/list/selected.vue
  13. 2
      pages/index/openScreenAd/openScreenAd.vue
  14. 2
      pages/order/index/onlineorder.vue
  15. 4
      pages/order/newdetail/logistics.vue
  16. 2
      pages/shop/goodsdetail.vue
  17. 2
      pages/shop/searchList.vue
  18. 2
      pages/shop/shopdetail.vue
  19. 2
      pages/store/cart/cart.vue
  20. 4
      pages/user/member/service.vue
  21. 4
      pages/user/my/center.vue
  22. 4
      pages/user/my/chatonline.vue
  23. 2
      pages/user/my/collect.vue
  24. 13
      pages/user/my/my.vue
  25. 2
      pages/user/my/myregister.vue
  26. 4
      pages/user/my/setting.vue
  27. 6
      pages/user/register/register.vue
  28. BIN
      static/images/login.png

2
pages/business/activity/add.vue
View File

@ -87,7 +87,7 @@
<text class="lf-iconfont icon-jia my-image-item-after"></text>
</view>
<view class="my-image-item" v-for="(item, index) in image_list" :key="index" @click="lookImage(index)">
<image :src="item" mode="aspectFill"></image>
<image :src="item" mode="widthFix"></image>
<view class="remove-image" @click.stop="removeInage(index)">
<text class="lf-iconfont icon-shanchu"></text>
</view>

2
pages/business/center/center.vue
View File

@ -7,7 +7,7 @@
<view class="bg-right"></view>
<view class="head-content">
<view class="lf-flex">
<image class="head-img" mode="aspectFill" :src="detail.brand.logo"></image>
<image class="head-img" mode="widthFix" :src="detail.brand.logo"></image>
<view class="head-title lf-line-3">{{ detail.brand.name }}</view>
</view>
<view class="lf-flex">

2
pages/business/withdrawal/withdrawal.vue
View File

@ -13,7 +13,7 @@
<!-- 店铺信息 -->
<view class="card">
<view class="lf-flex">
<image class="shop-avatar" mode="aspectFill" :src="brand.logo"></image>
<image class="shop-avatar" mode="widthFix" :src="brand.logo"></image>
<view class="shop-name">{{ brand.name }}</view>
</view>
</view>

5
pages/coupon/index/index.vue
View File

@ -9,7 +9,7 @@
<scroll-view :style="{height: autoHeight}" :scroll-y="true" :refresher-enabled="true" :refresher-triggered="isRefresher"
@scrolltolower="onScrolltolower" @refresherrefresh="onRefresherrefresh">
<view class="coupon-wrap">
<view class="coupon-card lf-m-b-30" :class="{'invalid-bg': item.ifpast == true}" v-for="(item, index) in tab.list" :key="index">
<view class="coupon-card lf-m-b-30" :class="{'invalid-bg': item.ifpast == true,'lf-bg-haveuse': item.used_at != ''}" v-for="(item, index) in tab.list" :key="index">
<view class="coupon-circle-top">
<view class="coupon-circle1"></view>
</view>
@ -204,6 +204,9 @@
</script>
<style scoped lang="scss">
.lf-bg-haveuse {
background-color: rgba(255, 255, 255, 1)!important;
}
.coupon-circle1 {
width: 40rpx;
height: 40rpx;

50
pages/discover/discover.vue
View File

@ -12,8 +12,8 @@
<view class="lf-p-32">
<view class="lf-flex" @click="$url('/pages/user/my/my?user_id='+item.user_id)">
<view class="tag-father">
<image :src="item.user.avatar" v-if="item.user.avatar" mode="aspectFill" class="head-img"></image>
<image src="/static/images/empty.png" v-else mode="aspectFill" class="head-img"></image>
<image :src="item.user.avatar" v-if="item.user.avatar" mode="widthFix" class="head-img"></image>
<image src="/static/images/empty.png" v-else mode="widthFix" class="head-img"></image>
<view class="head-tag">V</view>
</view>
<view class="lf-flex-column lf-m-l-20">
@ -146,8 +146,52 @@
});
}, 500);
},
getCurrentPageUrlWithArgs() {
var pages = getCurrentPages() //获取加载的页面
var currentPage = pages[pages.length-1] //获取当前页面的对象
var url = currentPage.route //当前页面url
var options = currentPage.options //如果要获取url中所带的参数可以查看options
//拼接url的参数
var urlWithArgs = url + '?'
for(var key in options){
var value = options[key]
urlWithArgs += key + '=' + value + '&'
}
urlWithArgs = urlWithArgs.substring(0, urlWithArgs.length-1)
return encodeURIComponent(urlWithArgs)
},
goDetails(id) {
this.$url('/pages/discover/discoverdetails?discover_id='+id)
let token = this.$cookieStorage.get('user_token');
if(!token) {
var url = this.getCurrentPageUrlWithArgs();
wx.showModal({
content:'请重新登录',
duration:1500,
showCancel: false,
success:(res)=>{
if (res.confirm) {
// wx.navigateTo 邓平艺 于2021.09.24修改，
// 原因：未登录点击后跳转到登录页，当登录成功，
// 再次跳转回来时，用户点击页面返回，原有页面和弹窗还存在
uni.redirectTo({
url:`/pages/user/register/register?url=${url}`
})
return;
}
},
cancel:()=>{
uni.redirectTo({
url:`/pages/user/register/register?url=${url}`
})
return;
}
})
}else {
this.$url('/pages/discover/discoverdetails?discover_id='+id)
}
},
addLike(id) {
this.$http

10
pages/discover/discoverdetails.vue
View File

@ -4,7 +4,7 @@
<view class="lf-p-32">
<view class="lf-flex">
<view class="tag-father" @click="$url('/pages/user/my/my?user_id='+discover_details.user_id)">
<image :src="discover_details.user.avatar" mode="aspectFill" class="head-img"></image>
<image :src="discover_details.user.avatar" mode="widthFix" class="head-img"></image>
<view class="head-tag">V</view>
</view>
<view class="lf-flex-column lf-m-l-20">
@ -47,8 +47,8 @@
<view class="lf-m-t-20" @click="applySub(commentitem.user.id,commentitem.id)">
<view class="lf-flex">
<view @click="$url('/pages/user/my/my?user_id='+commentitem.user_id)">
<image class="comment-img" :src="commentitem.user.avatar" v-if="commentitem.user.avatar" mode="aspectFill"></image>
<image class="comment-img" src="/static/images/empty.png" v-else mode="aspectFill"></image>
<image class="comment-img" :src="commentitem.user.avatar" v-if="commentitem.user.avatar" mode="widthFix"></image>
<image class="comment-img" src="/static/images/empty.png" v-else mode="widthFix"></image>
</view>
<view class="lf-flex-column lf-m-l-20">
<view class="lf-color-999 lf-font-24" v-if="commentitem.user.nick_name">{{commentitem.user.nick_name}}</view>
@ -70,8 +70,8 @@
<view class="lf-flex" @click="applySub(subitem.user.id,subitem.parent_id)">
<view class="lf-flex lf-m-t-30">
<view @click="$url('/pages/user/my/my?user_id='+subitem.user_id)">
<image class="comment-img" :src="subitem.user.avatar" v-if="subitem.user.avatar" mode="aspectFill"></image>
<image class="comment-img" src="/static/images/empty.png" v-else mode="aspectFill"></image>
<image class="comment-img" :src="subitem.user.avatar" v-if="subitem.user.avatar" mode="widthFix"></image>
<image class="comment-img" src="/static/images/empty.png" v-else mode="widthFix"></image>
</view>
<view class="lf-flex-column lf-m-l-20">
<view class="lf-flex">

2
pages/index/activity/goods.vue
View File

@ -2,7 +2,7 @@
<view>
<lf-nav title="家具专场" :showIcon="true" bgColor="transparent" :spreadOut="false"></lf-nav>
<view class="head">
<image class="img" mode="aspectFill" src="https://picsum.photos/200/300?grayscale"></image>
<image class="img" mode="widthFix" src="https://picsum.photos/200/300?grayscale"></image>
</view>
<view class="content">
<view class="card" v-for="(item, index) in 14" :key="index">

2
pages/index/activity/hot.vue
View File

@ -11,7 +11,7 @@
<view class="scroll-content">
<view class="card" v-for="(item, index) in tab.list" :key="index" @click="goDetails(item.id)">
<view class="cover">
<image class="img" :src="item.image" mode="aspectFill"></image>
<image class="img" :src="item.image" mode="widthFix"></image>
</view>
<view class="info">
<view class="title">{{item.name}}</view>

2
pages/index/cateringFacilities/cateringFacilities.vue
View File

@ -10,7 +10,7 @@
<view class="list">
<view class="item" v-for="(item, index) in 6" :key="index">
<view class="img">
<image src="https://picsum.photos/200/300" mode="aspectFill"></image>
<image src="https://picsum.photos/200/300" mode="widthFix"></image>
<view class="float-layer">
<image src="/static/images/empty.png"></image>
</view>

9
pages/index/collectCoupons/collectCoupons.vue
View File

@ -7,7 +7,7 @@
</view>
<view class="coupon-wrap">
<view class="coupon-box" v-for="(item,index) of coupon_list" :key="index">
<view class="coupon-card lf-m-b-30">
<view class="coupon-card lf-m-b-30" :class="item.ifpast?'lf-bg-999':''">
<view class="coupon-circle-top">
<view class="coupon-circle1"></view>
</view>
@ -27,10 +27,10 @@
</view>
</view>
</view>
<view class="coupon-receive" @click="receive(item.code)">立即领取</view>
<view class="coupon-receive" :class="item.ifpast?'lf-bg-999':''" @click="receive(item.code)">立即领取</view>
<block v-if="item.ifpast">
<view class="coupon-opacity"></view>
<view class="coupon-end">
<view class="coupon-end" :class="item.ifpast?'lf-bg-999':''">
<view>抢光了</view>
</view>
</block>
@ -109,6 +109,9 @@
</script>
<style lang="scss" scoped="scoped">
.lf-bg-999 {
background-color: #999!important;
}
.head{
height: 376rpx;
width: 750rpx;

2
pages/index/list/monthlyList.vue
View File

@ -2,7 +2,7 @@
<view>
<lf-nav :showIcon="true" bgColor="transparent" :spreadOut="false"></lf-nav>
<view class="head">
<image class="img" mode="aspectFill" src="https://picsum.photos/200/300?grayscale"></image>
<image class="img" mode="widthFix" src="https://picsum.photos/200/300?grayscale"></image>
<view class="title">热销榜单</view>
</view>
<view class="content">

2
pages/index/list/selected.vue
View File

@ -2,7 +2,7 @@
<view>
<lf-nav :showIcon="true" bgColor="transparent" :spreadOut="false"></lf-nav>
<view class="head">
<image class="img" mode="aspectFill" src="https://picsum.photos/200/300?grayscale"></image>
<image class="img" mode="widthFix" src="https://picsum.photos/200/300?grayscale"></image>
<view class="title">精选榜单</view>
</view>
<view class="content">

2
pages/index/openScreenAd/openScreenAd.vue
View File

@ -1,7 +1,7 @@
<template>
<view class="content">
<block v-if="$isRight(full)">
<image class="img" :src="full.image" mode="aspectFill" @click="clickAd"></image>
<image class="img" :src="full.image" mode="widthFix" @click="clickAd"></image>
<view class="tips" @click="next">跳过 {{ num }}s</view>
</block>
</view>

2
pages/order/index/onlineorder.vue
View File

@ -30,7 +30,7 @@
</view>
<view v-for="(i,index3) of item2.items" :key="index3">
<view class="lf-m-t-30" style="display: flex;">
<image class="content-img" :src="i.item_meta.image" mode="aspectFill"></image>
<image class="content-img" :src="i.item_meta.image" mode="widthFix"></image>
<view class="lf-m-l-15" style="width: 480rpx;display: flex;flex-direction: column;justify-content: space-between;">
<view class="lf-color-333 lf-font-26 lf-line-2" style="max-width: 480rpx;">{{i.item_name}}</view>
<view class="lf-font-24 lf-color-777 lf-m-t-14 lf-row-between" style="width: 100%;">

4
pages/order/newdetail/logistics.vue
View File

@ -2,12 +2,12 @@
<view v-if="$isRight(logistics_data)">
<lf-nav title="物流详情" :showIcon="true"></lf-nav>
<view class="top">
<image class="img" :src="order_details.items[0].item_meta.image" mode="aspectFill"></image>
<image class="img" :src="order_details.items[0].item_meta.image" mode="widthFix"></image>
<view>{{logistics_data.state_text}}</view>
</view>
<view class="head">
<view class="lf-flex">
<image class="avatar" src="https://picsum.photos/200/300" mode="aspectFill"></image>
<image class="avatar" src="https://picsum.photos/200/300" mode="widthFix"></image>
<view class="name">{{logistics_data.com}} {{order_no}}</view>
</view>
<view class="copy" @click="copy">复制</view>

2
pages/shop/goodsdetail.vue
View File

@ -126,7 +126,7 @@
<view class="lf-row-between lf-w-100">
<view class="lf-flex" @click="$url('/pages/shop/shopdetail?id='+ brand_detail.id)">
<view class="tag-father">
<image :src="brand_detail.logo" mode="aspectFill" class="head-img"></image>
<image :src="brand_detail.logo" mode="widthFix" class="head-img"></image>
</view>
<view class="lf-flex-column lf-m-l-20">
<text class="lf-font-28 lf-color-black lf-font-bold">{{ brand_detail.name }}</text>

2
pages/shop/searchList.vue
View File

@ -16,7 +16,7 @@
<swiper-item v-for="(tab_item, tab_index) in tab_list" :key="tab_index">
<scroll-view :scroll-y="true" :style="{height: autoHeight}" @scrolltolower="scrolltolower">
<view class="scroll-content" v-if="tab_index == 0">
<lf-waterfall :list="goods_list" ref="searchWaterfall"></lf-waterfall>
<lf-waterfall :ifsale="false" :list="goods_list" ref="searchWaterfall"></lf-waterfall>
<lf-nocontent src="/static/images/empty.png" v-if="goods_list.length <= 0"></lf-nocontent>
</view>
<view class="scroll-content" v-else>

2
pages/shop/shopdetail.vue
View File

@ -7,7 +7,7 @@
<view class="shop-title">
<view class="shop-flex">
<view class="shop-img">
<image class="shop-img" :src="detail.logo" mode="aspectFill"></image>
<image class="shop-img" :src="detail.logo" mode="widthFix"></image>
</view>
<view>
<view class="lf-color-black lf-font-36">{{ detail.name }}</view>

2
pages/store/cart/cart.vue
View File

@ -24,7 +24,7 @@
<u-checkbox shape="circle" active-color="#15716E" @change="goodsCheckChange($event, s_index, g_index)" v-model="g_item.checked"></u-checkbox>
</u-checkbox-group>
<view class="lf-m-t-30" style="display: flex;">
<image class="content-img" :src="g_item.img" mode="aspectFill" @click="$url('/pages/shop/goodsdetail?id='+ g_item.com_id)"></image>
<image class="content-img" :src="g_item.img" mode="widthFix" @click="$url('/pages/shop/goodsdetail?id='+ g_item.com_id)"></image>
<view class="lf-m-l-15 content-info">
<view class="lf-color-333 lf-font-26 lf-line-2" style="max-width: 480rpx;">{{g_item.name}}</view>
<view class="lf-font-24 lf-color-777 lf-m-t-14 lf-row-between">

4
pages/user/member/service.vue
View File

@ -3,11 +3,11 @@
<lf-nav title="会员服务" :showIcon="true"></lf-nav>
<view class="content">
<view class="head">
<image mode="aspectFill" src="https://picsum.photos/seed/picsum/200/300"></image>
<image mode="widthFix" src="https://picsum.photos/seed/picsum/200/300"></image>
</view>
<view class="main">
<view class="item" v-for="(item, index) in serviceList" :key="index">
<image class="img" :src="item.image" mode="aspectFill"></image>
<image class="img" :src="item.image" mode="widthFix"></image>
<view class="title">{{item.name}}</view>
<view class="desc">{{item.remark}}</view>
</view>

4
pages/user/my/center.vue
View File

@ -8,8 +8,8 @@
<view class="lf-flex lf-p-32 lf-row-between">
<view class="lf-row-between">
<view @click="clickAvatar">
<image :src="userInfo.avatar" mode="aspectFill" class="center-img" v-if="userInfo.avatar"></image>
<image src="/static/images/empty.png" mode="aspectFill" class="center-img" v-else></image>
<image :src="userInfo.avatar" mode="widthFix" class="center-img" v-if="userInfo.avatar"></image>
<image src="/static/images/empty.png" mode="widthFix" class="center-img" v-else></image>
</view>
<view class="lf-row-center" @click="clickMobile">
<view class="lf-color-white lf-font-36 lf-m-l-20">{{ userInfo.mobile_replace || '未登录，点此登录' }}</view>

4
pages/user/my/chatonline.vue
View File

@ -7,7 +7,7 @@
<view class="lf-row-center lf-m-b-30 lf-font-24 lf-color-777">2021-09-01 18:38:24</view>
<view class="self-main">
<view class="cu-avatar radius">
<image class="lf-w-100 lf-h-100 round-radius" src="https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png" mode="aspectFill" ></image>
<image class="lf-w-100 lf-h-100 round-radius" src="https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png" mode="widthFix" ></image>
</view>
<view class="main">
<view class="content shadow">
@ -26,7 +26,7 @@
</view>
</view>
<view class="cu-avatar radius">
<image class="lf-w-100 lf-h-100 round-radius" src="https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png" mode="aspectFill" ></image>
<image class="lf-w-100 lf-h-100 round-radius" src="https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png" mode="widthFix" ></image>
</view>
</view>
</view>

2
pages/user/my/collect.vue
View File

@ -6,7 +6,7 @@
</view>
<view v-if="title_current==0">
<view class="lf-p-30 lf-flex" v-for="(item,index) of tab_list[title_current].list" :key="index" @click="$url('/pages/shop/shopdetail?id='+ item.collectable.id)">
<image class="collect-img" :src="item.collectable.logo" mode="aspectFill"></image>
<image class="collect-img" :src="item.collectable.logo" mode="widthFix"></image>
<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">{{item.collectable.name}}</view>
<view class="lf-font-24 lf-color-777">{{item.collectable.category}}｜{{item.collectable.goods_count}}件在售</view>

13
pages/user/my/my.vue
View File

@ -5,7 +5,7 @@
<view class="lf-row-between lf-w-100">
<view class="lf-flex">
<view class="tag-father">
<image :src="discover_info.avatar" mode="aspectFill" class="head-img"></image>
<image :src="discover_info.avatar" mode="widthFix" class="head-img"></image>
<view class="head-tag">V</view>
</view>
<view class="lf-flex-column lf-m-l-20">
@ -22,7 +22,7 @@
</view>
<scroll-view :style="{height: autoHeight}" :scroll-y="true" :refresher-enabled="true" :refresher-triggered="isRefresher"
@scrolltolower="onScrolltolower" @refresherrefresh="onRefresherrefresh">
<view class="lf-m-32" v-for="(item,index) in discover_info.list.data" :key="index" @click="goDetails(item.id)">
<view class="lf-m-32" v-for="(item,index) in list" :key="index" @click="goDetails(item.id)">
<view class="lf-font-48 lf-color-black lf-font-bold">
{{item.create_time[0]}}
</view>
@ -50,7 +50,7 @@
</view>
<!-- 空数据的情况 -->
<view class="loading-more">
<text v-if="discover_info.list.data.length"
<text v-if="list.length"
:class="{'loading-more-text': loadingClass}">{{ loadingText }}</text>
<lf-nocontent src="/static/images/empty.png" v-else></lf-nocontent>
</view>
@ -73,6 +73,7 @@
isRefresher: false,
scrollH: 0,
nav_height: 0,
list: []
}
},
onLoad(e) {
@ -136,7 +137,7 @@
this.page = 1;
this.isPage = true;
this.loadingClass = true;
this.discover_info.list.data = [];
this.list = [];
this.loadingText = '正在加载中';
this.loginList(options);
},
@ -222,9 +223,9 @@
this.isRefresher = false;
}
if(this.page == 1) {
this.discover_info.list.data = res.data.data.list.data;
this.list = res.data.data.list.data;
}else {
this.discover_info.list.data.push(...res.data.data.list.data);
this.list.push(...res.data.data.list.data);
}
console.log('登录时的发现列表',this.discover_info);
} else {

2
pages/user/my/myregister.vue
View File

@ -5,7 +5,7 @@
<view class="bg-right"></view>
<view class="register-card">
<view class="lf-flex lf-p-l-40 register-content">
<image class="register-head" :src="activity_details.user.avatar" mode="aspectFill"></image>
<image class="register-head" :src="activity_details.user.avatar" mode="widthFix"></image>
<view class="lf-color-black lf-m-l-21 lf-font-32" v-if="activity_details.user.nick_name">
{{activity_details.user.nick_name}}
</view>

4
pages/user/my/setting.vue
View File

@ -19,8 +19,8 @@
</view>
<view class="lf-flex">
<view class="lf-row-center">
<image :src="userInfo.avatar" mode="aspectFill" class="set-img" v-if="userInfo.avatar"></image>
<image src="/static/images/empty.png" mode="aspectFill" class="set-img" v-else></image>
<image :src="userInfo.avatar" mode="widthFix" class="set-img" v-if="userInfo.avatar"></image>
<image src="/static/images/empty.png" mode="widthFix" class="set-img" v-else></image>
</view>
<text class="lf-iconfont icon-xiangyou lf-font-24 lf-m-l-10 lf-color-777"></text>
</view>

6
pages/user/register/register.vue
View File

@ -1,8 +1,8 @@
<template>
<view>
<lf-nav title="登录/注册" :showIcon="true" bgColor="#fff"></lf-nav>
<view class="illustration">
<image class="img" src="/static/images/empty.png" mode="aspectFill"></image>
<view style="display: flex;justify-content: center;align-items: center;margin-top: 300rpx;">
<image class="img" src="/static/images/login.png" mode="widthFix"></image>
</view>
<view class="fixed-btn">
<button class="btn1" hover-class="lf-opacity" @click="toPhoneLogin">手机号登录</button>
@ -300,7 +300,7 @@
height: max-content;
position: fixed;
left: calc(50% - 315rpx);
top: calc(46% + 375rpx);
top: calc(40% + 375rpx);
display: flex;
justify-content: space-between;
.btn1, .btn2{

BIN
static/images/login.png
View File

Side by Side

After

Width: 714  |  Height: 550  |  Size: 17 KiB

Write Preview
Loading…
Cancel
Save