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

Merge branch 'master' of https://gitea.lihaink.cn/mkm/new_shop_app

Browse Source
This commit is contained in:
weipengfei 2024-04-20 13:34:47 +08:00
commit 42de5aefee
5 changed files with 218 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -418,7 +418,7 @@
style="margin-left: 20rpx;color: #FF6D20;font-size: 22.78rpx; ">{{item.service_score}}</text> style="margin-left: 20rpx;color: #FF6D20;font-size: 22.78rpx; ">{{item.service_score}}</text>
<text v-if="item.distance" <text v-if="item.distance"
style="margin-left: 20rpx;font-size: 21.03rpx;color: #aaa;">{{item.distance}}</text> style="margin-left: 20rpx;font-size: 21.03rpx;color: #aaa;">{{item.distance}}</text>
<text style="margin-left:20rpx;">{{item.category_name}}</text> <text style="margin-left:20rpx;" class="line1">{{item.category_name}}</text>
</view> </view>
<view class="content-two"> <view class="content-two">
<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx" <u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"

4
pages/payment/get_payment.vue
View File

@ -138,6 +138,10 @@
this.mer_id = opt.mer_id; this.mer_id = opt.mer_id;
}, },
onReady() {
this.handleOpenKeyboard();
},
onShow() { onShow() {
if (!this.isLogin) { if (!this.isLogin) {
Cache.set("login_back_url_weixin", "/" + getCurrentPages()[0].route + "?mer_id=" + this.mer_id); Cache.set("login_back_url_weixin", "/" + getCurrentPages()[0].route + "?mer_id=" + this.mer_id);

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

@ -1,53 +1,3 @@
<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">
@ -64,15 +14,6 @@
</view> </view>
<view class="shop"> <view class="shop">
<!-- <view class="shop-img">
<u-image width="100rpx" height="154rpx" :lazyLoad="true" :fade="true" :src="store.mer_avatar"
radius="10">
<template v-slot:loading>
<u-loading-icon color="#999"></u-loading-icon>
</template>
</u-image>
</view> -->
<view class="shop-info"> <view class="shop-info">
<view class="shop-info-title" @click="navTo('/pages/store/detail/index?id='+id)"> <view class="shop-info-title" @click="navTo('/pages/store/detail/index?id='+id)">
<text>{{store.mer_name}}</text> <text>{{store.mer_name}}</text>
@ -87,7 +28,8 @@
</view> </view>
<view class="shop-info-sale">月销{{store.sales}}+</view> <view class="shop-info-sale">月销{{store.sales}}+</view>
<view v-if="store.services_type == 0" class="iconfont icon-kefu3" @click="goService"></view> <view v-if="store.services_type == 0" class="iconfont icon-kefu3" @click="goService"></view>
<view v-else-if="store.services_type == 1" class="iconfont icon-kefu3" @click="call(1)"></view> <view v-else-if="store.services_type == 1" class="iconfont icon-kefu3" @click="call(1)">
</view>
<view v-else class="iconfont icon-kefu3" @click="call(0)"> </view> <view v-else class="iconfont icon-kefu3" @click="call(0)"> </view>
</view> </view>
<view class="shop-info-runtime" v-if="store.mer_info&&store.mer_info.mer_take_time">营业时间 : <view class="shop-info-runtime" v-if="store.mer_info&&store.mer_info.mer_take_time">营业时间 :
@ -111,7 +53,6 @@
</view> </view>
</view> </view>
<scroll-view class="main" scroll-y="true" @scroll="scrollHome" catchtouchmove :style="viewColor">
<view v-show="!navShow && (tabActive === 3 || tabActive === 7)" class="nav"> <view v-show="!navShow && (tabActive === 3 || tabActive === 7)" class="nav">
<view class="nav-cont" :class="{noPointer : preview}" id="nav-cont"> <view class="nav-cont" :class="{noPointer : preview}" id="nav-cont">
<view :class="{ active: navActive === 0 }" class="item" @click="set_where(0,0)"> <view :class="{ active: navActive === 0 }" class="item" @click="set_where(0,0)">
@ -144,17 +85,19 @@
</block> </block>
</view> </view>
<scroll-view class="main" scroll-y="true" @scroll="scrollHome" catchtouchmove :style="viewColor">
<!-- nav的占位 -->
<view class="tab-cont" <view class="tab-cont"
:style="viewColor,{'height':'calc(100vh - '+listHeight+' - 84rpx '+(tabActive == 2?' + 84rpx':'')+' )'}" :style="viewColor,{'height':'calc(100vh - '+listHeight + (tabActive == 2?' + 84rpx':'')+' )'}"
:class="{noPointer : preview}"> :class="{noPointer : preview}">
<!-- 占位 --> <!-- 占位 -->
<view class="aside-left-placeholder" v-if="tabActive != 2"></view> <view class="aside-left-placeholder" v-if="tabActive != 2"></view>
<!-- 大分类 --> <!-- 大分类 -->
<view class="aside-left" v-if="tabActive != 2" <view class="aside-left" v-if="tabActive != 2"
:style="{'top':'calc('+headHeight+')','height':'calc(100vh - '+listHeight+' - 84rpx)'}"> :style="{'top':'calc('+headHeight+')','height':'calc(100vh - '+listHeight+')'}">
<block v-for="item in asideMenu" :key="item.store_category_id"> <block v-for="(item,index) in asideMenu" :key="index">
<view class="aside-left-item line1" @click="onChangeAsideMenu(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}"> :class="{'aside-active':asideCurr == item.store_category_id?true:false}">
{{item.cate_name}} {{item.cate_name}}
@ -214,8 +157,7 @@
<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)'}"> :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,indx) in goods" :key="indx" class="item" @click="goGoodsDetail(item)">
@click="goGoodsDetail(item)">
<view class="image" style="width: 180rpx;height: 180rpx;"> <view class="image" style="width: 180rpx;height: 180rpx;">
<image style="width: 100%;height: 100%;" :src="item.image" lazy-load></image> <image style="width: 100%;height: 100%;" :src="item.image" lazy-load></image>
<view v-if="item.stock == 0" class="sell_out">已售罄</view> <view v-if="item.stock == 0" class="sell_out">已售罄</view>
@ -231,7 +173,9 @@
<!-- 标签 --> <!-- 标签 -->
<view class="tag" v-if="item.mer_label_name && item.mer_label_name.length > 0"> <view class="tag" v-if="item.mer_label_name && item.mer_label_name.length > 0">
<view class="tag-item" v-for="(ii,indx) in item.mer_label_name">{{ii}}</view> <view class="tag-item" v-for="(ii,indx) in item.mer_label_name" :key="indx">
{{ii}}
</view>
</view> </view>
<!-- 规格产地 --> <!-- 规格产地 -->
@ -269,13 +213,13 @@
<view class="iconfont icon-xiangyou"></view> <view class="iconfont icon-xiangyou"></view>
</view> </view>
</view> </view>
<view v-for="item in category" :key="item.store_category_id" class="section"> <view v-for="(item,indx) in category" :key="indx" class="section">
<view class="head" @click="goCategoryGoods(item.store_category_id)"> <view class="head" @click="goCategoryGoods(item.store_category_id)">
<view class="title">{{ item.cate_name }}</view> <view class="title">{{ item.cate_name }}</view>
<view class="iconfont icon-xiangyou"></view> <view class="iconfont icon-xiangyou"></view>
</view> </view>
<view v-if="item.children" class="body"> <view v-if="item.children" class="body">
<view v-for="value in item.children" :key="value.store_category_id" class="item" <view v-for="(value,indx) in item.children" :key="indx" class="item"
@click="goCategoryGoods(value.store_category_id)">{{ value.cate_name }}</view> @click="goCategoryGoods(value.store_category_id)">{{ value.cate_name }}</view>
</view> </view>
</view> </view>
@ -514,7 +458,6 @@
tabs: [], tabs: [],
storeScroll: true, storeScroll: true,
storeTop: 0, storeTop: 0,
navHeight: 0,
currSpid: "", currSpid: "",
topicList: [], topicList: [],
service_open: false, service_open: false,
@ -525,7 +468,9 @@
headHeight: 0, headHeight: 0,
asideMenu: [], asideMenu: [],
asideCurr: '', asideCurr: '',
CartCount: 0 CartCount: 0,
navHeight: 0,
listTop: 0
} }
}, },
computed: { computed: {
@ -666,11 +611,9 @@
}, },
// #endif // #endif
methods: { methods: {
//获取购物车数量 //获取购物车数量
getCart() { getCart() {
let that = this; let that = this;
console.log(111)
getCartCounts({ getCartCounts({
sale_type: this.where.sale_type sale_type: this.where.sale_type
}).then(res => { }).then(res => {
@ -706,6 +649,7 @@
url: url url: url
}) })
}, },
// 查看地图 // 查看地图
showMaoLocation: function() { showMaoLocation: function() {
if (!this.store.lat || !this.store.long) return this if (!this.store.lat || !this.store.long) return this
@ -743,10 +687,9 @@
this.$nextTick(async () => { this.$nextTick(async () => {
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 navObj = await this.getDomInfo('.nav');
this.headHeight = headHeight;
this.listHeight = headHeight.height + footerHeight.height + 'px'; this.listHeight = headHeight.height + footerHeight.height + navObj.height + 'px';
}) })
}, },
@ -1138,8 +1081,8 @@
}, },
// 商铺首页滚动 navbar 吸顶 // 商铺首页滚动 navbar 吸顶
scrollHome: function(e) { scrollHome: function(e) {
uni.$emit('scroll'); // uni.$emit('scroll');
this.navShow = e.detail.scrollTop >= 50; // this.navShow = e.detail.scrollTop >= 50;
}, },
goback: function() { goback: function() {
@ -1238,6 +1181,52 @@
background: #f5f5f5; background: #f5f5f5;
min-height: 500rpx; min-height: 500rpx;
overflow: auto; overflow: auto;
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;
}
}
}
} }
.car-number { .car-number {
@ -1425,6 +1414,119 @@
} }
} }
.nav {
padding: 0 30rpx;
display: flex;
justify-content: space-between;
align-items: center;
width: 100%;
height: 90rpx;
background: #fff;
border-bottom: 1px solid #f3f3f3;
z-index: 10;
.nav-cont {
display: flex;
align-items: center;
height: 84rpx;
.item {
display: flex;
justify-content: center;
align-items: center;
min-width: 0;
.cont {
display: flex;
justify-content: center;
align-items: center;
width: 116rpx;
height: 44rpx;
border-radius: 22rpx;
font-weight: 500;
font-size: 24rpx;
color: #666666;
.arrow-icon {
margin-left: 10rpx;
font-size: 18rpx;
}
.layout-icon {
font-size: 32rpx;
}
.icon-pailie {
font-size: 32rpx;
}
image {
width: 15rpx;
height: 21rpx;
margin-left: 7rpx;
}
}
}
.active {
.cont {
font-size: 28rpx;
font-weight: bold;
color: var(--view-theme);
}
}
}
.guanzhu {
width: 146rpx;
height: 58rpx;
line-height: 58rpx;
background: #46B03A;
border-radius: 68rpx 68rpx 68rpx 68rpx;
font-weight: 600;
font-size: 28rpx;
color: #FFFFFF;
text-align: center;
}
.guanzhu-active {
background: transparent;
border: 2rpx solid #46B03A;
color: #46B03A;
}
.select {
position: absolute;
top: 100%;
left: 0;
z-index: 2;
width: 100%;
padding-right: 40rpx;
padding-bottom: 28rpx;
padding-left: 74rpx;
border-bottom-right-radius: 24rpx;
border-bottom-left-radius: 24rpx;
background-color: #FFFFFF;
box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.06);
.item {
margin-top: 28rpx;
font-size: 24rpx;
color: #454545;
}
.active {
color: var(--view-theme);
.iconfont {
color: var(--view-theme);
float: right;
font-size: 20rpx;
}
}
}
}
.main_count { .main_count {
background-color: #ffffff; background-color: #ffffff;
padding: 30rpx 20rpx; padding: 30rpx 20rpx;
@ -1583,117 +1685,6 @@
} }
} }
.nav {
position: relative;
padding: 0 30rpx;
display: flex;
justify-content: space-between;
align-items: center;
background: #fff;
border-bottom: 1px solid #f3f3f3;
.nav-cont {
display: flex;
align-items: center;
height: 84rpx;
.item {
display: flex;
justify-content: center;
align-items: center;
min-width: 0;
.cont {
display: flex;
justify-content: center;
align-items: center;
width: 116rpx;
height: 44rpx;
border-radius: 22rpx;
font-weight: 500;
font-size: 24rpx;
color: #666666;
.arrow-icon {
margin-left: 10rpx;
font-size: 18rpx;
}
.layout-icon {
font-size: 32rpx;
}
.icon-pailie {
font-size: 32rpx;
}
image {
width: 15rpx;
height: 21rpx;
margin-left: 7rpx;
}
}
}
.active {
.cont {
font-size: 28rpx;
font-weight: bold;
color: var(--view-theme);
}
}
}
.guanzhu {
width: 146rpx;
height: 58rpx;
line-height: 58rpx;
background: #46B03A;
border-radius: 68rpx 68rpx 68rpx 68rpx;
font-weight: 600;
font-size: 28rpx;
color: #FFFFFF;
text-align: center;
}
.guanzhu-active {
background: transparent;
border: 2rpx solid #46B03A;
color: #46B03A;
}
.select {
position: absolute;
top: 100%;
left: 0;
z-index: 2;
width: 100%;
padding-right: 40rpx;
padding-bottom: 28rpx;
padding-left: 74rpx;
border-bottom-right-radius: 24rpx;
border-bottom-left-radius: 24rpx;
background-color: #FFFFFF;
box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.06);
.item {
margin-top: 28rpx;
font-size: 24rpx;
color: #454545;
}
.active {
color: var(--view-theme);
.iconfont {
color: var(--view-theme);
float: right;
font-size: 20rpx;
}
}
}
}
.goods { .goods {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;

10
pages/users/order_confirm/index.vue
View File

@ -1457,7 +1457,7 @@
title: res.message, title: res.message,
icon: 'success' icon: 'success'
}, { }, {
tab: 4, tab: 5,
url: goPages url: goPages
}); });
}).catch(res => { }).catch(res => {
@ -1486,7 +1486,7 @@
title: '支付成功', title: '支付成功',
icon: 'success' icon: 'success'
}, { }, {
tab: 4, tab: 5,
url: url url: url
}); });
}, },
@ -1496,7 +1496,7 @@
return that.$util.Tips({ return that.$util.Tips({
title: '取消支付', title: '取消支付',
}, { }, {
tab: 4, tab: 5,
url: url url: url
}); });
}, },
@ -1506,7 +1506,7 @@
return that.$util.Tips({ return that.$util.Tips({
title: '', title: '',
}, { }, {
tab: 4, tab: 5,
url: url url: url
}); });
}, },
@ -1564,7 +1564,7 @@
title: '下单成功,请上传支付凭证!' title: '下单成功,请上传支付凭证!'
}, { }, {
tab: 5, tab: 5,
url: "/pages/users/order_list/index?sale_type="+ this.sale_type url: "/pages/users/order_list/index?sale_type=" + this.sale_type
}); });
break; break;
// #ifdef H5 // #ifdef H5

2
pages/whole_sale/index.vue
View File

@ -455,7 +455,7 @@
<text v-if="item.distance" <text v-if="item.distance"
style="margin-left: 20rpx;font-size: 21.03rpx;color: #aaa;">{{item.distance}}</text> style="margin-left: 20rpx;font-size: 21.03rpx;color: #aaa;">{{item.distance}}</text>
<text style="margin-left: 20rpx;">{{item.category_name}}</text> <text style="margin-left: 20rpx;" class="line1">{{item.category_name}}</text>
</view> </view>
<view class="content-two"> <view class="content-two">
<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx" <u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"