三个页面修改
This commit is contained in:
commit
b30dcdb78f
2
App.vue
2
App.vue
@ -77,6 +77,7 @@
|
||||
this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
|
||||
this.globalData.uid = this.$store.state.app.uid;
|
||||
|
||||
// #ifdef APP-PLUS
|
||||
//监听uni小程序发送的事件
|
||||
mp.onUniMPEventReceive(ret => {
|
||||
console.log('小程序事件: ', ret);
|
||||
@ -86,6 +87,7 @@
|
||||
});
|
||||
}
|
||||
});
|
||||
// #endif
|
||||
|
||||
let that = this;
|
||||
// #ifdef MP
|
||||
|
@ -101,7 +101,7 @@ export default {
|
||||
if(this.mark < this.allList.length){
|
||||
this.waterFall()
|
||||
}
|
||||
|
||||
console.log(this.rightList,this.leftList)
|
||||
}
|
||||
},
|
||||
immediate: true,
|
||||
|
@ -108,7 +108,6 @@ export default {
|
||||
deep:true
|
||||
},
|
||||
mounted(){
|
||||
|
||||
this.getUserInfo()
|
||||
},
|
||||
|
||||
|
@ -1,16 +1,14 @@
|
||||
<template>
|
||||
<view class="wf-item-page" @click="gogogo(item)">
|
||||
|
||||
|
||||
|
||||
<image :src="item.image[0]" mode="widthFix" class="item-img" />
|
||||
|
||||
<view class="goods_item_img" v-if="item.video_link.length>0">
|
||||
<image src="@/static/images/sp.png" mode="aspectFill"></image>
|
||||
<image src="@/static/images/sp.png" mode="aspectFit"></image>
|
||||
</view>
|
||||
<view class="title">{{item.title}}</view>
|
||||
<view class="item-info">
|
||||
<image :src="(item.author && item.author.avatar) || '/static/images/f.png'" mode="aspectFill"
|
||||
<image :src="(item.author && item.author.avatar) || '/static/images/f.png'" mode="aspectFit"
|
||||
class="info-avatar" />
|
||||
<view class="info-nickname">{{ item.author.nickname }}</view>
|
||||
</view>
|
||||
@ -41,7 +39,6 @@
|
||||
this.getUserInfo()
|
||||
},
|
||||
|
||||
|
||||
methods: {
|
||||
/**
|
||||
* 获取个人用户信息
|
||||
@ -62,7 +59,6 @@
|
||||
url: `/pages/short_video/appSwiper/index?id=${item.community_id}&uid=${this.user_id}&user=1`
|
||||
// #endif
|
||||
})
|
||||
|
||||
} else {
|
||||
uni.navigateTo({
|
||||
url: `/pages/plantGrass/plant_detail/index?id=${item.community_id}`
|
||||
|
@ -1529,7 +1529,6 @@
|
||||
"selectedColor": "#E93323",
|
||||
"borderStyle": "white",
|
||||
"backgroundColor": "#ffffff",
|
||||
"fontSize": "25rpx",
|
||||
"list": [{
|
||||
"pagePath": "pages/index/index",
|
||||
"iconPath": "static/tabbar_icon/a.png",
|
||||
@ -1564,13 +1563,11 @@
|
||||
}
|
||||
],
|
||||
"midButton": {
|
||||
"width": "78rpx",
|
||||
"height": "126rpx",
|
||||
"iconWidth": "78rpx",
|
||||
"width": "68px",
|
||||
"height": "70px",
|
||||
"iconWidth": "48px",
|
||||
"pagePath": "pages/plant_release/index",
|
||||
"iconPath": "static/tabbar_icon/d.png",
|
||||
// "selectedIconPath": "static/tabbar_icon/d-a.png",
|
||||
|
||||
"text": "发布"
|
||||
}
|
||||
|
||||
|
@ -77,7 +77,6 @@
|
||||
<view v-else class='list'>
|
||||
<WaterfallsFlow :wfList='productList' @itemTap="godDetail" :type="1" @goShop="goShop"/>
|
||||
</view>
|
||||
|
||||
<view class='noCommodity' v-if="productList.length==0 && where.page > 1">
|
||||
<view class='pictrue' style="margin: 60rpx auto;">
|
||||
<image src='/static/images/noCart.png'></image>
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,264 +1,270 @@
|
||||
<template>
|
||||
<view style="background-color: #F0F2F5;min-height: 100vh">
|
||||
<view style="height: var(--status-bar-height);"></view>
|
||||
<view class='productList' :style="viewColor">
|
||||
<!-- 顶部 -->
|
||||
<view class="top">
|
||||
<view style="height: 10px;">
|
||||
</view>
|
||||
<view class="head_tit">
|
||||
<view class="" style="display: flex;align-items: center;">
|
||||
<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
|
||||
<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
|
||||
</view>
|
||||
<view class="" style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
|
||||
{{titName}}
|
||||
</view>
|
||||
|
||||
|
||||
<view class="">
|
||||
|
||||
<view style="height: var(--status-bar-height);"></view>
|
||||
<view class='productList' :style="viewColor">
|
||||
<!-- 顶部 -->
|
||||
<view class="top">
|
||||
<view style="height: 10px;">
|
||||
</view>
|
||||
<view class="">
|
||||
|
||||
</view>
|
||||
<view style="position: relative;">
|
||||
<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
|
||||
v-model="sotreParam.keyword" class="serch_cls"></u-search>
|
||||
<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
|
||||
src="/static/images/GXSC/SS.png" width="115.65rpx" height="56.82rpx"></u--image>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
<view class="content">
|
||||
<view class="hot_serch">
|
||||
<!-- <text>热搜:</text> <text>热a搜商品</text> <text>热搜商品</text>
|
||||
<text>热搜sasas商品</text> -->
|
||||
</view>
|
||||
|
||||
<!-- <view class="menu_cls">
|
||||
<u-scroll-list>
|
||||
<view class="menu_li" @click="navGo(item.merchant_category_id)" v-for="item,index in menuList"
|
||||
:key="index">
|
||||
<u--image :showLoading="true" :src="imgList[index]" width="94.63rpx" height="99.63rpx"
|
||||
style="margin-bottom: 20rpx;"></u--image>
|
||||
<text style="display: block; width: 15vw;">{{item.category_name}}</text>
|
||||
</view>
|
||||
</u-scroll-list>
|
||||
</view> -->
|
||||
|
||||
<view class="goods_list">
|
||||
<view class="goods_card" @click="goStore(item.mer_id)" v-for="(item,index) in storeList"
|
||||
:key="index">
|
||||
<view class="left">
|
||||
<u--image :showLoading="true" :src="item.mer_avatar" width="157.71rpx"
|
||||
height="157.71rpx"></u--image>
|
||||
</view>
|
||||
<view class="right">
|
||||
<view class="li head" style="display: flex;">
|
||||
<text class="com_name">{{item.mer_name}}</text>
|
||||
<text
|
||||
style="font-weight: normal;font-size: 19.28rpx;color: red;padding:0 10rpx; border-radius: 10rpx; border: 1px solid red;">{{item.type_name}}</text>
|
||||
<view class="head_tit">
|
||||
<view class="" style="display: flex;align-items: center;">
|
||||
<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
|
||||
<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
|
||||
</view>
|
||||
<view class="li">
|
||||
<u--image v-for="item,index in [1,1,,1,1,1]" :key="index" :showLoading="true"
|
||||
src="/static/images/GXSC/PF.png" width="20.85rpx" height="19.85rpx"></u--image>
|
||||
<text style="margin-left: 20rpx;color: #FF6D20; ">5.0</text>
|
||||
<text>月销2000+</text>
|
||||
</view>
|
||||
<view class="li" style="align-items: center;">
|
||||
<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
|
||||
height="33.85rpx"></u--image>
|
||||
<text> {{item.service_phone}}</text>
|
||||
</view>
|
||||
<view class="li" style="align-items: center;">
|
||||
<u--image :showLoading="true" src="/static/images/GXSC/SJ.png" width="33.85rpx"
|
||||
height="33.85rpx"></u--image>
|
||||
<text>{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text>
|
||||
</view>
|
||||
<view class="li" style="align-items: center;">
|
||||
<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="33.85rpx"
|
||||
height="33.85rpx"></u--image>
|
||||
<text class="address">{{item.mer_address}}</text>
|
||||
<view class="" style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
|
||||
{{titName}}
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
<!-- 热搜 -->
|
||||
|
||||
|
||||
|
||||
<!-- <view class="nav-wrapper" :class="'styleType'+store_street_theme">
|
||||
<view class='nav acea-row row-middle' :class="'styleType'+store_street_theme">
|
||||
<view v-for="item in downMenus" :key="item.key" class='item'
|
||||
:class="{'font-colors':firstKey == item.key}" @click='set_where(item.key)'>
|
||||
<view class="">
|
||||
{{item.title}}
|
||||
|
||||
</view>
|
||||
<view class="line" :class="{'font-line':firstKey == item.key}">
|
||||
<view style="position: relative;">
|
||||
<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
|
||||
v-model="sotreParam.keyword" class="serch_cls"></u-search>
|
||||
<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
|
||||
src="/static/images/GXSC/SS.png" width="115.65rpx" height="56.82rpx"></u--image>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
<view class="content">
|
||||
<view class="hot_serch">
|
||||
<!-- <text>热搜:</text> <text>热a搜商品</text> <text>热搜商品</text>
|
||||
<text>热搜sasas商品</text> -->
|
||||
</view>
|
||||
|
||||
<!-- <view class="menu_cls">
|
||||
<u-scroll-list>
|
||||
<view class="menu_li" @click="navGo(item.merchant_category_id)" v-for="item,index in menuList"
|
||||
:key="index">
|
||||
<u--image :showLoading="true" :src="imgList[index]" width="94.63rpx" height="99.63rpx"
|
||||
style="margin-bottom: 20rpx;"></u--image>
|
||||
<text style="display: block; width: 15vw;">{{item.category_name}}</text>
|
||||
</view>
|
||||
</u-scroll-list>
|
||||
</view> -->
|
||||
|
||||
<view class="goods_list">
|
||||
<view class="goods_card" @click="goStore(item.mer_id)" v-for="(item,index) in storeList"
|
||||
:key="index">
|
||||
<view class="left">
|
||||
<u--image :showLoading="true" :src="item.mer_avatar" width="157.71rpx"
|
||||
height="157.71rpx"></u--image>
|
||||
</view>
|
||||
<view class="right">
|
||||
<view class="li head" style="display: flex;">
|
||||
<text class="com_name">{{item.mer_name}}</text>
|
||||
<text
|
||||
style="font-weight: normal;font-size: 19.28rpx;color: red;padding:0 10rpx; border-radius: 10rpx; border: 1px solid red;">{{item.type_name}}</text>
|
||||
</view>
|
||||
<view class="li">
|
||||
<u--image v-for="item,index in [1,1,,1,1,1]" :key="index" :showLoading="true"
|
||||
src="/static/images/GXSC/PF.png" width="20.85rpx" height="19.85rpx"></u--image>
|
||||
<text style="margin-left: 20rpx;color: #FF6D20; ">5.0</text>
|
||||
<text>月销2000+</text>
|
||||
</view>
|
||||
<view class="li" style="align-items: center;">
|
||||
<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
|
||||
height="33.85rpx"></u--image>
|
||||
<text> {{item.service_phone}}</text>
|
||||
</view>
|
||||
<view class="li" style="align-items: center;">
|
||||
<u--image :showLoading="true" src="/static/images/GXSC/SJ.png" width="33.85rpx"
|
||||
height="33.85rpx"></u--image>
|
||||
<text>{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text>
|
||||
</view>
|
||||
<view class="li" style="align-items: center;">
|
||||
<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="33.85rpx"
|
||||
height="33.85rpx"></u--image>
|
||||
<text class="address">{{item.mer_address}}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 热搜 -->
|
||||
|
||||
|
||||
|
||||
<!-- <view class="nav-wrapper" :class="'styleType'+store_street_theme">
|
||||
<view class='nav acea-row row-middle' :class="'styleType'+store_street_theme">
|
||||
<view v-for="item in downMenus" :key="item.key" class='item'
|
||||
:class="{'font-colors':firstKey == item.key}" @click='set_where(item.key)'>
|
||||
<view class="">
|
||||
{{item.title}}
|
||||
</view>
|
||||
<view class="line" :class="{'font-line':firstKey == item.key}">
|
||||
</view>
|
||||
</view>
|
||||
|
||||
-->
|
||||
</view>
|
||||
</view>
|
||||
|
||||
-->
|
||||
|
||||
<!-- 店铺 -->
|
||||
<!--
|
||||
<block>
|
||||
<view class="store-wrapper">
|
||||
<view class="store-item" v-for="(item,index) in storeList" :key="index">
|
||||
<view class="head">
|
||||
<view class="bgc_img" :style="{ backgroundImage: `url(${item.mini_banner})`}">
|
||||
</view>
|
||||
<view class="zhezhao">
|
||||
</view>
|
||||
<view class="zhezhao1" @click="goStore(item.mer_id)">
|
||||
<view class="title">
|
||||
<view>{{item.mer_name}}
|
||||
<!-- 店铺 -->
|
||||
<!--
|
||||
<block>
|
||||
<view class="store-wrapper">
|
||||
<view class="store-item" v-for="(item,index) in storeList" :key="index">
|
||||
<view class="head">
|
||||
<view class="bgc_img" :style="{ backgroundImage: `url(${item.mini_banner})`}">
|
||||
</view>
|
||||
<view class="zhezhao">
|
||||
</view>
|
||||
<view class="zhezhao1" @click="goStore(item.mer_id)">
|
||||
<view class="title">
|
||||
<view>{{item.mer_name}}
|
||||
</view>
|
||||
<span>
|
||||
{{item.type_name}}
|
||||
</span>
|
||||
</view>
|
||||
<view class="coent">
|
||||
<view class="avater">
|
||||
<image :src="item.mer_avatar" mode=""></image>
|
||||
</view>
|
||||
<view class=" text">
|
||||
<view class="text_one">
|
||||
<view class="">
|
||||
<image src="@/static/images/phone.png" mode=""></image>
|
||||
{{item.service_phone}}
|
||||
</view>
|
||||
<view class="text_one_r">
|
||||
<image src="@/static/images/clock.png" mode=""></image>
|
||||
{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="text_two">
|
||||
<image src="@/static/images/shangpu.png" mode=""></image>
|
||||
{{item.mer_info}}
|
||||
</view>
|
||||
<view class="text_three">
|
||||
<image src="@/static/images/dingwei.png" mode=""></image>
|
||||
{{item.mer_address}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<span>
|
||||
{{item.type_name}}
|
||||
</span>
|
||||
</view>
|
||||
<view class="coent">
|
||||
<view class="avater">
|
||||
<image :src="item.mer_avatar" mode=""></image>
|
||||
</view>
|
||||
<view class=" text">
|
||||
<view class="text_one">
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
<block v-if="store_street_theme == 2">
|
||||
<view class="mer-item2" v-for="(item,index) in storeList" :key='index'>
|
||||
<view class="mer-hd mer-shop-count" @click="goStore(item.mer_id)">
|
||||
<image class="mer-avatar" :src="item.mer_avatar"></image>
|
||||
<view class="mer-shop-right">
|
||||
<view class="mer-count">
|
||||
<view class="mer-top">
|
||||
<view class="txt line1">{{item.mer_name}}</view>
|
||||
<text v-if="item.type_name" class="font-bg-red ml8">{{item.type_name}}</text>
|
||||
<text v-else-if="item.is_trader" class="font-bg-red ml8">自营</text>
|
||||
</view>
|
||||
<view class="mer-btn">
|
||||
<view class="">
|
||||
<image src="@/static/images/phone.png" mode=""></image>
|
||||
{{item.service_phone}}
|
||||
{{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
|
||||
</view>
|
||||
<view class="text_one_r">
|
||||
<image src="@/static/images/clock.png" mode=""></image>
|
||||
{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}
|
||||
<view class="line" v-if="item.distance"></view>
|
||||
<view class="distance" v-if="item.distance" @click.stop="showStoreLocation(item)">
|
||||
<view class="">
|
||||
{{item.distance}}
|
||||
</view>
|
||||
<view class="iconfont icon-xiangyou"></view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="text_two">
|
||||
<image src="@/static/images/shangpu.png" mode=""></image>
|
||||
{{item.mer_info}}
|
||||
</view>
|
||||
<view class="text_three">
|
||||
<image src="@/static/images/dingwei.png" mode=""></image>
|
||||
{{item.mer_address}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="pro-box">
|
||||
<navigator :url="`/pages/goods_details/index?id=${itemn.product_id}`" hover-class="none"
|
||||
class="pro-item" v-for="(itemn,indexn) in item.recommend" :key='indexn'>
|
||||
<view class="picture">
|
||||
<easy-loadimage mode="widthFix" :image-src="itemn.image"></easy-loadimage>
|
||||
<view v-if="itemn.border_pic"
|
||||
:style="{ backgroundImage: `url(${itemn.border_pic})` }"
|
||||
class="border-picture"></view>
|
||||
</view>
|
||||
<view class="price">
|
||||
<text>¥</text>{{itemn.price}}
|
||||
</view>
|
||||
</navigator>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
<block v-if="store_street_theme == 2">
|
||||
<view class="mer-item2" v-for="(item,index) in storeList" :key='index'>
|
||||
<view class="mer-hd mer-shop-count" @click="goStore(item.mer_id)">
|
||||
<image class="mer-avatar" :src="item.mer_avatar"></image>
|
||||
<view class="mer-shop-right">
|
||||
<view class="mer-count">
|
||||
<view class="mer-top">
|
||||
<view class="txt line1">{{item.mer_name}}</view>
|
||||
<text v-if="item.type_name" class="font-bg-red ml8">{{item.type_name}}</text>
|
||||
<text v-else-if="item.is_trader" class="font-bg-red ml8">自营</text>
|
||||
</view>
|
||||
<view class="mer-btn">
|
||||
</block>
|
||||
<block v-if="store_street_theme == 3">
|
||||
<view class="mer-item mer-item3" v-for="(item,index) in storeList" :key='index'
|
||||
:style="'background-image:url('+item.mini_banner+')'">
|
||||
<view class="mer-hd" @click="goStore(item.mer_id)">
|
||||
<view class="mer-name">
|
||||
<image :src="item.mer_avatar"></image>
|
||||
<view class="">
|
||||
{{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
|
||||
</view>
|
||||
<view class="line" v-if="item.distance"></view>
|
||||
<view class="distance" v-if="item.distance" @click.stop="showStoreLocation(item)">
|
||||
<view class="">
|
||||
{{item.distance}}
|
||||
<view class="mer-top">
|
||||
<view class="txt line1">{{item.mer_name}}</view>
|
||||
<text v-if="item.type_name" class="font-bg-red ml8">{{item.type_name}}</text>
|
||||
<text v-else-if="item.is_trader" class="font-bg-red ml8">自营</text>
|
||||
</view>
|
||||
<view class="iconfont icon-xiangyou"></view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="pro-box">
|
||||
<navigator :url="`/pages/goods_details/index?id=${itemn.product_id}`" hover-class="none"
|
||||
class="pro-item" v-for="(itemn,indexn) in item.recommend" :key='indexn'>
|
||||
<view class="picture">
|
||||
<easy-loadimage mode="widthFix" :image-src="itemn.image"></easy-loadimage>
|
||||
<view v-if="itemn.border_pic"
|
||||
:style="{ backgroundImage: `url(${itemn.border_pic})` }"
|
||||
class="border-picture"></view>
|
||||
</view>
|
||||
<view class="price">
|
||||
<text>¥</text>{{itemn.price}}
|
||||
</view>
|
||||
</navigator>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
<block v-if="store_street_theme == 3">
|
||||
<view class="mer-item mer-item3" v-for="(item,index) in storeList" :key='index'
|
||||
:style="'background-image:url('+item.mini_banner+')'">
|
||||
<view class="mer-hd" @click="goStore(item.mer_id)">
|
||||
<view class="mer-name">
|
||||
<image :src="item.mer_avatar"></image>
|
||||
<view class="">
|
||||
<view class="mer-top">
|
||||
<view class="txt line1">{{item.mer_name}}</view>
|
||||
<text v-if="item.type_name" class="font-bg-red ml8">{{item.type_name}}</text>
|
||||
<text v-else-if="item.is_trader" class="font-bg-red ml8">自营</text>
|
||||
</view>
|
||||
<view class="mer-btn">
|
||||
<view class="">
|
||||
{{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
|
||||
</view>
|
||||
<view class="line" v-if="item.distance"></view>
|
||||
<view class="distance" v-if="item.distance" @click.stop="showStoreLocation(item)">
|
||||
<view class="">
|
||||
{{item.distance}}
|
||||
<view class="mer-btn">
|
||||
<view class="">
|
||||
{{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
|
||||
</view>
|
||||
<view class="line" v-if="item.distance"></view>
|
||||
<view class="distance" v-if="item.distance" @click.stop="showStoreLocation(item)">
|
||||
<view class="">
|
||||
{{item.distance}}
|
||||
</view>
|
||||
<view class="iconfont icon-xiangyou"></view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="pro-box" :class="'styleType'+store_street_theme">
|
||||
<view class="pro-item" v-for="(itemn,indexn) in item.recommend" :key='indexn' v-if="indexn<=2">
|
||||
<view @click="go_details(itemn.product_type,itemn.product_id)">
|
||||
<view class="picture">
|
||||
<image :src="itemn.image"></image>
|
||||
<view v-if="itemn.border_pic"
|
||||
:style="{ backgroundImage: `url(${itemn.border_pic})` }" class="border-picture">
|
||||
</view>
|
||||
</view>
|
||||
<view class="price">
|
||||
<text>¥</text>{{itemn.price}}
|
||||
</view>
|
||||
<view class="iconfont icon-xiangyou"></view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
<view class='loadingicon acea-row row-center-wrapper' v-if="loading">
|
||||
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
|
||||
</view>
|
||||
<view class="pro-box" :class="'styleType'+store_street_theme">
|
||||
<view class="pro-item" v-for="(itemn,indexn) in item.recommend" :key='indexn' v-if="indexn<=2">
|
||||
<view @click="go_details(itemn.product_type,itemn.product_id)">
|
||||
<view class="picture">
|
||||
<image :src="itemn.image"></image>
|
||||
<view v-if="itemn.border_pic"
|
||||
:style="{ backgroundImage: `url(${itemn.border_pic})` }" class="border-picture">
|
||||
</view>
|
||||
</view>
|
||||
<view class="price">
|
||||
<text>¥</text>{{itemn.price}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
<view class='loadingicon acea-row row-center-wrapper' v-if="loading">
|
||||
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
|
||||
</view>
|
||||
-->
|
||||
-->
|
||||
|
||||
|
||||
</view>
|
||||
<view class='no-shop' v-if="!storeList.length && !loading && !loadingIcon" v-cloak>
|
||||
<view class='pictrue' style="margin: 0 auto;background-color: #F0F2F5;">
|
||||
<image src='../../../static/images/noCart.png'></image>
|
||||
<text>暂无店铺,快去搜索其他店铺吧</text>
|
||||
</view>
|
||||
<view class='no-shop' v-if="!storeList.length && !loading && !loadingIcon" v-cloak>
|
||||
<view class='pictrue' style="margin: 0 auto;background-color: #F0F2F5;">
|
||||
<image src='../../../static/images/noCart.png'></image>
|
||||
<text>暂无店铺,快去搜索其他店铺吧</text>
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
<u-popup class="pop" :show="show" @close="close" mode="center" bgColor='transparent'>
|
||||
<image :src="image"></image>
|
||||
<image src="@/static/images/guanbi.png" class="guanbi" @click="close"></image>
|
||||
</u-popup>
|
||||
</view>
|
||||
</block>
|
||||
<u-popup class="pop" :show="show" @close="close" mode="center" bgColor='transparent'>
|
||||
<image :src="image"></image>
|
||||
<image src="@/static/images/guanbi.png" class="guanbi" @click="close"></image>
|
||||
</u-popup>
|
||||
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
@ -132,7 +132,8 @@
|
||||
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>客服电话:</view>
|
||||
<input class="com_input" type="number" v-model="servicePhone" placeholder="输入客服电话">
|
||||
</view>
|
||||
<view class="item_cell flex_a_c">
|
||||
|
||||
<view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" >
|
||||
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao" v-if="credit_buy"></i>开启先货后款:</view>
|
||||
<u-switch v-model="credit_buy" @change="change"></u-switch>
|
||||
</view>
|
||||
@ -154,6 +155,7 @@
|
||||
<text style="color: #CCCCCC;">开启后,店铺即可展示在移动端</text>
|
||||
</view> -->
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
<button class="submit_btn l_center" @click="postMerchantUpdata">提交审核</button>
|
||||
@ -265,7 +267,8 @@
|
||||
credit_buy: false, //开启信用购
|
||||
interest_rate: '', //利率
|
||||
settle_cycle: '', //周期
|
||||
mer_name:''
|
||||
mer_name:'',
|
||||
type_code:''
|
||||
}
|
||||
},
|
||||
onLoad(e) {
|
||||
@ -295,6 +298,7 @@
|
||||
res.data.mer_take_day.forEach((item, i) => {
|
||||
this.dateWeek[Number(item) - 1].isCheck = true
|
||||
})
|
||||
this.type_code= res.data.type_code
|
||||
this.mer_take_time = res.data.mer_take_time
|
||||
this.intro = res.data.mer_info
|
||||
this.cruxText = res.data.mer_keyword
|
||||
|
@ -319,8 +319,7 @@
|
||||
<view class="fixed-head">
|
||||
<view class="sys-head" :style="{height:statusBarHeight}"></view>
|
||||
<view class="tool-bar" @click='goBack()'>
|
||||
|
||||
<image class="icon-xiangzuo" src="@/static/image/icon-back.png"></image>
|
||||
<image class="icon-xiangzuo" src="../static/img/index/icon-back.png"></image>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -705,15 +704,15 @@
|
||||
// })'
|
||||
// that.isUser ?
|
||||
videoList({
|
||||
page: that.page,
|
||||
limit: that.limit,
|
||||
id:this.videoID
|
||||
|
||||
}).then(res=>{
|
||||
that.getVideoData(res.data.list);
|
||||
page: that.page,
|
||||
limit: that.limit,
|
||||
id: this.videoID
|
||||
|
||||
}).then(res => {
|
||||
that.getVideoData(res.data.list);
|
||||
})
|
||||
|
||||
|
||||
|
||||
|
||||
//:
|
||||
// graphicLstApi({
|
||||
// page: that.page,
|
||||
@ -746,7 +745,7 @@
|
||||
})
|
||||
},
|
||||
getVideoData(list) {
|
||||
|
||||
|
||||
if (list.length == 0) return
|
||||
let that = this;
|
||||
that.loadVideo = list.length == that.limit
|
||||
@ -757,7 +756,7 @@
|
||||
msg[i]['community_id'] = msg[i]['community_id'].toString()
|
||||
that.dataList.push(msg[i])
|
||||
}
|
||||
|
||||
|
||||
if (that.dataList.length !== 0) {
|
||||
that.dataList[that.k].state = 'play';
|
||||
setTimeout(function() {
|
||||
@ -883,8 +882,8 @@
|
||||
// 这个方法主要就是用来第一次进入视频播放时用来处理
|
||||
deoList(this.videoID).then(async (res) => {
|
||||
this.loadVideo = false
|
||||
this.userUid=res.data.uid
|
||||
this.page = this.page + 1;
|
||||
this.userUid = res.data.uid
|
||||
this.page = this.page + 1;
|
||||
var msg = [res.data];
|
||||
for (let i = 0; i < msg.length; i++) {
|
||||
msg[i]['isMore'] = false
|
||||
@ -895,7 +894,7 @@
|
||||
msg[i]['community_id'] = msg[i]['community_id'].toString()
|
||||
}
|
||||
this.dataList = msg;
|
||||
|
||||
|
||||
if (this.dataList.length !== 0) {
|
||||
this.dataList[this.k].state = 'play';
|
||||
uni.createVideoContext(this.dataList[this.k].community_id, this).play()
|
||||
@ -1239,6 +1238,7 @@
|
||||
left: 0;
|
||||
top: 70rpx;
|
||||
height: 86rpx;
|
||||
|
||||
|
||||
.icon-xiangzuo {
|
||||
margin-left: 10px;
|
||||
|
BIN
pages/short_video/components/index/icon-back.png
Normal file
BIN
pages/short_video/components/index/icon-back.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 421 B |
@ -775,8 +775,7 @@
|
||||
page: that.page,
|
||||
limit: that.limit,
|
||||
id: this.videoID
|
||||
// is_star: that.isSatrt,
|
||||
// community_id: that.videoID
|
||||
|
||||
}).then(res => {
|
||||
that.videoData(res.data.list)
|
||||
if (res.data.list.length < that.limit) {
|
||||
|
@ -88,7 +88,7 @@
|
||||
</view>
|
||||
<view class="list-con-right">
|
||||
<view class="con-right" style="margin-bottom: 20rpx"
|
||||
@tap="navgo('/pages/nongKe/food/index?type_code=TypeLocalCuisine')">
|
||||
@click="navgo('/pages/nongKe/food/index?type_code=TypeLocalCuisine')">
|
||||
<!-- <view class="list-con-title">
|
||||
<view class="con-titlea">
|
||||
当地美食
|
||||
@ -99,7 +99,8 @@
|
||||
</view> -->
|
||||
<image src="@/static/images/f7.png" mode="aspectFit"></image>
|
||||
</view>
|
||||
<view class="con-right" @tap="navgo('/pages/nongKe/tourism/index?type_code=TypeFeaturedCultural')">
|
||||
<view class="con-right"
|
||||
@click="navgo('/pages/nongKe/tourism/index?type_code=TypeFeaturedCultural')">
|
||||
<!-- <view class="list-con-title">
|
||||
<view class="con-titlea">
|
||||
特色文旅
|
||||
@ -255,6 +256,10 @@
|
||||
|
||||
this.list()
|
||||
},
|
||||
beforeDestroy() {
|
||||
// 销毁监听事件
|
||||
this.$bus.$off('value-updated')
|
||||
},
|
||||
mounted() {
|
||||
|
||||
// #ifdef H5
|
||||
@ -755,7 +760,7 @@
|
||||
.titlea-con {
|
||||
width: 96rpx;
|
||||
height: 100rpx;
|
||||
|
||||
|
||||
color: #f4f7fe;
|
||||
|
||||
.titlea {
|
||||
@ -768,7 +773,7 @@
|
||||
|
||||
.titleb {
|
||||
position: absolute;
|
||||
bottom:8rpx;
|
||||
bottom: 8rpx;
|
||||
font-size: 37rpx;
|
||||
font-family: PingFang SC-Semibold, PingFang SC;
|
||||
font-weight: 600;
|
||||
|
BIN
static/applet/GX_APP.png
Normal file
BIN
static/applet/GX_APP.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 7.3 KiB |
BIN
static/applet/SHOP_APP.png
Normal file
BIN
static/applet/SHOP_APP.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 7.1 KiB |
BIN
static/images/icon-back.png
Normal file
BIN
static/images/icon-back.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 884 B |
BIN
static/tabbar_icon/top.png
Normal file
BIN
static/tabbar_icon/top.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 4.9 KiB |
Loading…
x
Reference in New Issue
Block a user