导航栏修改

src/packageGoods/coupon/index.vue

@@ -1,6 +1,12 @@
 <template>
 	<view>
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="选择优惠券" leftIconSize="0"></u-navbar>
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="选择优惠券"></u-navbar>
+		<!-- #endif -->
+		
 		<view class="coupon-title">可用优惠券：{{ total }}</view>
 		<view class="coupon-list">
 			<u-radio-group v-model="radiovalue1" placement="column" @change="changeChechk()">

src/packageGoods/goods/company.vue

@@ -1,6 +1,11 @@
 <template>
 	<view>
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar title="商家信息" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" leftIconSize="0"/>
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar title="商家信息" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
+		<!-- #endif -->
 		<view class="company">该商品由以下商家提供</view>
 		<view class="detail-description" v-for="(item,index) in merchantInfo" :key="index">
 			<image :src="item" mode="scaleToFill"></image>

src/packageGoods/goods/detail.vue

@@ -1,6 +1,12 @@
 <template>
 	<view>
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar title="商品详情" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" leftIconSize="0"/>
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar title="商品详情" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
+		<!-- #endif -->
+		
 		<view class="detail">
 			<!-- 商品轮播 -->
 			<view class="detail-swiper">

src/packageGoods/goods/list.vue

@@ -1,6 +1,11 @@
 <template>
 	<view>
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar :title="name" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff"  leftIconSize="0"/>
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar :title="name" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
+		<!-- #endif -->
 		<!-- 固定nav -->
 		<view class="fixed-top">
 			<!-- 搜索 -->

src/packageGoods/order/detail.vue

@@ -1,6 +1,11 @@
 <template>
 	<view class="detail">
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar title="订单详情" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" leftIconSize="0" />
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar title="订单详情" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
+		<!-- #endif -->
 		<!-- 订单状态 -->
 		<view class="status">
 			<image src="../../packageGoods/static/ordr/bg.png" mode="scaleToFill"></image>

src/packageGoods/order/index.vue

@@ -1,6 +1,11 @@
 <template>
 	<view>
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar title="我的订单" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff"  leftIconSize="0"/>
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar title="我的订单" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
+		<!-- #endif -->
 		<view class="order">
 			<!-- 订单导航 -->
 			<view class="flex order-state-search">

src/packageGoods/order/logistics.vue

@@ -1,6 +1,11 @@
 <template>
 	<view class="detail">
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar title="物流详情" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" leftIconSize="0" />
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar title="物流详情" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
+		<!-- #endif -->
 		<!-- 包裹 -->
 		<view class="pack" v-if="deliverList.length>1">
 			<u-tabs @change="changeTab" :scrollable="false" :list="packList" lineWidth="20" lineHeight="4"

src/packageGoods/order/settlement.vue

@@ -1,6 +1,11 @@
 <template>
 	<view>
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar title="提交订单" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" leftIconSize="0"/>
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar title="提交订单" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
+		<!-- #endif -->
 		<view class="settlement">
 			<view class="settlement-address">
 				<!-- 选择地址、获取微信地址 -->

src/packageGoods/recovery/index.vue

@@ -1,6 +1,11 @@
 <template>
 	<view>
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="兑换" leftIconSize="0"></u-navbar>
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="兑换"></u-navbar>
+		<!-- #endif -->
 		<view class="settlement">
 			<!-- 商品 -->
 			<view class="settlement-goods" style="background-color: #fff">

src/packageGoods/ticket/index.vue

@@ -1,6 +1,11 @@
 <template>
 	<view>
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="盲票列表" leftIconSize="0"></u-navbar>
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="盲票列表"></u-navbar>
+		<!-- #endif -->
 		<view class="ticket-box">
 			<view class="flex ticket-box-list">
 				<navigator :url="`/pages/ticketBox/detail?boxId=${ item.boxId }`" class="flex ticket-box-list-item"

src/packageOperate/activity/index.vue

@@ -1,6 +1,10 @@
 <template>
 	<view style="background-image: linear-gradient(#ff8e0c,#ffc555 80%,#ff8e0c); width: 100%; height: 100%;">
-
+		
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar title="免费抽奖" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" leftIconSize="0" />
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<view v-if="pagesNum > 1">
 			<u-navbar title="免费抽奖" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		</view>
@@ -11,6 +15,7 @@
 				</view>
 			</u-navbar>
 		</view>
+		<!-- #endif -->
 
 		<view class="wrap">
 			<!-- 参与人 -->

src/packageOperate/activity/record.vue

@@ -1,5 +1,9 @@
 <template>
 	<view>
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar title="获奖名单" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff"  leftIconSize="0"/>
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<view v-if="pagesNum > 1">
 			<u-navbar title="获奖名单" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		</view>
@@ -10,6 +14,8 @@
 				</view>
 			</u-navbar>
 		</view>
+		<!-- #endif -->
+		
 		<view class="list">
 			<view v-for="(item,index) in list" :key="index" class="list-view">
 				<view class="award flex">

src/packageOperate/address/create.vue

@@ -1,7 +1,14 @@
 <template>
 	<view>
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar :title="addrId ? '编辑地址' : '添加地址'" :border="true" :placeholder="true" :autoBack="true"
+			bgColor="#fff" leftIconSize="0" />
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar :title="addrId ? '编辑地址' : '添加地址'" :border="true" :placeholder="true" :autoBack="true"
 			bgColor="#fff" />
+		<!-- #endif -->
+		
 		<!-- 表单组件 -->
 		<view class="address-add">
 			<u-form labelPosition="left" ref="form" labelWidth="90">

src/packageOperate/address/index.vue

@@ -1,6 +1,11 @@
 <template>
 	<view>
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar title="我的地址" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" leftIconSize="0" />
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar title="我的地址" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
+		<!-- #endif -->
 		<view class="addres-list">
 			<view class="address-item" v-for="(item, index) in list" :key="index">
 				<view class="contacts">

src/packageOperate/process/index.vue

@@ -1,6 +1,11 @@
 <template>
 	<view>
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar title="兑奖" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff"  leftIconSize="0" />
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar title="兑奖" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
+		<!-- #endif -->
 		<view class="process">
 			<view class="flex box-wrap">
 				<view class="flex box">

src/packageOperate/share/index.vue

@@ -1,6 +1,11 @@
 <template>
 	<view>
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar title="分享" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff"  leftIconSize="0" />
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar title="分享" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
+		<!-- #endif -->
 
 		<view class="flex invitation">
 			<view class="flex invitation-user">

src/packageOther/about/conceal.vue

@@ -1,6 +1,11 @@
 <template>
 	<view>
-		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="隐私保护声明"></u-navbar>
+		 <!-- #ifdef MP-ALIPAY -->
+		 <u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="隐私保护声明" leftIconSize="0" ></u-navbar>
+		 <!-- #endif -->
+		 <!-- #ifndef MP-ALIPAY -->
+		 <u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="隐私保护声明"  ></u-navbar>
+		 <!-- #endif -->
 		<view v-html="desc" class="desc"></view>
 	</view>
 </template>

src/packageOther/about/index.vue

@@ -1,6 +1,12 @@
 <template>
 	<view>
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="关于我们" leftIconSize="0"></u-navbar>
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="关于我们"></u-navbar>
+		<!-- #endif -->
+		
 		<view class="about">
 			<view class="flex about-logo">
 				<image src="../../static/public/logo.png" mode="scaleToFill"></image>

src/packageOther/about/protect.vue

@@ -1,6 +1,11 @@
 <template>
 	<view>
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="用户使用协议" leftIconSize="0" ></u-navbar>
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="用户使用协议"></u-navbar>
+		<!-- #endif -->
 		<view v-html="desc" class="desc"></view>
 	</view>
 </template>

src/packageOther/rule/index.vue

@@ -1,6 +1,11 @@
 <template>
 	<view>
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="盲票产品规则" leftIconSize="0" ></u-navbar>
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="盲票产品规则"></u-navbar>
+		<!-- #endif -->
 		<view v-html="desc" class="desc"></view>
 	</view>
 </template>

src/packagePrize/bean/index.vue

@@ -1,6 +1,12 @@
 <template>
 	<view>
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的盲豆"  leftIconSize="0"></u-navbar>
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的盲豆"></u-navbar>
+		<!-- #endif -->
+		
 		<view class="bean">
 			<!-- 盲豆数 -->
 			<view class="bean-balance flex">

src/packagePrize/coupon/detail.vue

@@ -1,6 +1,12 @@
 <template>
 	<view>
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="优惠券详情" leftIconSize="0"></u-navbar>
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="优惠券详情"></u-navbar>
+		<!-- #endif -->
+		
 		<view class="detail">
 			<!-- 优惠券信息 -->
 			<view class="flex detail-item">

src/packagePrize/coupon/use.vue

@@ -1,6 +1,11 @@
 <template>
 	<view>
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="优惠券使用记录" leftIconSize="0"></u-navbar>
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="优惠券使用记录"></u-navbar>
+		<!-- #endif -->
 		<!-- 优惠券筛选 -->
 		<view class="prize-state">
 			<u-tabs @change="changeTab" :scrollable="false" :list="stateArr" lineWidth="20" lineHeight="4"

src/packagePrize/goods/detail.vue

@@ -1,6 +1,12 @@
 <template>
 	<view>
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="奖品详情" leftIconSize="0"></u-navbar>
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="奖品详情"></u-navbar>
+		<!-- #endif -->
+		
 		<view class="detail">
 			<view class="detail-swiper">
 				<u-swiper :list="picUrlArr" height="375" radius="0" :indicator="true" :circular="true" indicatorMode="dot" indicatorActiveColor="#FA822C"></u-swiper>

src/packagePrize/prize/index.vue

@@ -1,5 +1,18 @@
 <template>
 	<view>
+		<!-- #ifdef MP-ALIPAY -->
+		<view v-if="pagesNum > 1">
+			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的仓库" leftIconSize="0"></u-navbar>
+		</view>
+		<view v-else>
+			<u-navbar leftIconSize="0" :placeholder="true" bgColor="#fff" 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 -->
+		<!-- #ifndef MP-ALIPAY -->
 		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的仓库"></u-navbar>
 		</view>
@@ -10,6 +23,8 @@
 				</view>
 			</u-navbar>
 		</view>
+		<!-- #endif -->
+		
 
 		<!-- 奖品选择 -->
 		<view class="prize-state">

src/packagePrize/rolling/index.vue

@@ -1,6 +1,13 @@
 <template>
 	<view>
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="盲票开启" v-if="rollingShow"  leftIconSize="0"></u-navbar>
+		<!-- #endif -->
+		
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="盲票开启" v-if="rollingShow"></u-navbar>
+		<!-- #endif -->
+		
 		<view class="rolling" v-if="rollingShow">
 			<!-- 奖品滚动 -->
 			<view class="rolling-prize">

src/packagePrize/ticket/index.vue

@@ -1,6 +1,12 @@
 <template>
 	<view>
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的盲票" leftIconSize="0"></u-navbar>
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的盲票"></u-navbar>
+		<!-- #endif -->
+		
 		<!-- 状态 -->
 		<view class="state">
 			<u-tabs @change="changeTab" :scrollable="false" :list="stateArr" lineWidth="60" lineHeight="3"

src/pages/login/code.vue

@@ -1,6 +1,11 @@
 <template>
 	<view class="container">
+		<!-- #ifdef MP-ALIPAY -->
+		<u-navbar title="手机验证码登录" :border="true" :placeholder="true" :autoBack="true" leftIconSize="0" />
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<u-navbar title="手机验证码登录" :border="true" :placeholder="true" :autoBack="true" />
+		<!-- #endif -->
 		<view class="container">
 			<view class="login">
 				<view class="login-title">验证码登录</view>

src/pages/ticketBox/detail.vue

@@ -1,5 +1,19 @@
 <template>
 	<view class="ticket-wrap">
+		<!-- #ifdef MP-ALIPAY -->
+		<view v-if="pagesNum > 1">
+			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="盲票详情" leftIconSize="0"></u-navbar>
+		</view>
+		<view v-else>
+			<u-navbar leftIconSize="0" :placeholder="true" bgColor="#fff" title="盲票详情">
+				<view class="nav-left flex" slot="left" @click="toIndex">
+					<u-icon name="home" size="20" color="#333"></u-icon>
+					<view class="nav-left__code">首页</view>
+				</view>
+			</u-navbar>
+		</view>
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
 		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="盲票详情"></u-navbar>
 		</view>
@@ -11,6 +25,8 @@
 				</view>
 			</u-navbar>
 		</view>
+		<!-- #endif -->
+		
 		<!-- 奖品轮播 -->
 		<view class="prize">
 			<!-- 查看规则 -->