Merge branch 'develop' of http://192.168.0.204/panyongping/uni-pdtravel into develop

pages/album/albumIndex.vue

@@ -2,8 +2,8 @@
 	<view class="big-box" :style="{'padding-top': statusBarHeight + 'px'}" v-if="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>
+			:style="{'display': 'flex','top': statusBarHeight + 'px', 'height': navHeight + 'px','line-height': navHeight + 'px'}">
+			<u-icon name="arrow-left" color="#333" v-if="options.index" @click="returnClick"></u-icon>
 			摄影/旅拍
 		</view>
 
@@ -34,7 +34,6 @@
 						<view class="left demo-water" v-for="(item, index) in leftList" :key="index"
 							@click="jumpToClick(item.title)">
 							<image :src="item.image" mode="aspectFill"></image>
-							<!-- <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>
 								<view class="slogan">快来定制吧</view>
@@ -52,7 +51,6 @@
 						<view class="demo-water" v-for="(item, index) in rightList" :key="index"
 							@click="jumpToClick(item.title)">
 							<image :src="item.image" mode="aspectFill"></image>
-							<!-- <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>
 								<view class="slogan">快来定制吧</view>
@@ -78,8 +76,8 @@
 			</text>
 		</view>
 
-		<!-- <u-mask :show="couponTip || showUseRule"> -->
-			<view class="mask">
+		<u-overlay :show="couponTip || showUseRule">
+			<view class="mask" @tap.stop>
 				<view class="img-box">
 					<image class="bg" src="@/static/img/my/backgroundIcon01.png" mode="aspectFit"></image>
 					<view class="coupon-box" v-if="couponTip">
@@ -88,10 +86,6 @@
 							免费获得 2 寸照片
 						</view>
 						<image class="my-card" src="./static/album/myCard.png" mode="aspectFit"></image>
-						<!-- <view class="use-rule" @click="showUseRuleClick">
-							使用规则
-							<u-icon name="arrow-right"></u-icon>
-						</view> -->
 						<view class="address">（使用地址：长江索道南站观景台旁）</view>
 					</view>
 					<view class="rules" v-if="showUseRule">
@@ -106,26 +100,17 @@
 							</view>
 						</view>
 					</view>
-					<u-icon class="close" name="close-circle" @click="closeMask"></u-icon>
+					<u-icon class="close" name="close-circle" color="#fff" @click="closeMask"></u-icon>
 				</view>
 				<u-button type="primary" shape="circle" @click="closeMask">知道了</u-button>
 			</view>
-		<!-- </u-mask> -->
+		</u-overlay>
 
 	</view>
 </template>
 
 <script>
-// import UWaterfall from '@/uview-ui/components/u-waterfall/u-waterfall.vue'
-// import ULazyLoad from '@/uview-ui/components/u-lazy-load/u-lazy-load.vue'
-// import UMask from '@/uview-ui/components/u-mask/u-mask.vue'
-
 export default {
-  components: {
-    // UWaterfall,
-    // ULazyLoad,
-    // UMask
-  },
   data() {
     return {
       couponTip: false, //券领取提示
@@ -376,8 +361,6 @@ export default {
     if (this.options.template === 'true') { // 从模板选择页进入
       this.show = true
 			this.couponTip = true
-      // this.getCoupon()
-      // this.couponIsUse()
     }else if (this.options.channelId) { // 扫码进入本页
       this.handleWhetherToVotePage()
     } else if (this.options.index == 1) { // 从vlog首页进入
@@ -418,7 +401,7 @@ export default {
 			background: linear-gradient(to top, #f7f7f7, #f7f7f7 80%, transparent 100%);
 		}
 
-		/deep/.u-mask {
+		/deep/.u-transition {
 			display: flex;
 			justify-content: center;
 			align-items: center;
@@ -589,11 +572,10 @@ export default {
 			width: 100%;
 			height: 100%;
 
-			.close {
+			/deep/.u-icon {
 				position: absolute;
 				top: -64rpx;
 				right: 24rpx;
-				color: #fff;
 				font-size: 40rpx;
 
 				&::after {

pages/album/chooseFavorite.vue

@@ -4,7 +4,7 @@
 			<picker mode="selector" @change="companyChage" :value="index" :range="companyArr" range-key="merchantName">
 				<view class="company">{{companyArr[index] ? companyArr[index].merchantName : '请选择公司'}}</view>
 			</picker>
-			<u-icon name="arrow-down"></u-icon>
+			<u-icon name="arrow-down" color="#fff"></u-icon>
 		</view>
 		<view class="outer-container">
 			<view class="inner-container">
@@ -25,14 +25,7 @@
 </template>
 
 <script>
-// import UCheckboxGroup from '@/uview-ui/components/u-checkbox-group/u-checkbox-group.vue'
-// import UCheckbox from '@/uview-ui/components/u-checkbox/u-checkbox.vue'
-
 export default {
-  components: {
-    // UCheckboxGroup,
-    // UCheckbox,
-  },
   data() {
     return {
       statusBarHeight: 0,

pages/album/getPortrait.vue

@@ -25,8 +25,8 @@
 			</view>
 		</view>
 		<text class="tip">获取照片需先在拍摄点摄影</text>
-		<!-- <u-mask :show="maskShow" @click="closeClick"> -->
-			<view class="mask">
+		<u-overlay :show="maskShow" @click="closeClick">
+			<view class="mask" @tap.stop>
 				<text class="countdown" :class="{'hidden': maskCount <= 0}">{{maskCount}}s</text>
 				<view class="tip">
 					<view>未找到您的照片</view>
@@ -34,16 +34,12 @@
 				</view>
 				<u-button type="info" size="mini" shape="circle" @click="returnClick">返回</u-button>
 			</view>
-		<!-- </u-mask> -->
+		</u-overlay>
 	</view>
 </template>
 
 <script>
-// import UMask from '@/uview-ui/components/u-mask/u-mask.vue'
 export default {
-  components: {
-    // UMask
-  },
   data() {
     return {
       statusBarHeight: 0,
@@ -149,6 +145,7 @@ export default {
           this.queryData = res.data
           this.takePhoto()
 			  }else{
+					this.handleNotFound()
 			    uni.showToast({
 			      title: '查询参数获取失败',
 			      icon: 'none'
@@ -189,12 +186,8 @@ export default {
       var loop = setInterval(() => {
 			  this.maskCount -= 1
 			  if(this.maskCount <= 0) {
-			    // this.maskShow = false
 			    this.src = ''
 			    clearInterval(loop)
-			    // uni.navigateBack({
-					  // delta: 1
-			    // })
 			    uni.setScreenBrightness({
 					  value: this.defaultBrightness, //屏幕亮度值，范围 0~1，0 最暗，1 最亮
 			    })
@@ -288,7 +281,6 @@ export default {
 				box-sizing: border-box;
 				background-color: #fff;
 				-webkit-transform: rotate(0deg);
-				// z-index: 100;
 			}
 			.surface {
 				display: flex;
@@ -348,7 +340,7 @@ export default {
 			font-weight: 700;
 			color: #3688FF;
 		}
-		/deep/.u-mask {
+		/deep/.u-transition {
 			display: flex;
 			justify-content: center;
 			align-items: center;