解决冲突文件

pages/tabbar/dashboard.vue

@@ -32,9 +32,12 @@
 		</view>
 		<!-- 内容 -->
 		<view class="content-box">
+			
 			<view class="box">
 				<Section :title="$t('homePage.home.stationTopo')" />
-				<view v-if="componentsLoaded">
+				<!-- 加载中占位（可选） -->
+				<view v-else class="loading-tip">
+					<zero-loading v-if="tuopoloading"></zero-loading>
 					<cixi v-if="topologyType === 0" ref="tuopu" />
 					<kejiyuan v-else-if="topologyType === 2" ref="tuopu" />
 					<lingchao v-else-if="topologyType === 3" ref="tuopu" />
@@ -52,11 +55,6 @@
 					<pv2first v-else-if="topologyType === 1 && inverterFlag === 1 && pvTopologyType === 2" ref="tuopu" />
 					<standard v-else ref="tuopu" />
 				</view>
-				<!-- 加载中占位（可选） -->
-				<view v-else class="loading-tip">
-					<zero-loading v-if="tuopoloading"></zero-loading>
-				</view>
-			</view>
 			<view v-if="topologyType === 9" class="box">
 				<Section :title="$t('homePage.home.deviceMonitor')" />
 				<devicemonitoring ref="deviceFire" />
@@ -188,7 +186,7 @@
 		data() {
 			return {
 				// #ifdef APP
-				src: '/hybrid/demo.html',
+				src: '/static/html/demo.html',
 				// #endif
 				// #ifdef H5
 				src: '/static/html/demo.html',
@@ -387,7 +385,7 @@
 			        resolve(res);
 			      })
 			      .catch((err) => {
-			        reject("错误");
+			        reject("error");
 			      });
 			  });
 			},