diff --git a/hybrid/html/demo.html b/hybrid/html/demo.html
index 19de077..82cbc54 100644
--- a/hybrid/html/demo.html
+++ b/hybrid/html/demo.html
@@ -1,3 +1,4 @@
+<<<<<<< .mine
@@ -98,3 +99,183 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+=======
+
+
+
+
+
+
+
+
+
+ 11111111
+
+
+
+>>>>>>> .theirs
diff --git a/pages/tabbar/dashboard.vue b/pages/tabbar/dashboard.vue
index dbbd40a..d681890 100644
--- a/pages/tabbar/dashboard.vue
+++ b/pages/tabbar/dashboard.vue
@@ -32,9 +32,12 @@
+
-
+
+
+
@@ -52,11 +55,6 @@
-
-
-
-
-
@@ -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");
});
});
},
diff --git a/static/html/demo.html b/static/html/demo.html
index 19de077..bf7e311 100644
--- a/static/html/demo.html
+++ b/static/html/demo.html
@@ -4,6 +4,7 @@
+