mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

弹窗界面以及商户管理修改

Browse Source
This commit is contained in:
jia 2023-09-26 19:11:14 +08:00
parent 5cf28341eb
commit 55b4c78c1e
6 changed files with 2218 additions and 2129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pages.json
View File

@ -125,6 +125,7 @@
"path": "pages/moreProject/moreProject",
"style": {
"navigationBarTitleText": "商户平台",
"navigationStyle": "custom",
"enablePullDownRefresh": false
}

6
pages/margin/margin.vue
View File

@ -8,6 +8,10 @@
<text>已缴纳保证金</text>
<text>{{merchant_Data.paid_margin}}</text>
</view>
<view class="item">
<text>未缴纳保证金</text>
<text>{{merchant_Data.unpaid_margin}}</text>
</view>
<view class="item">
<text>缴纳店铺账户</text>
<text>{{merchant_Data.mer_name}}</text>
@ -236,7 +240,7 @@
display: flex;
flex-direction: column;
padding: 0 28rpx;
margin-top: 50rpx;
margin-top: 85rpx;
.title {
font-size: 32rpx;

46
pages/moreProject/moreProject.vue
View File

@ -1,5 +1,16 @@
<template>
<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">
<view class="" v-if="userInfoData.mer_info.setting_status==1">
<view class="special_work com" v-if="userInfoData.mer_info.type_code === 'TypeSupplyChain'">
@ -410,11 +421,12 @@
<emptyPage title="暂无信息"></emptyPage>
</view>
<view class="settlementAgreement" v-if="isFshow">
<view class="setAgCount" style="width: 100%;height: 100%;">
<!-- <i class="icon iconfont icon-cha" @click="recuo"></i> -->
<view class="" style="width: 60rpx;height: 60rpx; position: absolute;right: 30rpx; top:20rpx"
<view class="setAgCount" style="width: 100%;height: 100%; padding-top:120rpx ;" >
<view class="" style="width: 60rpx;height: 60rpx; position: absolute;left: 30rpx; top:80rpx"
@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>
<div class="title">{{detail.title}}</div>
<view style="margin: 20rpx 0;">甲方公司:{{company?company:"暂无公司信息"}}</view>
@ -440,7 +452,8 @@
<view class="userpage">
<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>
<form report-submit='true' style="height: 90%;">
<view class='merchantsSettled' :style="{'height':Fheight}">
@ -627,9 +640,6 @@
this.getUserInfo()
this.codelist()
this.list()
},
@ -854,6 +864,12 @@
}
},
//
logout(){
uni.switchTab({
url:'/pages/gather/gather'
})
},
//商户设置
buyserset() {
uni.navigateTo({
@ -936,6 +952,18 @@
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 {
width: 100%;
@ -949,7 +977,7 @@
height: 60rpx;
position: absolute;
top: 65rpx;
right: 60rpx;
left: 60rpx;
image {
width: 100%;

10
pages/product/addGoods/index.vue
View File

@ -837,9 +837,9 @@
mer_cate_id: '请选择店铺分类', // 店铺分类
unit_name: '请输入商品单位', // 商品单位
};
console.log({
...this.setFormData
})
// console.log({
// ...this.setFormData
// })
Object.keys(requireData).some(item => {
if (!this.setFormData[item]) {
Toast(requireData[item]);
@ -858,6 +858,10 @@
Toast('请选择送货方式');
return;
}
if (!this.setFormData.mer_cate_id.length) {
Toast('请选择店铺分类');
return;
}
if (this.setFormData.imageList.length < 2) {
Toast('请添加最少两张图片用于展示');
return;

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

@ -26,10 +26,12 @@
<!-- #endif -->
<view v-show="navShow && tabActive === 3" class="nav" :style="viewColor">
<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">
{{ 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 :class="{ active: navActive === 1 }" class="item" @click="set_where(2,0)">
@ -45,7 +47,8 @@
</view>
<view class="item" @click="select.show = false;navActive = 4;isColumn = !isColumn">
<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>
@ -74,7 +77,8 @@
</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">
<image :src="store.mer_avatar"></image>
@ -121,10 +125,12 @@
</view>
<view v-show="!navShow && tabActive === 3 || tabActive === 7" class="nav">
<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">
{{ 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 :class="{ active: navActive === 1 }" class="item" @click="set_where(2,0)">
@ -143,7 +149,8 @@
</view>
<view class="item" @click="select.show = false;navActive = 4;isColumn = !isColumn">
<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>
@ -184,7 +191,8 @@
<!-- #ifdef H5 -->
<view v-for="(item, index) in styleConfig" :key="index">
<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>
</block>
</block>
@ -200,10 +208,12 @@
<combination v-if="item.name == 'combination'" :merId="id" :dataConfig="item"></combination>
<topic v-if="item.name == 'topic'" :merId="id" :dataConfig="item"></topic>
<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>
<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>
<presellList v-if="item.name == 'presellList'" :merId="id" :dataConfig="item"></presellList>
<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="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">
<easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage>
<view v-if="item.stock == 0" class="sell_out">已售罄</view>
@ -237,7 +248,8 @@
<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"
<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">
@ -245,7 +257,8 @@
</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">
<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>
@ -255,7 +268,8 @@
<view class="score">{{ item.rate }}评分 {{ item.reply_count }}条评论</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>
最高赚 ¥{{ item.max_extension }}
</view>
@ -299,7 +313,8 @@
<!--生活服务-->
<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 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>
@ -313,14 +328,16 @@
¥
<text>{{ item.price }}</text>
</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>
<view class="vipImg">
<image class="image" src="/static/images/svip.png"></image>
</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"
: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>
@ -329,7 +346,8 @@
<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">
<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>
@ -367,7 +385,8 @@
</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 class="time">
{{ item.use_start_time | dateFormat }}-{{ item.use_end_time | dateFormat }}
</view>
</block>
<block v-if="item.coupon_type == 0">
@ -429,17 +448,35 @@
unfollowStore,
storeServiceList
} from '@/api/store.js';
import { initiateAssistApi, getTopicList } from '@/api/activity.js';
import { 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 {
initiateAssistApi,
getTopicList
} from '@/api/activity.js';
import {
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 history from "@/mixins/history";
import emptyPage from '@/components/emptyPage.vue'
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';
// #ifdef MP || APP-PLUS
import activeParty from '@/pages/index/component/activeParty';
@ -497,7 +534,7 @@
data() {
return {
//下拉
isTriggered:false,
isTriggered: false,
domain: HTTP_REQUEST_URL,
// #ifdef MP
menuButtonInfo: uni.getMenuButtonBoundingClientRect(),
@ -594,7 +631,7 @@
],
tabs3: [{
icon: 'icon-yizhan_o',
name: '云商品',
name: '综合云商品',
value: 7,
}, {
icon: 'icon-gouwu_o',
@ -620,10 +657,9 @@
],
tabs5: [{
icon: 'icon-yizhan_o',
name: '云商品',
name: '综合云商品',
value: 7,
}
],
}],
tabs: [],
storeScroll: true,
storeTop: 0,
@ -634,7 +670,7 @@
type: 3,
statusBarHeight: 0,
isLihaiYun: '',
business_status:0
business_status: 0
}
},
computed: {
@ -645,7 +681,8 @@
number: 0
};
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)) /
3;
score.star = score.number / 5 * 100;
@ -723,7 +760,10 @@
}
}
// #endif
this.getStore();
this.userinfo()
this.diyData();
shareScence(this.currSpid, this.isLogin)
if (this.isLogin) {
@ -775,13 +815,14 @@
this.storeHeight = data.height;
this.storeTop = data.top;
}).exec();
this.userinfo()
},
methods: {
userinfo(){
userinfo() {
getUserInfo().then(res => {
this.business_status=res.data.mer_info.setting_status
this.business_status = res.data.mer_info.setting_status
this.getStore();
})
},
getProductSpu() {
@ -874,7 +915,9 @@
// 获取diy模板数据
diyData() {
let that = this;
getDiy({ id: that.id }).then(res => {
getDiy({
id: that.id
}).then(res => {
let data = res.data;
that.styleConfig = that.objToArr(res.data.value);
uni.setNavigationBarTitle({
@ -968,9 +1011,10 @@
// this.tabs = this.tabs2
// 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
}else{
} else {
this.tabs = this.tabs5
}
@ -1046,7 +1090,10 @@
if (this.topicList.length) {
return;
}
getTopicList(this.id, { page: 1, limit: 999 }).then(res => {
getTopicList(this.id, {
page: 1,
limit: 999
}).then(res => {
this.topicList = res.data;
});
},
@ -1172,7 +1219,7 @@
return false;
}
this.goods = []
this.where.page=1
this.where.page = 1
this.goodsLoading = this.loadend = this.loading = false
this.tabActive = param;
// console.log(this.goods);
@ -1213,7 +1260,7 @@
}
},
//#endif
onRefresh(){
onRefresh() {
this.isTriggered = true;
const newList = this.goods.reverse();
this.goods = newList;

13
pages/store/settled/index.vue
View File

@ -1,14 +1,19 @@
<template>
<view class="" style="padding-top:var(--status-bar-height)">
<view class="">
<!-- #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 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'>
<view class='merchantsSettled'>
<view class='merchantsSettled' >
<view class="merchantBgCount">
<image mode="widthFix" class="merchantBg" :src="domain+'/static/diy/merchantBg'+keyColor+'.jpg'"
alt="">
@ -17,7 +22,7 @@
申请记录
<text class="iconfont icon-xiangyou"></text>
</view>
<view class='list'>
<view class='list' style="padding-top: var(--status-bar-height);">
<view class="item">
<view class="acea-row row-middle">
<text class="item-name">商户名称</text>