Skip to content

P
ptfw-uniapp
Commit 5cac79c7 authored by DPFly's avatar DPFly
Browse files
Options

支付宝小程序禁用拼团

parent 6648f45b
Show whitespace changes
Inline Side-by-side
Showing with 146 additions and 165 deletions
src/components/business/group-entrance/index.vue 0 → 100644
View file @ 5cac79c7
<template>
<block>
<!-- #ifdef MP-WEIXIN -->
<view v-if="storeType == 30 && groupInfo" class="group" :style="customStyle">
<view class="top-line">
<view class="heading">多人拼团</view>
<view class="view-more" @click="toGroupList"
>查看更多
<image
class="icon-arrow"
src="https://img-shop.qmimg.cn/s1000184/images/2019/06/25/33222f1e8649fb42.png"
/>
</view>
</view>
<view @click="toGroupDetail">
<group-item :info="groupInfo" />
</view>
</view>
<!-- #endif -->
</block>
</template>
<script>
import groupItem from '@/components/business/group-item/index'
import groupModel from '@/models/marketing/group'
export default {
components: {
groupItem,
},
props: {
groupInfo: {
type: Object,
required: true,
},
customStyle: {
type: String,
default: 'margin: 20rpx 0;',
},
},
computed: {
storeType() {
return this.$store.state.store_info.store_type
},
},
methods: {
// 去拼团列表页
toGroupList() {
this.$navigate('/pages/marketing/group/list/index')
},
// 去拼团详情页
toGroupDetail() {
this.$navigate('/pages/marketing/group/detail/index', { id: this.groupInfo.id })
},
},
}
</script>
<style lang="scss" scoped>
.group {
padding: 40rpx 30rpx 35rpx;
background-color: #fff;
.top-line {
margin-bottom: 32rpx;
display: flex;
align-items: center;
justify-content: space-between;
.heading {
line-height: 1;
font-size: 40rpx;
font-weight: 700;
color: #333;
}
.view-more {
display: flex;
align-items: center;
line-height: 1;
font-size: 28rpx;
color: #999;
.icon-arrow {
margin-left: 10rpx;
width: 15rpx;
height: 26rpx;
}
}
}
}
</style>
src/pages.json
View file @ 5cac79c7
......@@ -374,93 +374,95 @@
"navigationBarBackgroundColor": "#ffffff"
}
},
// #ifdef MP-WEIXIN
{
"path": "member/code/index",
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "会员码",
"navigationBarBackgroundColor": "#019e54",
"navigationBarTextStyle": "white",
"backgroundColorTop": "#019e54",
"backgroundColorBottom": "#019e54"
}
},
{
"path": "member/card/rule/index",
"path": "group/list/index",
"style": {
// #ifdef MP-ALIPAY
"allowsBounceVertical": "NO",
// #endif
"navigationBarTitleText": "等级说明",
"navigationBarTitleText": "多人拼团",
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#ffffff"
"navigationBarBackgroundColor": "#ffffff",
"backgroundColor": "#f8f8f8",
"enablePullDownRefresh": true
}
},
{
"path": "member/card/record/index",
"path": "group/detail/index",
"style": {
// #ifdef MP-ALIPAY
"allowsBounceVertical": "NO",
// #endif
"navigationBarTitleText": "消费记录",
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#ffffff",
"onReachBottomDistance": 50
"backgroundColor": "#f8f8f8",
"enablePullDownRefresh": true
}
},
{
"path": "member/card/select/index",
"path": "group/intro/index",
"style": {
// #ifdef MP-ALIPAY
"allowsBounceVertical": "NO",
// #endif
"navigationBarTitleText": "会员卡选择",
"navigationBarTitleText": "拼团玩法",
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#ffffff"
}
},
{
"path": "group/list/index",
"path": "group/share/index",
"style": {
"navigationBarTitleText": "多人拼团",
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#ffffff",
"backgroundColor": "#f8f8f8",
"enablePullDownRefresh": true
"backgroundColor": "#f8f8f8"
}
},
{
"path": "group/detail/index",
"path": "group/order/index",
"style": {
"navigationBarTitleText": "拼团订单",
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#ffffff",
"backgroundColor": "#f8f8f8",
"enablePullDownRefresh": true
}
},
// #endif
{
"path": "group/intro/index",
"path": "member/code/index",
"style": {
"navigationBarTitleText": "拼团玩法",
"enablePullDownRefresh": true,
"navigationBarTitleText": "会员码",
"navigationBarBackgroundColor": "#019e54",
"navigationBarTextStyle": "white",
"backgroundColorTop": "#019e54",
"backgroundColorBottom": "#019e54"
}
},
{
"path": "member/card/rule/index",
"style": {
// #ifdef MP-ALIPAY
"allowsBounceVertical": "NO",
// #endif
"navigationBarTitleText": "等级说明",
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#ffffff"
}
},
{
"path": "group/share/index",
"path": "member/card/record/index",
"style": {
// #ifdef MP-ALIPAY
"allowsBounceVertical": "NO",
// #endif
"navigationBarTitleText": "消费记录",
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#ffffff",
"backgroundColor": "#f8f8f8"
"onReachBottomDistance": 50
}
},
{
"path": "group/order/index",
"path": "member/card/select/index",
"style": {
"navigationBarTitleText": "拼团订单",
// #ifdef MP-ALIPAY
"allowsBounceVertical": "NO",
// #endif
"navigationBarTitleText": "会员卡选择",
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#ffffff",
"enablePullDownRefresh": true
"navigationBarBackgroundColor": "#ffffff"
}
}
]
......
src/pages/order/detail/index.vue
View file @ 5cac79c7
......@@ -614,9 +614,11 @@
</button>
</view>
<!-- 拼团支付 -->
<!-- #ifdef MP-WEIXIN -->
<view class="btn-wrapper" v-if="isGroupOrder && orderDetail.status_text == '未支付'">
<button class="btn" type="primary" @click="payGroup">去付款</button>
</view>
<!-- #endif -->
<!-- 快捷导航 -->
<base-quick-nav></base-quick-nav>
</view>
......
src/pages/store/index/index.vue
View file @ 5cac79c7
......@@ -100,19 +100,7 @@
<view class="notice_text">{{ noticeTit[0].title }}</view>
</view>
</view>
<view v-if="store_info.store_type == 30 && groupInfo" class="group">
<view class="top-line">
<view class="heading">多人拼团</view>
<view class="view-more" @click="toGroupList"
>查看更多<image
class="icon-arrow"
src="https://img-shop.qmimg.cn/s1000184/images/2019/06/25/33222f1e8649fb42.png"
/></view>
</view>
<view @click="toGroupDetail">
<group-item :info="groupInfo" />
</view>
</view>
<groupEntrance :groupInfo="groupInfo" />
<!-- 免费领券 -->
<view class="free-coupon" v-if="coupon.length">
<view
......@@ -288,19 +276,7 @@
</view>
</view>
</view>
<view v-if="store_info.store_type == 30 && groupInfo" class="group">
<view class="top-line">
<view class="heading">多人拼团</view>
<view class="view-more" @click="toGroupList"
>查看更多<image
class="icon-arrow"
src="https://img-shop.qmimg.cn/s1000184/images/2019/06/25/33222f1e8649fb42.png"
/></view>
</view>
<view @click="toGroupDetail">
<group-item :info="groupInfo" />
</view>
</view>
<groupEntrance :groupInfo="groupInfo" />
<!-- 免费领券 -->
<view class="free-coupon" v-if="coupon.length">
<view
......@@ -538,19 +514,7 @@
<view class="card_img"> </view>
</view>
</view>
<view v-if="store_info.store_type == 30 && groupInfo" class="group">
<view class="top-line">
<view class="heading">多人拼团</view>
<view class="view-more" @click="toGroupList"
>查看更多<image
class="icon-arrow"
src="https://img-shop.qmimg.cn/s1000184/images/2019/06/25/33222f1e8649fb42.png"
/></view>
</view>
<view @click="toGroupDetail">
<group-item :info="groupInfo" />
</view>
</view>
<groupEntrance :groupInfo="groupInfo" />
<!-- 领券AD -->
<navigator class="coupon_ad white_box" url="/pages/marketing/coupon/canReceive/index">
</navigator>
......@@ -643,19 +607,7 @@
<view class="notice_text">{{ noticeTit[0].title }}</view>
</view>
</view>
<view v-if="store_info.store_type == 30 && groupInfo" class="group">
<view class="top-line">
<view class="heading">多人拼团</view>
<view class="view-more" @click="toGroupList"
>查看更多<image
class="icon-arrow"
src="https://img-shop.qmimg.cn/s1000184/images/2019/06/25/33222f1e8649fb42.png"
/></view>
</view>
<view @click="toGroupDetail">
<group-item :info="groupInfo" />
</view>
</view>
<groupEntrance :groupInfo="groupInfo" />
<!-- 免费领券 -->
<view class="free-coupon" v-if="coupon.length">
<view
......@@ -828,19 +780,7 @@
</view>
</view>
</view>
<view v-if="store_info.store_type == 30 && groupInfo" class="group">
<view class="top-line">
<view class="heading">多人拼团</view>
<view class="view-more" @click="toGroupList"
>查看更多<image
class="icon-arrow"
src="https://img-shop.qmimg.cn/s1000184/images/2019/06/25/33222f1e8649fb42.png"
/></view>
</view>
<view @click="toGroupDetail">
<group-item :info="groupInfo" />
</view>
</view>
<groupEntrance :groupInfo="groupInfo" />
<!-- 免费领券 -->
<view class="free-coupon" v-if="coupon.length">
<!-- <text class="title">免费领券</text> -->
......@@ -1042,23 +982,7 @@
>
<button class="btn btn-share" open-type="share" button-hover="none">分享店铺</button>
</view>
<view
v-if="store_info.store_type == 30 && groupInfo"
class="group"
style="margin: 20rpx 30rpx;"
>
<view class="top-line">
<view class="heading">多人拼团</view>
<view class="view-more" @click="toGroupList"
>查看更多<image
class="icon-arrow"
src="https://img-shop.qmimg.cn/s1000184/images/2019/06/25/33222f1e8649fb42.png"
/></view>
</view>
<view @click="toGroupDetail">
<group-item :info="groupInfo" />
</view>
</view>
<groupEntrance :groupInfo="groupInfo" customStyle="margin: 20rpx 30rpx" />
<view class="receive-card" @click="toMyCard" v-if="!member_card.lev_id"></view>
</view>
......@@ -1224,7 +1148,7 @@
import virtualNavigation from '@/components/basic/virtual-navigation'
import virtualTabbar from '@/components/basic/virtual-tabbar'
import mobileBtnAuthor from '@/components/business/mobile-btn-author'
import groupItem from '@/components/business/group-item'
import groupEntrance from '@/components/business/group-entrance/index'
import log from '@/utils/basic/log'
import util from '@/utils/basic/util'
import native from '@/utils/basic/native'
......@@ -1320,7 +1244,7 @@ export default {
virtualNavigation,
virtualTabbar,
mobileBtnAuthor,
groupItem,
groupEntrance,
},
methods: {
init() {
......@@ -1347,14 +1271,6 @@ export default {
if (list.length) this.groupInfo = list[0]
})
},
// 去拼团列表页
toGroupList() {
this.$navigate('/pages/marketing/group/list/index')
},
// 去拼团详情页
toGroupDetail() {
this.$navigate('/pages/marketing/group/detail/index', { id: this.groupInfo.id })
},
// 切换店铺首页模板
switchTemplate() {
let type = this.store_setting.template_type
......@@ -3839,37 +3755,6 @@ page {
margin-top: 10rpx;
}
// 拼团活动
.group {
margin: 20rpx 0;
padding: 40rpx 30rpx 35rpx;
background-color: #fff;
.top-line {
margin-bottom: 32rpx;
display: flex;
align-items: center;
justify-content: space-between;
.heading {
line-height: 1;
font-size: 40rpx;
font-weight: 700;
color: #333;
}
.view-more {
display: flex;
align-items: center;
line-height: 1;
font-size: 28rpx;
color: #999;
.icon-arrow {
margin-left: 10rpx;
width: 15rpx;
height: 26rpx;
}
}
}
}
/* 免费领券 */
.free-coupon-tit {
......
src/pages/user/index/index.vue
View file @ 5cac79c7
......@@ -124,6 +124,7 @@
<!-- #endif -->
<!-- 服务链接 -->
<view class="service-links box">
<!-- #ifdef MP-WEIXIN -->
<view
v-if="store_info.store_type == 30"
@click="$navigate"
......@@ -134,6 +135,7 @@
></image>
<text>拼团订单</text>
</view>
<!-- #endif -->
<view @click="$navigate" data-url="/pages/user/address/list/index">
<image
src="https://img-shop.qmimg.cn/s16/images/2018/11/07/33e75c94893cfe75.png"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment