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

pages.json

@@ -197,7 +197,7 @@
             
         },
 				{
-				    "path" : "pages/album/index",
+				    "path" : "pages/album/albumIndex",
 				    "style" :                                                                                    
 				    {
 				        "navigationBarTitleText": "相册首页",

pages/album/index.vue → pages/album/albumIndex.vue

@@ -13,7 +13,7 @@
 					<image class="img" src="../../static/img/coupon/coupon.jpg"></image>
 					<text class="title">影像DIY</text>
 				</view>
-				<view class="item">
+				<view class="item" @click="jumpToCustomClick">
 					<image class="img" src="../../static/img/coupon/coupon.jpg"></image>
 					<text class="title">旅拍定制</text>
 				</view>
@@ -27,7 +27,7 @@
 				<view class="title">私人定制</view>
 				<u-waterfall v-model="list" ref="uWaterfall">
 					<template v-slot:left="{leftList}">
-						<view class="left demo-water" v-for="(item, index) in leftList" :key="index">
+						<view class="left demo-water" v-for="(item, index) in leftList" :key="index" @click="jumpToClick(item.title)">
 							<u-lazy-load threshold="-450" border-radius="10" :image="item.image" :index="index"></u-lazy-load>
 							<view class="info-box" :style="{'background-color': item.color}">
 								<view class="item-title">{{item.title}}</view>
@@ -43,7 +43,7 @@
 						</view>
 					</template>
 					<template v-slot:right="{rightList}">
-						<view class="demo-water" v-for="(item, index) in rightList" :key="index">
+						<view class="demo-water" v-for="(item, index) in rightList" :key="index" @click="jumpToClick(item.title)">
 							<u-lazy-load threshold="-450" border-radius="10" :image="item.image" :index="index"></u-lazy-load>
 							<view class="info-box" :style="{'background-color': item.color}">
 								<view class="item-title">{{item.title}}</view>
@@ -136,11 +136,28 @@ export default {
     }
   },
   methods: {
-    jumpToScanFaceClick() {
+    jumpToScanFaceClick() {//---跳转扫脸页面
+      uni.navigateTo({
+			  url: './getPortrait'
+      })
+    },
+    jumpToCustomClick() {//---跳转旅拍定制页面
 		  uni.navigateTo({
-			  url:'./getPortrait'
+			  url: './myPhotoAlbum/myPhotoAlbum'
 		  })
     },
+    jumpToClick(title) {
+      if(title === '精彩瞬间') {
+        uni.navigateTo({
+				  url: './getPortrait'
+        })
+      }
+      if(title === '网红旅拍') {
+        uni.navigateTo({
+				  url: './myPhotoAlbum/myPhotoAlbum'
+        })
+      }
+    },
     recordDeviceInfo() {//---记录设备信息
       this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight // 状态栏高度
       this.capsule = uni.getMenuButtonBoundingClientRect() // 胶囊大小、位置数据

pages/album/chooseFavorite.vue

@@ -27,7 +27,6 @@
 <script>
 import UCheckbox from '@/uview-ui/components/u-checkbox/u-checkbox.vue'
 
-
 export default {
   components: {
     UCheckbox,
@@ -60,7 +59,7 @@ export default {
 			      icon: 'success'
 			    })
           uni.navigateTo({
-            url: './index?tip=true'
+            url: './albumIndex?tip=true'
           })
 			  }else{
 			    uni.showToast({