mkm
/
shop-applet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into prod

This commit is contained in:
weipengfei 2023-12-02 18:07:05 +08:00
parent b707f4bf97 33874d9f77
commit e53e4cf2c5
1 changed files with 48 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
pages/index/index.vue
View File

@ -379,6 +379,7 @@
import {
ENV
} from "@/config/app.js"
import { Toast } from '../../libs/uniApi';
export default {
components: {
@ -433,44 +434,47 @@
type: 13,
image: require('@/static/images/index9.png')
},
{
name: '供货采购',
type: 3,
image: require('@/static/images/index4.png')
},
{
name: '进货管理',
type: 4,
image: require('@/static/images/index5.png')
},
{
name: '订单管理',
type: 2,
image: require('@/static/images/index1.png')
},
// {
// name: '供货采购',
// type: 3,
// image: require('@/static/images/index4.png')
// },
// {
// name: '进货管理',
// type: 4,
// image: require('@/static/images/index5.png')
// },
{
name: '订单核销',
type: 7,
image: require('@/static/images/index2.png')
},
// {
// name: '扫码出库',
// type: 11,
// image: require('@/static/images/index10.png')
// },
{
name: '商户设置',
type: 12,
image: require('@/static/images/index11.png')
},
// {
// name: '商户设置',
// type: 12,
// image: require('@/static/images/index11.png')
// },
{
name: '提现管理',
type: 5,
image: require('@/static/images/index8.png')
}, {
name: '客服记录',
type: 6,
image: require('@/static/images/index6.png')
}, {
name: '订单核销',
type: 7,
image: require('@/static/images/index2.png')
}, {
},
// {
// name: '客服记录',
// type: 6,
// image: require('@/static/images/index6.png')
// },
{
name: '全部',
type: 8,
image: require('@/static/images/index3.png')
@ -493,11 +497,18 @@
name: '提现管理',
type: 5,
image: require('@/static/images/index8.png')
}, {
name: '客服记录',
type: 6,
image: require('@/static/images/index6.png')
}, {
},
{
name: '押金缴纳',
type: 14,
image: require('@/static/images/index20.png')
},
// {
// name: '客服记录',
// type: 6,
// image: require('@/static/images/index6.png')
// },
{
name: '订单核销',
type: 7,
image: require('@/static/images/index2.png')
@ -1139,6 +1150,14 @@
.mer_id}&stype=2`
})
break;
case 14:
if(this.userInfoData.mer_info.mer_settlement_agree_status == 0) Toast('暂无权限');
else uni.navigateTo({
url: '/pages/margin/margin' + `?mer_id=` + this.userInfoData
.service
.mer_id
})
break;
default:
uni.navigateTo({
url: '/pages/moreProject/moreProject'