~liuwh/nsjcy.git

刘文浩 / nsjcy

forked from nsjcy/frontEnd/nsjcy

summary
commits
tree
docs
forks
compare

js冲突

liuwh

2020-05-09 4edccb5c4268698889887edcee9228db2c9f0a61

 SunshineLnsMinApp/pages/dissDetail/dissDetail.js

@@ -37,9 +37,7 @@
  scanEvildoing: function (e) {
    var name = this.data.name;
    if (name == '公益随手拍') {
      wx.navigateTo({
        url: '../video/video',
      })
      app.getPermission( '../video/video')
    } else {
      wx.navigateTo({
        url: '../scanEvildoing/scanEvildoing?id=new',

			@@ -37,9 +37,7 @@
			scanEvildoing: function (e) {
			var name = this.data.name;
			if (name == '公益随手拍') {
			wx.navigateTo({
			url: '../video/video',
			})
			app.getPermission( '../video/video')
			} else {
			wx.navigateTo({
			url: '../scanEvildoing/scanEvildoing?id=new',