lilei 2 gadi atpakaļ
vecāks
revīzija
2b40ac7a18

+ 2 - 2
App.vue

@@ -1,8 +1,8 @@
 <script>
 	export default {
 		globalData: {
-			baseUrl: 'http://192.168.0.215:9110/saas/clz/', // 本地
-			// baseUrl: 'https://md.test.zyucgj.com/saas/clz/', // 预发布
+			// baseUrl: 'http://192.168.0.215:9110/saas/clz/', // 本地
+			baseUrl: 'https://md.test.zyucgj.com/saas/clz/', // 预发布
 			// baseUrl: 'https://car.zyucgj.com/saas/clz/' // 生产
 		},
 		onLaunch: function() {

+ 148 - 137
pages.json

@@ -122,143 +122,7 @@
             }
             
         },
-		{
-		    "path" : "pages/digitalShelf/choosePart",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "选择配件",
-		        "enablePullDownRefresh": false
-		    }
-		}
-		,{
-		    "path" : "pages/digitalShelf/orderList",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "货架订单",
-		        "enablePullDownRefresh": false
-		    }
-		}
-		,{
-		    "path" : "pages/digitalShelf/orderDetail",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "订单详情",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-		,{
-		    "path" : "pages/digitalShelf/choosePartResult",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-		    }
-		    
-		}
-		,{
-		    "path" : "pages/digitalShelf/stockPut",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "补货记录",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-		,{
-		    "path" : "pages/digitalShelf/stockPutDetail",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "补货单详情",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-		,{
-		    "path" : "pages/digitalShelf/settlementManage/settlementManage",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "付款结算",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-		,{
-		    "path" : "pages/digitalShelf/settlementManage/settlementSxDetail",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "已用额度详情",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-		,{
-		    "path" : "pages/digitalShelf/settlementManage/settlementAyDetail",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "待结算详情",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-		,{
-		    "path" : "pages/digitalShelf/settlementRecord/settlementRecord",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "结算记录",
-		        "enablePullDownRefresh": false,
-				"titleView":false,
-				// 将回弹属性关掉
-				"bounce":"none"
-		    }
-		    
-		}
-		,{
-		    "path" : "pages/digitalShelf/settlementRecord/settlementDetail",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "结算详情",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-		,{
-		    "path" : "pages/digitalShelf/settlementRecord/orderPartDetail",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "订单详情",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-		,{
-		    "path" : "pages/digitalShelf/scanBarcode/scanBarcode",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "扫码拿货",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-        ,{
-            "path" : "pages/digitalShelf/tempOrderList/tempOrderList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "急送订单",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/digitalShelf/tempOrderList/orderDetail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "急送订单详情",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
+        {
             "path" : "pages/storeManage/addPerson",
             "style" :                                                                                    
             {
@@ -313,6 +177,153 @@
             
         }
     ],
+	"subPackages":[{
+		"root": "pagesA",
+		"pages":[
+			{
+			    "path" : "digitalShelf/choosePart",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "选择配件",
+			        "enablePullDownRefresh": false
+			    }
+			}
+			,{
+			    "path" : "digitalShelf/orderList",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "货架订单",
+			        "enablePullDownRefresh": false
+			    }
+			}
+			,{
+			    "path" : "digitalShelf/orderDetail",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "订单详情",
+			        "enablePullDownRefresh": false
+			    }
+			    
+			}
+			,{
+			    "path" : "digitalShelf/choosePartResult",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+			    }
+			    
+			}
+			,{
+			    "path" : "digitalShelf/stockPut",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "补货记录",
+			        "enablePullDownRefresh": false
+			    }
+			    
+			}
+			,{
+			    "path" : "digitalShelf/stockPutDetail",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "补货单详情",
+			        "enablePullDownRefresh": false
+			    }
+			    
+			}
+			,{
+			    "path" : "digitalShelf/settlementManage/settlementManage",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "付款结算",
+			        "enablePullDownRefresh": false
+			    }
+			    
+			}
+			,{
+			    "path" : "digitalShelf/settlementManage/settlementSxDetail",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "已用额度详情",
+			        "enablePullDownRefresh": false
+			    }
+			    
+			}
+			,{
+			    "path" : "digitalShelf/settlementManage/settlementAyDetail",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "待结算详情",
+			        "enablePullDownRefresh": false
+			    }
+			    
+			}
+			,{
+			    "path" : "digitalShelf/settlementRecord/settlementRecord",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "结算记录",
+			        "enablePullDownRefresh": false,
+					"titleView":false,
+					// 将回弹属性关掉
+					"bounce":"none"
+			    }
+			    
+			}
+			,{
+			    "path" : "digitalShelf/settlementRecord/settlementDetail",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "结算详情",
+			        "enablePullDownRefresh": false
+			    }
+			    
+			}
+			,{
+			    "path" : "digitalShelf/settlementRecord/orderPartDetail",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "订单详情",
+			        "enablePullDownRefresh": false
+			    }
+			    
+			}
+			,{
+			    "path" : "digitalShelf/scanBarcode/scanBarcode",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "扫码拿货",
+			        "enablePullDownRefresh": false
+			    }
+			    
+			}
+			,{
+			    "path" : "digitalShelf/tempOrderList/tempOrderList",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "急送订单",
+			        "enablePullDownRefresh": false
+			    }
+			    
+			}
+			,{
+			    "path" : "digitalShelf/tempOrderList/orderDetail",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "急送订单详情",
+			        "enablePullDownRefresh": false
+			    }
+			    
+			}
+		]
+	}],
+	"preloadRule": {
+		"pages/index/index": {
+			"network": "all",
+			"packages": ["pagesA"]
+		}
+	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",

+ 2 - 2
pages/index/index.vue

@@ -343,7 +343,7 @@
 			toOrder(){
 				if(this.hasShelf){
 					uni.navigateTo({
-						url: "/pages/digitalShelf/orderList"
+						url: "/pagesA/digitalShelf/orderList"
 					})
 				}else{
 					uni.showToast({
@@ -528,7 +528,7 @@
 			toChoosePart(item){
 				item.text = item.modelInfo
 				uni.navigateTo({
-					url: "/pages/digitalShelf/choosePart?vinNumber="+item.vinCode+"&carList="+encodeURIComponent(JSON.stringify(item))
+					url: "/pagesA/digitalShelf/choosePart?vinNumber="+item.vinCode+"&carList="+encodeURIComponent(JSON.stringify(item))
 				})
 			}
 		}

+ 5 - 5
pages/morePage/morePage.vue

@@ -17,7 +17,7 @@
 				<u-cell-item title="库存查询" v-if="$hasPermissions('M_stockQueryList_mini')" @click="toPage('/pages/stockQuery/stockQuery')" :title-style="{fontSize:'1em'}">
 					<text slot="icon"></text>
 				</u-cell-item>
-				<u-cell-item title="补货记录" v-if="$hasPermissions('M_stockPut_mini')" @click="toPage('/pages/digitalShelf/stockPut')" :title-style="{fontSize:'1em'}">
+				<u-cell-item title="补货记录" v-if="$hasPermissions('M_stockPut_mini')" @click="toPage('/pagesA/digitalShelf/stockPut')" :title-style="{fontSize:'1em'}">
 					<text slot="icon"></text>
 				</u-cell-item>
 			</u-cell-group>
@@ -27,10 +27,10 @@
 				<u-icon size="34" name="order"></u-icon> <text>订单管理</text>
 			</view>
 			<u-cell-group :border="false">
-				<u-cell-item title="货架订单" v-if="$hasPermissions('M_shelfOrder_mini')" @click="toPage('/pages/digitalShelf/orderList')" :title-style="{fontSize:'1em'}">
+				<u-cell-item title="货架订单" v-if="$hasPermissions('M_shelfOrder_mini')" @click="toPage('/pagesA/digitalShelf/orderList')" :title-style="{fontSize:'1em'}">
 					<text slot="icon"></text>
 				</u-cell-item>
-				<u-cell-item title="急送订单" v-if="$hasPermissions('M_tempShelfOrder_mini')" @click="toPage('/pages/digitalShelf/tempOrderList/tempOrderList')" :title-style="{fontSize:'1em'}">
+				<u-cell-item title="急送订单" v-if="$hasPermissions('M_tempShelfOrder_mini')" @click="toPage('/pagesA/digitalShelf/tempOrderList/tempOrderList')" :title-style="{fontSize:'1em'}">
 					<text slot="icon"></text>
 				</u-cell-item>
 			</u-cell-group>
@@ -40,10 +40,10 @@
 				<u-icon size="36" name="rmb-circle"></u-icon> <text>结算管理</text>
 			</view>
 			<u-cell-group :border="false">
-				<u-cell-item title="结算记录" v-if="$hasPermissions('M_settlementRecord_mini')" @click="toPage('/pages/digitalShelf/settlementRecord/settlementRecord')" :title-style="{fontSize:'1em'}">
+				<u-cell-item title="结算记录" v-if="$hasPermissions('M_settlementRecord_mini')" @click="toPage('/pagesA/digitalShelf/settlementRecord/settlementRecord')" :title-style="{fontSize:'1em'}">
 					<text slot="icon"></text>
 				</u-cell-item>
-				<u-cell-item title="付款结算" v-if="$hasPermissions('M_settlementManage_mini')" @click="toPage('/pages/digitalShelf/settlementManage/settlementManage')" :title-style="{fontSize:'1em'}">
+				<u-cell-item title="付款结算" v-if="$hasPermissions('M_settlementManage_mini')" @click="toPage('/pagesA/digitalShelf/settlementManage/settlementManage')" :title-style="{fontSize:'1em'}">
 					<text slot="icon"></text>
 				</u-cell-item>
 			</u-cell-group>

+ 1 - 1
pages/queryByCode/confirmQh.vue

@@ -74,7 +74,7 @@
 			toDetail(data){
 				uni.$emit("updateQueryByCodeList")
 				uni.redirectTo({
-					url: "/pages/digitalShelf/orderDetail?shelfOrderSn="+data.shelfOrderSn
+					url: "/pagesA/digitalShelf/orderDetail?shelfOrderSn="+data.shelfOrderSn
 				})
 			},
 			// 确认拿货

+ 1 - 1
pages/vinInput/confirmVin.vue

@@ -166,7 +166,7 @@
 							}
 							// 打开选择配件页面
 							uni.redirectTo({
-								url: "/pages/digitalShelf/choosePart?vinNumber="+vinNo+"&carList="+encodeURIComponent(JSON.stringify(res.data))
+								url: "/pagesA/digitalShelf/choosePart?vinNumber="+vinNo+"&carList="+encodeURIComponent(JSON.stringify(res.data))
 							})
 						} else {
 							uni.showModal({

+ 1 - 1
pages/vinRecord/vinRecord.vue

@@ -102,7 +102,7 @@
 			toChoosePart(item){
 				item.text = item.modelInfo
 				uni.navigateTo({
-					url: "/pages/digitalShelf/choosePart?vinNumber="+item.vinCode+"&carList="+encodeURIComponent(JSON.stringify(item))
+					url: "/pagesA/digitalShelf/choosePart?vinNumber="+item.vinCode+"&carList="+encodeURIComponent(JSON.stringify(item))
 				})
 			}
 		}

+ 3 - 3
pages/digitalShelf/choosePart.vue → pagesA/digitalShelf/choosePart.vue

@@ -229,7 +229,7 @@
 		<u-mask :show="showMask">
 			<view class="imageWarp flex flex_column justify_center align_center" style="width:100%;height:100vh;">
 				<view style="position: relative;">
-					<u-image src="/static/hb.png" width="700" height="657" @click="toSuccess"></u-image>
+					<u-image src="/pagesA/static/hb.png" width="700" height="657" @click="toSuccess"></u-image>
 					<view style="font-size: 60rpx;color:#fff;position: absolute;top:50%;text-align: center;width: 100%;">
 						{{tempData&&tempData.shelfOrder&&tempData.shelfOrder.totalRewardAmount||'0.00'}} <text style="font-size: 26rpx;margin-left: 10rpx;">元</text>
 					</view>
@@ -624,7 +624,7 @@
 						}else{
 							// 或失败
 							uni.redirectTo({
-								url:"/pages/digitalShelf/choosePartResult?data="+encodeURIComponent(JSON.stringify({shelfOrder:{remindMessage:res.message}}))+"&state=0"
+								url:"/pagesA/digitalShelf/choosePartResult?data="+encodeURIComponent(JSON.stringify({shelfOrder:{remindMessage:res.message}}))+"&state=0"
 							})
 						}
 						this.saveLoading = false
@@ -634,7 +634,7 @@
 			toSuccess(){
 				// 提交成功
 				uni.redirectTo({
-					url:"/pages/digitalShelf/choosePartResult?data="+encodeURIComponent(JSON.stringify(this.tempData))+"&state=1"
+					url:"/pagesA/digitalShelf/choosePartResult?data="+encodeURIComponent(JSON.stringify(this.tempData))+"&state=1"
 				})
 			}
 		}

+ 2 - 2
pages/digitalShelf/choosePartResult.vue → pagesA/digitalShelf/choosePartResult.vue

@@ -198,7 +198,7 @@
 		 // 扫码拿货
 		 toScan(){
 			 uni.redirectTo({
-			 	url:"/pages/digitalShelf/scanBarcode/scanBarcode?shelfOrderSn="+this.shelfOrderSn
+			 	url:"/pagesA/digitalShelf/scanBarcode/scanBarcode?shelfOrderSn="+this.shelfOrderSn
 			 })
 		 },
 		 // 一键拿货
@@ -228,7 +228,7 @@
 		 // 去结算
 		 toSettle(){
 			 uni.redirectTo({
-			 	url:"/pages/digitalShelf/settlementManage/settlementManage"
+			 	url:"/pagesA/digitalShelf/settlementManage/settlementManage"
 			 })
 		 },
 		 message(title){

+ 1 - 1
pages/digitalShelf/orderDetail.vue → pagesA/digitalShelf/orderDetail.vue

@@ -187,7 +187,7 @@
 		 // 打开扫描取货
 		 sanCodeRow () {
 			 uni.navigateTo({
-				url:"/pages/digitalShelf/scanBarcode/scanBarcode?shelfOrderSn="+this.shelfOrderSn
+				url:"/pagesA/digitalShelf/scanBarcode/scanBarcode?shelfOrderSn="+this.shelfOrderSn
 			 })
 		  },
 		  // 获取详情

+ 2 - 2
pages/digitalShelf/orderList.vue → pagesA/digitalShelf/orderList.vue

@@ -213,7 +213,7 @@
 			// 详细页
 			viewRow(item){
 				uni.navigateTo({
-					url: "/pages/digitalShelf/orderDetail?shelfOrderSn="+item.shelfOrderSn+"&state="+['FINISH','CLOSE'][this.swiperCurrent]
+					url: "/pagesA/digitalShelf/orderDetail?shelfOrderSn="+item.shelfOrderSn+"&state="+['FINISH','CLOSE'][this.swiperCurrent]
 				})
 			},
 			// 删除
@@ -254,7 +254,7 @@
 			// 打开扫描取货
 		   sanCodeRow (item) {
 			     uni.navigateTo({
-			     	url:"/pages/digitalShelf/scanBarcode/scanBarcode?shelfOrderSn="+item.shelfOrderSn
+			     	url:"/pagesA/digitalShelf/scanBarcode/scanBarcode?shelfOrderSn="+item.shelfOrderSn
 			     })
 		    },
 			// 一键取货

+ 0 - 0
pages/digitalShelf/scanBarcode/scanBarcode.vue → pagesA/digitalShelf/scanBarcode/scanBarcode.vue


+ 0 - 0
pages/digitalShelf/settlementManage/settlementAyDetail.vue → pagesA/digitalShelf/settlementManage/settlementAyDetail.vue


+ 3 - 3
pages/digitalShelf/settlementManage/settlementManage.vue → pagesA/digitalShelf/settlementManage/settlementManage.vue

@@ -74,7 +74,7 @@
 			// 结算记录
 			if(btns.index == 0){
 				uni.navigateTo({
-					url: "/pages/digitalShelf/settlementRecord/settlementRecord"
+					url: "/pagesA/digitalShelf/settlementRecord/settlementRecord"
 				})
 			}
 		},
@@ -110,11 +110,11 @@
 			viewDetail(month){
 				if(this.settlementType == 'CREDIT'){
 					uni.navigateTo({
-						url: "/pages/digitalShelf/settlementManage/settlementSxDetail?data="+encodeURIComponent(JSON.stringify(this.info))
+						url: "/pagesA/digitalShelf/settlementManage/settlementSxDetail?data="+encodeURIComponent(JSON.stringify(this.info))
 					})
 				}else{
 					uni.navigateTo({
-						url: "/pages/digitalShelf/settlementManage/settlementAyDetail?month="+month+"&data="+encodeURIComponent(JSON.stringify(this.info))
+						url: "/pagesA/digitalShelf/settlementManage/settlementAyDetail?month="+month+"&data="+encodeURIComponent(JSON.stringify(this.info))
 					})
 				}
 			}

+ 0 - 0
pages/digitalShelf/settlementManage/settlementSxDetail.vue → pagesA/digitalShelf/settlementManage/settlementSxDetail.vue


+ 0 - 0
pages/digitalShelf/settlementRecord/orderPartDetail.vue → pagesA/digitalShelf/settlementRecord/orderPartDetail.vue


+ 1 - 1
pages/digitalShelf/settlementRecord/settlementDetail.vue → pagesA/digitalShelf/settlementRecord/settlementDetail.vue

@@ -146,7 +146,7 @@
 				item.payDate = this.info.payDate
 				this.$u.vuex('vuex_settleOrderDetail', item)
 				uni.navigateTo({
-					url: "/pages/digitalShelf/settlementRecord/orderPartDetail"
+					url: "/pagesA/digitalShelf/settlementRecord/orderPartDetail"
 				})
 			}
 		}

+ 1 - 1
pages/digitalShelf/settlementRecord/settlementRecord.vue → pagesA/digitalShelf/settlementRecord/settlementRecord.vue

@@ -79,7 +79,7 @@
 				item.payTypeVal = this.filterpayType(item.payWay)
 				this.$u.vuex('vuex_settleRecordDetail', item)
 				uni.navigateTo({
-					url: "/pages/digitalShelf/settlementRecord/settlementDetail"
+					url: "/pagesA/digitalShelf/settlementRecord/settlementDetail"
 				})
 			}
 		},

+ 1 - 1
pages/digitalShelf/stockPut.vue → pagesA/digitalShelf/stockPut.vue

@@ -199,7 +199,7 @@
 			// 详细页
 			viewRow(item){
 				uni.navigateTo({
-					url: "/pages/digitalShelf/stockPutDetail?sn="+item.replenishBillSn
+					url: "/pagesA/digitalShelf/stockPutDetail?sn="+item.replenishBillSn
 				})
 			},
 			// 立即入库

+ 0 - 0
pages/digitalShelf/stockPutDetail.vue → pagesA/digitalShelf/stockPutDetail.vue


+ 1 - 1
pages/digitalShelf/tempOrderList/orderDetail.vue → pagesA/digitalShelf/tempOrderList/orderDetail.vue

@@ -139,7 +139,7 @@
 		 // 打开扫描拿货
 		 sanCodeRow () {
 			 uni.navigateTo({
-				url:"/pages/digitalShelf/scanBarcode/scanBarcode?shelfOrderSn="+this.shelfOrderSn
+				url:"/pagesA/digitalShelf/scanBarcode/scanBarcode?shelfOrderSn="+this.shelfOrderSn
 			 })
 		  },
 		  // 获取详情

+ 1 - 1
pages/digitalShelf/tempOrderList/tempOrderList.vue → pagesA/digitalShelf/tempOrderList/tempOrderList.vue

@@ -205,7 +205,7 @@
 			// 详细页
 			viewRow(item){
 				uni.navigateTo({
-					url: "/pages/digitalShelf/tempOrderList/orderDetail?orderSn="+item.tempSn+"&state="+(item.billState == 'FINISH'?1:0)
+					url: "/pagesA/digitalShelf/tempOrderList/orderDetail?orderSn="+item.tempSn+"&state="+(item.billState == 'FINISH'?1:0)
 				})
 			},
 			// 获取待拿货数量

+ 0 - 0
static/hb.png → pagesA/static/hb.png


BIN
static/codetemp.jpg