diff --git a/main.js b/main.js
index 8ab2e44..b3715c2 100644
--- a/main.js
+++ b/main.js
@@ -8,7 +8,8 @@ App.mpType = 'app'
Vue.prototype.goBack = function () {
- getCurrentPages().length > 1 ? uni.navigateBack({}) : uni.navigateBack({delta:999})
+ getCurrentPages().length > 1 ? uni.navigateBack({}) : window.location.href = window.location.origin
+
}
Vue.prototype.concat = function () {
// let img = require("static/4/0_card.png")
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2374165..bbfb347 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,14 +1,36 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{progressNum}}%
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
@@ -17,6 +39,7 @@
data() {
return {
imgSrc: require('static/1/1.png'),
+ progressNum: 0,
number: 0,
startY: 0
}
@@ -34,7 +57,7 @@
this.number += 1
switch (this.number){
case 1:
- this.imgSrc = require('static/1/1.png')
+ this.startProgress()
break;
case 2:
this.imgSrc = require('static/1/2.png')
@@ -46,6 +69,16 @@
break;
}
},
+ startProgress() {
+ let timer = setInterval(()=>{
+ this.progressNum++
+ if (this.progressNum>=100) {
+ this.progressNum = 100
+ clearInterval(timer)
+ this.number = 2
+ }
+ },10)
+ },
touchStart(e) {
this.startY = e.changedTouches[0].clientY;
},
@@ -63,16 +96,60 @@
\ No newline at end of file
diff --git a/static/1/1btn.png b/static/1/1btn.png
new file mode 100644
index 0000000..c466174
Binary files /dev/null and b/static/1/1btn.png differ
diff --git a/static/1/2title.png b/static/1/2title.png
new file mode 100644
index 0000000..12ddf6e
Binary files /dev/null and b/static/1/2title.png differ