Merge branch 'master' of https://github.com/Tencent/omi

packages/omi-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omi-cli",
-  "version": "3.0.30",
+  "version": "3.0.31",
   "description": "Create website with no build configuration. be friendly to [Omi](https://github.com/Tencent/omi) framework.",
   "main": "bin/omi",
   "engines": {

packages/omi-cli/template/mp/gulpfile.js

@@ -3,7 +3,6 @@ let path = require('path')
 let tap = require('gulp-tap')
 let compile = require('./scripts/mp/index')
 let fs = require('fs')
-let watch = require('gulp-watch')
 let compileWxss = require('./scripts/mp/wxss')
 
 gulp.task('components', ['copy'], () => {
@@ -200,7 +199,7 @@ gulp.task('copyThen', () => {
 })
 
 gulp.task('watch', () => {
-  watch('src-mp/**/*', () => {
+  gulp.watch('src-mp/**/*', () => {
     gulp.start('copyThen')
   })
 })

packages/omi-cli/template/mp/package.json

@@ -13,7 +13,6 @@
     "css-what": "^2.1.2",
     "gulp": "^3.9.1",
     "gulp-tap": "^1.0.1",
-    "gulp-watch": "^5.0.1",
     "html2json": "^1.0.2",
     "uglify-js": "^3.4.9"
   },

packages/omi-cli/template/mp/src/utils/mp.js

@@ -68,6 +68,10 @@ wx.setNavigationBarTitle = function (option) {
   document.title = option.title
 }
 
+wx.navigateBack = function (option) {
+  history.go(option.delta * -1)
+}
+
 function getUrlParams(url) {
   url = url.replace(/#.*$/, '')
   var queryArray = url.split(/[?&]/).slice(1)

packages/omi-mp-douban/gulpfile.js

@@ -3,7 +3,6 @@ let path = require('path')
 let tap = require('gulp-tap')
 let compile = require('./scripts/mp/index')
 let fs = require('fs')
-let watch = require('gulp-watch')
 let compileWxss = require('./scripts/mp/wxss')
 
 gulp.task('components', ['copy'], () => {
@@ -200,7 +199,7 @@ gulp.task('copyThen', () => {
 })
 
 gulp.task('watch', () => {
-  watch('src-mp/**/*', () => {
+  gulp.watch('src-mp/**/*', () => {
     gulp.start('copyThen')
   })
 })

packages/omi-mp-douban/package.json

@@ -13,7 +13,6 @@
     "css-what": "^2.1.2",
     "gulp": "^3.9.1",
     "gulp-tap": "^1.0.1",
-    "gulp-watch": "^5.0.1",
     "html2json": "^1.0.2",
     "uglify-js": "^3.4.9"
   },

packages/omi-mp-douban/src/utils/mp.js

@@ -68,6 +68,10 @@ wx.setNavigationBarTitle = function (option) {
   document.title = option.title
 }
 
+wx.navigateBack = function (option) {
+  history.go(option.delta * -1)
+}
+
 function getUrlParams(url) {
   url = url.replace(/#.*$/, '')
   var queryArray = url.split(/[?&]/).slice(1)

packages/omi-mp/src/utils/mp.js

@@ -68,6 +68,10 @@ wx.setNavigationBarTitle = function (option) {
   document.title = option.title
 }
 
+wx.navigateBack = function (option) {
+  history.go(option.delta * -1)
+}
+
 function getUrlParams(url) {
   url = url.replace(/#.*$/, '')
   var queryArray = url.split(/[?&]/).slice(1)