Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop

pages/album/albumIndex.vue

@@ -2,6 +2,7 @@
 	<view class="big-box" :style="{'padding-top': statusBarHeight + 'px'}" v-show="show">
 		
 		<view class="nav-bar" :style="{'top': statusBarHeight + 'px', 'height': navHeight + 'px','line-height': navHeight + 'px'}">
+			<u-icon name="arrow-left" v-if="options.index" @click="returnClick"></u-icon>
 			摄影/旅拍
 		</view>
 		
@@ -144,6 +145,9 @@ export default {
     }
   },
   methods: {
+    returnClick() {
+      uni.navigateBack({delta: 1})
+    },
     closeMask() {//---关闭遮罩
       this.showtip = false
       this.showUseRule = false