Merge branch 'master' into dev

pages/showImageList/showImageList.js

@@ -47,6 +47,7 @@ Page({
       {
         ...this.data.config,
         onTap(current, urls) {
+          wx.navigateBack()
           return false
         },
       })