弹窗界面以及商户管理修改
This commit is contained in:
parent
5cf28341eb
commit
55b4c78c1e
@ -125,6 +125,7 @@
|
|||||||
"path": "pages/moreProject/moreProject",
|
"path": "pages/moreProject/moreProject",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "商户平台",
|
"navigationBarTitleText": "商户平台",
|
||||||
|
"navigationStyle": "custom",
|
||||||
"enablePullDownRefresh": false
|
"enablePullDownRefresh": false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8,6 +8,10 @@
|
|||||||
<text>已缴纳保证金</text>
|
<text>已缴纳保证金</text>
|
||||||
<text>{{merchant_Data.paid_margin}}</text>
|
<text>{{merchant_Data.paid_margin}}</text>
|
||||||
</view>
|
</view>
|
||||||
|
<view class="item">
|
||||||
|
<text>未缴纳保证金</text>
|
||||||
|
<text>{{merchant_Data.unpaid_margin}}</text>
|
||||||
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<text>缴纳店铺账户</text>
|
<text>缴纳店铺账户</text>
|
||||||
<text>{{merchant_Data.mer_name}}</text>
|
<text>{{merchant_Data.mer_name}}</text>
|
||||||
@ -236,7 +240,7 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
padding: 0 28rpx;
|
padding: 0 28rpx;
|
||||||
margin-top: 50rpx;
|
margin-top: 85rpx;
|
||||||
|
|
||||||
.title {
|
.title {
|
||||||
font-size: 32rpx;
|
font-size: 32rpx;
|
||||||
|
@ -1,5 +1,16 @@
|
|||||||
<template>
|
<template>
|
||||||
<view class="gather">
|
<view class="gather">
|
||||||
|
<!-- #ifdef MP || APP-PLUS -->
|
||||||
|
|
||||||
|
<view class="conten-top">
|
||||||
|
<view class="" style="position: absolute;left: 30rpx;" @click="logout"><i class="iconfont icon-xiangzuo"
|
||||||
|
style="font-size: 40rpx;text-align: left;"></i></view>
|
||||||
|
<view class="" style="font-size: 30rpx;">
|
||||||
|
商家平台
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view style="padding-top:var(--status-bar-height);padding-bottom: 30rpx; margin-bottom: 30rpx;"></view>
|
||||||
|
<!-- #endif -->
|
||||||
<block v-if="isShow&&userInfoData.mer_info.mer_name">
|
<block v-if="isShow&&userInfoData.mer_info.mer_name">
|
||||||
<view class="" v-if="userInfoData.mer_info.setting_status==1">
|
<view class="" v-if="userInfoData.mer_info.setting_status==1">
|
||||||
<view class="special_work com" v-if="userInfoData.mer_info.type_code === 'TypeSupplyChain'">
|
<view class="special_work com" v-if="userInfoData.mer_info.type_code === 'TypeSupplyChain'">
|
||||||
@ -410,11 +421,12 @@
|
|||||||
<emptyPage title="暂无信息"></emptyPage>
|
<emptyPage title="暂无信息"></emptyPage>
|
||||||
</view>
|
</view>
|
||||||
<view class="settlementAgreement" v-if="isFshow">
|
<view class="settlementAgreement" v-if="isFshow">
|
||||||
<view class="setAgCount" style="width: 100%;height: 100%;">
|
<view class="setAgCount" style="width: 100%;height: 100%; padding-top:120rpx ;" >
|
||||||
<!-- <i class="icon iconfont icon-cha" @click="recuo"></i> -->
|
|
||||||
<view class="" style="width: 60rpx;height: 60rpx; position: absolute;right: 30rpx; top:20rpx"
|
<view class="" style="width: 60rpx;height: 60rpx; position: absolute;left: 30rpx; top:80rpx"
|
||||||
@click="recuo">
|
@click="recuo">
|
||||||
<image src="@/static/images/close.png" mode="aspectFit" style="width: 60rpx;height: 60rpx;"></image>
|
<i class="iconfont icon-xiangzuo" style="width: 60rpx;height: 60rpx;font-size: 40rpx;"></i>
|
||||||
|
<!-- <image src="@/static/images/close.png" mode="aspectFit" style="width: 60rpx;height: 60rpx;"></image> -->
|
||||||
</view>
|
</view>
|
||||||
<div class="title">{{detail.title}}</div>
|
<div class="title">{{detail.title}}</div>
|
||||||
<view style="margin: 20rpx 0;">甲方公司:{{company?company:"暂无公司信息"}}</view>
|
<view style="margin: 20rpx 0;">甲方公司:{{company?company:"暂无公司信息"}}</view>
|
||||||
@ -440,7 +452,8 @@
|
|||||||
|
|
||||||
<view class="userpage">
|
<view class="userpage">
|
||||||
<view class="userpage-icon" @click="close">
|
<view class="userpage-icon" @click="close">
|
||||||
<image src="@/static/images/close.png" mode=""></image>
|
<!-- <image src="@/static/images/close.png" mode=""></image> -->
|
||||||
|
<i class="iconfont icon-xiangzuo" style="width: 60rpx;height: 60rpx;font-size: 40rpx;"></i>
|
||||||
</view>
|
</view>
|
||||||
<form report-submit='true' style="height: 90%;">
|
<form report-submit='true' style="height: 90%;">
|
||||||
<view class='merchantsSettled' :style="{'height':Fheight}">
|
<view class='merchantsSettled' :style="{'height':Fheight}">
|
||||||
@ -627,9 +640,6 @@
|
|||||||
this.getUserInfo()
|
this.getUserInfo()
|
||||||
this.codelist()
|
this.codelist()
|
||||||
this.list()
|
this.list()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
@ -854,6 +864,12 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
|
//
|
||||||
|
logout(){
|
||||||
|
uni.switchTab({
|
||||||
|
url:'/pages/gather/gather'
|
||||||
|
})
|
||||||
|
},
|
||||||
//商户设置
|
//商户设置
|
||||||
buyserset() {
|
buyserset() {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
@ -936,6 +952,18 @@
|
|||||||
background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
|
background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.conten-top {
|
||||||
|
width: 100%;
|
||||||
|
padding-top: var(--status-bar-height);
|
||||||
|
padding-bottom: 30rpx;
|
||||||
|
text-align: center;
|
||||||
|
background-color: #fff;
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
position: fixed;
|
||||||
|
z-index: 10;
|
||||||
|
}
|
||||||
|
|
||||||
.userpage {
|
.userpage {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
||||||
@ -949,7 +977,7 @@
|
|||||||
height: 60rpx;
|
height: 60rpx;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 65rpx;
|
top: 65rpx;
|
||||||
right: 60rpx;
|
left: 60rpx;
|
||||||
|
|
||||||
image {
|
image {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
@ -837,9 +837,9 @@
|
|||||||
mer_cate_id: '请选择店铺分类', // 店铺分类
|
mer_cate_id: '请选择店铺分类', // 店铺分类
|
||||||
unit_name: '请输入商品单位', // 商品单位
|
unit_name: '请输入商品单位', // 商品单位
|
||||||
};
|
};
|
||||||
console.log({
|
// console.log({
|
||||||
...this.setFormData
|
// ...this.setFormData
|
||||||
})
|
// })
|
||||||
Object.keys(requireData).some(item => {
|
Object.keys(requireData).some(item => {
|
||||||
if (!this.setFormData[item]) {
|
if (!this.setFormData[item]) {
|
||||||
Toast(requireData[item]);
|
Toast(requireData[item]);
|
||||||
@ -858,6 +858,10 @@
|
|||||||
Toast('请选择送货方式');
|
Toast('请选择送货方式');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (!this.setFormData.mer_cate_id.length) {
|
||||||
|
Toast('请选择店铺分类');
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (this.setFormData.imageList.length < 2) {
|
if (this.setFormData.imageList.length < 2) {
|
||||||
Toast('请添加最少两张图片用于展示');
|
Toast('请添加最少两张图片用于展示');
|
||||||
return;
|
return;
|
||||||
|
@ -26,10 +26,12 @@
|
|||||||
<!-- #endif -->
|
<!-- #endif -->
|
||||||
<view v-show="navShow && tabActive === 3" class="nav" :style="viewColor">
|
<view v-show="navShow && tabActive === 3" class="nav" :style="viewColor">
|
||||||
<view class="nav-cont">
|
<view class="nav-cont">
|
||||||
<view :class="{ active: navActive === 0 }" class="item" @click="navActive = 0;select.show = !select.show">
|
<view :class="{ active: navActive === 0 }" class="item"
|
||||||
|
@click="navActive = 0;select.show = !select.show">
|
||||||
<view class="cont">
|
<view class="cont">
|
||||||
{{ select.selected ? '评分' : '默认' }}
|
{{ select.selected ? '评分' : '默认' }}
|
||||||
<text :class="['arrow-icon', 'iconfont', select.show ? 'icon-xiangshang' : 'icon-xiangxia']"></text>
|
<text
|
||||||
|
:class="['arrow-icon', 'iconfont', select.show ? 'icon-xiangshang' : 'icon-xiangxia']"></text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view :class="{ active: navActive === 1 }" class="item" @click="set_where(2,0)">
|
<view :class="{ active: navActive === 1 }" class="item" @click="set_where(2,0)">
|
||||||
@ -45,7 +47,8 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="item" @click="select.show = false;navActive = 4;isColumn = !isColumn">
|
<view class="item" @click="select.show = false;navActive = 4;isColumn = !isColumn">
|
||||||
<view class="cont">
|
<view class="cont">
|
||||||
<text :class="['layout-icon', 'iconfont', isColumn ? 'icon-pailie' : 'icon-tupianpailie']"></text>
|
<text
|
||||||
|
:class="['layout-icon', 'iconfont', isColumn ? 'icon-pailie' : 'icon-tupianpailie']"></text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@ -74,7 +77,8 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<scroll-view @refresherrefresh="onRefresh" refresher-enabled="true" :refresher-triggered="isTriggered" class="main" scroll-y="true" @scroll="scrollHome" catchtouchmove :style="viewColor">
|
<scroll-view @refresherrefresh="onRefresh" refresher-enabled="true" :refresher-triggered="isTriggered"
|
||||||
|
class="main" scroll-y="true" @scroll="scrollHome" catchtouchmove :style="viewColor">
|
||||||
<!-- 店铺信息 -->
|
<!-- 店铺信息 -->
|
||||||
<view id="store" class="store">
|
<view id="store" class="store">
|
||||||
<image :src="store.mer_avatar"></image>
|
<image :src="store.mer_avatar"></image>
|
||||||
@ -121,10 +125,12 @@
|
|||||||
</view>
|
</view>
|
||||||
<view v-show="!navShow && tabActive === 3 || tabActive === 7" class="nav">
|
<view v-show="!navShow && tabActive === 3 || tabActive === 7" class="nav">
|
||||||
<view class="nav-cont">
|
<view class="nav-cont">
|
||||||
<view :class="{ active: navActive === 0 }" class="item" @click="navActive = 0;select.show = !select.show">
|
<view :class="{ active: navActive === 0 }" class="item"
|
||||||
|
@click="navActive = 0;select.show = !select.show">
|
||||||
<view class="cont">
|
<view class="cont">
|
||||||
{{ select.selected ? '评分' : '默认' }}
|
{{ select.selected ? '评分' : '默认' }}
|
||||||
<text :class="['arrow-icon', 'iconfont', select.show ? 'icon-xiangshang' : 'icon-xiangxia']"></text>
|
<text
|
||||||
|
:class="['arrow-icon', 'iconfont', select.show ? 'icon-xiangshang' : 'icon-xiangxia']"></text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view :class="{ active: navActive === 1 }" class="item" @click="set_where(2,0)">
|
<view :class="{ active: navActive === 1 }" class="item" @click="set_where(2,0)">
|
||||||
@ -143,7 +149,8 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="item" @click="select.show = false;navActive = 4;isColumn = !isColumn">
|
<view class="item" @click="select.show = false;navActive = 4;isColumn = !isColumn">
|
||||||
<view class="cont">
|
<view class="cont">
|
||||||
<text :class="['layout-icon', 'iconfont', isColumn ? 'icon-pailie' : 'icon-tupianpailie']"></text>
|
<text
|
||||||
|
:class="['layout-icon', 'iconfont', isColumn ? 'icon-pailie' : 'icon-tupianpailie']"></text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@ -184,7 +191,8 @@
|
|||||||
<!-- #ifdef H5 -->
|
<!-- #ifdef H5 -->
|
||||||
<view v-for="(item, index) in styleConfig" :key="index">
|
<view v-for="(item, index) in styleConfig" :key="index">
|
||||||
<block v-if="item.name != 'headerSerch' && item.name != 'tabNav'">
|
<block v-if="item.name != 'headerSerch' && item.name != 'tabNav'">
|
||||||
<component :is="item.name" :index="index" :dataConfig="item" :merId="id" @detail="goGoodsDetail">
|
<component :is="item.name" :index="index" :dataConfig="item" :merId="id"
|
||||||
|
@detail="goGoodsDetail">
|
||||||
</component>
|
</component>
|
||||||
</block>
|
</block>
|
||||||
</block>
|
</block>
|
||||||
@ -200,10 +208,12 @@
|
|||||||
<combination v-if="item.name == 'combination'" :merId="id" :dataConfig="item"></combination>
|
<combination v-if="item.name == 'combination'" :merId="id" :dataConfig="item"></combination>
|
||||||
<topic v-if="item.name == 'topic'" :merId="id" :dataConfig="item"></topic>
|
<topic v-if="item.name == 'topic'" :merId="id" :dataConfig="item"></topic>
|
||||||
<coupon v-if="item.name == 'coupon'" :merId="id" :dataConfig="item"></coupon>
|
<coupon v-if="item.name == 'coupon'" :merId="id" :dataConfig="item"></coupon>
|
||||||
<goodList v-if="item.name == 'goodList'" :merId="id" :dataConfig="item" @detail="goGoodsDetail">
|
<goodList v-if="item.name == 'goodList'" :merId="id" :dataConfig="item"
|
||||||
|
@detail="goGoodsDetail">
|
||||||
</goodList>
|
</goodList>
|
||||||
<guide v-if="item.name == 'guide'" :merId="id" :dataConfig="item"></guide>
|
<guide v-if="item.name == 'guide'" :merId="id" :dataConfig="item"></guide>
|
||||||
<liveBroadcast v-if="item.name == 'liveBroadcast'" :merId="id" :dataConfig="item"></liveBroadcast>
|
<liveBroadcast v-if="item.name == 'liveBroadcast'" :merId="id" :dataConfig="item">
|
||||||
|
</liveBroadcast>
|
||||||
<menus v-if="item.name == 'menus'" :merId="id" :dataConfig="item"></menus>
|
<menus v-if="item.name == 'menus'" :merId="id" :dataConfig="item"></menus>
|
||||||
<presellList v-if="item.name == 'presellList'" :merId="id" :dataConfig="item"></presellList>
|
<presellList v-if="item.name == 'presellList'" :merId="id" :dataConfig="item"></presellList>
|
||||||
<richText v-if="item.name == 'richText'" :merId="id" :dataConfig="item"></richText>
|
<richText v-if="item.name == 'richText'" :merId="id" :dataConfig="item"></richText>
|
||||||
@ -221,7 +231,8 @@
|
|||||||
<!-- 商品 -->
|
<!-- 商品 -->
|
||||||
<view v-if="goods.length" class="goods-wrap" id="goods" @touchmove="onTouchmove">
|
<view v-if="goods.length" class="goods-wrap" id="goods" @touchmove="onTouchmove">
|
||||||
<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" @click="goGoodsDetail(item)">
|
<view v-for="item in goods" :key="item.product_id" class="item"
|
||||||
|
@click="goGoodsDetail(item)">
|
||||||
<view class="image">
|
<view class="image">
|
||||||
<easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage>
|
<easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage>
|
||||||
<view v-if="item.stock == 0" class="sell_out">已售罄</view>
|
<view v-if="item.stock == 0" class="sell_out">已售罄</view>
|
||||||
@ -237,7 +248,8 @@
|
|||||||
<view class="money">
|
<view class="money">
|
||||||
¥<text>{{ item.price }}</text>
|
¥<text>{{ item.price }}</text>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="item.show_svip_info && item.show_svip_info.show_svip_price && item.svip_price"
|
<view
|
||||||
|
v-if="item.show_svip_info && item.show_svip_info.show_svip_price && item.svip_price"
|
||||||
class="acea-row row-middle">
|
class="acea-row row-middle">
|
||||||
<text class='vip-money'>¥{{item.svip_price}}</text>
|
<text class='vip-money'>¥{{item.svip_price}}</text>
|
||||||
<view class="vipImg">
|
<view class="vipImg">
|
||||||
@ -245,7 +257,8 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="item.product_type != 0 || item.issetCoupon || item.delivery_free == 1"
|
<view
|
||||||
|
v-if="item.product_type != 0 || item.issetCoupon || item.delivery_free == 1"
|
||||||
class="item_tags">
|
class="item_tags">
|
||||||
<text v-if="item.product_type != 0"
|
<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>
|
: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>
|
||||||
@ -255,7 +268,8 @@
|
|||||||
<view class="score">{{ item.rate }}评分 {{ item.reply_count }}条评论</view>
|
<view class="score">{{ item.rate }}评分 {{ item.reply_count }}条评论</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="item.max_extension>0 && (item.product_type == 0 || item.product_type == 2)" class="foot">
|
<view v-if="item.max_extension>0 && (item.product_type == 0 || item.product_type == 2)"
|
||||||
|
class="foot">
|
||||||
<text v-show="!isColumn" class="iconfont"></text>
|
<text v-show="!isColumn" class="iconfont"></text>
|
||||||
最高赚 ¥{{ item.max_extension }}
|
最高赚 ¥{{ item.max_extension }}
|
||||||
</view>
|
</view>
|
||||||
@ -299,7 +313,8 @@
|
|||||||
<!--生活服务-->
|
<!--生活服务-->
|
||||||
<view v-show="tabActive === 5" id="product" @touchmove="onTouchmoves">
|
<view v-show="tabActive === 5" id="product" @touchmove="onTouchmoves">
|
||||||
<view v-if="productList.length" class="goods column">
|
<view v-if="productList.length" class="goods column">
|
||||||
<view v-for="item in productList" :key="item.product_id" class="item" @click="goGoodsDetail(item)">
|
<view v-for="item in productList" :key="item.product_id" class="item"
|
||||||
|
@click="goGoodsDetail(item)">
|
||||||
<view class="image">
|
<view class="image">
|
||||||
<easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage>
|
<easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage>
|
||||||
</view>
|
</view>
|
||||||
@ -313,14 +328,16 @@
|
|||||||
¥
|
¥
|
||||||
<text>{{ item.price }}</text>
|
<text>{{ item.price }}</text>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="item.show_svip_info.show_svip_price && item.svip_price" class="acea-row row-middle">
|
<view v-if="item.show_svip_info.show_svip_price && item.svip_price"
|
||||||
|
class="acea-row row-middle">
|
||||||
<text class='vip-money'>¥{{item.svip_price}}</text>
|
<text class='vip-money'>¥{{item.svip_price}}</text>
|
||||||
<view class="vipImg">
|
<view class="vipImg">
|
||||||
<image class="image" src="/static/images/svip.png"></image>
|
<image class="image" src="/static/images/svip.png"></image>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="item.product_type != 0 || item.issetCoupon || item.delivery_free == 1" class="item_tags">
|
<view v-if="item.product_type != 0 || item.issetCoupon || item.delivery_free == 1"
|
||||||
|
class="item_tags">
|
||||||
<text v-if="item.product_type != 0"
|
<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>
|
: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 ticket" v-if="item.issetCoupon">领券</text>
|
||||||
@ -329,7 +346,8 @@
|
|||||||
<view class="score">{{ item.rate }}评分 {{ item.reply_count }}条评论</view>
|
<view class="score">{{ item.rate }}评分 {{ item.reply_count }}条评论</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="item.max_extension && (item.product_type == 0 || item.product_type == 2)" class="foot">
|
<view v-if="item.max_extension && (item.product_type == 0 || item.product_type == 2)"
|
||||||
|
class="foot">
|
||||||
<text v-show="!isColumn" class="iconfont"></text>
|
<text v-show="!isColumn" class="iconfont"></text>
|
||||||
最高赚 ¥{{ item.max_extension }}
|
最高赚 ¥{{ item.max_extension }}
|
||||||
</view>
|
</view>
|
||||||
@ -367,7 +385,8 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="time-wrap" style="justify-content: space-between;">
|
<view class="time-wrap" style="justify-content: space-between;">
|
||||||
<block v-if="item.coupon_type == 1">
|
<block v-if="item.coupon_type == 1">
|
||||||
<view class="time">{{ item.use_start_time | dateFormat }}-{{ item.use_end_time | dateFormat }}
|
<view class="time">
|
||||||
|
{{ item.use_start_time | dateFormat }}-{{ item.use_end_time | dateFormat }}
|
||||||
</view>
|
</view>
|
||||||
</block>
|
</block>
|
||||||
<block v-if="item.coupon_type == 0">
|
<block v-if="item.coupon_type == 0">
|
||||||
@ -429,17 +448,35 @@
|
|||||||
unfollowStore,
|
unfollowStore,
|
||||||
storeServiceList
|
storeServiceList
|
||||||
} from '@/api/store.js';
|
} from '@/api/store.js';
|
||||||
import { initiateAssistApi, getTopicList } from '@/api/activity.js';
|
import {
|
||||||
import { getShopCoupons, setCouponReceive, getDiy, getProductSpuAPI } from '@/api/api.js';
|
initiateAssistApi,
|
||||||
import { getUserInfo } from '@/api/user.js';
|
getTopicList
|
||||||
import { configMap } from "@/utils";
|
} from '@/api/activity.js';
|
||||||
import { mapGetters } from "vuex";
|
import {
|
||||||
import { goShopDetail } from '@/libs/order.js';
|
getShopCoupons,
|
||||||
|
setCouponReceive,
|
||||||
|
getDiy,
|
||||||
|
getProductSpuAPI
|
||||||
|
} from '@/api/api.js';
|
||||||
|
import {
|
||||||
|
getUserInfo
|
||||||
|
} from '@/api/user.js';
|
||||||
|
import {
|
||||||
|
configMap
|
||||||
|
} from "@/utils";
|
||||||
|
import {
|
||||||
|
mapGetters
|
||||||
|
} from "vuex";
|
||||||
|
import {
|
||||||
|
goShopDetail
|
||||||
|
} from '@/libs/order.js';
|
||||||
import authorize from '@/components/Authorize';
|
import authorize from '@/components/Authorize';
|
||||||
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";
|
||||||
import { HTTP_REQUEST_URL } from '@/config/app';
|
import {
|
||||||
|
HTTP_REQUEST_URL
|
||||||
|
} from '@/config/app';
|
||||||
import mConfig from '../component/index.js';
|
import mConfig from '../component/index.js';
|
||||||
// #ifdef MP || APP-PLUS
|
// #ifdef MP || APP-PLUS
|
||||||
import activeParty from '@/pages/index/component/activeParty';
|
import activeParty from '@/pages/index/component/activeParty';
|
||||||
@ -594,7 +631,7 @@
|
|||||||
],
|
],
|
||||||
tabs3: [{
|
tabs3: [{
|
||||||
icon: 'icon-yizhan_o',
|
icon: 'icon-yizhan_o',
|
||||||
name: '云商品',
|
name: '综合云商品',
|
||||||
value: 7,
|
value: 7,
|
||||||
}, {
|
}, {
|
||||||
icon: 'icon-gouwu_o',
|
icon: 'icon-gouwu_o',
|
||||||
@ -620,10 +657,9 @@
|
|||||||
],
|
],
|
||||||
tabs5: [{
|
tabs5: [{
|
||||||
icon: 'icon-yizhan_o',
|
icon: 'icon-yizhan_o',
|
||||||
name: '云商品',
|
name: '综合云商品',
|
||||||
value: 7,
|
value: 7,
|
||||||
}
|
}],
|
||||||
],
|
|
||||||
tabs: [],
|
tabs: [],
|
||||||
storeScroll: true,
|
storeScroll: true,
|
||||||
storeTop: 0,
|
storeTop: 0,
|
||||||
@ -645,7 +681,8 @@
|
|||||||
number: 0
|
number: 0
|
||||||
};
|
};
|
||||||
if ('postage_score' in store) {
|
if ('postage_score' in store) {
|
||||||
score.number = (parseFloat(store.postage_score) + parseFloat(store.product_score) + parseFloat(store
|
score.number = (parseFloat(store.postage_score) + parseFloat(store.product_score) + parseFloat(
|
||||||
|
store
|
||||||
.service_score)) /
|
.service_score)) /
|
||||||
3;
|
3;
|
||||||
score.star = score.number / 5 * 100;
|
score.star = score.number / 5 * 100;
|
||||||
@ -723,7 +760,10 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// #endif
|
// #endif
|
||||||
this.getStore();
|
this.userinfo()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
this.diyData();
|
this.diyData();
|
||||||
shareScence(this.currSpid, this.isLogin)
|
shareScence(this.currSpid, this.isLogin)
|
||||||
if (this.isLogin) {
|
if (this.isLogin) {
|
||||||
@ -775,13 +815,14 @@
|
|||||||
this.storeHeight = data.height;
|
this.storeHeight = data.height;
|
||||||
this.storeTop = data.top;
|
this.storeTop = data.top;
|
||||||
}).exec();
|
}).exec();
|
||||||
this.userinfo()
|
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
userinfo() {
|
userinfo() {
|
||||||
getUserInfo().then(res => {
|
getUserInfo().then(res => {
|
||||||
|
|
||||||
this.business_status = res.data.mer_info.setting_status
|
this.business_status = res.data.mer_info.setting_status
|
||||||
|
this.getStore();
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
getProductSpu() {
|
getProductSpu() {
|
||||||
@ -874,7 +915,9 @@
|
|||||||
// 获取diy模板数据
|
// 获取diy模板数据
|
||||||
diyData() {
|
diyData() {
|
||||||
let that = this;
|
let that = this;
|
||||||
getDiy({ id: that.id }).then(res => {
|
getDiy({
|
||||||
|
id: that.id
|
||||||
|
}).then(res => {
|
||||||
let data = res.data;
|
let data = res.data;
|
||||||
that.styleConfig = that.objToArr(res.data.value);
|
that.styleConfig = that.objToArr(res.data.value);
|
||||||
uni.setNavigationBarTitle({
|
uni.setNavigationBarTitle({
|
||||||
@ -968,6 +1011,7 @@
|
|||||||
// this.tabs = this.tabs2
|
// this.tabs = this.tabs2
|
||||||
// this.service_open = false
|
// this.service_open = false
|
||||||
// }
|
// }
|
||||||
|
|
||||||
if (this.business_status == 1) {
|
if (this.business_status == 1) {
|
||||||
this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3
|
this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3
|
||||||
} else {
|
} else {
|
||||||
@ -1046,7 +1090,10 @@
|
|||||||
if (this.topicList.length) {
|
if (this.topicList.length) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
getTopicList(this.id, { page: 1, limit: 999 }).then(res => {
|
getTopicList(this.id, {
|
||||||
|
page: 1,
|
||||||
|
limit: 999
|
||||||
|
}).then(res => {
|
||||||
this.topicList = res.data;
|
this.topicList = res.data;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
@ -1,12 +1,17 @@
|
|||||||
<template>
|
<template>
|
||||||
<view class="" style="padding-top:var(--status-bar-height)">
|
<view class="">
|
||||||
|
<!-- #ifdef MP || APP-PLUS -->
|
||||||
|
|
||||||
<view class="conten-top">
|
<view class="conten-top">
|
||||||
<view class="" style="position: absolute;left: 30rpx;" @click="logout"><i class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;"></i></view>
|
<view class="" style="position: absolute;left: 30rpx;" @click="logout"><i class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;"></i></view>
|
||||||
<view class="" style="font-size: 30rpx;">
|
<view class="" style="font-size: 30rpx;">
|
||||||
商家入驻
|
商家入驻
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="!successful" :style="viewColor" style="margin-top: 50rpx;">
|
<view style="height:var(--status-bar-height);margin-bottom: 30rpx;"></view>
|
||||||
|
<!-- #endif -->
|
||||||
|
|
||||||
|
<view v-if="!successful" :style="viewColor" >
|
||||||
<form report-submit='true'>
|
<form report-submit='true'>
|
||||||
<view class='merchantsSettled' >
|
<view class='merchantsSettled' >
|
||||||
<view class="merchantBgCount">
|
<view class="merchantBgCount">
|
||||||
@ -17,7 +22,7 @@
|
|||||||
申请记录
|
申请记录
|
||||||
<text class="iconfont icon-xiangyou"></text>
|
<text class="iconfont icon-xiangyou"></text>
|
||||||
</view>
|
</view>
|
||||||
<view class='list'>
|
<view class='list' style="padding-top: var(--status-bar-height);">
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<view class="acea-row row-middle">
|
<view class="acea-row row-middle">
|
||||||
<text class="item-name">商户名称</text>
|
<text class="item-name">商户名称</text>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user