Merge branch 'dev' into 'test'

修改

See merge request quanshu/mp-ui-user!50

src/packageGoods/coupon/index.vue

@@ -7,7 +7,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="选择优惠券"></u-navbar>
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="选择优惠券" />
 		</view>

src/packageGoods/goods/company.vue

@@ -6,7 +6,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar title="商家信息" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="商家信息" />
 		</view>

src/packageGoods/goods/detail.vue

@@ -6,7 +6,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar title="商品详情" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="商品详情" />
 		</view>

src/packageGoods/goods/list.vue

@@ -6,7 +6,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :title="name" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" :title="name" />
 		</view>

src/packageGoods/order/detail.vue

@@ -6,7 +6,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar title="订单详情" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="订单详情" />
 		</view>

src/packageGoods/order/index.vue

@@ -6,7 +6,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar title="我的订单" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的订单" />
 		</view>

src/packageGoods/order/logistics.vue

@@ -6,7 +6,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar title="物流详情" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="物流详情" />
 		</view>

src/packageGoods/order/settlement.vue

@@ -6,7 +6,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar title="提交订单" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="提交订单" />
 		</view>

src/packageGoods/promoters/index.vue

@@ -7,7 +7,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="选择盲票天使"></u-navbar>
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="选择盲票天使" />
 		</view>

src/packageGoods/recovery/index.vue

@@ -6,7 +6,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="兑换"></u-navbar>
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="兑换" />
 		</view>

src/packageGoods/ticket/index.vue

@@ -8,7 +8,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="商品列表"></u-navbar>
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="商品列表" />
 		</view>

src/packageOperate/address/create.vue

@@ -8,7 +8,7 @@
 		<u-navbar :title="addrId ? '编辑地址' : '添加地址'" :border="true" :placeholder="true" :autoBack="true"
 			bgColor="#fff" />
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" :title="addrId ? '编辑地址' : '添加地址'" />
 		</view>

src/packageOperate/address/index.vue

@@ -6,7 +6,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar title="我的地址" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的地址" />
 		</view>

src/packageOperate/creator/index.vue

@@ -7,7 +7,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar title="申请创客" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="申请创客" />
 		</view>

src/packageOperate/process/index.vue

@@ -6,7 +6,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar title="兑奖" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="兑奖" />
 		</view>

src/packageOperate/share/index.vue

@@ -6,7 +6,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar title="分享" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="分享" />
 		</view>

src/packageOther/about/conceal.vue

@@ -6,7 +6,7 @@
 		 <!-- #ifdef MP-WEIXIN -->
 		 <u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="隐私保护声明"  ></u-navbar>
 		 <!-- #endif -->
-		 <!-- #ifdef H5 -->
+		 <!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		 <view v-if="$pagesNum() > 1">
 		 	<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="隐私保护声明" />
 		 </view>

src/packageOther/about/index.vue

@@ -6,7 +6,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="关于我们"></u-navbar>
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="关于我们" />
 		</view>

src/packageOther/rule/index.vue

@@ -6,7 +6,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="盲票产品规则"></u-navbar>
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="盲票产品规则" />
 		</view>

src/packageOther/rule/purchase.vue

@@ -6,7 +6,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="商品购买服务协议"></u-navbar>
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="商品购买服务协议" />
 		</view>

src/packagePrize/address/index.vue

@@ -7,7 +7,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="使用范围"></u-navbar>
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="使用范围" />
 		</view>

src/packagePrize/bean/index.vue

@@ -6,7 +6,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的盲豆"></u-navbar>
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的盲豆" />
 		</view>

src/packagePrize/coupon/detail.vue

@@ -7,7 +7,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="优惠券详情"></u-navbar>
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="优惠券详情" />
 		</view>

src/packagePrize/coupon/use.vue

@@ -6,7 +6,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="优惠券使用记录"></u-navbar>
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="优惠券使用记录" />
 		</view>

src/packagePrize/goods/detail.vue

@@ -6,7 +6,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="奖品详情"></u-navbar>
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="奖品详情" />
 		</view>

src/packagePrize/goods/index.vue

@@ -7,7 +7,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="商品详情"></u-navbar>
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="商品详情" />
 		</view>

src/packagePrize/purchase/index.vue

@@ -7,7 +7,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="购买成功"></u-navbar>
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="购买成功" />
 		</view>

src/packagePrize/rolling/index.vue

@@ -10,7 +10,7 @@
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="抽奖中" v-if="rollingShow">
 		</u-navbar>
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="抽奖中" />
 		</view>

src/packagePrize/ticket/index.vue

@@ -6,7 +6,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的盲票"></u-navbar>
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的盲票" />
 		</view>

src/pages/login/code.vue

@@ -6,7 +6,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar title="手机验证码登录" :border="true" :placeholder="true" :autoBack="true" />
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" title="登录" />
 		</view>

src/pages/login/index.vue

@@ -6,7 +6,7 @@
 		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" title="登录"></u-navbar>
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
+		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
 		<view v-if="$pagesNum() > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" title="登录" />
 		</view>