Merge remote-tracking branch 'origin/dev-ly' into dev-jcq

.env

@@ -5,10 +5,12 @@ VITE_IS_MICRO= true
 VITE_PUBLIC_PATH = /
 
 # 后端请求前缀
-# VITE_API_URL = http://192.168.10.101:9999 
+VITE_API_URL = http://43.199.205.45:9999
+# VITE_API_URL = http://192.168.3.129:999
+# VITE_API_URL = http://192.168.10.101:9999
 # VITE_API_URL = http://192.168.3.118:9999
 #  VITE_API_URL = http://192.168.3.17:9999
- VITE_API_URL = http://43.199.205.45:9999
+#  VITE_API_URL = http://16.162.25.197:9999
 
 # OAUTH2 密码模式客户端信息
 VITE_OAUTH2_PASSWORD_CLIENT='pig:pig'

.env.production

@@ -0,0 +1,13 @@
+# port 端口号
+VITE_PORT = 8888
+
+#浏览器自动打开
+VITE_OPEN = true
+
+# 本地环境
+ENV = 'production'
+
+# ADMIN 服务地址
+VITE_ADMIN_PROXY_PATH = http://127.0.0.1:9999
+# VITE_API_URL = http://16.162.25.197:9999
+VITE_API_URL = http://43.199.205.45:9999

src/views/marketing/push-logs/index.vue

@@ -64,7 +64,9 @@
             {{ row.pushStatus ? '已推送' : '未推送' }}
           </template>
         </el-table-column>
-        
+        <!-- <el-table-column :formatter="statusFormatter" :label="'客户端ID'" prop="clientID" min-width="120"
+          show-overflow-tooltip>
+        </el-table-column> -->
         <el-table-column :formatter="statusFormatter" :label="'推送详情'" prop="pushDetail" min-width="250">
           <template #default="{ row }">
             <div class="trigger-info" @click="showTriggerInfo(row)">