Merge branch 'master' of http://112.74.63.148:3000/litianbiao/shenze-sysMan

 Conflicts:

	yarn.lock

src/assets/language/en.json

@@ -306,6 +306,7 @@
     "pleaseConfirmAgainWhetherToOperate": "Please confirm again whether to operate",
     "IllThinkAboutItAgain": "I'll think about it again",
     "restartSucceeded": "Restart succeeded",
+    "deleteDeviceSucceed": "Delete device successfully",
     "sleepSuccessfully": "Sleep successfully",
     "open": "open",
     "close": "close",
@@ -419,6 +420,7 @@
       "batchPricePlace":"Please enter the batch price",
       "modifySubmit":"Modification submission"
     },
+    "deleteDevice":"Delete Device",
     "noPosition":"No positioning",
     "equipLocation":"Equipment location",
     "position":"position",

src/assets/language/zh.json

@@ -306,6 +306,7 @@
     "pleaseConfirmAgainWhetherToOperate": "请再次确认是否进行操作",
     "IllThinkAboutItAgain": "我再想想",
     "restartSucceeded": "重启成功",
+    "deleteDeviceSucceed": "删除设备成功",
     "sleepSuccessfully": "睡眠成功",
     "open": "开启",
     "close": "关闭",
@@ -370,6 +371,9 @@
     "sleepState": "睡眠状态",
     "sleeping": "睡眠中",
     "notSleeping": "未睡眠",
+	"sleepDesc": "睡眠描述",
+	"confirmLog": "确定",
+	"sleepDescPlace": "请输入睡眠描述",
     "lastRefreshTime": "最近刷新时间",
     "machineUniqueCode": "机器唯一编码",
     "furnaceHeadTemperature": "炉头温度",
@@ -419,6 +423,7 @@
       "batchPricePlace":"请输入批量价格",
       "modifySubmit":"修改提交"
     },
+	"deleteDevice":"删除设备",
     "noPosition":"暂无定位",
     "equipLocation":"设备位置",
     "position":"定位",

src/service/device/index.js

@@ -111,3 +111,11 @@ export function Api_getTApkInfo_updateApk(params) {
 export function Api_getDiscCodeStatus(params) {
   return axios.get(`/SZWL-SERVER/tEquipment/updateCouponStatus`, {params})
 }
+// 修改睡眠描述
+export function changeSleepDesc(params) {
+  return axios.get(`/SZWL-SERVER/tEquipmentDesc/updateSleepDesc`, {params})
+}
+// 删除设备
+export function delOneDevice(params) {
+  return axios.post(`http://127.0.0.1:49011/tEquipmentDeleted/delOneDevice`, {params})
+}

src/service/forgetPassword.js

@@ -9,8 +9,3 @@ export function sentForgetCode(params) {
 export function checkForgetCode(params) {
   return axios.post(`/SZWL-SERVER/tMessageCode/checkForgetCode?ifForeign=${params.ifForeign}&phoneOrEmail=${params.phoneOrEmail}&code=${params.code}`, params);
 }
-
-// 修改密码
-export function updatePassword(params) {
-  return axios.post(`/SZWL-SERVER/tAdmin/updatePassword?username=${params.username}&password=${params.password}`, params);
-}

src/views/changePassword.vue

@@ -90,7 +90,7 @@ export default {
           display: none;
         }
 
-        .van-field__control {
+        /deep/.van-field__control {
           height: 38px;
           line-height: 38px;
           padding: 6px;

src/views/device/deviceOper.vue

@@ -132,6 +132,18 @@
         </div>
         <div class="operText">{{ $t("device.modifyPrice") }}</div>
       </div>
+
+	  <!-- 删除设备 -->           <!--  这个deleteDevice 得完善一下 现在没取到接口要的id  -->
+	  <div v-if="user.type < 2" class="operItem" @click="deleteDevice()">
+	    <div class="operIcon">
+	      <img
+	        class="operImg"
+	        src="../../assets/device/operIcon/deletedevice.png"
+	      />
+	    </div>
+	    <div class="operText">{{ $t("device.deleteDevice") }}</div>
+	  </div>
+    
     </div>
   </van-dialog>
   <van-dialog
@@ -156,6 +168,8 @@
     </div>
   </van-dialog>
 </template>
+
+
 <script>
 import { onMounted, ref } from "vue";
 import {
@@ -163,6 +177,7 @@ import {
   sleepEquipment,
   openDoor,
   deviceTuoji,
+  delOneDevice,
 } from "../../service/device";
 import { Toast } from "vant";
 import { useRouter } from "vue-router";
@@ -256,6 +271,11 @@ export default {
       operType.value = 5;
       operCheckShow.value = true;
     };
+    // 删除设备
+    const deleteDevice = () => {
+      operType.value = 6;
+      operCheckShow.value = true;
+    };
     // 取消操作
     const operCheckClear = () => {
       operCheckShow.value = false;
@@ -334,6 +354,19 @@ export default {
           Toast.fail(data.message);
         }
       }
+      // 删除设备
+      if (operType.value === 6) {
+        const { data } = await delOneDevice({
+          equipmentId: device.value.id,
+          adminId: user.id,
+        });
+        if (data.code) {
+          Toast.success(t("device.deleteDeviceSucceed"));
+          operCheckShow.value = false;
+        } else {
+          Toast.fail(data.message);
+        }
+      }
       // 关闭弹窗
       show.value = false;
       // 触发操作完成回调
@@ -344,6 +377,7 @@ export default {
     };
 
     return {
+      user,
       device,
       show,
       operCheckShow,
@@ -364,6 +398,7 @@ export default {
       isRole,
       modifyPriceClk,
       sleepTitle,
+      deleteDevice,
     };
   },
   components: {},

src/views/device/index.vue

@@ -110,12 +110,39 @@
                     >
                     <!-- <van-switch size="24px" v-model="item.isSleep" /> -->
                   </div>
+				  <div class="layer8_1 o-ptb-10">
+					  <span v-if="item.isSleep" class="word8_1">
+					  	<div v-if="!sleepDescBoxShow" >
+							<span>{{ $t("device.sleepDesc") }}: 
+								<van-field
+								  class="word8_2"
+								  v-model="item.sleepDesc"
+								  :placeholder="$t('device.sleepDescPlace')"
+								>
+								<template #button>
+									<van-button
+									  type="primary"
+									  @click="sleepDescChg(item.sleepDesc, item.id)"
+									  >{{ $t("device.confirmLog") }}
+									</van-button>
+									<van-icon name="edit" class="editIcon" @click="editSleepDesc()" />
+								</template>
+								</van-field>
+							</span>
+					  	</div>
+					  	<div v-else>
+					  	  <span class="word8_3" >{{ $t("device.sleepDesc") }}: 
+						  {{item.sleepDesc ==null ? "暂停营业" : item.sleepDesc}}</span>
+					  	  <van-icon name="edit" class="editIcon" @click="editSleepDesc()" />
+					  	</div>
+					  </span>
+				  </div>
                   <!-- <span class="txt5 o-ptb-10 kBordBott l-flex-RC"><span>一键重启炉头：</span>
                     <van-button type="primary">重启</van-button>
                   </span> -->
                   <div class="word9 o-ptb-10 kBordBott l-flex-between">
                     <span>
-                      {{ $t("device.furnHeadStatus") }}:{{
+                      {{ $t("device.furnHeadStatus") }}: {{
                         item.eqeStatus === 1
                           ? $t("device.opened")
                           : $t("device.closed")
@@ -281,6 +308,7 @@ import {
   getDeviceList,
   eliminate,
   Api_getReplenishment,
+  changeSleepDesc,
 } from "@/service/device/index";
 import deviceSearch from "./deviceSearch.vue";
 import deviceOper from "./deviceOper.vue";
@@ -302,6 +330,8 @@ export default {
     const router = useRouter();
     const sys = ref(null);
     const user = getLoginUser();
+	//控制睡眠描述的显示隐藏
+	const sleepDescBoxShow = ref(true);
     // 页面列表查询参数
     let searchParams = reactive({
       id: "", // 用户账户id
@@ -457,6 +487,29 @@ export default {
       list.value = [];
       getList();
     };
+	// 点击修改图标
+	const editSleepDesc = () => {
+		sleepDescBoxShow.value = !sleepDescBoxShow.value;
+	}
+	// 点击睡眠描述的确定按钮
+	const sleepDescChg = async (sleepDesc, id) => {
+		console.log(sleepDesc);
+		if (!sleepDesc) {
+		  Toast(t("device.sleepDescPlace"));
+		} else {
+		  const { data } = await changeSleepDesc({
+		    equipmentId: id,
+		    sleepDesc,
+		  });
+		  if (data.code === "00000") {
+			sleepDescBoxShow.value = true;
+		    Toast(data.message);
+		    // setTimeout(() => {
+		    //   gettAdminGetRelation();
+		    // }, 500);
+		  }
+		}
+	}
     return {
       ...toRefs(searchParams),
       list,
@@ -479,6 +532,9 @@ export default {
       operFinish,
       equipStatus,
       eqeStatusClk,
+	  editSleepDesc,
+	  sleepDescBoxShow,
+	  sleepDescChg,
     };
   },
 };
@@ -933,6 +989,27 @@ export default {
               margin: 0;
             }
           }
+		  
+		  .layer8_1 {
+			  width: 100%;
+			  
+			.word8_1 {
+				width: 100%;
+				font-size: 14px;
+
+			}
+			.word8_2 {
+				width: 75%;
+			}
+			.word8_3 {
+				width: 70%;
+			}
+			
+			.editIcon {
+			  font-size: 20px;
+			  color: #4d6add;
+			}  
+		  }
 
           .word9 {
             width: 100%;

src/views/discountCode/payCode.vue

@@ -166,7 +166,13 @@ export default {
 @import "./index.less";
 .discountCodePage {
   /deep/ .van-field__button{
-    width: 100px;
+    width: 150px;
+  }
+  .van-field{
+	width:100%;
+	display: flex;
+	align-items: center;//上下对齐
+	justify-content: space-between; 
   }
 }
 </style>

src/views/forgetPassword.vue

@@ -7,13 +7,13 @@
         <van-field
           v-model="username"
           name="username"
-          :label="$t('forgetPassword.usernameLabel')"
+          
           :placeholder="$t('forgetPassword.usernamePlaceholder')"
           :rules="[{ required: true, message: $t('forgetPassword.usernameRequired') }]"
         />
         <span class="info2">{{$t('forgetPassword.selectForgetPassword')}}</span>
         <div class="van-cell van-field">
-          <div class="van-cell__title van-field__label"><span></span></div>
+          
           <div class="van-cell__value van-field__value radioBox">
             <van-radio-group v-model="ifForeign" direction="horizontal">
               <van-radio name="0" icon-size="18px">{{$t('forgetPassword.phone')}}</van-radio>
@@ -27,7 +27,7 @@
             v-model="phone"
             name="phone"
             type="tel"
-            :label="$t('forgetPassword.phoneLabel')"
+            
             :placeholder="$t('forgetPassword.phonePlaceholder')"
             :rules="[{ required: true, message: $t('forgetPassword.phoneRequired') }]"
           >
@@ -41,12 +41,12 @@
           <van-field
             v-model="email"
             name="email"
-            :label="$t('forgetPassword.emailLabel')"
+            
             :placeholder="$t('forgetPassword.emailPlaceholder')"
             :rules="[{ required: true, message: $t('forgetPassword.emailRequired') }]"
           >
             <template #button>
-              <van-button size="small" type="primary" @click="seedVerCode()" :disabled="time !== 0" style="color: black;">{{time === 0 ? $t('forgetPassword.seedVerCode') : time + '秒后可重发'}}</van-button>
+              <van-button size="small" type="primary" @click="seedVerCode()" :disabled="time !== 0">{{time === 0 ? $t('forgetPassword.seedVerCode') : time + '秒后可重发'}}</van-button>
             </template>
           </van-field>
         </div>
@@ -158,8 +158,8 @@ export default {
         margin-top: 20px;
         overflow: visible;
         &::after { display: none;}
-		.van-field__button button { background-color: #4d6add; color: #fff; }
-        .van-field__control {
+		.van-field__button button { background-color: #8096ec; color: #fff; }
+        /deep/.van-field__control {
           height: 38px;
           line-height: 38px;
           padding: 6px;

src/views/home/index.vue

@@ -241,16 +241,16 @@ export default {
       if (data.code && data.data) {
         salesVolume.value = 0;
         salesNumber.value = 0;
-		orderNumber.value = 0;
+		    orderNumber.value = 0;
         data.data.series[0].data.forEach((item) => {
           salesNumber.value = parseInt(salesNumber.value + item);
         });
         data.data.series[1].data.forEach((item) => {
           salesVolume.value = parseInt(salesVolume.value + item);
         });
-		data.data.series[2].data.forEach((item) => {
-		  orderNumber.value = parseInt(orderNumber.value + item);
-		});
+		    data.data.series[2].data.forEach((item) => {
+		      orderNumber.value = parseInt(orderNumber.value + item);
+		    });
         // 解决eacharts与v-if的渲染问题
         await nextTick();
         if (chartBox.value) {

src/views/register.vue

@@ -11,6 +11,7 @@
           :placeholder="$t('register.usernamePlaceholder')"
           :rules="[{ required: true, message: $t('register.usernameRequired') }]"
         />
+		<br>
         <van-field
           v-model="name"
           name="name"
@@ -18,6 +19,7 @@
           :placeholder="$t('register.namePlaceholder')"
           :rules="[{ required: true, message: $t('register.nameRequired') }]"
         />
+		<br>
         <van-field
           v-model="password"
           name="password"
@@ -26,6 +28,7 @@
           :placeholder="$t('register.passwordPlaceholder')"
           :rules="[{ required: true, message: $t('register.passwordRequired') }]"
         />
+		<br>
         <van-field
           v-model="passwordCheck"
           name="passwordCheck"
@@ -34,6 +37,7 @@
           :placeholder="$t('register.passwordCheckPlaceholder')"
           :rules="[{ required: true, message: $t('register.passwordCheckRequired') }]"
         />
+		<br>
         <div class="van-cell van-field">
           <div class="van-cell__title van-field__label"><span>{{$t('register.country')}}</span></div>
           <div class="van-cell__value van-field__value radioBox">
@@ -44,6 +48,7 @@
           </div>
         </div>
         <van-field
+		  v-if="ifForeign === '0'"
           v-model="phone"
           name="phone"
           type="tel"
@@ -55,6 +60,7 @@
             <van-button size="small" type="primary" @click="seedVerCode()" :disabled="time !== 0">{{time === 0 ? $t('register.seedVerCode') : time + $t('register.replaysInSeconds')}}</van-button>
           </template>
         </van-field>
+		<br v-if="ifForeign === '0'">
         <van-field
           v-if="ifForeign === '0'"
           v-model="code"
@@ -63,7 +69,9 @@
           :placeholder="$t('register.codePlaceholder')"
           :rules="[{ required: true, message: $t('register.codeRequired') }]"
         />
+		<br v-if="ifForeign === '0'">
         <van-field
+		  v-if="ifForeign === '1'"
           v-model="email"
           name="email"
           :label="$t('register.emailLabel')"
@@ -74,6 +82,7 @@
             <van-button size="small" type="primary" @click="seedVerCode()" :disabled="time !== 0">{{time === 0 ? $t('register.seedVerCode') : time + $t('register.replaysInSeconds')}}</van-button>
           </template>
         </van-field>
+		<br v-if="ifForeign === '1'">
         <van-field
           v-if="ifForeign === '1'"
           v-model="code"
@@ -81,7 +90,8 @@
           :label="$t('register.emailCodeLabel')"
           :placeholder="$t('register.emailCodePlaceholder')"
           :rules="[{ required: true, message: $t('register.emailCodeRequired') }]"
-        />
+        /> 
+		<br v-if="ifForeign === '1'">
         <van-button round type="primary" class="register" native-type="submit">{{$t('register.registerButton')}}</van-button>
       </van-form>
     </div>

vue.config.js

@@ -6,7 +6,8 @@ module.exports = {
 		open: true,
     proxy: {
       '/': { //前端任何含/api的URL请求都会被反向代理。如http://localhost:8000/xxx/api/source/xxx的请求会变成服务器的反向代理请求
-        target: 'http://112.74.63.148:49011', //原来请求的服务器IP地址会换成此地址，如以上地址会变成http://localhost:5000/xxx/api/source/xxx
+        target: 'http://127.0.0.1:49011', //原来请求的服务器IP地址会换成此地址，如以上地址会变成http://localhost:5000/xxx/api/source/xxx
+        // target: 'http://112.74.63.148:49011', //原来请求的服务器IP地址会换成此地址，如以上地址会变成http://localhost:5000/xxx/api/source/xxx
         changeOrigin: true, // 是否跨域
         pathRewrite: {
           // '.+?/api': '/api'

yarn.lock

@@ -3,38 +3,43 @@
 
 
 "@achrinza/node-ipc@9.2.2":
-  version "9.2.2"
-  resolved "https://registry.npmjs.org/@achrinza/node-ipc/-/node-ipc-9.2.2.tgz"
-  integrity sha512-b90U39dx0cU6emsOvy5hxU4ApNXnE3+Tuo8XQZfiKTGelDwpMwBVgBP7QX6dGTcJgu/miyJuNJ/2naFBliNWEw==
+  "integrity" "sha512-b90U39dx0cU6emsOvy5hxU4ApNXnE3+Tuo8XQZfiKTGelDwpMwBVgBP7QX6dGTcJgu/miyJuNJ/2naFBliNWEw=="
+  "resolved" "https://registry.npmjs.org/@achrinza/node-ipc/-/node-ipc-9.2.2.tgz"
+  "version" "9.2.2"
   dependencies:
     "@node-ipc/js-queue" "2.0.3"
-    event-pubsub "4.3.0"
-    js-message "1.0.7"
+    "event-pubsub" "4.3.0"
+    "js-message" "1.0.7"
+
+"@amap/amap-jsapi-loader@^1.0.1":
+  "integrity" "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw=="
+  "resolved" "https://registry.npmjs.org/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz"
+  "version" "1.0.1"
 
 "@ampproject/remapping@^2.1.0":
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz"
-  integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
+  "integrity" "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w=="
+  "resolved" "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz"
+  "version" "2.2.0"
   dependencies:
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz"
-  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
+  "integrity" "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="
+  "resolved" "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
     "@babel/highlight" "^7.18.6"
 
 "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.18.6":
-  version "7.18.8"
-  resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz"
-  integrity sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==
+  "integrity" "sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ=="
+  "resolved" "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz"
+  "version" "7.18.8"
 
-"@babel/core@^7.11.0":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/core/-/core-7.18.6.tgz"
-  integrity sha512-cQbWBpxcbbs/IUredIPkHiAGULLV8iwgNRMFzvbhEXISp4f3rUUXE5+TIw6KwUWUR3DwyI6gmBRnmAtYaWehwQ==
+"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.11.0", "@babel/core@^7.12.0", "@babel/core@^7.13.0", "@babel/core@^7.4.0-0":
+  "integrity" "sha512-cQbWBpxcbbs/IUredIPkHiAGULLV8iwgNRMFzvbhEXISp4f3rUUXE5+TIw6KwUWUR3DwyI6gmBRnmAtYaWehwQ=="
+  "resolved" "https://registry.npmjs.org/@babel/core/-/core-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
     "@ampproject/remapping" "^2.1.0"
     "@babel/code-frame" "^7.18.6"
@@ -46,32 +51,32 @@
     "@babel/template" "^7.18.6"
     "@babel/traverse" "^7.18.6"
     "@babel/types" "^7.18.6"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.2.1"
-    semver "^6.3.0"
+    "convert-source-map" "^1.7.0"
+    "debug" "^4.1.0"
+    "gensync" "^1.0.0-beta.2"
+    "json5" "^2.2.1"
+    "semver" "^6.3.0"
 
 "@babel/generator@^7.18.6", "@babel/generator@^7.18.7":
-  version "7.18.7"
-  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.18.7.tgz"
-  integrity sha512-shck+7VLlY72a2w9c3zYWuE1pwOKEiQHV7GTUbSnhyl5eu3i04t30tBY82ZRWrDfo3gkakCFtevExnxbkf2a3A==
+  "integrity" "sha512-shck+7VLlY72a2w9c3zYWuE1pwOKEiQHV7GTUbSnhyl5eu3i04t30tBY82ZRWrDfo3gkakCFtevExnxbkf2a3A=="
+  "resolved" "https://registry.npmjs.org/@babel/generator/-/generator-7.18.7.tgz"
+  "version" "7.18.7"
   dependencies:
     "@babel/types" "^7.18.7"
     "@jridgewell/gen-mapping" "^0.3.2"
-    jsesc "^2.5.1"
+    "jsesc" "^2.5.1"
 
 "@babel/helper-annotate-as-pure@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz"
-  integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==
+  "integrity" "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
     "@babel/types" "^7.18.6"
 
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.6.tgz"
-  integrity sha512-KT10c1oWEpmrIRYnthbzHgoOf6B+Xd6a5yhdbNtdhtG7aO1or5HViuf1TQR36xY/QprXA5nvxO6nAjhJ4y38jw==
+  "integrity" "sha512-KT10c1oWEpmrIRYnthbzHgoOf6B+Xd6a5yhdbNtdhtG7aO1or5HViuf1TQR36xY/QprXA5nvxO6nAjhJ4y38jw=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
     "@babel/helper-explode-assignable-expression" "^7.18.6"
     "@babel/types" "^7.18.6"
@@ -100,17 +105,17 @@
     "@babel/helper-split-export-declaration" "^7.18.6"
 
 "@babel/helper-create-regexp-features-plugin@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz"
-  integrity sha512-7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A==
+  "integrity" "sha512-7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
-    regexpu-core "^5.1.0"
+    "regexpu-core" "^5.1.0"
 
 "@babel/helper-define-polyfill-provider@^0.3.1":
-  version "0.3.1"
-  resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz"
-  integrity sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==
+  "integrity" "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz"
+  "version" "0.3.1"
   dependencies:
     "@babel/helper-compilation-targets" "^7.13.0"
     "@babel/helper-module-imports" "^7.12.13"
@@ -127,16 +132,16 @@
   "version" "7.18.6"
 
 "@babel/helper-explode-assignable-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz"
-  integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==
+  "integrity" "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
     "@babel/types" "^7.18.6"
 
 "@babel/helper-function-name@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.6.tgz"
-  integrity sha512-0mWMxV1aC97dhjCah5U5Ua7668r5ZmSC2DLfH2EZnf9c3/dHZKiFa5pRLMH5tjSl471tY6496ZWk/kjNONBxhw==
+  "integrity" "sha512-0mWMxV1aC97dhjCah5U5Ua7668r5ZmSC2DLfH2EZnf9c3/dHZKiFa5pRLMH5tjSl471tY6496ZWk/kjNONBxhw=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
     "@babel/template" "^7.18.6"
     "@babel/types" "^7.18.6"