From b54bc37f35fc6866dba0570760606d08f0a3a17f Mon Sep 17 00:00:00 2001
From: lxz <lxz15516116653@163.com>
Date: Thu, 11 Jan 2024 17:16:07 +0800
Subject: [PATCH] =?UTF-8?q?ios=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/customTabbar/tabbar.vue     |   7 +-
 config/app.js                          |   2 +-
 manifest.json                          |   4 +-
 node_modules/.vite/deps/_metadata.json |   6 +-
 node_modules/.vite/deps/uview-plus.js  | 234 ++++++++++++-------------
 pages/Login/login.vue                  |  15 +-
 pages/live/live.vue                    |  95 +++-------
 pages/live/live2.vue                   |  20 ---
 pages/live/liveIos.nvue                | 111 ++++++++++++
 pages/live/liveIos.vue                 | 129 --------------
 unpackage/dist/build/.nvue/app.js      |   3 +
 unpackage/dist/dev/.nvue/app.js        |   3 +
 12 files changed, 276 insertions(+), 353 deletions(-)
 delete mode 100644 pages/live/live2.vue
 create mode 100644 pages/live/liveIos.nvue
 delete mode 100644 pages/live/liveIos.vue

diff --git a/components/customTabbar/tabbar.vue b/components/customTabbar/tabbar.vue
index a186cb8..e8a7e60 100644
--- a/components/customTabbar/tabbar.vue
+++ b/components/customTabbar/tabbar.vue
@@ -1,6 +1,6 @@
 <template>
 
-	<u-tabbar :value="value1" :fixed="true" @change="change1" :placeholder="false" :safeAreaInsetBottom="true">
+	<u-tabbar :value="value1" :fixed="true" :placeholder="false" :safeAreaInsetBottom="true">
 		<u-tabbar-item @click="click1">
 			<template #active-icon>
 				<image class="u-page__item__slot-icon" src="/static/tabs-icon/sydj.png"
@@ -48,11 +48,6 @@
 	} from "vue"
 	console.log(store.state.tabbrIndex)
 	const value1 = ref(store.state.tabbrIndex)
-
-
-
-
-
 	const click1 = (e) => {
 
 		store.dispatch('changeTabbar', e)
diff --git a/config/app.js b/config/app.js
index 4ec7ee8..5386163 100644
--- a/config/app.js
+++ b/config/app.js
@@ -1,8 +1,8 @@
 let BASE_URL
 import store from "@/store/index.js"
 // 环境
-let env = "dev"
 // let env = "prod"
+let env = "dev"
 
 
 let HTTP_REQUEST_URL
diff --git a/manifest.json b/manifest.json
index 93c148c..52a9659 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
 	"name": "种植溯源",
 	"appid": "__UNI__D087881",
 	"description": "",
-	"versionName": "1.0.7",
-	"versionCode": 107,
+	"versionName": "1.1.0",
+	"versionCode": 110,
 	"transformPx": false,
 	/* 5+App特有相关 */
 	"app-plus": {
diff --git a/node_modules/.vite/deps/_metadata.json b/node_modules/.vite/deps/_metadata.json
index 4e84546..6e24207 100644
--- a/node_modules/.vite/deps/_metadata.json
+++ b/node_modules/.vite/deps/_metadata.json
@@ -1,11 +1,11 @@
 {
-  "hash": "b1800904",
-  "browserHash": "aae9ffb9",
+  "hash": "6c7c04d1",
+  "browserHash": "ba822572",
   "optimized": {
     "uview-plus": {
       "src": "../../uview-plus/index.js",
       "file": "uview-plus.js",
-      "fileHash": "265a1387",
+      "fileHash": "2c6e9b73",
       "needsInterop": false
     }
   },
diff --git a/node_modules/.vite/deps/uview-plus.js b/node_modules/.vite/deps/uview-plus.js
index e5bb119..de488a2 100644
--- a/node_modules/.vite/deps/uview-plus.js
+++ b/node_modules/.vite/deps/uview-plus.js
@@ -1,4 +1,4 @@
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/mixin/mixin.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/mixin/mixin.js
 var mixin_default = {
   // 定义每个组件都可能需要用到的外部样式以及类名
   props: {
@@ -129,10 +129,10 @@ var mixin_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/mixin/mpMixin.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/mixin/mpMixin.js
 var mpMixin_default = {};
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/utils.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/utils.js
 var { toString } = Object.prototype;
 function isArray(val) {
   return toString.call(val) === "[object Array]";
@@ -188,7 +188,7 @@ function isUndefined(val) {
   return typeof val === "undefined";
 }
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/helpers/buildURL.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/helpers/buildURL.js
 function encode(val) {
   return encodeURIComponent(val).replace(/%40/gi, "@").replace(/%3A/gi, ":").replace(/%24/g, "$").replace(/%2C/gi, ",").replace(/%20/g, "+").replace(/%5B/gi, "[").replace(/%5D/gi, "]");
 }
@@ -231,17 +231,17 @@ function buildURL(url2, params) {
   return url2;
 }
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/helpers/isAbsoluteURL.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/helpers/isAbsoluteURL.js
 function isAbsoluteURL(url2) {
   return /^([a-z][a-z\d+\-.]*:)?\/\//i.test(url2);
 }
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/helpers/combineURLs.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/helpers/combineURLs.js
 function combineURLs(baseURL, relativeURL) {
   return relativeURL ? `${baseURL.replace(/\/+$/, "")}/${relativeURL.replace(/^\/+/, "")}` : baseURL;
 }
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/buildFullPath.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/buildFullPath.js
 function buildFullPath(baseURL, requestedURL) {
   if (baseURL && !isAbsoluteURL(requestedURL)) {
     return combineURLs(baseURL, requestedURL);
@@ -249,7 +249,7 @@ function buildFullPath(baseURL, requestedURL) {
   return requestedURL;
 }
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/settle.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/settle.js
 function settle(resolve, reject, response) {
   const { validateStatus: validateStatus2 } = response.config;
   const status = response.statusCode;
@@ -260,7 +260,7 @@ function settle(resolve, reject, response) {
   }
 }
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/adapters/index.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/adapters/index.js
 var mergeKeys = (keys, config2) => {
   const config = {};
   keys.forEach((prop) => {
@@ -323,10 +323,10 @@ var adapters_default = (config) => new Promise((resolve, reject) => {
   }
 });
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/dispatchRequest.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/dispatchRequest.js
 var dispatchRequest_default = (config) => adapters_default(config);
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/InterceptorManager.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/InterceptorManager.js
 function InterceptorManager() {
   this.handlers = [];
 }
@@ -351,7 +351,7 @@ InterceptorManager.prototype.forEach = function forEach2(fn) {
 };
 var InterceptorManager_default = InterceptorManager;
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/mergeConfig.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/mergeConfig.js
 var mergeKeys2 = (keys, globalsConfig, config2) => {
   const config = {};
   keys.forEach((prop) => {
@@ -413,7 +413,7 @@ var mergeConfig_default = (globalsConfig, config2 = {}) => {
   return config;
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/defaults.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/defaults.js
 var defaults_default = {
   baseURL: "",
   header: {},
@@ -428,7 +428,7 @@ var defaults_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/utils/clone.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/utils/clone.js
 var clone = function() {
   "use strict";
   function _instanceof(obj, type) {
@@ -625,7 +625,7 @@ var clone = function() {
 }();
 var clone_default = clone;
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/Request.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/core/Request.js
 var Request = class {
   /**
   * @param {Object} arg - 全局配置
@@ -763,10 +763,10 @@ var Request = class {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/index.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/luch-request/index.js
 var luch_request_default = Request;
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/util/route.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/util/route.js
 var Router = class {
   constructor() {
     this.config = {
@@ -866,7 +866,7 @@ var Router = class {
 };
 var route_default = new Router().route;
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/colorGradient.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/colorGradient.js
 function colorGradient(startColor = "rgb(0, 0, 0)", endColor = "rgb(255, 255, 255)", step = 10) {
   const startRGB = hexToRgb(startColor, false);
   const startR = startRGB[0];
@@ -978,7 +978,7 @@ var colorGradient_default = {
   colorToRgba
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/test.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/test.js
 function email(value) {
   return /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/.test(value);
 }
@@ -1152,7 +1152,7 @@ var test_default = {
   string
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/debounce.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/debounce.js
 var timeout = null;
 function debounce(func2, wait = 500, immediate = false) {
   if (timeout !== null)
@@ -1172,7 +1172,7 @@ function debounce(func2, wait = 500, immediate = false) {
 }
 var debounce_default = debounce;
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/throttle.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/throttle.js
 var timer;
 var flag;
 function throttle(func2, wait = 500, immediate = true) {
@@ -1194,7 +1194,7 @@ function throttle(func2, wait = 500, immediate = true) {
 }
 var throttle_default = throttle;
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/digit.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/digit.js
 var _boundaryCheckingState = true;
 function strip(num, precision = 15) {
   return +parseFloat(Number(num).toPrecision(precision));
@@ -1258,7 +1258,7 @@ function round(num, ratio) {
   return result;
 }
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/index.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/index.js
 function range2(min = 0, max = 0, value = 0) {
   return Math.max(min, Math.min(max, Number(value)));
 }
@@ -1732,7 +1732,7 @@ var function_default = {
   setConfig
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/config.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/config.js
 var version = "3";
 if (true) {
   console.log(`
@@ -1767,7 +1767,7 @@ var config_default = {
   unit: "px"
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/actionSheet.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/actionSheet.js
 var actionSheet_default = {
   // action-sheet组件
   actionSheet: {
@@ -1785,7 +1785,7 @@ var actionSheet_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/album.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/album.js
 var album_default = {
   // album 组件
   album: {
@@ -1803,7 +1803,7 @@ var album_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/alert.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/alert.js
 var alert_default = {
   // alert警告组件
   alert: {
@@ -1818,7 +1818,7 @@ var alert_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/avatar.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/avatar.js
 var avatar_default = {
   // avatar 组件
   avatar: {
@@ -1839,7 +1839,7 @@ var avatar_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/avatarGroup.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/avatarGroup.js
 var avatarGroup_default = {
   // avatarGroup 组件
   avatarGroup: {
@@ -1855,7 +1855,7 @@ var avatarGroup_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/backtop.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/backtop.js
 var backtop_default = {
   // backtop组件
   backtop: {
@@ -1875,7 +1875,7 @@ var backtop_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/badge.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/badge.js
 var badge_default = {
   // 徽标数组件
   badge: {
@@ -1895,7 +1895,7 @@ var badge_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/button.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/button.js
 var button_default = {
   // button组件
   button: {
@@ -1930,7 +1930,7 @@ var button_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/calendar.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/calendar.js
 var calendar_default = {
   // calendar 组件
   calendar: {
@@ -1967,7 +1967,7 @@ var calendar_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/carKeyboard.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/carKeyboard.js
 var carKeyboard_default = {
   // 车牌号键盘
   carKeyboard: {
@@ -1975,7 +1975,7 @@ var carKeyboard_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/cell.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/cell.js
 var cell_default = {
   // cell组件的props
   cell: {
@@ -2003,7 +2003,7 @@ var cell_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/cellGroup.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/cellGroup.js
 var cellGroup_default = {
   // cell-group组件的props
   cellGroup: {
@@ -2013,7 +2013,7 @@ var cellGroup_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/checkbox.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/checkbox.js
 var checkbox_default = {
   // checkbox组件
   checkbox: {
@@ -2033,7 +2033,7 @@ var checkbox_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/checkboxGroup.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/checkboxGroup.js
 var checkboxGroup_default = {
   // checkbox-group组件
   checkboxGroup: {
@@ -2055,7 +2055,7 @@ var checkboxGroup_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/circleProgress.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/circleProgress.js
 var circleProgress_default = {
   // circleProgress 组件
   circleProgress: {
@@ -2063,7 +2063,7 @@ var circleProgress_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/code.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/code.js
 var code_default = {
   // code 组件
   code: {
@@ -2076,7 +2076,7 @@ var code_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/codeInput.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/codeInput.js
 var codeInput_default = {
   // codeInput 组件
   codeInput: {
@@ -2098,7 +2098,7 @@ var codeInput_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/col.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/col.js
 var col_default = {
   // col 组件
   col: {
@@ -2110,7 +2110,7 @@ var col_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/collapse.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/collapse.js
 var collapse_default = {
   // collapse 组件
   collapse: {
@@ -2120,7 +2120,7 @@ var collapse_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/collapseItem.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/collapseItem.js
 var collapseItem_default = {
   // collapseItem 组件
   collapseItem: {
@@ -2138,7 +2138,7 @@ var collapseItem_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/columnNotice.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/columnNotice.js
 var columnNotice_default = {
   // columnNotice 组件
   columnNotice: {
@@ -2155,7 +2155,7 @@ var columnNotice_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/countDown.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/countDown.js
 var countDown_default = {
   // u-count-down 计时器组件
   countDown: {
@@ -2166,7 +2166,7 @@ var countDown_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/countTo.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/countTo.js
 var countTo_default = {
   // countTo 组件
   countTo: {
@@ -2184,7 +2184,7 @@ var countTo_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/datetimePicker.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/datetimePicker.js
 var datetimePicker_default = {
   // datetimePicker 组件
   datetimePicker: {
@@ -2213,7 +2213,7 @@ var datetimePicker_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/divider.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/divider.js
 var divider_default = {
   // divider组件
   divider: {
@@ -2228,7 +2228,7 @@ var divider_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/empty.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/empty.js
 var empty_default = {
   // empty组件
   empty: {
@@ -2246,7 +2246,7 @@ var empty_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/form.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/form.js
 var form_default = {
   // form 组件
   form: {
@@ -2261,7 +2261,7 @@ var form_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/formItem.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/formItem.js
 var formItem_default = {
   // formItem 组件
   formItem: {
@@ -2276,7 +2276,7 @@ var formItem_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/gap.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/gap.js
 var gap_default = {
   // gap组件
   gap: {
@@ -2288,7 +2288,7 @@ var gap_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/grid.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/grid.js
 var grid_default = {
   // grid组件
   grid: {
@@ -2298,7 +2298,7 @@ var grid_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/gridItem.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/gridItem.js
 var gridItem_default = {
   // grid-item组件
   gridItem: {
@@ -2307,7 +2307,7 @@ var gridItem_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/icon.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/icon.js
 var {
   color
 } = config_default;
@@ -2334,7 +2334,7 @@ var icon_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/image.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/image.js
 var image_default = {
   // image组件
   image: {
@@ -2357,7 +2357,7 @@ var image_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/indexAnchor.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/indexAnchor.js
 var indexAnchor_default = {
   // indexAnchor 组件
   indexAnchor: {
@@ -2369,7 +2369,7 @@ var indexAnchor_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/indexList.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/indexList.js
 var indexList_default = {
   // indexList 组件
   indexList: {
@@ -2381,7 +2381,7 @@ var indexList_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/input.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/input.js
 var input_default = {
   // index 组件
   input: {
@@ -2422,7 +2422,7 @@ var input_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/keyboard.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/keyboard.js
 var keyboard_default = {
   // 键盘组件
   keyboard: {
@@ -2445,7 +2445,7 @@ var keyboard_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/line.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/line.js
 var line_default = {
   // line组件
   line: {
@@ -2458,7 +2458,7 @@ var line_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/lineProgress.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/lineProgress.js
 var lineProgress_default = {
   // lineProgress 组件
   lineProgress: {
@@ -2470,7 +2470,7 @@ var lineProgress_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/link.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/link.js
 var {
   color: color2
 } = config_default;
@@ -2487,7 +2487,7 @@ var link_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/list.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/list.js
 var list_default = {
   // list 组件
   list: {
@@ -2508,7 +2508,7 @@ var list_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/listItem.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/listItem.js
 var listItem_default = {
   // listItem 组件
   listItem: {
@@ -2516,7 +2516,7 @@ var listItem_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadingIcon.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadingIcon.js
 var {
   color: color3
 } = config_default;
@@ -2537,7 +2537,7 @@ var loadingIcon_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadingPage.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadingPage.js
 var loadingPage_default = {
   // loading-page组件
   loadingPage: {
@@ -2553,7 +2553,7 @@ var loadingPage_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadmore.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/loadmore.js
 var loadmore_default = {
   // loadmore 组件
   loadmore: {
@@ -2578,7 +2578,7 @@ var loadmore_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/modal.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/modal.js
 var modal_default = {
   // modal 组件
   modal: {
@@ -2601,7 +2601,7 @@ var modal_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/color.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/color.js
 var color4 = {
   primary: "#3c9cff",
   info: "#909399",
@@ -2617,7 +2617,7 @@ var color4 = {
 };
 var color_default = color4;
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/navbar.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/navbar.js
 var navbar_default = {
   // navbar 组件
   navbar: {
@@ -2640,7 +2640,7 @@ var navbar_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/noNetwork.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/noNetwork.js
 var noNetwork_default = {
   // noNetwork
   noNetwork: {
@@ -2650,7 +2650,7 @@ var noNetwork_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/noticeBar.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/noticeBar.js
 var noticeBar_default = {
   // noticeBar
   noticeBar: {
@@ -2670,7 +2670,7 @@ var noticeBar_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/notify.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/notify.js
 var notify_default = {
   // notify组件
   notify: {
@@ -2685,7 +2685,7 @@ var notify_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/numberBox.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/numberBox.js
 var numberBox_default = {
   // 步进器组件
   numberBox: {
@@ -2713,7 +2713,7 @@ var numberBox_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/numberKeyboard.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/numberKeyboard.js
 var numberKeyboard_default = {
   // 数字键盘
   numberKeyboard: {
@@ -2723,7 +2723,7 @@ var numberKeyboard_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/overlay.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/overlay.js
 var overlay_default = {
   // overlay组件
   overlay: {
@@ -2734,7 +2734,7 @@ var overlay_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/parse.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/parse.js
 var parse_default = {
   // parse
   parse: {
@@ -2749,7 +2749,7 @@ var parse_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/picker.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/picker.js
 var picker_default = {
   // picker
   picker: {
@@ -2771,7 +2771,7 @@ var picker_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/popup.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/popup.js
 var popup_default = {
   // popup组件
   popup: {
@@ -2794,7 +2794,7 @@ var popup_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/radio.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/radio.js
 var radio_default = {
   // radio组件
   radio: {
@@ -2814,7 +2814,7 @@ var radio_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/radioGroup.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/radioGroup.js
 var radioGroup_default = {
   // radio-group组件
   radioGroup: {
@@ -2837,7 +2837,7 @@ var radioGroup_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/rate.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/rate.js
 var rate_default = {
   // rate组件
   rate: {
@@ -2856,7 +2856,7 @@ var rate_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/readMore.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/readMore.js
 var readMore_default = {
   // readMore
   readMore: {
@@ -2871,7 +2871,7 @@ var readMore_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/row.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/row.js
 var row_default = {
   // row
   row: {
@@ -2881,7 +2881,7 @@ var row_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/rowNotice.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/rowNotice.js
 var rowNotice_default = {
   // rowNotice
   rowNotice: {
@@ -2895,7 +2895,7 @@ var rowNotice_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/scrollList.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/scrollList.js
 var scrollList_default = {
   // scrollList
   scrollList: {
@@ -2908,7 +2908,7 @@ var scrollList_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/search.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/search.js
 var search_default = {
   // search
   search: {
@@ -2938,7 +2938,7 @@ var search_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/section.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/section.js
 var section_default = {
   // u-section组件
   section: {
@@ -2955,7 +2955,7 @@ var section_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/skeleton.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/skeleton.js
 var skeleton_default = {
   // skeleton
   skeleton: {
@@ -2973,7 +2973,7 @@ var skeleton_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/slider.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/slider.js
 var slider_default = {
   // slider组件
   slider: {
@@ -2992,7 +2992,7 @@ var slider_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/statusBar.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/statusBar.js
 var statusBar_default = {
   // statusBar
   statusBar: {
@@ -3000,7 +3000,7 @@ var statusBar_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/steps.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/steps.js
 var steps_default = {
   // steps组件
   steps: {
@@ -3014,7 +3014,7 @@ var steps_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/stepsItem.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/stepsItem.js
 var stepsItem_default = {
   // steps-item组件
   stepsItem: {
@@ -3025,7 +3025,7 @@ var stepsItem_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/sticky.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/sticky.js
 var sticky_default = {
   // sticky组件
   sticky: {
@@ -3038,7 +3038,7 @@ var sticky_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/subsection.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/subsection.js
 var subsection_default = {
   // subsection组件
   subsection: {
@@ -3054,7 +3054,7 @@ var subsection_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipeAction.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipeAction.js
 var swipeAction_default = {
   // swipe-action组件
   swipeAction: {
@@ -3062,7 +3062,7 @@ var swipeAction_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipeActionItem.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipeActionItem.js
 var swipeActionItem_default = {
   // swipeActionItem 组件
   swipeActionItem: {
@@ -3076,7 +3076,7 @@ var swipeActionItem_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swiper.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swiper.js
 var swiper_default = {
   // swiper 组件
   swiper: {
@@ -3107,7 +3107,7 @@ var swiper_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipterIndicator.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/swipterIndicator.js
 var swipterIndicator_default = {
   // swiperIndicator 组件
   swiperIndicator: {
@@ -3119,7 +3119,7 @@ var swipterIndicator_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/switch.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/switch.js
 var switch_default = {
   // switch
   switch: {
@@ -3136,7 +3136,7 @@ var switch_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabbar.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabbar.js
 var tabbar_default = {
   // tabbar
   tabbar: {
@@ -3151,7 +3151,7 @@ var tabbar_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabbarItem.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabbarItem.js
 var tabbarItem_default = {
   //
   tabbarItem: {
@@ -3164,7 +3164,7 @@ var tabbarItem_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabs.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tabs.js
 var tabs_default = {
   //
   tabs: {
@@ -3189,7 +3189,7 @@ var tabs_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tag.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tag.js
 var tag_default = {
   // tag 组件
   tag: {
@@ -3211,7 +3211,7 @@ var tag_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/text.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/text.js
 var text_default = {
   // text 组件
   text: {
@@ -3241,7 +3241,7 @@ var text_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/textarea.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/textarea.js
 var textarea_default = {
   // textarea 组件
   textarea: {
@@ -3270,7 +3270,7 @@ var textarea_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/toast.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/toast.js
 var toast_default = {
   // toast组件
   toast: {
@@ -3293,7 +3293,7 @@ var toast_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/toolbar.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/toolbar.js
 var toolbar_default = {
   // toolbar 组件
   toolbar: {
@@ -3306,7 +3306,7 @@ var toolbar_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tooltip.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/tooltip.js
 var tooltip_default = {
   // tooltip 组件
   tooltip: {
@@ -3324,7 +3324,7 @@ var tooltip_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/transition.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/transition.js
 var transition_default = {
   // transition动画组件的props
   transition: {
@@ -3335,7 +3335,7 @@ var transition_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/upload.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props/upload.js
 var upload_default = {
   // upload组件
   upload: {
@@ -3364,7 +3364,7 @@ var upload_default = {
   }
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/props.js
 var {
   color: color5
 } = config_default;
@@ -3459,7 +3459,7 @@ var props_default = {
   ...upload_default
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/zIndex.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/config/zIndex.js
 var zIndex_default = {
   toast: 10090,
   noNetwork: 10080,
@@ -3472,13 +3472,13 @@ var zIndex_default = {
   indexListSticky: 965
 };
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/platform.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/libs/function/platform.js
 var platform = "none";
 platform = "vue3";
 platform = "h5";
 var platform_default = platform;
 
-// ../../../../../Project/uniapp/TraceabilityAPP/node_modules/uview-plus/index.js
+// ../../../../zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/index.js
 var pleaseSetTranspileDependencies = {};
 var babelTest = pleaseSetTranspileDependencies == null ? void 0 : pleaseSetTranspileDependencies.test;
 var $u = {
diff --git a/pages/Login/login.vue b/pages/Login/login.vue
index 8e8a5b5..b840ef0 100644
--- a/pages/Login/login.vue
+++ b/pages/Login/login.vue
@@ -444,19 +444,18 @@
 		reactive,
 		ref
 	} from 'vue';
+	import store from "@/store/index.js"
 
 
-
-
-	const store = useStore()
+	const stores = useStore()
 	const num = ref(0)
 	const isshow = ref(false)
 	const pwdShow = ref(false)
 	const tips = ref('获取验证码')
 	const countDown = ref(0); // 倒计时秒数
 	const formData = reactive({
-		account: "",
-		password: "",
+		account: "19130550023",
+		password: "a123456",
 		code: '',
 		scene: "2",
 		terminal: ''
@@ -560,12 +559,14 @@
 					title: '登陆中'
 				})
 
-				store.dispatch('saveUserInfo', res.data)
+				stores.dispatch('saveUserInfo', res.data)
 				setTimeout(() => {
 					uni.hideLoading()
-					uni.reLaunch({
+					store.dispatch('changeTabbar', 0)
+					uni.switchTab({
 						url: '/pages/index/massif'
 					})
+					console.log(store.state.tabbrIndex, "tabbar")
 					uni.$u.toast('登录成功');
 				}, 500)
 
diff --git a/pages/live/live.vue b/pages/live/live.vue
index 88cbcf1..2e888c0 100644
--- a/pages/live/live.vue
+++ b/pages/live/live.vue
@@ -29,9 +29,9 @@
 				windowWidth: '',
 				deviceId: "",
 				shwovideo: false,
-				shwovideoTimer: "",
 				initFailTimer: "",
 				flag: true,
+				SocketTask: "",
 
 			}
 		},
@@ -40,55 +40,21 @@
 			this.deviceId = option.device
 			this.videoUrl = option.url
 			this.videoUrl = this.replaceLastThreeChars(this.videoUrl, "mp4");
-			this.subNvue = uni.getSubNVueById('subNvue'); //获取 
+			// #ifndef H5
+			this.subNvue = uni.getSubNVueById('subNvue'); //获取
 			this.subNvue.show() // 显示
-			let data = {
+			// #endif
+
+			let datas = {
 				username: option.user,
 				device: 'lihai_lot_walnutpi_dev_' + option.device,
 				scene: 'app',
 			}
-			this.openScoket(data)
-			// this.canplay(option.device)
+			this.openScoket(datas)
 			this.platform = uni.getSystemInfoSync().platform
-			// this.windowWidth = uni.getSystemInfoSync().screenWidth //获取屏幕宽度
-			// this.boxStyle.width = this.windowWidth + 'px' //给宽度加px
-			// this.wHeight = uni.getSystemInfoSync().screenHeight; //获取屏幕高度
-			// this.boxStyle.height = this.wHeight; //改变视频高度
-
-			// console.log(this.boxStyle, 'boxstyle')
-
-			this.initFailTimer = setTimeout(() => {
-				if (this.flag) {
-					uni.$u.toast("初始化失败,请重新进入")
-					setTimeout(() => {
-						uni.navigateBack()
-					}, 1000)
-				}
-			}, 60000)
 		},
 
 		methods: {
-			canplay(id) {
-				let that = this
-				this.shwovideoTimer = setInterval(() => {
-					uni.request({
-						url: `http://rtsp.lihaink.cn/index/api/getMediaInfo?secret=YwDtp2llj80HA19JhMXL4Po99nsMAyNT&schema=rtsp&vhost=__defaultVhost__&app=live&stream=lihai_lot_walnutpi_dev_${id}`, //仅为示例，并非真实接口地址。
-						success: (res) => {
-							console.log("res", res.data.code);
-							if (res.data.code == 0) {
-								that.shwovideo = true
-								clearInterval(this.shwovideoTimer)
-							}
-						},
-						fail: (err) => {
-							console.log(err, "err")
-						}
-					});
-
-				}, 2500)
-
-			},
-
 			replaceLastThreeChars(str, replacement) {
 				if (str.length < 3) {
 					return replacement + str;
@@ -102,7 +68,6 @@
 			// 接收图片的base64编码  
 			receiveImg(data) {
 				this.imgSrc = (data.test)
-				console.log(this.imgSrc)
 				videoCover({
 					device_id: this.deviceId,
 					image: this.imgSrc
@@ -120,59 +85,53 @@
 				options.src = url;
 				this.vsrc = options;
 			},
-			openScoket(scoketData) {
+			openScoket(datas) {
 				let that = this
-				uni.connectSocket({
-					url: 'wss://iot.lihaink.cn/test'
+				this.SocketTask = uni.connectSocket({
+					url: 'wss://iot.lihaink.cn/test',
+					complete: () => {
+						console.log(that.socket, "socketTASK")
+					}
 				});
-				uni.onSocketOpen(function(res) {
-
-					console.log("scoket open")
-					uni.sendSocketMessage({
-						data: JSON.stringify(scoketData)
+				this.SocketTask.onOpen(function(res) {
+					that.SocketTask.send({
+						data: JSON.stringify(datas)
 					});
-					uni.onSocketMessage(function(res) {
-						console.log(JSON.parse(res.data).code, "收到消息")
+					that.SocketTask.onMessage(function(res) {
+						console.log(res, "收到消息")
 						if (JSON.parse(res.data).code == 200) {
 							that.shwovideo = true
 						}
 					});
 				});
-				uni.onSocketError(function(res) {
+				this.SocketTask.onError(function(res) {
 					console.log('WebSocket连接打开失败，请检查！');
 				});
-				uni.onSocketClose(function(res) {
+				this.SocketTask.onClose(function(res) {
 					console.log('WebSocket 已关闭！');
 				});
 			},
 			playVedio() {
+				// #ifndef H5
 				this.subNvue.hide()
+				// #endif
+				uni.createVideoContext('video', this).requestFullScreen();
 				this.flag = false
 				setTimeout(() => {
 					this.setUrl(this.videoUrl)
 				}, 2000)
-				// if (uni.getSystemInfoSync().platform == "ios") return
-				// uni.createVideoContext('video', this).requestFullScreen();
-				// screen.orientation.lock('landscape');
-
-
 			},
 			fullscreenchange(e) {
-				console.log(e, "e")
-
 				if (!e.detail.fullScreen) { // 退出全屏，锁定竖屏
 					plus.screen.lockOrientation('portrait-primary');
 				}
 			},
 
-
-		}
-
-		,
+		},
 		onUnload() {
-			uni.closeSocket();
-			clearTimeout(this.initFailTimer)
-			clearInterval(this.shwovideoTimer)
+			this.SocketTask.close();
+			this.SocketTask = null
+			console.log(this.socket, 'sosddsdsd')
 		},
 	}
 </script>
diff --git a/pages/live/live2.vue b/pages/live/live2.vue
deleted file mode 100644
index 1106c8c..0000000
--- a/pages/live/live2.vue
+++ /dev/null
@@ -1,20 +0,0 @@
-<template>
-
-	<view class="" v-if="show">
-		<video :controls="true" src="http://rtsp.lihaink.cn/live/lihai_lot_walnutpi_dev_5.live.mp4" :autoplay="true"
-			id="video"></video>
-	</view>
-	<view class="">
-		sdfsdf
-	</view>
-</template>
-
-<script setup>
-	import {
-		ref
-	} from "vue"
-	const show = ref(false)
-</script>
-
-<style>
-</style>
\ No newline at end of file
diff --git a/pages/live/liveIos.nvue b/pages/live/liveIos.nvue
new file mode 100644
index 0000000..dab4a76
--- /dev/null
+++ b/pages/live/liveIos.nvue
@@ -0,0 +1,111 @@
+<template>
+	<view>
+		<view>
+			<!-- :style="`width: ${videoHidth}px;height:${videoHeight}px;top:${videoOffset}px;left:${-videoOffset}px`" -->
+			<!-- style="width: 770px;height: 414px;top: 147px;left: -147px;" -->
+			<video v-if="shwovideo" @play="playVedio" @fullscreenchange="fullscreenchange" :controls="true"
+				:autoplay="true" :show-fullscreen-btn='false' :muted="true" :src="videoUrl" id="video" :style="`
+		width: ${videoWidth};
+		height: ${videoHeight};`"></video>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				imgSrc: "",
+				subNvue: "",
+				videoUrl: "",
+				videoUrl1: "https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/2minute-demo.mp4",
+				videoWidth: "",
+				videoHeight: "",
+				videoOffset: "",
+				object_fit: 'contain', //视频样式默认包含🌟
+				windowWidth: '',
+				deviceId: "",
+				shwovideo: false,
+				flag: true,
+				SocketTask: "",
+
+			}
+		},
+
+		onLoad(option) {
+			this.deviceId = option.device
+			this.videoUrl = option.url
+			this.subNvue = uni.getSubNVueById('subNvueIos'); //获取 
+			let datas = {
+				username: option.user,
+				device: 'lihai_lot_walnutpi_dev_' + option.device,
+				scene: 'app',
+			}
+			this.openScoket(datas)
+			let platform = uni.getSystemInfoSync()
+			this.videoHeight = platform.windowHeight
+			this.videoWidth = platform.windowWidth
+			this.videoOffset = platform.screenHeight - platform.windowHeight + platform.statusBarHeight
+		},
+
+		methods: {
+			openScoket(datas) {
+				let that = this
+				this.SocketTask = uni.connectSocket({
+					url: 'wss://iot.lihaink.cn/test',
+					complete: () => {
+						console.log(that.socket, "socketTASK")
+					}
+				});
+				this.SocketTask.onOpen(function(res) {
+					that.SocketTask.send({
+						data: JSON.stringify(datas)
+					});
+					that.SocketTask.onMessage(function(res) {
+						console.log(res, "收到消息")
+						if (JSON.parse(res.data).code == 200) {
+							that.shwovideo = true
+						}
+					});
+				});
+				this.SocketTask.onError(function(res) {
+					console.log('WebSocket连接打开失败，请检查！');
+				});
+				this.SocketTask.onClose(function(res) {
+					console.log('WebSocket 已关闭！');
+				});
+			},
+			playVedio() {
+				this.subNvue.hide()
+				this.flag = false
+
+			},
+			fullscreenchange(e) {
+				if (!e.detail.fullScreen) { // 退出全屏，锁定竖屏
+					plus.screen.lockOrientation('portrait-primary');
+				}
+			},
+
+
+		}
+
+		,
+		onUnload() {
+			this.SocketTask.close();
+			this.SocketTask = null
+			console.log(this.socket, 'sosddsdsd')
+		},
+	}
+</script>
+
+<style lang="scss">
+	.video {
+		// transform: rotate(90deg);
+		// position: absolute;
+		// width: 770;
+		// height: 414;
+		// top: 174px;
+		// left: -174px;
+		// transform: translate(-50%, -50%);
+	}
+</style>
\ No newline at end of file
diff --git a/pages/live/liveIos.vue b/pages/live/liveIos.vue
deleted file mode 100644
index b484909..0000000
--- a/pages/live/liveIos.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-<template>
-	<view>
-		<view>
-			<video v-if="shwovideo" @play="playVedio" @fullscreenchange="fullscreenchange" :controls="true"
-				:autoplay="true" style="width: 100vw;height: 100vh;" :src="videoUrl1" id="video"></video>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		videoCover
-	} from "@/api/api.js"
-	import {
-		Uploads
-	} from "@/api/upload.js"
-	export default {
-		data() {
-			return {
-				vsrc: {}, //用于renderjs通信  
-				imgSrc: "",
-				subNvue: "",
-				videoUrl: "",
-				videoUrl1: "https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/2minute-demo.mp4",
-				boxStyle: { //视频，图片封面样式🌟💗
-					'height': 0,
-					'width': 0,
-				},
-				object_fit: 'contain', //视频样式默认包含🌟
-				windowWidth: '',
-				deviceId: "",
-				shwovideo: false,
-				shwovideoTimer: "",
-				initFailTimer: "",
-				flag: true,
-
-			}
-		},
-
-		onLoad(option) {
-			this.deviceId = option.device
-			this.videoUrl = option.url
-			this.subNvue = uni.getSubNVueById('subNvueIos'); //获取 
-			this.subNvue.show() // 显示
-			let data = {
-				username: option.user,
-				device: 'lihai_lot_walnutpi_dev_' + option.device,
-				scene: 'app',
-			}
-			this.openScoket(data)
-			this.platform = uni.getSystemInfoSync().platform
-
-
-			this.initFailTimer = setTimeout(() => {
-				if (this.flag) {
-					uni.$u.toast("初始化失败,请重新进入")
-					setTimeout(() => {
-						uni.navigateBack()
-					}, 1000)
-				}
-			}, 60000)
-
-			setTimeout(() => {
-				this.shwovideo = true
-			}, 2000)
-		},
-
-		methods: {
-
-
-
-
-
-			openScoket(scoketData) {
-				let that = this
-				uni.connectSocket({
-					url: 'wss://iot.lihaink.cn/test'
-				});
-				uni.onSocketOpen(function(res) {
-
-					console.log("scoket open")
-					uni.sendSocketMessage({
-						data: JSON.stringify(scoketData)
-					});
-					uni.onSocketMessage(function(res) {
-						console.log(JSON.parse(res.data).code, "收到消息")
-						if (JSON.parse(res.data).code == 200) {
-							that.shwovideo = true
-						}
-					});
-				});
-				uni.onSocketError(function(res) {
-					console.log('WebSocket连接打开失败，请检查！');
-				});
-				uni.onSocketClose(function(res) {
-					console.log('WebSocket 已关闭！');
-				});
-			},
-			playVedio() {
-				this.subNvue.hide()
-				this.flag = false
-
-			},
-			fullscreenchange(e) {
-				console.log(e, "e")
-
-				if (!e.detail.fullScreen) { // 退出全屏，锁定竖屏
-					plus.screen.lockOrientation('portrait-primary');
-				}
-			},
-
-
-		}
-
-		,
-		onUnload() {
-			uni.closeSocket();
-			clearTimeout(this.initFailTimer)
-			clearInterval(this.shwovideoTimer)
-		},
-	}
-</script>
-
-<style lang="scss">
-	.vdo {
-		width: 100vw;
-		height: 100%;
-	}
-</style>
\ No newline at end of file
diff --git a/unpackage/dist/build/.nvue/app.js b/unpackage/dist/build/.nvue/app.js
index 68cba87..cd6b90c 100644
--- a/unpackage/dist/build/.nvue/app.js
+++ b/unpackage/dist/build/.nvue/app.js
@@ -1,3 +1,6 @@
+Promise.resolve("./pages/live/liveIos.js").then((res) => {
+  res.length;
+});
 Promise.resolve("./pages/addLand/select_address_n.js").then((res) => {
   res.length;
 });
diff --git a/unpackage/dist/dev/.nvue/app.js b/unpackage/dist/dev/.nvue/app.js
index 68cba87..cd6b90c 100644
--- a/unpackage/dist/dev/.nvue/app.js
+++ b/unpackage/dist/dev/.nvue/app.js
@@ -1,3 +1,6 @@
+Promise.resolve("./pages/live/liveIos.js").then((res) => {
+  res.length;
+});
 Promise.resolve("./pages/addLand/select_address_n.js").then((res) => {
   res.length;
 });