Merge branch 'master' of git.zdool.com:xs/yyx/h5

src/pages/PersonalCenter/PersonalCenter.vue

@@ -83,7 +83,7 @@
 					<text class="person_itm_sign_tit">头像</text>
 					<view class="person_itm_sign_right">
 
-                         <image class="avator" :src='imgUrl' >
+						<image class="avator" :src='imgUrl'>
 						</image>
 
 						<u-icon name="arrow-right"></u-icon>
@@ -125,6 +125,7 @@
 
 
 
+			<!-- <view class="person_itm_sign" @click="goChangeInfo('艺术成就',JSON.parse(userInfoObj.artAtt))"> -->
 			<view class="person_itm_sign" @click="goChangeInfo('艺术成就',JSON.parse(userInfoObj.artAtt))">
 				<text class="person_itm_sign_tit">艺术成就</text>
 				<view class="person_itm_sign_right">
@@ -140,6 +141,7 @@
 				</view>
 			</view>
 			<view class="person_itm_sign" @click="goChangeInfo('代表作',JSON.parse(userInfoObj.opus))">
+				<!-- <view class="person_itm_sign" @click="goChangeInfo('代表作',JSON.parse('[null]'))"> -->
 				<text class="person_itm_sign_tit">代表作</text>
 				<view class="person_itm_sign_right">
 					<u-icon name="arrow-right"></u-icon>
@@ -269,7 +271,7 @@
 
 				xieName: '',
 				userType: '',
-                imgUrl:''
+				imgUrl: ''
 			};
 		},
 		methods: {
@@ -282,10 +284,24 @@
 			},
 			requestUserinfo() {
 				this.http.request('/user/userInfo', {}, "GET").then((res) => {
+					// 因为异步问题  res 打印出来的是 最后的结果
 					console.log("res", res.data);
-                    this.userInfoObj = res.data
+					this.userInfoObj = res.data;
+					if(res.data.artAtt==""){
+						 
+						this.userInfoObj.artAtt= JSON.stringify([""])
+					 
+					}
+					if(res.data.greats==""){
+						this.userInfoObj.greats= JSON.stringify([""])
+					}
+					if(res.data.opus=="[]"){
+						this.userInfoObj.opus= JSON.stringify([""])
+					}
+					 
+
 					// this.imgUrl=baseurl+JSON.parse(this.userInfoObj.images)[0]
-                  this.imgUrl= JSON.parse(this.userInfoObj.images)[0]
+					this.imgUrl = JSON.parse(this.userInfoObj.images)[0]
 
 				}).catch((error) => {
 					uni.showToast({
@@ -293,14 +309,15 @@
 					})
 
 				})
-            },goChangePasw(){
+			},
+			goChangePasw() {
 				uni.navigateTo({
-                    url:'/pages/PersonalCenter/changePasw'
+					url: '/pages/PersonalCenter/changePasw'
 				})
 			}
 		},
 		onReady() {
-            this.requestUserinfo()
+			// this.requestUserinfo()
 		},
 		onShow() {
 			this.requestUserinfo()

src/pages/PersonalCenter/ReEditSingleInfo.vue

@@ -52,8 +52,8 @@
 		<!-- 成就类 -->
 		<view class=" m16" v-if="Edkey=='艺术成就'||Edkey=='荣誉奖项'">
 			<view class="flc-top" v-for="(v,i) in Edvalue" :key="i">
-                <input type="text " style="flex: 1; padding: 18rpx 32rpx;     " class=" gray" v-model="Edvalue[i]"
+				<input type="text " style="flex: 1; padding: 18rpx 32rpx;     " class=" gray" v-model.trim="Edvalue[i]"
-                    placeholder="请输入艺术成就" />
+					:placeholder="Edkey=='艺术成就' ? '请输入艺术成就' :'请输入荣誉奖项' " />
 
 				<view class="right_img_box">
 
@@ -76,7 +76,7 @@
 
 			<view v-for="(val,index) in StandradList" :key="index">
 				<view class="opus_inputBox">
-                    <input type="text" v-model="StandradList[index]" placeholder="请输入作品名称" class="opus_inputBox_inpt" />
+					<input type="text" v-model.trim="StandradList[index]" placeholder="请输入作品名称" class="opus_inputBox_inpt" />
 					<view class="opus_inputBox_img">
 						<view style="width: 80rpx; height: 80rpx;" class="addImg" @click="AddItem"
 							v-if="StandradList.length==index+1">
@@ -108,9 +108,7 @@
 				<image style="width: 172rpx;height: 172rpx;" src="../../static/improveData/jia.png"></image>
 			</u-upload>
 		</view>
-
 		<!-- 头像上传 ed-->
-
 		<!-- 实景 资质上传  -->
 		<view v-if="Edkey=='实景照'||Edkey=='资质证'">
 			<u-upload style="margin: 16rpx 32rpx 0rpx;" accept="image" width="172rpx" height="172rpx"
@@ -118,36 +116,22 @@
 				<image style="width: 172rpx;height: 172rpx;" src="../../static/improveData/jia.png"></image>
 			</u-upload>
 		</view>
-
 		<!-- 实景 资质上传 ed-->
-
-
-
-
-
-
 		<u-picker :show="zhengzhiShow" confirmColor="#99241B" @confirm="confimZheng" immediateChange closeOnClickOverlay
 			@close="zhengzhiClose" @cancel="zhengzhiClose"
 			:columns="Edkey=='政治面貌'? Zhengcolumns : Edkey =='民族' ? Zucolumns : Edkey=='籍贯' ? Jicolumns : Edkey=='人才类型'?  peopleSkillColums:Edkey=='所属协会'? xiecolumns:[]">
 		</u-picker>
-
 		<u-datetime-picker confirmColor="#99241B" :minDate="-2207520000000" :maxDate="1786778555000"
 			:show="showBirthday" v-if="Edkey=='出生日期'||Edkey=='入会时间'||Edkey=='服务开始时间'||Edkey=='服务结束时间'" :value="Edvalue"
 			:mode="timeMode" closeOnClickOverlay @confirm="birthdayConfirm" @cancel="birthdayClose"
 			@close="birthdayClose">
 		</u-datetime-picker>
-
-
-
 		<!-- 服务内容介绍 -->
 		<view class="textAreaInfo" v-if="Edkey == '服务内容介绍'">
 			<u--textarea v-model="Edvalue" placeholder="请输入介绍" style="background-color: #F8F8F8;">
 			</u--textarea>
 		</view>
 		<!-- 服务内容介绍ed -->
-
-
-
 		<!-- #D5D4D6 -->
 		<u-button class="custom-style" :disabled='!isSubmit'
 			style="background-color:#99241B ; color: #FFFFFF; margin-top: 32rpx;  width: calc(100% - 96rpx);"
@@ -196,8 +180,8 @@
 				},
 				timeMode: 'date', //时间选择器模式 date tiem
 				postFileList2: [], //用来上传的数组
-                // baseurl: http.config.baseUrl.replace('/h5/api', ''),
+				baseurl: http.config.baseUrl.replace('/h5/api', ''),
-                baseurl:'',
+				// baseurl: '',
 				fileList4: [], //头像上传
 				fileList1: [], //资质证 实景照
 				fileList2: [], //代表作照片
@@ -224,7 +208,8 @@
 				peopleSkillColums: [
 					["书法家", "画家", "雕塑家"]
 				],
-                xiehuiObj: {}//协会的name id 为key value  对象
+				xiehuiObj: {} ,//协会的name id 为key value  对象
+				artHonrList:[""]
 			};
 		},
 		onLoad(opt) {
@@ -236,6 +221,10 @@
 			uni.setNavigationBarTitle({
 				title: JSON.parse(opt.key)
 			})
+			/* if(this.Edkey == '艺术成就' || this.Edkey == '荣誉奖项'){
+				console.log("this.EdvaluePPPPPPP",JSON.parse(JSON.stringify(opt.value)));
+				 
+			} */
 			// 日期选择器模式的转换
 			if (this.Edkey == '出生日期' || this.Edkey == '入会时间') {
 				this.timeMode = 'date'
@@ -287,24 +276,35 @@
 			}
 			if (this.Edkey == '代表作') {
 				this.isSubmit = true
+
 				// 分化为 stanlist  和fileList2 
+				this.fileList2 = []
+				if (opt.value =='[""]') {
+					this.StandradList = [""]
+					this.fileList2 = [[]]
+					this.postFileList2=[[]]
+				} else {
+					// console.log("this.Edvalue++++", this.Edvalue);
 					this.Edvalue.map((v, i) => {
 						this.StandradList.push(v.name)
-                    this.fileList2.push(v.value)
+						this.fileList2.push(v.value ? v.value : [])
 					})
-                console.log("flieList2", this.fileList2);
+					// console.log("StandradList", this.StandradList);
-                console.log("this.Edvalue==", this.Edvalue);
+					// console.log("this.Edvalue==", this.Edvalue);
 					// 代表作 提交用的 数组
 					this.postFileList2 = this.Edvalue.map((v, i) => {
-                    return v.value
+						return v.value ? v.value : ['']
 					})
-                console.log(" this.postFileList2===", this.postFileList2);
+					// console.log(" this.postFileList2===", this.postFileList2);
 					var urL = this.baseurl
+					// console.log("ddd", urL);
 					var sarr = this.fileList2.map((v, i) => {
+						// console.log("vv", v);
 						return v.map((vv, ii) => {
 							return urL + vv
 						})
 					})
+					// console.log("sarr", sarr);
 					this.fileList2 = this.fileList2.map((v, i) => {
 						return v = []
 					})
@@ -320,15 +320,13 @@
 					// this.fileList2.splice(1,0)
 					console.log(" this.fileList2", this.fileList2);
 				}
+
+			}
 		},
 
 		onReady() {
 
 			// this.$refs.form1.setRules(this.rules);
-
-
-
-
 		},
 		methods: {
 			AddItem() {
@@ -345,7 +343,7 @@
 					// 是用来 显示 作品名称 和 列数的
 					this.StandradList.splice(num, 1)
 					// 是用来显示
-                    this.fileList2.splice(num, 1 )
+					this.fileList2.splice(num, 1)
 					// 是用来 提交修改数据用的
 					this.postFileList2.splice(num, 1)
 				} else {
@@ -467,9 +465,12 @@
 						})
 					}
 				} else if (this.Edkey == '艺术成就' || this.Edkey == '荣誉奖项') {
-                    var str = JSON.stringify(this.Edvalue)
+					console.log("艺术成就", this.Edvalue);
 				 
+					 var str = JSON.stringify(this.Edvalue)
+					if(this.Edvalue[0]){
 						if (this.Edkey == '艺术成就') {
+						
 							this.PostChangerRequest({
 								'artAtt':   str
 							})
@@ -478,10 +479,50 @@
 								'greats': str
 							})
 						}
+					}else{
+						console.log("11");
+						if (this.Edkey == '艺术成就') {
+						
+							this.PostChangerRequest({
+								'artAtt': ''
+							})
+						} else {
+							this.PostChangerRequest({
+								'greats':''
+							})
+						}
+					}
 
 				} else if (this.Edkey == '代表作') {
-                    // console.log("submit", this.postFileList2);
+					 
-                    // this.StandradList
+					var opsArr = []
+					for (let i = 0; i < this.StandradList.length; i++) {
+						// console.log("=====", this.fileList2);
+						opsArr.push({
+							name: this.StandradList[i] ?this.StandradList[i]: '' ,
+							value: this.postFileList2[i]? this.postFileList2[i] : []
+						})
+					}
+					var isNull= opsArr.every((v,i)=>{
+						 return v.name==''
+					 })
+					 
+					 
+					 console.log("isNul",isNull);
+					console.log("opsArr", opsArr);
+					 
+					 // isNull  是否所有作品名称 都没有
+					if(isNull){
+						this.PostChangerRequest({
+							'opus': []
+						})
+					}else{
+						this.PostChangerRequest({
+							'opus': opsArr
+						})
+					}
+					
+					/* if(this.fileList2 ){
 						var opsArr = []
 						for (let i = 0; i < this.StandradList.length; i++) {
 						    // console.log("=====", this.fileList2);
@@ -494,6 +535,12 @@
 						this.PostChangerRequest({
 						    'opus': opsArr
 						})
+					}else{
+						this.PostChangerRequest({
+						    'opus': '[null]'
+						})
+					} */
+
 				} else {
 					// postListObj 通过对应列表 来发起修改请求
 					this.PostChangerRequest({

src/pages/improveData/improveData.vue

@@ -119,7 +119,8 @@
 
             </view>
             <!-- 文艺人才 -->
-            <view class="wenyi" v-if="pageTypeId=='wyrc'">
+            <!-- <view class="wenyi" v-if="pageTypeId=='wyrc'"> -->
+            <view class="wenyi"  >
                 <view class="data_itm_box">
 
                     <u-form-item ref="item1" @click="renCaiShow=true" class="data_itm">
@@ -134,7 +135,7 @@
                     <u-form-item ref="item1" label='艺术成就' class="data_itm te">
 
                         <view class="chen_itm" v-for="(v,i) in artlist" :key="i">
-                            <input type="text" v-model="artlist[i]" placeholder="请输入艺术成就" class="chengjiu" />
+                            <input type="text" v-model.trim="artlist[i]" placeholder="请输入艺术成就" class="chengjiu" />
 
                             <view class="right_img_box">
                                 <view style="width: 80rpx; height: 80rpx;" class="addImg" @click="AddItem(0)"
@@ -151,7 +152,7 @@
                     </u-form-item>
                     <u-form-item ref="item1" label='荣誉奖项' class="data_itm te">
                         <view class="chen_itm" v-for="(va,ind) in honorList" :key="ind">
-                            <input type="text" v-model="honorList[ind]" placeholder="请输入荣誉奖项" class="chengjiu" />
+                            <input type="text" v-model.trim="honorList[ind]" placeholder="请输入荣誉奖项" class="chengjiu" />
                             <view class="right_img_box">
 
                                 <view style="width: 80rpx; height: 80rpx;" class="addImg" @click="AddItem(1)"
@@ -171,7 +172,7 @@
                         <view v-for="(val,index) in StandradList" :key="index">
                             <view class="tt"
                                 style="display: flex; justify-content: space-between; align-items: center;  ">
-                                <input type="text" v-model="StandradList[index]" placeholder="请输入作品名称"
+                                <input type="text" v-model.trim="StandradList[index]" placeholder="请输入作品名称"
                                     class="chengjiu" />
 
                                 <view class="right_img_box" style="margin-left: 16rpx;">
@@ -787,7 +788,9 @@
                     }
                 }
                 console.log("opsArr====",opsArr);
-
+				console.log("honorList",this.honorList);
+				this.honorList.forEach()
+				return
 
                 var yishucj = JSON.stringify(this.artlist)
                 var rongyujx = JSON.stringify(this.honorList)

yarn.lock

@@ -2573,6 +2573,11 @@ async@^2.6.2:
   dependencies:
     lodash "^4.17.14"
 
+async@^3.2.3:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
+  integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz"
@@ -3397,6 +3402,11 @@ clone@^1.0.2:
   resolved "https://registry.npmmirror.com/clone/-/clone-1.0.4.tgz"
   integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
 
+clone@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==
+
 co-body@^5.1.1:
   version "5.2.0"
   resolved "https://registry.npmmirror.com/co-body/-/co-body-5.2.0.tgz"
@@ -3640,6 +3650,13 @@ cookies@~0.8.0:
     depd "~2.0.0"
     keygrip "~1.1.0"
 
+copy-anything@^2.0.1:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.6.tgz#092454ea9584a7b7ad5573062b2a87f5900fc480"
+  integrity sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==
+  dependencies:
+    is-what "^3.14.1"
+
 copy-concurrently@^1.0.0:
   version "1.0.5"
   resolved "https://registry.npmmirror.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz"
@@ -4066,7 +4083,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0, debug@^3.1.1, debug@^3.2.7:
+debug@^3.1.0, debug@^3.1.1, debug@^3.2.6, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.npmmirror.com/debug/-/debug-3.2.7.tgz"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
@@ -4528,7 +4545,7 @@ envinfo@^6.0.1:
   resolved "https://registry.npmmirror.com/envinfo/-/envinfo-6.0.1.tgz"
   integrity sha512-IbMWvMQulMm1hiky1Zt5YTcSDEdZs0r9bt77mcLa4RUAKRYTGZvrb3MtAt47FuldPxwL+u2LtQex1FajIW1/Cw==
 
-errno@^0.1.3, errno@~0.1.7:
+errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
   version "0.1.8"
   resolved "https://registry.npmmirror.com/errno/-/errno-0.1.8.tgz"
   integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
@@ -5231,6 +5248,18 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^7.1.6:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.1.1"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@~7.1.1:
   version "7.1.7"
   resolved "https://registry.npmmirror.com/glob/-/glob-7.1.7.tgz"
@@ -5686,6 +5715,13 @@ iconv-lite@0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+iconv-lite@^0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
 icss-replace-symbols@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmmirror.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz"
@@ -5718,6 +5754,11 @@ ignore@^4.0.3:
   resolved "https://registry.npmmirror.com/ignore/-/ignore-4.0.6.tgz"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
+image-size@~0.5.0:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
+  integrity sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==
+
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.npmmirror.com/immediate/-/immediate-3.0.6.tgz"
@@ -6210,6 +6251,11 @@ is-weakref@^1.0.1:
   dependencies:
     call-bind "^1.0.2"
 
+is-what@^3.14.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1"
+  integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==
+
 is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmmirror.com/is-windows/-/is-windows-1.0.2.tgz"
@@ -7017,6 +7063,49 @@ lcid@^3.0.0:
   dependencies:
     invert-kv "^3.0.0"
 
+less-loader@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-6.2.0.tgz#8b26f621c155b342eefc24f5bd6e9dc40c42a719"
+  integrity sha512-Cl5h95/Pz/PWub/tCBgT1oNMFeH1WTD33piG80jn5jr12T4XbxZcjThwNXDQ7AG649WEynuIzO4b0+2Tn9Qolg==
+  dependencies:
+    clone "^2.1.2"
+    less "^3.11.3"
+    loader-utils "^2.0.0"
+    schema-utils "^2.7.0"
+
+less@^3.11.3:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/less/-/less-3.13.1.tgz#0ebc91d2a0e9c0c6735b83d496b0ab0583077909"
+  integrity sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==
+  dependencies:
+    copy-anything "^2.0.1"
+    tslib "^1.10.0"
+  optionalDependencies:
+    errno "^0.1.1"
+    graceful-fs "^4.1.2"
+    image-size "~0.5.0"
+    make-dir "^2.1.0"
+    mime "^1.4.1"
+    native-request "^1.0.5"
+    source-map "~0.6.0"
+
+less@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/less/-/less-4.1.3.tgz#175be9ddcbf9b250173e0a00b4d6920a5b770246"
+  integrity sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==
+  dependencies:
+    copy-anything "^2.0.1"
+    parse-node-version "^1.0.1"
+    tslib "^2.3.0"
+  optionalDependencies:
+    errno "^0.1.1"
+    graceful-fs "^4.1.2"
+    image-size "~0.5.0"
+    make-dir "^2.1.0"
+    mime "^1.4.1"
+    needle "^3.1.0"
+    source-map "~0.6.0"
+
 leven@^3.1.0:
   version "3.1.0"
   resolved "https://registry.npmmirror.com/leven/-/leven-3.1.0.tgz"
@@ -7424,7 +7513,7 @@ mime-types@^2.1.12, mime-types@^2.1.18, mime-types@~2.1.17, mime-types@~2.1.19,
   dependencies:
     mime-db "1.52.0"
 
-mime@1.6.0:
+mime@1.6.0, mime@^1.4.1:
   version "1.6.0"
   resolved "https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
@@ -7478,7 +7567,7 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.npmmirror.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"
   integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==
 
-minimatch@^3.0.4:
+minimatch@^3.0.4, minimatch@^3.1.1:
   version "3.1.2"
   resolved "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -7636,11 +7725,25 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+native-request@^1.0.5:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.1.0.tgz#acdb30fe2eefa3e1bc8c54b3a6852e9c5c0d3cb0"
+  integrity sha512-uZ5rQaeRn15XmpgE0xoPL8YWqcX90VtCFglYwAgkvKM5e8fog+vePLAhHxuuv/gRkrQxIeh5U3q9sMNUrENqWw==
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.npmmirror.com/natural-compare/-/natural-compare-1.4.0.tgz"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
+needle@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-3.1.0.tgz#3bf5cd090c28eb15644181ab6699e027bd6c53c9"
+  integrity sha512-gCE9weDhjVGCRqS8dwDR/D3GTAeyXLXuqp7I8EzH6DllZGXSUyxuqqLh+YX9rMAWaaTFyVAg6rHGL25dqvczKw==
+  dependencies:
+    debug "^3.2.6"
+    iconv-lite "^0.6.3"
+    sax "^1.2.4"
+
 negotiator@0.6.3:
   version "0.6.3"
   resolved "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.3.tgz"
@@ -8181,6 +8284,11 @@ parse-json@^5.0.0:
     json-parse-even-better-errors "^2.3.0"
     lines-and-columns "^1.1.6"
 
+parse-node-version@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
+  integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
+
 parse5-htmlparser2-tree-adapter@^6.0.0:
   version "6.0.1"
   resolved "https://registry.npmmirror.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz"
@@ -9474,7 +9582,7 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -9515,7 +9623,17 @@ sass-loader@^10.0.1:
     schema-utils "^3.0.0"
     semver "^7.3.2"
 
-sax@~1.2.4:
+sass-resources-loader@^2.2.5:
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/sass-resources-loader/-/sass-resources-loader-2.2.5.tgz#75131cdb26bae51fcffc007d8155d57b5e825ca7"
+  integrity sha512-po8rfETH9cOQACWxubT/1CCu77KjxwRtCDm6QAXZH99aUHBydwSoxdIjC40SGp/dcS/FkSNJl0j1VEojGZqlvQ==
+  dependencies:
+    async "^3.2.3"
+    chalk "^4.1.0"
+    glob "^7.1.6"
+    loader-utils "^2.0.0"
+
+sax@^1.2.4, sax@~1.2.4:
   version "1.2.4"
   resolved "https://registry.npmmirror.com/sax/-/sax-1.2.4.tgz"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
@@ -10546,11 +10664,21 @@ ts-pnp@^1.1.6:
   resolved "https://registry.npmmirror.com/ts-pnp/-/ts-pnp-1.2.0.tgz"
   integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==
 
+tslib@^1.10.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+
 tslib@^2.0.1:
   version "2.3.1"
   resolved "https://registry.npmmirror.com/tslib/-/tslib-2.3.1.tgz"
   integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
 
+tslib@^2.3.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
+  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
+
 tsscmp@1.0.6:
   version "1.0.6"
   resolved "https://registry.npmmirror.com/tsscmp/-/tsscmp-1.0.6.tgz"