Browse Source

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

# Conflicts:
#	common/js/config.js
master
邓平艺 4 years ago
parent
commit
26f72e559c
  1. 2
      common/js/config.js
  2. 2
      components/lf-shopGoodsCard/lf-shopGoodsCard.vue
  3. 4
      pages/discover/discover.vue
  4. 18
      pages/discover/discoverdetails.vue
  5. 2
      pages/discover/publish.vue
  6. 39
      pages/index/index/index.vue
  7. 10
      pages/order/confirm/confirm.vue
  8. 3
      pages/order/index/onlineorder.vue
  9. 123
      pages/order/newdetail/newdetail.vue
  10. 2
      pages/point/exchangeRecord/exchangeRecord.vue
  11. 4
      pages/shop/shopdetail.vue
  12. 2
      pages/shop/specialList.vue

2
common/js/config.js

@ -16,7 +16,7 @@ export default {
//https://demo-guojiang-ec-api.guojiang.club/
baseUrl: process.env.NODE_ENV === 'development' ?
'http://192.168.3.81/' : 'https://v3-ec-admin-dev.guojiang.club/', // 运行时自动替换变量
'https://jincheng.lubanhudong.com/' : 'https://v3-ec-admin-dev.guojiang.club/', // 运行时自动替换变量
},
PACKAGES: {
activity: false,

2
components/lf-shopGoodsCard/lf-shopGoodsCard.vue

@ -1,6 +1,6 @@
<template>
<view class="content">
<view class="shop" @click="$url('/pages/shop/specialList')">
<view class="shop" @click="$url(main[0].link)">
<image class="img" :src="main[0] && main[0].image" mode="aspectFill"></image>
</view>
<scroll-view class="scroll-view" :scroll-x="true">

4
pages/discover/discover.vue

@ -12,11 +12,13 @@
<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" mode="aspectFill" class="head-img"></image>
<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>
<view class="head-tag">V</view>
</view>
<view class="lf-flex-column lf-m-l-20">
<view class="lf-font-32 lf-color-black lf-font-bold" v-if="item.user.nick_name">{{item.user.nick_name}}</view>
<view class="lf-font-32 lf-color-black lf-font-bold" v-else>{{item.user.mobile_replace}}</view>
<view class="lf-font-24 lf-color-777 lf-m-t-15">{{item.created_at}}</view>
</view>
</view>

18
pages/discover/discoverdetails.vue

@ -9,7 +9,8 @@
</view>
<view class="lf-flex-column lf-m-l-20">
<view>
<text class="lf-font-32 lf-color-black lf-font-bold lf-m-r-15">{{discover_details.user.nick_name}}</text>
<text class="lf-font-32 lf-color-black lf-font-bold lf-m-r-15" v-if="discover_details.user.nick_name">{{discover_details.user.nick_name}}</text>
<text class="lf-font-32 lf-color-black lf-font-bold lf-m-r-15" v-else>{{discover_details.user.mobile_replace}}</text>
<text class="lf-iconfont icon-xiangyou lf-color-777 lf-text-vertical" style="font-size: 18rpx;"></text>
</view>
<view class="lf-font-24 lf-color-777 lf-m-t-15">{{discover_details.updated_at}}</view>
@ -46,10 +47,12 @@
<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" mode="aspectFill"></image>
<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>
</view>
<view class="lf-flex-column lf-m-l-20">
<view class="lf-color-999 lf-font-24">{{commentitem.user.nick_name}}</view>
<view class="lf-color-999 lf-font-24" v-if="commentitem.user.nick_name">{{commentitem.user.nick_name}}</view>
<view class="lf-color-999 lf-font-24" v-else>{{commentitem.user.mobile_replace}}</view>
<view>
<view class="lf-color-black lf-line-2" style="max-width:550rpx;">{{commentitem.content}}<text class="lf-color-999 lf-font-24 lf-m-l-10">{{commentitem.created_at}}</text></view>
</view>
@ -67,14 +70,17 @@
<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" mode="aspectFill"></image>
<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>
</view>
<view class="lf-flex-column lf-m-l-20">
<view class="lf-flex">
<view class="lf-color-999 lf-font-24 lf-m-r-10">{{subitem.user.nick_name}}</view>
<view class="lf-color-999 lf-font-24 lf-m-r-10" v-if="subitem.user.nick_name">{{subitem.user.nick_name}}</view>
<view class="lf-color-999 lf-font-24 lf-m-r-10" v-else>{{subitem.user.mobile_replace}}</view>
<view class="lf-row-center" style="max-width: 446rpx;">
<text class="lf-color-333 lf-m-r-10">回复</text>
<text class="lf-font-24 lf-color-999">{{subitem.to_user.nick_name}}:</text>
<text class="lf-font-24 lf-color-999" v-if="subitem.to_user.nick_name">{{subitem.to_user.nick_name}}:</text>
<text class="lf-font-24 lf-color-999" v-else>{{subitem.to_user.mobile_replace}}:</text>
</view>
</view>
<view style="max-width: 460rpx;">

2
pages/discover/publish.vue

@ -99,7 +99,7 @@
header: {
Authorization: this.$cookieStorage.get('user_token')
},
url: 'http://192.168.3.29/api/discover/upload_image',
url: this.$config.GLOBAL.baseUrl+'api/discover/upload_image',
filePath: img,
fileType: 'image',
name: 'image',

39
pages/index/index/index.vue

@ -26,7 +26,7 @@
<indexNav :nav-data="item.value" :meta="item.meta"></indexNav>
</view>
<!-- 今日头条 -->
<view class="fuwu-tips" v-if="item.name == 'micro_page_componet_tips'">
<view class="fuwu-tips" v-if="item.name == 'micro_page_componet_article_-' || item.name == 'micro_page_componet_article_|'">
<view class="fuwu-tips-title">今日头条</view>
<view>
<text class="fuwu-tips-desc1">{{ item.title }}</text>
@ -56,14 +56,15 @@
</view>
<!-- 店铺商品展示模块 -->
<view v-if="item.name == 'micro_page_componet_brand_recommended' && item.value && item.value.length">
<view class="lf-module-title" v-if="item.is_show_title" @click="$url('/pages/shop/goodsSpecial')">{{ item.title }}</view>
<!-- @click="$url('/pages/shop/goodsSpecial')" -->
<view class="lf-module-title" v-if="item.is_show_title">{{ item.title }}</view>
<lf-shop-goods-card :list="item.value" :main="item.main"></lf-shop-goods-card>
</view>
<!-- 为你推荐模块 -->
<view v-if="item.name == 'micro_page_componet_recommended' && item.value && item.value.length">
<view class="lf-module-title" v-if="item.is_show_title">{{ item.title }}</view>
<view style="padding: 0 11px;">
<lf-waterfall :list="transformList(item.value)"></lf-waterfall>
<lf-waterfall :ifsale="false" :list="transformList(item.value)"></lf-waterfall>
</view>
</view>
</view>
@ -316,7 +317,7 @@
<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">{{car_num}}</view>
</view>
</view>
<!-- ad广告弹出组件 TODO 暂时先注释 -->
@ -384,6 +385,7 @@
show_ad: false, // ad广
ad_modal_list: [], // ad广
nav_bg_color: 'rgba(255,255,255,0)' ,//
car_num: 0
};
},
//
@ -422,13 +424,13 @@
},
onShow(e) {
this.isLogin=!!this.$cookieStorage.get('user_token')
let toekn = this.$cookieStorage.get('user_token');
if (toekn) {
this.getUserInfo();
this.getcarNum()
}
@ -544,6 +546,33 @@
changeAbout() {
this.is_show_about = false;
},
getcarNum() {
this.$http
.get({
api: 'api/shopping/cart/count',
header: {
Authorization: this.$cookieStorage.get('user_token')
},
})
.then(res => {
if (res.data.code == 200) {
this.car_num = res.data.data;
} else {
wx.showModal({
content: '请下拉页面刷新重试',
showCancel: false
});
}
})
.catch(() => {
wx.stopPullDownRefresh();
wx.hideLoading();
wx.showModal({
content: '请求失败',
showCancel: false
});
});
},
//
queryMicroData() {
this.$http

10
pages/order/confirm/confirm.vue

@ -14,6 +14,7 @@
<text class="lf-font-28 lf-color-primary lf-m-r-10">更换收获地址</text>
<text class="lf-iconfont icon-xiangyou lf-font-24 lf-color-777"></text>
</view>
<view v-if="address">
<view class="lf-m-t-20">
<text class="lf-font-28 lf-color-222 lf-font-bold">{{ address.accept_name }}</text>
<text class="lf-font-28 lf-color-777 lf-m-l-20">{{ address.mobile }}</text>
@ -22,6 +23,10 @@
<text>{{ address.address_name }}{{ address.address }}</text>
</view>
</view>
<view v-else class="lf-font-28 lf-color-777">
暂无收货地址,请前往添加
</view>
</view>
<view class="card goods">
<view @click="$url('/pages/shop/shopdetail?id='+ order_detail.order.brand.id)">
<text class="lf-iconfont icon-Group- lf-font-30"></text>
@ -223,6 +228,11 @@
},
//
confirm(){
console.log(this.address)
if(this.address == null) {
this.$msg('请先添加收货地址!');
return
}
this.$http.post({
api: 'api/shopping/order/confirm',
data: {

3
pages/order/index/onlineorder.vue

@ -188,8 +188,7 @@
data:{
page:this.page
},
header: {
Authorization: `Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjVkYTY5YjM5NWFhYzM5NzVmMzI3ZTEwZDEyMzAzZjI5MzE4ZmU2OGE2Njg0MTU0MWVjMjQ2NWM4ZWJkYjRlMTUwMmY1NWM0NDlkOTcxZDdjIn0.eyJhdWQiOiIzIiwianRpIjoiNWRhNjliMzk1YWFjMzk3NWYzMjdlMTBkMTIzMDNmMjkzMThmZTY4YTY2ODQxNTQxZWMyNDY1YzhlYmRiNGUxNTAyZjU1YzQ0OWQ5NzFkN2MiLCJpYXQiOjE2MzIzODY3NDAsIm5iZiI6MTYzMjM4Njc0MCwiZXhwIjoxNjYzOTIyNzQwLCJzdWIiOiIxIiwic2NvcGVzIjpbXX0.am-szF_sZcjtyOnEJT1DHMnr1hjAZ90MJc1Pc3AD3FrcQU5xb-u43ddL70ZmM3OxxLTZlmrB8OA3XJYREMtcz26MzwOMfopB9A5AH1EjHiFCV_368cq4ZpXNFi_Sn_LrY9Wje0-WMvkznF8tbrdCNrZn5YyIV47cwEnUNQrrREX4OhcgrSfNvwnh8_O_fueBwws9yY3tTlvVB7-AvG2urFI5XCzygsE3llE0wxF5ZJO1T5QRYLDse2BQ3d9feFzO5_7FiVspKr8DrJUlZP-Zz02UgIDIA_PX0UO2M0KeBwqPYq2d5uEnXT8or7K9coSnHRqbbr4qn6iczxDu4ofM58oCcaPycbtI3RvP2SMZuWmX8fXw-T99XltK_uJEU_wlIkrjvabzyo3tkrxRrwmzJEb3Yf4Lbah_xtfi24Nsu9SRjdw8YoiF6YhuuU5YaOn-wLltgmugfYpkFpEOneVAxoMjkm5IxZAJYMXF-DeSpdOoiTmuIRZYX4GDa55s_31r0YMyF6IIQNUvOjHHk-sJSHG0kPd5QivLP7dxE5XndwyFKAOeM97X2TjdYMhJz0EBCyS4Y_pI6AFWsxJkKsa0aqvBAeJyOV9k8kbYwtPeeBhBNsDWSlGBEZYMcoAv-C-IBZzd7gu2Ceh_MJPItrnsvj8W43Cv1TwxD26bJyt9EUY`
header: { Authorization: this.$cookieStorage.get('user_token')
},
})
.then(res => {

123
pages/order/newdetail/newdetail.vue

@ -1,12 +1,13 @@
<template>
<view>
<view v-if="$isRight(order_details)">
<lf-nav title="订单详情" :showIcon="true"></lf-nav>
<view class="tips" v-if="type == 'default'">
<!-- v-if="order_details.last_pay_time" -->
<view class="tips" v-if="show">
<view class="lf-font-24 lf-color-white">剩余支付时间</view>
<view>
<view class="lf-font-24 lf-color-white">
<!-- {{time}} -->
<countdown-timer :time="time" :autoStart="true" @finish="dateFinish">
<template v-slot="{minute, second}">
<!-- <view>{{minute}}:{{second}}</view> -->
<view class="lf-flex">
<view class="lf-font-24 lf-color-white">{{ minute >= 10 ? minute : "0" + minute }}</view>
<view class="lf-font-24 lf-color-white">:</view>
@ -87,7 +88,8 @@
<text class="lf-color-777">商品订单编号</text>
<text>
<text class="lf-color-222">{{order_details.order_no}}</text>
<text class="lf-font-28 lf-m-l-20" style="color: #22A19F;" @click="copy(order_details.order_no)">复制</text>
<text class="lf-font-28 lf-m-l-20" style="color: #22A19F;"
@click="copy(order_details.order_no)">复制</text>
</text>
</view>
<view class="lf-row-between lf-font-28 lf-m-t-30">
@ -173,21 +175,24 @@
<script>
import countdownTimer from '@/components/countdown-timer/countdown-timer';
export default {
data(){
data() {
return {
type: 'default' ,// point, default
time: new Date('2021/09/8 14:15:00').getTime() - new Date('2021/09/8 14:10:00').getTime(),
type: 'default', // point, default
time: '',
order_no: '',
order_details: ''
order_details: '',
countdown_minute: '',
time: '',
show: false
}
},
components: {
countdownTimer
},
onLoad(options){
onLoad(options) {
this.type = options.type || this.type;
this.order_no = options.order_id;
if(this.order_no) {
if (this.order_no) {
this.getOrderDetails();
}
},
@ -198,17 +203,76 @@
data: text
});
},
dateFinish(){
dateFinish() {
this.show = false;
console.log("倒计时结束");
},
countDown(munite, second) {
let m = munite;
let s = second;
let m2, s2;
let _this = this;
let tiem = setInterval(function() {
s--;
if (s < 0) {
s = 59;
m--;
if (m < 0) {
_this.time = '00分00秒';
_this.show = false;
// _this.getOrderDetails();
clearTimeout(tiem);
return;
}
}
m2 = m < 10? '0' + m : m;
s2 = s < 10 ? ('0' + s) : s;
_this.time = m2 + '分' + s2 + '秒';
}, 1000)
},
s_to_hs(s) {
//
//60
var h;
h = Math.floor(s / 60);
//
//%60
s = s % 60;
//
h += '';
s += '';
//0
// h = (h.length == 1) ? '0' + h : h;
// s = (s.length == 1) ? '0' + s : s;
this.countDown(h,s)
// return h + ':' + s;
},
getTime(){
var date = new Date(),
year = date.getFullYear(),
month = date.getMonth() + 1,
day = date.getDate(),
hour = date.getHours() < 10 ? "0" + date.getHours() : date.getHours(),
minute = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes(),
second = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
month >= 1 && month <= 9 ? (month = "0" + month) : "";
day >= 0 && day <= 9 ? (day = "0" + day) : "";
var timer = year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second;
return timer;
},
getOrderDetails() {
this.$http.get({
api: 'api/order/'+this.order_no,
api: 'api/order/' + this.order_no,
header: {
Authorization: `Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjVkYTY5YjM5NWFhYzM5NzVmMzI3ZTEwZDEyMzAzZjI5MzE4ZmU2OGE2Njg0MTU0MWVjMjQ2NWM4ZWJkYjRlMTUwMmY1NWM0NDlkOTcxZDdjIn0.eyJhdWQiOiIzIiwianRpIjoiNWRhNjliMzk1YWFjMzk3NWYzMjdlMTBkMTIzMDNmMjkzMThmZTY4YTY2ODQxNTQxZWMyNDY1YzhlYmRiNGUxNTAyZjU1YzQ0OWQ5NzFkN2MiLCJpYXQiOjE2MzIzODY3NDAsIm5iZiI6MTYzMjM4Njc0MCwiZXhwIjoxNjYzOTIyNzQwLCJzdWIiOiIxIiwic2NvcGVzIjpbXX0.am-szF_sZcjtyOnEJT1DHMnr1hjAZ90MJc1Pc3AD3FrcQU5xb-u43ddL70ZmM3OxxLTZlmrB8OA3XJYREMtcz26MzwOMfopB9A5AH1EjHiFCV_368cq4ZpXNFi_Sn_LrY9Wje0-WMvkznF8tbrdCNrZn5YyIV47cwEnUNQrrREX4OhcgrSfNvwnh8_O_fueBwws9yY3tTlvVB7-AvG2urFI5XCzygsE3llE0wxF5ZJO1T5QRYLDse2BQ3d9feFzO5_7FiVspKr8DrJUlZP-Zz02UgIDIA_PX0UO2M0KeBwqPYq2d5uEnXT8or7K9coSnHRqbbr4qn6iczxDu4ofM58oCcaPycbtI3RvP2SMZuWmX8fXw-T99XltK_uJEU_wlIkrjvabzyo3tkrxRrwmzJEb3Yf4Lbah_xtfi24Nsu9SRjdw8YoiF6YhuuU5YaOn-wLltgmugfYpkFpEOneVAxoMjkm5IxZAJYMXF-DeSpdOoiTmuIRZYX4GDa55s_31r0YMyF6IIQNUvOjHHk-sJSHG0kPd5QivLP7dxE5XndwyFKAOeM97X2TjdYMhJz0EBCyS4Y_pI6AFWsxJkKsa0aqvBAeJyOV9k8kbYwtPeeBhBNsDWSlGBEZYMcoAv-C-IBZzd7gu2Ceh_MJPItrnsvj8W43Cv1TwxD26bJyt9EUY`
Authorization: this.$cookieStorage.get('user_token')
}
}).then(res => {
this.order_details = res.data.data
var date = this.getTime()
this.time = new Date(this.order_details.will_closed_at).getTime() - new Date(date).getTime()
if(this.time > 0) {
this.show = true;
}
console.log(this.order_details);
})
},
@ -217,7 +281,7 @@
</script>
<style>
page{
page {
background-color: #F8F8F8;
}
</style>
@ -231,6 +295,7 @@
padding: 0 32rpx;
align-items: center;
}
.waitconfirm-tag {
width: 136rpx;
height: 53rpx;
@ -242,6 +307,7 @@
justify-content: center;
align-items: center;
}
.btn-cancel {
width: 220rpx;
height: 90rpx;
@ -253,6 +319,7 @@
justify-content: center;
align-items: center;
}
.btn-confirm {
width: 220rpx;
height: 90rpx;
@ -264,6 +331,7 @@
justify-content: center;
align-items: center;
}
.btn-atonce {
width: 220rpx;
height: 90rpx;
@ -275,6 +343,7 @@
justify-content: center;
align-items: center;
}
.order-btn {
width: 100%;
height: 120rpx;
@ -285,6 +354,7 @@
position: fixed;
bottom: 0;
}
.tips {
display: flex;
background-color: #F63434;
@ -293,42 +363,49 @@
justify-content: center;
align-items: center;
}
.card{
.card {
height: max-content;
width: 750rpx;
padding: 30rpx 32rpx;
background-color: #FFFFFF;
&:nth-child(n+2){
&:nth-child(n+2) {
margin-top: 20rpx;
}
}
.goods{
.shop-name{
.goods {
.shop-name {
font-size: 28rpx;
color: #222222;
font-weight: bold;
margin: 0 15rpx;
}
.goods-img{
.goods-img {
width: 130rpx;
height: 130rpx;
border-radius: 4rpx;
margin-right: 15rpx;
background-color: #EEEEEE;
}
.info{
.info {
width: 540rpx;
height: 130rpx;
display: flex;
flex-direction: column;
justify-content: space-around;
.price{
.price {
font-size: 32rpx;
color: #F63434;
font-weight: bold;
}
}
.order-num{
.order-num {
font-size: 24rpx;
color: #999999;
display: flex;

2
pages/point/exchangeRecord/exchangeRecord.vue

@ -95,7 +95,7 @@
this.$http.get({
api: 'api/order/point/list',
header: {
Authorization: `Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjVkYTY5YjM5NWFhYzM5NzVmMzI3ZTEwZDEyMzAzZjI5MzE4ZmU2OGE2Njg0MTU0MWVjMjQ2NWM4ZWJkYjRlMTUwMmY1NWM0NDlkOTcxZDdjIn0.eyJhdWQiOiIzIiwianRpIjoiNWRhNjliMzk1YWFjMzk3NWYzMjdlMTBkMTIzMDNmMjkzMThmZTY4YTY2ODQxNTQxZWMyNDY1YzhlYmRiNGUxNTAyZjU1YzQ0OWQ5NzFkN2MiLCJpYXQiOjE2MzIzODY3NDAsIm5iZiI6MTYzMjM4Njc0MCwiZXhwIjoxNjYzOTIyNzQwLCJzdWIiOiIxIiwic2NvcGVzIjpbXX0.am-szF_sZcjtyOnEJT1DHMnr1hjAZ90MJc1Pc3AD3FrcQU5xb-u43ddL70ZmM3OxxLTZlmrB8OA3XJYREMtcz26MzwOMfopB9A5AH1EjHiFCV_368cq4ZpXNFi_Sn_LrY9Wje0-WMvkznF8tbrdCNrZn5YyIV47cwEnUNQrrREX4OhcgrSfNvwnh8_O_fueBwws9yY3tTlvVB7-AvG2urFI5XCzygsE3llE0wxF5ZJO1T5QRYLDse2BQ3d9feFzO5_7FiVspKr8DrJUlZP-Zz02UgIDIA_PX0UO2M0KeBwqPYq2d5uEnXT8or7K9coSnHRqbbr4qn6iczxDu4ofM58oCcaPycbtI3RvP2SMZuWmX8fXw-T99XltK_uJEU_wlIkrjvabzyo3tkrxRrwmzJEb3Yf4Lbah_xtfi24Nsu9SRjdw8YoiF6YhuuU5YaOn-wLltgmugfYpkFpEOneVAxoMjkm5IxZAJYMXF-DeSpdOoiTmuIRZYX4GDa55s_31r0YMyF6IIQNUvOjHHk-sJSHG0kPd5QivLP7dxE5XndwyFKAOeM97X2TjdYMhJz0EBCyS4Y_pI6AFWsxJkKsa0aqvBAeJyOV9k8kbYwtPeeBhBNsDWSlGBEZYMcoAv-C-IBZzd7gu2Ceh_MJPItrnsvj8W43Cv1TwxD26bJyt9EUY`
Authorization: this.$cookieStorage.get('user_token')
},
data: {
page: this.page

4
pages/shop/shopdetail.vue

@ -2,7 +2,7 @@
<view>
<lf-nav :spreadOut="false" :showIcon="true" bgColor="transparent!important"></lf-nav>
<view class="shop-head">
<image class="lf-w-100 lf-h-100" :src="detail.logo" mode="aspectFill"></image>
<image class="lf-w-100 lf-h-100" :src="detail.images[0].path" mode="aspectFill"></image>
</view>
<view class="shop-title">
<view class="shop-flex">
@ -86,7 +86,7 @@
<swiper-item v-for="(tabItem, tabIndex) in tab_list" :key="tabIndex">
<scroll-view class="com" :scroll-y="true" :refresher-enabled="true" :refresher-triggered="tabItem.isRefresher" @scrolltolower="onScrolltolower" @refresherrefresh="onRefresherrefresh">
<view class="lf-m-t-20"></view>
<lf-waterfall :list="tabItem.list" :listlength="tab_list.length" :tabindex='tabIndex' ref="uWaterfallFather"></lf-waterfall>
<lf-waterfall :ifsale="false" :list="tabItem.list" :listlength="tab_list.length" :tabindex='tabIndex' ref="uWaterfallFather"></lf-waterfall>
<view class="loading-more lf-m-b-10">
<text :class="{'loading-more-text': tabItem.loadingClass}" v-if="tabItem.list.length">{{tabItem.loadingText}}</text>
<lf-nocontent v-else></lf-nocontent>

2
pages/shop/specialList.vue

@ -9,7 +9,7 @@
</view>
<view class="goods-list">
<!-- TODO 此处应为渲染多个lf-waterfall组件 -->
<lf-waterfall :list="list" ref="uWaterfallFather"></lf-waterfall>
<lf-waterfall :ifsale="false" :list="list" ref="uWaterfallFather"></lf-waterfall>
</view>
<u-back-top :scrollTop="pageScrollTop"></u-back-top>
</view>

Loading…
Cancel
Save