From 8d1f6c30155fb85fa92d76e1fa3ff5439db694a6 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 26 七月 2024 12:39:42 +0800
Subject: [PATCH] Merge branch 'master' of http://121.37.118.194:8000/r/~jt/MES-PDA
---
pages/index/index.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d9a6c2a..c25eee8 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -16,7 +16,7 @@
:style="{'background-color':app.bk_color,'color':app.bk_color}">
<i :class="app.img_font_style" :style="{'color':app.txt_color}"></i>
</a>
- <p :data-key="app.id">{{ app.name || app.list_name}}</p>
+ <p :data-key="app.id">{{ app.list_name|| app.name}}</p>
</li>
</ul>
@@ -130,7 +130,7 @@
appCreate(app) { //鐐瑰嚮鍔熻兘鐐硅烦杞〉闈� console.log(app);
var paramStr = this.$store.state.OIMoboxSAPI ? app.param : app.Param;
- var appName = this.$store.state.OIMoboxSAPI ? (app.name || app.list_name) : app.Name;
+ var appName = this.$store.state.OIMoboxSAPI ? (app.list_name || app.name ) : app.Name;
var defCode = this.$store.state.OIMoboxSAPI ? app.def_code : app.DefCode;
var param = "";
if (paramStr) {
--
Gitblit v1.9.1