Merge branch 'dev' into pre-release
This commit is contained in:
commit
a6c5bde685
46
App.vue
46
App.vue
@ -30,6 +30,7 @@
|
||||
data() {
|
||||
return {
|
||||
audioTeam: [],
|
||||
timer: null
|
||||
}
|
||||
},
|
||||
globalData: {
|
||||
@ -108,22 +109,6 @@
|
||||
// console.log("jpush连接", connectEnable)
|
||||
})
|
||||
|
||||
|
||||
// 设置别名
|
||||
// jpushModule.setAlias({
|
||||
// 'alias': uni.getStorageSync('userId'),
|
||||
// 'sequence': 1
|
||||
// })
|
||||
//
|
||||
// jpushModule.addTagAliasListener(result => {
|
||||
// let code = result.code
|
||||
// let sequence = result.sequence
|
||||
// let tags = result.tags
|
||||
// let tag = result.tag
|
||||
// let tagEnable = result.tagEnable
|
||||
// let alias = result.alias
|
||||
// console.log(alias, '别名')
|
||||
// })
|
||||
// 通知事件回调
|
||||
jpushModule.addNotificationListener(result => {
|
||||
let notificationEventType = result.notificationEventType
|
||||
@ -132,8 +117,6 @@
|
||||
let content = result.content
|
||||
let extras = result.extras
|
||||
|
||||
console.log("通知", result)
|
||||
|
||||
if (result.extras.type == 'ORDER_CREATE' && result.extras.mp3.length > 0) {
|
||||
if (result.extras.mp3[0] == '微信') this.audioTeam.push('/static/audio/wechat.MP3')
|
||||
if (result.extras.mp3[0] == '支付宝') this.audioTeam.push('/static/audio/pay.MP3')
|
||||
@ -287,37 +270,24 @@
|
||||
methods: {
|
||||
//网络检测
|
||||
checknetwork() {
|
||||
|
||||
uni.onNetworkStatusChange(function(res) {
|
||||
|
||||
if (res.isConnected) {
|
||||
|
||||
uni.reLaunch({
|
||||
url: '/pages/index/index'
|
||||
})
|
||||
|
||||
} else {
|
||||
|
||||
let that = this;
|
||||
uni.showModal({
|
||||
|
||||
title: '系统提示',
|
||||
|
||||
content: '当前设备无网络或网络较差',
|
||||
|
||||
cancelText: '取消',
|
||||
|
||||
confirmText: '确定',
|
||||
|
||||
success: (res) => {
|
||||
|
||||
if (res.confirm) {
|
||||
|
||||
that.timer = null;
|
||||
uni.reLaunch({
|
||||
|
||||
url: '/pages/index/index'
|
||||
|
||||
})
|
||||
|
||||
} else {
|
||||
|
||||
// #ifdef H5
|
||||
@ -325,25 +295,17 @@
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/login/login_copy'
|
||||
})
|
||||
|
||||
// #endif
|
||||
|
||||
// #ifdef APP-PLUS
|
||||
|
||||
that.timer = null;
|
||||
plus.runtime.quit()
|
||||
|
||||
// #endif
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
},
|
||||
/**
|
||||
* 语音播报
|
||||
|
||||
@ -9,6 +9,14 @@
|
||||
// +----------------------------------------------------------------------
|
||||
import request from "@/utils/request.js";
|
||||
|
||||
/**
|
||||
* 退款订单
|
||||
* @param numType
|
||||
*/
|
||||
export function refundListNew(data) {
|
||||
return request.get("refund/list", data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验支付密码是否正确
|
||||
* @param numType
|
||||
|
||||
13
api/store.js
13
api/store.js
@ -300,6 +300,19 @@ export function getStoreCategory(id, data) {
|
||||
noAuth: true
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 新获取商品分类
|
||||
* @param {Object} id 商铺 id
|
||||
* @param {Object} data
|
||||
*/
|
||||
export function getProductCategoryList(data) {
|
||||
return request.get("store/product/category/index", data, {
|
||||
noAuth: true
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 关注商铺
|
||||
* @param {Object} type_id 商铺 id
|
||||
|
||||
@ -1,9 +1,11 @@
|
||||
<template>
|
||||
<view :style="viewColor">
|
||||
<view class="product-window" :class="(attr.cartAttr === true ? 'on' : '') + ' ' + (iSbnt || destri?'join':'') + ' ' + (isPresell ?'presell-window':'product-window')">
|
||||
<view class="product-window"
|
||||
:class="(attr.cartAttr === true ? 'on' : '') + ' ' + (iSbnt || destri?'join':'') + ' ' + (isPresell ?'presell-window':'product-window')">
|
||||
<view class="textpic acea-row row-between-wrapper">
|
||||
<view class="pictrue">
|
||||
<image :src="(attr.productSelect&&attr.productSelect.image) ? attr.productSelect.image : ''" @click="loookImg"></image>
|
||||
<image :src="(attr.productSelect&&attr.productSelect.image) ? attr.productSelect.image : ''"
|
||||
@click="loookImg"></image>
|
||||
</view>
|
||||
<view class="text">
|
||||
<view class="line1">
|
||||
@ -13,7 +15,8 @@
|
||||
<view>
|
||||
预售价
|
||||
￥<text class="num">{{ attr.productSelect.price }}</text>
|
||||
<text v-if="presell_type === 2">定金￥<text class="num">{{ attr.productSelect.down_price }}</text></text>
|
||||
<text v-if="presell_type === 2">定金￥<text
|
||||
class="num">{{ attr.productSelect.down_price }}</text></text>
|
||||
</view>
|
||||
<text class="stock" v-if='isShow'>库存: {{ attr.productSelect.stock }}</text>
|
||||
<text class='stock' v-if="limitNum">限量: {{attr.productSelect.quota_show}}</text>
|
||||
@ -22,11 +25,12 @@
|
||||
<view class="acea-row row-middle">
|
||||
<view class="acea-row row-middle">
|
||||
<text>￥</text><text class="num">{{ attr.productSelect.price }}</text>
|
||||
<view v-if="attr.productSelect && attr.productSelect.svip_price" class="acea-row row-middle">
|
||||
<text class='vip-money'>￥{{attr.productSelect.svip_price}}</text>
|
||||
<view v-if="attr.productSelect && attr.productSelect.svip_price"
|
||||
class="acea-row row-middle">
|
||||
<!-- <text class='vip-money'>￥{{attr.productSelect.svip_price}}</text>
|
||||
<view class="vipImg">
|
||||
<image :src="`${domain}/static/images/svip.png`"></image>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -42,8 +46,8 @@
|
||||
<view class="item" v-for="(item, indexw) in attr.productAttr" :key="indexw">
|
||||
<view class="title">{{ item.attr_name }}</view>
|
||||
<view class="listn acea-row row-middle">
|
||||
<view class="itemn" :class="item.index === itemn.attr ? 'on' : ''" v-for="(itemn, indexn) in item.attr_value"
|
||||
@click="tapAttr(indexw, indexn)" :key="indexn">
|
||||
<view class="itemn" :class="item.index === itemn.attr ? 'on' : ''"
|
||||
v-for="(itemn, indexn) in item.attr_value" @click="tapAttr(indexw, indexn)" :key="indexn">
|
||||
{{ itemn.attr }}
|
||||
</view>
|
||||
</view>
|
||||
@ -67,8 +71,12 @@
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
import { mapGetters } from "vuex";
|
||||
import { HTTP_REQUEST_URL } from '@/config/app';
|
||||
import {
|
||||
mapGetters
|
||||
} from "vuex";
|
||||
import {
|
||||
HTTP_REQUEST_URL
|
||||
} from '@/config/app';
|
||||
export default {
|
||||
computed: mapGetters(['viewColor']),
|
||||
props: {
|
||||
@ -114,8 +122,7 @@
|
||||
domain: HTTP_REQUEST_URL,
|
||||
}
|
||||
},
|
||||
mounted(){
|
||||
},
|
||||
mounted() {},
|
||||
methods: {
|
||||
// 查看大图
|
||||
loookImg() {
|
||||
@ -172,72 +179,89 @@
|
||||
padding-bottom: calc(140rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
|
||||
transform: translate3d(0, 100%, 0);
|
||||
transition: all .3s cubic-bezier(.25, .5, .5, .9);
|
||||
|
||||
&.presell-window {
|
||||
padding-bottom: 200rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.product-window.on {
|
||||
transform: translate3d(0, 0, 0);
|
||||
}
|
||||
|
||||
.product-window.join {
|
||||
padding-bottom: 30rpx;
|
||||
}
|
||||
|
||||
.product-window .textpic {
|
||||
padding: 0 80rpx 0 30rpx;
|
||||
margin-top: 29rpx;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.product-window .textpic .pictrue {
|
||||
width: 150rpx;
|
||||
height: 150rpx;
|
||||
}
|
||||
|
||||
.product-window .textpic .pictrue image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
border-radius: 10rpx;
|
||||
}
|
||||
|
||||
.product-window .textpic .text {
|
||||
width: 460rpx;
|
||||
font-size: 32rpx;
|
||||
color: #202020;
|
||||
}
|
||||
|
||||
.product-window .textpic .text .money {
|
||||
font-size: 24rpx;
|
||||
margin-top: 40rpx;
|
||||
color: var(--view-priceColor);
|
||||
}
|
||||
|
||||
.product-window .textpic .text .money .num {
|
||||
font-size: 36rpx;
|
||||
}
|
||||
|
||||
.product-window .textpic .text .money .stock {
|
||||
color: #999;
|
||||
margin-left: 18rpx;
|
||||
}
|
||||
|
||||
.vip-money {
|
||||
color: #282828;
|
||||
font-size: 22rpx;
|
||||
margin-left: 6rpx;
|
||||
}
|
||||
|
||||
.vipImg {
|
||||
width: 65rpx;
|
||||
height: 28rpx;
|
||||
margin-left: 4rpx;
|
||||
|
||||
image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
|
||||
.product-window .textpic .text .presell_price {
|
||||
color: #FF7F00;
|
||||
|
||||
.num {
|
||||
display: inline-block;
|
||||
margin-right: 20rpx;
|
||||
}
|
||||
|
||||
.stock {
|
||||
margin-left: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.product-window .textpic .iconfont {
|
||||
position: absolute;
|
||||
right: 30rpx;
|
||||
@ -245,22 +269,27 @@
|
||||
font-size: 35rpx;
|
||||
color: #8a8a8a;
|
||||
}
|
||||
|
||||
.product-window .productWinList {
|
||||
max-height: 395rpx;
|
||||
overflow: auto;
|
||||
margin-top: 36rpx;
|
||||
}
|
||||
|
||||
.product-window .productWinList .item~.item {
|
||||
margin-top: 36rpx;
|
||||
}
|
||||
|
||||
.product-window .productWinList .item .title {
|
||||
font-size: 30rpx;
|
||||
color: #999;
|
||||
padding: 0 30rpx;
|
||||
}
|
||||
|
||||
.product-window .productWinList .item .listn {
|
||||
padding: 0 30rpx 0 16rpx;
|
||||
}
|
||||
|
||||
.product-window .productWinList .item .listn .itemn {
|
||||
border: 1px solid #bbb;
|
||||
font-size: 26rpx;
|
||||
@ -269,11 +298,13 @@
|
||||
border-radius: 6rpx;
|
||||
margin: 14rpx 0 0 14rpx;
|
||||
}
|
||||
|
||||
.product-window .productWinList .item .listn .itemn.on {
|
||||
color: #fff;
|
||||
background-color: var(--view-theme);
|
||||
border-color: var(--view-theme);
|
||||
}
|
||||
|
||||
.product-window .cart {
|
||||
margin-top: 36rpx;
|
||||
padding: 0 30rpx;
|
||||
@ -286,14 +317,17 @@
|
||||
-ms-flex-pack: justify;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.product-window .cart .title {
|
||||
font-size: 30rpx;
|
||||
color: #999;
|
||||
line-height: 54rpx;
|
||||
}
|
||||
|
||||
.product-window .cart .carnum {
|
||||
height: 54rpx;
|
||||
}
|
||||
|
||||
.product-window .cart .carnum view {
|
||||
border: 1px solid #a4a4a4;
|
||||
width: 84rpx;
|
||||
@ -303,28 +337,34 @@
|
||||
color: #a4a4a4;
|
||||
font-size: 45rpx;
|
||||
}
|
||||
|
||||
.product-window .cart .carnum .reduce {
|
||||
border-right: 0;
|
||||
border-radius: 6rpx 0 0 6rpx;
|
||||
line-height: 48rpx;
|
||||
}
|
||||
|
||||
.product-window .cart .carnum .reduce.on {
|
||||
border-color: #e3e3e3;
|
||||
color: #dedede;
|
||||
}
|
||||
|
||||
.product-window .cart .carnum .plus {
|
||||
border-left: 0;
|
||||
border-radius: 0 6rpx 6rpx 0;
|
||||
line-height: 46rpx;
|
||||
}
|
||||
|
||||
.product-window .cart .carnum .plus.on {
|
||||
border-color: #e3e3e3;
|
||||
color: #dedede;
|
||||
}
|
||||
|
||||
.product-window .cart .carnum .num {
|
||||
color: #282828;
|
||||
font-size: 28rpx;
|
||||
}
|
||||
|
||||
.product-window .joinBnt {
|
||||
font-size: 30rpx;
|
||||
width: 620rpx;
|
||||
@ -334,10 +374,12 @@
|
||||
line-height: 86rpx;
|
||||
color: #fff;
|
||||
margin: 100rpx auto 0 auto;
|
||||
|
||||
&.b-color {
|
||||
background-color: var(--view-theme);
|
||||
}
|
||||
}
|
||||
|
||||
.product-window .joinBnt.on {
|
||||
background-color: #bbb;
|
||||
color: #fff;
|
||||
|
||||
@ -3,12 +3,15 @@
|
||||
<view class="address-window" :class="address.address==true?'on':''">
|
||||
<view class='title'>选择地址<text class='iconfont icon-guanbi' @tap='close'></text></view>
|
||||
<scroll-view scroll-y="true" class='list'>
|
||||
<view class='item acea-row row-between-wrapper' :class='active==index?"t-color":""' v-for="(item,index) in addressList"
|
||||
@tap='tapAddress(index,item.address_id)' :key='index'>
|
||||
<view class='item acea-row row-between-wrapper' :class='active==index?"t-color":""'
|
||||
v-for="(item,index) in addressList" @tap='tapAddress(index,item.address_id)' :key='index'>
|
||||
<text class='iconfont icon-ditu' :class='active==index?"t-color":""'></text>
|
||||
<view class='address'>
|
||||
<view class='name' :class='active==index?"t-color":""'>{{item.real_name}}<text class='phone'>{{item.phone}}</text></view>
|
||||
<view class='line1'>{{item.province}}{{item.city}}{{item.district}}{{item.street || ''}}{{item.detail}}</view>
|
||||
<view class='name' :class='active==index?"t-color":""'>{{item.real_name}}<text
|
||||
class='phone'>{{item.phone}}</text></view>
|
||||
<view class='line1'>
|
||||
{{item.province}}{{item.city}}{{item.district}}{{item.street || ''}}{{item.detail}}
|
||||
</view>
|
||||
</view>
|
||||
<text class='iconfont icon-complete' :class='active==index?"t-color":""'></text>
|
||||
</view>
|
||||
@ -34,9 +37,15 @@
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
import { getAddressList } from '@/api/user.js';
|
||||
import { mapGetters } from "vuex";
|
||||
import { HTTP_REQUEST_URL } from '@/config/app';
|
||||
import {
|
||||
getAddressList
|
||||
} from '@/api/user.js';
|
||||
import {
|
||||
mapGetters
|
||||
} from "vuex";
|
||||
import {
|
||||
HTTP_REQUEST_URL
|
||||
} from '@/config/app';
|
||||
export default {
|
||||
props: {
|
||||
pagesUrl: {
|
||||
@ -87,7 +96,7 @@
|
||||
let that = this;
|
||||
getAddressList({
|
||||
page: 1,
|
||||
limit: 5
|
||||
limit: 100
|
||||
}).then(res => {
|
||||
let addressList = res.data.list;
|
||||
//处理默认选中项
|
||||
@ -114,9 +123,11 @@
|
||||
transform: translate3d(0, 100%, 0);
|
||||
transition: all .3s cubic-bezier(.25, .5, .5, .9);
|
||||
}
|
||||
|
||||
.address-window.on {
|
||||
transform: translate3d(0, 0, 0);
|
||||
}
|
||||
|
||||
.address-window .title {
|
||||
font-size: 32rpx;
|
||||
font-weight: bold;
|
||||
@ -125,15 +136,18 @@
|
||||
line-height: 123rpx;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.address-window .title .iconfont {
|
||||
position: absolute;
|
||||
right: 30rpx;
|
||||
color: #8a8a8a;
|
||||
font-size: 35rpx;
|
||||
}
|
||||
|
||||
.address-window .list {
|
||||
max-height: 650rpx;
|
||||
}
|
||||
|
||||
.address-window .list .item {
|
||||
margin-left: 30rpx;
|
||||
padding-right: 30rpx;
|
||||
@ -142,26 +156,32 @@
|
||||
font-size: 25rpx;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.address-window .list .item .iconfont {
|
||||
font-size: 37rpx;
|
||||
color: #2c2c2c;
|
||||
}
|
||||
|
||||
.address-window .list .item .iconfont.icon-complete {
|
||||
font-size: 30rpx;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.address-window .list .item .address {
|
||||
width: 560rpx;
|
||||
}
|
||||
|
||||
.address-window .list .item .address .name {
|
||||
font-size: 28rpx;
|
||||
font-weight: bold;
|
||||
color: #282828;
|
||||
margin-bottom: 4rpx;
|
||||
}
|
||||
|
||||
.address-window .list .item .address .name .phone {
|
||||
margin-left: 18rpx;
|
||||
}
|
||||
|
||||
.address-window .addressBnt {
|
||||
font-size: 30rpx;
|
||||
font-weight: bold;
|
||||
@ -174,16 +194,21 @@
|
||||
margin: 85rpx auto;
|
||||
background-color: var(--view-theme);
|
||||
}
|
||||
|
||||
.address-window .pictrue {
|
||||
text-align: center;
|
||||
}
|
||||
.address-window .pictrue image,.address-window .pictrue uni-image {
|
||||
|
||||
.address-window .pictrue image,
|
||||
.address-window .pictrue uni-image {
|
||||
width: 414rpx;
|
||||
height: 305rpx;
|
||||
}
|
||||
|
||||
.address-window .pictrue view {
|
||||
color: #999;
|
||||
}
|
||||
|
||||
.t-color {
|
||||
color: var(--view-theme) !important;
|
||||
}
|
||||
|
||||
@ -3,8 +3,7 @@
|
||||
<view v-if="newData.status && newData.status.status" style="height: 100rpx;"></view>
|
||||
<view class="foot" v-if="newData.status && newData.status.status">
|
||||
<view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}">
|
||||
<view class="foot-item" v-for="(item,index) in newData.menuList" :key="index"
|
||||
@click="goRouter(item)">
|
||||
<view class="foot-item" v-for="(item,index) in newData.menuList" :key="index" @click="goRouter(item)">
|
||||
<block v-if="item.link == activeRouter">
|
||||
<image :src="item.imgList[0]"></image>
|
||||
<view class="txt" :style="{color:newData.activeTxtColor.color[0].item}">{{item.name}}
|
||||
@ -65,7 +64,6 @@
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@ -85,9 +83,11 @@
|
||||
box-shadow: 0px 0px 17rpx 1rpx rgba(206, 206, 206, 0.32);
|
||||
padding-bottom: constant(safe-area-inset-bottom); ///兼容 IOS<11.2/
|
||||
padding-bottom: env(safe-area-inset-bottom); ///兼容 IOS>11.2/
|
||||
|
||||
&.filter {
|
||||
filter: blur(2rpx);
|
||||
}
|
||||
|
||||
.foot-item {
|
||||
display: flex;
|
||||
width: max-content;
|
||||
@ -95,6 +95,7 @@
|
||||
justify-content: center;
|
||||
flex-direction: column;
|
||||
position: relative;
|
||||
|
||||
.count-num {
|
||||
position: absolute;
|
||||
display: flex;
|
||||
@ -111,12 +112,14 @@
|
||||
padding: 4rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.foot-item image {
|
||||
height: 50rpx;
|
||||
width: 50rpx;
|
||||
text-align: center;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.foot-item .txt {
|
||||
font-size: 24rpx;
|
||||
}
|
||||
|
||||
@ -4,8 +4,10 @@
|
||||
:class="{'no-transition':!openTransition,'show-transition':showTransition&&openTransition}"
|
||||
@load="handleImgLoad" @error="handleImgError">
|
||||
</image>
|
||||
<view class="loadfail-img" v-else-if="isLoadError" :style="{ 'background-image': `url(${domain}/static/images/loadfail.png)`}"></view>
|
||||
<view :class="['loading-img','spin-circle',loadingMode]" v-show="!showImg&&!isLoadError" :style="{ 'background-image': `url(${domain}/static/images/loading.gif)`}"></view>
|
||||
<view class="loadfail-img" v-else-if="isLoadError"
|
||||
:style="{ 'background-image': `url(${domain}/static/easy-loadimage/loadfail.png)`}"></view>
|
||||
<view :class="['loading-img','spin-circle',loadingMode]" v-show="!showImg&&!isLoadError"
|
||||
:style="{ 'background-image': `url(${domain}/static/easy-loadimage/loading.gif)`}"></view>
|
||||
</view>
|
||||
</template>
|
||||
<script>
|
||||
@ -18,14 +20,19 @@
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
import { throttle } from '@/libs/uniApi';
|
||||
import { HTTP_REQUEST_URL } from '@/config/app';
|
||||
import {
|
||||
throttle
|
||||
} from '@/libs/uniApi';
|
||||
import {
|
||||
HTTP_REQUEST_URL
|
||||
} from '@/config/app';
|
||||
// 生成全局唯一id
|
||||
function generateUUID() {
|
||||
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
|
||||
let r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8);
|
||||
return v.toString(16);
|
||||
})
|
||||
function generateUUID() {
|
||||
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
|
||||
let r = Math.random() * 16 | 0,
|
||||
v = c == 'x' ? r : (r & 0x3 | 0x8);
|
||||
return v.toString(16);
|
||||
})
|
||||
}
|
||||
export default {
|
||||
props: {
|
||||
@ -115,6 +122,7 @@ export default{
|
||||
image {
|
||||
will-change: transform
|
||||
}
|
||||
|
||||
/* 渐变过渡效果处理 */
|
||||
image.origin-img {
|
||||
width: 100%;
|
||||
@ -122,13 +130,16 @@ export default{
|
||||
opacity: 0.3;
|
||||
max-height: 360rpx;
|
||||
}
|
||||
|
||||
image.origin-img.show-transition {
|
||||
transition: opacity .5s;
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
image.origin-img.no-transition {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
/* 加载失败、加载中的占位图样式控制 */
|
||||
.loadfail-img {
|
||||
height: 100%;
|
||||
@ -136,25 +147,38 @@ export default{
|
||||
background-size: 50%;
|
||||
background-position: center;
|
||||
}
|
||||
|
||||
.loading-img {
|
||||
height: 100%;
|
||||
background-position: center;
|
||||
}
|
||||
|
||||
/* 转圈 */
|
||||
.spin-circle {
|
||||
background-repeat: no-repeat;
|
||||
background-size: 60%;
|
||||
}
|
||||
|
||||
/* 动态灰色若隐若现 */
|
||||
.looming-gray {
|
||||
animation: looming-gray 1s infinite linear;
|
||||
background-color: #e3e3e3;
|
||||
}
|
||||
|
||||
@keyframes looming-gray {
|
||||
0% {background-color:#e3e3e3aa;}
|
||||
50% {background-color:#e3e3e3;}
|
||||
100% {background-color:#e3e3e3aa;}
|
||||
0% {
|
||||
background-color: #e3e3e3aa;
|
||||
}
|
||||
|
||||
50% {
|
||||
background-color: #e3e3e3;
|
||||
}
|
||||
|
||||
100% {
|
||||
background-color: #e3e3e3aa;
|
||||
}
|
||||
}
|
||||
|
||||
/* 骨架屏1 */
|
||||
.skeleton-1 {
|
||||
background-color: #e3e3e3;
|
||||
@ -164,11 +188,13 @@ export default{
|
||||
background-position: 0 0;
|
||||
animation: skeleton-1 .6s infinite;
|
||||
}
|
||||
|
||||
@keyframes skeleton-1 {
|
||||
to {
|
||||
background-position: 200% 0;
|
||||
}
|
||||
}
|
||||
|
||||
/* 骨架屏2 */
|
||||
.skeleton-2 {
|
||||
background-image: linear-gradient(-90deg, #fefefe 0%, #e6e6e6 50%, #fefefe 100%);
|
||||
@ -176,10 +202,10 @@ export default{
|
||||
background-position: 0 0;
|
||||
animation: skeleton-2 1.2s ease-in-out infinite;
|
||||
}
|
||||
|
||||
@keyframes skeleton-2 {
|
||||
to {
|
||||
background-position: -135% 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
|
||||
@ -1,45 +1,43 @@
|
||||
<template>
|
||||
<view class='product-bg'>
|
||||
<swiper :indicator-dots="indicatorDots" indicator-active-color="#e93323" :autoplay="autoplay" :circular="circular"
|
||||
:interval="interval" :duration="duration" @change="change" v-if="isPlay">
|
||||
<swiper :indicator-dots="indicatorDots" :current='current' indicator-active-color="#e93323" :autoplay="autoplay"
|
||||
:circular="circular" :interval="interval" :duration="duration" @change="change" v-if="isPlay">
|
||||
<!-- #ifndef APP-PLUS -->
|
||||
<swiper-item v-if="videoline && videoline != '' && videoline != 'https:'">
|
||||
<view class="item">
|
||||
<video id="myVideo" :src='videoline && (videoline.substring(0,4) == "http" || videoline.substring(0,5) == "https") ? videoline : ("http:" + videoline)'
|
||||
objectFit="cover" controls style="width:100%;height:100% " show-mute-btn="true"
|
||||
auto-pause-if-navigate @ended="endedFun()"></video>
|
||||
<view class="poster" v-if="controls">
|
||||
<image class="image" :src="videoCoverImg"></image>
|
||||
</view>
|
||||
<view class="stop" v-if="controls" @tap="bindPause">
|
||||
<image class="image" src="../../static/images/stop.png"></image>
|
||||
</view>
|
||||
</view>
|
||||
</swiper-item>
|
||||
<!-- #endif -->
|
||||
<!-- #ifdef APP-PLUS -->
|
||||
<swiper-item v-if="videoline">
|
||||
<view class="item">
|
||||
<view class="poster" v-show="controls">
|
||||
<image class="image" :src="videoCoverImg"></image>
|
||||
</view>
|
||||
<view class="stop" v-show="controls" @tap="bindPause">
|
||||
<image class="image" src="../../static/images/stop.png"></image>
|
||||
</view>
|
||||
</view>
|
||||
</swiper-item>
|
||||
<!-- #endif -->
|
||||
<block v-for="(item,index) in imgUrls" :key='index'>
|
||||
<swiper-item>
|
||||
<image :src="item" class="slide-image" @click='getpreviewImage(item)' mode="widthFix" />
|
||||
<swiper-item v-if="isVideoUrl(item)">
|
||||
<video :src="isVideoUrl(item,true)" objectFit="cover" controls style="width:100%;height:100% "
|
||||
show-center-play-btn show-mute-btn="true" auto-pause-if-navigate
|
||||
:enable-progress-gesture="false" :poster="item+coverUrl"></video>
|
||||
</swiper-item>
|
||||
<swiper-item v-else>
|
||||
<image :src="item" class="slide-image" @click='getpreviewImage(item)' />
|
||||
</swiper-item>
|
||||
</block>
|
||||
<!-- #endif -->
|
||||
|
||||
<!-- #ifdef APP-PLUS -->
|
||||
<block v-for="(item,index) in imgUrls" :key='index'>
|
||||
<swiper-item v-if="isVideoUrl(item)">
|
||||
<view>
|
||||
<image :src="item+coverUrl" class="slide-image" />
|
||||
<image class="image-play-icon" src="../../static/images/stop.png"
|
||||
@click='videoPlay(item,index)'>
|
||||
</image>
|
||||
</view>
|
||||
</swiper-item>
|
||||
|
||||
<swiper-item v-else>
|
||||
<image :src="item" class="slide-image" @click='getpreviewImage(item)' />
|
||||
</swiper-item>
|
||||
</block>
|
||||
<!-- #endif -->
|
||||
</swiper>
|
||||
|
||||
<!-- #ifdef APP-PLUS -->
|
||||
<view v-if="!isPlay" style="width: 100%; height: 750rpx;">
|
||||
<video id="myVideo" :src='videoline && (videoline.substring(0,4) == "http" || videoline.substring(0,5) == "https") ? videoline : "http:" + videoline'
|
||||
objectFit="cover" controls style="width:100%;height:100% " show-center-play-btn show-mute-btn="true"
|
||||
auto-pause-if-navigate :enable-progress-gesture="false" :poster="videoCoverImg" @pause="videoPause" @ended="endedFun()"></video>
|
||||
<video id="myVideo" :src='playingUrl' objectFit="cover" controls style="width:100%;height:100% "
|
||||
show-center-play-btn show-mute-btn="true" auto-pause-if-navigate :enable-progress-gesture="false"
|
||||
:poster="playingUrl+coverUrl" @pause="videoPause" @ended="endedFun()"></video>
|
||||
|
||||
</view>
|
||||
<!-- #endif -->
|
||||
@ -50,7 +48,7 @@
|
||||
// +----------------------------------------------------------------------
|
||||
// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
|
||||
// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
|
||||
// +----------------------------------------------------------------------
|
||||
@ -74,6 +72,10 @@
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
coverUrl: '?spm=a2c4e.11153940.blogcont573781.6.c1032027sQ46VG&x-oss-process=video/snapshot,t_1000,m_fast',
|
||||
current: '0',
|
||||
videoTypeList: ['mp4', 'avi', 'mov', 'wmv', 'mkv', 'flv', 'mpeg', '3gp', 'webm'],
|
||||
playingUrl: '',
|
||||
indicatorDots: true,
|
||||
circular: true,
|
||||
autoplay: true,
|
||||
@ -97,6 +99,25 @@
|
||||
// #endif
|
||||
},
|
||||
methods: {
|
||||
isVideoUrl(url, getRightUrl) {
|
||||
const str = url;
|
||||
const lastIndex = str.lastIndexOf(".");
|
||||
let extension;
|
||||
if (lastIndex !== -1) {
|
||||
extension = str.substring(lastIndex + 1);
|
||||
} else {
|
||||
extension = 'jpg'
|
||||
}
|
||||
if (getRightUrl) return url.replace(/\\/g, "")
|
||||
return this.videoTypeList.includes(extension)
|
||||
},
|
||||
|
||||
videoPlay(url, index) {
|
||||
this.playingUrl = url
|
||||
this.current = index
|
||||
console.log(this.current)
|
||||
this.bindPause()
|
||||
},
|
||||
getpreviewImage: function(item) {
|
||||
uni.previewImage({
|
||||
urls: this.imgUrls,
|
||||
@ -109,6 +130,7 @@
|
||||
this.autoplay = true
|
||||
// #endif
|
||||
},
|
||||
|
||||
bindPause: function() {
|
||||
// #ifndef APP-PLUS
|
||||
this.videoContext.play();
|
||||
@ -140,15 +162,18 @@
|
||||
height: 750rpx;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.product-bg swiper {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.product-bg .slide-image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
width: 750rpx;
|
||||
height: 750rpx;
|
||||
}
|
||||
|
||||
.product-bg .pages {
|
||||
position: absolute;
|
||||
background-color: #fff;
|
||||
@ -161,15 +186,18 @@
|
||||
font-size: 24rpx;
|
||||
color: #050505;
|
||||
}
|
||||
|
||||
#myVideo {
|
||||
width: 100%;
|
||||
height: 100%
|
||||
}
|
||||
|
||||
.product-bg .item {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.product-bg .item .poster {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
@ -178,10 +206,12 @@
|
||||
width: 100%;
|
||||
z-index: 9;
|
||||
}
|
||||
|
||||
.product-bg .item .poster .image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.product-bg .item .stop {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
@ -192,8 +222,18 @@
|
||||
margin-left: -68rpx;
|
||||
z-index: 9;
|
||||
}
|
||||
|
||||
.product-bg .item .stop .image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.image-play-icon {
|
||||
position: absolute;
|
||||
width: 100rpx;
|
||||
height: 100rpx;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
}
|
||||
</style>
|
||||
@ -63,7 +63,7 @@
|
||||
</view>
|
||||
|
||||
<!-- tab导航 -->
|
||||
<view class="tabs" v-if="showTab">
|
||||
<view class="tabs" v-if="showTab" :style="{top:'calc(98rpx + var(--status-bar-height))'}">
|
||||
<block v-for="(item,indx) in tabsArr" :key="indx">
|
||||
<view v-if="indx>0" style="width: 3rpx;height: 36rpx;background-color: #ccc;"></view>
|
||||
<view :class="{'tabs-item-active':item.val==currTabs}" class="tabs-item" @click="changeTab(item.val)">
|
||||
@ -280,6 +280,11 @@
|
||||
}
|
||||
|
||||
.tabs {
|
||||
position: sticky;
|
||||
top: 0;
|
||||
z-index: 900;
|
||||
background: #fff;
|
||||
padding-bottom: 20rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
@ -323,6 +328,7 @@
|
||||
.recommend .recommendList {
|
||||
padding: 0 20rpx;
|
||||
min-height: 100rpx;
|
||||
min-height: calc(100vh - 82rpx - var(--status-bar-height));
|
||||
}
|
||||
|
||||
.recommend .recommendList.on {
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
"name" : "惠农生活",
|
||||
"appid" : "__UNI__3A527D1",
|
||||
"description" : "",
|
||||
"versionName": "2.0.37",
|
||||
"versionCode": 2037,
|
||||
"versionName" : "2.0.52",
|
||||
"versionCode" : 2052,
|
||||
"transformPx" : false,
|
||||
/* 5+App特有相关 */
|
||||
"app-plus" : {
|
||||
|
||||
20
pages.json
20
pages.json
@ -25,7 +25,7 @@
|
||||
}, {
|
||||
"path": "pages/whole_sale/index",
|
||||
"style": {
|
||||
"enablePullDownRefresh": true,
|
||||
"enablePullDownRefresh": false,
|
||||
"navigationBarTitleText": "批发",
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
@ -34,7 +34,9 @@
|
||||
"style": {
|
||||
"enablePullDownRefresh": true,
|
||||
"navigationBarTitleText": "工作台",
|
||||
"navigationStyle": "custom"
|
||||
"navigationStyle": "custom",
|
||||
"backgroundColorTop": "#40AE36",
|
||||
"backgroundTextStyle": "light"
|
||||
}
|
||||
}, {
|
||||
"path": "pages/order_addcart/order_addcart",
|
||||
@ -105,6 +107,13 @@
|
||||
// #endif
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/goods_details/videoPlay",
|
||||
"style": {
|
||||
"navigationBarTitleText": "视屏详情"
|
||||
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/goods_cate/goods_cate",
|
||||
"style": {
|
||||
@ -578,7 +587,8 @@
|
||||
"path": "order_list/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "我的订单",
|
||||
"navigationStyle": "custom"
|
||||
"navigationStyle": "custom",
|
||||
"enablePullDownRefresh": true
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -1515,7 +1525,9 @@
|
||||
"backgroundColor": "#F8F8F8"
|
||||
//#ifndef H5
|
||||
,
|
||||
"titleNView": true
|
||||
"titleNView": true,
|
||||
"backgroundColorTop": "#40AE36",
|
||||
"backgroundTextStyle": "light"
|
||||
//#endif
|
||||
//#ifdef H5
|
||||
,
|
||||
|
||||
@ -4,11 +4,12 @@
|
||||
<view class="store-wrapper" v-if="storeInfo">
|
||||
<view class="left">
|
||||
<image :src="storeInfo.mer_avatar" mode=""></image>
|
||||
<view class="txt">{{storeInfo.mer_name}}</view>
|
||||
<view class="txt line1">{{storeInfo.mer_name}}</view>
|
||||
</view>
|
||||
<view class="acea-row store-opeation">
|
||||
<navigator v-if="hide_mer_status != 1 && storeInfo.mer_id"
|
||||
:url="'/pages/store/home/index?id='+storeInfo.mer_id" class="link" open-type="redirect">进店</navigator>
|
||||
:url="'/pages/store/home/index?id='+storeInfo.mer_id" class="link" open-type="redirect">进店
|
||||
</navigator>
|
||||
<text v-if="storeInfo.service_phone" class="iconfont icon-dadianhua01" @click="goCustomer"></text>
|
||||
</view>
|
||||
</view>
|
||||
@ -24,20 +25,24 @@
|
||||
<!-- 左边 -->
|
||||
<div class="item acea-row row-top" v-if="item.send_type == 0">
|
||||
<div v-if="item.msn_type !== 100" class="pictrue" @click="userDetail(item.user.uid)">
|
||||
<image :src="item.user.avatar ? item.user.avatar : '/static/images/f.png'" mode=""></image>
|
||||
<image :src="item.user.avatar ? item.user.avatar : '/static/images/f.png'" mode="">
|
||||
</image>
|
||||
</div>
|
||||
<view v-if="item.msn_type === 100" class="recall-msg">对方撤回了一条消息</view>
|
||||
|
||||
<div class="text">
|
||||
<div class="acea-row">
|
||||
<!--退款订单链接-->
|
||||
<navigator v-if="item.msn_type === 6 && item.refundOrder && item.refundOrder.refund_order_id"
|
||||
open-type="navigate" :url="'/pages/order_details/index?order_id='+item.refundOrder.order_id">
|
||||
<navigator
|
||||
v-if="item.msn_type === 6 && item.refundOrder && item.refundOrder.refund_order_id"
|
||||
open-type="navigate"
|
||||
:url="'/pages/order_details/index?order_id='+item.refundOrder.order_id">
|
||||
<div class="broadcast-details_num">
|
||||
<span>退款单号：{{ item.refundOrder.refund_order_sn }}</span>
|
||||
</div>
|
||||
<div class="conter acea-row row-middle">
|
||||
<div class="broadcast-details_order noPad" v-for="(val, inx) in item.refundOrder.refundProduct"
|
||||
<div class="broadcast-details_order noPad"
|
||||
v-for="(val, inx) in item.refundOrder.refundProduct"
|
||||
:key="item.service_log_id">
|
||||
<div class="broadcast-details_box noPad" v-if="inx == 0">
|
||||
<div class="broadcast_details_img">
|
||||
@ -47,7 +52,9 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="broadcast_details_picBox noPad">
|
||||
<div class="broadcast_details_tit">{{val.product.cart_info.product.store_name}}</div>
|
||||
<div class="broadcast_details_tit">
|
||||
{{val.product.cart_info.product.store_name}}
|
||||
</div>
|
||||
<div class="broadcast_details_pic">
|
||||
￥{{ item.refundOrder.refund_price }}
|
||||
</div>
|
||||
@ -61,17 +68,19 @@
|
||||
<div class="broadcast-details_num acea-row row-middle">
|
||||
<span>订单号：{{ item.orderInfo.order_sn }}</span>
|
||||
<!-- #ifdef H5 -->
|
||||
<button class="copy copy-data" :data-clipboard-text="item.orderInfo.order_sn">复制</button>
|
||||
<button class="copy copy-data"
|
||||
:data-clipboard-text="item.orderInfo.order_sn">复制</button>
|
||||
<!-- #endif -->
|
||||
<!-- #ifndef H5 -->
|
||||
<button class="copy" @tap.stop="copyText(item.orderInfo.order_sn)">复制</button>
|
||||
<button class="copy"
|
||||
@tap.stop="copyText(item.orderInfo.order_sn)">复制</button>
|
||||
<!-- #endif -->
|
||||
</div>
|
||||
<navigator
|
||||
:url="'/pages/admin/orderDetail/index?id='+item.orderInfo.order_id+'&mer_id='+item.orderInfo.mer_id"
|
||||
open-type="open-type" class="conter acea-row row-middle">
|
||||
<div class="broadcast-details_order noPad" v-for="(val, inx) in item.orderInfo.orderProduct"
|
||||
:key="val.id">
|
||||
<div class="broadcast-details_order noPad"
|
||||
v-for="(val, inx) in item.orderInfo.orderProduct" :key="val.id">
|
||||
<div class="broadcast-details_box noPad" v-if="inx == 0">
|
||||
<div class="broadcast_details_img">
|
||||
<image :src="val.cart_info.product.image" />
|
||||
@ -80,7 +89,9 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="broadcast_details_picBox noPad">
|
||||
<div class="broadcast_details_tit">{{val.cart_info.product.store_name}}</div>
|
||||
<div class="broadcast_details_tit">
|
||||
{{val.cart_info.product.store_name}}
|
||||
</div>
|
||||
<div class="broadcast_details_pic">
|
||||
￥{{ item.orderInfo.pay_price }}
|
||||
</div>
|
||||
@ -90,10 +101,13 @@
|
||||
</navigator>
|
||||
</div>
|
||||
<!--商品链接-->
|
||||
<div class="conter acea-row row-middle" v-if="item.msn_type === 4 && item.product">
|
||||
<div class="conter acea-row row-middle"
|
||||
v-if="item.msn_type === 4 && item.product">
|
||||
<div class=" noPad">
|
||||
<navigator class="acea-row row-column-around noPad" v-if="item.product.product_id"
|
||||
:url="`/pages/goods_details/index?id=${item.product.product_id}`" open-type="navigate">
|
||||
<navigator class="acea-row row-column-around noPad"
|
||||
v-if="item.product.product_id"
|
||||
:url="`/pages/goods_details/index?id=${item.product.product_id}`"
|
||||
open-type="navigate">
|
||||
<div class="broadcast_details_img_no">
|
||||
<image :src="item.product.image" />
|
||||
</div>
|
||||
@ -101,7 +115,9 @@
|
||||
<div class="broadcast_details_pic">
|
||||
￥{{ item.product.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">{{item.product.store_name}}</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.product.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -110,7 +126,8 @@
|
||||
<div class="conter acea-row row-middle"
|
||||
v-if="item.msn_type === 7 && item.presell && item.presell.product">
|
||||
<div class=" noPad">
|
||||
<navigator class="acea-row row-column-around noPad" v-if="item.presell.product_presell_id"
|
||||
<navigator class="acea-row row-column-around noPad"
|
||||
v-if="item.presell.product_presell_id"
|
||||
:url="`/pages/activity/presell_details/index?id=${item.presell.product_presell_id}`"
|
||||
open-type="navigate">
|
||||
<div class="broadcast_details_img_no">
|
||||
@ -120,7 +137,9 @@
|
||||
<div class="broadcast_details_pic">
|
||||
￥{{ item.presell.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">{{item.presell.store_name}}</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.presell.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -129,7 +148,8 @@
|
||||
<div class="conter acea-row row-middle"
|
||||
v-if="item.msn_type === 8 && item.productGroup && item.productGroup.product">
|
||||
<div class=" noPad">
|
||||
<navigator class="acea-row row-column-around noPad" v-if="item.productGroup.product_group_id"
|
||||
<navigator class="acea-row row-column-around noPad"
|
||||
v-if="item.productGroup.product_group_id"
|
||||
:url="`/pages/activity/combination_details/index?id=${item.productGroup.product_group_id}`"
|
||||
open-type="navigate">
|
||||
<div class="broadcast_details_img_no">
|
||||
@ -139,7 +159,9 @@
|
||||
<div class="broadcast_details_pic">
|
||||
￥{{ item.productGroup.product.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">{{item.productGroup.product.store_name}}</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.productGroup.product.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -148,7 +170,8 @@
|
||||
<image :src="item.msn" @click="clickImg(item.msn)" mode="heightFix" />
|
||||
</div>
|
||||
<div class="conter acea-row row-middle" v-if="item.msn_type === 2">
|
||||
<i class="em" :class="item.msn" :style="'background-image:url('+ httpUrl +')'"></i>
|
||||
<i class="em" :class="item.msn"
|
||||
:style="'background-image:url('+ httpUrl +')'"></i>
|
||||
</div>
|
||||
<div class="conter acea-row row-middle" v-if="item.msn_type === 1">
|
||||
{{item.msn}}
|
||||
@ -158,12 +181,14 @@
|
||||
</div>
|
||||
</div>
|
||||
<!-- 右边 -->
|
||||
<div class="item acea-row row-top row-right" v-else @longpress="longTime(items,index,item,j)">
|
||||
<div class="item acea-row row-top row-right" v-else
|
||||
@longpress="longTime(items,index,item,j)">
|
||||
<div class="text textR">
|
||||
<!-- <div class="name">{{ item.user.nickname }}</div> -->
|
||||
<div class="acea-row ">
|
||||
<!--退款订单链接-->
|
||||
<navigator v-if="item.msn_type === 6 && item.refundOrder.refund_order_id" open-type="navigate">
|
||||
<navigator v-if="item.msn_type === 6 && item.refundOrder.refund_order_id"
|
||||
open-type="navigate">
|
||||
<div class="broadcast-details_num acea-row row-middle">
|
||||
<text>订单号：{{ item.refundOrder.refund_order_sn }}</text>
|
||||
<!-- #ifdef H5 -->
|
||||
@ -171,12 +196,13 @@
|
||||
:data-clipboard-text="item.refundOrder.refund_order_sn">复制</button>
|
||||
<!-- #endif -->
|
||||
<!-- #ifndef H5 -->
|
||||
<button class="copy" @tap.stop="copyText(item.refundOrder.refund_order_sn)">复制</button>
|
||||
<button class="copy"
|
||||
@tap.stop="copyText(item.refundOrder.refund_order_sn)">复制</button>
|
||||
<!-- #endif -->
|
||||
</div>
|
||||
<div class="conter acea-row row-middle">
|
||||
<div class="broadcast-details_order noPad" v-for="(val, inx) in item.refundOrder.refundProduct"
|
||||
:key="val.id">
|
||||
<div class="broadcast-details_order noPad"
|
||||
v-for="(val, inx) in item.refundOrder.refundProduct" :key="val.id">
|
||||
<div class="broadcast-details_box noPad" v-if="inx == 0">
|
||||
<div class="broadcast_details_img">
|
||||
<image :src="val.product.cart_info.product.image" />
|
||||
@ -185,7 +211,9 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="broadcast_details_picBox noPad">
|
||||
<div class="broadcast_details_tit">{{val.product.cart_info.product.store_name}}</div>
|
||||
<div class="broadcast_details_tit">
|
||||
{{val.product.cart_info.product.store_name}}
|
||||
</div>
|
||||
<div class="broadcast_details_pic">
|
||||
￥{{ item.refundOrder.refund_price }}
|
||||
</div>
|
||||
@ -199,17 +227,19 @@
|
||||
<div class="broadcast-details_num acea-row row-middle">
|
||||
<text>订单号：{{ item.orderInfo.order_sn }}</text>
|
||||
<!-- #ifdef H5 -->
|
||||
<button class="copy copy-data" :data-clipboard-text="item.orderInfo.order_sn">复制</button>
|
||||
<button class="copy copy-data"
|
||||
:data-clipboard-text="item.orderInfo.order_sn">复制</button>
|
||||
<!-- #endif -->
|
||||
<!-- #ifndef H5 -->
|
||||
<button class="copy" @tap.stop="copyText(item.orderInfo.order_sn)">复制</button>
|
||||
<button class="copy"
|
||||
@tap.stop="copyText(item.orderInfo.order_sn)">复制</button>
|
||||
<!-- #endif -->
|
||||
</div>
|
||||
<navigator
|
||||
:url="'/pages/admin/orderDetail/index?id='+item.orderInfo.order_id+'&mer_id='+item.orderInfo.mer_id"
|
||||
open-type="navigate" class="conter acea-row row-middle">
|
||||
<div class="broadcast-details_order noPad" v-for="(val, inx) in item.orderInfo.orderProduct"
|
||||
:key="val.id">
|
||||
<div class="broadcast-details_order noPad"
|
||||
v-for="(val, inx) in item.orderInfo.orderProduct" :key="val.id">
|
||||
<div class="broadcast-details_box noPad" v-if="inx == 0">
|
||||
<div class="broadcast_details_img">
|
||||
<image :src="val.cart_info.product.image" />
|
||||
@ -218,7 +248,9 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="broadcast_details_picBox noPad">
|
||||
<div class="broadcast_details_tit">{{val.cart_info.product.store_name}}</div>
|
||||
<div class="broadcast_details_tit">
|
||||
{{val.cart_info.product.store_name}}
|
||||
</div>
|
||||
<div class="broadcast_details_pic">
|
||||
￥{{ item.orderInfo.pay_price }}
|
||||
</div>
|
||||
@ -228,9 +260,11 @@
|
||||
</navigator>
|
||||
</div>
|
||||
<!--商品链接-->
|
||||
<div class="conter acea-row row-middle" v-if="item.msn_type === 4 && item.product">
|
||||
<div class="conter acea-row row-middle"
|
||||
v-if="item.msn_type === 4 && item.product">
|
||||
<div class=" acea-row row-column-around noPad">
|
||||
<navigator class="acea-row row-column-around noPad" v-if="item.product.product_id"
|
||||
<navigator class="acea-row row-column-around noPad"
|
||||
v-if="item.product.product_id"
|
||||
:url="`/pages/goods_details/index?id=${item.product.product_id}`">
|
||||
<div class="broadcast_details_img_no">
|
||||
<image :src="item.product.image" />
|
||||
@ -239,7 +273,9 @@
|
||||
<div class="broadcast_details_pic">
|
||||
￥{{ item.product.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">{{item.product.store_name}}</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.product.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -248,7 +284,8 @@
|
||||
<div class="conter acea-row row-middle"
|
||||
v-if="item.msn_type === 7 && item.presell && item.presell.product">
|
||||
<div class=" acea-row row-column-around noPad">
|
||||
<navigator class="acea-row row-column-around noPad" v-if="item.presell.product_presell_id"
|
||||
<navigator class="acea-row row-column-around noPad"
|
||||
v-if="item.presell.product_presell_id"
|
||||
:url="`/pages/activity/presell_details/index?id=${item.presell.product_presell_id}`"
|
||||
open-type="navigate">
|
||||
<div class="broadcast_details_img_no">
|
||||
@ -258,7 +295,9 @@
|
||||
<div class="broadcast_details_pic">
|
||||
￥{{ item.presell.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">{{item.presell.store_name}}</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.presell.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -267,7 +306,8 @@
|
||||
<div class="conter acea-row row-middle"
|
||||
v-if="item.msn_type === 8 && item.productGroup && item.productGroup.product">
|
||||
<div class=" acea-row row-column-around noPad">
|
||||
<navigator class="acea-row row-column-around noPad" v-if="item.productGroup.product_group_id"
|
||||
<navigator class="acea-row row-column-around noPad"
|
||||
v-if="item.productGroup.product_group_id"
|
||||
:url="`/pages/activity/combination_details/index?id=${item.productGroup.product_group_id}`"
|
||||
open-type="navigate">
|
||||
<div class="broadcast_details_img_no">
|
||||
@ -277,7 +317,9 @@
|
||||
<div class="broadcast_details_pic">
|
||||
￥{{ item.productGroup.product.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">{{item.productGroup.product.store_name}}</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.productGroup.product.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -286,7 +328,8 @@
|
||||
<image :src="item.msn" @click="clickImg(item.msn)" mode="heightFix" />
|
||||
</div>
|
||||
<div class="conter acea-row row-middle" v-if="item.msn_type === 2">
|
||||
<i class="em" :class="item.msn" :style="'background-image:url('+ httpUrl +')'"></i>
|
||||
<i class="em" :class="item.msn"
|
||||
:style="'background-image:url('+ httpUrl +')'"></i>
|
||||
</div>
|
||||
<div class="conter acea-row row-middle" v-if="item.msn_type === 1">
|
||||
{{item.msn}}
|
||||
@ -307,8 +350,8 @@
|
||||
</view>
|
||||
<!-- #endif -->
|
||||
</view>
|
||||
<view v-if="(new Date().getTime()/1000 - item.send_time) <= 120" class="recall-item"
|
||||
@click.stop="reverstMsg(item)">
|
||||
<view v-if="(new Date().getTime()/1000 - item.send_time) <= 120"
|
||||
class="recall-item" @click.stop="reverstMsg(item)">
|
||||
<view class="iconfont icon-chehui"></view>撤回
|
||||
</view>
|
||||
</view>
|
||||
@ -328,21 +371,24 @@
|
||||
<!-- 左边 -->
|
||||
<div class="item acea-row row-top" v-if="item.send_type == 1">
|
||||
<div v-if="item.msn_type !== 100" class="pictrue">
|
||||
<image :src="item.service.avatar ? item.service.avatar : '/static/images/f.png'" mode=""></image>
|
||||
<image :src="item.service.avatar ? item.service.avatar : '/static/images/f.png'"
|
||||
mode=""></image>
|
||||
</div>
|
||||
<view v-if="item.msn_type === 100" class="recall-msg">对方撤回了一条消息</view>
|
||||
<div class="text">
|
||||
<!-- <div class="name">{{ item.service.nickname }}</div> -->
|
||||
<div class="acea-row">
|
||||
<!--退款订单链接-->
|
||||
<navigator v-if="item.msn_type === 6 && item.refundOrder.refund_order_id" open-type="navigate"
|
||||
<navigator v-if="item.msn_type === 6 && item.refundOrder.refund_order_id"
|
||||
open-type="navigate"
|
||||
:url="'/pages/order_details/index?order_id='+item.refundOrder.order_id">
|
||||
<div class="broadcast-details_num">
|
||||
<text>退款单号：{{ item.refundOrder.refund_order_sn }}</text>
|
||||
</div>
|
||||
<div class="conter acea-row row-middle">
|
||||
<!-- :key="item.service_log_id" -->
|
||||
<div class="broadcast-details_order noPad" v-for="(val, inx) in item.refundOrder.refundProduct">
|
||||
<div class="broadcast-details_order noPad"
|
||||
v-for="(val, inx) in item.refundOrder.refundProduct">
|
||||
<div class="broadcast-details_box noPad" v-if="inx == 0">
|
||||
<div class="broadcast_details_img">
|
||||
<image :src="val.product.cart_info.product.image" />
|
||||
@ -351,7 +397,9 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="broadcast_details_picBox noPad">
|
||||
<div class="broadcast_details_tit">{{val.product.cart_info.product.store_name}}</div>
|
||||
<div class="broadcast_details_tit">
|
||||
{{val.product.cart_info.product.store_name}}
|
||||
</div>
|
||||
<div class="broadcast_details_pic">
|
||||
￥{{ val.product.cart_info.productAttr.price }}
|
||||
</div>
|
||||
@ -365,16 +413,20 @@
|
||||
<div class="broadcast-details_num acea-row row-middle">
|
||||
<text>订单号：{{ item.orderInfo.order_sn }}</text>
|
||||
<!-- #ifdef H5 -->
|
||||
<button class="copy copy-data" :data-clipboard-text="item.orderInfo.order_sn">复制</button>
|
||||
<button class="copy copy-data"
|
||||
:data-clipboard-text="item.orderInfo.order_sn">复制</button>
|
||||
<!-- #endif -->
|
||||
<!-- #ifndef H5 -->
|
||||
<button class="copy" @tap.stop="copyText(item.orderInfo.order_sn)">复制</button>
|
||||
<button class="copy"
|
||||
@tap.stop="copyText(item.orderInfo.order_sn)">复制</button>
|
||||
<!-- #endif -->
|
||||
</div>
|
||||
<navigator :url="'/pages/order_details/index?order_id='+item.orderInfo.order_id"
|
||||
<navigator
|
||||
:url="'/pages/order_details/index?order_id='+item.orderInfo.order_id"
|
||||
open-type="navigate" class="conter acea-row row-middle">
|
||||
<!-- :key="item.service_log_id" -->
|
||||
<div class="broadcast-details_order noPad" v-for="(val, inx) in item.orderInfo.orderProduct">
|
||||
<div class="broadcast-details_order noPad"
|
||||
v-for="(val, inx) in item.orderInfo.orderProduct">
|
||||
<div class="broadcast-details_box noPad" v-if="inx == 0">
|
||||
<div class="broadcast_details_img">
|
||||
<image :src="val.cart_info.product.image" />
|
||||
@ -383,7 +435,9 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="broadcast_details_picBox noPad">
|
||||
<div class="broadcast_details_tit">{{val.cart_info.product.store_name}}</div>
|
||||
<div class="broadcast_details_tit">
|
||||
{{val.cart_info.product.store_name}}
|
||||
</div>
|
||||
<div class="broadcast_details_pic">
|
||||
￥{{ item.orderInfo.pay_price }}
|
||||
</div>
|
||||
@ -393,10 +447,13 @@
|
||||
</navigator>
|
||||
</div>
|
||||
<!--商品链接-->
|
||||
<div class="conter acea-row row-middle" v-if="item.msn_type === 4 && item.product">
|
||||
<div class="conter acea-row row-middle"
|
||||
v-if="item.msn_type === 4 && item.product">
|
||||
<div class=" noPad">
|
||||
<navigator class="acea-row row-column-around noPad" v-if="item.product.product_id"
|
||||
:url="`/pages/goods_details/index?id=${item.product.product_id}`" open-type="navigate">
|
||||
<navigator class="acea-row row-column-around noPad"
|
||||
v-if="item.product.product_id"
|
||||
:url="`/pages/goods_details/index?id=${item.product.product_id}`"
|
||||
open-type="navigate">
|
||||
<div class="broadcast_details_img_no">
|
||||
<image :src="item.product.image" />
|
||||
</div>
|
||||
@ -404,7 +461,9 @@
|
||||
<div class="broadcast_details_pic">
|
||||
￥{{ item.product.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">{{item.product.store_name}}</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.product.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -413,7 +472,8 @@
|
||||
<div class="conter acea-row row-middle"
|
||||
v-if="item.msn_type === 7 && item.presell && item.presell.product">
|
||||
<div class=" noPad">
|
||||
<navigator class="acea-row row-column-around noPad" v-if="item.presell.product_presell_id"
|
||||
<navigator class="acea-row row-column-around noPad"
|
||||
v-if="item.presell.product_presell_id"
|
||||
:url="`/pages/activity/presell_details/index?id=${item.presell.product_presell_id}`"
|
||||
open-type="navigate">
|
||||
<div class="broadcast_details_img_no">
|
||||
@ -423,7 +483,9 @@
|
||||
<div class="broadcast_details_pic">
|
||||
￥{{ item.presell.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">{{item.presell.store_name}}</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.presell.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -432,7 +494,8 @@
|
||||
<div class="conter acea-row row-middle"
|
||||
v-if="item.msn_type === 8 && item.productGroup && item.productGroup.product">
|
||||
<div class="noPad">
|
||||
<navigator class="acea-row row-column-around noPad" v-if="item.productGroup.product_group_id"
|
||||
<navigator class="acea-row row-column-around noPad"
|
||||
v-if="item.productGroup.product_group_id"
|
||||
:url="`/pages/activity/combination_details/index?id=${item.productGroup.product_group_id}`"
|
||||
open-type="navigate">
|
||||
<div class="broadcast_details_img_no">
|
||||
@ -442,7 +505,9 @@
|
||||
<div class="broadcast_details_pic">
|
||||
￥{{ item.productGroup.product.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">{{item.productGroup.product.store_name}}</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.productGroup.product.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -451,7 +516,8 @@
|
||||
<image :src="item.msn" @click="clickImg(item.msn)" mode="heightFix" />
|
||||
</div>
|
||||
<div class="conter acea-row row-middle" v-if="item.msn_type === 2">
|
||||
<i class="em" :class="item.msn" :style="'background-image:url('+ httpUrl +')'"></i>
|
||||
<i class="em" :class="item.msn"
|
||||
:style="'background-image:url('+ httpUrl +')'"></i>
|
||||
</div>
|
||||
<div class="conter acea-row row-middle" v-if="item.msn_type === 1">
|
||||
{{item.msn}}
|
||||
@ -466,14 +532,16 @@
|
||||
<!-- <div class="name">{{ item.user.nickname }}</div> -->
|
||||
<div class="acea-row" @longpress="longTime(items,index,item,j)">
|
||||
<!--退款订单链接-->
|
||||
<navigator v-if="item.msn_type === 6 && item.refundOrder.refund_order_id" open-type="navigate"
|
||||
<navigator v-if="item.msn_type === 6 && item.refundOrder.refund_order_id"
|
||||
open-type="navigate"
|
||||
:url="'/pages/order_details/index?order_id='+item.refundOrder.order_id">
|
||||
<div class="broadcast-details_num">
|
||||
<text>退款单号：{{ item.refundOrder.refund_order_sn }}</text>
|
||||
</div>
|
||||
<div class="conter acea-row row-middle">
|
||||
<!-- :key="item.service_log_id" -->
|
||||
<div class="broadcast-details_order noPad" v-for="(val, inx) in item.refundOrder.refundProduct">
|
||||
<div class="broadcast-details_order noPad"
|
||||
v-for="(val, inx) in item.refundOrder.refundProduct">
|
||||
<div class="broadcast-details_box noPad" v-if="inx == 0">
|
||||
<div class="broadcast_details_img">
|
||||
<image :src="val.product.cart_info.product.image" />
|
||||
@ -482,7 +550,9 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="broadcast_details_picBox noPad">
|
||||
<div class="broadcast_details_tit">{{val.product.cart_info.product.store_name}}</div>
|
||||
<div class="broadcast_details_tit">
|
||||
{{val.product.cart_info.product.store_name}}
|
||||
</div>
|
||||
<div class="broadcast_details_pic">
|
||||
共{{item.refundOrder.refund_num}}件商品，
|
||||
合计 ￥{{ item.refundOrder.refund_price }}
|
||||
@ -497,15 +567,19 @@
|
||||
<div class="broadcast-details_num acea-row row-middle">
|
||||
<text>订单号：{{ item.orderInfo.order_sn }}</text>
|
||||
<!-- #ifdef H5 -->
|
||||
<button class="copy copy-data" :data-clipboard-text="item.orderInfo.order_sn">复制</button>
|
||||
<button class="copy copy-data"
|
||||
:data-clipboard-text="item.orderInfo.order_sn">复制</button>
|
||||
<!-- #endif -->
|
||||
<!-- #ifndef H5 -->
|
||||
<button class="copy" @tap.stop="copyText(item.orderInfo.order_sn)">复制</button>
|
||||
<button class="copy"
|
||||
@tap.stop="copyText(item.orderInfo.order_sn)">复制</button>
|
||||
<!-- #endif -->
|
||||
</div>
|
||||
<navigator :url="'/pages/order_details/index?order_id='+item.orderInfo.order_id"
|
||||
<navigator
|
||||
:url="'/pages/order_details/index?order_id='+item.orderInfo.order_id"
|
||||
open-type="navigate" class="conter acea-row row-middle">
|
||||
<div class="broadcast-details_order noPad" v-for="(val, inx) in item.orderInfo.orderProduct">
|
||||
<div class="broadcast-details_order noPad"
|
||||
v-for="(val, inx) in item.orderInfo.orderProduct">
|
||||
<div class="broadcast-details_box noPad" v-if="inx == 0">
|
||||
<div class="broadcast_details_img">
|
||||
<image :src="val.cart_info.product.image" />
|
||||
@ -514,7 +588,9 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="broadcast_details_picBox noPad">
|
||||
<div class="broadcast_details_tit">{{val.cart_info.product.store_name}}</div>
|
||||
<div class="broadcast_details_tit">
|
||||
{{val.cart_info.product.store_name}}
|
||||
</div>
|
||||
<div class="broadcast_details_pic">
|
||||
￥{{ item.orderInfo.pay_price }}
|
||||
</div>
|
||||
@ -524,10 +600,13 @@
|
||||
</navigator>
|
||||
</div>
|
||||
<!--商品链接-->
|
||||
<div class="conter acea-row row-middle" v-if="item.msn_type === 4 && item.product">
|
||||
<div class="conter acea-row row-middle"
|
||||
v-if="item.msn_type === 4 && item.product">
|
||||
<div class="acea-row row-column-around noPad">
|
||||
<navigator class="acea-row row-column-around noPad" v-if="item.product.product_id"
|
||||
:url="`/pages/goods_details/index?id=${item.product.product_id}`" open-type="navigate">
|
||||
<navigator class="acea-row row-column-around noPad"
|
||||
v-if="item.product.product_id"
|
||||
:url="`/pages/goods_details/index?id=${item.product.product_id}`"
|
||||
open-type="navigate">
|
||||
<div class="broadcast_details_img_no">
|
||||
<image :src="item.product.image" />
|
||||
</div>
|
||||
@ -535,7 +614,9 @@
|
||||
<div class="broadcast_details_pic">
|
||||
￥{{ item.product.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">{{item.product.store_name}}</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.product.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -544,7 +625,8 @@
|
||||
<div class="conter acea-row row-middle"
|
||||
v-if="item.msn_type === 7 && item.presell && item.presell.product">
|
||||
<div class="acea-row row-column-around noPad">
|
||||
<navigator class="acea-row row-column-around noPad" v-if="item.presell.product_presell_id"
|
||||
<navigator class="acea-row row-column-around noPad"
|
||||
v-if="item.presell.product_presell_id"
|
||||
:url="`/pages/activity/presell_details/index?id=${item.presell.product_presell_id}`"
|
||||
open-type="navigate">
|
||||
<div class="broadcast_details_img_no">
|
||||
@ -554,7 +636,9 @@
|
||||
<div class="broadcast_details_pic">
|
||||
￥{{ item.presell.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">{{item.presell.store_name}}</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.presell.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -563,7 +647,8 @@
|
||||
<div class="conter acea-row row-middle"
|
||||
v-if="item.msn_type === 8 && item.productGroup && item.productGroup.product">
|
||||
<div class="acea-row row-column-around noPad">
|
||||
<navigator class="acea-row row-column-around noPad" v-if="item.productGroup.product_group_id"
|
||||
<navigator class="acea-row row-column-around noPad"
|
||||
v-if="item.productGroup.product_group_id"
|
||||
:url="`/pages/activity/combination_details/index?id=${item.productGroup.product_group_id}`"
|
||||
open-type="navigate">
|
||||
<div class="broadcast_details_img_no">
|
||||
@ -573,7 +658,9 @@
|
||||
<div class="broadcast_details_pic">
|
||||
￥{{ item.productGroup.product.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">{{item.productGroup.product.store_name}}</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.productGroup.product.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -582,7 +669,8 @@
|
||||
<image :src="item.msn" @click="clickImg(item.msn)" mode="heightFix" />
|
||||
</div>
|
||||
<div class="conter acea-row row-middle" v-if="item.msn_type === 2">
|
||||
<i class="em" :class="item.msn" :style="'background-image:url('+ httpUrl +')'"></i>
|
||||
<i class="em" :class="item.msn"
|
||||
:style="'background-image:url('+ httpUrl +')'"></i>
|
||||
</div>
|
||||
<div class="conter acea-row row-middle" v-if="item.msn_type === 1">
|
||||
{{ item.msn }}
|
||||
@ -603,8 +691,8 @@
|
||||
</view>
|
||||
<!-- #endif -->
|
||||
</view>
|
||||
<view v-if="(new Date().getTime()/1000 - item.send_time) <= 120" class="recall-item"
|
||||
@click.stop="reverstMsg(item)">
|
||||
<view v-if="(new Date().getTime()/1000 - item.send_time) <= 120"
|
||||
class="recall-item" @click.stop="reverstMsg(item)">
|
||||
<view class="iconfont icon-chehui"></view>撤回
|
||||
</view>
|
||||
</view>
|
||||
@ -653,7 +741,8 @@
|
||||
</div>
|
||||
<div>
|
||||
<div class="broadcast_details_pic">
|
||||
共{{ orderInfo.total_num }}件商品，合计 <text class="p-color">￥{{ orderInfo.pay_price }}</text>
|
||||
共{{ orderInfo.total_num }}件商品，合计 <text
|
||||
class="p-color">￥{{ orderInfo.pay_price }}</text>
|
||||
</div>
|
||||
<div class="broadcast_details_btn" @click="sendOrder">
|
||||
发送订单
|
||||
@ -705,7 +794,8 @@
|
||||
</div>
|
||||
<view class="input_count">
|
||||
<input type="text" placeholder-class='placeholder' placeholder="输入内容" class="input" ref="input"
|
||||
v-show="!voice" @input="bindInput" @keyup="keyup" @focus="focus" cursor-spacing="20" v-model="textCon">
|
||||
v-show="!voice" @input="bindInput" @keyup="keyup" @focus="focus" cursor-spacing="20"
|
||||
v-model="textCon">
|
||||
<div class="send iconfont icon-fasong" :style="'color:'+iconColor" @click="sendTest"></div>
|
||||
</view>
|
||||
</div>
|
||||
@ -715,8 +805,8 @@
|
||||
:duration="duration" v-if="emojiGroup.length > 0">
|
||||
<block v-for="(emojiList, index) in emojiGroup" :key="index">
|
||||
<swiper-item>
|
||||
<i class="em" :class="emoji" :style="'background-image:url('+ httpUrl +')'" v-for="emoji in emojiList"
|
||||
:key="emoji" @click="addEmoji(emoji)"></i>
|
||||
<i class="em" :class="emoji" :style="'background-image:url('+ httpUrl +')'"
|
||||
v-for="emoji in emojiList" :key="emoji" @click="addEmoji(emoji)"></i>
|
||||
</swiper-item>
|
||||
</block>
|
||||
</swiper>
|
||||
@ -742,15 +832,38 @@
|
||||
// #ifdef H5
|
||||
import ClipboardJS from "@/plugin/clipboard/clipboard.js";
|
||||
// #endif
|
||||
import { getChatRecord, getMerHistory, chatReverstApi, hasServiceApi } from "@/api/user";
|
||||
import { getProductDetail, getPresellProductDetail, getStoreDetail } from "@/api/store";
|
||||
import { getCombinationDetail } from "@/api/activity";
|
||||
import { getOrderDetail, refundDetail } from "@/api/order";
|
||||
import {
|
||||
getChatRecord,
|
||||
getMerHistory,
|
||||
chatReverstApi,
|
||||
hasServiceApi
|
||||
} from "@/api/user";
|
||||
import {
|
||||
getProductDetail,
|
||||
getPresellProductDetail,
|
||||
getStoreDetail
|
||||
} from "@/api/store";
|
||||
import {
|
||||
getCombinationDetail
|
||||
} from "@/api/activity";
|
||||
import {
|
||||
getOrderDetail,
|
||||
refundDetail
|
||||
} from "@/api/order";
|
||||
import Loading from "@/components/Loading";
|
||||
import { TOKENNAME, HTTP_REQUEST_URL } from '@/config/app.js';
|
||||
import { toLogin } from '@/libs/login.js';
|
||||
import { configMap } from "@/utils";
|
||||
import { mapGetters } from "vuex";
|
||||
import {
|
||||
TOKENNAME,
|
||||
HTTP_REQUEST_URL
|
||||
} from '@/config/app.js';
|
||||
import {
|
||||
toLogin
|
||||
} from '@/libs/login.js';
|
||||
import {
|
||||
configMap
|
||||
} from "@/utils";
|
||||
import {
|
||||
mapGetters
|
||||
} from "vuex";
|
||||
const chunk = function(arr, num) {
|
||||
num = num * 1 || 1;
|
||||
var ret = [];
|
||||
@ -930,16 +1043,23 @@
|
||||
});
|
||||
uni.$on(["reply", "chat", "send_chat"], data => {
|
||||
data.longpress = false
|
||||
if (that.history.length > 0 && that.history[that.history.length - 1]['children'].length > 0) {
|
||||
if (that.history.length > 0 && that.history[that.history.length - 1]['children'].length >
|
||||
0) {
|
||||
let index = that.history[that.history.length - 1]['children'].length - 1
|
||||
let item = that.history[that.history.length - 1]['children'][index]
|
||||
if (data.send_time - item.send_time > 300) {
|
||||
that.history.push({ time: data.create_time, children: [data] })
|
||||
that.history.push({
|
||||
time: data.create_time,
|
||||
children: [data]
|
||||
})
|
||||
} else {
|
||||
that.history[that.history.length - 1]['children'].push(data);
|
||||
}
|
||||
} else {
|
||||
that.history.push({ time: data.create_time, children: [data] })
|
||||
that.history.push({
|
||||
time: data.create_time,
|
||||
children: [data]
|
||||
})
|
||||
}
|
||||
that.deleteMsg(data);
|
||||
that.height();
|
||||
@ -1170,7 +1290,9 @@
|
||||
getChatRecord(this.mer_id, {
|
||||
page: this.page,
|
||||
limit: this.limit
|
||||
}).then(({ data }) => {
|
||||
}).then(({
|
||||
data
|
||||
}) => {
|
||||
let arr = this.getChatTime(data.list)
|
||||
let newArr = []
|
||||
for (var j in arr) {
|
||||
@ -1439,7 +1561,9 @@
|
||||
},
|
||||
//#ifndef H5
|
||||
copyText: function(text) {
|
||||
uni.setClipboardData({ data: text });
|
||||
uni.setClipboardData({
|
||||
data: text
|
||||
});
|
||||
},
|
||||
// #endif
|
||||
}
|
||||
@ -2011,6 +2135,10 @@
|
||||
.left {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
.txt {
|
||||
max-width: 480rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.link {
|
||||
|
||||
@ -12,10 +12,11 @@
|
||||
<view class="con line1" v-if="item.last && item.last.msn_type == 2">[表情]</view>
|
||||
<view class="con line1" v-if="item.last && item.last.msn_type == 3">[图片]</view>
|
||||
<view class="con line1" v-if="item.last && item.last.msn_type == 4">[商品]</view>
|
||||
<view class="con line1" v-if="item.last && (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view>
|
||||
<view class="con line1"
|
||||
v-if="item.last && (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view>
|
||||
</view>
|
||||
<view class="right-box">
|
||||
<view class="time">{{item.last && item.last.create_time.split(' ')[1] || ''}}</view>
|
||||
<view class="time">{{item.display_time}}</view>
|
||||
<view class="num" v-if="item.num>0">{{item.num}}</view>
|
||||
</view>
|
||||
</div>
|
||||
@ -23,18 +24,21 @@
|
||||
<block v-if="type == 1 && list.length>0" v-for="(item,index) in list" :key="index">
|
||||
<div class="item acea-row" @click="goPage(item)">
|
||||
<view class="logo">
|
||||
<image :src="(item.user && item.user.avatar) ? item.user.avatar : '/static/images/f.png'" mode=""></image>
|
||||
<image :src="(item.user && item.user.avatar) ? item.user.avatar : '/static/images/f.png'"
|
||||
mode=""></image>
|
||||
</view>
|
||||
<view class="info">
|
||||
<view class="name">{{item.user && item.user.nickname}}</view>
|
||||
<view class="con line1" v-if="item.last && item.last.msn_type == 1">{{item.last.msn}}</view>
|
||||
<view class="con line1" v-if="item.last && item.last.msn_type == 2">[表情]</view>
|
||||
<view class="con line1" v-if="item.last && item.last.msn_type == 3">[图片]</view>
|
||||
<view class="con line1" v-if="item.last && (item.last.msn_type == 4 || item.last.msn_type == 7)">[商品]</view>
|
||||
<view class="con line1" v-if="item.last && (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view>
|
||||
<view class="con line1"
|
||||
v-if="item.last && (item.last.msn_type == 4 || item.last.msn_type == 7)">[商品]</view>
|
||||
<view class="con line1"
|
||||
v-if="item.last && (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view>
|
||||
</view>
|
||||
<view class="right-box">
|
||||
<view class="time">{{item.last && item.last.create_time.split(' ')[1]}}</view>
|
||||
<view class="time">{{item.display_time}}</view>
|
||||
<view class="num" v-if="item.num>0">{{item.num}}</view>
|
||||
</view>
|
||||
</div>
|
||||
@ -57,9 +61,16 @@
|
||||
// +----------------------------------------------------------------------
|
||||
import emptyPage from '@/components/emptyPage.vue'
|
||||
|
||||
import { serviceList, serviceUserList } from "@/api/user";
|
||||
import { toLogin } from '@/libs/login.js';
|
||||
import { mapGetters } from "vuex";
|
||||
import {
|
||||
serviceList,
|
||||
serviceUserList
|
||||
} from "@/api/user";
|
||||
import {
|
||||
toLogin
|
||||
} from '@/libs/login.js';
|
||||
import {
|
||||
mapGetters
|
||||
} from "vuex";
|
||||
export default {
|
||||
name: "CustomerList",
|
||||
components: {
|
||||
@ -207,6 +218,7 @@
|
||||
transform: rotate(180deg);
|
||||
font-size: 36rpx;
|
||||
}
|
||||
|
||||
.popupn {
|
||||
position: fixed;
|
||||
width: 100%;
|
||||
@ -217,17 +229,20 @@
|
||||
height: 90rpx;
|
||||
line-height: 90rpx;
|
||||
z-index: 100;
|
||||
|
||||
.title {
|
||||
max-width: 560rpx;
|
||||
margin: 0 auto;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.iconfont {
|
||||
display: inline-block;
|
||||
position: relative;
|
||||
top: 4rpx;
|
||||
right: 0;
|
||||
}
|
||||
|
||||
.mer_logo {
|
||||
width: 34rpx;
|
||||
height: 34rpx;
|
||||
@ -235,36 +250,44 @@
|
||||
top: 6rpx;
|
||||
right: 10px;
|
||||
}
|
||||
|
||||
.mer_name {
|
||||
display: inline-block;
|
||||
max-width: 650rpx;
|
||||
}
|
||||
|
||||
.invoice-content {
|
||||
background-color: #ffffff;
|
||||
}
|
||||
}
|
||||
|
||||
.list_count {
|
||||
margin-top: 104rpx;
|
||||
}
|
||||
|
||||
.item {
|
||||
align-items: center;
|
||||
border-bottom: 1px solid #eee;
|
||||
padding: 20rpx 30rpx;
|
||||
background-color: #fff;
|
||||
|
||||
.logo image {
|
||||
width: 88rpx;
|
||||
height: 88rpx;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
.info {
|
||||
width: 334rpx;
|
||||
margin-left: 20rpx;
|
||||
|
||||
.con {
|
||||
margin-top: 10rpx;
|
||||
color: #999999;
|
||||
font-size: 24rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.right-box {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
@ -272,9 +295,11 @@
|
||||
align-items: flex-end;
|
||||
font-size: 20rpx;
|
||||
color: #BBBBBB;
|
||||
|
||||
.time {
|
||||
margin-bottom: 10rpx;
|
||||
}
|
||||
|
||||
.num {
|
||||
min-width: 6px;
|
||||
background-color: var(--view-theme);
|
||||
|
||||
@ -7,57 +7,32 @@
|
||||
background-color: #f8fafb !important;
|
||||
|
||||
.wholeSale-header {
|
||||
position: sticky;
|
||||
top: 0;
|
||||
z-index: 9;
|
||||
margin-bottom: 20rpx;
|
||||
// background-color: #40AE36;
|
||||
|
||||
.scrollview {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
height: 98rpx;
|
||||
padding-left: 32rpx;
|
||||
|
||||
.scrollview-item {
|
||||
margin-right: 30rpx;
|
||||
font-size: 28rpx;
|
||||
color: #FFFFFF;
|
||||
background-color: #40AE36;
|
||||
}
|
||||
|
||||
.scrollview-active {
|
||||
position: relative;
|
||||
font-weight: bold;
|
||||
font-size: 36rpx;
|
||||
color: #FFFFFF;
|
||||
|
||||
&::after {
|
||||
content: "";
|
||||
display: inline-block;
|
||||
position: absolute;
|
||||
bottom: -6rpx;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
width: 100%;
|
||||
height: 6rpx;
|
||||
background-color: #FFFFFF;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.wholeSale-con {
|
||||
margin: 0 20rpx;
|
||||
.wholeSale-section {
|
||||
position: sticky;
|
||||
top: calc(82rpx + var(--status-bar-height));
|
||||
padding: 0rpx 20rpx;
|
||||
background-color: #fff;
|
||||
transition: height .5s;
|
||||
overflow: hidden;
|
||||
margin-bottom: 20rpx;
|
||||
|
||||
.wholeSale-nav {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 40rpx;
|
||||
padding-bottom: 20rpx;
|
||||
|
||||
.icon {
|
||||
margin-right: 20rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.search_content {
|
||||
// margin-bottom: 40rpx;
|
||||
flex: 1;
|
||||
height: 70rpx;
|
||||
padding: 2px 2px 2px 21.05rpx;
|
||||
@ -91,15 +66,18 @@
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.category {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
overflow: auto;
|
||||
margin-bottom: 20rpx;
|
||||
padding-right: 70rpx;
|
||||
|
||||
.category-wrap {
|
||||
display: flex;
|
||||
padding-bottom: 20rpx;
|
||||
padding-bottom: 10rpx;
|
||||
|
||||
.category-item {
|
||||
display: flex;
|
||||
@ -140,6 +118,24 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.category-all {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
height: 100%;
|
||||
background-color: #f3f3f3;
|
||||
z-index: 10;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
font-size: 24rpx;
|
||||
border-radius: 4rpx;
|
||||
width: 70rpx;
|
||||
color: #919191;
|
||||
}
|
||||
}
|
||||
|
||||
.cate {
|
||||
@ -169,42 +165,83 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.comprehensive {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 0 50rpx;
|
||||
.popup-wrap {
|
||||
background-color: #fff;
|
||||
padding: 20rpx;
|
||||
|
||||
[class^=comprehensive-] {
|
||||
.popup-wrap-title {
|
||||
font-size: 36rpx;
|
||||
color: #333;
|
||||
font-weight: bold;
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
|
||||
.popup-wrap-category {
|
||||
width: 100%;
|
||||
|
||||
.popup-wrap-category-wrap {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
|
||||
.popup-wrap-category-item {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
margin: 0 20rpx 20rpx 0;
|
||||
|
||||
&:nth-child(5n) {
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
text {
|
||||
margin-right: 12rpx;
|
||||
font-size: 26rpx;
|
||||
margin-top: 16rpx;
|
||||
font-size: 24rpx;
|
||||
color: #666666;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
image {
|
||||
width: 28rpx;
|
||||
height: 28rpx;
|
||||
.popup-wrap-category-item-text {
|
||||
width: 120rpx;
|
||||
text-align: center;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
|
||||
.loudou {
|
||||
width: 24rpx;
|
||||
height: 24rpx;
|
||||
.popup-wrap-category-item-active {
|
||||
position: relative;
|
||||
|
||||
.popup-wrap-category-item-img {
|
||||
border: 2px solid #40AE36;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
text {
|
||||
background-color: #40AE36;
|
||||
color: #fff;
|
||||
padding: 2rpx 10rpx 6rpx 10rpx;
|
||||
border-radius: 50rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.wholeSale-con {
|
||||
height: 100vh;
|
||||
margin: 0 20rpx;
|
||||
padding-bottom: 30rpx;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<template>
|
||||
<view class="wholeSale">
|
||||
|
||||
<!-- 顶部 -->
|
||||
<view class="wholeSale-header" style="position: fixed;top: 0;left: 0;width: 100%;z-index: 999;">
|
||||
<view class="wholeSale-header">
|
||||
<!-- 适配不同机 -->
|
||||
<view style="height: var(--status-bar-height);background-color: #40af37;"></view>
|
||||
<view style="display: flex;padding: 20rpx 28rpx;background-color: #40af37;color: #fff;">
|
||||
@ -213,11 +250,9 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 内容 -->
|
||||
<view class="wholeSale-con" style="padding-top: calc(var(--status-bar-height) + 100rpx);">
|
||||
<!-- 分类区域 -->
|
||||
<view class="wholeSale-section" :style="{height:wrapHeight + 'rpx'}">
|
||||
<view class="wholeSale-nav">
|
||||
<!-- <u-icon class="icon" name="arrow-left" size="20" @click="navBack"></u-icon> -->
|
||||
<!-- 搜索 -->
|
||||
<view @click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}`)"
|
||||
hover-class="none" class="search_content flex_a_c_j_sb">
|
||||
<view class="flex_a_c search_content_wrap">
|
||||
@ -225,7 +260,6 @@
|
||||
<input type="text" placeholder="搜索商品名称" :value="where.keyword"
|
||||
placeholder-style="font-size: 30rpx;color:#999;" disabled style="pointer-events: none;">
|
||||
</view>
|
||||
<!-- <button class="search_btn">搜索</button> -->
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -247,6 +281,11 @@
|
||||
</block>
|
||||
</view>
|
||||
</scroll-view>
|
||||
|
||||
<view class="category-all" v-if="store_category.length > 0" @click="onAllCategory">
|
||||
<view style="margin-bottom: 20rpx;">全部</view>
|
||||
<u-icon name="list"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 商品小分类 -->
|
||||
@ -262,26 +301,44 @@
|
||||
</view>
|
||||
</scroll-view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 综合查询 -->
|
||||
<!-- <view class="comprehensive">
|
||||
<view class="comprehensive-price">
|
||||
<text>价格</text>
|
||||
<image src="@/static/new_define/priceChange.png"></image>
|
||||
</view>
|
||||
<view class="comprehensive-sales_num">
|
||||
<text>销量</text>
|
||||
</view>
|
||||
<view class="comprehensive-discount">
|
||||
<text>抵扣</text>
|
||||
<image class="loudou" src="@/static/new_define/loudou.png"></image>
|
||||
</view>
|
||||
</view> -->
|
||||
|
||||
<!-- 内容 -->
|
||||
<view class="wholeSale-con"
|
||||
:style="{height:'calc(100vh - '+wrapHeight+'rpx - 142rpx '+(isShowSmall?' - 48rpx':'')+')'}">
|
||||
<scroll-view :scroll-y="true" @scrolltolower="onScrollBottom" @scroll="onScroll" style="height: 100%;"
|
||||
@scrolltoupper="scrolltoupper" :refresher-threshold="0">
|
||||
<view>
|
||||
<!-- 流水瀑布 -->
|
||||
<WaterfallsFlow :wfList='hostProduct' @itemTap="goDetail" :type="0" />
|
||||
<loadmore :type="isLoading"></loadmore>
|
||||
<loadmore :type="isLoading" style="margin-bottom:20rpx ;"></loadmore>
|
||||
</view>
|
||||
</scroll-view>
|
||||
</view>
|
||||
|
||||
<!-- 弹框大分类 -->
|
||||
<uni-popup ref="popup" type="top" border-radius="10px 10px 0 0" z-index="1000">
|
||||
<view class="popup-wrap">
|
||||
<view style="height: var(--status-bar-height);"></view>
|
||||
<view class="popup-wrap-title">分类</view>
|
||||
<view class="popup-wrap-category">
|
||||
<view class="popup-wrap-category-wrap">
|
||||
<block v-for="(item,index) in store_category" :key="index">
|
||||
<view class="popup-wrap-category-item" :class="{'category-item-active': index==cate_change}"
|
||||
@click="changeCate(index)">
|
||||
<u--image class="popup-wrap-category-item-img" width="108rpx" :src="item.pic"
|
||||
height="108rpx" shape="circle">
|
||||
<template v-slot:loading>
|
||||
<u-loading-icon color="#999" size="15" />
|
||||
</template>
|
||||
</u--image>
|
||||
<text class="popup-wrap-category-item-text">{{item.cate_name}}</text>
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</uni-popup>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@ -310,27 +367,60 @@
|
||||
page: 1,
|
||||
limit: 20,
|
||||
mer_type: 1, //1-里海云仓, 2-云市场, 3-名优特产
|
||||
mer_cate_id: '',
|
||||
cate_pid: '',
|
||||
keyword: '',
|
||||
deduction_rate: '', //抵扣比例
|
||||
rand: 1
|
||||
}
|
||||
},
|
||||
wrapHeight: 300,
|
||||
isShowSmall: false,
|
||||
scrollTop: 0,
|
||||
}
|
||||
},
|
||||
onLoad(option) {
|
||||
this.getStoreCategory();
|
||||
this.getProductslist(true);
|
||||
},
|
||||
onReachBottom() {
|
||||
this.getProductslist();
|
||||
},
|
||||
onPageScroll() {
|
||||
|
||||
onPageScroll(e) {
|
||||
uni.$emit('scroll');
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
this.getProductslist(true);
|
||||
|
||||
watch: {
|
||||
'where.cate_pid'(newVal, oldVal) {
|
||||
if (newVal && !oldVal) {
|
||||
this.wrapHeight = 300 + 48;
|
||||
this.isShowSmall = true;
|
||||
}
|
||||
if (!newVal && oldVal) {
|
||||
this.wrapHeight = 300;
|
||||
this.isShowSmall = false;
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
onAllCategory() {
|
||||
this.$refs.popup.open();
|
||||
},
|
||||
|
||||
scrolltoupper() {
|
||||
this.getProductslist(true);
|
||||
},
|
||||
|
||||
onScrollBottom(e) {
|
||||
this.getProductslist();
|
||||
},
|
||||
|
||||
onScroll(e) {
|
||||
if (this.scrollTop >= e.target.scrollTop) { //上拉
|
||||
this.wrapHeight = 300;
|
||||
if (this.where.cate_pid) this.wrapHeight = this.wrapHeight + 48;
|
||||
} else {
|
||||
this.wrapHeight = 0;
|
||||
}
|
||||
this.scrollTop = e.target.scrollTop;
|
||||
},
|
||||
|
||||
navTo(url) {
|
||||
uni.navigateTo({
|
||||
url: url,
|
||||
@ -344,12 +434,11 @@
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
navBack() {
|
||||
uni.navigateBack();
|
||||
},
|
||||
tabsChange(e) {
|
||||
this.tabsCurr = e;
|
||||
},
|
||||
|
||||
changeCate(e) {
|
||||
this.cate_change = e;
|
||||
this.store_category_children = [];
|
||||
@ -359,13 +448,15 @@
|
||||
store_category_id: ''
|
||||
})
|
||||
this.cate_change_children = 0;
|
||||
this.where.mer_cate_id = this.store_category[e].store_category_id;
|
||||
this.where.cate_pid = this.store_category[e].store_category_id;
|
||||
this.getProductslist(true);
|
||||
|
||||
this.$refs.popup && this.$refs.popup.close();
|
||||
},
|
||||
changeChildrenCate(e) {
|
||||
this.cate_change_children = e;
|
||||
this.where.mer_cate_id = this.store_category_children[e].store_category_id;
|
||||
if (e == 0) this.where.mer_cate_id = this.store_category[this.cate_change]
|
||||
this.where.cate_pid = this.store_category_children[e].store_category_id;
|
||||
if (e == 0) this.where.cate_pid = this.store_category[this.cate_change]
|
||||
.store_category_id; // 如若选中全部, 则取父级id
|
||||
this.getProductslist(true);
|
||||
},
|
||||
@ -391,6 +482,7 @@
|
||||
}
|
||||
if (this.isLoading == -1) return;
|
||||
this.isLoading = 1;
|
||||
|
||||
getProductslist(this.where).then(res => {
|
||||
this.where.limit = res.data.limit
|
||||
this.where.page = res.data.page
|
||||
|
||||
@ -1,333 +1,8 @@
|
||||
<style lang="scss" scoped>
|
||||
page {
|
||||
background-color: #f8fafb !important;
|
||||
}
|
||||
|
||||
.wholeSale {
|
||||
background-color: #f8fafb !important;
|
||||
|
||||
.wholeSale-header {
|
||||
margin-bottom: 20rpx;
|
||||
// background-color: #40AE36;
|
||||
|
||||
.scrollview {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
height: 98rpx;
|
||||
padding-left: 32rpx;
|
||||
|
||||
.scrollview-item {
|
||||
margin-right: 30rpx;
|
||||
font-size: 28rpx;
|
||||
color: #FFFFFF;
|
||||
}
|
||||
|
||||
.scrollview-active {
|
||||
position: relative;
|
||||
font-weight: bold;
|
||||
font-size: 36rpx;
|
||||
color: #FFFFFF;
|
||||
|
||||
&::after {
|
||||
content: "";
|
||||
display: inline-block;
|
||||
position: absolute;
|
||||
bottom: -6rpx;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
width: 100%;
|
||||
height: 6rpx;
|
||||
background-color: #FFFFFF;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.wholeSale-con {
|
||||
margin: 0 20rpx;
|
||||
|
||||
.wholeSale-nav {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 40rpx;
|
||||
|
||||
.icon {
|
||||
margin-right: 20rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.search_content {
|
||||
// margin-bottom: 40rpx;
|
||||
flex: 1;
|
||||
height: 70rpx;
|
||||
padding: 2px 2px 2px 21.05rpx;
|
||||
border-radius: 80rpx;
|
||||
background: #EDEFF2;
|
||||
position: relative;
|
||||
box-sizing: border-box;
|
||||
|
||||
.search_content_wrap {
|
||||
width: 100%;
|
||||
|
||||
.icon-sousuo {
|
||||
font-size: 26.32rpx;
|
||||
font-weight: bold;
|
||||
color: #c8c7c6;
|
||||
margin-right: 17.54rpx;
|
||||
}
|
||||
|
||||
input {
|
||||
width: 80%;
|
||||
}
|
||||
}
|
||||
|
||||
.search_btn {
|
||||
width: 106rpx;
|
||||
height: 60rpx;
|
||||
line-height: 60rpx;
|
||||
background: #40AE36;
|
||||
border-radius: 100px;
|
||||
font-size: 28rpx;
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
|
||||
.category {
|
||||
width: 100%;
|
||||
overflow: auto;
|
||||
margin-bottom: 20rpx;
|
||||
|
||||
.category-wrap {
|
||||
display: flex;
|
||||
padding-bottom: 20rpx;
|
||||
|
||||
.category-item {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
margin-right: 38rpx;
|
||||
|
||||
text {
|
||||
margin-top: 16rpx;
|
||||
font-size: 24rpx;
|
||||
color: #666666;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.category-item-text {
|
||||
width: 120rpx;
|
||||
text-align: center;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
|
||||
.category-item-active {
|
||||
position: relative;
|
||||
|
||||
.category-item-img {
|
||||
border: 2px solid #40AE36;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
text {
|
||||
background-color: #40AE36;
|
||||
color: #fff;
|
||||
padding: 2rpx 10rpx 6rpx 10rpx;
|
||||
border-radius: 50rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.cate {
|
||||
width: 100%;
|
||||
overflow: auto;
|
||||
margin-bottom: 30rpx;
|
||||
|
||||
.cate-wrap {
|
||||
display: flex;
|
||||
padding-bottom: 8rpx;
|
||||
|
||||
.cate-item {
|
||||
|
||||
text {
|
||||
padding: 4rpx 16rpx;
|
||||
white-space: nowrap;
|
||||
font-size: 30rpx;
|
||||
color: #333;
|
||||
}
|
||||
}
|
||||
|
||||
.cate-item-active {
|
||||
text {
|
||||
color: #40AE36;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.comprehensive {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 0 50rpx;
|
||||
|
||||
[class^=comprehensive-] {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
text {
|
||||
margin-right: 12rpx;
|
||||
font-size: 26rpx;
|
||||
color: #666666;
|
||||
}
|
||||
|
||||
image {
|
||||
width: 28rpx;
|
||||
height: 28rpx;
|
||||
}
|
||||
|
||||
.loudou {
|
||||
width: 24rpx;
|
||||
height: 24rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.goods_list {
|
||||
.goods {
|
||||
width: 710rpx;
|
||||
height: 200rpx;
|
||||
margin: 20rpx auto;
|
||||
margin-top: 0;
|
||||
background-color: #fff;
|
||||
border-radius: 24rpx;
|
||||
display: flex;
|
||||
|
||||
.avatar {
|
||||
height: 160rpx;
|
||||
width: 160rpx;
|
||||
margin: 20rpx;
|
||||
border-radius: 12rpx;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.content {
|
||||
margin: 20rpx 0;
|
||||
width: 500rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
|
||||
.content-head {
|
||||
width: 500rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: flex-end;
|
||||
font-size: 28rpx;
|
||||
color: #333;
|
||||
|
||||
.title {
|
||||
width: 360rpx;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
|
||||
.content-two {
|
||||
display: flex;
|
||||
font-size: 24rpx;
|
||||
color: #666;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.score {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
font-weight: 500;
|
||||
font-size: 24rpx;
|
||||
line-height: 1;
|
||||
color: #000;
|
||||
|
||||
.score-title {
|
||||
margin-right: 15rpx;
|
||||
|
||||
}
|
||||
|
||||
.score_text {
|
||||
color: #fd5d2e;
|
||||
}
|
||||
|
||||
.star {
|
||||
position: relative;
|
||||
width: 111rpx;
|
||||
height: 19rpx;
|
||||
margin-right: 10rpx;
|
||||
background: url(../../columnGoods/images/star.png) left top/100% 100% no-repeat;
|
||||
overflow: hidden;
|
||||
|
||||
view {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: url(../../columnGoods/images/star_active.png) left top/111rpx 19rpx no-repeat;
|
||||
|
||||
&.star_purple {
|
||||
background: url(../../columnGoods/images/star_active_purple.png) left top/111rpx 19rpx no-repeat;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.position-address {
|
||||
position: absolute;
|
||||
top: 70rpx;
|
||||
right: -10rpx;
|
||||
// background-color: rgba(#000, 0.7);
|
||||
width: 250rpx;
|
||||
padding: 20rpx;
|
||||
padding-top: 30rpx;
|
||||
font-size: 26rpx;
|
||||
text-align: center;
|
||||
border-radius: 10rpx;
|
||||
background-image: url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/39cd0202404171145486922.png);
|
||||
background-size: 100% 100%;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
.icon {
|
||||
position: absolute;
|
||||
right: 10rpx;
|
||||
top: 25rpx;
|
||||
}
|
||||
|
||||
.btn {
|
||||
background-color: #40AE36;
|
||||
width: 100%;
|
||||
height: 40rpx;
|
||||
margin-top: 20rpx;
|
||||
border-radius: 40rpx;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<template>
|
||||
<view class="wholeSale">
|
||||
|
||||
<!-- 顶部 -->
|
||||
<view class="wholeSale-header" style="position: fixed;top: 0;left: 0;width: 100%;z-index: 999;">
|
||||
<!-- 适配不同机 -->
|
||||
<view class="wholeSale-header">
|
||||
<view style="height: var(--status-bar-height);background-color: #40af37;"></view>
|
||||
<view
|
||||
style="display: flex;padding: 20rpx 28rpx;background-color: #40af37;color: #fff;justify-content: space-between;">
|
||||
@ -351,11 +26,9 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 内容 -->
|
||||
<view class="wholeSale-con" style="padding-top: calc(var(--status-bar-height) + 100rpx);">
|
||||
<!-- 分类区域 -->
|
||||
<view class="wholeSale-section" :style="{height:wrapHeight + 'rpx'}">
|
||||
<view class="wholeSale-nav">
|
||||
<!-- <u-icon class="icon" name="arrow-left" size="20" @click="navBack"></u-icon> -->
|
||||
<!-- 搜索 -->
|
||||
<view
|
||||
@click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}&shop=true`)"
|
||||
hover-class="none" class="search_content flex_a_c_j_sb">
|
||||
@ -364,7 +37,6 @@
|
||||
<input type="text" placeholder="搜索店铺名称" :value="where.keyword"
|
||||
placeholder-style="font-size: 30rpx;color:#999;" disabled style="pointer-events: none;">
|
||||
</view>
|
||||
<!-- <button class="search_btn">搜索</button> -->
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -386,15 +58,20 @@
|
||||
</block>
|
||||
</view>
|
||||
</scroll-view>
|
||||
|
||||
<view class="category-all" v-if="store_category.length > 0" @click="onAllCategory">
|
||||
<view style="margin-bottom: 20rpx;">全部</view>
|
||||
<u-icon name="list"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 列表 -->
|
||||
<view class="goods_list">
|
||||
<view class="goods_list" :style="{height:'calc(100vh - '+wrapHeight+'rpx - 142rpx)'}">
|
||||
<scroll-view :scroll-y="true" @scrolltolower="onScrollBottom" @scroll="onScroll" style="height: 100%;"
|
||||
@scrolltoupper="scrolltoupper" :refresher-threshold="0">
|
||||
<view class="goods" v-for="(item, index) in goodsList" :key="index" @click="goStore(item.mer_id)">
|
||||
<view class="avatar">
|
||||
<!-- <image style="width: 100%;height: 100%;" :src="item.mer_avatar" mode="aspectFill" lazy-load>
|
||||
</image> -->
|
||||
<u--image width="160rpx" height="160rpx" :src="item.mer_avatar" mode="aspectFill">
|
||||
<template v-slot:loading>
|
||||
<u-loading-icon color="#999" size="15" />
|
||||
@ -404,7 +81,8 @@
|
||||
<view class="content">
|
||||
<view class="content-head">
|
||||
<view class="title">{{item.mer_name}}</view>
|
||||
<text style="font-size: 21.03rpx;color: #aaa;" v-if="item.sales>=100">月销{{item.sales}}</text>
|
||||
<text style="font-size: 21.03rpx;color: #aaa;"
|
||||
v-if="item.sales>=100">月销{{item.sales}}</text>
|
||||
</view>
|
||||
<view class="content-two">
|
||||
<view class="score">
|
||||
@ -436,7 +114,33 @@
|
||||
</view>
|
||||
</view>
|
||||
<loadmore :type="isLoading"></loadmore>
|
||||
</scroll-view>
|
||||
</view>
|
||||
|
||||
<!-- 弹框大分类 -->
|
||||
<uni-popup ref="popup" type="top" border-radius="10px 10px 0 0" z-index="1000">
|
||||
<view class="popup-wrap">
|
||||
<view style="height: var(--status-bar-height);"></view>
|
||||
<view class="popup-wrap-title">分类</view>
|
||||
<view class="popup-wrap-category">
|
||||
<view class="popup-wrap-category-wrap">
|
||||
<block v-for="(item,index) in store_category" :key="index">
|
||||
<view class="popup-wrap-category-item"
|
||||
:class="{'popup-wrap-category-item-active': index==cate_change}"
|
||||
@click="changeCate(index)">
|
||||
<u--image class="popup-wrap-category-item-img" width="108rpx" :src="item.background"
|
||||
height="108rpx" shape="circle">
|
||||
<template v-slot:loading>
|
||||
<u-loading-icon color="#999" size="15" />
|
||||
</template>
|
||||
</u--image>
|
||||
<text class="popup-wrap-category-item-text">{{item.category_name}}</text>
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</uni-popup>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@ -486,7 +190,9 @@
|
||||
type_id: '10,12,21,24',
|
||||
merchant_category_id: '',
|
||||
location: ''
|
||||
}
|
||||
},
|
||||
wrapHeight: 300,
|
||||
scrollTop: 0,
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@ -514,12 +220,36 @@
|
||||
this.storeMerchantList();
|
||||
},
|
||||
onReachBottom() {
|
||||
this.storeMerchantList();
|
||||
// this.storeMerchantList();
|
||||
},
|
||||
onPageScroll() {
|
||||
uni.$emit('scroll');
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
// this.storeMerchantList(true);
|
||||
},
|
||||
methods: {
|
||||
onAllCategory() {
|
||||
this.$refs.popup.open();
|
||||
},
|
||||
|
||||
scrolltoupper() {
|
||||
this.storeMerchantList(true);
|
||||
},
|
||||
|
||||
onScrollBottom(e) {
|
||||
this.storeMerchantList();
|
||||
},
|
||||
|
||||
onScroll(e) {
|
||||
if (this.scrollTop >= e.target.scrollTop) { //上拉
|
||||
this.wrapHeight = 300;
|
||||
} else {
|
||||
this.wrapHeight = 0;
|
||||
}
|
||||
this.scrollTop = e.target.scrollTop;
|
||||
},
|
||||
|
||||
navTo(url) {
|
||||
uni.navigateTo({
|
||||
url: url,
|
||||
@ -536,13 +266,14 @@
|
||||
navBack() {
|
||||
uni.navigateBack();
|
||||
},
|
||||
tabsChange(e) {
|
||||
this.tabsCurr = e;
|
||||
},
|
||||
|
||||
changeCate(e) {
|
||||
this.cate_change = e;
|
||||
this.where.merchant_category_id = this.store_category[e].merchant_category_id;
|
||||
this.storeMerchantList(true);
|
||||
|
||||
this.$refs.popup && this.$refs.popup.close();
|
||||
this.$forceUpdate();
|
||||
},
|
||||
// 进店
|
||||
goStore(id) {
|
||||
@ -568,10 +299,13 @@
|
||||
if (this.isLoading == -1) return;
|
||||
this.isLoading = 1;
|
||||
storeMerchantList(this.where).then(res => {
|
||||
uni.stopPullDownRefresh();
|
||||
this.goodsList = [...this.goodsList, ...res.data.list];
|
||||
this.isLoading = 0;
|
||||
if (res.data.list.length < this.where.limit) this.isLoading = -1;
|
||||
this.where.page++;
|
||||
}).catch(() => {
|
||||
uni.stopPullDownRefresh();
|
||||
})
|
||||
},
|
||||
closeShowAddress() {
|
||||
@ -669,3 +403,343 @@
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
page {
|
||||
background-color: #f8fafb !important;
|
||||
}
|
||||
|
||||
.wholeSale {
|
||||
|
||||
.wholeSale-header-search-wrap {
|
||||
padding: 30rpx 20rpx 0;
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
.wholeSale-header {
|
||||
position: sticky;
|
||||
top: 0;
|
||||
z-index: 90;
|
||||
margin-bottom: 20rpx;
|
||||
background-color: #40AE36;
|
||||
}
|
||||
|
||||
.wholeSale-section {
|
||||
position: sticky;
|
||||
top: calc(82rpx + var(--status-bar-height));
|
||||
padding: 0rpx 20rpx;
|
||||
background-color: #fff;
|
||||
transition: height .5s;
|
||||
overflow: hidden;
|
||||
margin-bottom: 20rpx;
|
||||
|
||||
.wholeSale-nav {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 40rpx;
|
||||
|
||||
.icon {
|
||||
margin-right: 20rpx;
|
||||
}
|
||||
|
||||
.search_content {
|
||||
// margin-bottom: 40rpx;
|
||||
flex: 1;
|
||||
height: 70rpx;
|
||||
padding: 2px 2px 2px 21.05rpx;
|
||||
border-radius: 80rpx;
|
||||
background: #EDEFF2;
|
||||
position: relative;
|
||||
box-sizing: border-box;
|
||||
|
||||
.search_content_wrap {
|
||||
width: 100%;
|
||||
|
||||
.icon-sousuo {
|
||||
font-size: 26.32rpx;
|
||||
font-weight: bold;
|
||||
color: #c8c7c6;
|
||||
margin-right: 17.54rpx;
|
||||
}
|
||||
|
||||
input {
|
||||
width: 80%;
|
||||
}
|
||||
}
|
||||
|
||||
.search_btn {
|
||||
width: 106rpx;
|
||||
height: 60rpx;
|
||||
line-height: 60rpx;
|
||||
background: #40AE36;
|
||||
border-radius: 100px;
|
||||
font-size: 28rpx;
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.category {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
overflow: auto;
|
||||
margin-bottom: 20rpx;
|
||||
padding-right: 70rpx;
|
||||
|
||||
.category-wrap {
|
||||
display: flex;
|
||||
padding-bottom: 20rpx;
|
||||
|
||||
.category-item {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
margin-right: 38rpx;
|
||||
|
||||
text {
|
||||
margin-top: 16rpx;
|
||||
font-size: 24rpx;
|
||||
color: #666666;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.category-item-text {
|
||||
width: 120rpx;
|
||||
text-align: center;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
|
||||
.category-item-active {
|
||||
position: relative;
|
||||
|
||||
.category-item-img {
|
||||
border: 2px solid #40AE36;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
text {
|
||||
background-color: #40AE36;
|
||||
color: #fff;
|
||||
padding: 2rpx 10rpx 6rpx 10rpx;
|
||||
border-radius: 50rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.category-all {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
height: 100%;
|
||||
background-color: #f3f3f3;
|
||||
z-index: 10;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
font-size: 24rpx;
|
||||
border-radius: 4rpx;
|
||||
width: 70rpx;
|
||||
color: #919191;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.popup-wrap {
|
||||
background-color: #fff;
|
||||
padding: 20rpx;
|
||||
|
||||
.popup-wrap-title {
|
||||
font-size: 36rpx;
|
||||
color: #333;
|
||||
font-weight: bold;
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
|
||||
.popup-wrap-category {
|
||||
width: 100%;
|
||||
|
||||
.popup-wrap-category-wrap {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
|
||||
.popup-wrap-category-item {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
margin: 0 20rpx 20rpx 0;
|
||||
|
||||
&:nth-child(5n) {
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
text {
|
||||
margin-top: 16rpx;
|
||||
font-size: 24rpx;
|
||||
color: #666666;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.popup-wrap-category-item-text {
|
||||
width: 120rpx;
|
||||
text-align: center;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
|
||||
.popup-wrap-category-item-active {
|
||||
position: relative;
|
||||
|
||||
.popup-wrap-category-item-img {
|
||||
border: 2px solid #40AE36;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
text {
|
||||
background-color: #40AE36;
|
||||
color: #fff;
|
||||
padding: 2rpx 10rpx 6rpx 10rpx;
|
||||
border-radius: 50rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.wholeSale-con {
|
||||
margin: 0 20rpx;
|
||||
}
|
||||
|
||||
.goods_list {
|
||||
padding-bottom: 30rpx;
|
||||
background-color: #f8fafb;
|
||||
|
||||
.goods {
|
||||
width: 710rpx;
|
||||
height: 200rpx;
|
||||
margin: 20rpx auto;
|
||||
margin-top: 0;
|
||||
background-color: #fff;
|
||||
border-radius: 24rpx;
|
||||
display: flex;
|
||||
|
||||
.avatar {
|
||||
height: 160rpx;
|
||||
width: 160rpx;
|
||||
margin: 20rpx;
|
||||
border-radius: 12rpx;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.content {
|
||||
margin: 20rpx 0;
|
||||
width: 500rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
|
||||
.content-head {
|
||||
width: 500rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: flex-end;
|
||||
font-size: 28rpx;
|
||||
color: #333;
|
||||
|
||||
.title {
|
||||
width: 360rpx;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
|
||||
.content-two {
|
||||
display: flex;
|
||||
font-size: 24rpx;
|
||||
color: #666;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.score {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
font-weight: 500;
|
||||
font-size: 24rpx;
|
||||
line-height: 1;
|
||||
color: #000;
|
||||
|
||||
.score-title {
|
||||
margin-right: 15rpx;
|
||||
|
||||
}
|
||||
|
||||
.score_text {
|
||||
color: #fd5d2e;
|
||||
}
|
||||
|
||||
.star {
|
||||
position: relative;
|
||||
width: 111rpx;
|
||||
height: 19rpx;
|
||||
margin-right: 10rpx;
|
||||
background: url(../../columnGoods/images/star.png) left top/100% 100% no-repeat;
|
||||
overflow: hidden;
|
||||
|
||||
view {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: url(../../columnGoods/images/star_active.png) left top/111rpx 19rpx no-repeat;
|
||||
|
||||
&.star_purple {
|
||||
background: url(../../columnGoods/images/star_active_purple.png) left top/111rpx 19rpx no-repeat;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.position-address {
|
||||
position: absolute;
|
||||
top: 70rpx;
|
||||
right: -10rpx;
|
||||
z-index: 101;
|
||||
width: 250rpx;
|
||||
padding: 20rpx;
|
||||
padding-top: 30rpx;
|
||||
font-size: 26rpx;
|
||||
text-align: center;
|
||||
border-radius: 10rpx;
|
||||
background-image: url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/39cd0202404171145486922.png);
|
||||
background-size: 100% 100%;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
.icon {
|
||||
position: absolute;
|
||||
right: 10rpx;
|
||||
top: 25rpx;
|
||||
}
|
||||
|
||||
.btn {
|
||||
background-color: #40AE36;
|
||||
width: 100%;
|
||||
height: 40rpx;
|
||||
margin-top: 20rpx;
|
||||
border-radius: 40rpx;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@ -1,61 +1,309 @@
|
||||
<template>
|
||||
<view class="wholeSale">
|
||||
<!-- 适配不同机 -->
|
||||
<view class="wholeSale-header">
|
||||
<view style="height: var(--status-bar-height);background-color: #40af37;"></view>
|
||||
<view style="display: flex;padding: 20rpx 28rpx;background-color: #40af37;color: #fff;">
|
||||
<view style="display: flex;font-weight: bold;font-size: 32rpx;"><u-icon style="margin-right: 20rpx;"
|
||||
name="arrow-left" size="20" color="#fff" @click="navBack"></u-icon>名优特产</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="wholeSale-section" :style="{height:wrapHeight + 'rpx'}">
|
||||
<view class="wholeSale-nav">
|
||||
<!-- 搜索 -->
|
||||
<view @click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}`)"
|
||||
hover-class="none" class="search_content flex_a_c_j_sb">
|
||||
<view class="flex_a_c search_content_wrap">
|
||||
<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
|
||||
<input type="text" placeholder="搜索商品名称" :value="where.keyword"
|
||||
placeholder-style="font-size: 30rpx;color:#999;" disabled style="pointer-events: none;">
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 商品大分类 -->
|
||||
<view class="category">
|
||||
<scroll-view scroll-x="true">
|
||||
<view class="category-wrap">
|
||||
<block v-for="(item,index) in store_category" :key="index">
|
||||
<view class="category-item" :class="{'category-item-active': index==cate_change}"
|
||||
@click="changeCate(index)">
|
||||
<u--image class="category-item-img" width="108rpx" :src="item.pic" height="108rpx"
|
||||
shape="circle">
|
||||
<template v-slot:loading>
|
||||
<u-loading-icon color="#999" size="15" />
|
||||
</template>
|
||||
</u--image>
|
||||
<text class="category-item-text">{{item.cate_name}}</text>
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
</scroll-view>
|
||||
|
||||
<view class="category-all" v-if="store_category.length > 0" @click="onAllCategory">
|
||||
<view style="margin-bottom: 20rpx;">全部</view>
|
||||
<u-icon name="list"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 商品小分类 -->
|
||||
<view class="cate" v-if="store_category_children.length>1">
|
||||
<scroll-view scroll-x="true">
|
||||
<view class="cate-wrap">
|
||||
<block v-for="(item,index) in store_category_children" :key="index">
|
||||
<view class="cate-item" :class="{'cate-item-active':index == cate_change_children}"
|
||||
@click="changeChildrenCate(index)">
|
||||
<text>{{item.cate_name}}</text>
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
</scroll-view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 内容 -->
|
||||
<view class="wholeSale-con" :style="{height:'calc(100vh - '+wrapHeight+'rpx - 142rpx )'}">
|
||||
<scroll-view :scroll-y="true" @scrolltolower="onScrollBottom" @scroll="onScroll" style="height: 100%;"
|
||||
@scrolltoupper="scrolltoupper" :refresher-threshold="0">
|
||||
<view>
|
||||
<!-- 流水瀑布 -->
|
||||
<WaterfallsFlow :wfList='hostProduct' @itemTap="goDetail" :type="0" />
|
||||
<loadmore :type="isLoading"></loadmore>
|
||||
</view>
|
||||
</scroll-view>
|
||||
</view>
|
||||
|
||||
<!-- 弹框大分类 -->
|
||||
<uni-popup ref="popup" type="top" border-radius="10px 10px 0 0" z-index="1000">
|
||||
<view class="popup-wrap">
|
||||
<view style="height: var(--status-bar-height);"></view>
|
||||
<view class="popup-wrap-title">分类</view>
|
||||
<view class="popup-wrap-category">
|
||||
<view class="popup-wrap-category-wrap">
|
||||
<block v-for="(item,index) in store_category" :key="index">
|
||||
<view class="popup-wrap-category-item"
|
||||
:class="{'popup-wrap-category-item-active': index==cate_change}"
|
||||
@click="changeCate(index)">
|
||||
<u--image class="popup-wrap-category-item-img" width="108rpx" :src="item.pic"
|
||||
height="108rpx" shape="circle">
|
||||
<template v-slot:loading>
|
||||
<u-loading-icon color="#999" size="15" />
|
||||
</template>
|
||||
</u--image>
|
||||
<text class="popup-wrap-category-item-text">{{item.cate_name}}</text>
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</uni-popup>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
goShopDetail
|
||||
} from '@/libs/order.js'
|
||||
import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
|
||||
import {
|
||||
getCategoryIndexList,
|
||||
getProductslist
|
||||
} from "@/api/store.js"
|
||||
export default {
|
||||
components: {
|
||||
WaterfallsFlow
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
hostProduct: [],
|
||||
store_category: [], //商品大分类
|
||||
store_category_children: [], //商品小分类
|
||||
cate_change: 0,
|
||||
cate_change_children: 0,
|
||||
isLoading: 0,
|
||||
where: {
|
||||
page: 1,
|
||||
limit: 20,
|
||||
cate_pid: '',
|
||||
keyword: '',
|
||||
mer_type: 3, //1-里海云仓, 2-云市场, 3-名优特产
|
||||
sale_type: 1, //1-零售, 2-批发
|
||||
},
|
||||
wrapHeight: 300,
|
||||
scrollTop: 0,
|
||||
}
|
||||
},
|
||||
onLoad(option) {
|
||||
this.getCategoryIndexList();
|
||||
this.getProductslist(true);
|
||||
},
|
||||
onReachBottom() {
|
||||
// this.getProductslist();
|
||||
},
|
||||
onPageScroll() {
|
||||
uni.$emit('scroll');
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
// this.getProductslist(true);
|
||||
},
|
||||
methods: {
|
||||
onAllCategory() {
|
||||
this.$refs.popup.open();
|
||||
},
|
||||
|
||||
scrolltoupper() {
|
||||
this.getProductslist(true);
|
||||
},
|
||||
|
||||
onScrollBottom(e) {
|
||||
this.getProductslist();
|
||||
},
|
||||
|
||||
onScroll(e) {
|
||||
if (this.scrollTop >= e.target.scrollTop) { //上拉
|
||||
this.wrapHeight = 300;
|
||||
} else {
|
||||
this.wrapHeight = 0;
|
||||
}
|
||||
this.scrollTop = e.target.scrollTop;
|
||||
},
|
||||
|
||||
navTo(url) {
|
||||
uni.navigateTo({
|
||||
url: url,
|
||||
success: () => {
|
||||
uni.$once('searchValue', (e) => {
|
||||
this.$nextTick(() => {
|
||||
this.where.keyword = e;
|
||||
this.getProductslist(true);
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
navBack() {
|
||||
uni.navigateBack();
|
||||
},
|
||||
|
||||
changeCate(e) {
|
||||
this.cate_change = e;
|
||||
this.store_category_children = [{
|
||||
cate_name: '全部',
|
||||
store_category_id: ''
|
||||
}];
|
||||
if (this.store_category[e].children) this.store_category_children = [...this.store_category_children, ...
|
||||
this.store_category[e].children
|
||||
];
|
||||
this.cate_change_children = 0;
|
||||
this.where.cate_pid = this.store_category[e].store_category_id;
|
||||
this.getProductslist(true);
|
||||
|
||||
this.$refs.popup && this.$refs.popup.close();
|
||||
this.$forceUpdate();
|
||||
},
|
||||
changeChildrenCate(e) {
|
||||
this.cate_change_children = e;
|
||||
this.where.cate_pid = this.store_category_children[e].store_category_id;
|
||||
if (e == 0) this.where.cate_pid = this.store_category[this.cate_change]
|
||||
.store_category_id; // 如若选中全部, 则取父级id
|
||||
this.getProductslist(true);
|
||||
},
|
||||
|
||||
getCategoryIndexList() {
|
||||
getCategoryIndexList({
|
||||
mer_type: this.where.mer_type,
|
||||
sale_type: this.where.sale_type
|
||||
}).then(res => {
|
||||
this.store_category = [{
|
||||
cate_name: '全部',
|
||||
pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0bc7a202404021652194310.png',
|
||||
store_category_id: ''
|
||||
}, ...res.data];
|
||||
this.store_category_children = this.store_category[0].children || [];
|
||||
this.store_category_children.unshift({
|
||||
cate_name: '全部',
|
||||
store_category_id: ''
|
||||
})
|
||||
})
|
||||
},
|
||||
getProductslist(reLoad = false) {
|
||||
if (reLoad) {
|
||||
this.where.page = 1;
|
||||
this.hostProduct = [];
|
||||
this.isLoading = 0;
|
||||
}
|
||||
if (this.isLoading == -1) return;
|
||||
this.isLoading = 1;
|
||||
getProductslist(this.where).then(res => {
|
||||
uni.stopPullDownRefresh();
|
||||
this.hostProduct = [...this.hostProduct, ...res.data.list];
|
||||
this.where.page++;
|
||||
this.isLoading = 0;
|
||||
if (res.data.list.length < this.where.limit) this.isLoading = -1;
|
||||
}).catch(() => {
|
||||
uni.stopPullDownRefresh();
|
||||
})
|
||||
},
|
||||
goDetail(item) {
|
||||
goShopDetail(item, this.uid).then(res => {
|
||||
if (this.isLogin) {
|
||||
initiateAssistApi(item.activity_id).then(res => {
|
||||
let id = res.data.product_assist_set_id;
|
||||
uni.hideLoading();
|
||||
uni.navigateTo({
|
||||
url: '/pages/activity/assist_detail/index?id=' + id
|
||||
});
|
||||
}).catch((err) => {
|
||||
uni.showToast({
|
||||
title: err,
|
||||
icon: 'none'
|
||||
})
|
||||
});
|
||||
} else {
|
||||
toLogin();
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
page {
|
||||
background-color: #f8fafb !important;
|
||||
}
|
||||
|
||||
.wholeSale {
|
||||
background-color: #f8fafb !important;
|
||||
|
||||
.wholeSale-header {
|
||||
position: sticky;
|
||||
top: 0;
|
||||
z-index: 90;
|
||||
background-color: #40AE36;
|
||||
}
|
||||
|
||||
.wholeSale-section {
|
||||
position: sticky;
|
||||
top: calc(82rpx + var(--status-bar-height));
|
||||
padding: 0rpx 20rpx;
|
||||
background-color: #fff;
|
||||
transition: height .5s;
|
||||
overflow: hidden;
|
||||
margin-bottom: 20rpx;
|
||||
// background-color: #40AE36;
|
||||
|
||||
.scrollview {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
height: 98rpx;
|
||||
padding-left: 32rpx;
|
||||
|
||||
.scrollview-item {
|
||||
margin-right: 30rpx;
|
||||
font-size: 28rpx;
|
||||
color: #FFFFFF;
|
||||
}
|
||||
|
||||
.scrollview-active {
|
||||
position: relative;
|
||||
font-weight: bold;
|
||||
font-size: 36rpx;
|
||||
color: #FFFFFF;
|
||||
|
||||
&::after {
|
||||
content: "";
|
||||
display: inline-block;
|
||||
position: absolute;
|
||||
bottom: -6rpx;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
width: 100%;
|
||||
height: 6rpx;
|
||||
background-color: #FFFFFF;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.wholeSale-con {
|
||||
margin: 0 20rpx;
|
||||
padding-top: 20rpx;
|
||||
z-index: 20;
|
||||
|
||||
.wholeSale-nav {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 40rpx;
|
||||
|
||||
.icon {
|
||||
margin-right: 20rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.search_content {
|
||||
// margin-bottom: 40rpx;
|
||||
flex: 1;
|
||||
height: 70rpx;
|
||||
padding: 2px 2px 2px 21.05rpx;
|
||||
@ -89,11 +337,14 @@
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.category {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
overflow: auto;
|
||||
margin-bottom: 20rpx;
|
||||
padding-right: 70rpx;
|
||||
|
||||
.category-wrap {
|
||||
display: flex;
|
||||
@ -138,274 +389,94 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.category-all {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
height: 100%;
|
||||
background-color: #f3f3f3;
|
||||
z-index: 10;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
font-size: 24rpx;
|
||||
border-radius: 4rpx;
|
||||
width: 70rpx;
|
||||
color: #919191;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.cate {
|
||||
width: 100%;
|
||||
overflow: auto;
|
||||
margin-bottom: 30rpx;
|
||||
.popup-wrap {
|
||||
background-color: #fff;
|
||||
padding: 20rpx;
|
||||
|
||||
.cate-wrap {
|
||||
display: flex;
|
||||
padding-bottom: 8rpx;
|
||||
|
||||
.cate-item {
|
||||
|
||||
text {
|
||||
padding: 4rpx 16rpx;
|
||||
white-space: nowrap;
|
||||
font-size: 30rpx;
|
||||
.popup-wrap-title {
|
||||
font-size: 36rpx;
|
||||
color: #333;
|
||||
}
|
||||
}
|
||||
|
||||
.cate-item-active {
|
||||
text {
|
||||
color: #40AE36;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
}
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
|
||||
.comprehensive {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 0 50rpx;
|
||||
.popup-wrap-category {
|
||||
width: 100%;
|
||||
|
||||
[class^=comprehensive-] {
|
||||
.popup-wrap-category-wrap {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
|
||||
.popup-wrap-category-item {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
margin: 0 20rpx 20rpx 0;
|
||||
|
||||
&:nth-child(5n) {
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
text {
|
||||
margin-right: 12rpx;
|
||||
font-size: 26rpx;
|
||||
margin-top: 16rpx;
|
||||
font-size: 24rpx;
|
||||
color: #666666;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
image {
|
||||
width: 28rpx;
|
||||
height: 28rpx;
|
||||
.popup-wrap-category-item-text {
|
||||
width: 120rpx;
|
||||
text-align: center;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
|
||||
.loudou {
|
||||
width: 24rpx;
|
||||
height: 24rpx;
|
||||
.popup-wrap-category-item-active {
|
||||
position: relative;
|
||||
|
||||
.popup-wrap-category-item-img {
|
||||
border: 2px solid #40AE36;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
text {
|
||||
background-color: #40AE36;
|
||||
color: #fff;
|
||||
padding: 2rpx 10rpx 6rpx 10rpx;
|
||||
border-radius: 50rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.wholeSale-con {
|
||||
padding-bottom: 30rpx;
|
||||
margin: 0 20rpx;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<template>
|
||||
<view class="wholeSale">
|
||||
|
||||
<!-- 顶部 -->
|
||||
<view class="wholeSale-header" style="position: fixed;top: 0;left: 0;width: 100%;z-index: 999;">
|
||||
<!-- 适配不同机 -->
|
||||
<view style="height: var(--status-bar-height);background-color: #40af37;"></view>
|
||||
<view style="display: flex;padding: 20rpx 28rpx;background-color: #40af37;color: #fff;">
|
||||
<view style="display: flex;font-weight: bold;font-size: 32rpx;"><u-icon style="margin-right: 20rpx;" name="arrow-left" size="20" color="#fff" @click="navBack"></u-icon>名优特产</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 内容 -->
|
||||
<view class="wholeSale-con" style="padding-top: calc(var(--status-bar-height) + 100rpx);">
|
||||
<view class="wholeSale-nav">
|
||||
<!-- <u-icon class="icon" name="arrow-left" size="20" @click="navBack"></u-icon> -->
|
||||
<!-- 搜索 -->
|
||||
<view @click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}`)" hover-class="none"
|
||||
class="search_content flex_a_c_j_sb">
|
||||
<view class="flex_a_c search_content_wrap">
|
||||
<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
|
||||
<input type="text" placeholder="搜索商品名称" :value="where.keyword" placeholder-style="font-size: 30rpx;color:#999;"
|
||||
disabled style="pointer-events: none;">
|
||||
</view>
|
||||
<!-- <button class="search_btn">搜索</button> -->
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 商品大分类 -->
|
||||
<view class="category">
|
||||
<scroll-view scroll-x="true">
|
||||
<view class="category-wrap">
|
||||
<block v-for="(item,index) in store_category" :key="index">
|
||||
<view class="category-item" :class="{'category-item-active': index==cate_change}" @click="changeCate(index)">
|
||||
<u--image class="category-item-img" width="108rpx" :src="item.pic" height="108rpx" shape="circle">
|
||||
<template v-slot:loading>
|
||||
<u-loading-icon color="#999" size="15" />
|
||||
</template>
|
||||
</u--image>
|
||||
<text class="category-item-text">{{item.cate_name}}</text>
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
</scroll-view>
|
||||
</view>
|
||||
|
||||
<!-- 商品小分类 -->
|
||||
<view class="cate" v-if="store_category_children.length>1">
|
||||
<scroll-view scroll-x="true">
|
||||
<view class="cate-wrap">
|
||||
<block v-for="(item,index) in store_category_children" :key="index">
|
||||
<view class="cate-item" :class="{'cate-item-active':index == cate_change_children}" @click="changeChildrenCate(index)">
|
||||
<text>{{item.cate_name}}</text>
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
</scroll-view>
|
||||
</view>
|
||||
|
||||
<!-- 综合查询 -->
|
||||
<!-- <view class="comprehensive">
|
||||
<view class="comprehensive-price">
|
||||
<text>价格</text>
|
||||
<image src="@/static/new_define/priceChange.png"></image>
|
||||
</view>
|
||||
<view class="comprehensive-sales_num">
|
||||
<text>销量</text>
|
||||
</view>
|
||||
<view class="comprehensive-discount">
|
||||
<text>抵扣</text>
|
||||
<image class="loudou" src="@/static/new_define/loudou.png"></image>
|
||||
</view>
|
||||
</view> -->
|
||||
|
||||
<!-- 流水瀑布 -->
|
||||
<WaterfallsFlow :wfList='hostProduct' @itemTap="goDetail" :type="0" />
|
||||
<loadmore :type="isLoading"></loadmore>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
goShopDetail
|
||||
} from '@/libs/order.js'
|
||||
import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
|
||||
import {
|
||||
getCategoryIndexList,
|
||||
getProductslist
|
||||
} from "@/api/store.js"
|
||||
export default {
|
||||
components: {
|
||||
WaterfallsFlow
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
hostProduct: [],
|
||||
store_category: [], //商品大分类
|
||||
store_category_children: [], //商品小分类
|
||||
cate_change: 0,
|
||||
cate_change_children: 0,
|
||||
isLoading: 0,
|
||||
where: {
|
||||
page: 1,
|
||||
limit: 20,
|
||||
cate_pid: '',
|
||||
keyword: '',
|
||||
mer_type: 3, //1-里海云仓, 2-云市场, 3-名优特产
|
||||
sale_type: 1, //1-零售, 2-批发
|
||||
}
|
||||
}
|
||||
},
|
||||
onLoad(option){
|
||||
this.getCategoryIndexList();
|
||||
this.getProductslist(true);
|
||||
},
|
||||
onReachBottom() {
|
||||
this.getProductslist();
|
||||
},
|
||||
onPageScroll() {
|
||||
uni.$emit('scroll');
|
||||
},
|
||||
methods: {
|
||||
navTo(url){
|
||||
uni.navigateTo({
|
||||
url:url,
|
||||
success: () => {
|
||||
uni.$once('searchValue', (e)=>{
|
||||
this.$nextTick(()=>{
|
||||
this.where.keyword = e;
|
||||
this.getProductslist(true);
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
navBack(){
|
||||
uni.navigateBack();
|
||||
},
|
||||
tabsChange(e) {
|
||||
this.tabsCurr = e;
|
||||
},
|
||||
changeCate(e){
|
||||
this.cate_change = e;
|
||||
this.store_category_children = [{
|
||||
cate_name: '全部',
|
||||
store_category_id: ''
|
||||
}];
|
||||
if(this.store_category[e].children) this.store_category_children = [...this.store_category_children, ...this.store_category[e].children];
|
||||
this.cate_change_children = 0;
|
||||
this.where.cate_pid = this.store_category[e].store_category_id;
|
||||
this.getProductslist(true);
|
||||
},
|
||||
changeChildrenCate(e){
|
||||
this.cate_change_children = e;
|
||||
this.where.cate_pid = this.store_category_children[e].store_category_id;
|
||||
if(e==0) this.where.cate_pid = this.store_category[this.cate_change].store_category_id; // 如若选中全部, 则取父级id
|
||||
this.getProductslist(true);
|
||||
},
|
||||
getCategoryIndexList(){
|
||||
getCategoryIndexList({mer_type: this.where.mer_type, sale_type: this.where.sale_type}).then(res=>{
|
||||
this.store_category = [{
|
||||
cate_name: '全部',
|
||||
pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0bc7a202404021652194310.png',
|
||||
store_category_id: ''
|
||||
}, ...res.data];
|
||||
this.store_category_children = this.store_category[0].children || [];
|
||||
this.store_category_children.unshift({
|
||||
cate_name: '全部',
|
||||
store_category_id: ''
|
||||
})
|
||||
})
|
||||
},
|
||||
getProductslist(reLoad=false){
|
||||
if(reLoad){
|
||||
this.where.page = 1;
|
||||
this.hostProduct = [];
|
||||
this.isLoading = 0;
|
||||
}
|
||||
if(this.isLoading==-1)return;
|
||||
this.isLoading = 1;
|
||||
getProductslist(this.where).then(res=>{
|
||||
this.hostProduct = [...this.hostProduct, ...res.data.list];
|
||||
this.where.page++;
|
||||
this.isLoading = 0;
|
||||
if(res.data.list.length<this.where.limit) this.isLoading = -1;
|
||||
})
|
||||
},
|
||||
goDetail(item) {
|
||||
goShopDetail(item, this.uid).then(res => {
|
||||
if (this.isLogin) {
|
||||
initiateAssistApi(item.activity_id).then(res => {
|
||||
let id = res.data.product_assist_set_id;
|
||||
uni.hideLoading();
|
||||
uni.navigateTo({
|
||||
url: '/pages/activity/assist_detail/index?id=' + id
|
||||
});
|
||||
}).catch((err) => {
|
||||
uni.showToast({
|
||||
title: err,
|
||||
icon: 'none'
|
||||
})
|
||||
});
|
||||
} else {
|
||||
toLogin();
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@ -144,8 +144,10 @@
|
||||
<view style="margin-right: 30rpx;" @click="scanQRcode" hover-class="none">
|
||||
<view class="iconfont icon-saoma" style="color:#fff;font-size:40rpx;"> </view>
|
||||
</view>
|
||||
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
|
||||
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none"
|
||||
style="position: relative;">
|
||||
<view class="iconfont icon-xiaoxi" style="color:#fff;font-size:40rpx;"> </view>
|
||||
<text class="iconnum" v-if="userInfoData.user_unread">{{userInfoData.user_unread}}</text>
|
||||
</navigator>
|
||||
</view>
|
||||
</view>
|
||||
@ -182,10 +184,10 @@
|
||||
<view class="content">
|
||||
<block v-if="nowMenuList.length > 0">
|
||||
<u-transition v-for="(item, index) in nowMenuList" :key="item.name" show>
|
||||
<view class="examine" @click.stop="editFlag ? removeMenu(item) : clickMenu(item)" @longpress="editFlag = true">
|
||||
<view class="examine" @click.stop="editFlag ? removeMenu(item) : clickMenu(item)"
|
||||
@longpress="editFlag = true">
|
||||
<image class="icon_img" :src="item.pic" mode="aspectFit">
|
||||
</image>
|
||||
<!-- <u-icon v-if="editFlag" class="icon" name="minus-circle-fill" color="red"></u-icon> -->
|
||||
<view v-if="editFlag" class="icon" style="background-color: red;">删除</view>
|
||||
<text class="text">{{ item.name }}</text>
|
||||
</view>
|
||||
@ -211,7 +213,6 @@
|
||||
<u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
|
||||
<view class="examine" @click.stop="pushMenu(item)">
|
||||
<image class="icon_img" :src="item.pic" mode="aspectFit"> </image>
|
||||
<!-- <u-icon class="icon" name="plus-circle-fill"></u-icon> -->
|
||||
<view class="icon">添加</view>
|
||||
<text class="text">{{ item.name }}</text>
|
||||
</view>
|
||||
@ -284,13 +285,12 @@
|
||||
backColor: 'rgba(252, 252, 252, 0)',
|
||||
newData: {},
|
||||
activeRouter: '',
|
||||
// userInfo: {},
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
...mapGetters(['userInfo', 'location', 'isLogin'])
|
||||
},
|
||||
created() {},
|
||||
onLoad() {},
|
||||
onShow() {
|
||||
this.street = this.$store.state.storage.address.townName;
|
||||
this.getNav();
|
||||
@ -304,6 +304,15 @@
|
||||
}
|
||||
this.getUserInfo();
|
||||
this.imgUrls = uni.getStorageSync('swiperImgList');
|
||||
|
||||
// 加载缓存中的菜单 2024/04/28
|
||||
let menu = uni.getStorageSync('gatherMenuList');
|
||||
if (menu) {
|
||||
menu = JSON.parse(menu);
|
||||
} else {
|
||||
menu = [];
|
||||
}
|
||||
this.nowMenuList = menu;
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
this.getUserInfo()
|
||||
@ -329,7 +338,24 @@
|
||||
onHide() {
|
||||
uni.$emit('showLoading', false);
|
||||
},
|
||||
watch: {
|
||||
nowMenuList(newVal, oldVal) {
|
||||
if (newVal) {
|
||||
uni.setStorageSync('gatherMenuList', JSON.stringify(newVal));
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
/**
|
||||
* 获取个人用户信息
|
||||
*/
|
||||
getUserInfo: function() {
|
||||
let that = this;
|
||||
getUserInfo().then(res => {
|
||||
showTab(res.data);
|
||||
this.userInfo = res.data;
|
||||
});
|
||||
},
|
||||
changeSwiper(e) {
|
||||
if (e.length > 0 && e[1].value) {
|
||||
uni.navigateTo({
|
||||
@ -586,6 +612,18 @@
|
||||
}
|
||||
}
|
||||
|
||||
.iconnum {
|
||||
min-width: 14rpx;
|
||||
color: #fff;
|
||||
background: #E93323;
|
||||
border-radius: 15rpx;
|
||||
position: absolute;
|
||||
left: 20rpx;
|
||||
top: -10rpx;
|
||||
font-size: 10px;
|
||||
padding: 0 5px;
|
||||
}
|
||||
|
||||
.site-box {
|
||||
width: 100%;
|
||||
/* #ifdef MP || APP-PLUS */
|
||||
|
||||
@ -26,11 +26,13 @@
|
||||
<productConSwiper :imgUrls="storeInfo.slider_image" :videoCoverImg="videoCoverImg"
|
||||
:videoline="storeInfo.video_link"></productConSwiper>
|
||||
<!--有氛围图-->
|
||||
<view v-if="storeInfo.atmosphere_pic" :style="{ backgroundImage: `url(${storeInfo.atmosphere_pic})` }"
|
||||
<view v-if="storeInfo.atmosphere_pic"
|
||||
:style="{ backgroundImage: `url(${storeInfo.atmosphere_pic})` }"
|
||||
class='nav acea-row row-between-wrapper'>
|
||||
<view class='money skeleton-rect'>￥<text class='num'>{{storeInfo.price}}</text>
|
||||
<text v-if="!svipData" class='y-money'>￥{{storeInfo.ot_price}}</text>
|
||||
<view class="atmosphere" v-if="svipData && svipData.show_svip_price && svipData.show_svip"
|
||||
<view class="atmosphere"
|
||||
v-if="svipData && svipData.show_svip_price && svipData.show_svip"
|
||||
style="display: inline-block;">
|
||||
<text class="vip-money">￥{{storeInfo.svip_price}}</text>
|
||||
<image class="vip-image" :src="`${domain}/static/images/svip.png`"></image>
|
||||
@ -48,12 +50,15 @@
|
||||
</view>
|
||||
<view class="fenxiang_btn">
|
||||
<view @click="setCollect"><text class="iconfont"
|
||||
:class="storeInfo.isRelation ? 'icon-yishoucang2' : 'icon-shoucang4'"></text><br />收藏</view>
|
||||
<view @click="listenerActionSheet"><text class="iconfont icon-fenxiang4"></text><br />分享</view>
|
||||
:class="storeInfo.isRelation ? 'icon-yishoucang2' : 'icon-shoucang4'"></text><br />收藏
|
||||
</view>
|
||||
<view @click="listenerActionSheet"><text
|
||||
class="iconfont icon-fenxiang4"></text><br />分享</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="storeInfo.atmosphere_pic" class='integral_count skeleton-rect'>
|
||||
<text v-if="storeInfo.max_integral > 0" class='integral'>积分最高可抵扣{{storeInfo.max_integral}}元</text>
|
||||
<text v-if="storeInfo.max_integral > 0"
|
||||
class='integral'>积分最高可抵扣{{storeInfo.max_integral}}元</text>
|
||||
<text v-if="storeInfo.delivery_free == 1" class='integral'>包邮</text>
|
||||
</view>
|
||||
<!--无氛围图-->
|
||||
@ -61,7 +66,8 @@
|
||||
<view class='money p-color skeleton-rect' style="min-width: 70rpx;">
|
||||
￥
|
||||
<text class='num'>{{storeInfo.price}}</text>
|
||||
<text style="color: #000;font-weight: 500;" v-if="storeInfo.attr&&storeInfo.attr.length==0&&storeInfo.unit_name!='无'">/{{ storeInfo.unit_name}}</text>
|
||||
<text style="color: #000;font-weight: 500;"
|
||||
v-if="storeInfo.attr&&storeInfo.attr.length==0&&storeInfo.unit_name!='无'">/{{ storeInfo.unit_name}}</text>
|
||||
<text style="color: #000;font-weight: 500;" v-else>{{" 起 "}}</text>
|
||||
<view v-if="svipData && svipData.show_svip_price && svipData.show_svip"
|
||||
style="display: inline-block;">
|
||||
@ -73,23 +79,26 @@
|
||||
<view @click="setCollect"
|
||||
style="display: flex;flex-direction: column;justify-content: center;align-items: center;">
|
||||
<!-- <text class="iconfont" :class="storeInfo.isRelation ? 'icon-yishoucang2' : 'icon-shoucang4'"></text><br/> -->
|
||||
<u-icon :name="storeInfo.isRelation?'star-fill':'star'" color="#F55726"></u-icon>
|
||||
<u-icon :name="storeInfo.isRelation?'star-fill':'star'"
|
||||
color="#F55726"></u-icon>
|
||||
收藏
|
||||
</view>
|
||||
<!-- <view @click="listenerActionSheet"><text class="iconfont icon-fenxiang4"></text><br/>分享</view> -->
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<view v-if="!storeInfo.atmosphere_pic" class='integral_count skeleton-rect'
|
||||
style="">
|
||||
<text v-if="storeInfo.max_integral > 0" class='integral' style="margin-top: 0;">积分最高可抵扣{{storeInfo.max_integral}}元</text>
|
||||
<text v-if="storeInfo.delivery_free == 1" class='integral' style="margin-top: 0;">包邮</text>
|
||||
<view v-if="!storeInfo.atmosphere_pic" class='integral_count skeleton-rect' style="">
|
||||
<text v-if="storeInfo.max_integral > 0" class='integral'
|
||||
style="margin-top: 0;">积分最高可抵扣{{storeInfo.max_integral}}元</text>
|
||||
<text v-if="storeInfo.delivery_free == 1" class='integral'
|
||||
style="margin-top: 0;">包邮</text>
|
||||
</view>
|
||||
|
||||
<view v-if="showPriceTabs" class='share acea-row row-top' style="flex-wrap: wrap;padding-top: 0rpx;">
|
||||
<view v-if="showPriceTabs" class='share acea-row row-top'
|
||||
style="flex-wrap: wrap;padding-top: 0rpx;">
|
||||
<view class='money p-color skeleton-rect price-tab'>规格: </view>
|
||||
<view class='money p-color skeleton-rect price-tab' v-for="(item, index) in storeInfo.sku" @click="selecAttr">
|
||||
<view class='money p-color skeleton-rect price-tab'
|
||||
v-for="(item, index) in storeInfo.sku" @click="selecAttr">
|
||||
￥
|
||||
<text class='num' style="font-size: 28rpx;">{{item.price}}</text>
|
||||
<text style="font-size: 26rpx;">{{"/"}}{{ item.sku || storeInfo.unit_name}}</text>
|
||||
@ -101,7 +110,8 @@
|
||||
<view class="acea-row row-between-wrapper">
|
||||
<image :src="`${domain}/static/images/svip_user.png`"></image>
|
||||
<view class="">开通 SVIP会员
|
||||
<block v-if="svipData.show_svip_price">立省<text>{{svipData.save_money}}元</text></block>
|
||||
<block v-if="svipData.show_svip_price">立省<text>{{svipData.save_money}}元</text>
|
||||
</block>
|
||||
<block v-else><text>省钱多多，权益多多</text></block>
|
||||
</view>
|
||||
</view>
|
||||
@ -110,7 +120,8 @@
|
||||
<text class="iconfont icon-jiantou"></text>
|
||||
</navigator>
|
||||
</view>
|
||||
<view v-if="!storeInfo.atmosphere_pic" class='introduce skeleton-rect' style="padding-bottom: 20rpx;margin-top: 10rpx;">
|
||||
<view v-if="!storeInfo.atmosphere_pic" class='introduce skeleton-rect'
|
||||
style="padding-bottom: 20rpx;margin-top: 10rpx;">
|
||||
<!-- <text v-if="storeInfo.merchant.type_name" class="font-bg-red bt-color">{{storeInfo.merchant.type_name}}</text>
|
||||
<text v-else-if="storeInfo.merchant.is_trader" class="font-bg-red bt-color">自营</text> -->
|
||||
{{storeInfo.store_name || ''}}
|
||||
@ -142,18 +153,13 @@
|
||||
</view>
|
||||
<view class='wrapper' v-if="storeInfo.store_info" style="padding: 28rpx;">
|
||||
<view style="padding-bottom: 20rpx;">基础信息</view>
|
||||
<view
|
||||
style="white-space: pre-wrap;color: #666666;font-size: 26rpx;border-radius: 14rpx;">
|
||||
{{storeInfo.store_info}}</view>
|
||||
<view style="white-space: pre-wrap;color: #666666;font-size: 26rpx;border-radius: 14rpx;">
|
||||
{{storeInfo.store_info}}
|
||||
</view>
|
||||
<!-- <view class='attribute acea-row row-between-wrapper skeleton-rect'>
|
||||
<view class="acea-row row-between-wrapper">{{attrTxt}}：
|
||||
<text class='atterTxt'>{{attrValue}}</text>
|
||||
</view>
|
||||
<view class='iconfont icon-jiantou'></view>
|
||||
</view> -->
|
||||
<view v-if="specsInfo.params && specsInfo.params.length>0" class="attribute acea-row row-between-wrapper"
|
||||
@click="seeSpecs">
|
||||
|
||||
<view v-if="specsInfo.params && specsInfo.params.length>0"
|
||||
class="attribute acea-row row-between-wrapper" @click="seeSpecs">
|
||||
<view class="acea-row row-middle">
|
||||
参数：
|
||||
<view class="list line1">
|
||||
@ -165,7 +171,8 @@
|
||||
<view class="iconfont icon-jiantou"></view>
|
||||
</view>
|
||||
<!--运费-->
|
||||
<view v-if="shipping || shippingValue" class='attribute acea-row row-between-wrapper' @click="showShip">
|
||||
<view v-if="shipping || shippingValue" class='attribute acea-row row-between-wrapper'
|
||||
@click="showShip">
|
||||
<view class="acea-row row-between-wrapper">运费：
|
||||
<text class='atterTxt'>{{shippingValue}}</text>
|
||||
</view>
|
||||
@ -198,7 +205,8 @@
|
||||
show-scrollbar="false">
|
||||
<view class="img-box">
|
||||
<view class="combo_item" v-for="(item,index) in comboList" :key="index">
|
||||
<view class="img-item" v-for="(itemn,indexn) in item.discountsProduct" :key="indexn">
|
||||
<view class="img-item" v-for="(itemn,indexn) in item.discountsProduct"
|
||||
:key="indexn">
|
||||
<image :src="itemn.image" mode="" @click="openCombo"></image>
|
||||
<text v-if="indexn != item.count-1" class="iconfont icon-jiahao2"></text>
|
||||
</view>
|
||||
@ -234,10 +242,11 @@
|
||||
</navigator>
|
||||
</view>
|
||||
<view class="imgList acea-row">
|
||||
<view class="pictrue" v-for="(item, index) in storeInfo.community" :key="index" v-if="index<=2"
|
||||
@click="goPlant(item)">
|
||||
<view class="pictrue" v-for="(item, index) in storeInfo.community" :key="index"
|
||||
v-if="index<=2" @click="goPlant(item)">
|
||||
<image :src="item.image[0]" class="image"></image>
|
||||
<image v-if="item.is_type == 2" class="video_img" src="@/static/images/stop.png" mode=""></image>
|
||||
<image v-if="item.is_type == 2" class="video_img" src="@/static/images/stop.png"
|
||||
mode=""></image>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -245,27 +254,25 @@
|
||||
<view class="store-wrapper" v-if="storeInfo.merchant && hide_mer_status !=1">
|
||||
<view class="store-hd skeleton-rect">
|
||||
<view v-if="storeInfo.merchant&&hide_mer_status != 1" class="store-info">
|
||||
<navigator :url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`"
|
||||
<navigator
|
||||
:url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`"
|
||||
hover-class="none" class="logo">
|
||||
<image :src="storeInfo.merchant.mer_avatar" mode=""></image>
|
||||
</navigator>
|
||||
<navigator :url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`"
|
||||
<navigator
|
||||
:url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`"
|
||||
hover-class="none" class="info">
|
||||
<view class="name line1">
|
||||
<text>{{storeInfo.merchant.mer_name ? storeInfo.merchant.mer_name : ''}}</text>
|
||||
<image v-if="margin_ico_switch==1 && margin_ico && storeInfo.merchant.is_margin == 10"
|
||||
<text class="line1"
|
||||
style="max-width:450rpx;">{{storeInfo.merchant.mer_name ? storeInfo.merchant.mer_name : ''}}</text>
|
||||
<image
|
||||
v-if="margin_ico_switch==1 && margin_ico && storeInfo.merchant.is_margin == 10"
|
||||
:src="margin_ico" class="store-margin"></image>
|
||||
<!-- <text v-if="storeInfo.merchant.type_name" class="font-bg-red ml8 bt-color">{{storeInfo.merchant.type_name}}</text>
|
||||
<text v-else-if="storeInfo.merchant.is_trader" class="font-bg-red ml8 bt-color">自营</text> -->
|
||||
</view>
|
||||
<!-- <view v-if="storeInfo.merchant.care_count" class="txt">
|
||||
{{storeInfo.merchant.care_count < 10000 ? storeInfo.merchant.care_count : (storeInfo.merchant.care_count/10000).toFixed(2)+'万'}}人关注
|
||||
</view>
|
||||
<view v-else class="txt">0人关注</view> -->
|
||||
</navigator>
|
||||
<navigator v-if="hide_mer_status != 1"
|
||||
:url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`" class="link"
|
||||
hover-class="none">进店</navigator>
|
||||
:url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`"
|
||||
class="link" hover-class="none">进店</navigator>
|
||||
</view>
|
||||
<view class="score-wrapper">
|
||||
<view class="item">
|
||||
@ -283,17 +290,20 @@
|
||||
<view class="acea-row row-between">
|
||||
<view class="title">店铺推荐</view>
|
||||
<navigator v-if="hide_mer_status!=1" class="moer-btn"
|
||||
:url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`" hover-class="none">
|
||||
:url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`"
|
||||
hover-class="none">
|
||||
查看更多<text class='iconfont icon-jiantou'></text></navigator>
|
||||
</view>
|
||||
<view class="swiper page_swiper">
|
||||
<swiper indicator-dots="true" :autoplay="false" :circular="circular" :interval="interval"
|
||||
:duration="duration" :current="swiperCur" style="750rpx;">
|
||||
<swiper indicator-dots="true" :autoplay="false" :circular="circular"
|
||||
:interval="interval" :duration="duration" :current="swiperCur" style="750rpx;">
|
||||
<block v-for="(item,index) in recommend" :key="index">
|
||||
<swiper-item class="swiper-item">
|
||||
<view class="img-box">
|
||||
<view class="img-item" v-for="(itm,idx) in item" :key="idx" @click="goProDetail(itm)">
|
||||
<easy-loadimage mode="widthFix" :image-src="itm.image"></easy-loadimage>
|
||||
<view class="img-item" v-for="(itm,idx) in item" :key="idx"
|
||||
@click="goProDetail(itm)">
|
||||
<easy-loadimage mode="widthFix"
|
||||
:image-src="itm.image"></easy-loadimage>
|
||||
<view class="txt">
|
||||
<view class="title line1">{{itm.store_name}}</view>
|
||||
<view class="price">
|
||||
@ -309,10 +319,12 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class='product-intro' id="past3" style="background-color: #fff;">
|
||||
|
||||
<view class='conter' v-if="description">
|
||||
<!-- #ifndef APP-PLUS -->
|
||||
<jyf-parser v-if="description.type == 0" :domain='domain'
|
||||
:html="description.content.replace(/<br\/>/ig, '')" ref="article" :tag-style="tagStyle"></jyf-parser>
|
||||
:html="description.content.replace(/<br\/>/ig, '')" ref="article"
|
||||
:tag-style="tagStyle"></jyf-parser>
|
||||
<!-- #endif -->
|
||||
<!-- #ifdef APP-PLUS -->
|
||||
<view v-if="description.type == 0" class="description"
|
||||
@ -320,10 +332,29 @@
|
||||
<!-- #endif -->
|
||||
<view v-else class="product_content">
|
||||
<view v-if="description.content && description.content.title" class="title">
|
||||
{{description.content.title}}</view>
|
||||
{{description.content.title}}
|
||||
</view>
|
||||
<view v-if="description.content && description.content.image" class="pictures">
|
||||
<image mode="widthFix" style="width: 100%;" v-for="(item,index) in description.content.image"
|
||||
:key="index" :src="item"></image>
|
||||
<view class="" v-for="(item,index) in description.content.image" :key="index">
|
||||
<view style="position: relative;"
|
||||
v-if='videoTypeList.includes(getSuffix(item))' @click="navGoPlay(item)">
|
||||
<!-- #ifdef APP-PLUS -->
|
||||
<image :src="item+coverUrl" mode="widthFix"
|
||||
style="background-color: #fff;width: 100vw;" />
|
||||
<!-- <image class="image-play-icon" src="/static/images/stop.png"> -->
|
||||
<u--image class="image-play-icon" src="/static/images/stop.png" width="100rpx" height="100rpx" ></u--image>
|
||||
</image>
|
||||
<!-- #endif -->
|
||||
<!-- #ifndef APP-PLUS -->
|
||||
<video :src="item" objectFit="cover" controls style="width:750rpx;"
|
||||
show-center-play-btn show-mute-btn="true" auto-pause-if-navigate
|
||||
:enable-progress-gesture="false"></video>
|
||||
<!-- #endif -->
|
||||
</view>
|
||||
<image v-else :src="item" mode="widthFix"
|
||||
style="background-color: #fff;width: 100vw;">
|
||||
</image>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -344,7 +375,8 @@
|
||||
</view>
|
||||
<view class='footer acea-row row-between-wrapper' :class="{'footpl':hide_mer_status==1}">
|
||||
<navigator v-if="hide_mer_status !=1"
|
||||
:url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`" class='item skeleton-rect'>
|
||||
:url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`"
|
||||
class='item skeleton-rect'>
|
||||
<view class='iconfont icon-dianpu'></view>
|
||||
<view>店铺</view>
|
||||
</navigator>
|
||||
@ -359,8 +391,8 @@
|
||||
</view>
|
||||
</block>
|
||||
|
||||
<navigator open-type='switchTab' class="animated item skeleton-rect" :class="animated==true?'bounceIn':''"
|
||||
url='/pages/order_addcart/order_addcart' hover-class="none">
|
||||
<navigator open-type='switchTab' class="animated item skeleton-rect"
|
||||
:class="animated==true?'bounceIn':''" url='/pages/order_addcart/order_addcart' hover-class="none">
|
||||
<view class='iconfont icon-gouwuche1'>
|
||||
<text v-if="CartCount>0" class='num'>{{CartCount || 0}}</text>
|
||||
</view>
|
||||
@ -368,8 +400,8 @@
|
||||
</navigator>
|
||||
<view v-if="attr.productSelect.stock != 0" class='bnt acea-row skeleton-rect'>
|
||||
<form @submit="joinCart" report-submit='true'>
|
||||
<button v-if="storeInfo.type != 1&&storeInfo.type != 2&&!storeInfo.mer_form_id" class='joinCart bnts'
|
||||
form-type="submit">加入购物车</button>
|
||||
<button v-if="storeInfo.type != 1&&storeInfo.type != 2&&!storeInfo.mer_form_id"
|
||||
class='joinCart bnts' form-type="submit">加入购物车</button>
|
||||
</form>
|
||||
<form @submit="goBuy" report-submit='true' v-if="attr.productSelect">
|
||||
<button class='buy bnts'
|
||||
@ -402,8 +434,8 @@
|
||||
<!-- 分享按钮 -->
|
||||
<view class="generate-posters acea-row row-middle" :class="posters ? 'on' : ''">
|
||||
<!-- #ifndef MP -->
|
||||
<button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' v-if="weixinStatus === true"
|
||||
@click="H5ShareBox = true">
|
||||
<button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none'
|
||||
v-if="weixinStatus === true" @click="H5ShareBox = true">
|
||||
<view class="iconfont icon-weixin3"></view>
|
||||
<view class="">发送给朋友</view>
|
||||
</button>
|
||||
@ -473,7 +505,9 @@
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
var sysHeight = uni.getSystemInfoSync().statusBarHeight;
|
||||
import { arrivalSubscribe } from '@/utils/SubscribeMessage.js';
|
||||
import {
|
||||
arrivalSubscribe
|
||||
} from '@/utils/SubscribeMessage.js';
|
||||
import {
|
||||
getProductDetail,
|
||||
getProductParmas,
|
||||
@ -486,13 +520,29 @@
|
||||
getDiscountsLst,
|
||||
priceRuleApi
|
||||
} from '@/api/store.js';
|
||||
import { getOrderConfirm } from '@/api/order.js';
|
||||
import { getUserInfo, imgToBase } from '@/api/user.js';
|
||||
import { getCoupons, getShopCoupons } from '@/api/api.js';
|
||||
import { getCartCounts } from '@/api/order.js';
|
||||
import { mapGetters } from "vuex";
|
||||
import { configMap } from "@/utils";
|
||||
import { imageBase64 } from "@/api/public";
|
||||
import {
|
||||
getOrderConfirm
|
||||
} from '@/api/order.js';
|
||||
import {
|
||||
getUserInfo,
|
||||
imgToBase
|
||||
} from '@/api/user.js';
|
||||
import {
|
||||
getCoupons,
|
||||
getShopCoupons
|
||||
} from '@/api/api.js';
|
||||
import {
|
||||
getCartCounts
|
||||
} from '@/api/order.js';
|
||||
import {
|
||||
mapGetters
|
||||
} from "vuex";
|
||||
import {
|
||||
configMap
|
||||
} from "@/utils";
|
||||
import {
|
||||
imageBase64
|
||||
} from "@/api/public";
|
||||
import productConSwiper from '@/components/productConSwiper';
|
||||
import couponListWindow from '@/components/couponListWindow';
|
||||
import copyPassword from '@/components/copyPassword';
|
||||
@ -500,13 +550,19 @@
|
||||
import userEvaluation from '@/components/userEvaluation';
|
||||
import shareRedPackets from '@/components/shareRedPackets';
|
||||
import specs from '@/components/specs/index.vue';
|
||||
import { toLogin } from '@/libs/login.js';
|
||||
import {
|
||||
toLogin
|
||||
} from '@/libs/login.js';
|
||||
// #ifndef H5
|
||||
import passwordPopup from '@/components/passwordPopup';
|
||||
// #endif
|
||||
import { HTTP_REQUEST_URL } from '@/config/app';
|
||||
import {
|
||||
HTTP_REQUEST_URL
|
||||
} from '@/config/app';
|
||||
import home from '@/components/home';
|
||||
import { silenceBindingSpread } from "@/utils";
|
||||
import {
|
||||
silenceBindingSpread
|
||||
} from "@/utils";
|
||||
import parser from "@/components/jyf-parser/jyf-parser";
|
||||
import history from "@/mixins/history";
|
||||
import shareScence from "@/libs/spread";
|
||||
@ -537,6 +593,8 @@
|
||||
data() {
|
||||
let that = this;
|
||||
return {
|
||||
videoTypeList: ['mp4', 'avi', 'mov', 'wmv', 'mkv', 'flv', 'mpeg', '3gp', 'webm'],
|
||||
coverUrl: '?spm=a2c4e.11153940.blogcont573781.6.c1032027sQ46VG&x-oss-process=video/snapshot,t_1000,m_fast',
|
||||
isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取
|
||||
sysHeight: sysHeight, //系统导航条高度
|
||||
//属性是否打开
|
||||
@ -677,6 +735,7 @@
|
||||
},
|
||||
},
|
||||
onLoad(options) {
|
||||
console.log(options)
|
||||
let that = this
|
||||
if (options.spid) {
|
||||
app.globalData.spid = options.spid;
|
||||
@ -789,6 +848,22 @@
|
||||
},
|
||||
// #endif
|
||||
methods: {
|
||||
navGoPlay(url) {
|
||||
uni.navigateTo({
|
||||
url: `/pages/goods_details/videoPlay?url=${url}`
|
||||
})
|
||||
|
||||
},
|
||||
getSuffix(url) {
|
||||
const str = url;
|
||||
const lastIndex = str.lastIndexOf(".");
|
||||
if (lastIndex !== -1) {
|
||||
const extension = str.substring(lastIndex + 1);
|
||||
return extension
|
||||
} else {
|
||||
console.log("字符串中没有找到点号。");
|
||||
}
|
||||
},
|
||||
call: function() {
|
||||
let that = this;
|
||||
if (that.storeInfo.merchant.service_phone) {
|
||||
@ -849,7 +924,11 @@
|
||||
typeValue = 1
|
||||
}
|
||||
// #endif
|
||||
arrivalNoticeApi({ unique: uniqueValue, type: typeValue, product_id: that.id }).then(res => {
|
||||
arrivalNoticeApi({
|
||||
unique: uniqueValue,
|
||||
type: typeValue,
|
||||
product_id: that.id
|
||||
}).then(res => {
|
||||
return that.$util.Tips({
|
||||
title: res.message
|
||||
})
|
||||
@ -912,12 +991,15 @@
|
||||
},
|
||||
/*获取套餐列表数据*/
|
||||
getDiscountsData() {
|
||||
getDiscountsLst({ product_id: this.id }).then(res => {
|
||||
getDiscountsLst({
|
||||
product_id: this.id
|
||||
}).then(res => {
|
||||
this.comboTotal = res.data.count;
|
||||
res.data.list.forEach((item, index) => {
|
||||
item.save_price = 0;
|
||||
item.discountsProduct.forEach((v, i) => {
|
||||
item.save_price += parseFloat(v.product.ot_price) - parseFloat(v.product.price)
|
||||
item.save_price += parseFloat(v.product.ot_price) - parseFloat(v
|
||||
.product.price)
|
||||
})
|
||||
})
|
||||
this.comboList = res.data.list;
|
||||
@ -990,7 +1072,8 @@
|
||||
this.$set(this, 'toView', id);
|
||||
this.$set(this, 'navActive', index);
|
||||
this.$set(this, 'lock', true);
|
||||
this.$set(this, 'scrollTop', index > 0 ? that.topArr[index] - (app.globalData.navHeight / 2) : that.topArr[
|
||||
this.$set(this, 'scrollTop', index > 0 ? that.topArr[index] - (app.globalData.navHeight / 2) : that
|
||||
.topArr[
|
||||
index]);
|
||||
},
|
||||
scroll: function(e) {
|
||||
@ -1037,7 +1120,8 @@
|
||||
this.$set(this.attr.productSelect, "cart_num", stock);
|
||||
this.$set(this, "cart_num", stock);
|
||||
}
|
||||
if (num.cart_num > this.storeInfo.once_max_count && this.storeInfo.once_max_count != 0 && this.storeInfo
|
||||
if (num.cart_num > this.storeInfo.once_max_count && this.storeInfo.once_max_count != 0 && this
|
||||
.storeInfo
|
||||
.pay_limit != 0) {
|
||||
this.$set(this.attr.productSelect, "cart_num", this.storeInfo.once_max_count);
|
||||
this.$set(this, "cart_num", this.storeInfo.once_max_count);
|
||||
@ -1072,7 +1156,8 @@
|
||||
let productSelect = this.productValue[res];
|
||||
if (productSelect) this.$set(this, "uniqueValue", productSelect.unique);
|
||||
if (productSelect && productSelect.stock > 0) {
|
||||
this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this.storeInfo
|
||||
this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this
|
||||
.storeInfo
|
||||
.image);
|
||||
this.$set(this.attr.productSelect, "price", productSelect.price);
|
||||
this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price);
|
||||
@ -1153,7 +1238,8 @@
|
||||
that.$set(that, 'pay_limit', res.data.pay_limit);
|
||||
that.$set(that, 'min_count', res.data.once_min_count);
|
||||
that.$set(that, 'svipData', res.data.show_svip_info || null);
|
||||
that.$set(that, 'svipPrice', res.data.show_svip_info && res.data.show_svip_info.show_svip_price ||
|
||||
that.$set(that, 'svipPrice', res.data.show_svip_info && res.data.show_svip_info
|
||||
.show_svip_price ||
|
||||
false);
|
||||
uni.setNavigationBarTitle({
|
||||
title: storeInfo.store_name.substring(0, 7) + "..."
|
||||
@ -1259,7 +1345,8 @@
|
||||
"store_name",
|
||||
this.storeInfo.store_name
|
||||
);
|
||||
this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this.storeInfo
|
||||
this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this
|
||||
.storeInfo
|
||||
.image);
|
||||
this.$set(this.attr.productSelect, "price", productSelect.price);
|
||||
this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price);
|
||||
@ -1474,7 +1561,8 @@
|
||||
is_new: news === undefined ? 0 : 1,
|
||||
product_id: that.id,
|
||||
cart_num: that.attr.productSelect.cart_num,
|
||||
product_attr_unique: that.attr.productSelect !== undefined ? that.attr.productSelect.unique : "",
|
||||
product_attr_unique: that.attr.productSelect !== undefined ? that.attr.productSelect.unique :
|
||||
"",
|
||||
source: this.source,
|
||||
product_type: 0,
|
||||
spread_id: this.currSpid,
|
||||
@ -1625,7 +1713,8 @@
|
||||
];
|
||||
// #endif
|
||||
//生成推广海报
|
||||
that.$util.goodsPosterCanvas(arr2, that.storeInfo.store_name, that.storeInfo.price, that.site_name, that
|
||||
that.$util.goodsPosterCanvas(arr2, that.storeInfo.store_name, that.storeInfo.price, that.site_name,
|
||||
that
|
||||
.storeInfo.ot_price,
|
||||
function(tempFilePath) {
|
||||
that.$set(that, 'posterImage', tempFilePath);
|
||||
@ -2633,4 +2722,11 @@
|
||||
color: #000000;
|
||||
// border: 1px solid #F55726;
|
||||
}
|
||||
|
||||
.image-play-icon {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
}
|
||||
</style>
|
||||
45
pages/goods_details/videoPlay.nvue
Normal file
45
pages/goods_details/videoPlay.nvue
Normal file
@ -0,0 +1,45 @@
|
||||
<template>
|
||||
<view class="">
|
||||
<video :src="url" style="width: 750rpx;height: 1400rpx;" :autoplay='true' id="myvideo" controls></video>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
url: ""
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
videoPlay() {
|
||||
console.log("开始播放了")
|
||||
},
|
||||
|
||||
videoShow() {
|
||||
this.videoContext = uni.createVideoContext("myvideo", this); // this这个是实例对象 必传
|
||||
this.videoUrl = this.url;
|
||||
this.videoContext.requestFullScreen({
|
||||
// direction: 90
|
||||
});
|
||||
this.videoContext.play();
|
||||
this.videoPlay = true; // 显示播放盒子
|
||||
|
||||
}
|
||||
|
||||
},
|
||||
onLoad(option) {
|
||||
this.url = option.url
|
||||
setTimeout(() => {
|
||||
this.videoShow()
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
|
||||
</style>
|
||||
@ -6,27 +6,33 @@
|
||||
<view class="location">
|
||||
<view class="box flex_a_c_j_sb">
|
||||
<view class="place_wrapper flex_a_c">
|
||||
<view v-if="street&&street!='未开启定位'" @click="changeMap" class="iconfont icon-weizhi" style="color:#fff;font-size:40rpx;"></view>
|
||||
<view v-if="street&&street!='未开启定位'" @click="changeMap" class="iconfont icon-weizhi"
|
||||
style="color:#fff;font-size:40rpx;"></view>
|
||||
<view v-if="street&&street!='未开启定位'" @click="changeMap" class="town_name">{{street}}</view>
|
||||
</view>
|
||||
<view class="flex_a_c_j_sb">
|
||||
<view style="margin-right: 30rpx;" @click="scanQRcode" hover-class="none">
|
||||
<view class="iconfont icon-saoma" style="color:#fff;font-size:40rpx;"> </view>
|
||||
</view>
|
||||
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
|
||||
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none"
|
||||
style="position: relative;">
|
||||
<view class="iconfont icon-xiaoxi" style="color:#fff;font-size:40rpx;"> </view>
|
||||
<text class="iconnum" v-if="userInfo.user_unread">{{userInfo.user_unread}}</text>
|
||||
</navigator>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view :style="{ height: (swiperTop)+'px','background':'#40AE36','margin-bottom':'20rpx'}"></view>
|
||||
|
||||
<!--轮播图-->
|
||||
<view class="swiperBg" :style="{ marginTop: (swiperTop + 13)+'px'}">
|
||||
<view class="swiperBg">
|
||||
<view class="swiper page_swiper" v-if="imgUrls.length">
|
||||
<swiper :autoplay="true" :circular="circular" :interval="intervals" :duration="duration"
|
||||
indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff" :current="swiperCur"
|
||||
style="height:330rpx;margin: 0 auto;width:710rpx;" @change="swiperChange" :class="{ scalex:isScale }">
|
||||
style="height:330rpx;margin: 0 auto;width:710rpx;" @change="swiperChange"
|
||||
:class="{ scalex:isScale }">
|
||||
<block v-for="(item,index) in imgUrls" :key="index">
|
||||
<swiper-item :class="{ active: index == swiperCur,scalex:isScale }">
|
||||
<view @click="goDetail(item)" class='slide-navigator acea-row row-between-wrapper'>
|
||||
@ -439,11 +445,11 @@
|
||||
|
||||
.iconnum {
|
||||
min-width: 14rpx;
|
||||
color: #E93323;
|
||||
background: #fff;
|
||||
color: #fff;
|
||||
background: #E93323;
|
||||
border-radius: 15rpx;
|
||||
position: absolute;
|
||||
right: -10rpx;
|
||||
left: 20rpx;
|
||||
top: -10rpx;
|
||||
font-size: 10px;
|
||||
padding: 0 5px;
|
||||
|
||||
@ -29,11 +29,6 @@
|
||||
</swiper-item>
|
||||
</block>
|
||||
</swiper>
|
||||
<!-- <view class="dots" :class="'dot'+txtStyle">
|
||||
<block v-for="(item,index) in imgUrls" :key="index">
|
||||
<view class="dot" :class="[docConfig == 1 ? 'square' : docConfig == 0 ? 'circular' : 'nodoc',index == swiperCur ? ' active' : '']"></view>
|
||||
</block>
|
||||
</view> -->
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
|
||||
@ -3,19 +3,27 @@
|
||||
<!-- #ifdef MP || APP-PLUS -->
|
||||
<view style="visibility: hidden;" :style="{ height: navHeight + 'rpx' }" v-if="isFixed"></view>
|
||||
<!-- #endif -->
|
||||
<view class="navTabBox tabNav" :class="{isFixed:isFixed}" :style="'background:'+bgColor+';margin-top:'+mbConfig+'rpx;color:'+txtColor+';top:'+isTop">
|
||||
<view class="navTabBox tabNav" :class="{isFixed:isFixed}"
|
||||
:style="'background:'+bgColor+';margin-top:'+mbConfig+'rpx;color:'+txtColor+';top:'+isTop">
|
||||
<view class="longTab" :style='"width:"+mainWidth+"px"'>
|
||||
<scroll-view scroll-x="true" style="white-space: nowrap; display: flex;" scroll-with-animation :scroll-left="tabLeft" show-scrollbar="true">
|
||||
<view class="longItem" :style="'width:'+isWidth+'px;color:'+(index===tabClick ? activeColor : txtColor)" :data-index="index" :class="index===tabClick?'click':''" v-for="(item,index) in tabTitle" :key="index" :id="'id'+index" @click="longClick(index,item.store_category_id,item.pid)">{{item.cate_name}}</view>
|
||||
<scroll-view scroll-x="true" style="white-space: nowrap; display: flex;" scroll-with-animation
|
||||
:scroll-left="tabLeft" show-scrollbar="true">
|
||||
<view class="longItem"
|
||||
:style="'width:'+isWidth+'px;color:'+(index===tabClick ? activeColor : txtColor)"
|
||||
:data-index="index" :class="index===tabClick?'click':''" v-for="(item,index) in tabTitle"
|
||||
:key="index" :id="'id'+index" @click="longClick(index,item.store_category_id,item.pid)">
|
||||
{{item.cate_name}}</view>
|
||||
<view class="underlineBox" :style='"transform:translateX("+isLeft+"px);width:"+isWidth+"px"'>
|
||||
<view class="underline" :style="'background-color:'+activeColor"></view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
</view>
|
||||
<navigator v-if="merId" :url="'/pages/store/home/index?id='+merId+'&type=2'" class="category" hover-class="none" :style="'background-color:'+bgColor+';color:'+txtColor">
|
||||
<navigator v-if="merId" :url="'/pages/store/home/index?id='+merId+'&type=2'" class="category"
|
||||
hover-class="none" :style="'background-color:'+bgColor+';color:'+txtColor">
|
||||
<text class="iconfont icon-fenlei3"></text>分类
|
||||
</navigator>
|
||||
<navigator v-else open-type='switchTab' url="/pages/goods_cate/goods_cate" class="category" hover-class="none" :style="'background-color:'+bgColor+';color:'+txtColor">
|
||||
<navigator v-else open-type='switchTab' url="/pages/goods_cate/goods_cate" class="category"
|
||||
hover-class="none" :style="'background-color:'+bgColor+';color:'+txtColor">
|
||||
<text class="iconfont icon-fenlei3"></text>分类
|
||||
</navigator>
|
||||
</view>
|
||||
@ -32,7 +40,9 @@
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
import { getCateData } from '@/api/api.js';
|
||||
import {
|
||||
getCateData
|
||||
} from '@/api/api.js';
|
||||
let app = getApp();
|
||||
export default {
|
||||
name: 'navTab',
|
||||
@ -172,11 +182,13 @@
|
||||
.tabNav {
|
||||
padding-top: 10rpx;
|
||||
}
|
||||
|
||||
.navTabBox {
|
||||
width: 100%;
|
||||
color: rgba(255, 255, 255, 1);
|
||||
position: relative;
|
||||
padding-bottom: 10rpx;
|
||||
|
||||
&.isFixed {
|
||||
z-index: 10;
|
||||
position: fixed;
|
||||
@ -186,15 +198,18 @@
|
||||
top: 0;
|
||||
/* #endif */
|
||||
}
|
||||
|
||||
.click {
|
||||
color: white;
|
||||
}
|
||||
|
||||
.longTab {
|
||||
/* #ifdef H5 */
|
||||
padding-right: 106rpx;
|
||||
/* #endif */
|
||||
/* #ifdef MP || APP-PLUS */
|
||||
padding-right: 116rpx;
|
||||
|
||||
/* #endif */
|
||||
.longItem {
|
||||
height: 50upx;
|
||||
@ -207,12 +222,14 @@
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
|
||||
&.click {
|
||||
font-weight: bold;
|
||||
font-size: 30rpx;
|
||||
color: #E93323;
|
||||
}
|
||||
}
|
||||
|
||||
.underlineBox {
|
||||
height: 3px;
|
||||
width: 20%;
|
||||
@ -220,12 +237,19 @@
|
||||
align-content: center;
|
||||
justify-content: center;
|
||||
transition: .5s;
|
||||
|
||||
.underline {
|
||||
width: 33rpx;
|
||||
height: 4rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.category_wrap {
|
||||
transition: height .4s;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.category {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
@ -243,12 +267,14 @@
|
||||
line-height: 50upx;
|
||||
z-index: 3;
|
||||
padding: 0 15rpx 0 25rpx;
|
||||
|
||||
.iconfont {
|
||||
font-size: 30rpx;
|
||||
margin-right: 6rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.child-box {
|
||||
width: 100%;
|
||||
position: relative;
|
||||
@ -258,6 +284,7 @@
|
||||
/* #endif */
|
||||
/* #ifdef MP */
|
||||
box-shadow: 0 2rpx 3rpx 1rpx #f9f9f9;
|
||||
|
||||
/* #endif */
|
||||
.wrapper {
|
||||
display: flex;
|
||||
@ -265,6 +292,7 @@
|
||||
padding: 20rpx 0;
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.child-item {
|
||||
flex-shrink: 0;
|
||||
width: 140rpx;
|
||||
@ -273,21 +301,25 @@
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin-left: 10rpx;
|
||||
|
||||
image {
|
||||
width: 90rpx;
|
||||
height: 90rpx;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
.txt {
|
||||
font-size: 24rpx;
|
||||
color: #282828;
|
||||
text-align: center;
|
||||
margin-top: 10rpx;
|
||||
}
|
||||
|
||||
&.on {
|
||||
image {
|
||||
border: 1px solid $theme-color-opacity;
|
||||
}
|
||||
|
||||
.txt {
|
||||
color: $theme-color;
|
||||
}
|
||||
|
||||
@ -12,7 +12,6 @@
|
||||
<homeComb v-if="smallPage" class="home-comb" :isScale="isScale" :isMenu="isMenu"
|
||||
:dataConfig="homeCombData" :userInfo="userInfo" :isFixed="isFixed" :isScrolled="isScrolled"
|
||||
@changeDiy="changeDiy"></homeComb>
|
||||
<!-- <card></card> -->
|
||||
<view v-for="(item, index) in styleConfig" :key="index">
|
||||
<block
|
||||
v-if="item.name != 'headerSerch' && item.name != 'tabNav' && item.name != 'shopList' && item.name != 'homeComb' && item.name != 'hotRanking' && item.name != 'pageFoot'">
|
||||
@ -39,12 +38,33 @@
|
||||
<hotRanking :dataConfig="item"></hotRanking>
|
||||
</block>
|
||||
</view>
|
||||
<view class="main" v-show="navIndex == 0">
|
||||
<!-- 首页推荐 -->
|
||||
<view v-if="recommend_switch == 1" class="index-product-wrapper">
|
||||
<!-- 首发新品 -->
|
||||
<recommend ref="recommendRef" :hostProduct="hostProduct[hostIndex]"
|
||||
@changeRecommedTab="changeRecommedTab" showTab :indexP="true" :isLogin="isLogin"
|
||||
:loading="loading">
|
||||
</recommend>
|
||||
<view class="loadingicon acea-row row-center-wrapper"
|
||||
v-if="hostProduct[hostIndex].length > 0 || hotLoading[hostIndex]">
|
||||
<text class="loading iconfont icon-jiazai"
|
||||
:hidden="hotLoading[hostIndex] == false"></text>
|
||||
{{ hotTitle }}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-show="navIndex == 0" class="loadingicon acea-row row-center-wrapper"
|
||||
v-if="tempArr.length && styleConfig[styleConfig.length - 1].name == 'promotionList'">
|
||||
<text class="loading iconfont icon-jiazai" :hidden="loading == false"></text>
|
||||
{{ loadTitle }}
|
||||
</view>
|
||||
<!-- #endif -->
|
||||
|
||||
<!-- #ifdef MP || APP-PLUS -->
|
||||
<homeComb class="home-comb" v-if="smallPage" :isScale="isScale" :isMenu="isMenu"
|
||||
:dataConfig="homeCombData" :isFixed="isFixed" :isScrolled="isScrolled" :userInfo="userInfo"
|
||||
@changeDiy="changeDiy" @bindHeight="bindHeighta"></homeComb>
|
||||
<!-- <card></card> -->
|
||||
<block v-for="(item, index) in styleConfig" :key="index">
|
||||
<view v-show="navIndex == 0">
|
||||
<homeComb v-if="item.name == 'homeComb' && !smallPage" :isMenu="isMenu" :dataConfig="item"
|
||||
@ -82,11 +102,10 @@
|
||||
<tabNav v-if="item.name == 'tabNav'" :dataConfig="item" class="tabNav" :tabTitle="navTop"
|
||||
@bindHeight="bindHeighta" @changeTab="changeTab" :isFixed="isFixed"></tabNav>
|
||||
</block>
|
||||
<!-- #endif -->
|
||||
|
||||
<view class="main" v-show="navIndex == 0">
|
||||
<!-- 首页推荐 -->
|
||||
<view v-if="recommend_switch == 1" class="index-product-wrapper">
|
||||
<view class="main">
|
||||
<view class="index-product-wrapper">
|
||||
<!-- 首发新品 -->
|
||||
<recommend ref="recommendRef" :hostProduct="hostProduct[hostIndex]"
|
||||
@changeRecommedTab="changeRecommedTab" showTab :indexP="true" :isLogin="isLogin"
|
||||
@ -100,11 +119,12 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-show="navIndex == 0" class="loadingicon acea-row row-center-wrapper"
|
||||
<view class="loadingicon acea-row row-center-wrapper"
|
||||
v-if="tempArr.length && styleConfig[styleConfig.length - 1].name == 'promotionList'">
|
||||
<text class="loading iconfont icon-jiazai" :hidden="loading == false"></text>
|
||||
{{ loadTitle }}
|
||||
</view>
|
||||
<!-- #endif -->
|
||||
</block>
|
||||
<!-- 分类页 -->
|
||||
<view class="productList" v-if="navIndex > 0">
|
||||
@ -654,13 +674,17 @@
|
||||
},
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
this.overflow = true;
|
||||
this.reconnect();
|
||||
// this.overflow = true;
|
||||
// this.reconnect();
|
||||
// that.overflow = true;
|
||||
// #ifdef APP-PLUS
|
||||
setTimeout(() => {
|
||||
uni.reLaunch({
|
||||
url: "/pages/index/index"
|
||||
});
|
||||
this.hotPage = 1;
|
||||
this.hotScroll = true;
|
||||
let hostList = this.hostProduct;
|
||||
hostList[this.hostIndex] = [];
|
||||
this.$set(this, 'hostProduct', hostList);
|
||||
this.loadGoods(this.hostIndex + 1);
|
||||
}, 50)
|
||||
// #endif
|
||||
},
|
||||
@ -1043,8 +1067,7 @@
|
||||
if (that.loading || that.loadend) return;
|
||||
that.loading = true;
|
||||
that.loadTitle = '';
|
||||
getProductslist(that.where)
|
||||
.then(res => {
|
||||
getProductslist(that.where).then(res => {
|
||||
let list = res.data.list;
|
||||
let productList = that.$util.SplitArray(list, that.sortProduct);
|
||||
let loadend = list.length < that.where.limit;
|
||||
@ -1053,8 +1076,7 @@
|
||||
that.loadTitle = loadend ? '已全部加载' : '加载更多';
|
||||
that.$set(that, 'sortProduct', productList);
|
||||
that.$set(that.where, 'page', that.where.page + 1);
|
||||
})
|
||||
.catch(err => {
|
||||
}).catch(err => {
|
||||
that.loading = false;
|
||||
that.loadTitle = '加载更多';
|
||||
});
|
||||
@ -1072,6 +1094,10 @@
|
||||
this.loadGoods(e);
|
||||
},
|
||||
loadGoods(e = 1) {
|
||||
|
||||
console.log(e);
|
||||
|
||||
this.$nextTick(() => {
|
||||
if (e == 1) return this.get_host_product(0);
|
||||
if (e == 2) return this.get_host_home({
|
||||
mer_type: 1
|
||||
@ -1082,6 +1108,7 @@
|
||||
if (e == 4) return this.get_host_home({
|
||||
mer_type: 3
|
||||
}, 3);
|
||||
})
|
||||
},
|
||||
/**
|
||||
* 获取我的推荐
|
||||
@ -1091,9 +1118,11 @@
|
||||
let num = that.hotLimit;
|
||||
if (!that.hotScroll) return;
|
||||
if (that.hotLoading[e]) return;
|
||||
|
||||
that.hotLoading[e] = true;
|
||||
that.hotTitle = '加载中';
|
||||
getProductHot(that.hotPage, that.hotLimit, 1, 1).then(res => {
|
||||
uni.stopPullDownRefresh();
|
||||
res.data.list = this.shuffleArray(res.data.list);
|
||||
let list = res.data.list;
|
||||
let productList = that.hostProduct;
|
||||
@ -1128,6 +1157,7 @@
|
||||
getProductslist({
|
||||
...query
|
||||
}).then(res => {
|
||||
uni.stopPullDownRefresh();
|
||||
res.data.list = this.shuffleArray(res.data.list);
|
||||
let list = res.data.list;
|
||||
let productList = that.hostProduct;
|
||||
|
||||
@ -44,7 +44,7 @@
|
||||
<navigator
|
||||
:url="hide_mer_status == 0 ? `/pages/store/home/index?id=${item.mer_id}&sale_type=${tabsCurr}` : '#'"
|
||||
class="info">
|
||||
<view class="name">{{item.mer_name}}</view>
|
||||
<view class="name line1" style="max-width: 450rpx;">{{item.mer_name}}</view>
|
||||
<text class="iconfont icon-xiangyou" style="font-weight: bold;"></text>
|
||||
</navigator>
|
||||
</view>
|
||||
@ -88,13 +88,11 @@
|
||||
</view>
|
||||
|
||||
<view class='money acea-row row-middle'>
|
||||
<view>
|
||||
<view class="line1" style="max-width: 260rpx;">
|
||||
<text class="money-price">￥{{goods.productAttr.price}}</text>
|
||||
<text class="money-unit">/份</text>
|
||||
<text
|
||||
class="money-unit">/{{goods.productAttr.sku || goods.product.unit_name}}</text>
|
||||
</view>
|
||||
<!-- <view v-if="goods.productAttr.show_svip_price" class="vipImg">
|
||||
<image :src="`${domain}/static/images/svip.png`"></image>
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
<view class='carnum acea-row row-center-wrapper'>
|
||||
@ -180,8 +178,8 @@
|
||||
@ChangCouponsUseState="ChangCouponsUseState"></couponListWindow>
|
||||
</block>
|
||||
<!-- 组件 -->
|
||||
<addcartWindow :key="addcartKey" :attr="attr" :isShow='1' :iSplus='1' :destri='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
|
||||
@goCat="goCat" @attrVal="attrVal" id='product-window'></addcartWindow>
|
||||
<addcartWindow :key="addcartKey" :attr="attr" :isShow='1' :iSplus='1' :destri='1' @myevent="onMyEvent"
|
||||
@ChangeAttr="ChangeAttr" @goCat="goCat" @attrVal="attrVal" id='product-window'></addcartWindow>
|
||||
<Authorize :isShowAuth="isShowAuth"></Authorize>
|
||||
<!--自定义底部tab栏-->
|
||||
<customTab :newData="newData" :activeRouter="activeRouter"></customTab>
|
||||
|
||||
@ -128,17 +128,19 @@
|
||||
</view>
|
||||
<view class="merchant" v-if="orderInfo.merchant && orderInfo.order_type != 1"
|
||||
@click="goStore(orderInfo.mer_id)">
|
||||
{{orderInfo.merchant.mer_name}}
|
||||
<text class="merchant_name line1">{{orderInfo.merchant.mer_name}}</text>
|
||||
<text class="iconfont icon-xiangyou"></text>
|
||||
</view>
|
||||
<block v-if="cartInfo.length>0">
|
||||
<orderGoods :orderData='orderInfo' :pay_type="orderInfo.pay_type" :status="orderInfo.status" :evaluate='orderInfo.status'
|
||||
:activityType='orderInfo.activity_type' :sale_type="sale_type" :orderId="order_id" :cartInfo="cartInfo" :jump="true">
|
||||
<orderGoods :orderData='orderInfo' :pay_type="orderInfo.pay_type" :status="orderInfo.status"
|
||||
:evaluate='orderInfo.status' :activityType='orderInfo.activity_type' :sale_type="sale_type"
|
||||
:orderId="order_id" :cartInfo="cartInfo" :jump="true">
|
||||
</orderGoods>
|
||||
<block
|
||||
v-if="orderInfo.order_type == 1 && orderInfo.takeOrderList && orderInfo.takeOrderList.length > 0"
|
||||
v-for="(item,index) in orderInfo.takeOrderList" :key="index">
|
||||
<orderGoods :orderData='item' :pay_type="orderInfo.pay_type" :status="orderInfo.status" :evaluate='item.status' :activityType='item.activity_type' :sale_type="sale_type"
|
||||
<orderGoods :orderData='item' :pay_type="orderInfo.pay_type" :status="orderInfo.status"
|
||||
:evaluate='item.status' :activityType='item.activity_type' :sale_type="sale_type"
|
||||
:orderId="item.order_id" :cartInfo="item.orderProduct" :jump="true"></orderGoods>
|
||||
</block>
|
||||
</block>
|
||||
@ -288,7 +290,8 @@
|
||||
</view>
|
||||
<view class='item acea-row row-between' v-if='orderInfo.platform_coupon_price > 0'>
|
||||
<view>平台优惠抵扣：</view>
|
||||
<view class='conter' style="width: auto;color: #F55726;">-￥{{orderInfo.platform_coupon_price}}</view>
|
||||
<view class='conter' style="width: auto;color: #F55726;">-￥{{orderInfo.platform_coupon_price}}
|
||||
</view>
|
||||
</view>
|
||||
<view class='item acea-row row-between' v-if='orderInfo.integral'>
|
||||
<view>积分抵扣：</view>
|
||||
@ -942,7 +945,8 @@
|
||||
}).then(res => {
|
||||
let cart_id = res.data.cart_id.join(',')
|
||||
return uni.navigateTo({
|
||||
url: '/pages/users/order_confirm/index?cartId=' + cart_id + '&sale_type=' + this.sale_type
|
||||
url: '/pages/users/order_confirm/index?cartId=' + cart_id + '&sale_type=' +
|
||||
this.sale_type
|
||||
});
|
||||
}).catch(err => {
|
||||
that.$util.Tips({
|
||||
@ -1054,6 +1058,7 @@
|
||||
}
|
||||
|
||||
.merchant {
|
||||
display: flex;
|
||||
width: 100%;
|
||||
height: 86rpx;
|
||||
padding: 0 30rpx;
|
||||
@ -1065,6 +1070,12 @@
|
||||
box-sizing: border-box;
|
||||
background-color: #fff;
|
||||
|
||||
.merchant_name {
|
||||
display: inline-block;
|
||||
overflow: hidden;
|
||||
max-width: 700rpx;
|
||||
}
|
||||
|
||||
.iconfont {
|
||||
margin-top: 6rpx;
|
||||
font-size: 22rpx;
|
||||
|
||||
@ -57,7 +57,7 @@
|
||||
</view>
|
||||
<!-- 店铺商品列表 -->
|
||||
<view class="order-wrapper" v-for="(item,index) in orderInfo.orderList" :key="index">
|
||||
<view class="title" @click="goStore(item)">{{item.merchant.mer_name}}<text
|
||||
<view class="title line1" @click="goStore(item)">{{item.merchant.mer_name}}<text
|
||||
class="iconfont icon-xiangyou"></text>
|
||||
</view>
|
||||
<view class="goods-box" v-if="item.orderProduct">
|
||||
|
||||
@ -305,7 +305,9 @@
|
||||
import {
|
||||
toLogin
|
||||
} from '@/libs/login.js';
|
||||
import {showTab} from "@/utils/showTab.js";
|
||||
import {
|
||||
showTab
|
||||
} from "@/utils/showTab.js";
|
||||
const app = getApp();
|
||||
export default {
|
||||
components: {
|
||||
@ -479,7 +481,7 @@
|
||||
this.getNav();
|
||||
if (that.isLogin) {
|
||||
this.getUserInfo();
|
||||
this.orderNum();
|
||||
|
||||
} else {
|
||||
// this.userInfo = {
|
||||
// is_svip: 0
|
||||
@ -524,7 +526,6 @@
|
||||
} else {
|
||||
this.openAuto()
|
||||
}
|
||||
|
||||
},
|
||||
goRouter(item) {
|
||||
var pages = getCurrentPages();
|
||||
@ -641,26 +642,54 @@
|
||||
that.is_promoter = res.data.is_promoter;
|
||||
that.extension_status = res.data.extension_status;
|
||||
that.getMyMenus();
|
||||
this.orderNum();
|
||||
});
|
||||
},
|
||||
// 订单数字
|
||||
orderNum() {
|
||||
let openType = '';
|
||||
orderData().then(({
|
||||
data
|
||||
}) => {
|
||||
this.orderMenu.forEach((item, index) => {
|
||||
switch (item.title) {
|
||||
case '待付款':
|
||||
item.num = data.noPay
|
||||
item.num = Number(data.noPay) + Number(data.mer_noPay);
|
||||
if ((data.noPay >= data.mer_noPay) || data.noPay) {
|
||||
openType = 1;
|
||||
} else {
|
||||
openType = 2;
|
||||
}
|
||||
item.url = '/pages/users/order_list/index?status=0&openType=' + openType
|
||||
break
|
||||
case '待发货':
|
||||
item.num = data.noPostage
|
||||
item.num = Number(data.noPostage) + Number(data.mer_noPostage);
|
||||
if ((data.noPostage >= data.mer_noPostage) || data.noPostage) {
|
||||
openType = 1;
|
||||
} else {
|
||||
openType = 2;
|
||||
}
|
||||
item.url = '/pages/users/order_list/index?status=1&openType=' + openType
|
||||
break
|
||||
case '待收货':
|
||||
item.num = data.noDeliver
|
||||
item.num = Number(data.noDeliver) + Number(data.mer_noDeliver);
|
||||
|
||||
if ((data.noDeliver >= data.mer_noDeliver) || data.noDeliver) {
|
||||
openType = 1;
|
||||
} else {
|
||||
openType = 2;
|
||||
}
|
||||
|
||||
item.url = '/pages/users/order_list/index?status=2&openType=' + openType
|
||||
break
|
||||
case '待评价':
|
||||
item.num = data.noComment
|
||||
item.num = Number(data.noComment) + Number(data.mer_noComment);
|
||||
if ((data.noComment >= data.mer_noComment) || data.noComment) {
|
||||
openType = 1;
|
||||
} else {
|
||||
openType = 2;
|
||||
}
|
||||
item.url = '/pages/users/order_list/index?status=3&openType=' + openType
|
||||
break
|
||||
case '售后/退款':
|
||||
item.num = data.refund
|
||||
@ -1263,11 +1292,11 @@
|
||||
|
||||
.iconnum {
|
||||
min-width: 6px;
|
||||
background-color: #fff;
|
||||
color: var(--view-theme);
|
||||
background-color: red;
|
||||
color: #fff;
|
||||
border-radius: 15rpx;
|
||||
position: absolute;
|
||||
right: -10rpx;
|
||||
left: 50rpx;
|
||||
top: -10rpx;
|
||||
font-size: 10px;
|
||||
padding: 0 4px;
|
||||
|
||||
@ -9,7 +9,8 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="whiteBg" v-if="formItem == 0">
|
||||
<div class="logon" style="display: flex;align-items: center;justify-content: center;" @click="wxLogin">
|
||||
<div class="logon" style="display: flex;align-items: center;justify-content: center;"
|
||||
@click="wxLogin">
|
||||
<u-icon name="weixin-fill" color="#fff" size="30"></u-icon> 微信一键登录
|
||||
</div>
|
||||
|
||||
@ -68,8 +69,8 @@
|
||||
<div class="acea-row row-middle">
|
||||
<image src="/static/images/code_2.png"></image>
|
||||
|
||||
<input type="number" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
|
||||
v-model="captcha" maxlength="4" />
|
||||
<input type="number" placeholder="填写验证码" placeholder-class="placeholder"
|
||||
class="codeIput" v-model="captcha" maxlength="4" />
|
||||
<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
|
||||
@click="handleVerify">
|
||||
{{ text }}
|
||||
@ -79,8 +80,8 @@
|
||||
<div class="item" v-if="isShowCode">
|
||||
<div class="acea-row row-middle">
|
||||
<image src="/static/images/code_2.png"></image>
|
||||
<input type="number" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
|
||||
v-model="codeVal" maxlength="4" />
|
||||
<input type="number" placeholder="填写验证码" placeholder-class="placeholder"
|
||||
class="codeIput" v-model="codeVal" maxlength="4" />
|
||||
<div class="code" @click="getcaptcha">
|
||||
<image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" />
|
||||
</div>
|
||||
@ -112,8 +113,8 @@
|
||||
<div class="item">
|
||||
<div class="acea-row row-middle">
|
||||
<image src="/static/images/code_2.png"></image>
|
||||
<input type="number" placeholder="填写验证码" maxLength='4' placeholder-class="placeholder" class="codeIput"
|
||||
v-model="captcha" />
|
||||
<input type="number" placeholder="填写验证码" maxLength='4' placeholder-class="placeholder"
|
||||
class="codeIput" v-model="captcha" />
|
||||
|
||||
<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
|
||||
@click="handleVerify">
|
||||
@ -132,8 +133,8 @@
|
||||
<div class="item" v-if="isShowCode">
|
||||
<div class="acea-row row-middle">
|
||||
<image src="/static/images/code_2.png"></image>
|
||||
<input type="number" placeholder="填写验证码" maxlength="4" placeholder-class="placeholder" class="codeIput"
|
||||
v-model="codeVal" />
|
||||
<input type="number" placeholder="填写验证码" maxlength="4" placeholder-class="placeholder"
|
||||
class="codeIput" v-model="codeVal" />
|
||||
<div class="code" @click="getcaptcha">
|
||||
<image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" />
|
||||
</div>
|
||||
@ -169,7 +170,8 @@
|
||||
</view>
|
||||
|
||||
<!-- #ifdef APP-PLUS -->
|
||||
<div class="protocol acea-row row-between-wrapper" style="position: fixed; bottom: 160rpx;left: 50%;transform: translate(-50%);">
|
||||
<div class="protocol acea-row row-between-wrapper"
|
||||
style="position: fixed; bottom: 160rpx;left: 50%;transform: translate(-50%);">
|
||||
<text class="protocol_text" v-if="formItem==0" @click="formItem = 1 ">其他方式登录</text>
|
||||
<text class="protocol_text" v-else @click="formItem = 0 ">微信快捷登录</text>
|
||||
</div>
|
||||
@ -188,8 +190,8 @@
|
||||
</view>
|
||||
|
||||
<view class="item acea-row row-between-wrapper">
|
||||
<input type='number' placeholder='填写验证码' maxlength="4" placeholder-class='placeholder' class="codeIput"
|
||||
v-model="captcha"></input>
|
||||
<input type='number' placeholder='填写验证码' maxlength="4" placeholder-class='placeholder'
|
||||
class="codeIput" v-model="captcha"></input>
|
||||
|
||||
<button class="code" :class="disabled === true ? 'on' : ''" :disabled='disabled'
|
||||
@click="handleVerify">
|
||||
@ -281,7 +283,9 @@
|
||||
mapGetters
|
||||
} from "vuex";
|
||||
import Verify from '@/components/verify/verify.vue';
|
||||
import { Toast } from "../../../libs/uniApi";
|
||||
import {
|
||||
Toast
|
||||
} from "../../../libs/uniApi";
|
||||
const BACK_URL = "login_back_url";
|
||||
// #ifdef APP-PLUS
|
||||
var jpushModule = uni.requireNativePlugin("JG-JPush");
|
||||
@ -379,7 +383,8 @@
|
||||
}).then(({
|
||||
data
|
||||
}) => {
|
||||
const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
|
||||
const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) ||
|
||||
"/pages/index/index";
|
||||
that.$Cache.clear(BACK_URL);
|
||||
that.$Cache.clear('login_back_url_weixin');
|
||||
that.$store.commit("LOGIN", {
|
||||
@ -498,7 +503,8 @@
|
||||
}).then(res => {
|
||||
const data = res.data;
|
||||
if (res.data.status == 200) {
|
||||
const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
|
||||
const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) ||
|
||||
"/pages/index/index";
|
||||
that.$Cache.clear(BACK_URL);
|
||||
that.$Cache.clear('login_back_url_weixin');
|
||||
that.$store.commit("LOGIN", {
|
||||
@ -591,7 +597,8 @@
|
||||
}).then(res => {
|
||||
const data = res.data;
|
||||
if (res.data.status == 200) {
|
||||
const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
|
||||
const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) ||
|
||||
"/pages/index/index";
|
||||
that.$Cache.clear(BACK_URL);
|
||||
that.$Cache.clear('login_back_url_weixin');
|
||||
that.$store.commit("LOGIN", {
|
||||
@ -648,7 +655,8 @@
|
||||
console.log('--', res);
|
||||
const data = res.data;
|
||||
if (res.data.status == 200) {
|
||||
const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
|
||||
const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) ||
|
||||
"/pages/index/index";
|
||||
that.$Cache.clear(BACK_URL);
|
||||
that.$Cache.clear('login_back_url_weixin');
|
||||
that.$store.commit("LOGIN", {
|
||||
@ -745,7 +753,8 @@
|
||||
data
|
||||
}) => {
|
||||
this.checkOpenId(data.user)
|
||||
const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
|
||||
const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) ||
|
||||
"/pages/index/index";
|
||||
that.$store.commit("LOGIN", {
|
||||
'token': data.token,
|
||||
'time': data.exp
|
||||
@ -831,7 +840,8 @@
|
||||
});
|
||||
that.$store.commit("SETUID", res.data.user.uid);
|
||||
that.$store.commit('UPDATE_USERINFO', res.data.user);
|
||||
const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
|
||||
const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) ||
|
||||
"/pages/index/index";
|
||||
that.$Cache.clear(BACK_URL);
|
||||
that.$Cache.clear('login_back_url_weixin');
|
||||
let method
|
||||
@ -914,7 +924,8 @@
|
||||
});
|
||||
that.$store.commit("SETUID", res.data.user.uid);
|
||||
that.$store.commit('UPDATE_USERINFO', res.data.user);
|
||||
const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
|
||||
const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) ||
|
||||
"/pages/index/index";
|
||||
that.$Cache.clear(BACK_URL);
|
||||
that.$Cache.clear('login_back_url_weixin');
|
||||
let method
|
||||
@ -1003,17 +1014,21 @@
|
||||
if (!that.isAgree) return that.$util.Tips({
|
||||
title: '请勾选用户协议与隐私政策'
|
||||
});
|
||||
|
||||
console.log(11)
|
||||
|
||||
loginH5({
|
||||
auth_token: uni.getStorageSync('auth_token'),
|
||||
account: that.account,
|
||||
password: that.password,
|
||||
spread: that.$Cache.get("spread")
|
||||
})
|
||||
.then(({
|
||||
}).then(({
|
||||
data
|
||||
}) => {
|
||||
console.log(data)
|
||||
this.checkOpenId(data.user)
|
||||
const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
|
||||
const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) ||
|
||||
"/pages/index/index";
|
||||
that.$store.commit("LOGIN", {
|
||||
'token': data.token,
|
||||
'time': data.exp
|
||||
@ -1052,6 +1067,7 @@
|
||||
});
|
||||
})
|
||||
.catch(e => {
|
||||
console.log(e)
|
||||
that.$util.Tips({
|
||||
title: e
|
||||
});
|
||||
|
||||
@ -9,8 +9,9 @@
|
||||
<view class="btn_tab">
|
||||
<view class="tab_item" :class="{'tab_item_active': sale_type==1}" @click="changeSaleType(1)">
|
||||
用户订单</view>
|
||||
<view v-if="mer_info.mer_settlement_agree_status||sale_type==2" class="tab_item"
|
||||
:class="{'tab_item_active': sale_type==2}" @click="changeSaleType(2)">商户订单</view>
|
||||
<view v-if="(mer_info && mer_info.mer_settlement_agree_status==1)||sale_type==2"
|
||||
class="tab_item" :class="{'tab_item_active': sale_type==2}" @click="changeSaleType(2)">商户订单
|
||||
</view>
|
||||
</view>
|
||||
<view class="btn_car" @click="toGwc">
|
||||
<text class="iconfont icon-gouwuche" style="font-size: 36rpx;"></text>
|
||||
@ -19,23 +20,28 @@
|
||||
<view class='nav acea-row row-around new-nav-tab'>
|
||||
<view class='item' :class='orderStatus==-1 ? "on": ""' @click="statusClick(-1)">
|
||||
<view>全部</view>
|
||||
<view class='num'>{{orderData.all || 0}}</view>
|
||||
<view class='num'>{{(sale_type==1?orderData.all:orderData.mer_all) || 0}}</view>
|
||||
</view>
|
||||
<view class='item' :class='orderStatus==0 ? "on": ""' @click="statusClick(0)">
|
||||
<view>待付款</view>
|
||||
<view class='num'>{{orderData.noPay || 0}}</view>
|
||||
<view class='num'>{{(sale_type==1?orderData.noPay:orderData.mer_noPay) || 0}}</view>
|
||||
</view>
|
||||
<view class='item' :class='orderStatus==1 ? "on": ""' @click="statusClick(1)">
|
||||
<view>待发货</view>
|
||||
<view class='num'>{{orderData.noPostage || 0}}</view>
|
||||
<view class='num'>{{(sale_type==1?orderData.noPostage:orderData.mer_noPostage) || 0}}</view>
|
||||
</view>
|
||||
<view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(2)">
|
||||
<view>待收货</view>
|
||||
<view class='num '>{{orderData.noDeliver || 0}}</view>
|
||||
<view class='num' v-if="sale_type == 1">{{(Number(orderData.noDeliver)) || 0}} </view>
|
||||
<view class='num' v-else>{{( Number(orderData.mer_noDeliver)) || 0}} </view>
|
||||
</view>
|
||||
<view class='item' :class='orderStatus==3 ? "on": ""' @click="statusClick(3)">
|
||||
<view>待评价</view>
|
||||
<view class='num'>{{orderData.noComment || 0}}</view>
|
||||
<view class='num'>{{(sale_type==1?orderData.noComment:orderData.mer_noComment) || 0}}</view>
|
||||
</view>
|
||||
<view class='item' :class='orderStatus==4 ? "on": ""' @click="statusClick(4)">
|
||||
<view>退款/售后</view>
|
||||
<view class='num'>{{(sale_type==1?orderData.elseRefund:orderData.mer_elseRefund) || 0}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -73,11 +79,12 @@
|
||||
<view class='num'>{{orderData.noComment || 0}}</view>
|
||||
</view>
|
||||
</view> -->
|
||||
<navigator class="search acea-row row-middle" :url="`/pages/users/order_list/search?sale_type=${sale_type}`"
|
||||
hover-class="none">
|
||||
<navigator class="search acea-row row-middle"
|
||||
:url="`/pages/users/order_list/search?sale_type=${sale_type}&status=${orderStatus}`" hover-class="none">
|
||||
<text class="iconfont icon-sousuo"></text>
|
||||
搜索我的订单
|
||||
</navigator>
|
||||
|
||||
<!--定金预售订单-->
|
||||
<view v-if="presellProList.length > 0" class="event_container"
|
||||
:style="{ 'background-image': `url(${domain}/static/images/presell_orderBg.png)`}">
|
||||
@ -103,19 +110,19 @@
|
||||
<block v-if="orderStatus == 0">
|
||||
<view class='item' v-for="(item,index) in orderList" :key="index">
|
||||
<view @click='goOrderDetails(item.group_order_id)'>
|
||||
|
||||
<view v-for="(order,j) in item.orderList" :key="order.order_id+j">
|
||||
<view class='title acea-row row-between-wrapper'>
|
||||
<view class="acea-row row-middle left-wrapper">
|
||||
<text class="iconfont icon-shangjiadingdan"></text>
|
||||
<view class="store-name">
|
||||
<view>{{item.orderList[0].merchant.mer_name}}</view>
|
||||
<view class="store-name line1">{{order.merchant.mer_name}}
|
||||
</view>
|
||||
<text class="iconfont icon-xiangyou"></text>
|
||||
</view>
|
||||
<view class='t-color'>
|
||||
{{ item.orderList[0].activity_type === 2 && item.orderList[0].orderProduct[0].cart_info.productPresell.presell_type ==2 ? "待付定金" : "待付款" }}
|
||||
{{ order.activity_type === 2 && order.orderProduct[0].cart_info.productPresell.presell_type ==2 ? "待付定金" : "待付款" }}
|
||||
</view>
|
||||
</view>
|
||||
<view v-for="(order,j) in item.orderList" :key="order.order_id+j">
|
||||
<!--预售-->
|
||||
<view v-if="order.activity_type === 2">
|
||||
<block v-for="(goods,g) in order.orderProduct">
|
||||
@ -208,6 +215,73 @@
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
|
||||
<!-- 退款 -->
|
||||
<block v-else-if="orderStatus == 4">
|
||||
<view class="goods-wrapper">
|
||||
<view>
|
||||
<view class="info-box" v-for="(item,index) in orderList" :key="index">
|
||||
<view class="title" @click="goMall(item)">
|
||||
<text class="iconfont icon-shangjiadingdan"></text>
|
||||
<text v-if="item.merchant" class="txt line1"
|
||||
style="max-width: 500rpx;">{{item.merchant.mer_name}}</text>
|
||||
<text class="iconfont icon-xiangyou"></text>
|
||||
</view>
|
||||
<view class="product-box">
|
||||
<view class="product-item" v-for="goods in item.refundProduct"
|
||||
:key="goods.order_product_id">
|
||||
<image class="img-box" :src="goods.product.cart_info.product.image" mode="">
|
||||
</image>
|
||||
<view class="msg">
|
||||
<view class="name line1"><text
|
||||
v-if="goods.product.cart_info.product_type === 2"
|
||||
class="event_name event_bg">预售</text>{{goods.product.cart_info.product.store_name}}
|
||||
</view>
|
||||
<view class="des">{{goods.product.cart_info.productAttr.sku}}</view>
|
||||
<view class="price">退款：{{goods.refund_price}}</view>
|
||||
<view class="num">x {{goods.refund_num}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="btn-box" v-if="item.status == 1">
|
||||
<view class="btn gray" @click="goDetail(item)">查看详情</view>
|
||||
<view class="btn" @click="goPage(item.refund_order_id)">退回商品</view>
|
||||
</view>
|
||||
<view class="btn-box" v-else-if="item.status == -1">
|
||||
<view class="btn" @click="goDetail(item)">查看详情</view>
|
||||
<!-- <view class="btn" @click="applyAgain(item)">再次申请</view> -->
|
||||
</view>
|
||||
<view class="btn-box" v-else>
|
||||
<view class="btn gray" v-if="item.status == 3" @click="bindDetele(item,index)">
|
||||
删除订单</view>
|
||||
<view class="btn" @click="goDetail(item)">查看详情</view>
|
||||
</view>
|
||||
<view class="status">
|
||||
<!-- 0审核中 1待发货 2待收货 3已退款 -1已拒绝 -->
|
||||
<block v-if="item.status == 0">
|
||||
<text class="iconfont icon-shenhezhong1 p-color"></text>
|
||||
</block>
|
||||
<block v-if="item.status == 1">
|
||||
<text class="iconfont icon-daituihuo"></text>
|
||||
</block>
|
||||
<block v-if="item.status == 2">
|
||||
<text class="iconfont icon-tuihuozhong"></text>
|
||||
</block>
|
||||
<block v-if="item.status == 3">
|
||||
<text class="iconfont icon-yituikuan"></text>
|
||||
</block>
|
||||
<block v-if="item.status == -1">
|
||||
<text class="iconfont icon-yijujue1"></text>
|
||||
</block>
|
||||
<block v-if="item.status == -2">
|
||||
<text class="iconfont icon-yiquxiao"></text>
|
||||
</block>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
|
||||
<!-- 待发货 待收货 待评价 已完成 -->
|
||||
<block v-else>
|
||||
<view class='item' v-for="(item,index) in orderList" :key="index">
|
||||
@ -215,8 +289,8 @@
|
||||
<view class='title acea-row row-between-wrapper'>
|
||||
<view class="acea-row row-middle left-wrapper" @click.stop="goMall(item)">
|
||||
<text class="iconfont icon-shangjiadingdan"></text>
|
||||
<view class="store-name">
|
||||
<view>{{item.merchant.mer_name}}</view>
|
||||
<view class="store-name line1">
|
||||
{{item.merchant.mer_name}}
|
||||
</view>
|
||||
<text class="iconfont icon-xiangyou"></text>
|
||||
</view>
|
||||
@ -404,7 +478,9 @@
|
||||
groupOrderList,
|
||||
orderTake,
|
||||
applyInvoiceApi,
|
||||
uploadEnvidenceApi
|
||||
uploadEnvidenceApi,
|
||||
refundListNew,
|
||||
refundDel
|
||||
} from '@/api/order.js';
|
||||
import {
|
||||
getUserInfo
|
||||
@ -500,6 +576,12 @@
|
||||
add: false,
|
||||
},
|
||||
mer_info: {},
|
||||
refundParam: {
|
||||
page: 1,
|
||||
limit: 15,
|
||||
type: 0,
|
||||
identity: ''
|
||||
}
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
@ -510,15 +592,13 @@
|
||||
onLoad(options) {
|
||||
if (options.sale_type) this.sale_type = options.sale_type;
|
||||
if (options.status) this.orderStatus = options.status;
|
||||
let user = this.$store.state.app.userInfo;
|
||||
if (user.mer_info) this.initMerInfo(user);
|
||||
if (this.isLogin) {
|
||||
this.page = 1;
|
||||
this.loadend = false;
|
||||
this.loading = false;
|
||||
this.getOrderData();
|
||||
this.getOrderList();
|
||||
this.getUserInfo();
|
||||
this.getUserInfo(options);
|
||||
this.getpreSellOrderList();
|
||||
} else {
|
||||
toLogin()
|
||||
@ -539,8 +619,25 @@
|
||||
});
|
||||
// #endif
|
||||
},
|
||||
|
||||
// 下拉刷星
|
||||
onPullDownRefresh() {
|
||||
this.loadend = false;
|
||||
this.loading = false;
|
||||
this.$set(this, 'orderList', []);
|
||||
|
||||
if (this.orderStatus == 4) {
|
||||
this.refundParam.page = 1;
|
||||
this.getRefundList();
|
||||
} else {
|
||||
this.page = 1;
|
||||
this.getOrderList();
|
||||
this.getOrderData();
|
||||
}
|
||||
},
|
||||
|
||||
methods: {
|
||||
// 赋值银行信息
|
||||
// 复制银行信息
|
||||
handleCopy() {
|
||||
let that = this;
|
||||
uni.setClipboardData({
|
||||
@ -568,29 +665,8 @@
|
||||
navBack() {
|
||||
uni.navigateBack();
|
||||
},
|
||||
initMerInfo(user) {
|
||||
this.mer_info = user;
|
||||
if (this.mer_info.mer_settlement_agree_status) {
|
||||
this.payMode.forEach(item => {
|
||||
if (item.value == 'merBalance') {
|
||||
item.payStatus = 1;
|
||||
item.number = this.mer_info.mer_money;
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
changeSaleType(type = 1) {
|
||||
if (type != this.sale_type) {
|
||||
this.sale_type = type;
|
||||
this.page = 1;
|
||||
this.loadend = false;
|
||||
this.loading = false;
|
||||
this.getOrderData();
|
||||
this.getOrderList();
|
||||
this.getUserInfo();
|
||||
this.getpreSellOrderList();
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
// 去商铺
|
||||
goMall(item) {
|
||||
if (this.hide_mer_status == 0) {
|
||||
@ -613,24 +689,34 @@
|
||||
* 获取用户信息
|
||||
*
|
||||
*/
|
||||
getUserInfo: function() {
|
||||
getUserInfo: function(options) {
|
||||
let that = this;
|
||||
getUserInfo().then(res => {
|
||||
that.payMode[2].number = res.data.now_money;
|
||||
if (res.data.mer_info) that.initMerInfo(res.data.mer_info);
|
||||
if (res.data.mer_info) that.initMerInfo(res.data.mer_info, options);
|
||||
});
|
||||
},
|
||||
/**
|
||||
* 关闭支付组件
|
||||
*
|
||||
*/
|
||||
|
||||
initMerInfo(user, options) {
|
||||
this.mer_info = user;
|
||||
if (user && user.mer_settlement_agree_status) {
|
||||
this.payMode.forEach(item => {
|
||||
if (item.value == 'merBalance') {
|
||||
item.payStatus = 1;
|
||||
item.number = this.mer_info.mer_money;
|
||||
}
|
||||
});
|
||||
//如果是opentype=2 优先展示商户订单
|
||||
if (options && options.openType && options.openType == 2) this.changeSaleType(2);
|
||||
}
|
||||
},
|
||||
|
||||
// 关闭支付组件
|
||||
payClose: function() {
|
||||
this.pay_close = false;
|
||||
},
|
||||
/**
|
||||
* 获取订单统计数据
|
||||
*
|
||||
*/
|
||||
|
||||
// 获取订单统计数据
|
||||
getOrderData: function() {
|
||||
let that = this;
|
||||
orderData({
|
||||
@ -639,10 +725,8 @@
|
||||
that.$set(that, 'orderData', res.data);
|
||||
})
|
||||
},
|
||||
/**
|
||||
* 取消订单
|
||||
*
|
||||
*/
|
||||
|
||||
// 取消订单
|
||||
cancelOrder: function(index, order_id) {
|
||||
let that = this;
|
||||
if (!order_id) return that.$util.Tips({
|
||||
@ -664,10 +748,8 @@
|
||||
});
|
||||
});
|
||||
},
|
||||
/**
|
||||
* 打开支付组件
|
||||
*
|
||||
*/
|
||||
|
||||
// 打开支付组件
|
||||
goPay: function(pay_price, order_id) {
|
||||
this.$set(this, 'pay_close', true);
|
||||
this.order_id = order_id;
|
||||
@ -693,10 +775,7 @@
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
* 支付成功回调
|
||||
*
|
||||
*/
|
||||
// 支付成功回调
|
||||
pay_complete: function() {
|
||||
this.loadend = false;
|
||||
this.page = 1;
|
||||
@ -706,17 +785,14 @@
|
||||
this.getOrderData();
|
||||
this.getOrderList();
|
||||
},
|
||||
/**
|
||||
* 支付失败回调
|
||||
*
|
||||
*/
|
||||
|
||||
// 支付失败回调
|
||||
pay_fail: function() {
|
||||
this.pay_close = false;
|
||||
this.pay_order_id = '';
|
||||
},
|
||||
/**
|
||||
* 去订单详情
|
||||
*/
|
||||
|
||||
// 去订单详情
|
||||
goOrderDetails: function(order_id) {
|
||||
let self = this
|
||||
if (!order_id) return that.$util.Tips({
|
||||
@ -755,9 +831,8 @@
|
||||
}
|
||||
// #endif
|
||||
},
|
||||
/**
|
||||
* 点击去评价
|
||||
*/
|
||||
|
||||
// 点击去评价
|
||||
goOrderDetails_Evaluation: function(order_id) {
|
||||
let self = this
|
||||
if (!order_id) return that.$util.Tips({
|
||||
@ -786,21 +861,105 @@
|
||||
}
|
||||
// #endif
|
||||
},
|
||||
/**
|
||||
* 切换类型
|
||||
*/
|
||||
|
||||
// 切换类型
|
||||
statusClick: function(status) {
|
||||
if (status == this.orderStatus) return;
|
||||
this.orderStatus = status;
|
||||
this.loadend = false;
|
||||
this.loading = false;
|
||||
this.page = 1;
|
||||
|
||||
this.$set(this, 'orderList', []);
|
||||
|
||||
if (status == 4) { //1是用户 2是商户
|
||||
if (status == this.orderStatus) return;
|
||||
this.orderStatus = status;
|
||||
this.refundParam.identity = this.sale_type;
|
||||
this.refundParam.page = 1;
|
||||
this.getRefundList();
|
||||
} else {
|
||||
if (status == this.orderStatus) return;
|
||||
this.orderStatus = status;
|
||||
this.page = 1;
|
||||
this.getOrderList();
|
||||
}
|
||||
},
|
||||
/**
|
||||
* 获取订单列表
|
||||
*/
|
||||
|
||||
changeSaleType(type = 1) {
|
||||
if (this.sale_type == type) return;
|
||||
|
||||
this.loadend = false;
|
||||
this.loading = false;
|
||||
this.$set(this, 'orderList', []);
|
||||
|
||||
if (this.orderStatus == 4) {
|
||||
this.refundParam.identity = type;
|
||||
this.refundParam.page = 1;
|
||||
this.getRefundList();
|
||||
} else {
|
||||
this.page = 1;
|
||||
this.getOrderData();
|
||||
this.getOrderList();
|
||||
this.getUserInfo();
|
||||
this.getpreSellOrderList();
|
||||
}
|
||||
this.sale_type = type;
|
||||
},
|
||||
|
||||
// 获取退款列表
|
||||
getRefundList() {
|
||||
let that = this;
|
||||
if (that.loadend) return;
|
||||
if (that.loading) return;
|
||||
that.loading = true;
|
||||
that.loadTitle = "加载更多";
|
||||
refundListNew(this.refundParam).then(res => {
|
||||
let list = res.data.list || [];
|
||||
let loadend = list.length < that.refundParam.limit;
|
||||
that.orderList = that.refundParam.page == 1 ? list : that.$util.SplitArray(list, that
|
||||
.orderList);
|
||||
that.$set(that, 'orderList', that.orderList);
|
||||
that.getProductCount();
|
||||
that.loadend = loadend;
|
||||
that.loading = false;
|
||||
that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
|
||||
that.refundParam.page = that.refundParam.page + 1;
|
||||
that.isReady = true;
|
||||
uni.stopPullDownRefresh();
|
||||
}).catch(err => {
|
||||
that.loading = false;
|
||||
that.loadTitle = "加载更多";
|
||||
})
|
||||
},
|
||||
|
||||
// 去详情页
|
||||
goDetail(item) {
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/refund/detail?id=' + item.refund_order_id
|
||||
})
|
||||
},
|
||||
|
||||
// 删除记录
|
||||
bindDetele(item, index) {
|
||||
let self = this
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '确定删除该记录吗？',
|
||||
success: function(res) {
|
||||
if (res.confirm) {
|
||||
refundDel(item.refund_order_id).then(res => {
|
||||
self.orderList.splice(index, 1)
|
||||
})
|
||||
uni.showToast({
|
||||
title: '删除成功',
|
||||
icon: 'none'
|
||||
})
|
||||
} else if (res.cancel) {
|
||||
console.log('用户点击取消');
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
// 获取订单列表
|
||||
getOrderList: function() {
|
||||
let that = this;
|
||||
if (that.loadend) return;
|
||||
@ -826,7 +985,8 @@
|
||||
that.loadend = loadend;
|
||||
that.loading = false;
|
||||
that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
|
||||
that.page = that.page + 1
|
||||
that.page = that.page + 1;
|
||||
uni.stopPullDownRefresh();
|
||||
})
|
||||
} else {
|
||||
getOrderList({
|
||||
@ -846,6 +1006,7 @@
|
||||
that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
|
||||
that.page = that.page + 1;
|
||||
that.isReady = true;
|
||||
uni.stopPullDownRefresh();
|
||||
}).catch(err => {
|
||||
that.loading = false;
|
||||
that.loadTitle = "加载更多";
|
||||
@ -853,9 +1014,8 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
/**
|
||||
* 获取定金预售订单列表
|
||||
*/
|
||||
|
||||
// 获取定金预售订单列表
|
||||
getpreSellOrderList: function() {
|
||||
let that = this;
|
||||
getOrderList({
|
||||
@ -869,9 +1029,8 @@
|
||||
that.$set(that, 'presellProList', list);
|
||||
})
|
||||
},
|
||||
/**
|
||||
* 获取单个订单商品数量
|
||||
*/
|
||||
|
||||
// 获取单个订单商品数量
|
||||
getProductCount: function() {
|
||||
if (this.orderStatus !== 0) {
|
||||
this.orderList.forEach((item, i) => {
|
||||
@ -885,9 +1044,8 @@
|
||||
})
|
||||
}
|
||||
},
|
||||
/**
|
||||
* 删除订单
|
||||
*/
|
||||
|
||||
// 删除订单
|
||||
delOrder: function(order_id, index) {
|
||||
let that = this;
|
||||
orderDel(order_id).then(res => {
|
||||
@ -905,6 +1063,7 @@
|
||||
});
|
||||
})
|
||||
},
|
||||
|
||||
// 确认收货
|
||||
confirmOrder: function(item, index) {
|
||||
let that = this;
|
||||
@ -930,6 +1089,7 @@
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
/*申请开票*/
|
||||
applyInvoice(order_id) {
|
||||
let that = this;
|
||||
@ -939,11 +1099,13 @@
|
||||
that.$refs.addInvoicing.getInvoiceDefault();
|
||||
that.$refs.addInvoicing.getInvoiceList();
|
||||
},
|
||||
|
||||
// 关闭发票弹窗
|
||||
changeInvoiceClose: function(data) {
|
||||
if (data) this.getInvoiceData(data);
|
||||
this.$set(this.invoice, 'invoice', false);
|
||||
},
|
||||
|
||||
// 开票回调
|
||||
getInvoiceData(data) {
|
||||
let that = this
|
||||
@ -959,12 +1121,138 @@
|
||||
}
|
||||
},
|
||||
onReachBottom: function() {
|
||||
if (this.orderStatus == 4)
|
||||
this.getRefundList()
|
||||
else
|
||||
this.getOrderList();
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.info-box {
|
||||
position: relative;
|
||||
margin-top: 12rpx;
|
||||
background-color: #fff;
|
||||
|
||||
.title {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 0 32rpx;
|
||||
height: 86rpx;
|
||||
border-bottom: 1px solid #F0F0F0;
|
||||
color: #282828;
|
||||
|
||||
.icon-shangjiadingdan {
|
||||
font-size: 32rpx;
|
||||
}
|
||||
|
||||
.txt {
|
||||
margin: 0 5rpx;
|
||||
}
|
||||
|
||||
.icon-xiangyou {
|
||||
color: #999;
|
||||
font-size: 20rpx;
|
||||
margin-top: 6rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.product-box {
|
||||
.product-item {
|
||||
display: flex;
|
||||
padding: 25rpx 30rpx;
|
||||
|
||||
.img-box {
|
||||
width: 130rpx;
|
||||
height: 130rpx;
|
||||
border-radius: 16rpx;
|
||||
}
|
||||
|
||||
.msg {
|
||||
position: relative;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
width: 440rpx;
|
||||
margin-left: 26rpx;
|
||||
|
||||
.name {
|
||||
font-size: 28rpx;
|
||||
color: #282828;
|
||||
}
|
||||
|
||||
.des {
|
||||
font-size: 20rpx;
|
||||
color: #868686;
|
||||
}
|
||||
|
||||
.price {
|
||||
font-size: 26rpx;
|
||||
}
|
||||
|
||||
.num {
|
||||
position: absolute;
|
||||
right: -50rpx;
|
||||
top: 4rpx;
|
||||
color: #868686;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.event_name {
|
||||
display: inline-block;
|
||||
margin-right: 9rpx;
|
||||
color: #fff;
|
||||
font-size: 20rpx;
|
||||
padding: 0 8rpx;
|
||||
line-height: 30rpx;
|
||||
text-align: center;
|
||||
border-radius: 6rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.btn-box {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
padding: 0 20rpx 20rpx;
|
||||
|
||||
.btn {
|
||||
width: 176rpx;
|
||||
height: 60rpx;
|
||||
line-height: 60rpx;
|
||||
margin-left: 18rpx;
|
||||
text-align: center;
|
||||
background: var(--view-theme);
|
||||
border-radius: 30rpx;
|
||||
color: #fff;
|
||||
font-size: 27rpx;
|
||||
|
||||
&.gray {
|
||||
border: 1px solid #ddd;
|
||||
background: transparent;
|
||||
color: #aaa;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.status {
|
||||
position: absolute;
|
||||
right: 30rpx;
|
||||
top: 0;
|
||||
|
||||
.iconfont {
|
||||
font-size: 120rpx;
|
||||
opacity: .3;
|
||||
}
|
||||
|
||||
.p-color {
|
||||
color: var(--view-theme);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.popups {
|
||||
width: 640rpx;
|
||||
background-color: #fff;
|
||||
@ -1093,6 +1381,7 @@
|
||||
}
|
||||
|
||||
.store-name {
|
||||
max-width: 400rpx;
|
||||
margin: 0 10rpx;
|
||||
}
|
||||
|
||||
|
||||
@ -4,7 +4,8 @@
|
||||
<view class='header'>
|
||||
<view class="search acea-row row-middle">
|
||||
<text class="iconfont icon-sousuo"></text>
|
||||
<input v-model="store_name" :focus="focus" confirm-type="search" placeholder="搜索我的订单" class="input" inputmode="search" @confirm="handleSearch" />
|
||||
<input v-model="store_name" :focus="focus" confirm-type="search" placeholder="搜索我的订单" class="input"
|
||||
inputmode="search" @confirm="handleSearch" />
|
||||
</view>
|
||||
</view>
|
||||
<view class='list'>
|
||||
@ -17,7 +18,9 @@
|
||||
<view class="acea-row row-middle left-wrapper">
|
||||
{{item.group_order_sn}}
|
||||
</view>
|
||||
<view class='t-color'>{{ item.orderList[0].activity_type === 2 && item.orderList[0].orderProduct[0].cart_info.productPresell.presell_type ==2 ? "待付定金" : "待付款" }}</view>
|
||||
<view class='t-color'>
|
||||
{{ item.orderList[0].activity_type === 2 && item.orderList[0].orderProduct[0].cart_info.productPresell.presell_type ==2 ? "待付定金" : "待付款" }}
|
||||
</view>
|
||||
</view>
|
||||
<view v-for="(order,j) in item.orderList" :key="order.order_id+j">
|
||||
<!--预售-->
|
||||
@ -25,28 +28,36 @@
|
||||
<block v-for="(goods,g) in order.orderProduct">
|
||||
<view class='item-info acea-row row-between row-top'>
|
||||
<view class='pictrue'>
|
||||
<image :src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'></image>
|
||||
<image
|
||||
:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
|
||||
</image>
|
||||
</view>
|
||||
<view class='text acea-row row-between'>
|
||||
<view class='name line1'>
|
||||
<text class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
|
||||
<text
|
||||
class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
|
||||
<view class="event_ship event_color">发货时间：
|
||||
<!--全款预售-->
|
||||
<text v-if="goods.cart_info.productPresell.presell_type === 1">
|
||||
<text
|
||||
v-if="goods.cart_info.productPresell.presell_type === 1">
|
||||
{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
|
||||
</text>
|
||||
<!--定金预售-->
|
||||
<text v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
|
||||
<text
|
||||
v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class='money'>
|
||||
<view>￥{{goods.cart_info.productPresellAttr.presell_price}}</view>
|
||||
<view>￥{{goods.cart_info.productPresellAttr.presell_price}}
|
||||
</view>
|
||||
<view>x{{goods.product_num}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="goods.cart_info.productPresell.presell_type === 2" class="event_price">
|
||||
<view v-if="goods.cart_info.productPresell.presell_type === 2"
|
||||
class="event_price">
|
||||
定金待支付 <text class="t-color">￥{{ order.pay_price }}</text>
|
||||
尾款待支付 <text class="t-color">￥{{ order.presellOrder.pay_price }}</text>
|
||||
尾款待支付 <text
|
||||
class="t-color">￥{{ order.presellOrder.pay_price }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
@ -56,14 +67,18 @@
|
||||
|
||||
<view class='item-info acea-row row-between row-top'>
|
||||
<view class='pictrue'>
|
||||
<image :src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'></image>
|
||||
<image
|
||||
:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
|
||||
</image>
|
||||
</view>
|
||||
<view class='text acea-row row-between'>
|
||||
|
||||
<view class='name line2'>{{goods.cart_info.product.store_name}}</view>
|
||||
<view class='name line2'>{{goods.cart_info.product.store_name}}
|
||||
</view>
|
||||
|
||||
<view class='money' v-if="item.orderList[0].activity_type == 4">
|
||||
<view v-if="goods.cart_info.activeSku">￥{{goods.cart_info.activeSku.active_price}}</view>
|
||||
<view v-if="goods.cart_info.activeSku">
|
||||
￥{{goods.cart_info.activeSku.active_price}}</view>
|
||||
<view>x{{goods.product_num}}</view>
|
||||
</view>
|
||||
<view v-else class='money'>
|
||||
@ -75,16 +90,83 @@
|
||||
</block>
|
||||
</view>
|
||||
</view>
|
||||
<view class='totalPrice' v-if="item.orderList[0].activity_type !== 2">共{{item.total_num || 0}}件商品，总金额
|
||||
<view class='totalPrice' v-if="item.orderList[0].activity_type !== 2">
|
||||
共{{item.total_num || 0}}件商品，总金额
|
||||
<text class='money p-color'>￥{{item.pay_price}}</text>
|
||||
</view>
|
||||
<view class='bottom acea-row row-right row-middle'>
|
||||
<!-- <view class='bnt cancelBnt' @click.stop='cancelOrder(index,item.group_order_id)'>取消订单</view> -->
|
||||
<view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id)'>立即付款</view>
|
||||
<view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id)'>
|
||||
立即付款</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
|
||||
<block v-else-if="orderStatus == 4">
|
||||
<view class="goods-wrapper">
|
||||
<view>
|
||||
<view class="info-box" v-for="(item,index) in orderList" :key="index">
|
||||
<view class="title" @click="goStore(item)">
|
||||
<text class="iconfont icon-shangjiadingdan"></text>
|
||||
<text v-if="item.merchant" class="txt">{{item.merchant.mer_name}}</text>
|
||||
<text class="iconfont icon-xiangyou"></text>
|
||||
</view>
|
||||
<view class="product-box">
|
||||
<view class="product-item" v-for="goods in item.refundProduct"
|
||||
:key="goods.order_product_id">
|
||||
<image class="img-box" :src="goods.product.cart_info.product.image" mode="">
|
||||
</image>
|
||||
<view class="msg">
|
||||
<view class="name line1"><text
|
||||
v-if="goods.product.cart_info.product_type === 2"
|
||||
class="event_name event_bg">预售</text>{{goods.product.cart_info.product.store_name}}
|
||||
</view>
|
||||
<view class="des">{{goods.product.cart_info.productAttr.sku}}</view>
|
||||
<view class="price">退款：{{goods.refund_price}}</view>
|
||||
<view class="num">x {{goods.refund_num}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="btn-box" v-if="item.status == 1">
|
||||
<view class="btn gray" @click="goDetail(item)">查看详情</view>
|
||||
<view class="btn" @click="goPage(item.refund_order_id)">退回商品</view>
|
||||
</view>
|
||||
<view class="btn-box" v-else-if="item.status == -1">
|
||||
<view class="btn" @click="goDetail(item)">查看详情</view>
|
||||
<!-- <view class="btn" @click="applyAgain(item)">再次申请</view> -->
|
||||
</view>
|
||||
<view class="btn-box" v-else>
|
||||
<view class="btn gray" v-if="item.status == 3" @click="bindDetele(item,index)">
|
||||
删除订单</view>
|
||||
<view class="btn" @click="goDetail(item)">查看详情</view>
|
||||
</view>
|
||||
<view class="status">
|
||||
<!-- 0审核中 1待发货 2待收货 3已退款 -1已拒绝 -->
|
||||
<block v-if="item.status == 0">
|
||||
<text class="iconfont icon-shenhezhong1 p-color"></text>
|
||||
</block>
|
||||
<block v-if="item.status == 1">
|
||||
<text class="iconfont icon-daituihuo"></text>
|
||||
</block>
|
||||
<block v-if="item.status == 2">
|
||||
<text class="iconfont icon-tuihuozhong"></text>
|
||||
</block>
|
||||
<block v-if="item.status == 3">
|
||||
<text class="iconfont icon-yituikuan"></text>
|
||||
</block>
|
||||
<block v-if="item.status == -1">
|
||||
<text class="iconfont icon-yijujue1"></text>
|
||||
</block>
|
||||
<block v-if="item.status == -2">
|
||||
<text class="iconfont icon-yiquxiao"></text>
|
||||
</block>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
|
||||
<!-- 待发货 待收货 待评价 已完成 -->
|
||||
<block v-else>
|
||||
<view class='item' v-for="(item,index) in orderList" :key="index">
|
||||
@ -92,7 +174,9 @@
|
||||
<view class='title acea-row row-between-wrapper'>
|
||||
<view class="acea-row row-middle left-wrapper" @click.stop="goMall(item)">
|
||||
<text class="iconfont icon-shangjiadingdan"></text>
|
||||
<view class="store-name">{{item.merchant.mer_name}}</view>
|
||||
<view class="store-name line1" style="max-width: 500rpx;">
|
||||
{{item.merchant.mer_name}}
|
||||
</view>
|
||||
<text class="iconfont icon-xiangyou"></text>
|
||||
</view>
|
||||
<view v-if="item.status == 0" class='t-color'>待发货</view>
|
||||
@ -102,22 +186,30 @@
|
||||
<view v-if="item.status == -1" class='t-color'>已退款</view>
|
||||
</view>
|
||||
<view v-if="item.activity_type === 2">
|
||||
<view class='item-info acea-row row-between row-top' v-for="(goods,index) in item.orderProduct" :key="index">
|
||||
<view class='item-info acea-row row-between row-top'
|
||||
v-for="(goods,index) in item.orderProduct" :key="index">
|
||||
<view class='pictrue'>
|
||||
<image :src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'></image>
|
||||
<image
|
||||
:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
|
||||
</image>
|
||||
</view>
|
||||
<view class='text acea-row row-between'>
|
||||
<view class='name '>
|
||||
<view class='name' :class="item.status === 0 ? 'line1' : 'line2'">
|
||||
<text class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
|
||||
<text
|
||||
class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
|
||||
<view v-if="item.status == 0" class="event_ship event_color">发货时间：
|
||||
<!--全款预售-->
|
||||
<text v-if="goods.cart_info.productPresell.presell_type === 1">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
|
||||
<text
|
||||
v-if="goods.cart_info.productPresell.presell_type === 1">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
|
||||
<!--定金预售-->
|
||||
<text v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
|
||||
<text
|
||||
v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
|
||||
</view>
|
||||
</view>
|
||||
<view style="margin-top: 10rpx;" class="t-color">{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}</view>
|
||||
<view style="margin-top: 10rpx;" class="t-color">
|
||||
{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
|
||||
</view>
|
||||
</view>
|
||||
<view class='money'>
|
||||
<view>￥{{goods.cart_info.productPresellAttr.presell_price}}</view>
|
||||
@ -127,23 +219,30 @@
|
||||
</view>
|
||||
</view>
|
||||
<view v-else>
|
||||
<view class='item-info acea-row row-between row-top' v-for="(goods,index) in item.orderProduct" :key="index">
|
||||
<view class='item-info acea-row row-between row-top'
|
||||
v-for="(goods,index) in item.orderProduct" :key="index">
|
||||
<view class='pictrue'>
|
||||
<image :src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'></image>
|
||||
<image
|
||||
:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
|
||||
</image>
|
||||
</view>
|
||||
<view class='text acea-row row-between'>
|
||||
<view class='name '>
|
||||
<view class='name line2'>
|
||||
<text>{{goods.cart_info.product.store_name}}</text>
|
||||
</view>
|
||||
<view style="margin-top: 10rpx;" class="t-color">{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}</view>
|
||||
<view style="margin-top: 10rpx;" class="t-color">
|
||||
{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
|
||||
</view>
|
||||
</view>
|
||||
<view class='money' v-if="item.activity_type == 3">
|
||||
<view v-if="goods.cart_info.productAssistAttr">￥{{goods.cart_info.productAssistAttr.assist_price}}</view>
|
||||
<view v-if="goods.cart_info.productAssistAttr">
|
||||
￥{{goods.cart_info.productAssistAttr.assist_price}}</view>
|
||||
<view>x{{goods.product_num}}</view>
|
||||
</view>
|
||||
<view class='money' v-else-if="item.activity_type == 4">
|
||||
<view v-if="goods.cart_info.activeSku">￥{{goods.cart_info.activeSku.active_price}}</view>
|
||||
<view v-if="goods.cart_info.activeSku">
|
||||
￥{{goods.cart_info.activeSku.active_price}}</view>
|
||||
<view>x{{goods.product_num}}</view>
|
||||
</view>
|
||||
<view class='money' v-else>
|
||||
@ -166,19 +265,28 @@
|
||||
<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
|
||||
</block>
|
||||
<block v-if="item.status == 1">
|
||||
<view class='bnt cancelBnt' v-if="item.delivery_type == 1 || item.delivery_type == 2" @click='goOrderDetails(item.order_id)'>查看物流</view>
|
||||
<view class='bnt cancelBnt'
|
||||
v-if="item.delivery_type == 1 || item.delivery_type == 2"
|
||||
@click='goOrderDetails(item.order_id)'>查看物流</view>
|
||||
<view class='bnt b-color' @tap='confirmOrder(item,index)'>确认收货</view>
|
||||
</block>
|
||||
<block v-if="item.status == 2">
|
||||
<navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
|
||||
<navigator v-if="community_status == 1 && !item.community_id"
|
||||
:url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id"
|
||||
class='bnt colorBnt' hover-class="none">
|
||||
<text class="iconfont icon-fabu"></text>
|
||||
发布种草
|
||||
</navigator>
|
||||
<view class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>去评价</view>
|
||||
<view class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>去评价
|
||||
</view>
|
||||
</block>
|
||||
<block v-if="item.status == 3">
|
||||
<view class='bnt b-color' @click='goOrderDetails(item.order_id)' v-if="item.activity_type == 2 || item.activity_type == 3 || item.activity_type == 10">查看详情</view>
|
||||
<navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
|
||||
<view class='bnt b-color' @click='goOrderDetails(item.order_id)'
|
||||
v-if="item.activity_type == 2 || item.activity_type == 3 || item.activity_type == 10">
|
||||
查看详情</view>
|
||||
<navigator v-if="community_status == 1 && !item.community_id"
|
||||
:url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id"
|
||||
class='bnt colorBnt' hover-class="none">
|
||||
<text class="iconfont icon-fabu"></text>
|
||||
发布种草
|
||||
</navigator>
|
||||
@ -197,7 +305,8 @@
|
||||
</view>
|
||||
</view>
|
||||
<home></home>
|
||||
<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id" :totalPrice='totalPrice'></payment>
|
||||
<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id"
|
||||
:totalPrice='totalPrice'></payment>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@ -219,16 +328,27 @@
|
||||
orderDel,
|
||||
orderPay,
|
||||
groupOrderList,
|
||||
orderTake
|
||||
orderTake,
|
||||
refundListNew
|
||||
} from '@/api/order.js';
|
||||
import { getUserInfo } from '@/api/user.js';
|
||||
import { openOrderSubscribe } from '@/utils/SubscribeMessage.js';
|
||||
import {
|
||||
getUserInfo
|
||||
} from '@/api/user.js';
|
||||
import {
|
||||
openOrderSubscribe
|
||||
} from '@/utils/SubscribeMessage.js';
|
||||
import payment from '@/components/payment';
|
||||
import home from '@/components/home/index.vue';
|
||||
import { mapGetters } from "vuex";
|
||||
import {
|
||||
mapGetters
|
||||
} from "vuex";
|
||||
import emptyPage from '@/components/emptyPage.vue'
|
||||
import { configMap } from '@/utils'
|
||||
import { toLogin } from '@/libs/login.js';
|
||||
import {
|
||||
configMap
|
||||
} from '@/utils'
|
||||
import {
|
||||
toLogin
|
||||
} from '@/libs/login.js';
|
||||
export default {
|
||||
components: {
|
||||
payment,
|
||||
@ -276,7 +396,15 @@
|
||||
pay_order_id: '',
|
||||
totalPrice: '0',
|
||||
isReady: true,
|
||||
store_name: ''
|
||||
store_name: '',
|
||||
orderStatus: '',
|
||||
refundParams: {
|
||||
page: 1,
|
||||
limit: 15,
|
||||
type: 0,
|
||||
identity: '',
|
||||
search_info: ''
|
||||
}
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
@ -294,6 +422,7 @@
|
||||
onLoad(options) {
|
||||
if (options.status) this.orderStatus = options.status;
|
||||
if (options.sale_type) this.sale_type = options.sale_type;
|
||||
this.refundParams.identity = options.sale_type;
|
||||
},
|
||||
onShow() {
|
||||
if (this.isLogin) {
|
||||
@ -304,10 +433,6 @@
|
||||
toLogin()
|
||||
}
|
||||
},
|
||||
onReady(){
|
||||
},
|
||||
mounted: function() {
|
||||
},
|
||||
methods: {
|
||||
// 去商铺
|
||||
goMall(item) {
|
||||
@ -484,18 +609,62 @@
|
||||
}
|
||||
// #endif
|
||||
},
|
||||
/**
|
||||
* 切换类型
|
||||
*/
|
||||
statusClick: function(status) {
|
||||
if (status == this.orderStatus) return;
|
||||
this.orderStatus = status;
|
||||
this.loadend = false;
|
||||
this.loading = false;
|
||||
this.page = 1;
|
||||
this.$set(this, 'orderList', []);
|
||||
this.getOrderList();
|
||||
|
||||
// 获取退款列表
|
||||
getRefundList() {
|
||||
let that = this;
|
||||
if (that.loadend) return;
|
||||
if (that.loading) return;
|
||||
that.loading = true;
|
||||
that.loadTitle = "加载更多";
|
||||
refundListNew(this.refundParams).then(res => {
|
||||
let list = res.data.list || [];
|
||||
let loadend = list.length < that.limit;
|
||||
that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that
|
||||
.orderList);
|
||||
that.$set(that, 'orderList', that.orderList);
|
||||
that.getProductCount();
|
||||
that.loadend = loadend;
|
||||
that.loading = false;
|
||||
that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
|
||||
that.page = that.page + 1;
|
||||
that.isReady = true;
|
||||
uni.stopPullDownRefresh();
|
||||
}).catch(err => {
|
||||
that.loading = false;
|
||||
that.loadTitle = "加载更多";
|
||||
})
|
||||
},
|
||||
|
||||
// 去详情页
|
||||
goDetail(item) {
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/refund/detail?id=' + item.refund_order_id
|
||||
})
|
||||
},
|
||||
|
||||
// 删除记录
|
||||
bindDetele(item, index) {
|
||||
let self = this
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '确定删除该记录吗？',
|
||||
success: function(res) {
|
||||
if (res.confirm) {
|
||||
refundDel(item.refund_order_id).then(res => {
|
||||
self.goodsList.splice(index, 1)
|
||||
})
|
||||
uni.showToast({
|
||||
title: '删除成功',
|
||||
icon: 'none'
|
||||
})
|
||||
} else if (res.cancel) {
|
||||
console.log('用户点击取消');
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
* 获取订单列表
|
||||
*/
|
||||
@ -527,22 +696,7 @@
|
||||
that.loadTitle = "加载更多";
|
||||
})
|
||||
},
|
||||
/**
|
||||
* 获取定金预售订单列表
|
||||
*/
|
||||
getpreSellOrderList: function() {
|
||||
let that = this;
|
||||
getOrderList({
|
||||
status: 10,
|
||||
page: 1,
|
||||
limit: 1,
|
||||
}).then(res => {
|
||||
let list = res.data.list || [];
|
||||
that.presellOrderCount = res.data.count;
|
||||
that.$set(that, 'presellProList', list);
|
||||
})
|
||||
|
||||
},
|
||||
/**
|
||||
* 获取单个订单商品数量
|
||||
*/
|
||||
@ -559,26 +713,7 @@
|
||||
})
|
||||
}
|
||||
},
|
||||
/**
|
||||
* 删除订单
|
||||
*/
|
||||
delOrder: function(order_id, index) {
|
||||
let that = this;
|
||||
orderDel(order_id).then(res => {
|
||||
that.orderList.splice(index, 1);
|
||||
that.$set(that, 'orderList', that.orderList);
|
||||
that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1);
|
||||
that.getOrderData();
|
||||
return that.$util.Tips({
|
||||
title: '删除成功',
|
||||
icon: 'success'
|
||||
});
|
||||
}).catch(err => {
|
||||
return that.$util.Tips({
|
||||
title: err
|
||||
});
|
||||
})
|
||||
},
|
||||
|
||||
// 确认收货
|
||||
confirmOrder: function(item, index) {
|
||||
let that = this;
|
||||
@ -606,7 +741,7 @@
|
||||
},
|
||||
handleSearch() {
|
||||
this.loadend = false;
|
||||
this.page = 1;
|
||||
this.loading = false;
|
||||
this.orderList = [];
|
||||
if (!this.store_name) {
|
||||
return this.$util.Tips({
|
||||
@ -614,10 +749,23 @@
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.orderStatus == 4) {
|
||||
this.refundParams.search_info = this.store_name;
|
||||
this.refundParams.page = 1;
|
||||
this.refundParams.search_info = this.store_name;
|
||||
this.getRefundList();
|
||||
|
||||
} else {
|
||||
this.page = 1;
|
||||
this.getOrderList();
|
||||
}
|
||||
}
|
||||
},
|
||||
onReachBottom: function() {
|
||||
if (this.orderStatus == 4)
|
||||
this.getRefundList()
|
||||
else
|
||||
this.getOrderList();
|
||||
},
|
||||
|
||||
@ -625,34 +773,172 @@
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.info-box {
|
||||
position: relative;
|
||||
margin-top: 12rpx;
|
||||
background-color: #fff;
|
||||
|
||||
.title {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 0 32rpx;
|
||||
height: 86rpx;
|
||||
border-bottom: 1px solid #F0F0F0;
|
||||
color: #282828;
|
||||
|
||||
.icon-shangjiadingdan {
|
||||
font-size: 32rpx;
|
||||
}
|
||||
|
||||
.txt {
|
||||
margin: 0 5rpx;
|
||||
}
|
||||
|
||||
.icon-xiangyou {
|
||||
color: #999;
|
||||
font-size: 20rpx;
|
||||
margin-top: 6rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.product-box {
|
||||
.product-item {
|
||||
display: flex;
|
||||
padding: 25rpx 30rpx;
|
||||
|
||||
.img-box {
|
||||
width: 130rpx;
|
||||
height: 130rpx;
|
||||
border-radius: 16rpx;
|
||||
}
|
||||
|
||||
.msg {
|
||||
position: relative;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
width: 440rpx;
|
||||
margin-left: 26rpx;
|
||||
|
||||
.name {
|
||||
font-size: 28rpx;
|
||||
color: #282828;
|
||||
}
|
||||
|
||||
.des {
|
||||
font-size: 20rpx;
|
||||
color: #868686;
|
||||
}
|
||||
|
||||
.price {
|
||||
font-size: 26rpx;
|
||||
}
|
||||
|
||||
.num {
|
||||
position: absolute;
|
||||
right: -50rpx;
|
||||
top: 4rpx;
|
||||
color: #868686;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.event_name {
|
||||
display: inline-block;
|
||||
margin-right: 9rpx;
|
||||
color: #fff;
|
||||
font-size: 20rpx;
|
||||
padding: 0 8rpx;
|
||||
line-height: 30rpx;
|
||||
text-align: center;
|
||||
border-radius: 6rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.btn-box {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
padding: 0 20rpx 20rpx;
|
||||
|
||||
.btn {
|
||||
width: 176rpx;
|
||||
height: 60rpx;
|
||||
line-height: 60rpx;
|
||||
margin-left: 18rpx;
|
||||
text-align: center;
|
||||
background: var(--view-theme);
|
||||
border-radius: 30rpx;
|
||||
color: #fff;
|
||||
font-size: 27rpx;
|
||||
|
||||
&.gray {
|
||||
border: 1px solid #ddd;
|
||||
background: transparent;
|
||||
color: #aaa;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.status {
|
||||
position: absolute;
|
||||
right: 30rpx;
|
||||
top: 0;
|
||||
|
||||
.iconfont {
|
||||
font-size: 120rpx;
|
||||
opacity: .3;
|
||||
}
|
||||
|
||||
.p-color {
|
||||
color: var(--view-theme);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.my-order .header {
|
||||
padding: 17rpx 30rpx;
|
||||
background-color: var(--view-theme);
|
||||
}
|
||||
.t-color{color: var(--view-theme);}
|
||||
.p-color{color: var(--view-priceColor);}
|
||||
.b-color{background-color:var(--view-theme);}
|
||||
|
||||
.t-color {
|
||||
color: var(--view-theme);
|
||||
}
|
||||
|
||||
.p-color {
|
||||
color: var(--view-priceColor);
|
||||
}
|
||||
|
||||
.b-color {
|
||||
background-color: var(--view-theme);
|
||||
}
|
||||
|
||||
.my-order .header .picTxt {
|
||||
height: 190rpx;
|
||||
}
|
||||
|
||||
.my-order .header .picTxt .text {
|
||||
color: rgba(255, 255, 255, 0.8);
|
||||
font-size: 26rpx;
|
||||
}
|
||||
|
||||
.my-order .header .picTxt .text .name {
|
||||
font-size: 34rpx;
|
||||
font-weight: bold;
|
||||
color: #fff;
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
|
||||
.my-order .header .picTxt .pictrue {
|
||||
width: 122rpx;
|
||||
height: 109rpx;
|
||||
}
|
||||
|
||||
.my-order .header .picTxt .pictrue image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.my-order .nav {
|
||||
background-color: #fff;
|
||||
width: 690rpx;
|
||||
@ -660,28 +946,34 @@
|
||||
border-radius: 16rpx;
|
||||
margin: -73rpx auto 0 auto;
|
||||
}
|
||||
|
||||
.my-order .nav .item {
|
||||
text-align: center;
|
||||
font-size: 26rpx;
|
||||
color: #282828;
|
||||
padding: 29rpx 0;
|
||||
}
|
||||
|
||||
.my-order .nav .item.on {
|
||||
font-weight: bold;
|
||||
border-bottom: 5rpx solid var(--view-theme);
|
||||
}
|
||||
|
||||
.my-order .nav .item .num {
|
||||
margin-top: 18rpx;
|
||||
}
|
||||
|
||||
.my-order .list {
|
||||
width: 690rpx;
|
||||
margin: 14rpx auto 0 auto;
|
||||
}
|
||||
|
||||
.my-order .list .item {
|
||||
background-color: #fff;
|
||||
border-radius: 16rpx;
|
||||
margin-bottom: 14rpx;
|
||||
}
|
||||
|
||||
.my-order .list .item .title {
|
||||
height: 84rpx;
|
||||
padding: 0 30rpx;
|
||||
@ -693,49 +985,60 @@
|
||||
.iconfont {
|
||||
margin-top: 5rpx;
|
||||
}
|
||||
|
||||
.store-name {
|
||||
margin: 0 10rpx;
|
||||
}
|
||||
|
||||
.icon-xiangyou {
|
||||
font-size: 20rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.my-order .list .item .title .sign {
|
||||
font-size: 24rpx;
|
||||
padding: 0 7rpx;
|
||||
height: 36rpx;
|
||||
margin-right: 15rpx;
|
||||
}
|
||||
|
||||
.my-order .list .item .item-info {
|
||||
padding: 0 30rpx;
|
||||
margin-top: 22rpx;
|
||||
}
|
||||
|
||||
.my-order .list .item .item-info .pictrue {
|
||||
width: 120rpx;
|
||||
height: 120rpx;
|
||||
}
|
||||
|
||||
.my-order .list .item .item-info .pictrue image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
border-radius: 6rpx;
|
||||
}
|
||||
|
||||
.my-order .list .item .item-info .text {
|
||||
width: 486rpx;
|
||||
font-size: 28rpx;
|
||||
color: #999;
|
||||
margin-top: 6rpx;
|
||||
}
|
||||
|
||||
.my-order .list .item .item-info .text .name {
|
||||
width: 320rpx;
|
||||
color: #282828;
|
||||
}
|
||||
|
||||
.event_bg {
|
||||
background: #FF7F00;
|
||||
}
|
||||
|
||||
.event_color {
|
||||
color: #FF7F00;
|
||||
}
|
||||
|
||||
.my-order .list .item .event_name {
|
||||
display: inline-block;
|
||||
margin-right: 9rpx;
|
||||
@ -746,16 +1049,20 @@
|
||||
text-align: center;
|
||||
border-radius: 6rpx;
|
||||
}
|
||||
|
||||
.my-order .list .item .event_ship {
|
||||
font-size: 20rpx;
|
||||
margin-top: 10rpx;
|
||||
}
|
||||
|
||||
.my-order .list .event_price {
|
||||
margin: 0 0 50rpx 120rpx;
|
||||
}
|
||||
|
||||
.my-order .list .item .item-info .text .money {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.my-order .list .item .totalPrice {
|
||||
font-size: 26rpx;
|
||||
color: #282828;
|
||||
@ -763,10 +1070,12 @@
|
||||
margin: 27rpx 0 0 30rpx;
|
||||
padding: 0 30rpx 30rpx 0;
|
||||
}
|
||||
|
||||
.my-order .list .item .totalPrice .money {
|
||||
font-size: 28rpx;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.my-order .list .item .bottom {
|
||||
height: 107rpx;
|
||||
padding: 0 30rpx;
|
||||
@ -787,32 +1096,39 @@
|
||||
border: 1px solid #ddd;
|
||||
color: #aaa;
|
||||
}
|
||||
|
||||
.my-order .list .item .bottom .bnt.colorBnt {
|
||||
border: 1px solid var(--view-theme);
|
||||
color: var(--view-theme);
|
||||
}
|
||||
|
||||
.my-order .list .item .bottom .bnt .icon-fabu {
|
||||
font-size: 26rpx;
|
||||
margin-right: 10rpx;
|
||||
}
|
||||
|
||||
.my-order .list .item .bottom .bnt~.bnt {
|
||||
margin-left: 17rpx;
|
||||
}
|
||||
|
||||
.search {
|
||||
height: 60rpx;
|
||||
padding: 0 30rpx;
|
||||
border-radius: 30rpx;
|
||||
background-color: #FFFFFF;
|
||||
font-size: 26rpx;
|
||||
|
||||
.iconfont {
|
||||
margin-right: 10rpx;
|
||||
font-size: 26rpx;
|
||||
color: #999999;
|
||||
}
|
||||
|
||||
.input-placeholder {
|
||||
font-size: 26rpx;
|
||||
color: #999999;
|
||||
}
|
||||
|
||||
.input {
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
@ -61,7 +61,7 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="btn-box" @click="bindComfirm">申请退款</view>
|
||||
<view class="btn-box" @click="$u.throttle(bindComfirm, 1000)">申请退款</view>
|
||||
<alertBox :msg="msg" v-if="isShowBox" @bindClose="bindClose"></alertBox>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@ -1,8 +1,97 @@
|
||||
<style lang="scss">
|
||||
.sel_addr_wrap {
|
||||
height: 120rpx;
|
||||
padding: 30rpx 0;
|
||||
|
||||
.sel_addr {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin: 0 30rpx;
|
||||
border: 2rpx solid #40ae36;
|
||||
height: 60rpx;
|
||||
line-height: 60rpx;
|
||||
text-align: center;
|
||||
color: #40ae36;
|
||||
border-radius: 10rpx;
|
||||
font-weight: bold;
|
||||
|
||||
&:active {
|
||||
background: rgba(64, 174, 54, .1);
|
||||
}
|
||||
|
||||
text {
|
||||
margin-right: 10rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.sel_addr_update-wrap {
|
||||
padding: 30rpx 0;
|
||||
|
||||
|
||||
.sel_addr_update {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
border: 2rpx solid #40ae36;
|
||||
box-shadow: 0 0 2rpx 2rpx #40ae3650;
|
||||
padding: 10rpx 20rpx;
|
||||
margin: 0rpx 30rpx;
|
||||
border-radius: 10rpx;
|
||||
|
||||
.sel_addr_wrap-l {
|
||||
.sel_addr_wrap-l-addr {
|
||||
margin-bottom: 8rpx;
|
||||
font-size: 28rpx;
|
||||
font-weight: bold;
|
||||
color: #333;
|
||||
max-width: 480rpx;
|
||||
}
|
||||
|
||||
.sel_addr_wrap-l-detail {
|
||||
font-size: 26rpx;
|
||||
color: #999;
|
||||
max-width: 480rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.sel_addr_wrap-r {
|
||||
padding: 8rpx 8rpx;
|
||||
border: 2rpx solid #40ae36;
|
||||
border-radius: 10rpx;
|
||||
color: #40ae36;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<template>
|
||||
<view :style="viewColor">
|
||||
<form @submit="formSubmit" report-submit='true'>
|
||||
<view class='addAddress'>
|
||||
<view class='list'>
|
||||
|
||||
<view v-if="userAddress.detail != ''" class="sel_addr_update-wrap">
|
||||
<view class="sel_addr_update">
|
||||
<view class="sel_addr_wrap-l">
|
||||
<view class="sel_addr_wrap-l-addr line1">{{userAddress.detail}}</view>
|
||||
<view class="sel_addr_wrap-l-detail line1">{{userAddress.address_detail}}</view>
|
||||
</view>
|
||||
<view class="sel_addr_wrap-r" @click="handleToChoose">修改地址</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-else class="sel_addr_wrap">
|
||||
<view class="sel_addr" @click="handleToChoose">
|
||||
<text>选择收货地址</text>
|
||||
<u-icon name="arrow-right" size="16" color="#40ae36"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<view class='name'>门牌号</view>
|
||||
<input type='text' class="location-input" placeholder='详细地址,例:1栋101号' name='house_number'
|
||||
placeholder-class='placeholder' v-model="userAddress.house_number"></input>
|
||||
</view>
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<view class='name'>姓名</view>
|
||||
<input type='text' placeholder='请输入姓名' name='real_name' :value="userAddress.real_name"
|
||||
@ -13,40 +102,19 @@
|
||||
<input type='text' placeholder='请输入联系电话' name="phone" :value='userAddress.phone'
|
||||
placeholder-class='placeholder'></input>
|
||||
</view>
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<!-- <view class='item acea-row row-between-wrapper'>
|
||||
<view class='name'>所在地区</view>
|
||||
<view class="region">
|
||||
<view class="region_count" @click="changeRegion">
|
||||
<text v-if="!addressInfo.length" style="color:#cdcdcd;">请选择地区</text>
|
||||
<text v-else>{{addressText}}</text>
|
||||
<text class="iconfont icon-xiangyou"></text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<!-- <view class='item acea-row row-between-wrapper'>
|
||||
<view class='name'>所在村队</view>
|
||||
<view class="region">
|
||||
<view class="region_count" @click="changevillage">
|
||||
<text v-if="!villageInfo.length" style="color:#cdcdcd;">请选择村队</text>
|
||||
<text v-else>{{villageText}}</text>
|
||||
<view class="region_count" @click="handleToChoose">
|
||||
<text v-if="!detail.length" style="color:#cdcdcd;">请选择地区</text>
|
||||
<text v-else>{{detail}}</text>
|
||||
<text class="iconfont icon-xiangyou"></text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view> -->
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<view class='name'>详细地址</view>
|
||||
<input type='text' class="location-input" placeholder='请填写具体地址' name='detail'
|
||||
placeholder-class='placeholder' v-model="userAddress.detail"></input>
|
||||
<!--<view class="location" @click="selfLocation">
|
||||
<text class="iconfont icon-chakanditu"></text>
|
||||
<br>
|
||||
定位
|
||||
</view> -->
|
||||
|
||||
</view>
|
||||
</view>
|
||||
<view class='default acea-row row-middle'>
|
||||
<checkbox-group @change='ChangeIsDefault'>
|
||||
<checkbox :checked="userAddress.is_default ? true : false" />设置为默认地址
|
||||
@ -86,7 +154,9 @@ import {
|
||||
editAddress,
|
||||
getAddressDetail
|
||||
} from '@/api/user.js';
|
||||
import { wgsToGcj } from "@/utils/wgs.js";
|
||||
import {
|
||||
wgsToGcj
|
||||
} from "@/utils/wgs.js";
|
||||
import {
|
||||
getCityV2,
|
||||
getCityList
|
||||
@ -113,7 +183,8 @@ export default {
|
||||
couponId: 0, //优惠券id
|
||||
address_id: 0, //地址id
|
||||
userAddress: {
|
||||
is_default: false
|
||||
is_default: false,
|
||||
detail: ''
|
||||
}, //地址详情
|
||||
region: ['省', '市', '区'],
|
||||
valueRegion: [0, 0, 0],
|
||||
@ -126,10 +197,15 @@ export default {
|
||||
display: false,
|
||||
display_one: false,
|
||||
addressInfo: [],
|
||||
newAddrInfo: '',
|
||||
newPCAS: '',
|
||||
villageInfo: [],
|
||||
list: [],
|
||||
latitude: '',
|
||||
longitude: ''
|
||||
longitude: '',
|
||||
detail: '', //四川省泸州市龙马潭区龙门大道15号
|
||||
location: '', // 经纬度
|
||||
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
@ -158,14 +234,39 @@ export default {
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
||||
// 选择地址
|
||||
handleToChoose() {
|
||||
let that = this;
|
||||
// #ifdef H5
|
||||
uni.navigateTo({
|
||||
url: "/pages/select_address_n/select_address_n",
|
||||
success: (res) => {
|
||||
uni.$once('changeAddress', res => {
|
||||
console.log(res)
|
||||
// this.newAddrInfo = res.addr; "name": "中国,四川省,泸州市,龙马潭区",
|
||||
that.detail = res.addr.address;
|
||||
that.location = res.addr.location;
|
||||
})
|
||||
}
|
||||
})
|
||||
// #endif
|
||||
// #ifndef H5
|
||||
uni.chooseLocation({
|
||||
success: function(res) {
|
||||
that.userAddress.detail = res.name
|
||||
that.userAddress.address_detail = res.address;
|
||||
that.location = `${res.latitude},${res.longitude}`;;
|
||||
}
|
||||
});
|
||||
// #endif
|
||||
},
|
||||
|
||||
OnChangeAddress(address) {
|
||||
this.addressInfo = address;
|
||||
this.list = address
|
||||
},
|
||||
OnChangevAddress(address) {
|
||||
this.villageInfo = address;
|
||||
console.log(this.villageInfo)
|
||||
},
|
||||
|
||||
// 地址数据
|
||||
getCityList: function() {
|
||||
let that = this;
|
||||
@ -208,9 +309,9 @@ export default {
|
||||
let region = [res.data.province, res.data.city, res.data.district, res.data.street, res
|
||||
.data.village
|
||||
];
|
||||
console.log({...res.data});
|
||||
that.$set(that, 'userAddress', res.data);
|
||||
that.$set(that, 'region', region);
|
||||
that.$set(that, 'location', res.data.location);
|
||||
that.city_id = res.data.city_id
|
||||
if (res.data.areas) that.addressInfo = res.data.areas;
|
||||
else {
|
||||
@ -344,6 +445,10 @@ export default {
|
||||
formSubmit: function(e) {
|
||||
let that = this,
|
||||
value = e.detail.value;
|
||||
value.location = that.location
|
||||
value.detail = that.userAddress.detail
|
||||
value.address_detail = that.userAddress.address_detail
|
||||
|
||||
if (!value.real_name) return that.$util.Tips({
|
||||
title: '请填写收货人姓名'
|
||||
});
|
||||
@ -353,19 +458,22 @@ export default {
|
||||
if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone)) return that.$util.Tips({
|
||||
title: '请输入正确的手机号码'
|
||||
});
|
||||
if (!that.addressInfo.length) return that.$util.Tips({
|
||||
title: '请选择所在地区'
|
||||
});
|
||||
// if (!that.detail.length) return that.$util.Tips({
|
||||
// title: '请选择所在地区'
|
||||
// });
|
||||
// if (!that.villageInfo.length) return that.$util.Tips({
|
||||
// title: '请选择所在村队'
|
||||
// });
|
||||
if (!value.detail) return that.$util.Tips({
|
||||
title: '请填写详细地址'
|
||||
});
|
||||
if (!value.location) return that.$util.Tips({
|
||||
title: '请选择地址'
|
||||
});
|
||||
value.address_id = that.address_id;
|
||||
value.is_default = that.userAddress.is_default ? 1 : 0;
|
||||
value.area = that.addressInfo;
|
||||
value.brigade = that.villageInfo[0]
|
||||
value.area = that.detail;
|
||||
// value.brigade = that.villageInfo[0]
|
||||
|
||||
uni.showLoading({
|
||||
title: '保存中',
|
||||
@ -470,8 +578,11 @@ export default {
|
||||
}
|
||||
|
||||
.region .region_count {
|
||||
height: 42rpx;
|
||||
line-height: 42rpx;
|
||||
// height: 42rpx;
|
||||
// line-height: 42rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
|
||||
.icon-xiangyou {
|
||||
float: right;
|
||||
|
||||
@ -1,294 +1,8 @@
|
||||
<style lang="scss" scoped>
|
||||
page {
|
||||
background-color: #F8F9FA;
|
||||
}
|
||||
|
||||
.wholeSale {
|
||||
.wholeSale-header {
|
||||
margin-bottom: 20rpx;
|
||||
background-color: #40AE36;
|
||||
|
||||
.scrollview {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
height: 98rpx;
|
||||
padding-left: 32rpx;
|
||||
|
||||
.scrollview-item {
|
||||
margin-right: 30rpx;
|
||||
font-size: 28rpx;
|
||||
color: #FFFFFF;
|
||||
}
|
||||
|
||||
.scrollview-active {
|
||||
position: relative;
|
||||
font-weight: bold;
|
||||
font-size: 36rpx;
|
||||
color: #FFFFFF;
|
||||
|
||||
&::after {
|
||||
content: "";
|
||||
display: inline-block;
|
||||
position: absolute;
|
||||
bottom: -6rpx;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
width: 100%;
|
||||
height: 6rpx;
|
||||
background-color: #FFFFFF;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.wholeSale-con {
|
||||
margin: 0 10px;
|
||||
|
||||
.search_content {
|
||||
margin-bottom: 40rpx;
|
||||
height: 70rpx;
|
||||
padding: 2px 2px 2px 21.05rpx;
|
||||
border-radius: 80rpx;
|
||||
background: #EDEFF2;
|
||||
position: relative;
|
||||
box-sizing: border-box;
|
||||
|
||||
.search_content_wrap {
|
||||
width: 100%;
|
||||
|
||||
.icon-sousuo {
|
||||
font-size: 26.32rpx;
|
||||
font-weight: bold;
|
||||
color: #c8c7c6;
|
||||
margin-right: 17.54rpx;
|
||||
}
|
||||
|
||||
input {
|
||||
width: 80%;
|
||||
}
|
||||
}
|
||||
|
||||
.search_btn {
|
||||
width: 106rpx;
|
||||
height: 60rpx;
|
||||
line-height: 60rpx;
|
||||
background: #40AE36;
|
||||
border-radius: 100px;
|
||||
font-size: 28rpx;
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
|
||||
.category {
|
||||
width: 100%;
|
||||
overflow: auto;
|
||||
margin-bottom: 20rpx;
|
||||
|
||||
.category-wrap {
|
||||
display: flex;
|
||||
padding-bottom: 20rpx;
|
||||
|
||||
.category-item {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
margin-right: 38rpx;
|
||||
|
||||
text {
|
||||
margin-top: 16rpx;
|
||||
font-size: 24rpx;
|
||||
color: #666666;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.category-item-text {
|
||||
width: 120rpx;
|
||||
text-align: center;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
|
||||
.category-item-active {
|
||||
position: relative;
|
||||
|
||||
.category-item-img {
|
||||
border: 2px solid #40AE36;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
text {
|
||||
background-color: #40AE36;
|
||||
color: #fff;
|
||||
padding: 2rpx 10rpx 6rpx 10rpx;
|
||||
border-radius: 50rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.cate {
|
||||
width: 100%;
|
||||
overflow: auto;
|
||||
margin-bottom: 30rpx;
|
||||
|
||||
.cate-wrap {
|
||||
display: flex;
|
||||
padding-bottom: 8rpx;
|
||||
|
||||
.cate-item {
|
||||
|
||||
text {
|
||||
padding: 4rpx 16rpx;
|
||||
white-space: nowrap;
|
||||
font-size: 30rpx;
|
||||
color: #333;
|
||||
}
|
||||
}
|
||||
|
||||
.cate-item-active {
|
||||
text {
|
||||
color: #40AE36;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.comprehensive {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 20rpx 50rpx;
|
||||
|
||||
[class^=comprehensive-] {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
text {
|
||||
margin-right: 12rpx;
|
||||
font-size: 26rpx;
|
||||
color: #666666;
|
||||
}
|
||||
|
||||
image {
|
||||
width: 28rpx;
|
||||
height: 28rpx;
|
||||
}
|
||||
|
||||
.loudou {
|
||||
width: 24rpx;
|
||||
height: 24rpx;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.comp-color {
|
||||
|
||||
text {
|
||||
margin-right: 12rpx;
|
||||
font-size: 26rpx;
|
||||
color: #40ae36 !important;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.pictrue {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
color: #999;
|
||||
|
||||
image {
|
||||
width: 414rpx;
|
||||
height: 305rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.goods_list {
|
||||
.goods {
|
||||
// width: 690rpx;
|
||||
height: 200rpx;
|
||||
margin: 20rpx auto;
|
||||
margin-top: 0;
|
||||
background-color: #fff;
|
||||
border-radius: 24rpx;
|
||||
display: flex;
|
||||
|
||||
.avatar {
|
||||
height: 160rpx;
|
||||
width: 160rpx;
|
||||
margin: 20rpx;
|
||||
border-radius: 12rpx;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.content {
|
||||
margin: 20rpx 0;
|
||||
width: 520rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
|
||||
.content-head {
|
||||
width: 500rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: flex-end;
|
||||
font-size: 28rpx;
|
||||
color: #333;
|
||||
|
||||
.title {
|
||||
width: 360rpx;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
|
||||
.content-two {
|
||||
display: flex;
|
||||
font-size: 24rpx;
|
||||
color: #666;
|
||||
align-items: center;
|
||||
|
||||
.star {
|
||||
position: relative;
|
||||
width: 111rpx;
|
||||
height: 19rpx;
|
||||
margin-right: 10rpx;
|
||||
background: url(../columnGoods/images/star.png) left top/100% 100% no-repeat;
|
||||
overflow: hidden;
|
||||
|
||||
view {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: url(../columnGoods/images/star_active.png) left top/111rpx 19rpx no-repeat;
|
||||
|
||||
&.star_purple {
|
||||
background: url(../columnGoods/images/star_active_purple.png) left top/111rpx 19rpx no-repeat;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<template>
|
||||
<view class="wholeSale">
|
||||
|
||||
<!-- 顶部 -->
|
||||
<view class="wholeSale-header" style="position: fixed;top: 0;left: 0;width: 100%;z-index: 999;">
|
||||
<view class="wholeSale-header">
|
||||
<view class="wholeSale-header-wrap">
|
||||
<!-- 适配不同机 -->
|
||||
<view style="height: var(--status-bar-height);"></view>
|
||||
|
||||
@ -305,14 +19,11 @@
|
||||
</scroll-view>
|
||||
</view>
|
||||
|
||||
<!-- 内容 -->
|
||||
<view class="wholeSale-con" style="padding-top: calc(var(--status-bar-height) + 120rpx);">
|
||||
<u-subsection v-if="tabsCurr==2" :list="subList" @change="changeSub" :current="subCurr" mode="subsection"
|
||||
activeColor="#40ae36" fontSize="14" style="margin-bottom: 24rpx;"></u-subsection>
|
||||
<view class="wholeSale-header-search-wrap" :style="{height:wrapHeight + 'rpx'}">
|
||||
<u-subsection v-if="tabsCurr==2" :list="subList" @change="changeSub" :current="subCurr"
|
||||
mode="subsection" activeColor="#40ae36" fontSize="14" style="margin-bottom: 24rpx;"></u-subsection>
|
||||
|
||||
<view class="wholeSale-nav">
|
||||
<!-- <u-icon class="icon" name="arrow-left" size="20" @click="navBack"></u-icon> -->
|
||||
<!-- 搜索 -->
|
||||
<view
|
||||
@click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}&shop=${subCurr!=1 || (subCurr==1 && tabsCurr!=2) ? false : true}`)"
|
||||
hover-class="none" class="search_content flex_a_c_j_sb">
|
||||
@ -323,7 +34,6 @@
|
||||
:value="where.keyword" placeholder-style="font-size: 30rpx;color:#999;" disabled
|
||||
style="pointer-events: none;">
|
||||
</view>
|
||||
<!-- <button class="search_btn">搜索</button> -->
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -335,8 +45,8 @@
|
||||
<view class="category-item" :class="{'category-item-active': index==cate_change}"
|
||||
@click="changeCate(index)">
|
||||
<block v-if="subCurr!=1 || (subCurr==1 && tabsCurr!=2)">
|
||||
<u--image class="category-item-img" width="108rpx" :src="item.pic" height="108rpx"
|
||||
shape="circle">
|
||||
<u--image class="category-item-img" width="108rpx" :src="item.pic"
|
||||
height="108rpx" shape="circle">
|
||||
<template v-slot:loading>
|
||||
<u-loading-icon color="#999" size="15" />
|
||||
</template>
|
||||
@ -356,8 +66,11 @@
|
||||
</block>
|
||||
</view>
|
||||
</scroll-view>
|
||||
<view class="category-all" v-if="store_category.length > 0" @click="onAllCategory">
|
||||
<view style="margin-bottom: 20rpx;">全部</view>
|
||||
<u-icon name="list"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<!-- 商品小分类 -->
|
||||
<view class="cate" v-if="store_category_children.length>1">
|
||||
@ -375,7 +88,8 @@
|
||||
|
||||
<!-- 综合查询 -->
|
||||
<view class="comprehensive" v-if="subCurr!=1 || (subCurr==1 && tabsCurr!=2)">
|
||||
<view class="comprehensive-price" :class="{'comp-color': orderCurr==1}" @click="toOrder('price', 1)">
|
||||
<view class="comprehensive-price" :class="{'comp-color': orderCurr==1}"
|
||||
@click="toOrder('price', 1)">
|
||||
<text>价格</text>
|
||||
<image v-if="orderCurr==1" style="width: 15rpx;height: 21rpx;"
|
||||
:src="where.order == 'price_asc' ? domain+'/static/diy/up'+keyColor+'.png' : domain+'/static/diy/down'+keyColor+'.png'">
|
||||
@ -395,6 +109,7 @@
|
||||
<image class="loudou" src="@/static/new_define/loudou.png"></image>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 综合查询 -->
|
||||
<view class="comprehensive" v-if="deduction_rate && tabsCurr==1">
|
||||
<view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate==''}"
|
||||
@ -418,18 +133,22 @@
|
||||
<text>4:6</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 内容 -->
|
||||
<view class="wholeSale-con"
|
||||
:style="{height:'calc(100vh - '+wrapHeight+'rpx - 142rpx '+(isShowSmall?' - 48rpx':'')+')'}">
|
||||
<scroll-view :scroll-y="true" @scrolltolower="onScrollBottom" @scroll="onScroll" style="height: 100%;"
|
||||
@scrolltoupper="scrolltoupper" :refresher-threshold="0">
|
||||
<!-- 流水瀑布 -->
|
||||
<WaterfallsFlow v-if="subCurr!=1 || (subCurr==1 && tabsCurr!=2)" :wfList='hostProduct' @itemTap="goDetail"
|
||||
:type="0" :sale_type="2" />
|
||||
|
||||
<WaterfallsFlow v-if="subCurr!=1 || (subCurr==1 && tabsCurr!=2)" :wfList='hostProduct'
|
||||
@itemTap="goDetail" :type="0" :sale_type="2" />
|
||||
|
||||
<!-- 列表 -->
|
||||
<view class="goods_list" v-else>
|
||||
<view class="goods" v-for="(item, index) in shopList" :key="index" @click="goStore(item.mer_id)">
|
||||
<view class="avatar">
|
||||
<!-- <image style="width: 100%;height: 100%;" :src="item.mer_avatar" mode="aspectFill" lazy-load>
|
||||
</image> -->
|
||||
<u--image width="160rpx" height="160rpx" :src="item.mer_avatar" mode="aspectFill">
|
||||
<template v-slot:loading>
|
||||
<u-loading-icon color="#999" size="15" />
|
||||
@ -463,7 +182,8 @@
|
||||
<text> {{item.service_phone}}</text>
|
||||
<u--image style="margin-left: 28rpx;" v-if="item.mer_take_time" :showLoading="true"
|
||||
src="/static/images/GXSC/SJ.png" width="33.85rpx" height="33.85rpx"></u--image>
|
||||
<text v-if="item.mer_take_time">{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text>
|
||||
<text
|
||||
v-if="item.mer_take_time">{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text>
|
||||
</view>
|
||||
<view class="content-two">
|
||||
<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="33.85rpx"
|
||||
@ -474,15 +194,52 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<loadmore :type="isLoading" v-if="isLoading || hostProduct.length > 0" style="padding: 40rpx 0 150rpx; 0">
|
||||
<loadmore :type="isLoading" v-if="isLoading || hostProduct.length > 0"
|
||||
style="padding: 40rpx 0 150rpx; 0">
|
||||
</loadmore>
|
||||
<view class='pictrue' v-if="!isLoading && hostProduct.length == 0">
|
||||
<image :src="`${domain}/static/images/noCart.png`"></image>
|
||||
<view>暂无商品，看点别的吧</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
</view>
|
||||
|
||||
<!-- 弹框大分类 -->
|
||||
<uni-popup ref="popup" type="top" border-radius="10px 10px 0 0" z-index="1000">
|
||||
<view class="popup-wrap">
|
||||
<view style="height: var(--status-bar-height);"></view>
|
||||
<view class="popup-wrap-title">分类</view>
|
||||
<view class="popup-wrap-category">
|
||||
<view class="popup-wrap-category-wrap">
|
||||
<block v-for="(item,index) in store_category" :key="index">
|
||||
<view class="popup-wrap-category-item"
|
||||
:class="{'popup-wrap-category-item-active': index==cate_change}"
|
||||
@click="changeCate(index)">
|
||||
<block v-if="subCurr!=1 || (subCurr==1 && tabsCurr!=2)">
|
||||
<u--image class="popup-wrap-category-item-img" width="108rpx" :src="item.pic"
|
||||
height="108rpx" shape="circle">
|
||||
<template v-slot:loading>
|
||||
<u-loading-icon color="#999" size="15" />
|
||||
</template>
|
||||
</u--image>
|
||||
<text class="popup-wrap-category-item-text">{{item.cate_name}}</text>
|
||||
</block>
|
||||
<block v-else>
|
||||
<u--image class="popup-wrap-category-item-img" width="108rpx" :src="item.background"
|
||||
height="108rpx" shape="circle">
|
||||
<template v-slot:loading>
|
||||
<u-loading-icon color="#999" size="15" />
|
||||
</template>
|
||||
</u--image>
|
||||
<text class="popup-wrap-category-item-text">{{item.category_name}}</text>
|
||||
</block>
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</uni-popup>
|
||||
|
||||
<!--自定义底部tab栏-->
|
||||
<customTab :newData="newData" :activeRouter="activeRouter"></customTab>
|
||||
</view>
|
||||
@ -552,14 +309,20 @@
|
||||
limit: 20,
|
||||
sale_type: 2, //1为零售, 2为批发
|
||||
mer_type: 1,
|
||||
mer_cate_id: '', //
|
||||
cate_pid: '', //
|
||||
cate_id: '',
|
||||
keyword: '',
|
||||
deduction_rate: '', //抵扣比例
|
||||
order: '', // 销量sales, 价格低到高price_asc, 价格高到低price_desc
|
||||
rand: 1,
|
||||
},
|
||||
isIndexClick: true
|
||||
isIndexClick: true,
|
||||
bigTypeDomInfo: null,
|
||||
smallTypeDomInfo: null,
|
||||
categoryWrapHeight: 0,
|
||||
wrapHeight: 332,
|
||||
isShowSmall: false,
|
||||
scrollTop: 0,
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@ -585,7 +348,6 @@
|
||||
},
|
||||
|
||||
onShow() {
|
||||
console.log(this.isIndexClick)
|
||||
this.isIndexClick = false;
|
||||
},
|
||||
|
||||
@ -606,13 +368,49 @@
|
||||
})
|
||||
}
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
// onPullDownRefresh() {
|
||||
// this.initData(true, true);
|
||||
// },
|
||||
// onReachBottom() {
|
||||
// this.initData(false, true);
|
||||
// },
|
||||
|
||||
watch: {
|
||||
'where.cate_pid'(newVal, oldVal) {
|
||||
if (newVal && !oldVal) {
|
||||
this.wrapHeight = this.tabsCurr == 2 ? 400 : (332 + 48);
|
||||
this.isShowSmall = true;
|
||||
}
|
||||
if (!newVal && oldVal) {
|
||||
this.wrapHeight = this.tabsCurr == 2 ? 400 : 332;
|
||||
this.isShowSmall = false;
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
methods: {
|
||||
onAllCategory() {
|
||||
this.$refs.popup.open();
|
||||
},
|
||||
|
||||
scrolltoupper() {
|
||||
this.initData(true, true);
|
||||
},
|
||||
onReachBottom() {
|
||||
this.initData();
|
||||
|
||||
onScrollBottom(e) {
|
||||
this.initData(false, true);
|
||||
},
|
||||
methods: {
|
||||
|
||||
onScroll(e) {
|
||||
if (this.scrollTop >= e.target.scrollTop) { //上拉
|
||||
this.wrapHeight = this.tabsCurr == 2 ? 400 : 332;
|
||||
if (this.where.cate_pid) this.wrapHeight = this.wrapHeight + 48;
|
||||
} else {
|
||||
this.wrapHeight = 0;
|
||||
}
|
||||
this.scrollTop = e.target.scrollTop;
|
||||
},
|
||||
|
||||
initData(re = false, stop = false) {
|
||||
if (!stop) this.getStoreCategory();
|
||||
if (this.tabsCurr == 2 && this.subCurr == 1) this.storeMerchantList(re, stop);
|
||||
@ -683,6 +481,7 @@
|
||||
this.cate_change = 0;
|
||||
this.cate_change_children = 0;
|
||||
if (this.tabsCurr != 2 || (this.tabsCurr == 2 && this.subCurr != 1)) this.where.mer_type = e;
|
||||
this.wrapHeight = this.tabsCurr == 2 ? 400 : this.where.cate_pid ? (332 + 48) : 332;
|
||||
this.initData(true);
|
||||
},
|
||||
changeCate(e) {
|
||||
@ -692,22 +491,27 @@
|
||||
this.where.merchant_category_id = this.store_category[e].merchant_category_id;
|
||||
return this.storeMerchantList(true);
|
||||
}
|
||||
if (this.store_category[e].children) this.store_category_children = [...this.store_category[e].children];
|
||||
if (this.store_category[e].children) this.store_category_children = [...this.store_category[e]
|
||||
.children
|
||||
];
|
||||
this.store_category_children.unshift({
|
||||
cate_name: '全部',
|
||||
store_category_id: ''
|
||||
})
|
||||
this.cate_change_children = 0;
|
||||
if (this.tabsCurr == 1) this.where.mer_cate_id = this.store_category[e].store_category_id;
|
||||
if (this.tabsCurr == 1) this.where.cate_pid = this.store_category[e].store_category_id;
|
||||
else {
|
||||
this.where.cate_pid = this.store_category[e].store_category_id;
|
||||
this.where.cate_id = "";
|
||||
}
|
||||
this.getProductslist(true);
|
||||
|
||||
// 关闭popup
|
||||
this.$refs.popup && this.$refs.popup.close();
|
||||
},
|
||||
changeChildrenCate(e) {
|
||||
this.cate_change_children = e;
|
||||
let key = 'mer_cate_id';
|
||||
let key = 'cate_pid';
|
||||
if (this.tabsCurr != 1) key = 'cate_id';
|
||||
this.where[key] = this.store_category_children[e].store_category_id;
|
||||
if (e == 0) this.where[key] = this.store_category[this.cate_change].store_category_id; // 如若选中全部, 则取父级id
|
||||
@ -715,7 +519,9 @@
|
||||
},
|
||||
getStoreCategory() {
|
||||
this.store_category = [];
|
||||
if (this.tabsCurr == 1) getStoreCategory(259).then(res => {
|
||||
if (this.tabsCurr == 1) getStoreCategory(259, {
|
||||
sale_type: 2
|
||||
}).then(res => {
|
||||
this.initStoreCate(res);
|
||||
})
|
||||
else if (this.tabsCurr == 2 && this.subCurr == 1) merClassifly().then(res => {
|
||||
@ -810,3 +616,387 @@
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
page {
|
||||
background-color: #F8F9FA;
|
||||
}
|
||||
|
||||
.wholeSale {
|
||||
.wholeSale-header {
|
||||
position: sticky;
|
||||
top: 0;
|
||||
z-index: 90;
|
||||
margin-bottom: 20rpx;
|
||||
|
||||
.wholeSale-header-wrap {
|
||||
background-color: #40AE36;
|
||||
}
|
||||
|
||||
.wholeSale-header-search-wrap {
|
||||
position: sticky;
|
||||
top: calc(82rpx + var(--status-bar-height));
|
||||
transition: height .5s;
|
||||
overflow: hidden;
|
||||
padding: 30rpx 20rpx 0;
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
.scrollview {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
height: 98rpx;
|
||||
padding-left: 32rpx;
|
||||
|
||||
.scrollview-item {
|
||||
margin-right: 30rpx;
|
||||
font-size: 28rpx;
|
||||
color: #FFFFFF;
|
||||
}
|
||||
|
||||
.scrollview-active {
|
||||
position: relative;
|
||||
font-weight: bold;
|
||||
font-size: 36rpx;
|
||||
color: #FFFFFF;
|
||||
|
||||
&::after {
|
||||
content: "";
|
||||
display: inline-block;
|
||||
position: absolute;
|
||||
bottom: -6rpx;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
width: 100%;
|
||||
height: 6rpx;
|
||||
background-color: #FFFFFF;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.wholeSale-con {
|
||||
margin: 0 10px;
|
||||
}
|
||||
|
||||
.search_content {
|
||||
margin-bottom: 40rpx;
|
||||
height: 70rpx;
|
||||
padding: 2px 2px 2px 21.05rpx;
|
||||
border-radius: 80rpx;
|
||||
background: #EDEFF2;
|
||||
position: relative;
|
||||
box-sizing: border-box;
|
||||
|
||||
.search_content_wrap {
|
||||
width: 100%;
|
||||
|
||||
.icon-sousuo {
|
||||
font-size: 26.32rpx;
|
||||
font-weight: bold;
|
||||
color: #c8c7c6;
|
||||
margin-right: 17.54rpx;
|
||||
}
|
||||
|
||||
input {
|
||||
width: 80%;
|
||||
}
|
||||
}
|
||||
|
||||
.search_btn {
|
||||
width: 106rpx;
|
||||
height: 60rpx;
|
||||
line-height: 60rpx;
|
||||
background: #40AE36;
|
||||
border-radius: 100px;
|
||||
font-size: 28rpx;
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
|
||||
.category {
|
||||
width: 100%;
|
||||
overflow: auto;
|
||||
position: relative;
|
||||
padding-right: 70rpx;
|
||||
|
||||
.category-wrap {
|
||||
display: flex;
|
||||
padding-bottom: 20rpx;
|
||||
height: 192rpx;
|
||||
|
||||
.category-item {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
margin-right: 38rpx;
|
||||
|
||||
text {
|
||||
margin-top: 16rpx;
|
||||
font-size: 24rpx;
|
||||
color: #666666;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.category-item-text {
|
||||
width: 120rpx;
|
||||
text-align: center;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
|
||||
.category-item-active {
|
||||
position: relative;
|
||||
|
||||
.category-item-img {
|
||||
border: 2px solid #40AE36;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
text {
|
||||
background-color: #40AE36;
|
||||
color: #fff;
|
||||
padding: 2rpx 10rpx 6rpx 10rpx;
|
||||
border-radius: 50rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.category-all {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
height: 100%;
|
||||
background-color: #f3f3f3;
|
||||
z-index: 10;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
font-size: 24rpx;
|
||||
border-radius: 4rpx;
|
||||
width: 70rpx;
|
||||
color: #919191;
|
||||
}
|
||||
}
|
||||
|
||||
.cate {
|
||||
width: 100%;
|
||||
overflow: auto;
|
||||
margin-bottom: 30rpx;
|
||||
|
||||
.cate-wrap {
|
||||
display: flex;
|
||||
padding-bottom: 8rpx;
|
||||
|
||||
.cate-item {
|
||||
|
||||
text {
|
||||
padding: 4rpx 16rpx;
|
||||
white-space: nowrap;
|
||||
font-size: 30rpx;
|
||||
color: #333;
|
||||
}
|
||||
}
|
||||
|
||||
.cate-item-active {
|
||||
text {
|
||||
color: #40AE36;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.popup-wrap {
|
||||
background-color: #fff;
|
||||
padding: 20rpx;
|
||||
|
||||
.popup-wrap-title {
|
||||
font-size: 36rpx;
|
||||
color: #333;
|
||||
font-weight: bold;
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
|
||||
.popup-wrap-category {
|
||||
width: 100%;
|
||||
|
||||
.popup-wrap-category-wrap {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
|
||||
.popup-wrap-category-item {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
margin: 0 20rpx 20rpx 0;
|
||||
|
||||
&:nth-child(5n) {
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
text {
|
||||
margin-top: 16rpx;
|
||||
font-size: 24rpx;
|
||||
color: #666666;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.popup-wrap-category-item-text {
|
||||
width: 120rpx;
|
||||
text-align: center;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
|
||||
.popup-wrap-category-item-active {
|
||||
position: relative;
|
||||
|
||||
.popup-wrap-category-item-img {
|
||||
border: 2px solid #40AE36;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
text {
|
||||
background-color: #40AE36;
|
||||
color: #fff;
|
||||
padding: 2rpx 10rpx 6rpx 10rpx;
|
||||
border-radius: 50rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.comprehensive {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 20rpx 50rpx;
|
||||
|
||||
[class^=comprehensive-] {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
text {
|
||||
margin-right: 12rpx;
|
||||
font-size: 26rpx;
|
||||
color: #666666;
|
||||
}
|
||||
|
||||
image {
|
||||
width: 28rpx;
|
||||
height: 28rpx;
|
||||
}
|
||||
|
||||
.loudou {
|
||||
width: 24rpx;
|
||||
height: 24rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.comp-color {
|
||||
|
||||
text {
|
||||
margin-right: 12rpx;
|
||||
font-size: 26rpx;
|
||||
color: #40ae36 !important;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.pictrue {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
color: #999;
|
||||
|
||||
image {
|
||||
width: 414rpx;
|
||||
height: 305rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.goods_list {
|
||||
.goods {
|
||||
height: 200rpx;
|
||||
margin: 20rpx auto;
|
||||
margin-top: 0;
|
||||
background-color: #fff;
|
||||
border-radius: 24rpx;
|
||||
display: flex;
|
||||
|
||||
.avatar {
|
||||
height: 160rpx;
|
||||
width: 160rpx;
|
||||
margin: 20rpx;
|
||||
border-radius: 12rpx;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.content {
|
||||
margin: 20rpx 0;
|
||||
width: 520rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
|
||||
.content-head {
|
||||
width: 500rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: flex-end;
|
||||
font-size: 28rpx;
|
||||
color: #333;
|
||||
|
||||
.title {
|
||||
width: 360rpx;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
|
||||
.content-two {
|
||||
display: flex;
|
||||
font-size: 24rpx;
|
||||
color: #666;
|
||||
align-items: center;
|
||||
|
||||
.star {
|
||||
position: relative;
|
||||
width: 111rpx;
|
||||
height: 19rpx;
|
||||
margin-right: 10rpx;
|
||||
background: url(../columnGoods/images/star.png) left top/100% 100% no-repeat;
|
||||
overflow: hidden;
|
||||
|
||||
view {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: url(../columnGoods/images/star_active.png) left top/111rpx 19rpx no-repeat;
|
||||
|
||||
&.star_purple {
|
||||
background: url(../columnGoods/images/star_active_purple.png) left top/111rpx 19rpx no-repeat;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
BIN
static/images/loading.gif
Normal file
BIN
static/images/loading.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
29
utils/mixin.js
Normal file
29
utils/mixin.js
Normal file
@ -0,0 +1,29 @@
|
||||
const mixins = {
|
||||
data() {
|
||||
return {
|
||||
wrapHeight: 'auto',
|
||||
clientY: 0,
|
||||
maxHeight: 0,
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
methods: {
|
||||
// 移动
|
||||
onTouchMove(e) {
|
||||
console.log(e);
|
||||
const moveDistance = e.changedTouches[0].clientY - this.clientY;
|
||||
if (moveDistance > 5) {
|
||||
this.wrapHeight = '352rpx';
|
||||
} else {
|
||||
this.wrapHeight = 0;
|
||||
}
|
||||
},
|
||||
|
||||
// 开始触摸屏幕
|
||||
onTouchStart(e) {
|
||||
this.clientY = e.changedTouches[0].clientY;
|
||||
},
|
||||
}
|
||||
}
|
||||
export default mixins;
|
||||
@ -24,6 +24,15 @@ import permision from "./permission.js"
|
||||
// #endif
|
||||
export default {
|
||||
|
||||
getDom: (that, selector, fn) => {
|
||||
that.$nextTick(() => {
|
||||
const query = uni.createSelectorQuery().in(that);
|
||||
query.select(selector).boundingClientRect((data) => {
|
||||
fn && fn(data);
|
||||
}).exec();
|
||||
})
|
||||
},
|
||||
|
||||
//复制
|
||||
uniCopy: ({
|
||||
content,
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
module.exports = {
|
||||
publicPath: '/h5',
|
||||
productionSourceMap: false, // 生产打包时不输出map文件，增加打包速度
|
||||
configureWebpack: config => {
|
||||
if (process.env.NODE_ENV === 'production') {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user