zhengkaixin преди 2 години
родител
ревизия
2350e30aab
променени са 7 файла, в които са добавени 227 реда и са изтрити 228 реда
  1. BIN
      assets/img/equipmentPic.png
  2. BIN
      assets/img/loginLogo@1x.png
  3. 6 7
      config/.env.dev.js
  4. 1 1
      config/.env.prod.js
  5. 1 1
      config/.env.test.js
  6. 218 218
      pages.json
  7. 1 1
      pages/index/index.vue

BIN
assets/img/equipmentPic.png


BIN
assets/img/loginLogo@1x.png


+ 6 - 7
config/.env.dev.js

@@ -1,5 +1,5 @@
 const UNI_APP = {  
-	ProjectName :"荆力设备管理",
+	ProjectName :"设备管理",
 	//BASE_URL: 'http://192.168.77.162:8086/equipment-manage-server/',
 	BASE_URL:"https://equipment.xiaoxinda.com/equipment-manage-server/",
 	//IMG_URL:"http://www.jsrailway.com.cn/",
@@ -7,19 +7,18 @@ const UNI_APP = {
 	
 	//BASE_URL:'http://192.168.77.162:8081/railroad-server/',
 	//BASE_URL:'http://192.168.77.222:8086/railroad-server/',
-	PREFIX : "jp-Equipment-Jingli",
+	PREFIX : "jp-Equipment-Jingli_openid",
 	NODE_ENV :"dev",
 	SIMPLE_RUN:false,// 无视权限控制跳转页面   , 用于样式人员快速访问各种功能 ,快速测试等
 
 	
 	//openId:"oBA__5QB2nHNNef3xshMJ3GcR2Hw",
-	openId:"oBA__5UuQTRx5Q8h94bDPY-GO2SM",//zkx
-	//openId:"oBA__5UuQTRx5Q8h94bDPY-GO2SM---",
+	openId:"o0cz65_7xBJzDDhHxvCfCpFfcHjA",//zkx
 	//openId:"123456",//库管理
-	//openId:"123",// 项目部 - 审批1
+	openId:"123",// 项目部 - 审批1
 	//openId:"223",// 项目部 - 审批2
 	//openId:"323",// 项目部 - 审批3
-	//openId:"oBA__5fiKEszHSigQGwZbLCVbg5A",//杨所
+	//openId:"oBEnI6PiaBMNUMTnjT0ffT1R2JOk",//杨所
 	//openId:"oBEnI6N9gRq3xOVlw34JfYjhtB9k",//  伊明
 	
 	
@@ -28,7 +27,7 @@ const UNI_APP = {
 	//openId:"oK9Wr55J1J1eL6BqI2tW749NTxNU",//zq
 	//小鹏管家appid
 	//VUE_APP_WXAPPID:"wx7e70eb62a8459869",
-	VUE_APP_WXAPPID:"wx1052afafacae1c63",
+	VUE_APP_WXAPPID:"wx014362202dd87dd7",
 	VUE_APP_ALIAPPID:"2021003131641247",
 }  
 

+ 1 - 1
config/.env.prod.js

@@ -1,5 +1,5 @@
 const UNI_APP = {  	
-	ProjectName :"荆力设备管理",
+	ProjectName :"设备管理",
 	PREFIX : "jp-Equipment-Jingli",
 	
 //	BASE_URL:"http://47.98.231.198:8081/equipment-manage-server/",

+ 1 - 1
config/.env.test.js

@@ -1,6 +1,6 @@
 const UNI_APP = {  
 	PREFIX : "jp-Equipment-Jingli",
-	ProjectName :"荆力设备管理",
+	ProjectName :"设备管理",
 	
 	//BASE_URL:"http://47.98.231.198:8081/equipment-manage-server/",
     //BASE_URL: 'https://charging.xiaoxinda.com/charging-station-server/',

+ 218 - 218
pages.json

@@ -1,223 +1,223 @@
-{
-	
-	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/index/index",
-			"style": {}
-		}
-
-
-	],
-	"subPackages": [{
-			"root": "pages/projectDepartment",
-			"pages": [ {
-					"path": "exportApplication/exportApplication",
-					"style": {
-						//navigationBarTitleText": "",
-						"enablePullDownRefresh": false
-					}
-
-				}, {
-					"path": "exportApplication/deliveriedList",
-					"style": {
-						//navigationBarTitleText": "",
-						"enablePullDownRefresh": false
-					}
-
-				}, {
-					"path": "exportApplication/deliveryFrom",
-					"style": {
-						//navigationBarTitleText": "",
-						"enablePullDownRefresh": false
-					}
-
-				},
-				{
-					"path": "exportApplication/deliveryDetails",
-					"style": {
-						//navigationBarTitleText": "",
-						"enablePullDownRefresh": false
-					}
-
-				},
-				{
-					"path": "exportProcess/deliveryDetails",
-					"style": {
-						//navigationBarTitleText": "",
-						"enablePullDownRefresh": false
-					}
-
-				},
-				{
-					"path": "exportProcess/deliveryInfo",
-					"style": {
-						//navigationBarTitleText": "",
-						"enablePullDownRefresh": false
-					}
-
-				},
-				{
-					"path": "exportProcess/exportProcess",
-					"style": {
-						//navigationBarTitleText": "",
-						"enablePullDownRefresh": false
-					}
-
-				},
-				{
-					"path": "exportReturn/exportReturn",
-					"style": {
-						//navigationBarTitleText": "",
-						"enablePullDownRefresh": false
-					}
-
-				},
-				{
-					"path": "exportReturn/deliveryDetails",
-					"style": {
-						//navigationBarTitleText": "",
-						"enablePullDownRefresh": false
-					}
-
-				},
-				{
-					"path": "exportReturn/deliveryFrom",
-					"style": {
-						//navigationBarTitleText": "",
-						"enablePullDownRefresh": false
-					}
-
-				}
-
-				
-			]
-		},
-		{
-			"root": "pages/otherFunctions",
-			"pages": [{
-				"path": "messageCenter/messageCenter",
-				"style": {
-					//navigationBarTitleText": "",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "messageCenter/messageList",
-				"style": {
-					//navigationBarTitleText": "",
-					"enablePullDownRefresh": false
-				}
-
-			},
-		{
-			"path": "homePage",
-			"style": {}
-		},{
-			"path": "equipmentRetrieval/equipmentRetrieval",
-			"style": {
-				//navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "equipmentRetrieval/equipmentDetail",
-			"style": {
-				//navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "equipmentRetrieval/equipmentInfo",
-			"style": {
-				//navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}]
-		},
-		{
-			"root": "pages/storeManagement",
-			"pages": [{
-				"path": "equipmentDelivery/equipmentDelivery",
-				"style": {
-					//navigationBarTitleText": "",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "equipmentDelivery/deliveryDetails",
-				"style": {
-					//navigationBarTitleText": "",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "equipmentDelivery/deliveriedList",
-				"style": {
-					//navigationBarTitleText": "",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "equipmentEnter/equipmentEnter",
-				"style": {
-					//navigationBarTitleText": "",
-					"enablePullDownRefresh": false
-				}
-
+{
+	
+	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/index/index",
+			"style": {}
+		}
+
+
+	],
+	"subPackages": [{
+			"root": "pages/projectDepartment",
+			"pages": [ {
+					"path": "exportApplication/exportApplication",
+					"style": {
+						//navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "exportApplication/deliveriedList",
+					"style": {
+						//navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "exportApplication/deliveryFrom",
+					"style": {
+						//navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+
+				},
+				{
+					"path": "exportApplication/deliveryDetails",
+					"style": {
+						//navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+
+				},
+				{
+					"path": "exportProcess/deliveryDetails",
+					"style": {
+						//navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+
+				},
+				{
+					"path": "exportProcess/deliveryInfo",
+					"style": {
+						//navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+
+				},
+				{
+					"path": "exportProcess/exportProcess",
+					"style": {
+						//navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+
+				},
+				{
+					"path": "exportReturn/exportReturn",
+					"style": {
+						//navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+
+				},
+				{
+					"path": "exportReturn/deliveryDetails",
+					"style": {
+						//navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+
+				},
+				{
+					"path": "exportReturn/deliveryFrom",
+					"style": {
+						//navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+
+				}
+
+				
+			]
+		},
+		{
+			"root": "pages/otherFunctions",
+			"pages": [{
+				"path": "messageCenter/messageCenter",
+				"style": {
+					//navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "messageCenter/messageList",
+				"style": {
+					//navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+
+			},
+		{
+			"path": "homePage",
+			"style": {}
+		},{
+			"path": "equipmentRetrieval/equipmentRetrieval",
+			"style": {
+				//navigationBarTitleText": "",
+				"enablePullDownRefresh": false
 			}
-			// , {
-			// 	"path": "equipmentEnter/verification",
-			// 	"style": {
-			// 		//navigationBarTitleText": "",
-			// 		"enablePullDownRefresh": false
-			// 	}
+
+		}, {
+			"path": "equipmentRetrieval/equipmentDetail",
+			"style": {
+				//navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "equipmentRetrieval/equipmentInfo",
+			"style": {
+				//navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}]
+		},
+		{
+			"root": "pages/storeManagement",
+			"pages": [{
+				"path": "equipmentDelivery/equipmentDelivery",
+				"style": {
+					//navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "equipmentDelivery/deliveryDetails",
+				"style": {
+					//navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "equipmentDelivery/deliveriedList",
+				"style": {
+					//navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "equipmentEnter/equipmentEnter",
+				"style": {
+					//navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+
+			}
+			// , {
+			// 	"path": "equipmentEnter/verification",
+			// 	"style": {
+			// 		//navigationBarTitleText": "",
+			// 		"enablePullDownRefresh": false
+			// 	}
 			// }
-			// , {
-			// 	"path": "equipmentEnter/returnList",
-			// 	"style": {
-			// 		//navigationBarTitleText": "",
-			// 		"enablePullDownRefresh": false
-			// 	}
-
+			// , {
+			// 	"path": "equipmentEnter/returnList",
+			// 	"style": {
+			// 		//navigationBarTitleText": "",
+			// 		"enablePullDownRefresh": false
+			// 	}
+
 			// }
 			
-			, {
-				"path": "equipmentEnter/deliveryDetails",
-				"style": {
-					//navigationBarTitleText": "",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "equipmentInspection/equipmentInspection",
-				"style": {
-					//navigationBarTitleText": "",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "equipmentInspection/planDetail",
-				"style": {
-					//navigationBarTitleText": "",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "equipmentInspection/inspectionRecord",
-				"style": {
-					//navigationBarTitleText": "",
-					"enablePullDownRefresh": false
-				}
-
-			}]
-		}
-	],
-
-	"globalStyle": {
-		"navigationStyle": "custom", // 隐藏系统导航栏
-		"navigationBarTitleText": "荆力设备管理",
-		"enablePullDownRefresh": false
-	},
-	"uniIdRouter": {}
+			, {
+				"path": "equipmentEnter/deliveryDetails",
+				"style": {
+					//navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "equipmentInspection/equipmentInspection",
+				"style": {
+					//navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "equipmentInspection/planDetail",
+				"style": {
+					//navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "equipmentInspection/inspectionRecord",
+				"style": {
+					//navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+
+			}]
+		}
+	],
+
+	"globalStyle": {
+		"navigationStyle": "custom", // 隐藏系统导航栏
+		"navigationBarTitleText": "设备管理",
+		"enablePullDownRefresh": false
+	},
+	"uniIdRouter": {}
 }

+ 1 - 1
pages/index/index.vue

@@ -11,7 +11,7 @@
 			<img src="../../assets/img/loginLogo@1x.png" alt="">
 		</view>
 		<view class="title">
-			荆力设备管理系统
+			设备管理系统
 		</view>