lilei hace 2 años
padre
commit
3c77456757
Se han modificado 4 ficheros con 23 adiciones y 23 borrados
  1. 18 18
      pages.json
  2. 2 2
      pages/index/index.vue
  3. 2 2
      pagesA/queryByCode/confirmQh.vue
  4. 1 1
      pagesA/queryByCode/queryByCode.vue

+ 18 - 18
pages.json

@@ -139,24 +139,6 @@
                 "enablePullDownRefresh": false
             }
             
-        }
-        ,{
-            "path" : "pages/queryByCode/queryByCode",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "按产品编码查询",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/queryByCode/confirmQh",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "确认拿货",
-                "enablePullDownRefresh": false
-            }
-            
         }
         ,{
             "path" : "pages/storeManage/priceSetting/priceSetting",
@@ -315,6 +297,24 @@
 			        "enablePullDownRefresh": false
 			    }
 			    
+			},
+			{
+			    "path" : "queryByCode/queryByCode",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "按产品编码查询",
+			        "enablePullDownRefresh": false
+			    }
+			    
+			}
+			,{
+			    "path" : "queryByCode/confirmQh",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "确认拿货",
+			        "enablePullDownRefresh": false
+			    }
+			    
 			}
 		]
 	}],

+ 2 - 2
pages/index/index.vue

@@ -453,7 +453,7 @@
 										const params = Object.assign({shelfSn: shelfSn, billSource: billSource},res.data)
 										_this.$store.state.vuex_tempData = params
 										uni.navigateTo({
-											url: '/pages/queryByCode/confirmQh'
+											url: '/pagesA/queryByCode/confirmQh'
 										})
 									}else{
 										uni.showModal({
@@ -478,7 +478,7 @@
 				}else{
 					// 按编码搜索
 					uni.navigateTo({
-						url: '/pages/queryByCode/queryByCode'
+						url: '/pagesA/queryByCode/queryByCode'
 					})
 				}
 			},

+ 2 - 2
pages/queryByCode/confirmQh.vue → pagesA/queryByCode/confirmQh.vue

@@ -87,12 +87,12 @@
 			toDetail(data){
 				uni.$emit("updateQueryByCodeList")
 				uni.redirectTo({
-					url: "/pagesA/digitalShelf/orderDetail?shelfOrderSn="+data.shelfOrderSn
+					url: "/pagesA/digitalShelf/orderDetail?shelfOrderSn="+this.tempData.shelfOrderSn
 				})
 			},
 			showRedModal(data){
+				this.tempData = data
 				if(data.totalRewardAmount){
-					this.tempData = data
 					this.showMask = true
 				}else{
 				    this.toDetail(data)

+ 1 - 1
pages/queryByCode/queryByCode.vue → pagesA/queryByCode/queryByCode.vue

@@ -102,7 +102,7 @@
 					}
 					this.$store.state.vuex_tempData = Object.assign(params, item)
 					uni.navigateTo({
-						url: '/pages/queryByCode/confirmQh'
+						url: '/pagesA/queryByCode/confirmQh'
 					})
 				}else{
 					uni.showToast({