guhongwei 2 anos atrás
pai
commit
18fa9b49ba

+ 31 - 0
components/mobile-frame/index.vue

@@ -32,6 +32,8 @@
 		},
 		created: function() {
 			const that = this;
+			// 强制更新
+			that.forceUpdate();
 			that.search()
 		},
 		methods: {
@@ -65,6 +67,35 @@
 				const that = this;
 				that.$set(that, `active`, index);
 				that.$emit('toPath', item)
+			},
+			// 强制更新
+			forceUpdate() {
+				// const updateManager = uni.getUpdateManager();
+				// updateManager.onCheckForUpdate(function(res) {
+				// 	// 请求完新版本信息的回调
+				// 	console.log(res.hasUpdate);
+				// 	console.log('3');
+				// 	console.log('更新');
+				// });
+				// updateManager.onUpdateReady(function(res) {
+				// 	uni.showModal({
+				// 		title: '更新提示',
+				// 		content: '新版本已经准备好,是否重启应用?',
+				// 		success(res) {
+				// 			if (res.confirm) {
+				// 				console.log('2');
+				// 				console.log('更新确定');
+				// 				updateManager.applyUpdate();
+				// 			}
+				// 		}
+				// 	});
+
+				// });
+
+				// updateManager.onUpdateFailed(function(res) {
+				// 	console.log('1');
+				// 	console.log('失败');
+				// });
 			}
 		}
 	}

+ 1 - 1
pages/home/index.vue

@@ -106,7 +106,7 @@
 				],
 				total: 0,
 				skip: 0,
-				limit: 6,
+				limit: 10,
 				page: 0,
 				// 返回顶部
 				scrollTop: 0,

+ 1 - 1
pages/store/index.vue

@@ -52,7 +52,7 @@
 				total: 0,
 				page: 0,
 				skip: 0,
-				limit: 6,
+				limit: 10,
 			};
 		},
 		onLoad: async function() {

+ 1 - 1
pages/week/index.vue

@@ -77,7 +77,7 @@
 				total: 0,
 				page: 0,
 				skip: 0,
-				limit: 6,
+				limit: 10,
 				// 数据是否触底
 				is_bottom: false,
 				scrollTop: 0,

+ 1 - 1
pagesHome/exchange/index.vue

@@ -29,7 +29,7 @@
 				list: [],
 				total: 0,
 				skip: 0,
-				limit: 6,
+				limit: 10,
 				page: 0,
 				// 数据是否触底
 				is_bottom: false,

+ 1 - 1
pagesHome/group/index.vue

@@ -111,7 +111,7 @@
 				num: 1,
 				total: 0,
 				skip: 0,
-				limit: 6,
+				limit: 10,
 				page: 0
 			};
 		},

+ 1 - 1
pagesHome/market/search.vue

@@ -79,7 +79,7 @@
 				total: 0,
 				page: 0,
 				skip: 0,
-				limit: 6,
+				limit: 10,
 				condActive: 0,
 				shang: '',
 				xia: '',

+ 1 - 1
pagesHome/market/type.vue

@@ -72,7 +72,7 @@
 				total: 0,
 				page: 0,
 				skip: 0,
-				limit: 6,
+				limit: 10,
 				// 数据是否触底
 				is_bottom: false,
 				scrollTop: 0,

+ 1 - 1
pagesHome/order/appraise.vue

@@ -86,7 +86,7 @@
 				list: [],
 				total: 0,
 				skip: 0,
-				limit: 6,
+				limit: 10,
 				page: 0,
 				one: [],
 				two: [],

+ 1 - 1
pagesHome/shop/index.vue

@@ -169,7 +169,7 @@
 				total: 0,
 				page: 0,
 				skip: 0,
-				limit: 6,
+				limit: 10,
 				condActive: 0,
 				shang: '',
 				xia: '',

+ 1 - 1
pagesIntegral/home/index.vue

@@ -45,7 +45,7 @@
 				total: 0,
 				page: 0,
 				skip: 0,
-				limit: 6,
+				limit: 10,
 				// 数据是否触底
 				is_bottom: false,
 				scrollTop: 0

+ 1 - 1
pagesIntegral/record/index.vue

@@ -66,7 +66,7 @@
 				list: [],
 				total: 0,
 				skip: 0,
-				limit: 6,
+				limit: 10,
 				page: 0,
 				// 状态
 				statusList: [],

+ 1 - 1
pagesMy/address/index.vue

@@ -60,7 +60,7 @@
 				list: [],
 				total: 0,
 				skip: 0,
-				limit: 6,
+				limit: 10,
 				page: 0,
 				// 数据是否触底
 				is_bottom: false,

+ 1 - 1
pagesMy/assets/index.vue

@@ -45,7 +45,7 @@
 				list: [],
 				total: 0,
 				skip: 0,
-				limit: 6,
+				limit: 10,
 				page: 0,
 				// 来源
 				sourceList: [],

+ 1 - 1
pagesMy/collection/market.vue

@@ -95,7 +95,7 @@
 				list: [],
 				total: 0,
 				skip: 0,
-				limit: 6,
+				limit: 10,
 				page: 0,
 				condActive: 0,
 				shang: '',

+ 1 - 1
pagesMy/collection/shop.vue

@@ -89,7 +89,7 @@
 				list: [],
 				total: 0,
 				skip: 0,
-				limit: 6,
+				limit: 10,
 				page: 0,
 				condActive: 0,
 				shang: '',

+ 1 - 1
pagesMy/discount/index.vue

@@ -32,7 +32,7 @@
 				list: [],
 				total: 0,
 				skip: 0,
-				limit: 6,
+				limit: 10,
 				page: 0,
 				// 数据是否触底
 				is_bottom: false,

+ 1 - 1
pagesMy/dough/index.vue

@@ -69,7 +69,7 @@
 				list: [],
 				total: 0,
 				skip: 0,
-				limit: 6,
+				limit: 10,
 				page: 0,
 				statusList: [],
 				tabs: {

+ 1 - 1
pagesMy/integral/index.vue

@@ -41,7 +41,7 @@
 				list: [],
 				total: 0,
 				skip: 0,
-				limit: 6,
+				limit: 10,
 				page: 0,
 				// 状态
 				statusList: [],

+ 1 - 1
pagesMy/order/after.vue

@@ -74,7 +74,7 @@
 				typeList: [],
 				total: 0,
 				skip: 0,
-				limit: 6,
+				limit: 10,
 				page: 0,
 				tabs: {
 					active: '0',

+ 1 - 1
pagesMy/order/index.vue

@@ -172,7 +172,7 @@
 				list: [],
 				total: 0,
 				skip: 0,
-				limit: 6,
+				limit: 10,
 				page: 0,
 				// 数据是否触底
 				is_bottom: false,

+ 1 - 1
pagesRest/activity/info.vue

@@ -48,7 +48,7 @@
 				total: 0,
 				page: 0,
 				skip: 0,
-				limit: 6,
+				limit: 10,
 				// 数据是否触底
 				is_bottom: false,
 				scrollTop: 0,

+ 1 - 1
pagesRest/activity/list.vue

@@ -40,7 +40,7 @@
 				total: 0,
 				page: 0,
 				skip: 0,
-				limit: 6,
+				limit: 10,
 				// 数据是否触底
 				is_bottom: false,
 				scrollTop: 0,

+ 1 - 1
pagesRest/recom/index.vue

@@ -42,7 +42,7 @@
 				total: 0,
 				page: 0,
 				skip: 0,
-				limit: 6,
+				limit: 10,
 				// 数据是否触底
 				is_bottom: false,
 				scrollTop: 0,