lsx před 2 roky
rodič
revize
5d21abeabf
37 změnil soubory, kde provedl 142 přidání a 62 odebrání
  1. 1 2
      src/main.js
  2. 3 1
      src/packageGoods/coupon/index.vue
  3. 3 1
      src/packageGoods/goods/company.vue
  4. 4 2
      src/packageGoods/goods/detail.vue
  5. 6 3
      src/packageGoods/goods/list.vue
  6. 6 2
      src/packageGoods/order/detail.vue
  7. 3 1
      src/packageGoods/order/index.vue
  8. 6 2
      src/packageGoods/order/logistics.vue
  9. 3 1
      src/packageGoods/order/settlement.vue
  10. 5 3
      src/packageGoods/promoters/index.vue
  11. 3 1
      src/packageGoods/recovery/index.vue
  12. 5 1
      src/packageGoods/ticket/index.vue
  13. 3 2
      src/packageOperate/activity/index.vue
  14. 5 1
      src/packageOperate/activity/record.vue
  15. 5 2
      src/packageOperate/address/create.vue
  16. 4 2
      src/packageOperate/address/index.vue
  17. 6 2
      src/packageOperate/creator/index.vue
  18. 5 1
      src/packageOperate/process/index.vue
  19. 3 2
      src/packageOperate/share/index.vue
  20. 2 1
      src/packageOther/about/conceal.vue
  21. 2 1
      src/packageOther/about/protect.vue
  22. 2 1
      src/packageOther/rule/index.vue
  23. 2 1
      src/packageOther/rule/purchase.vue
  24. 5 1
      src/packagePrize/address/index.vue
  25. 3 1
      src/packagePrize/bean/index.vue
  26. 5 1
      src/packagePrize/coupon/detail.vue
  27. 3 1
      src/packagePrize/coupon/use.vue
  28. 5 1
      src/packagePrize/goods/detail.vue
  29. 6 2
      src/packagePrize/goods/index.vue
  30. 4 2
      src/packagePrize/prize/index.vue
  31. 5 1
      src/packagePrize/purchase/index.vue
  32. 6 3
      src/packagePrize/rolling/index.vue
  33. 3 2
      src/packagePrize/ticket/index.vue
  34. 1 1
      src/pages/login/code.vue
  35. 5 1
      src/pages/login/index.vue
  36. 4 3
      src/pages/ticketBox/detail.vue
  37. 0 6
      src/utils/util.js

+ 1 - 2
src/main.js

@@ -2,14 +2,13 @@ import App from './App'
 
 import Vue from 'vue'
 
-import { parseTime, numberFormat, toIndex, pagesNum } from "@/utils/util";
+import { parseTime, numberFormat, toIndex } from "@/utils/util";
 
 import uView from "uview-ui";
 Vue.use(uView);
 
 Vue.prototype.$parseTime = parseTime
 Vue.prototype.$toIndex = toIndex
-Vue.prototype.$pagesNum = pagesNum
 Vue.prototype.$numberFormat = numberFormat
 
 Vue.config.productionTip = false

+ 3 - 1
src/packageGoods/coupon/index.vue

@@ -8,7 +8,7 @@
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="选择优惠券"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="选择优惠券" />
 		</view>
 		<view v-else>
@@ -93,9 +93,11 @@
 				backOn: "https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/coupon_bkg2.png",
 				backOff: "https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/coupon_bkg1.png",
 				channelId: '',
+				pagesNum: '',
 			};
 		},
 		onShow() {
+			this.pagesNum = getCurrentPages().length
 			this.pageList()
 			this.exclusive()
 		},

+ 3 - 1
src/packageGoods/goods/company.vue

@@ -7,7 +7,7 @@
 		<u-navbar title="商家信息" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="商家信息" />
 		</view>
 		<view v-else>
@@ -34,12 +34,14 @@
 				merchantInfo: [],
 				goodsId:'',
 				data:[],
+				pagesNum: '',
 			}
 		},
 		onLoad(opthios) {
 			this.goodsId = opthios.goodsId
 		},
 		onShow() {
+			this.pagesNum = getCurrentPages().length
 			this.getDetail()
 		},
 		methods: {

+ 4 - 2
src/packageGoods/goods/detail.vue

@@ -7,7 +7,7 @@
 		<u-navbar title="商品详情" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="商品详情" />
 		</view>
 		<view v-else>
@@ -146,13 +146,15 @@
 				tipShow: false,
 				
 				exchangePopupShow: false,
-				purchasePopupShow: false
+				purchasePopupShow: false,
+				pagesNum: '',
 			};
 		},
 		onLoad(opthios) {
 			this.goodsId = opthios.id
 		},
 		onShow() {
+			this.pagesNum = getCurrentPages().length
 			this.getDetail()
 			if(uni.getStorageSync('token')) {
 				this.getBean()

+ 6 - 3
src/packageGoods/goods/list.vue

@@ -7,7 +7,7 @@
 		<u-navbar :title="name" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" :title="name" />
 		</view>
 		<view v-else>
@@ -100,10 +100,13 @@
 				choiceIndex: 1,
 				priceSort: null,
 				saleSort: null,
-				priceShow: false
+				priceShow: false,
+				pagesNum: '',
 			};
 		},
-		
+		onShow() {
+			this.pagesNum = getCurrentPages().length
+		},
 		onLoad(opthios) {
 			this.title = opthios.title
 			if(opthios.name) {

+ 6 - 2
src/packageGoods/order/detail.vue

@@ -7,7 +7,7 @@
 		<u-navbar title="订单详情" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="订单详情" />
 		</view>
 		<view v-else>
@@ -178,8 +178,12 @@
 				list: [],
 				deliverList: [],
 				autoConfirmTime: '',
-				authShow: false,
+				authShow: false,
+				pagesNum: '',
 			};
+		},
+		onShow() {
+			this.pagesNum = getCurrentPages().length
 		},
 		onLoad(opthios) {
 			this.orderId = opthios.id

+ 3 - 1
src/packageGoods/order/index.vue

@@ -7,7 +7,7 @@
 		<u-navbar title="我的订单" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的订单" />
 		</view>
 		<view v-else>
@@ -108,10 +108,12 @@
 					name: '已完成'
 				}, ],
 				authShow: false,
+				pagesNum: '',
 			};
 		},
 		onLoad(opthios) {},
 		onShow() {
+			this.pagesNum = getCurrentPages().length
 			this.pageList()
 		},
 		methods: {

+ 6 - 2
src/packageGoods/order/logistics.vue

@@ -7,7 +7,7 @@
 		<u-navbar title="物流详情" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="物流详情" />
 		</view>
 		<view v-else>
@@ -110,9 +110,13 @@
 				ListData: [],
 				listIndex: 0,
 				logistics: '',
-				packList: []
+				packList: [],
+				pagesNum: '',
 			}
 		},
+		onShow() {
+			this.pagesNum = getCurrentPages().length
+		},
 		onLoad(opthios) {
 			this.orderId = opthios.id
 			this.getDetail()

+ 3 - 1
src/packageGoods/order/settlement.vue

@@ -7,7 +7,7 @@
 		<u-navbar title="提交订单" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="提交订单" />
 		</view>
 		<view v-else>
@@ -165,6 +165,7 @@
 				wxAddress: {},
 				payment: '',
 				authShow: false,
+				pagesNum: '',
 			}
 		},
 		onLoad(opthios) {
@@ -183,6 +184,7 @@
 			}
 		},
 		onShow() {
+			this.pagesNum = getCurrentPages().length
 			if (this.toAddressShow) {
 				this.getDetail()
 			}

+ 5 - 3
src/packageGoods/promoters/index.vue

@@ -8,7 +8,7 @@
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="选择盲票天使"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="选择盲票天使" />
 		</view>
 		<view v-else>
@@ -61,10 +61,12 @@
 				channelId: '', //选中项的id
 				id: '', //门店的channelId
 				status: 'nomore', //上拉刷新状态
-				searchValue: '', //搜索
+				searchValue: '', //搜索
+				pagesNum: '',
 			};
 		},
-		onShow() {
+		onShow() {
+			this.pagesNum = getCurrentPages().length
 			this.pageList()
 		},
 		onLoad(opthios) {

+ 3 - 1
src/packageGoods/recovery/index.vue

@@ -7,7 +7,7 @@
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="兑换"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="兑换" />
 		</view>
 		<view v-else>
@@ -73,6 +73,7 @@
 				list: [],
 				value: '',
 				recovery: {},
+				pagesNum: '',
 			}
 		},
 		onLoad(opthios) {
@@ -91,6 +92,7 @@
 			}
 		},
 		onShow() {
+			this.pagesNum = getCurrentPages().length
 			this.getDetail()
 		},
 		methods: {

+ 5 - 1
src/packageGoods/ticket/index.vue

@@ -9,7 +9,7 @@
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="商品列表"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="商品列表" />
 		</view>
 		<view v-else>
@@ -66,8 +66,12 @@
 				total: 0,
 				list: [],
 				ids: [],
+				pagesNum: '',
 			};
 		},
+		onShow() {
+			this.pagesNum = getCurrentPages().length
+		},
 		onLoad(options) {
 			if (options.ids) {
 				this.ids = JSON.parse(options.ids)

+ 3 - 2
src/packageOperate/activity/index.vue

@@ -5,7 +5,7 @@
 		<u-navbar title="免费抽奖" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" leftIconSize="0" />
 		<!-- #endif -->
 		<!-- #ifndef MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar title="免费抽奖" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		</view>
 		<view v-else>
@@ -262,7 +262,7 @@
 				inviteCodeTa: '', //邀请码
 				marketingId: '', //活动id
 				userInfo: '', //uid
-
+				pagesNum: '',
 			}
 		},
 		onLoad(opthios) {
@@ -298,6 +298,7 @@
 			this.getDetail()
 		},
 		onShow() {
+			this.pagesNum = getCurrentPages().length
 			this.getBaseInfo()
 		},
 		methods: {

+ 5 - 1
src/packageOperate/activity/record.vue

@@ -4,7 +4,7 @@
 		<u-navbar title="获奖名单" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff"  leftIconSize="0"/>
 		<!-- #endif -->
 		<!-- #ifndef MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar title="获奖名单" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		</view>
 		<view v-else>
@@ -113,8 +113,12 @@
 				activityShow: false,
 				listData: {},
 				total: 0,
+				pagesNum: '',
 			}
 		},
+		onShow() {
+			this.pagesNum = getCurrentPages().length
+		},
 		onLoad(opthios) {
 			this.marketingId = opthios.id
 			this.pageList()

+ 5 - 2
src/packageOperate/address/create.vue

@@ -9,7 +9,7 @@
 			bgColor="#fff" />
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" :title="addrId ? '编辑地址' : '添加地址'" />
 		</view>
 		<view v-else>
@@ -74,9 +74,12 @@
 					area: '', // 区
 				},
 				areaShow: false,
+				pagesNum: '',
 			}
 		},
-
+		onShow() {
+			this.pagesNum = getCurrentPages().length
+		},
 		onLoad(options) {
 			if (options.addrId) {
 				this.addrId = options.addrId

+ 4 - 2
src/packageOperate/address/index.vue

@@ -7,7 +7,7 @@
 		<u-navbar title="我的地址" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的地址" />
 		</view>
 		<view v-else>
@@ -78,7 +78,8 @@
 				// 收货地址列表
 				list: [],
 				// 默认收货地址
-				defaultId: null
+				defaultId: null,
+				pagesNum: '',
 			}
 		},
 
@@ -89,6 +90,7 @@
 		},
 
 		onShow() {
+			this.pagesNum = getCurrentPages().length
 			// 获取页面数据
 			this.getPageData()
 		},

+ 6 - 2
src/packageOperate/creator/index.vue

@@ -8,7 +8,7 @@
 		<u-navbar title="申请创客" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="申请创客" />
 		</view>
 		<view v-else>
@@ -81,8 +81,12 @@
 					areaId: '', // 区ID/编码
 					area: '', // 区
 				},
-				areaShow: false,
+				areaShow: false,
+				pagesNum: '',
 			}
+		},
+		onShow() {
+			this.pagesNum = getCurrentPages().length
 		},
 		methods: {
 

+ 5 - 1
src/packageOperate/process/index.vue

@@ -7,7 +7,7 @@
 		<u-navbar title="兑奖" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="兑奖" />
 		</view>
 		<view v-else>
@@ -44,9 +44,13 @@
 			return {
 				id: '',
 				info: {},
+				pagesNum: '',
 				picUrlArr: []
 			};
 		},
+		onShow() {
+			this.pagesNum = getCurrentPages().length
+		},
 		onLoad(options) {
 			this.id = options.id
 			this.getDetail()

+ 3 - 2
src/packageOperate/share/index.vue

@@ -7,7 +7,7 @@
 		<u-navbar title="分享" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="分享" />
 		</view>
 		<view v-else>
@@ -56,6 +56,7 @@
 				userInfo: {},
 				avatar: '',
 				boxId: '',
+				pagesNum: '',
 				// 图片数据
 				posterData: {
 					poster: {
@@ -103,8 +104,8 @@
 		onLoad(options) {
 			this.boxId = options.boxId
 		},
-
 		onShow() {
+			this.pagesNum = getCurrentPages().length
 			this.getUrl()
 			this.getBaseInfo()
 		},

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 2 - 1
src/packageOther/about/conceal.vue


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 2 - 1
src/packageOther/about/protect.vue


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 2 - 1
src/packageOther/rule/index.vue


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 2 - 1
src/packageOther/rule/purchase.vue


+ 5 - 1
src/packagePrize/address/index.vue

@@ -8,7 +8,7 @@
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="使用范围"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="使用范围" />
 		</view>
 		<view v-else>
@@ -70,9 +70,13 @@
 				info: {},
 				total: 0,
 				pageNum: 1,
+				pagesNum: '',
 				status: 'nomore', //上拉刷新状态
 			};
 		},
+		onShow() {
+			this.pagesNum = getCurrentPages().length
+		},
 		onLoad(options) {
 			this.couponId = options.couponId
 			this.pageList()

+ 3 - 1
src/packagePrize/bean/index.vue

@@ -7,7 +7,7 @@
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的盲豆"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的盲豆" />
 		</view>
 		<view v-else>
@@ -61,9 +61,11 @@
 				pageNum: 1,
 				total: 0,
 				list: [],
+				pagesNum: '',
 			};
 		},
 		onShow() {
+			this.pagesNum = getCurrentPages().length
 			this.getBean()
 			this.pageList()
 		},

+ 5 - 1
src/packagePrize/coupon/detail.vue

@@ -8,7 +8,7 @@
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="优惠券详情"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="优惠券详情" />
 		</view>
 		<view v-else>
@@ -97,8 +97,12 @@
 			return {
 				info: {},
 				id: null,
+				pagesNum: '',
 			};
 		},
+		onShow() {
+			this.pagesNum = getCurrentPages().length
+		},
 		onLoad(options) {
 			this.id = options.id
 			this.getDetail()

+ 3 - 1
src/packagePrize/coupon/use.vue

@@ -7,7 +7,7 @@
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="优惠券使用记录"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="优惠券使用记录" />
 		</view>
 		<view v-else>
@@ -83,9 +83,11 @@
 				pageNum: 1,
 				total: 0,
 				list: [],
+				pagesNum: '',
 			};
 		},
 		onShow() {
+			this.pagesNum = getCurrentPages().length
 			this.pageList()
 		},
 		methods: {

+ 5 - 1
src/packagePrize/goods/detail.vue

@@ -7,7 +7,7 @@
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="奖品详情"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="奖品详情" />
 		</view>
 		<view v-else>
@@ -72,8 +72,12 @@
 
 				payShow: false,
 				payInfo: {},
+				pagesNum: '',
 			};
 		},
+		onShow() {
+			this.pagesNum = getCurrentPages().length
+		},
 		onLoad(opthios) {
 			this.getDetail(opthios.id)
 			this.goodsId = opthios.id

+ 6 - 2
src/packagePrize/goods/index.vue

@@ -8,7 +8,7 @@
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="商品详情"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="商品详情" />
 		</view>
 		<view v-else>
@@ -86,9 +86,13 @@
 
 				payShow: false,
 				payInfo: {},
-				purchasePopupShow: false
+				purchasePopupShow: false,
+				pagesNum: '',
 			};
 		},
+		onShow() {
+			this.pagesNum = getCurrentPages().length
+		},
 		onLoad(opthios) {
 			this.getDetail(opthios.id)
 			this.goodsId = opthios.id

+ 4 - 2
src/packagePrize/prize/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<!-- #ifdef MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的仓库" leftIconSize="0"></u-navbar>
 		</view>
 		<view v-else>
@@ -13,7 +13,7 @@
 		</view>
 		<!-- #endif -->
 		<!-- #ifndef MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的仓库"></u-navbar>
 		</view>
 		<view v-else>
@@ -218,9 +218,11 @@
 				tipData: {},
 				payInfo: {},
 				// infoItem: {},
+				pagesNum: '',
 			};
 		},
 		onShow() {
+			this.pagesNum = getCurrentPages().length
 			this.pageList()
 			this.couponNum()
 		},

+ 5 - 1
src/packagePrize/purchase/index.vue

@@ -8,7 +8,7 @@
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="购买成功"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="购买成功" />
 		</view>
 		<view v-else>
@@ -42,8 +42,12 @@
 				boxId: 0,
 				orderId: 0,
 				picUrl: '',
+				pagesNum: '',
 			}
 		},
+		onShow() {
+			this.pagesNum = getCurrentPages().length
+		},
 		onLoad(opthios) {
 			this.boxId = opthios.boxId
 			this.orderId = opthios.orderId

+ 6 - 3
src/packagePrize/rolling/index.vue

@@ -11,7 +11,7 @@
 		</u-navbar>
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="抽奖中" />
 		</view>
 		<view v-else>
@@ -155,10 +155,13 @@
 				orderId: '',
 				ticketId: '',
 				rotateShow: true,
-				circularShow: true
+				circularShow: true,
+				pagesNum: '',
 			}
 		},
-
+		onShow() {
+			this.pagesNum = getCurrentPages().length
+		},
 		onLoad(options) {
 			if (options) {
 				this.boxId = options.boxId

+ 3 - 2
src/packagePrize/ticket/index.vue

@@ -7,7 +7,7 @@
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的盲票"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="我的盲票" />
 		</view>
 		<view v-else>
@@ -86,11 +86,12 @@
 				pageNum: 1,
 				total: 0,
 				list: [],
-
+				pagesNum: '',
 
 			};
 		},
 		onShow() {
+			this.pagesNum = getCurrentPages().length
 			this.pageList()
 		},
 		onLoad(){

+ 1 - 1
src/pages/login/code.vue

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

+ 5 - 1
src/pages/login/index.vue

@@ -7,7 +7,7 @@
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" title="登录"></u-navbar>
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" title="登录" />
 		</view>
 		<view v-else>
@@ -79,8 +79,12 @@
 				token: '',
 				checked: true,
 				appId: 1,
+				pagesNum: '',
 			};
 		},
+		onShow() {
+			this.pagesNum = getCurrentPages().length
+		},
 		created() {
 			this.appId = appId
 		},

+ 4 - 3
src/pages/ticketBox/detail.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="ticket-wrap">
 		<!-- #ifdef MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="盲票详情" leftIconSize="0"></u-navbar>
 		</view>
 		<view v-else>
@@ -14,7 +14,7 @@
 		</view>
 		<!-- #endif -->
 		<!-- #ifndef MP-ALIPAY -->
-		<view v-if="$pagesNum() > 1">
+		<view v-if="pagesNum > 1">
 			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="盲票详情"></u-navbar>
 		</view>
 		<view v-else>
@@ -157,9 +157,9 @@
 				prizeInfo: {},
 				userInfo: {},
 				loginState: false,
+				pagesNum: '',
 			};
 		},
-
 		onLoad(opthios) {
 			//票赢天下跳转
 			if (opthios.scene) {
@@ -232,6 +232,7 @@
 		},
 		
 		onShow() {
+			this.pagesNum = getCurrentPages().length
 			this.loginState = uni.getStorageSync('token') ? true : false
 			if(this.loginState) {
 				this.getBaseInfo()

+ 0 - 6
src/utils/util.js

@@ -48,12 +48,6 @@ export function toIndex() {
 	})
 }
 
-// 获取当前页面的历史路径数量
-export function pagesNum() {
-	let pagesNum = getCurrentPages().length
-	return pagesNum
-}
-
 /**
  * 解决两个数相加精度丢失问题
  * @param a

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů