ソースを参照

新增版本更新功能

chensibo 1 週間 前
親
コミット
962e550a53
6 ファイル変更、1482 行追加、1336 行削除
  1. 83 83
      api/api.js
  2. 5 0
      api/interface/MES/user.js
  3. 2 2
      manifest.json
  4. 912 889
      pages.json
  5. 427 362
      pages/tabbar/homePage.vue
  6. 53 0
      unit/updateApp.js

+ 83 - 83
api/api.js

@@ -1,85 +1,85 @@
-import prodction from "./interface/production.js"
-import materialRegister from "./interface/materialRegister.js"
-import feeding from "./interface/feeding.js"
-import materialLocation from "./interface/materialLocation.js"
-import materialSplitOrMerge from "./interface/materialSplitOrMerge.js"
-import productionIssue from "./interface/productionIssue.js"
-import trestle from "./interface/trestle.js"
-import box from "./interface/box.js"
-import ipqc from "./interface/ipqc.js"
-import oqc from "./interface/fqc.js"
-import cutting from "./interface/cutting.js"
-import process from "./interface/process.js"
-import moldPerveser from "./interface/MES/moldPerveser.js"
-import user from "./interface/MES/user.js"
-import outSourceMaterial from "./interface/WMS/outSourceMaterial.js"
-import returnMaterial from "./interface/WMS/returnMaterial.js"
-import semiFinishedProducts from "./interface/WMS/semiFinishedProducts.js"
-import deliveryNote from "./interface/WMS/deliveryNote.js"
-import shipment from "./interface/MES/shipment.js"
-import codeSplit from "./interface/codeSplit.js"
-import codeMerge from "./interface/codeMerge.js"
-import shipmentMHT from "./interface/MES/shipmentMHT.js"
-import scanInOut from "./interface/scanInOut.js"
-import inventory from "./interface/inventory.js"
+import prodction from "./interface/production.js";
+import materialRegister from "./interface/materialRegister.js";
+import feeding from "./interface/feeding.js";
+import materialLocation from "./interface/materialLocation.js";
+import materialSplitOrMerge from "./interface/materialSplitOrMerge.js";
+import productionIssue from "./interface/productionIssue.js";
+import trestle from "./interface/trestle.js";
+import box from "./interface/box.js";
+import ipqc from "./interface/ipqc.js";
+import oqc from "./interface/fqc.js";
+import cutting from "./interface/cutting.js";
+import process from "./interface/process.js";
+import moldPerveser from "./interface/MES/moldPerveser.js";
+import user from "./interface/MES/user.js";
+import outSourceMaterial from "./interface/WMS/outSourceMaterial.js";
+import returnMaterial from "./interface/WMS/returnMaterial.js";
+import semiFinishedProducts from "./interface/WMS/semiFinishedProducts.js";
+import deliveryNote from "./interface/WMS/deliveryNote.js";
+import shipment from "./interface/MES/shipment.js";
+import codeSplit from "./interface/codeSplit.js";
+import codeMerge from "./interface/codeMerge.js";
+import shipmentMHT from "./interface/MES/shipmentMHT.js";
+import scanInOut from "./interface/scanInOut.js";
+import inventory from "./interface/inventory.js";
 
 export const api = {
-	...prodction,
-	...materialRegister,
-	...feeding,
-	...materialLocation,
-	...materialSplitOrMerge,
-	...productionIssue,
-	...trestle,
-	...box,
-	...ipqc,
-	...oqc,
-	...cutting,
-	...process,
-	...moldPerveser,
-	...user,
-	...outSourceMaterial,
-	...deliveryNote,
-	...shipment,
-	...returnMaterial,
-	...semiFinishedProducts,
-	...codeSplit,
-	...codeMerge,
-	...shipmentMHT,
-	...scanInOut,
-	...inventory,
-	// 默认请求就是get请求
-	login: {
-		url: '/admin-api/system/auth/login',
-		name: '用户登录',
-		method: 'POST'
-	},
-	// 默认请求就是get请求
-	loginInfo: {
-		url: '/admin-api/system/auth/get-permission-info',
-		name: '用户详情',
-		method: 'GET'
-	},
-	// 查询字典接口
-	getDictDataPage: {
-		url: '/admin-api/system/dict-data/page',
-		name: '字典详情',
-		method: 'GET'
-	},
-	// 查询字典接口(全量)
-	getDictDataAllPage: {
-		url: '/admin-api/system/dict-data/list-all-simple',
-		name: '字典列表',
-		method: 'GET'
-	},
-	getEmployeeDetail: {
-		url: '/admin-api/mes/employee-master/get',
-		name: '根据员工ID(或加密后)获取员工信息',
-		method: 'GET'
-	},
-	getEquipmentBaseDetail: {
-		url: '/admin-api/etm/equipment-base/get',
-		name: '根据设备ID获取设备信息',
-		method: 'GET'
-	},
-}
+  ...prodction,
+  ...materialRegister,
+  ...feeding,
+  ...materialLocation,
+  ...materialSplitOrMerge,
+  ...productionIssue,
+  ...trestle,
+  ...box,
+  ...ipqc,
+  ...oqc,
+  ...cutting,
+  ...process,
+  ...moldPerveser,
+  ...user,
+  ...outSourceMaterial,
+  ...deliveryNote,
+  ...shipment,
+  ...returnMaterial,
+  ...semiFinishedProducts,
+  ...codeSplit,
+  ...codeMerge,
+  ...shipmentMHT,
+  ...scanInOut,
+  ...inventory,
+  // 默认请求就是get请求
+  login: {
+    url: "/admin-api/system/auth/login",
+    name: "用户登录",
+    method: "POST",
+  },
+  // 默认请求就是get请求
+  loginInfo: {
+    url: "/admin-api/system/auth/get-permission-info",
+    name: "用户详情",
+    method: "GET",
+  },
+  // 查询字典接口
+  getDictDataPage: {
+    url: "/admin-api/system/dict-data/page",
+    name: "字典详情",
+    method: "GET",
+  },
+  // 查询字典接口(全量)
+  getDictDataAllPage: {
+    url: "/admin-api/system/dict-data/list-all-simple",
+    name: "字典列表",
+    method: "GET",
+  },
+  getEmployeeDetail: {
+    url: "/admin-api/mes/employee-master/get",
+    name: "根据员工ID(或加密后)获取员工信息",
+    method: "GET",
+  },
+  getEquipmentBaseDetail: {
+    url: "/admin-api/etm/equipment-base/get",
+    name: "根据设备ID获取设备信息",
+    method: "GET",
+  },
+};

+ 5 - 0
api/interface/MES/user.js

@@ -9,4 +9,9 @@ export default {
 		name: '获取mes系统用户详情',
 		method: 'GET'
 	},
+	getAppVs: {
+		url: '/admin-api/rtkwms/pda-vs/getLatestVersion',
+		name: '获取APP最新版本',
+		method: 'GET'
+	},
 }

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "东智MOM",
     "appid" : "__UNI__9190AB0",
     "description" : "",
-    "versionName" : "1.0.2",
-    "versionCode" : 1001,
+    "versionName" : "1.0.4",
+    "versionCode" : 261020,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

+ 912 - 889
pages.json

@@ -1,890 +1,913 @@
 {
-	"pages": [{
-			"path": "pages/login/loginPage",
-			"style": {
-				"navigationBarTitleText": "用户登录",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/tabbar/homePage",
-			"style": {
-				"navigationBarTitleText": "首页",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/tabbar/workBranch",
-			"style": {
-				"navigationBarTitleText": "工作台",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/system/bluetooth",
-			"style": {
-				"navigationBarTitleText": "蓝牙连接",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/system/bluetoothConfig",
-			"style": {
-				"navigationBarTitleText": "蓝牙配置",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/production/prepareMaterials",
-			"style": {
-				"navigationBarTitleText": "用料单备料",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/production/scanMaterials",
-			"style": {
-				"navigationBarTitleText": "用料单备料",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/production/materialIssuance",
-			"style": {
-				"navigationBarTitleText": "生成发料单",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/production/scanMixMaterials",
-			"style": {
-				"navigationBarTitleText": "多单备料",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/production/mixMaterialDetail",
-			"style": {
-				"navigationBarTitleText": "多单备料支援明细",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/materialRegister/registerType",
-			"style": {
-				"navigationBarTitleText": "登记类型",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/materialRegister/Scan/materialScanRegister",
-			"style": {
-				"navigationBarTitleText": "来料登记(扫码登记)",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/materialRegister/Input/materialInputRegister",
-			"style": {
-				"navigationBarTitleText": "来料登记(手填登记)",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/materialRegister/Input/materialInfoDetails",
-			"style": {
-				"navigationBarTitleText": "来料登记(手填登记->登记详情)",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/materialRegister/Record/registerRecord",
-			"style": {
-				"navigationBarTitleText": "登记记录",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/materialRegister/Record/recordPrint",
-			"style": {
-				"navigationBarTitleText": "登记记录->打印标签",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/feeding/shelfType",
-			"style": {
-				"navigationBarTitleText": "上架类型",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/feeding/incomingPage",
-			"style": {
-				"navigationBarTitleText": "来料上架",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/feeding/productionPage",
-			"style": {
-				"navigationBarTitleText": "产品上架",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/feeding/returnPage",
-			"style": {
-				"navigationBarTitleText": "退料上架",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/warehousing/warehousingType",
-			"style": {
-				"navigationBarTitleText": "入库操作",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/warehousing/warehousingApplication",
-			"style": {
-				"navigationBarTitleText": "入库单申请",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/warehousing/warehousingSign",
-			"style": {
-				"navigationBarTitleText": "入库单签收",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/SemiFinishedProducts/indexPage",
-			"style": {
-				"navigationBarTitleText": "半成品流转",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/SemiFinishedProducts/SemiFinishedProtuctsEntry",
-			"style": {
-				"navigationBarTitleText": "半成品流转入库",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/SemiFinishedProducts/SemiFinishedProtuctsSign",
-			"style": {
-				"navigationBarTitleText": "半成品流转入库签收",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/SemiFinishedProducts/list",
-			"style": {
-				"navigationBarTitleText": "半成品流转已签收列表",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/returnMaterial/returnMaterialType",
-			"style": {
-				"navigationBarTitleText": "退料操作",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/returnMaterial/returnMaterialApplication",
-			"style": {
-				"navigationBarTitleText": "退料单申请",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/returnMaterial/returnMaterialSign",
-			"style": {
-				"navigationBarTitleText": "退料单签收",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/location/locationPage",
-			"style": {
-				"navigationBarTitleText": "货位调整",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/trestle/trestleList",
-			"style": {
-				"navigationBarTitleText": "栈板拆合",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/trestle/boxNumberStacking",
-			"style": {
-				"navigationBarTitleText": "箱号合栈",
-				"navigationStyle": "custom",
-				"enablePullDownRefresh": false,
-				"onReachBottomDistance": 50, //50代表距离底部多少的距离 这个根据自己的需求 一般都是50
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/trestle/boxNumberOutStacking",
-			"style": {
-				"navigationBarTitleText": "箱号出栈",
-				"navigationStyle": "custom",
-				"enablePullDownRefresh": false,
-				"onReachBottomDistance": 50, //50代表距离底部多少的距离 这个根据自己的需求 一般都是50
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/trestle/trestleDetails",
-			"style": {
-				"navigationBarTitleText": "栈板详情",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/box/boxList",
-			"style": {
-				"navigationBarTitleText": "箱号拆合",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/box/boxSplit",
-			"style": {
-				"navigationBarTitleText": "拆箱",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/box/boxMerge",
-			"style": {
-				"navigationBarTitleText": "装箱",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/materialDisass/materialWorkBranch",
-			"style": {
-				"navigationBarTitleText": "物料拆合批",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/materialDisass/materialSplit",
-			"style": {
-				"navigationBarTitleText": "物料拆分",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/materialDisass/materialMerge",
-			"style": {
-				"navigationBarTitleText": "物料合并",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/productionIssue/productionIssue",
-			"style": {
-				"navigationBarTitleText": "生产发料",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/productionIssue/demandDetails",
-			"style": {
-				"navigationBarTitleText": "需求明细",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/productionIssue/issuePage",
-			"style": {
-				"navigationBarTitleText": "发料",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/productionIssue/currentIssueRecord",
-			"style": {
-				"navigationBarTitleText": "本次发料记录",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/productionIssue/issueRecord",
-			"style": {
-				"navigationBarTitleText": "发料记录",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/productionIssue/issueDetails",
-			"style": {
-				"navigationBarTitleText": "发料明细",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/production/glue/indexPage",
-			"style": {
-				"navigationBarTitleText": "点胶管理",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/production/IPQC/ipqcList",
-			"style": {
-				"navigationBarTitleText": "IPQC单据",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/production/IPQC/ipqcCheckout",
-			"style": {
-				"navigationBarTitleText": "IPQC检验",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/production/FQC/fqcList",
-			"style": {
-				"navigationBarTitleText": "销售单列表",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/production/FQC/fqcCheckout",
-			"style": {
-				"navigationBarTitleText": "FQC检验",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/production/cutting/cuttingList",
-			"style": {
-				"navigationBarTitleText": "分切单列表",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/production/cutting/cuttingCheckout",
-			"style": {
-				"navigationBarTitleText": "分切",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/production/cutting/cuttingMaterialPreparation",
-			"style": {
-				"navigationBarTitleText": "分切备料",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/deliveryNote/deliveryNoteList",
-			"style": {
-				"navigationBarTitleText": "送货单回签-待回签列表",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/deliveryNote/deliveryNoteDetail",
-			"style": {
-				"navigationBarTitleText": "送货单回签-待回签明细",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/production/processExecution/processList",
-			"style": {
-				"navigationBarTitleText": "生产工单列表",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/production/processExecution/processFullInspection",
-			"style": {
-				"navigationBarTitleText": "后段工序-全检执行",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/production/processExecution/processDetails",
-			"style": {
-				"navigationBarTitleText": "工单明细",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/production/processExecution/processExecution",
-			"style": {
-				"navigationBarTitleText": "工单执行",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/production/processExecution/processPosteriorSegment",
-			"style": {
-				"navigationBarTitleText": "后段工序",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/production/processExecution/takePhoto",
-			"style": {
-				"navigationBarTitleText": "生产结束",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/ETM/moldPreserve/indexPage",
-			"style": {
-				"navigationBarTitleText": "模具保养",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/ETM/moldPreserve/moldDetails",
-			"style": {
-				"navigationBarTitleText": "保养明细",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/ETM/moldPreserve/moldAdd",
-			"style": {
-				"navigationBarTitleText": "新增保养",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/tabbar/printTest",
-			"style": {
-				"navigationBarTitleText": "打印测试",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/outSourceMaterial/outSourceList",
-			"style": {
-				"navigationBarTitleText": "委外备料列表",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/outSourceMaterial/outSourceMaterials",
-			"style": {
-				"navigationBarTitleText": "委外备料",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/production/shipment/shipmentPage",
-			"style": {
-				"navigationBarTitleText": "出货打标签",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/production/shipment/shipmentPatchworkPage",
-			"style": {
-				"navigationBarTitleText": "出货单列表",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/production/shipment/shipmentOrderInfoDetails",
-			"style": {
-				"navigationBarTitleText": "出货单信息",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/production/shipment/shipmentPackingDetails",
-			"style": {
-				"navigationBarTitleText": "装箱/未装箱明细",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/production/shipmentMHT/shipmentPage",
-			"style": {
-				"navigationBarTitleText": "销售出货(麦禾田)",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/production/shipmentMHT/shipmentProduct",
-			"style": {
-				"navigationBarTitleText": "销售出货(麦禾田)->成品列表",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/codeSplitOrMerge/codeSplit",
-			"style": {
-				"navigationBarTitleText": "条码拆分",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/codeSplitOrMerge/codeMerge",
-			"style": {
-				"navigationBarTitleText": "条码合并",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/coldStorage/indexPage",
-			"style": {
-				"navigationBarTitleText": "出入冷库",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/scanInOut/scanInOutType",
-			"style": {
-				"navigationBarTitleText": "扫码出入库",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/scanInOut/Out/scanOutPage",
-			"style": {
-				"navigationBarTitleText": "扫码出库",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/Inventory/inventoryPage",
-			"style": {
-				"navigationBarTitleText": "盘点",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/Inventory/inventoryDetail",
-			"style": {
-				"navigationBarTitleText": "盘点明细",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/scanInOut/Out/scannedMaterials",
-			"style": {
-				"navigationBarTitleText": "扫码物料",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/scanInOut/Out/materialsDetail",
-			"style": {
-				"navigationBarTitleText": "物料明细",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/scanInOut/In/scanInPage",
-			"style": {
-				"navigationBarTitleText": "扫码入库",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/scanInOut/In/scannedMaterials",
-			"style": {
-				"navigationBarTitleText": "扫码物料",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/scanInOut/In/businessType3/returnMaterial",
-			"style": {
-				"navigationBarTitleText": "扫码物料(生产退料的时候)",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/scanInOut/In/businessType3/businessType3Detail",
-			"style": {
-				"navigationBarTitleText": "扫码明细(生产退料的时候)",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/workbranch/warehouse/scanInOut/In/materialsDetail",
-			"style": {
-				"navigationBarTitleText": "物料明细",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/tabbar/personCenter",
-			"style": {
-				"navigationBarTitleText": "个人中心",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"background": "#FFFFFF"
-				}
-			}
-		},
-		{
-			"path": "pages/personCenter/accountConfig",
-			"style": {
-				"navigationBarTitleText": "服务设置",
-				"navigationBarBackgroundColor": "#008aff",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/tabbar/tabbarPanel",
-			"style": {
-				"navigationBarTitleText": "tabbar",
-				"navigationStyle": "custom"
-			}
-		}
-	],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "GraceUI",
-		"navigationBarBackgroundColor": "#FFFFFF",
-		"backgroundColor": "#FFFFFF",
-		"pageOrientation": "auto",
-		"rpxCalcMaxDeviceWidth": 1024, // rpx 计算所支持的最大设备宽度,单位 px,默认值为 960
-		"rpxCalcBaseDeviceWidth": 375, // rpx 计算使用的基准设备宽度,设备实际宽度超出 rpx 计算所支持的最大设备宽度时将按基准宽度计算,单位 px,默认值为 375
-		"rpxCalcIncludeWidth": 750 // rpx 计算特殊处理的值,始终按实际的设备宽度计算,单位 rpx,默认值为 750
-	},
-	"tabBar": {
-		"color": "#B6C3D2",
-		"selectedColor": "#2B2E3D",
-		"borderStyle": "black",
-		"backgroundColor": "#F8F8F8",
-		"list": [{
-				"pagePath": "pages/tabbar/homePage",
-				"iconPath": "static/menu_imgs/home.png",
-				"selectedIconPath": "static/menu_imgs/home-default.png",
-				"text": "首页"
-			},
-			{
-				"pagePath": "pages/tabbar/workBranch",
-				"iconPath": "static/menu_imgs/home.png",
-				"selectedIconPath": "static/menu_imgs/home-default.png",
-				"text": "工作台"
-			},
-			{
-				"pagePath": "pages/tabbar/personCenter",
-				"iconPath": "static/menu_imgs/home.png",
-				"selectedIconPath": "static/menu_imgs/home-default.png",
-				"text": "个人中心"
-			},
-			{
-				"pagePath": "pages/tabbar/tabbarPanel",
-				"iconPath": "static/menu_imgs/home.png",
-				"selectedIconPath": "static/menu_imgs/home-default.png",
-				"text": "主页"
-			}
-		]
-	},
-	"easycom": {
-		"autoscan": true,
-		"custom": {
-			"gui-(.*)": "@/Grace6/components/gui-$1.vue",
-			"t-(.*)": "@/components/tabbar/t-$1.vue"
-		}
-	},
-	"condition" : { //模式配置,仅开发期间生效
-		"current": 0, //当前激活的模式(list 的索引项)
-		"list": [
-			{
-				"name": "", //模式名称
-				"path": "", //启动页面,必选
-				"query": "" //启动参数,在页面的onLoad函数里面得到
-			}
-		]
-	}
-}
+  "pages": [
+    {
+      "path": "pages/login/loginPage",
+      "style": {
+        "navigationBarTitleText": "用户登录",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/tabbar/homePage",
+      "style": {
+        "navigationBarTitleText": "首页",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/tabbar/workBranch",
+      "style": {
+        "navigationBarTitleText": "工作台",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/system/bluetooth",
+      "style": {
+        "navigationBarTitleText": "蓝牙连接",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/system/bluetoothConfig",
+      "style": {
+        "navigationBarTitleText": "蓝牙配置",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/production/prepareMaterials",
+      "style": {
+        "navigationBarTitleText": "用料单备料",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/production/scanMaterials",
+      "style": {
+        "navigationBarTitleText": "用料单备料",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/production/materialIssuance",
+      "style": {
+        "navigationBarTitleText": "生成发料单",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/production/scanMixMaterials",
+      "style": {
+        "navigationBarTitleText": "多单备料",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/production/mixMaterialDetail",
+      "style": {
+        "navigationBarTitleText": "多单备料支援明细",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/materialRegister/registerType",
+      "style": {
+        "navigationBarTitleText": "登记类型",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/materialRegister/Scan/materialScanRegister",
+      "style": {
+        "navigationBarTitleText": "来料登记(扫码登记)",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/materialRegister/Input/materialInputRegister",
+      "style": {
+        "navigationBarTitleText": "来料登记(手填登记)",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/materialRegister/Input/materialInfoDetails",
+      "style": {
+        "navigationBarTitleText": "来料登记(手填登记->登记详情)",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/materialRegister/Record/registerRecord",
+      "style": {
+        "navigationBarTitleText": "登记记录",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/materialRegister/Record/recordPrint",
+      "style": {
+        "navigationBarTitleText": "登记记录->打印标签",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/feeding/shelfType",
+      "style": {
+        "navigationBarTitleText": "上架类型",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/feeding/incomingPage",
+      "style": {
+        "navigationBarTitleText": "来料上架",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/feeding/productionPage",
+      "style": {
+        "navigationBarTitleText": "产品上架",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/feeding/returnPage",
+      "style": {
+        "navigationBarTitleText": "退料上架",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/warehousing/warehousingType",
+      "style": {
+        "navigationBarTitleText": "入库操作",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/warehousing/warehousingApplication",
+      "style": {
+        "navigationBarTitleText": "入库单申请",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/warehousing/warehousingSign",
+      "style": {
+        "navigationBarTitleText": "入库单签收",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/SemiFinishedProducts/indexPage",
+      "style": {
+        "navigationBarTitleText": "半成品流转",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/SemiFinishedProducts/SemiFinishedProtuctsEntry",
+      "style": {
+        "navigationBarTitleText": "半成品流转入库",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/SemiFinishedProducts/SemiFinishedProtuctsSign",
+      "style": {
+        "navigationBarTitleText": "半成品流转入库签收",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/SemiFinishedProducts/list",
+      "style": {
+        "navigationBarTitleText": "半成品流转已签收列表",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/returnMaterial/returnMaterialType",
+      "style": {
+        "navigationBarTitleText": "退料操作",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/returnMaterial/returnMaterialApplication",
+      "style": {
+        "navigationBarTitleText": "退料单申请",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/returnMaterial/returnMaterialSign",
+      "style": {
+        "navigationBarTitleText": "退料单签收",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/location/locationPage",
+      "style": {
+        "navigationBarTitleText": "货位调整",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/trestle/trestleList",
+      "style": {
+        "navigationBarTitleText": "栈板拆合",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/trestle/boxNumberStacking",
+      "style": {
+        "navigationBarTitleText": "箱号合栈",
+        "navigationStyle": "custom",
+        "enablePullDownRefresh": false,
+        "onReachBottomDistance": 50, //50代表距离底部多少的距离 这个根据自己的需求 一般都是50
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/trestle/boxNumberOutStacking",
+      "style": {
+        "navigationBarTitleText": "箱号出栈",
+        "navigationStyle": "custom",
+        "enablePullDownRefresh": false,
+        "onReachBottomDistance": 50, //50代表距离底部多少的距离 这个根据自己的需求 一般都是50
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/trestle/trestleDetails",
+      "style": {
+        "navigationBarTitleText": "栈板详情",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/box/boxList",
+      "style": {
+        "navigationBarTitleText": "箱号拆合",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/box/boxSplit",
+      "style": {
+        "navigationBarTitleText": "拆箱",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/box/boxMerge",
+      "style": {
+        "navigationBarTitleText": "装箱",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/materialDisass/materialWorkBranch",
+      "style": {
+        "navigationBarTitleText": "物料拆合批",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/materialDisass/materialSplit",
+      "style": {
+        "navigationBarTitleText": "物料拆分",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/materialDisass/materialMerge",
+      "style": {
+        "navigationBarTitleText": "物料合并",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/productionIssue/productionIssue",
+      "style": {
+        "navigationBarTitleText": "生产发料",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/productionIssue/demandDetails",
+      "style": {
+        "navigationBarTitleText": "需求明细",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/productionIssue/issuePage",
+      "style": {
+        "navigationBarTitleText": "发料",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/productionIssue/currentIssueRecord",
+      "style": {
+        "navigationBarTitleText": "本次发料记录",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/productionIssue/issueRecord",
+      "style": {
+        "navigationBarTitleText": "发料记录",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/productionIssue/issueDetails",
+      "style": {
+        "navigationBarTitleText": "发料明细",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/production/glue/indexPage",
+      "style": {
+        "navigationBarTitleText": "点胶管理",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/production/IPQC/ipqcList",
+      "style": {
+        "navigationBarTitleText": "IPQC单据",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/production/IPQC/ipqcCheckout",
+      "style": {
+        "navigationBarTitleText": "IPQC检验",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/production/FQC/fqcList",
+      "style": {
+        "navigationBarTitleText": "销售单列表",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/production/FQC/fqcCheckout",
+      "style": {
+        "navigationBarTitleText": "FQC检验",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/production/cutting/cuttingList",
+      "style": {
+        "navigationBarTitleText": "分切单列表",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/production/cutting/cuttingCheckout",
+      "style": {
+        "navigationBarTitleText": "分切",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/production/cutting/cuttingMaterialPreparation",
+      "style": {
+        "navigationBarTitleText": "分切备料",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/deliveryNote/deliveryNoteList",
+      "style": {
+        "navigationBarTitleText": "送货单回签-待回签列表",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/deliveryNote/deliveryNoteDetail",
+      "style": {
+        "navigationBarTitleText": "送货单回签-待回签明细",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/production/processExecution/processList",
+      "style": {
+        "navigationBarTitleText": "生产工单列表",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/production/processExecution/processFullInspection",
+      "style": {
+        "navigationBarTitleText": "后段工序-全检执行",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/production/processExecution/processDetails",
+      "style": {
+        "navigationBarTitleText": "工单明细",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/production/processExecution/processExecution",
+      "style": {
+        "navigationBarTitleText": "工单执行",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/production/processExecution/processPosteriorSegment",
+      "style": {
+        "navigationBarTitleText": "后段工序",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/production/processExecution/takePhoto",
+      "style": {
+        "navigationBarTitleText": "生产结束",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/ETM/moldPreserve/indexPage",
+      "style": {
+        "navigationBarTitleText": "模具保养",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/ETM/moldPreserve/moldDetails",
+      "style": {
+        "navigationBarTitleText": "保养明细",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/ETM/moldPreserve/moldAdd",
+      "style": {
+        "navigationBarTitleText": "新增保养",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/tabbar/printTest",
+      "style": {
+        "navigationBarTitleText": "打印测试",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/outSourceMaterial/outSourceList",
+      "style": {
+        "navigationBarTitleText": "委外备料列表",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/outSourceMaterial/outSourceMaterials",
+      "style": {
+        "navigationBarTitleText": "委外备料",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/production/shipment/shipmentPage",
+      "style": {
+        "navigationBarTitleText": "出货打标签",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/production/shipment/shipmentPatchworkPage",
+      "style": {
+        "navigationBarTitleText": "出货单列表",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/production/shipment/shipmentOrderInfoDetails",
+      "style": {
+        "navigationBarTitleText": "出货单信息",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/production/shipment/shipmentPackingDetails",
+      "style": {
+        "navigationBarTitleText": "装箱/未装箱明细",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/production/shipmentMHT/shipmentPage",
+      "style": {
+        "navigationBarTitleText": "销售出货(麦禾田)",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/production/shipmentMHT/shipmentProduct",
+      "style": {
+        "navigationBarTitleText": "销售出货(麦禾田)->成品列表",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/codeSplitOrMerge/codeSplit",
+      "style": {
+        "navigationBarTitleText": "条码拆分",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/codeSplitOrMerge/codeMerge",
+      "style": {
+        "navigationBarTitleText": "条码合并",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/coldStorage/indexPage",
+      "style": {
+        "navigationBarTitleText": "出入冷库",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/scanInOut/scanInOutType",
+      "style": {
+        "navigationBarTitleText": "扫码出入库",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/scanInOut/Out/scanOutPage",
+      "style": {
+        "navigationBarTitleText": "扫码出库",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/Inventory/inventoryPage",
+      "style": {
+        "navigationBarTitleText": "盘点",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/Inventory/inventoryDetail",
+      "style": {
+        "navigationBarTitleText": "盘点明细",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/scanInOut/Out/scannedMaterials",
+      "style": {
+        "navigationBarTitleText": "扫码物料",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/scanInOut/Out/materialsDetail",
+      "style": {
+        "navigationBarTitleText": "物料明细",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/scanInOut/In/scanInPage",
+      "style": {
+        "navigationBarTitleText": "扫码入库",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/scanInOut/In/scannedMaterials",
+      "style": {
+        "navigationBarTitleText": "扫码物料",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/scanInOut/In/businessType3/returnMaterial",
+      "style": {
+        "navigationBarTitleText": "扫码物料(生产退料的时候)",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/scanInOut/In/businessType3/businessType3Detail",
+      "style": {
+        "navigationBarTitleText": "扫码明细(生产退料的时候)",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/scanInOut/Out/scanTieInputs/scanTieInputs",
+      "style": {
+        "navigationBarTitleText": "扫码出库(需要贴纸id的时候)",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/scanInOut/Out/scanTieInputs/scanTieInputsDetail",
+      "style": {
+        "navigationBarTitleText": "扫码出库(需要贴纸id的时候)",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/workbranch/warehouse/scanInOut/In/materialsDetail",
+      "style": {
+        "navigationBarTitleText": "物料明细",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/tabbar/personCenter",
+      "style": {
+        "navigationBarTitleText": "个人中心",
+        "navigationStyle": "custom",
+        "app-plus": {
+          "background": "#FFFFFF"
+        }
+      }
+    },
+    {
+      "path": "pages/personCenter/accountConfig",
+      "style": {
+        "navigationBarTitleText": "服务设置",
+        "navigationBarBackgroundColor": "#008aff",
+        "navigationBarTextStyle": "white"
+      }
+    },
+    {
+      "path": "pages/tabbar/tabbarPanel",
+      "style": {
+        "navigationBarTitleText": "tabbar",
+        "navigationStyle": "custom"
+      }
+    }
+  ],
+  "globalStyle": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "GraceUI",
+    "navigationBarBackgroundColor": "#FFFFFF",
+    "backgroundColor": "#FFFFFF",
+    "pageOrientation": "auto",
+    "rpxCalcMaxDeviceWidth": 1024, // rpx 计算所支持的最大设备宽度,单位 px,默认值为 960
+    "rpxCalcBaseDeviceWidth": 375, // rpx 计算使用的基准设备宽度,设备实际宽度超出 rpx 计算所支持的最大设备宽度时将按基准宽度计算,单位 px,默认值为 375
+    "rpxCalcIncludeWidth": 750 // rpx 计算特殊处理的值,始终按实际的设备宽度计算,单位 rpx,默认值为 750
+  },
+  "tabBar": {
+    "color": "#B6C3D2",
+    "selectedColor": "#2B2E3D",
+    "borderStyle": "black",
+    "backgroundColor": "#F8F8F8",
+    "list": [
+      {
+        "pagePath": "pages/tabbar/homePage",
+        "iconPath": "static/menu_imgs/home.png",
+        "selectedIconPath": "static/menu_imgs/home-default.png",
+        "text": "首页"
+      },
+      {
+        "pagePath": "pages/tabbar/workBranch",
+        "iconPath": "static/menu_imgs/home.png",
+        "selectedIconPath": "static/menu_imgs/home-default.png",
+        "text": "工作台"
+      },
+      {
+        "pagePath": "pages/tabbar/personCenter",
+        "iconPath": "static/menu_imgs/home.png",
+        "selectedIconPath": "static/menu_imgs/home-default.png",
+        "text": "个人中心"
+      },
+      {
+        "pagePath": "pages/tabbar/tabbarPanel",
+        "iconPath": "static/menu_imgs/home.png",
+        "selectedIconPath": "static/menu_imgs/home-default.png",
+        "text": "主页"
+      }
+    ]
+  },
+  "easycom": {
+    "autoscan": true,
+    "custom": {
+      "gui-(.*)": "@/Grace6/components/gui-$1.vue",
+      "t-(.*)": "@/components/tabbar/t-$1.vue"
+    }
+  },
+  "condition": {
+    //模式配置,仅开发期间生效
+    "current": 0, //当前激活的模式(list 的索引项)
+    "list": [
+      {
+        "name": "", //模式名称
+        "path": "", //启动页面,必选
+        "query": "" //启动参数,在页面的onLoad函数里面得到
+      }
+    ]
+  }
+}

+ 427 - 362
pages/tabbar/homePage.vue

@@ -1,391 +1,456 @@
 <template>
-	<view class="home">
-		<div class="bg-card" />
-		<div class="title-operation">
-			<div class="user-profilephoto">
-				<img src="https://pic2.zhimg.com/50/v2-48ad5fee92cb9fc7292db33223452313_hd.png" alt="" srcset="">
-			</div>
-			<div class="user-detail">
-				<text>{{ users.nickname }} 欢迎回来!</text>
-				<text class="role-style">{{ users.roleStr }}</text>
-			</div>
-			<div class="user-mess">
-				<text class="font-icons" style="font-size: 26px;">&#xe6a4;</text>
-			</div>
-		</div>
-		<div class="title-panel">
-			<div class="card-title">今日待办</div>
-			<div class="card-row">
-				<div class="card-col">
-					<text style="color: #828282">0</text>
-					<text>待审批</text>
-				</div>
-				<div class="card-col">
-					<text style="color: orange;">0</text>
-					<text>预警</text>
-				</div>
-				<div class="card-col">
-					<text style="color: #539cf8;">6</text>
-					<text>未读公告</text>
-				</div>
-			</div>
-		</div>
-		<div class="content">
-			<div class="content-panel">
-				<div class="card-title">
-					<div class="card-title-left">
-						<text class="font-icons"
-							style="width: 20px;font-size: 18px;margin-right: 4px;color: #539cf8;">&#xe679;</text>企业公告
-					</div>
-					<div class="card-title-right">更多<i class="font-icons">&#xe66b;</i></div>
-				</div>
-				<div class="card-row">
-					<text>2023-06-01 关于启用加密管理制度的说明</text>
-					<text class="font-icons font-icons2">&#xe694;</text>
-				</div>
-				<div class="card-row">
-					<text>2023-06-03 端午节放假通知</text>
-					<text class="font-icons font-icons2">&#xe694;</text>
-				</div>
-				<div class="card-row">
-					<text>2023-06-11 再次申明节前请假及调休所需填写的审批明细</text>
-					<text class="font-icons font-icons2">&#xe694;</text>
-				</div>
-				<div class="card-row">
-					<text>2023-06-24 关于放假期间供应商提供送货的单据相关的订单</text>
-					<text class="font-icons font-icons2">&#xe694;</text>
-				</div>
-			</div>
-			<div class="content-panel">
-				<div class="card-title">
-					<div class="card-title-left">
-						<text class="font-icons"
-							style="width: 20px;font-size: 18px;margin-right: 4px;color: #2cb755;">&#xe6be;</text>我的待办
-					</div>
-					<div class="card-title-right">更多<i class="font-icons">&#xe66b;</i></div>
-				</div>
-				<div class="card-row">
-					<text>2023-06-11 采购订单CGDD2023060149101011000021需要进行采购</text>
-					<text class="font-icons font-icons2">&#xe694;</text>
-				</div>
-				<div class="card-row">
-					<text>2023-06-18 采购订单CGDD2023062149101011000021即将到期</text>
-					<text class="font-icons font-icons2">&#xe694;</text>
-				</div>
-				<div class="card-row">
-					<text>2023-06-19 采购订单CGDD2023060191010119000021需要进行采购</text>
-					<text class="font-icons font-icons2">&#xe694;</text>
-				</div>
-				<div class="card-row">
-					<text>2023-06-24 采购订单CGDD2023060249101011000021需要进行采购</text>
-					<text class="font-icons font-icons2">&#xe694;</text>
-				</div>
-			</div>
-			<div class="content-panel">
-				<div class="card-title">
-					<div class="card-title-left">
-						<text class="font-icons"
-							style="width: 20px;font-size: 18px;margin-right: 4px;color: orange;">&#xe6e0;</text>
-						预警信息
-					</div>
-					<div class="card-title-right">更多<i class="font-icons">&#xe66b;</i></div>
-				</div>
-				<div class="card-row">
-					<text>2023-06-01 您有4笔采购订单即将超时,请立即进行处理!</text>
-					<text class="font-icons font-icons2">&#xe694;</text>
-				</div>
-				<div class="card-row">
-					<text>2023-06-03 您有2笔采购订单已经逾期,请立即进行处理!</text>
-					<text class="font-icons font-icons2">&#xe694;</text>
-				</div>
-				<div class="card-row">
-					<text>2024-03-21 您有1笔采购订单已经逾期,请立即进行处理!</text>
-					<text class="font-icons font-icons2">&#xe694;</text>
-				</div>
-				<div class="card-row">
-					<text>2024-04-13 您有12笔采购订单已经逾期,请立即进行处理!</text>
-					<text class="font-icons font-icons2">&#xe694;</text>
-				</div>
-				<div class="card-row">
-					<text>2024-05-09 您有1笔采购订单已经逾期,请立即进行处理!</text>
-					<text class="font-icons font-icons2">&#xe694;</text>
-				</div>
-			</div>
-		</div>
-	</view>
+  <view class="home">
+    <div class="bg-card" />
+    <div class="title-operation">
+      <div class="user-profilephoto">
+        <img
+          src="https://pic2.zhimg.com/50/v2-48ad5fee92cb9fc7292db33223452313_hd.png"
+          alt=""
+          srcset=""
+        />
+      </div>
+      <div class="user-detail">
+        <text>{{ users.nickname }} 欢迎回来!</text>
+        <text class="role-style">{{ users.roleStr }}</text>
+      </div>
+      <div class="user-mess">
+        <text class="font-icons" style="font-size: 26px">&#xe6a4;</text>
+      </div>
+    </div>
+    <div class="title-panel">
+      <div class="card-title">今日待办</div>
+      <div class="card-row">
+        <div class="card-col">
+          <text style="color: #828282">0</text>
+          <text>待审批</text>
+        </div>
+        <div class="card-col">
+          <text style="color: orange">0</text>
+          <text>预警</text>
+        </div>
+        <div class="card-col">
+          <text style="color: #539cf8">6</text>
+          <text>未读公告</text>
+        </div>
+      </div>
+    </div>
+    <div class="content">
+      <div class="content-panel">
+        <div class="card-title">
+          <div class="card-title-left">
+            <text
+              class="font-icons"
+              style="
+                width: 20px;
+                font-size: 18px;
+                margin-right: 4px;
+                color: #539cf8;
+              "
+              >&#xe679;</text
+            >企业公告
+          </div>
+          <div class="card-title-right">
+            更多<i class="font-icons">&#xe66b;</i>
+          </div>
+        </div>
+        <div class="card-row">
+          <text>2023-06-01 关于启用加密管理制度的说明</text>
+          <text class="font-icons font-icons2">&#xe694;</text>
+        </div>
+        <div class="card-row">
+          <text>2023-06-03 端午节放假通知</text>
+          <text class="font-icons font-icons2">&#xe694;</text>
+        </div>
+        <div class="card-row">
+          <text>2023-06-11 再次申明节前请假及调休所需填写的审批明细</text>
+          <text class="font-icons font-icons2">&#xe694;</text>
+        </div>
+        <div class="card-row">
+          <text>2023-06-24 关于放假期间供应商提供送货的单据相关的订单</text>
+          <text class="font-icons font-icons2">&#xe694;</text>
+        </div>
+      </div>
+      <div class="content-panel">
+        <div class="card-title">
+          <div class="card-title-left">
+            <text
+              class="font-icons"
+              style="
+                width: 20px;
+                font-size: 18px;
+                margin-right: 4px;
+                color: #2cb755;
+              "
+              >&#xe6be;</text
+            >我的待办
+          </div>
+          <div class="card-title-right">
+            更多<i class="font-icons">&#xe66b;</i>
+          </div>
+        </div>
+        <div class="card-row">
+          <text>2023-06-11 采购订单CGDD2023060149101011000021需要进行采购</text>
+          <text class="font-icons font-icons2">&#xe694;</text>
+        </div>
+        <div class="card-row">
+          <text>2023-06-18 采购订单CGDD2023062149101011000021即将到期</text>
+          <text class="font-icons font-icons2">&#xe694;</text>
+        </div>
+        <div class="card-row">
+          <text>2023-06-19 采购订单CGDD2023060191010119000021需要进行采购</text>
+          <text class="font-icons font-icons2">&#xe694;</text>
+        </div>
+        <div class="card-row">
+          <text>2023-06-24 采购订单CGDD2023060249101011000021需要进行采购</text>
+          <text class="font-icons font-icons2">&#xe694;</text>
+        </div>
+      </div>
+      <div class="content-panel">
+        <div class="card-title">
+          <div class="card-title-left">
+            <text
+              class="font-icons"
+              style="
+                width: 20px;
+                font-size: 18px;
+                margin-right: 4px;
+                color: orange;
+              "
+              >&#xe6e0;</text
+            >
+            预警信息
+          </div>
+          <div class="card-title-right">
+            更多<i class="font-icons">&#xe66b;</i>
+          </div>
+        </div>
+        <div class="card-row">
+          <text>2023-06-01 您有4笔采购订单即将超时,请立即进行处理!</text>
+          <text class="font-icons font-icons2">&#xe694;</text>
+        </div>
+        <div class="card-row">
+          <text>2023-06-03 您有2笔采购订单已经逾期,请立即进行处理!</text>
+          <text class="font-icons font-icons2">&#xe694;</text>
+        </div>
+        <div class="card-row">
+          <text>2024-03-21 您有1笔采购订单已经逾期,请立即进行处理!</text>
+          <text class="font-icons font-icons2">&#xe694;</text>
+        </div>
+        <div class="card-row">
+          <text>2024-04-13 您有12笔采购订单已经逾期,请立即进行处理!</text>
+          <text class="font-icons font-icons2">&#xe694;</text>
+        </div>
+        <div class="card-row">
+          <text>2024-05-09 您有1笔采购订单已经逾期,请立即进行处理!</text>
+          <text class="font-icons font-icons2">&#xe694;</text>
+        </div>
+      </div>
+    </div>
+  </view>
 </template>
 <script>
-	import {
-		useSetDictStore
-	} from '@/stores/useSetDictStore';
-	import {
-		useSetWareHouseStore
-	} from '@/stores/useSetWareHouseStore.js';
-	export default {
-		data() {
-			return {
-				users: {
-					nickname: '',
-					roles: [],
-					roleStr: ''
-				}
-			}
-		},
-		mounted() {
-			this.handleSetDictStore()
-			this.handleSetWarehousStore()
-			// 获取用户信息
-			this.handleGetUserInfo()
-		},
-		methods: {
-			// 获取仓库信息
-			handleSetWarehousStore() {
-				const store = useSetWareHouseStore()
-				store.$reset()
-				store.getList()
-			},
-			// 获取字典数据
-			handleSetDictStore() {
-				const store = useSetDictStore()
-				store.$reset()
-				store.getList()
-			},
-			handleGetUserInfo() {
-				uni.$reqGet('getMesSystemUserDetails')
-					.then(({
-						data
-					}) => {
-						uni.setStorageSync('userInfo', JSON.stringify(data))
-						this.users.nickname = data?.username
-						this.users.roles = data?.roles
-						data?.roles.forEach((item, index) => {
-							if (index === data?.roles.length - 1) {
-								this.users.roleStr += item.name
-							} else {
-								this.users.roleStr += item.name + ', '
-							}
-						})
-					})
-			}
-		}
-	}
+import { useSetDictStore } from "@/stores/useSetDictStore";
+import { useSetWareHouseStore } from "@/stores/useSetWareHouseStore.js";
+import { downloadApp } from "@/unit/updateApp.js";
+export default {
+  data() {
+    return {
+      users: {
+        nickname: "",
+        roles: [],
+        roleStr: "",
+      },
+    };
+  },
+  mounted() {
+    this.handleSetDictStore();
+    this.handleSetWarehousStore();
+    // 获取用户信息
+    this.handleGetUserInfo();
+    // 检查并更新APP版本
+    this.checkVersion();
+  },
+  methods: {
+    // 获取仓库信息
+    handleSetWarehousStore() {
+      const store = useSetWareHouseStore();
+      store.$reset();
+      store.getList();
+    },
+    // 获取字典数据
+    handleSetDictStore() {
+      const store = useSetDictStore();
+      store.$reset();
+      store.getList();
+    },
+    handleGetUserInfo() {
+      uni.$reqGet("getMesSystemUserDetails").then(({ data }) => {
+        uni.setStorageSync("userInfo", JSON.stringify(data));
+        this.users.nickname = data?.username;
+        this.users.roles = data?.roles;
+        data?.roles.forEach((item, index) => {
+          if (index === data?.roles.length - 1) {
+            this.users.roleStr += item.name;
+          } else {
+            this.users.roleStr += item.name + ", ";
+          }
+        });
+      });
+    },
+    // 检查并更新APP版本
+    checkVersion() {
+      // 始终请求最新版本接口,方便查看版本信息
+      uni.$reqGet("getAppVs").then((res) => {
+        const vsInfo = res.data || {};
+        // #ifdef APP-PLUS
+        // 获取当前版本号,仅在 APP/PDA 弹窗更新
+        plus.runtime.getProperty(plus.runtime.appid, (e) => {
+          const nowVersion = e.versionCode * 1; // 当前版本
+          const newVersion = vsInfo.vs * 1; // 最新版本
+          // 先比对版本号,需要更新时再校验 status
+          if (nowVersion < newVersion) {
+            // status: 0 失效, 1 生效;失效时提示链接失效
+            if (Number(vsInfo.status) !== 1) {
+              uni.showToast({
+                title: "PDA版本需更新但链接失效,请联系管理员!",
+                icon: "none",
+                duration: 3000,
+              });
+              return;
+            }
+            uni.showModal({
+              content: "有新版本",
+              success: (res1) => {
+                if (res1.confirm && vsInfo.address) {
+                  downloadApp(vsInfo.address);
+                }
+              },
+            });
+          }
+        });
+        // #endif
+      });
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
-	.home {
-		width: 100vw;
-		height: 100vh;
-	}
+.home {
+  width: 100vw;
+  height: 100vh;
+}
 
-	.bg-card {
-		position: fixed;
-		left: 0%;
-		top: 0%;
-		width: 100vw;
-		height: 100vh;
-		z-index: 1;
-		background: linear-gradient(180deg, #2979fe, #fafafb);
-	}
+.bg-card {
+  position: fixed;
+  left: 0%;
+  top: 0%;
+  width: 100vw;
+  height: 100vh;
+  z-index: 1;
+  background: linear-gradient(180deg, #2979fe, #fafafb);
+}
 
-	.title-operation {
-		position: fixed;
-		left: 0%;
-		top: 24px;
-		z-index: 2;
-		width: calc(100vw - 24px);
-		min-height: 75px;
-		padding: 0 12px;
-		display: grid;
-		grid-template-rows: 1fr;
-		grid-template-columns: 2fr 8fr 1fr;
+.title-operation {
+  position: fixed;
+  left: 0%;
+  top: 24px;
+  z-index: 2;
+  width: calc(100vw - 24px);
+  min-height: 75px;
+  padding: 0 12px;
+  display: grid;
+  grid-template-rows: 1fr;
+  grid-template-columns: 2fr 8fr 1fr;
 
-		.user-profilephoto {
-			display: flex;
-			justify-content: center;
-			align-items: center;
+  .user-profilephoto {
+    display: flex;
+    justify-content: center;
+    align-items: center;
 
-			img {
-				width: 55px;
-				height: 55px;
-			}
-		}
+    img {
+      width: 55px;
+      height: 55px;
+    }
+  }
 
-		.user-detail {
-			padding: 8px;
-			display: grid;
-			grid-template-rows: 1fr 1fr;
-			grid-template-columns: 1fr;
-			align-items: center;
+  .user-detail {
+    padding: 8px;
+    display: grid;
+    grid-template-rows: 1fr 1fr;
+    grid-template-columns: 1fr;
+    align-items: center;
 
-			.role-style {
-				// width: calc(100vw - 150px);
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-				-o-text-overflow: ellipsis;
-			}
+    .role-style {
+      // width: calc(100vw - 150px);
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      -o-text-overflow: ellipsis;
+    }
 
-			text {
-				font-weight: bold;
-				color: white;
-			}
+    text {
+      font-weight: bold;
+      color: white;
+    }
 
-			text:nth-of-type(1) {
-				font-size: 16px;
-			}
-		}
+    text:nth-of-type(1) {
+      font-size: 16px;
+    }
+  }
 
-		.user-mess {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			color: white;
-		}
-	}
+  .user-mess {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: white;
+  }
+}
 
-	.title-panel {
-		position: fixed;
-		left: 0%;
-		top: 120px;
-		height: 130px;
-		width: calc(100vw - 12px);
-		margin: 12px 4px;
-		border-radius: 6px;
-		z-index: 3;
-		box-shadow: 3px 3px 1px 1px #d5dffd;
-		background-color: white;
+.title-panel {
+  position: fixed;
+  left: 0%;
+  top: 120px;
+  height: 130px;
+  width: calc(100vw - 12px);
+  margin: 12px 4px;
+  border-radius: 6px;
+  z-index: 3;
+  box-shadow: 3px 3px 1px 1px #d5dffd;
+  background-color: white;
 
-		.card-title {
-			height: 46px;
-			line-height: 46px;
-			padding: 0 16px;
-			font-weight: bold;
-			font-size: 14px;
-		}
+  .card-title {
+    height: 46px;
+    line-height: 46px;
+    padding: 0 16px;
+    font-weight: bold;
+    font-size: 14px;
+  }
 
-		.card-row {
-			height: 78px;
-			padding: 0 24px;
-			display: flex;
-			justify-content: space-between;
+  .card-row {
+    height: 78px;
+    padding: 0 24px;
+    display: flex;
+    justify-content: space-between;
 
-			.card-col {
-				display: grid;
-				grid-template-rows: 2fr 3fr;
-				grid-template-columns: 1fr;
-				align-items: center;
-				justify-content: center;
+    .card-col {
+      display: grid;
+      grid-template-rows: 2fr 3fr;
+      grid-template-columns: 1fr;
+      align-items: center;
+      justify-content: center;
 
-				>text:nth-of-type(1) {
-					text-align: center;
-					font-weight: bold;
-					font-size: 22px;
-				}
-			}
-		}
-	}
+      > text:nth-of-type(1) {
+        text-align: center;
+        font-weight: bold;
+        font-size: 22px;
+      }
+    }
+  }
+}
 
-	.content {
-		width: 100vw;
-		height: calc(100vh - 330px);
-		position: fixed;
-		top: 270px;
-		left: 0;
-		z-index: 2;
-		overflow-y: scroll;
+.content {
+  width: 100vw;
+  height: calc(100vh - 330px);
+  position: fixed;
+  top: 270px;
+  left: 0;
+  z-index: 2;
+  overflow-y: scroll;
 
-		.content-panel {
-			width: calc(100vw - 12px);
-			margin: 12px 4px;
-			border-radius: 6px;
-			z-index: 3;
-			box-shadow: 3px 3px 1px 1px #d5dffd;
-			overflow-y: hidden;
-			background-color: white;
+  .content-panel {
+    width: calc(100vw - 12px);
+    margin: 12px 4px;
+    border-radius: 6px;
+    z-index: 3;
+    box-shadow: 3px 3px 1px 1px #d5dffd;
+    overflow-y: hidden;
+    background-color: white;
 
-			.card-title {
-				position: relative;
-				display: grid;
-				grid-template-rows: 1fr;
-				grid-template-columns: 1fr 1fr;
+    .card-title {
+      position: relative;
+      display: grid;
+      grid-template-rows: 1fr;
+      grid-template-columns: 1fr 1fr;
 
-				.card-title-left {
-					height: 30px;
-					padding: 0 8px;
-					margin-bottom: 4px;
-					font-weight: bold;
-					font-size: 14px;
-					display: flex;
-					align-items: flex-end;
-				}
+      .card-title-left {
+        height: 30px;
+        padding: 0 8px;
+        margin-bottom: 4px;
+        font-weight: bold;
+        font-size: 14px;
+        display: flex;
+        align-items: flex-end;
+      }
 
-				.card-title-right {
-					position: absolute;
-					right: 6px;
-					top: 10px;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					font-size: 12px;
-				}
-			}
+      .card-title-right {
+        position: absolute;
+        right: 6px;
+        top: 10px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        font-size: 12px;
+      }
+    }
 
-			.card-row {
-				position: relative;
-				height: 36px;
-				line-height: 36px;
-				padding: 2px 10px 6px 22px;
-				display: grid;
-				grid-template-rows: 1fr;
-				grid-template-columns: 19fr 1fr;
+    .card-row {
+      position: relative;
+      height: 36px;
+      line-height: 36px;
+      padding: 2px 10px 6px 22px;
+      display: grid;
+      grid-template-rows: 1fr;
+      grid-template-columns: 19fr 1fr;
 
-				text:nth-of-type(1) {
-					overflow: hidden;
-					white-space: nowrap;
-					text-overflow: ellipsis;
-					-o-text-overflow: ellipsis;
-				}
+      text:nth-of-type(1) {
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        -o-text-overflow: ellipsis;
+      }
 
-				& >uni-text::before {
-					content: '';
-					position: absolute;
-					left: 12px;
-					top: 17px;
-					width: 4px;
-					height: 4px;
-					border-radius: 50%;
-					transform: translate(-50%, 0);
-					background-color: #23a8f2;
-					z-index: 2;
-				}
-			
-			
-				& >uni-text::after {
-					content: '';
-					position: absolute;
-					left: 12px;
-					top: 15px;
-					width: 2px;
-					height: 100%;
-					transform: translate(-50%, 0);
-					background-image: linear-gradient(#cfe1fc 50%, rgba(255,255,255,0) 0%); /* 35%设置虚线点x轴上的长度 */
-					background-position: left; /* top配置上边框位置的虚线 */
-					background-size: 1.5px 14px; /* 第一个参数设置虚线点的间距;第二个参数设置虚线点y轴上的长度 */
-					background-repeat: repeat-y;
-					z-index: 1;
-				}
-			}
-			
-		}
-	}
+      & > uni-text::before {
+        content: "";
+        position: absolute;
+        left: 12px;
+        top: 17px;
+        width: 4px;
+        height: 4px;
+        border-radius: 50%;
+        transform: translate(-50%, 0);
+        background-color: #23a8f2;
+        z-index: 2;
+      }
 
-	.font-icons {
-		font-size: 12px;
-		font-weight: bold;
-		text-align: right;
-	}
+      & > uni-text::after {
+        content: "";
+        position: absolute;
+        left: 12px;
+        top: 15px;
+        width: 2px;
+        height: 100%;
+        transform: translate(-50%, 0);
+        background-image: linear-gradient(
+          #cfe1fc 50%,
+          rgba(255, 255, 255, 0) 0%
+        ); /* 35%设置虚线点x轴上的长度 */
+        background-position: left; /* top配置上边框位置的虚线 */
+        background-size: 1.5px 14px; /* 第一个参数设置虚线点的间距;第二个参数设置虚线点y轴上的长度 */
+        background-repeat: repeat-y;
+        z-index: 1;
+      }
+    }
+  }
+}
 
-	.font-icons2 {
-		font-size: 12px;
-		text-align: right;
-	}
-</style>
+.font-icons {
+  font-size: 12px;
+  font-weight: bold;
+  text-align: right;
+}
+
+.font-icons2 {
+  font-size: 12px;
+  text-align: right;
+}
+</style>

+ 53 - 0
unit/updateApp.js

@@ -0,0 +1,53 @@
+// 下载并安装最新的APP版本
+function downloadApp(appUrl) {
+  // 下载最新版本APP
+  var dtask = plus.downloader.createDownload(
+    appUrl,
+    {
+      method: "GET",
+    },
+    (d, status) => {
+      if (status == 200) {
+        plus.runtime.install(
+          plus.io.convertLocalFileSystemURL(d.filename),
+          {},
+          {},
+          () => {
+            uni.showToast({
+              title: "安装失败",
+              duration: 1500,
+              icon: "none",
+            });
+          },
+        );
+      } else {
+        plus.nativeUI.alert("安装失败,请稍候重试: " + status);
+      }
+    },
+  );
+
+  dtask.start();
+  var prg = 0;
+  var showLoading = plus.nativeUI.showWaiting("正在下载");
+  dtask.addEventListener("statechanged", function (task) {
+    switch (task.state) {
+      case 1:
+        showLoading.setTitle("正在下载");
+        break;
+      case 2:
+        showLoading.setTitle("已连接到服务器");
+        break;
+      case 3:
+        prg = parseInt(
+          (parseFloat(task.downloadedSize) / parseFloat(task.totalSize)) * 100,
+        );
+        showLoading.setTitle("版本更新,正在下载" + prg + "% ");
+        break;
+      case 4:
+        plus.nativeUI.closeWaiting();
+        break;
+    }
+  });
+}
+
+export { downloadApp };