From 227b63b6bf5313bb8c4ffb2daa02730a847a93ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Mon, 13 Apr 2026 14:33:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=86=8C=E9=A9=B3=E5=9B=9E=E5=9B=BE?=
=?UTF-8?q?=E7=89=87=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
node_modules/.package-lock.json | 2 +-
package-lock.json | 2 +-
pages/shop/photoAlbum/photoManage.vue | 18 +++++++++++-------
utils/request.js | 4 ++--
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
index ff4ba77..2418305 100644
--- a/node_modules/.package-lock.json
+++ b/node_modules/.package-lock.json
@@ -1,5 +1,5 @@
{
- "name": "mrr.sj.front.app",
+ "name": "mrr.sj.front",
"lockfileVersion": 3,
"requires": true,
"packages": {
diff --git a/package-lock.json b/package-lock.json
index 40c7b53..d588f8e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
{
- "name": "mrr.sj.front.app",
+ "name": "mrr.sj.front",
"lockfileVersion": 3,
"requires": true,
"packages": {
diff --git a/pages/shop/photoAlbum/photoManage.vue b/pages/shop/photoAlbum/photoManage.vue
index efaa0a2..834234a 100644
--- a/pages/shop/photoAlbum/photoManage.vue
+++ b/pages/shop/photoAlbum/photoManage.vue
@@ -34,11 +34,11 @@
{{ getItem(item2).name }}
-
+
审核中…
-
+
已驳回
@@ -64,11 +64,11 @@
-
+
审核中…
-
+
已驳回
@@ -135,9 +135,9 @@
},
methods: {
todetail() {
- console.log('详情');
- uni.navigateTo({
- url:'/pages/shop/skill-detail'
+ console.log('详情');
+ uni.navigateTo({
+ url: '/pages/shop/skill-detail'
})
},
getItem(item) {
@@ -152,6 +152,10 @@
obj.url = item.url || item.auth_url
obj.name = item.name || item.auth_name
}
+ if (item.id == 0) {
+ obj.url = item.url
+ obj.name = item.name
+ }
if (item.type == 2) {
obj.url = obj.url + `?x-oss-process=video/snapshot,t_1000,m_fast,f_jpg,w_600,ar_auto`
}
diff --git a/utils/request.js b/utils/request.js
index 1a06288..ff89727 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -135,12 +135,12 @@ const request = async (options, isUpdate) => {
if (process.env.NODE_ENV === 'development') {
baseURL = url; // 发布到生产环境时,此处代码会被摇树移除掉。
- //baseURL = 'http://60.247.146.5:93'; // 发布到生产环境时,此处代码会被摇树移除掉。
+ baseURL = 'http://60.247.146.5:93'; // 发布到生产环境时,此处代码会被摇树移除掉。
//baseURL = 'http://60.247.146.5:96'; // 发布到生产环境时,此处代码会被摇树移除掉。
//baseURL = 'https://app.mrrweb.com.cn';
} else {
baseURL = url; // 发布到生产环境时,此处代码会被摇树移除掉。
- //baseURL = 'http://60.247.146.5:93'; // 发布到生产环境时,此处代码会被摇树移除掉。
+ baseURL = 'http://60.247.146.5:93'; // 发布到生产环境时,此处代码会被摇树移除掉。
//baseURL = 'http://60.247.146.5:96'; // 发布到生产环境时,此处代码会被摇树移除掉。
//baseURL = 'https://app.mrrweb.com.cn';