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;

52
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'">
@ -188,7 +199,7 @@
</image>
<text class="text">保证缴纳金</text>
</view>
<view class="examine"
@click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill">
@ -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}">
@ -614,7 +627,7 @@
created() {},
onLoad() {
this.Fheight = uni.getSystemInfoSync().windowHeight + 'px';
},
onShow() {
if (this.isLogin) {
@ -627,9 +640,6 @@
this.getUserInfo()
this.codelist()
this.list()
},
@ -854,6 +864,12 @@
}
},
//
logout(){
uni.switchTab({
url:'/pages/gather/gather'
})
},
//商户设置
buyserset() {
uni.navigateTo({
@ -863,7 +879,7 @@
navigator(url, t) {
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
if (this.codenote.length == 0) {
this.isFshow = true
@ -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;

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

File diff suppressed because one or more lines are too long

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>