修改

src/packageGoods/coupon/index.vue

@@ -4,15 +4,15 @@
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="选择优惠券" leftIconSize="0">
 		</u-navbar>
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="选择优惠券"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->
 		<view v-if="$pagesNum() > 1">
-			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="登录" />
+			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="选择优惠券" />
 		</view>
 		<view v-else>
-			<u-navbar leftIconSize="0" :placeholder="true" bgColor="#fff" :border="true" title="登录">
+			<u-navbar leftIconSize="0" :placeholder="true" bgColor="#fff" :border="true" title="选择优惠券">
 				<view class="nav-left flex" slot="left" @click="$toIndex()">
 					<u-icon name="arrow-left" size="20" color="#333"></u-icon>
 				</view>

src/packageGoods/goods/company.vue

@@ -3,7 +3,7 @@
 		<!-- #ifdef MP-ALIPAY -->
 		<u-navbar title="商家信息" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" leftIconSize="0"/>
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar title="商家信息" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packageGoods/goods/detail.vue

@@ -3,7 +3,7 @@
 		<!-- #ifdef MP-ALIPAY -->
 		<u-navbar title="商品详情" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" leftIconSize="0"/>
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar title="商品详情" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packageGoods/goods/list.vue

@@ -3,7 +3,7 @@
 		<!-- #ifdef MP-ALIPAY -->
 		<u-navbar :title="name" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff"  leftIconSize="0"/>
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :title="name" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packageGoods/order/detail.vue

@@ -3,7 +3,7 @@
 		<!-- #ifdef MP-ALIPAY -->
 		<u-navbar title="订单详情" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" leftIconSize="0" />
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar title="订单详情" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packageGoods/order/index.vue

@@ -3,7 +3,7 @@
 		<!-- #ifdef MP-ALIPAY -->
 		<u-navbar title="我的订单" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff"  leftIconSize="0"/>
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar title="我的订单" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packageGoods/order/logistics.vue

@@ -3,7 +3,7 @@
 		<!-- #ifdef MP-ALIPAY -->
 		<u-navbar title="物流详情" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" leftIconSize="0" />
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar title="物流详情" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packageGoods/order/settlement.vue

@@ -3,7 +3,7 @@
 		<!-- #ifdef MP-ALIPAY -->
 		<u-navbar title="提交订单" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" leftIconSize="0"/>
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar title="提交订单" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packageGoods/promoters/index.vue

@@ -4,7 +4,7 @@
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="选择盲票天使" leftIconSize="0">
 		</u-navbar>
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="选择盲票天使"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packageGoods/recovery/index.vue

@@ -3,7 +3,7 @@
 		<!-- #ifdef MP-ALIPAY -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="兑换" leftIconSize="0"></u-navbar>
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="兑换"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packageGoods/ticket/index.vue

@@ -5,7 +5,7 @@
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="商品列表" leftIconSize="0">
 		</u-navbar>
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="商品列表"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packageOperate/address/create.vue

@@ -4,7 +4,7 @@
 		<u-navbar :title="addrId ? '编辑地址' : '添加地址'" :border="true" :placeholder="true" :autoBack="true"
 			bgColor="#fff" leftIconSize="0" />
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :title="addrId ? '编辑地址' : '添加地址'" :border="true" :placeholder="true" :autoBack="true"
 			bgColor="#fff" />
 		<!-- #endif -->

src/packageOperate/address/index.vue

@@ -3,7 +3,7 @@
 		<!-- #ifdef MP-ALIPAY -->
 		<u-navbar title="我的地址" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" leftIconSize="0" />
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar title="我的地址" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packageOperate/creator/index.vue

@@ -4,7 +4,7 @@
 		<!-- #ifdef MP-ALIPAY -->
 		<u-navbar title="申请创客" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" leftIconSize="0" />
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar title="申请创客" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packageOperate/process/index.vue

@@ -3,7 +3,7 @@
 		<!-- #ifdef MP-ALIPAY -->
 		<u-navbar title="兑奖" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff"  leftIconSize="0" />
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar title="兑奖" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packageOperate/share/index.vue

@@ -3,7 +3,7 @@
 		<!-- #ifdef MP-ALIPAY -->
 		<u-navbar title="分享" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff"  leftIconSize="0" />
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar title="分享" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packageOther/about/conceal.vue

@@ -3,7 +3,7 @@
 		 <!-- #ifdef MP-ALIPAY -->
 		 <u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="隐私保护声明" leftIconSize="0" ></u-navbar>
 		 <!-- #endif -->
-		 <!-- #ifndef MP-ALIPAY || H5 -->
+		 <!-- #ifdef MP-WEIXIN -->
 		 <u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="隐私保护声明"  ></u-navbar>
 		 <!-- #endif -->
 		 <!-- #ifdef H5 -->

src/packageOther/about/index.vue

@@ -3,7 +3,7 @@
 		<!-- #ifdef MP-ALIPAY -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="关于我们" leftIconSize="0"></u-navbar>
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="关于我们"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packageOther/about/protect.vue

@@ -3,7 +3,7 @@
 		<!-- #ifdef MP-ALIPAY -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="用户使用协议" leftIconSize="0" ></u-navbar>
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="用户使用协议"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packageOther/rule/index.vue

@@ -3,7 +3,7 @@
 		<!-- #ifdef MP-ALIPAY -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="盲票产品规则" leftIconSize="0" ></u-navbar>
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="盲票产品规则"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packageOther/rule/purchase.vue

@@ -3,7 +3,7 @@
 		<!-- #ifdef MP-ALIPAY -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="商品购买服务协议" leftIconSize="0" ></u-navbar>
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="商品购买服务协议"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packagePrize/address/index.vue

@@ -4,7 +4,7 @@
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="使用范围" leftIconSize="0">
 		</u-navbar>
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="使用范围"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packagePrize/bean/index.vue

@@ -3,7 +3,7 @@
 		<!-- #ifdef MP-ALIPAY -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的盲豆"  leftIconSize="0"></u-navbar>
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的盲豆"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packagePrize/coupon/detail.vue

@@ -4,7 +4,7 @@
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="优惠券详情" leftIconSize="0">
 		</u-navbar>
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="优惠券详情"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packagePrize/coupon/use.vue

@@ -3,7 +3,7 @@
 		<!-- #ifdef MP-ALIPAY -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="优惠券使用记录" leftIconSize="0"></u-navbar>
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="优惠券使用记录"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packagePrize/goods/detail.vue

@@ -3,7 +3,7 @@
 		<!-- #ifdef MP-ALIPAY -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="奖品详情" leftIconSize="0"></u-navbar>
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="奖品详情"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packagePrize/goods/index.vue

@@ -4,7 +4,7 @@
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="商品详情" leftIconSize="0">
 		</u-navbar>
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="商品详情"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packagePrize/purchase/index.vue

@@ -4,7 +4,7 @@
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="购买成功" leftIconSize="0">
 		</u-navbar>
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="购买成功"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/packagePrize/rolling/index.vue

@@ -6,11 +6,22 @@
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="抽奖中" v-if="rollingShow"
 				leftIconSize="0"></u-navbar>
 		<!-- #endif -->
-
-		<!-- #ifndef MP-ALIPAY -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="抽奖中" v-if="rollingShow">
 		</u-navbar>
 		<!-- #endif -->
+		<!-- #ifdef H5 -->
+		<view v-if="$pagesNum() > 1">
+			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="抽奖中" />
+		</view>
+		<view v-else>
+			<u-navbar leftIconSize="0" :placeholder="true" bgColor="#fff" :border="true" title="抽奖中">
+				<view class="nav-left flex" slot="left" @click="$toIndex()">
+					<u-icon name="arrow-left" size="20" color="#333"></u-icon>
+				</view>
+			</u-navbar>
+		</view>
+		<!-- #endif -->
 
 		<view class="rolling" v-if="rollingShow">
 			<!-- 奖品滚动 -->

src/packagePrize/ticket/index.vue

@@ -3,7 +3,7 @@
 		<!-- #ifdef MP-ALIPAY -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的盲票" leftIconSize="0"></u-navbar>
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的盲票"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/pages/login/code.vue

@@ -3,7 +3,7 @@
 		<!-- #ifdef MP-ALIPAY -->
 		<u-navbar title="手机验证码登录" :border="true" :placeholder="true" :autoBack="true" leftIconSize="0" />
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar title="手机验证码登录" :border="true" :placeholder="true" :autoBack="true" />
 		<!-- #endif -->
 		<!-- #ifdef H5 -->

src/pages/login/index.vue

@@ -3,7 +3,7 @@
 		<!-- #ifdef MP-ALIPAY -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" title="登录" leftIconSize="0"></u-navbar>
 		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY || H5 -->
+		<!-- #ifdef MP-WEIXIN -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" title="登录"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->