From 84636211c3e871da21fe6fc1d0164ddb89013718 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Thu, 9 Nov 2023 18:59:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/app.js | 5 +++--
pages/index/index.vue | 26 +++++++++++++++-----------
pages/moreProject/moreProject.vue | 12 ++++++------
3 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/config/app.js b/config/app.js
index 5537476..97bff42 100644
--- a/config/app.js
+++ b/config/app.js
@@ -8,9 +8,9 @@ let httpApiTwo
let httpApiThree
// 在打包之前请检查当前环境是否正确
-const env = 'dev'; // 开发
+// const env = 'dev'; // 开发
-// const env = 'prod'; // 生产
+const env = 'prod'; // 生产
// const env = 'prew'; // 预上线
switch (env) {
@@ -43,6 +43,7 @@ switch (env) {
let wsApi = 'wss://shop.lihaink.cn'
module.exports = {
+ ENV: env,
// 请求域名 格式： https://您的域名
// #ifdef MP || APP-PLUS
// HTTP_REQUEST_URL: httpApi,
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1878894..71bfc33 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -375,6 +375,9 @@
getOrderList
} from "@/api/admin";
+ import {
+ ENV
+ } from "@/config/app.js"
export default {
components: {
@@ -434,11 +437,11 @@
type: 2,
image: require('@/static/images/index1.png')
},
- {
- name: '供货采购',
- type: 3,
- image: require('@/static/images/index4.png')
- },
+ // {
+ // name: '供货采购',
+ // type: 3,
+ // image: require('@/static/images/index4.png')
+ // },
// {
// name: '进货管理',
// type: 4,
@@ -449,11 +452,11 @@
// 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,
@@ -858,7 +861,8 @@
},
//个人详情
logout() {
- this.$refs.popup1.open()
+ if(ENV=='prod') this.byset()
+ else this.$refs.popup1.open()
},
//登录
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index db535d6..aef7e56 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -141,12 +141,12 @@
供货采购
-->
-
供货采购
-
+
进货管理
@@ -224,12 +224,12 @@
供应链批发
-
+
代发订单
-
+
补货订单
@@ -267,12 +267,12 @@
交易申请状态：待审核
-
供货采购
-
+
进货管理