Ver código fonte

Merge branch 'develop_szhj05' of http://git.chelingzhu.com/jianguan-web/qpls-md-app into develop_szhj05

chenrui 2 anos atrás
pai
commit
f8eb3eb805
4 arquivos alterados com 22 adições e 20 exclusões
  1. 1 3
      App.vue
  2. 2 1
      manifest.json
  3. 18 15
      pages/replenishmentManage/confirm.vue
  4. 1 1
      pages/statistics/chooseShelf.vue

+ 1 - 3
App.vue

@@ -54,8 +54,6 @@
 						});
 					}
 				})
-				// 清空角标
-				skJGPush.setBadge(0)
 			}else{
 				// 极光推送-init
 				skJGPush.initJPushService()
@@ -83,7 +81,7 @@
 					}
 				}else{
 					// 清空角标
-					skJGPush.setBadge(0)
+					skJGPush.setBadge(1)
 				}
 			})
 			

+ 2 - 1
manifest.json

@@ -54,7 +54,8 @@
         },
         /* 模块配置 */
         "modules" : {
-            "Bluetooth" : {}
+            "Bluetooth" : {},
+            "Push" : {}
         },
         /* 应用发布信息 */
         "distribute" : {

+ 18 - 15
pages/replenishmentManage/confirm.vue

@@ -114,22 +114,25 @@
 					replenishBillNo: this.listdata[0].replenishBillNo,
 					detailList: arr
 				}
-				this.loading = true
+				// this.loading = true
 				// 校验产品库存是否足够
-				shelfReplenishDetailStock(params).then(res => {
-					if (res.status == 200) {
-						if (res.data && res.data.length > 0) {
-							this.stockList = res.data || []
-							this.paramsData = params
-							this.confirmModal = false
-							this.stockModal = true
-							this.loading = false
-						} else {
-							this.confirmModal = false
-							this.confirmFun(params)
-						}
-					}
-				})
+				// shelfReplenishDetailStock(params).then(res => {
+				// 	if (res.status == 200) {
+				// 		if (res.data && res.data.length > 0) {
+				// 			this.stockList = res.data || []
+				// 			this.paramsData = params
+				// 			this.confirmModal = false
+				// 			this.stockModal = true
+				// 			this.loading = false
+				// 		} else {
+				// 			this.confirmModal = false
+				// 			this.confirmFun(params)
+				// 		}
+				// 	}
+				// })
+				
+				this.confirmModal = false
+				this.confirmFun(params)
 			},
 			// 提交确认
 			confirmFun (params) {

+ 1 - 1
pages/statistics/chooseShelf.vue

@@ -49,7 +49,7 @@
 				isGobleSearch: false,
 				shelfList: [],
 				pageNo:1,
-				pageSize: 10,
+				pageSize: 30,
 				total: 0, // 列表总数
 				noDataText: '暂无货架',
 				status: 'loading',