mkm/new_shop_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
DESKTOP-GMUNQ1B\k 2024-04-17 17:43:57 +08:00
parent f691bf6749
commit 83c04d43b5
5 changed files with 960 additions and 905 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1187
pages/cloud_warehouse/market/market.vue
View File

File diff suppressed because it is too large Load Diff

68
pages/index/index.vue
View File

@ -89,7 +89,8 @@
<view v-if="recommend_switch == 1" class="index-product-wrapper"> <view v-if="recommend_switch == 1" class="index-product-wrapper">
<!-- 首发新品 --> <!-- 首发新品 -->
<recommend ref="recommendRef" :hostProduct="hostProduct[hostIndex]" <recommend ref="recommendRef" :hostProduct="hostProduct[hostIndex]"
@changeRecommedTab="changeRecommedTab" showTab :indexP="true" :isLogin="isLogin" :loading="loading"> @changeRecommedTab="changeRecommedTab" showTab :indexP="true" :isLogin="isLogin"
:loading="loading">
</recommend> </recommend>
<view class="loadingicon acea-row row-center-wrapper" <view class="loadingicon acea-row row-center-wrapper"
v-if="hostProduct[hostIndex].length > 0 || hotLoading[hostIndex]"> v-if="hostProduct[hostIndex].length > 0 || hotLoading[hostIndex]">
@ -523,6 +524,35 @@
isSupport: true isSupport: true
}; };
}, },
onTabItemTap(e) {
},
// 滚动监听
onPageScroll(e) {
this.isFixed = e.scrollTop > 40;
// uni.setTabBarItem({
// index: 0,
// text: "123",
// selectedIconPath: "/static/tabbar_icon/b-a.png"
// })
// this.$forceUpdate();
if (this.isHeaderSerch) {
let isScroll = false
isScroll = e.scrollTop > 50
this.isScrolled = isScroll;
} else {
this.isScrolled = false
}
// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
uni.$emit('scroll');
},
/** /**
* 用户点击右上角分享 * 用户点击右上角分享
*/ */
@ -1048,7 +1078,7 @@
that.hotLoading[e] = true; that.hotLoading[e] = true;
that.hotTitle = '加载中'; that.hotTitle = '加载中';
getProductHot(that.hotPage, that.hotLimit, 1, 1).then(res => { getProductHot(that.hotPage, that.hotLimit, 1, 1).then(res => {
res.data.list = this.shuffleArray(res.data.list); res.data.list = this.shuffleArray(res.data.list);
let list = res.data.list; let list = res.data.list;
let productList = that.hostProduct; let productList = that.hostProduct;
if (!productList[e]) productList[e] = []; if (!productList[e]) productList[e] = [];
@ -1082,7 +1112,7 @@
getProductslist({ getProductslist({
...query ...query
}).then(res => { }).then(res => {
res.data.list = this.shuffleArray(res.data.list); res.data.list = this.shuffleArray(res.data.list);
let list = res.data.list; let list = res.data.list;
let productList = that.hostProduct; let productList = that.hostProduct;
if (!productList[e]) productList[e] = []; if (!productList[e]) productList[e] = [];
@ -1097,15 +1127,15 @@
that.$set(that, 'hotLimit', res.data.limit); that.$set(that, 'hotLimit', res.data.limit);
}); });
}, },
// 数组乱序 // 数组乱序
shuffleArray(array) { shuffleArray(array) {
for (let i = array.length - 1; i > 0; i--) { for (let i = array.length - 1; i > 0; i--) {
const j = Math.floor(Math.random() * (i + 1)); const j = Math.floor(Math.random() * (i + 1));
[array[i], array[j]] = [array[j], array[i]]; [array[i], array[j]] = [array[j], array[i]];
} }
return array; return array;
}, },
getCateData() { getCateData() {
getCateData().then(res => { getCateData().then(res => {
@ -1210,20 +1240,6 @@
} }
} }
}, },
// 滚动监听
onPageScroll(e) {
this.isFixed = e.scrollTop > 40;
if (this.isHeaderSerch) {
let isScroll = false
isScroll = e.scrollTop > 50
this.isScrolled = isScroll;
} else {
this.isScrolled = false
}
// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
uni.$emit('scroll');
}
}; };
</script> </script>
<style> <style>

280
pages/order_addcart/order_addcart.vue
View File

@ -2,40 +2,41 @@
<view :style="viewColor"> <view :style="viewColor">
<view class='shoppingCart'> <view class='shoppingCart'>
<view style="position: fixed;top: 0;left: 0;width: 100%;z-index: 999;"> <view style="position: fixed;top: 0;left: 0;width: 100%;z-index: 999;">
<!-- 头部 --> <!-- 头部 -->
<view class="shoppingCart-head"> <view class="shoppingCart-head">
<view style="height: var(--status-bar-height);"></view> <view style="height: var(--status-bar-height);"></view>
<!-- 滚动tab --> <!-- 滚动tab -->
<scroll-view scroll-x="true"> <scroll-view scroll-x="true">
<view class="scrollview"> <view class="scrollview">
<block v-for="(item,indx) in tabsArr" :key="indx"> <block v-for="(item,indx) in tabsArr" :key="indx">
<view class="scrollview-item" :class="{'scrollview-active':tabsCurr == item.val}" <view class="scrollview-item" :class="{'scrollview-active':tabsCurr == item.val}"
@click="tabsChange(item.val)"> @click="tabsChange(item.val)">
{{item.name}} {{item.name}}
</view> </view>
</block> </block>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<view class="func" style="padding-top: 0;"> <view class="func" style="padding-top: 0;">
<!-- 分段器 --> <!-- 分段器 -->
<!-- <view class="subsection"> <!-- <view class="subsection">
<u-subsection :list="['综合云市场','商户购物车']" activeColor="#40AE36" :current="subsecCurr" <u-subsection :list="['综合云市场','商户购物车']" activeColor="#40AE36" :current="subsecCurr"
mode="subsection" @change="subsecChange"></u-subsection> mode="subsection" @change="subsecChange"></u-subsection>
</view> --> </view> -->
<view class='nav acea-row row-between-wrapper'> <view class='nav acea-row row-between-wrapper'>
<view>购物数量：<text class='num t-color'>{{cartTotalCount}}</text></view> <view>购物数量：<text class='num t-color'>{{cartTotalCount}}</text></view>
<view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0" <view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0"
class='administrate acea-row row-center-wrapper' @click='manage'>{{ footerswitch ? '管理' : '取消'}} class='administrate acea-row row-center-wrapper' @click='manage'>
</view> {{ footerswitch ? '管理' : '取消'}}
</view> </view>
</view> </view>
</view> </view>
</view>
<view style="height: calc(var(--status-bar-height) + 180rpx);"></view>
<view style="height: calc(var(--status-bar-height) + 180rpx);"></view>
<view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0"> <view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0">
<view class='list'> <view class='list'>
<block v-for="(item,index) in cartList.valid" :key="index"> <block v-for="(item,index) in cartList.valid" :key="index">
@ -45,18 +46,19 @@
<text v-if="!item.allCheck" class="iconfont icon-weixuanzhong"></text> <text v-if="!item.allCheck" class="iconfont icon-weixuanzhong"></text>
<text v-else class="iconfont icon-xuanzhong1"></text> <text v-else class="iconfont icon-xuanzhong1"></text>
</view> </view>
<navigator :url="hide_mer_status == 0 ? `/pages/store/home/index?id=${item.mer_id}&sale_type=${tabsCurr}` : '#'" <navigator
:url="hide_mer_status == 0 ? `/pages/store/home/index?id=${item.mer_id}&sale_type=${tabsCurr}` : '#'"
class="info"> class="info">
<text class="iconfont icon-shangjiadingdan"></text> <!-- <text class="iconfont icon-shangjiadingdan"></text> -->
<view class="name">{{item.mer_name}}</view> <view class="name">{{item.mer_name}}</view>
<text class="iconfont icon-xiangyou"></text> <text class="iconfont icon-xiangyou" style="font-weight: bold;"></text>
</navigator> </navigator>
<view class="coupon-btn" style="width: auto;padding: 0 10rpx;">{{item.cloud_warehouse}}</view> <!-- <view class="coupon-btn" style="width: auto;padding: 0 10rpx;">{{item.cloud_warehouse}}
<!-- <view class="coupon-btn" v-if="item.hasCoupon>0" @click="giveCoupon(item)">优惠券</view> --> </view> -->
</view> </view>
<navigator v-for="goods in item.list" :key="goods.cart_id" <navigator v-for="goods in item.list" :key="goods.cart_id"
:url='`/pages/goods_details/index?id=${goods.product.product_id}&sale_type=${tabsCurr}`' hover-class='none' :url='`/pages/goods_details/index?id=${goods.product.product_id}&sale_type=${tabsCurr}`'
class='picTxt acea-row'> hover-class='none' class='picTxt acea-row'>
<view class="checkbox" @click.stop="goodsCheck(goods,index)"> <view class="checkbox" @click.stop="goodsCheck(goods,index)">
<text v-if="!goods.check" class="iconfont icon-weixuanzhong"></text> <text v-if="!goods.check" class="iconfont icon-weixuanzhong"></text>
<text v-else class="iconfont icon-xuanzhong1"></text> <text v-else class="iconfont icon-xuanzhong1"></text>
@ -67,7 +69,7 @@
<!-- <image v-else :src='item.productInfo.image'></image> --> <!-- <image v-else :src='item.productInfo.image'></image> -->
</view> </view>
<view class='text'> <view class='text'>
<view class='line1'>{{goods.product.store_name}}</view> <view class='line1 goods-name'>{{goods.product.store_name}}</view>
<view class='infor line1' v-if="goods.productAttr.sku" <view class='infor line1' v-if="goods.productAttr.sku"
@click.stop='changeCart(goods,goods.product_id)'> @click.stop='changeCart(goods,goods.product_id)'>
{{goods.productAttr.sku}} {{goods.productAttr.sku}}
@ -79,8 +81,13 @@
v-if="goods.product.once_min_count>0">{{goods.product.once_min_count}}件起购，</text><text v-if="goods.product.once_min_count>0">{{goods.product.once_min_count}}件起购，</text><text
v-if="goods.product.once_max_count>0">最多{{goods.product.once_max_count}}件</text> v-if="goods.product.once_max_count>0">最多{{goods.product.once_max_count}}件</text>
</view> </view>
<view class='money acea-row row-middle'> <view class='money acea-row row-middle'>
<text>￥{{goods.productAttr.price}}</text> <view>
<text class="money-price">￥{{goods.productAttr.price}}</text>
<text class="money-unit">/份</text>
</view>
<view v-if="goods.productAttr.show_svip_price" class="vipImg"> <view v-if="goods.productAttr.show_svip_price" class="vipImg">
<image :src="`${domain}/static/images/svip.png`"></image> <image :src="`${domain}/static/images/svip.png`"></image>
</view> </view>
@ -171,7 +178,7 @@
<!-- 组件 --> <!-- 组件 -->
<addcartWindow :attr="attr" :isShow='1' :iSplus='1' :destri='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr" <addcartWindow :attr="attr" :isShow='1' :iSplus='1' :destri='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
@goCat="goCat" @attrVal="attrVal" id='product-window'></addcartWindow> @goCat="goCat" @attrVal="attrVal" id='product-window'></addcartWindow>
<Authorize :isShowAuth="isShowAuth"></Authorize> <Authorize :isShowAuth="isShowAuth"></Authorize>
<!--自定义底部tab栏--> <!--自定义底部tab栏-->
<customTab :newData="newData" :activeRouter="activeRouter"></customTab> <customTab :newData="newData" :activeRouter="activeRouter"></customTab>
</view> </view>
@ -192,9 +199,9 @@
import { import {
getNavigation getNavigation
} from "@/api/public"; } from "@/api/public";
import { import {
getUserInfo getUserInfo
} from '@/api/user.js'; } from '@/api/user.js';
import customTab from '@/components/customTab'; import customTab from '@/components/customTab';
import { import {
getCartList, getCartList,
@ -291,11 +298,11 @@
currSku: '', currSku: '',
newData: {}, newData: {},
activeRouter: '', activeRouter: '',
userInfo: {}, userInfo: {},
mer_info: { mer_info: {
mer_settlement_agree_status: 0 mer_settlement_agree_status: 0
}, },
isShowAuth: false isShowAuth: false
}; };
}, },
computed: configMap({ computed: configMap({
@ -305,26 +312,26 @@
}, mapGetters(['isLogin', 'viewColor'])), }, mapGetters(['isLogin', 'viewColor'])),
onReady() {}, onReady() {},
mounted: function() {}, mounted: function() {},
onLoad: function(options) { onLoad: function(options) {},
},
onShow: function() { onShow: function() {
let that = this let that = this
let routes = getCurrentPages(); let routes = getCurrentPages();
let curRoute = routes[routes.length - 1].route; let curRoute = routes[routes.length - 1].route;
this.activeRouter = '/' + curRoute this.activeRouter = '/' + curRoute
this.getNav(); this.getNav();
if (this.isLogin == true) { if (this.isLogin == true) {
this.isShowAuth = false; this.isShowAuth = false;
try{ try {
if(this.$store.state.app.userInfo.mer_info.mer_settlement_agree_status&&this.tabsArr.length==1) this.tabsArr.push({ if (this.$store.state.app.userInfo.mer_info.mer_settlement_agree_status && this.tabsArr.length ==
name: '商户购物车', 1) this.tabsArr.push({
val: 2 name: '商户购物车',
}) val: 2
}catch(e){ })
this.getUserInfo(); } catch (e) {
} this.getUserInfo();
this.tabsCurr = uni.getStorageSync('tabbar_sale_type') || 1; // 获取上次进入的是零售商品还是批发商品 }
this.tabsCurr = uni.getStorageSync('tabbar_sale_type') || 1; // 获取上次进入的是零售商品还是批发商品
this.getCartList(); this.getCartList();
this.getCartNum(); this.getCartNum();
this.goodsHidden = true; this.goodsHidden = true;
@ -339,45 +346,46 @@
} else { } else {
setTimeout(() => { setTimeout(() => {
// toLogin() // toLogin()
this.isShowAuth = true; this.isShowAuth = true;
}, 300); }, 300);
} }
}, },
methods: { methods: {
tabsChange(e) { tabsChange(e) {
this.tabsCurr = e; this.tabsCurr = e;
uni.setStorageSync('tabbar_sale_type', this.tabsCurr+''); uni.setStorageSync('tabbar_sale_type', this.tabsCurr + '');
this.getCartList(); this.getCartList();
this.getCartNum(); this.getCartNum();
this.goodsHidden = true; this.goodsHidden = true;
this.footerswitch = true; this.footerswitch = true;
this.isAllSelect = true; //全选 this.isAllSelect = true; //全选
this.selectValue = []; //选中的数据 this.selectValue = []; //选中的数据
uni.setStorage({ uni.setStorage({
key: 'invoice_Data', key: 'invoice_Data',
data: {}, data: {},
success: function() {} success: function() {}
}) })
}, },
subsecChange(e) { subsecChange(e) {
this.subsecCurr = e; this.subsecCurr = e;
}, },
/** /**
* 获取个人用户信息 * 获取个人用户信息
*/ */
getUserInfo: function() { getUserInfo: function() {
let that = this; let that = this;
getUserInfo().then(res => { getUserInfo().then(res => {
that.userInfo = res.data; that.userInfo = res.data;
if(res.data.mer_info.mer_settlement_agree_status&&this.tabsArr.length==1) this.tabsArr.push({ if (res.data.mer_info.mer_settlement_agree_status && this.tabsArr.length == 1) this.tabsArr
name: '商户购物车', .push({
val: 2 name: '商户购物车',
}) val: 2
this.$store.commit('SET_USERINFO', res.data); })
}); this.$store.commit('SET_USERINFO', res.data);
}, });
},
goRouter(item) { goRouter(item) {
var pages = getCurrentPages(); var pages = getCurrentPages();
@ -757,8 +765,8 @@
getCartNum: function() { getCartNum: function() {
let that = this; let that = this;
getCartCounts({ getCartCounts({
sale_type: this.tabsCurr sale_type: this.tabsCurr
}).then(res => { }).then(res => {
that.cartTotalCount = res.data[0].count || 0; that.cartTotalCount = res.data[0].count || 0;
}); });
}, },
@ -766,8 +774,8 @@
getCartList: function(isChange) { getCartList: function(isChange) {
let that = this; let that = this;
getCartList({ getCartList({
sale_type: this.tabsCurr sale_type: this.tabsCurr
}).then(res => { }).then(res => {
res.data.list.forEach((item, index) => { res.data.list.forEach((item, index) => {
item.allCheck = true item.allCheck = true
item.list.forEach((goods, j) => { item.list.forEach((goods, j) => {
@ -789,10 +797,10 @@
if (res.data.list.length == 0 && res.data.fail.length == 0) { if (res.data.list.length == 0 && res.data.fail.length == 0) {
this.recommend = true; this.recommend = true;
this.hostProduct = []; this.hostProduct = [];
this.loadend = false; this.loadend = false;
this.hotScroll = false; this.hotScroll = false;
this.hotPage = 1; this.hotPage = 1;
this.getHostProduct(); this.getHostProduct();
} else { } else {
this.recommend = false this.recommend = false
} }
@ -875,7 +883,7 @@
getProductHot( getProductHot(
that.hotPage, that.hotPage,
that.hotLimit, that.hotLimit,
that.tabsCurr that.tabsCurr
).then(res => { ).then(res => {
let list = res.data.list || []; let list = res.data.list || [];
that.hotPage++ that.hotPage++
@ -1064,18 +1072,17 @@
z-index: 5; z-index: 5;
top: 76rpx; top: 76rpx;
} }
.shoppingCart .nav .administrate {
font-size: 26rpx;
color: #282828;
width: 110rpx;
height: 46rpx;
border-radius: 6rpx;
border: 1px solid #868686;
}
} }
} }
.administrate {
font-size: 26rpx;
color: #fff;
border-radius: 6rpx;
background: #40AE36;
padding: 4rpx 32rpx;
}
.shoppingCart .noCart { .shoppingCart .noCart {
margin-top: 20rpx; margin-top: 20rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
@ -1098,6 +1105,11 @@
color: #999; color: #999;
} }
.goods-name {
font-size: 28rpx;
color: #060606;
}
.shoppingCart .list { .shoppingCart .list {
margin: 20rpx 0 20rpx; margin: 20rpx 0 20rpx;
} }
@ -1115,7 +1127,7 @@
border-bottom: 1px solid #f0f0f0; border-bottom: 1px solid #f0f0f0;
.checkbox { .checkbox {
flex-shrink: 0; flex-shrink: 0;
width: 60rpx; width: 60rpx;
.iconfont { .iconfont {
@ -1145,14 +1157,15 @@
} }
.icon-xiangyou { .icon-xiangyou {
margin-top: 6rpx; margin-top: 4rpx;
font-size: 22rpx; font-size: 22rpx;
color: #999; color: #999;
margin-left: 6rpx;
} }
} }
.coupon-btn { .coupon-btn {
flex-shrink: 0; flex-shrink: 0;
color: var(--view-theme); color: var(--view-theme);
font-size: 22rpx; font-size: 22rpx;
width: 100rpx; width: 100rpx;
@ -1198,18 +1211,18 @@
} }
.shoppingCart .list .item .picTxt .pictrue { .shoppingCart .list .item .picTxt .pictrue {
width: 160rpx; width: 180rpx;
height: 160rpx; height: 180rpx;
} }
.shoppingCart .list .item .picTxt .pictrue image { .shoppingCart .list .item .picTxt .pictrue image {
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 6rpx; border-radius: 20rpx;
} }
.shoppingCart .list .item .picTxt .text { .shoppingCart .list .item .picTxt .text {
width: 444rpx; width: 420rpx;
margin-left: 20rpx; margin-left: 20rpx;
font-size: 28rpx; font-size: 28rpx;
color: #282828; color: #282828;
@ -1238,6 +1251,17 @@
margin-top: 28rpx; margin-top: 28rpx;
} }
.money-price {
color: #F55726;
font-size: 32rpx;
font-weight: bold;
}
.money-unit {
color: #999;
font-size: 22rpx;
}
.shoppingCart .list .item .picTxt .carnum { .shoppingCart .list .item .picTxt .carnum {
height: 47rpx; height: 47rpx;
position: absolute; position: absolute;
@ -1247,7 +1271,7 @@
.shoppingCart .list .item .picTxt .carnum view { .shoppingCart .list .item .picTxt .carnum view {
border: 1px solid #a4a4a4; border: 1px solid #a4a4a4;
min-width: 66rpx; // min-width: 66rpx;
text-align: center; text-align: center;
height: 100%; height: 100%;
line-height: 46rpx; line-height: 46rpx;
@ -1255,15 +1279,16 @@
color: #a4a4a4; color: #a4a4a4;
} }
.shoppingCart .list .item .picTxt .carnum .reduce { .shoppingCart .list .item .picTxt .carnum .reduce,
border-right: 0; .shoppingCart .list .item .picTxt .carnum .plus {
// border-radius: 3rpx 0 0 3rpx; width: 44rpx;
} height: 44rpx;
background: #F8F9FA;
.shoppingCart .list .item .picTxt .carnum .reduce.on, color: #333;
.shoppingCart .list .item .picTxt .carnum .plus.on { font-size: 28rpx;
border-color: #e3e3e3; border: 0;
color: #dedede; border-radius: 50%;
font-weight: bold;
} }
.shoppingCart .list .item .picTxt .carnum .plus { .shoppingCart .list .item .picTxt .carnum .plus {
@ -1272,7 +1297,12 @@
} }
.shoppingCart .list .item .picTxt .carnum .num { .shoppingCart .list .item .picTxt .carnum .num {
width: 78rpx;
height: 40rpx;
line-height: 40rpx;
text-align: center;
color: #282828; color: #282828;
border: 0;
} }
.shoppingCart .invalidGoods { .shoppingCart .invalidGoods {

12
pages/order_pay_status/index.vue
View File

@ -21,14 +21,16 @@
<view>兑换方式</view> <view>兑换方式</view>
<view class='itemCom'>积分兑换</view> <view class='itemCom'>积分兑换</view>
</view> </view>
<view v-else class='item acea-row row-between-wrapper'> <view v-else class='item acea-row row-between-wrapper'>
<view>支付方式</view> <view>支付方式</view>
<view v-if="order_pay_info.pay_type==1 || order_pay_info.pay_type==2 || order_pay_info.pay_type==3" <view
v-if="(order_pay_info.pay_type==1 || order_pay_info.pay_type==2 || order_pay_info.pay_type==3)"
class='itemCom'>微信</view> class='itemCom'>微信</view>
<view v-else-if="order_pay_info.pay_type==4 || order_pay_info.pay_type==5" class='itemCom'>支付宝 <view v-else-if="order_pay_info.pay_type==4 || order_pay_info.pay_type==5" class='itemCom'>支付宝
</view> </view>
<view v-else-if="order_pay_info.pay_type==9" class='itemCom'>商户余额</view> <view v-else-if="order_pay_info.pay_type==9" class='itemCom'>商户余额</view>
<view v-else class='itemCom'>余额</view> <view v-else class='itemCom'>{{JSON.stringify(order_pay_info)!='{}' ?'余额':''}}</view>
</view> </view>
<view v-if="order_type== 20" class='item acea-row row-between-wrapper'> <view v-if="order_type== 20" class='item acea-row row-between-wrapper'>
<view>支付积分</view> <view>支付积分</view>
@ -142,7 +144,7 @@
text: '展开更多', text: '展开更多',
timer: null, timer: null,
payResult: '正在查询支付结果...', payResult: '正在查询支付结果...',
sale_type: 1 sale_type: 1
}; };
}, },
computed: mapGetters(['isLogin', 'viewColor', 'keyColor']), computed: mapGetters(['isLogin', 'viewColor', 'keyColor']),
@ -153,7 +155,7 @@
tab: 3, tab: 3,
url: 1 url: 1
}); });
if(options.sale_type) this.sale_type = options.sale_type; if (options.sale_type) this.sale_type = options.sale_type;
this.orderId = options.order_id; this.orderId = options.order_id;
this.order_type = options.order_type; this.order_type = options.order_type;
this.status = options.status || 0; this.status = options.status || 0;

318
pages/store/home/index.vue
View File

@ -1,3 +1,53 @@
<style lang="scss">
.tab-cont {
display: flex;
.aside-left-placeholder {
width: 152rpx;
}
.aside-left {
position: fixed;
left: 0;
z-index: 2;
display: flex;
flex-wrap: wrap;
width: 152rpx;
overflow-y: auto;
background-color: #F4F4F4;
.aside-left-item {
width: 100%;
height: 94rpx;
line-height: 94rpx;
text-align: center;
padding: 0 14rpx;
}
.aside-active {
position: relative;
font-weight: bold;
font-size: 26rpx;
color: #40AE36;
background-color: #fff;
&::before {
content: "";
display: inline-block;
position: absolute;
left: 0;
top: 50%;
transform: translateY(-50%);
width: 6rpx;
height: 36rpx;
background: #40AE36;
border-radius: 0rpx 4rpx 4rpx 0rpx;
}
}
}
}
</style>
<template> <template>
<view class="store-home"> <view class="store-home">
<view class="header"> <view class="header">
@ -94,9 +144,23 @@
</block> </block>
</view> </view>
<view class="tab-cont" :style="viewColor,{'height':'calc(100vh - '+listHeight+' - 84rpx)'}" <view class="tab-cont"
:style="viewColor,{'height':'calc(100vh - '+listHeight+' - 84rpx '+(tabActive == 2?' + 84rpx':'')+' )'}"
:class="{noPointer : preview}"> :class="{noPointer : preview}">
<!-- 占位 -->
<view class="aside-left-placeholder" v-if="tabActive != 2"></view>
<!-- 大分类 -->
<view class="aside-left" v-if="tabActive != 2"
:style="{'top':'calc('+headHeight+')','height':'calc(100vh - '+listHeight+' - 84rpx)'}">
<block v-for="item in asideMenu" :key="item.store_category_id">
<view class="aside-left-item line1" @click="onChangeAsideMenu(item.store_category_id)"
:class="{'aside-active':asideCurr == item.store_category_id?true:false}">
{{item.cate_name}}
</view>
</block>
</view>
<view v-show="diyActive == 0 && tabActive == 1"> <view v-show="diyActive == 0 && tabActive == 1">
<!-- #ifdef H5 --> <!-- #ifdef H5 -->
@ -144,10 +208,11 @@
</view> </view>
<!-- 首页 --> <!-- 首页 -->
<view <view style="margin:0 auto;"
v-show="(tabActive == 3 || tabActive == 7 || diyActive == 1 || diyActive == 2) && tabActive != 5 && tabActive != 2"> v-show="(tabActive == 3 || tabActive == 7 || diyActive == 1 || diyActive == 2) && tabActive != 5 && tabActive != 2">
<!-- 商品 --> <!-- 商品 -->
<view v-if="goods.length" class="goods-wrap" id="goods" @touchmove="onTouchmove"> <view v-if="goods.length" class="goods-wrap" id="goods" @touchmove="onTouchmove"
:style="{'width':'calc(100vw - 152rpx)'}">
<view v-if="isColumn" class="goods column"> <view v-if="isColumn" class="goods column">
<view v-for="item in goods" :key="item.product_id" class="item" <view v-for="item in goods" :key="item.product_id" class="item"
@click="goGoodsDetail(item)"> @click="goGoodsDetail(item)">
@ -181,38 +246,7 @@
</view> </view>
<view class="price-icon iconfont icon-gouwuche"></view> <view class="price-icon iconfont icon-gouwuche"></view>
</view> </view>
<!-- <view class="item_bot">
<view class="money-wrap acea-row">
<view class="money">
¥<text>{{ item.price }}</text>
</view>
<view
v-if="item.show_svip_info && item.show_svip_info.show_svip_price && item.svip_price"
class="acea-row row-middle">
<text class='vip-money'>￥{{item.svip_price}}</text>
<view class="vipImg">
<image class="image" :src="`${domain}/static/images/svip.png`">
</image>
</view>
</view>
</view>
<view
v-if="item.product_type != 0 || item.issetCoupon || item.delivery_free == 1"
class="item_tags">
<text v-if="item.product_type != 0"
:class="'font_bg-red type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>
<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
<text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text>
</view>
<view class="score">{{ item.rate }}评分 {{ item.reply_count }}条评论</view>
</view> -->
</view> </view>
<!-- <view v-if="item.max_extension>0 && (item.product_type == 0 || item.product_type == 2)"
class="foot">
<text v-show="!isColumn" class="iconfont"></text>
最高赚 ¥{{ item.max_extension }}
</view> -->
</view> </view>
</view> </view>
<view v-else class="goods"> <view v-else class="goods">
@ -227,7 +261,7 @@
</view> </view>
<!-- 分类 --> <!-- 分类 -->
<view v-show="tabActive == 2"> <view v-show="tabActive == 2" style="width:100%;">
<view class="category"> <view class="category">
<view class="section"> <view class="section">
<view class="head" @click="goCategoryGoods('')"> <view class="head" @click="goCategoryGoods('')">
@ -251,130 +285,13 @@
{{loadTitle}} {{loadTitle}}
</view> </view>
</view> </view>
<!--生活服务 优惠券-->
<!-- <view v-show="tabActive === 5" id="product" @touchmove="onTouchmoves">
<view v-if="productList.length" class="goods column">
<view v-for="item in productList" :key="item.product_id" class="item"
@click="goGoodsDetail(item)">
<view class="image">
<easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage>
</view>
<view class="text acea-row row-between-wrapper">
<view class="name line2">
<text class="name_text line1">{{ item.store_name }}</text>
</view>
<view class="item_bot">
<view class="money-wrap acea-row">
<view class="money">
¥
<text>{{ item.price }}</text>
</view>
<view
v-if="item.show_svip_info && item.show_svip_info.show_svip_price && item.svip_price"
class="acea-row row-middle">
<text class='vip-money'>￥{{item.svip_price}}</text>
<view class="vipImg">
<image class="image" :src="`${domain}/static/images/svip.png`"></image>
</view>
</view>
</view>
<view v-if="item.product_type != 0 || item.issetCoupon || item.delivery_free == 1"
class="item_tags">
<text v-if="item.product_type != 0"
:class="'font_bg-red type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>
<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
<text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text>
</view>
<view class="score">{{ item.rate }}评分 {{ item.reply_count }}条评论</view>
</view>
</view>
<view v-if="item.max_extension && (item.product_type == 0 || item.product_type == 2)"
class="foot">
<text v-show="!isColumn" class="iconfont"></text>
最高赚 ¥{{ item.max_extension }}
</view>
</view>
</view>
<view v-if="goodsLoading" class="acea-row row-center-wrapper loadingicon">
<text :hidden="!goodsLoading" class="iconfont icon-jiazai loading"></text>
{{loadTitle}}
</view>
<emptyPage v-if="productList.length == 0 && !goodsLoading" title="暂无商品~"></emptyPage>
</view>
<view v-show="diyActive == 3 && tabActive == 1">
<view v-if="coupon.length" class="coupon">
<view v-for="item in coupon" :key="item.coupon_id" class="item">
<view class="left gary" v-if="item.issue">
<view class="money">
¥
<text>{{ item.coupon_price }}</text>
</view>
<view>满{{ item.use_min_price }}元可用</view>
</view>
<view class="left" v-else
:style="{ 'background-image': `url(${domain}/static/diy/couponBg${keyColor}.png)` }">
<view class="money">
¥
<text>{{ item.coupon_price }}</text>
</view>
<view>满{{ item.use_min_price }}元可用</view>
</view>
<view class="right">
<view class="name line1">
<text :class="{gary:item.issue}">{{item.type===0?'店铺券':'商品券'}}</text>
{{ item.title }}
</view>
<view class="time-wrap" style="justify-content: space-between;">
<block v-if="item.coupon_type == 1">
<view class="time">
{{ item.use_start_time | dateFormat }}-{{ item.use_end_time | dateFormat }}
</view>
</block>
<block v-if="item.coupon_type == 0">
<view>领取后{{ item.coupon_time}}天内可用</view>
</block>
<block v-if="item.issue">
<view class="gary iconfont icon-yilingqu2"></view>
</block>
<block v-else>
<view class="button" @click="receiveCoupon(item)">立即领取</view>
</block>
</view>
</view>
</view>
</view>
<emptyPage v-if="coupon.length == 0" title="暂无优惠券~"></emptyPage>
</view> -->
<!--活动专场-->
<!-- <view v-show="tabActive === 4">
<block v-if="topicList.length>0">
<view class="main_count">
<navigator v-for="(item,index) in topicList" :key='item.group_data_id'
:url="`/pages/activity/topic_detail/index?id=${item.group_data_id}`" hover-class="none">
<view class='list'>
<image :src="item.pic" class="picture"></image>
</view>
</navigator>
</view>
</block>
<block v-else>
<view class='empty-box' v-cloak>
<image src='../static/images/no-topic.png'></image>
<view class="txt">暂无活动专场哦~</view>
</view>
</block>
</view> -->
</view> </view>
</scroll-view> </scroll-view>
<view class="footer" :style="viewColor" :class="{noPointer : preview}"> <view class="footer" :style="viewColor" :class="{noPointer : preview}">
<view v-for="(item, index) in tabs3" :key="index" :class="{ active: tabActive === item.value }" class="item" <view v-for="(item, index) in tabs3" :key="index" :class="{ active: tabActive === item.value }" class="item"
@click="tab(item.value)"> @click="tab(item.value)">
<view :class="['iconfont', item.icon]"></view> <view :class="['iconfont', item.icon,item.value==9?'car-number':'']" :data-attr="CartCount"></view>
<view>{{ item.name }}</view> <view>{{ item.name }}</view>
</view> </view>
</view> </view>
@ -402,7 +319,8 @@
followStore, followStore,
unfollowStore, unfollowStore,
storeServiceList, storeServiceList,
hasServiceApi hasServiceApi,
getCategoryIndexList
} from '@/api/store.js'; } from '@/api/store.js';
import { import {
initiateAssistApi, initiateAssistApi,
@ -425,6 +343,9 @@
import { import {
goShopDetail goShopDetail
} from '@/libs/order.js'; } from '@/libs/order.js';
import {
getCartCounts
} from '@/api/order.js';
import history from "@/mixins/history"; import history from "@/mixins/history";
import emptyPage from '@/components/emptyPage.vue' import emptyPage from '@/components/emptyPage.vue'
import shareScence from "@/libs/spread"; import shareScence from "@/libs/spread";
@ -453,6 +374,9 @@
import pictureCube from '../../index/component/pictureCube' import pictureCube from '../../index/component/pictureCube'
import titles from '../../index/component/titles'; import titles from '../../index/component/titles';
// #endif // #endif
import {
merClassifly,
} from "@/api/store.js"
const app = getApp(); const app = getApp();
export default { export default {
components: { components: {
@ -578,6 +502,10 @@
icon: 'icon-gouwu_o', icon: 'icon-gouwu_o',
name: '商品', name: '商品',
value: 3, value: 3,
}, {
icon: 'icon-gouwuche',
name: '购物车',
value: 9,
}, { }, {
icon: 'icon-yingyongAPP_o', icon: 'icon-yingyongAPP_o',
name: '分类', name: '分类',
@ -593,7 +521,11 @@
type: 0, type: 0,
serviceInfo: {}, serviceInfo: {},
preview: false, preview: false,
listHeight: 0 listHeight: 0,
headHeight: 0,
asideMenu: [],
asideCurr: '',
CartCount: 0
} }
}, },
computed: { computed: {
@ -605,8 +537,7 @@
}; };
if ('postage_score' in store) { if ('postage_score' in store) {
score.number = (parseFloat(store.postage_score) + parseFloat(store.product_score) + parseFloat( score.number = (parseFloat(store.postage_score) + parseFloat(store.product_score) + parseFloat(
store.service_score)) / store.service_score)) / 3;
3;
score.star = score.number / 5 * 100; score.star = score.number / 5 * 100;
} }
return score; return score;
@ -701,6 +632,9 @@
}) })
} }
}) })
this.getMerClassifly();
this.getCart();
}, },
/** /**
@ -732,6 +666,41 @@
}, },
// #endif // #endif
methods: { methods: {
//获取购物车数量
getCart() {
let that = this;
console.log(111)
getCartCounts({
sale_type: this.where.sale_type
}).then(res => {
console.log(res)
that.CartCount = res.data[0].count;
});
},
// 修改菜单
onChangeAsideMenu(e) {
this.asideCurr = e;
this.resetParmas();
this.goods = [];
this.loadend = false;
this.getGoods();
},
// 获取分类
getMerClassifly() {
getCategoryIndexList({
mer_type: 2,
sale_type: this.where.sale_type
}).then(res => {
this.asideMenu = [{
cate_name: '全部',
store_category_id: ''
}, ...res.data];
})
},
navTo(url) { navTo(url) {
uni.navigateTo({ uni.navigateTo({
url: url url: url
@ -775,6 +744,7 @@
const headHeight = await this.getDomInfo('.header'); const headHeight = await this.getDomInfo('.header');
const footerHeight = await this.getDomInfo('.footer'); const footerHeight = await this.getDomInfo('.footer');
const navHeight = await this.getDomInfo('#nav-cont'); const navHeight = await this.getDomInfo('#nav-cont');
this.headHeight = headHeight;
this.listHeight = headHeight.height + footerHeight.height + 'px'; this.listHeight = headHeight.height + footerHeight.height + 'px';
}) })
@ -869,6 +839,7 @@
}); });
} }
}, },
// 本地生活服务商品 // 本地生活服务商品
get_service_list: function(isPage) { get_service_list: function(isPage) {
let that = this; let that = this;
@ -948,12 +919,16 @@
}, },
// 获取商铺商品 // 获取商铺商品
getGoods: function() { getGoods: function() {
console.log(2)
let that = this; let that = this;
if (that.loadend) return; if (that.loadend) return;
if (that.loading) return; if (that.loading) return;
if (that.goodsLoading) return; if (that.goodsLoading) return;
that.goodsLoading = true; that.goodsLoading = true;
that.loadTitle = ''; that.loadTitle = '';
that.where.cate_pid = that.asideCurr;
if (this.tabActive == 7) getStoreCloudGoods(that.id, that.where).then(res => { if (this.tabActive == 7) getStoreCloudGoods(that.id, that.where).then(res => {
that.goodsLoading = false; that.goodsLoading = false;
let list = res.data.list; let list = res.data.list;
@ -1176,11 +1151,17 @@
url: '/pages/index/index' url: '/pages/index/index'
}); });
}, },
// 商铺底部切换 // 商铺底部切换
tab: function(param) { tab: function(param) {
console.log(param)
if (param == 9) return uni.switchTab({
url: "/pages/order_addcart/order_addcart"
})
this.tabActive = param; this.tabActive = param;
this.goodsLoading = this.loadend = this.loading = false this.goodsLoading = this.loadend = this.loading = false
}, },
resetParmas() { resetParmas() {
this.navActive = 0; this.navActive = 0;
this.where = { this.where = {
@ -1259,6 +1240,24 @@
overflow: auto; overflow: auto;
} }
.car-number {
position: relative;
backgrond: red;
&::after {
content: attr(data-attr);
display: inline-block;
position: absolute;
background-color: #40AE36;
color: #fff;
padding: 10rpx;
font-size: 24rpx;
border-radius: 16rpx;
line-height: 16rpx;
text-align: center;
}
}
.noPointer { .noPointer {
pointer-events: none; pointer-events: none;
} }
@ -1590,6 +1589,8 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
background: #fff;
border-bottom: 1px solid #f3f3f3;
.nav-cont { .nav-cont {
display: flex; display: flex;
@ -1701,7 +1702,7 @@
padding-right: 20rpx; padding-right: 20rpx;
padding-left: 20rpx; padding-left: 20rpx;
background-color: #F5F5F5; background-color: #F5F5F5;
width: 750rpx; width: 100%;
.item { .item {
width: 345rpx; width: 345rpx;
@ -2235,7 +2236,6 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-top: 0; margin-top: 0;
padding-top: 200rpx;
image { image {
width: 414rpx; width: 414rpx;