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

pages/album/albumIndex.vue

@@ -73,7 +73,16 @@
 			<view class="mask">
 				<view class="img-box">
 					<image src="./static/album/postcardTip.png" mode="aspectFit" v-if="showtip"></image>
-					<image src="./static/album/useRule.png" mode="aspectFit" v-if="showUseRule"></image>
+					<!-- <view class="rules" v-if="showUseRule">
+						<view class="title">使用规则</view>
+						<view class="block">
+							<view class="name"></view>
+							<view class="content">
+								<view class="small-font"></view>
+							</view>
+						</view>
+					</view>
+					<image src="./static/album/useRule.png" mode="aspectFit" v-if="showUseRule"></image> -->
 					<u-icon class="close" name="close-circle" @click="closeMask"></u-icon>
 					<view class="use-rule" @click="useRuleClick" v-if="showtip"></view>
 				</view>
@@ -141,6 +150,11 @@ export default {
           color: '#D48D46'
         }
       ],
+      rules: [
+        {
+          ruleName: '规则说明',
+        }
+      ],
       options: {}//路由参数
     }
   },