wanghao 8 miesięcy temu
rodzic
commit
9f00f2899e

+ 8 - 3
my/renzheng/companyDev.vue

@@ -46,14 +46,15 @@ export default {
         "不需要融资",
       ],
       check: null,
+	    companyData:{}
     };
   },
   components: {
     navBar,
   },
   onLoad(options) {
-    if (options.text) {
-      this.text = options.text;
+    if (options.companyData) {
+      this.companyData = JSON.parse(options.companyData);
     }
   },
   methods: {
@@ -61,7 +62,11 @@ export default {
       this.check = index;
     },
     goJobPostingSecond(){
-        uni.navigateTo({ url: '/my/renzheng/companyFund' })
+		const companyData = this.companyData
+		companyData.companyDevelop=this.checkList[this.check]
+		console.log(companyData);
+        uni.navigateTo({ url: "/my/renzheng/companyFund?companyData=" +
+          encodeURIComponent(JSON.stringify(companyData))})
     }
   },
 };

+ 9 - 7
my/renzheng/companyFund.vue

@@ -109,6 +109,7 @@ export default {
       ],
       selectedCount: 0,
       totalCount: 20,
+	    companyData:{}
     };
   },
   components: {
@@ -133,8 +134,8 @@ export default {
     },
   },
   onLoad(options) {
-    if (options.text) {
-      this.text = options.text;
+    if (options.companyData) {
+      this.companyData = JSON.parse(options.companyData);
     }
   },
   methods: {
@@ -172,17 +173,18 @@ export default {
         });
         return;
       }
-
+	  const companyData = this.companyData
       // 获取选中的福利列表
       const selectedBenefits = this.selectedWelfare.map((item) => item.name);
-      console.log("选中的福利:", selectedBenefits);
-
+      // console.log("选中的福利:", selectedBenefits);
+	  companyData.welfare=selectedBenefits.join(',')
       // 跳转到下一页,传递选中的福利数据
       uni.navigateTo({
         url:
-          "/my/renzheng/peopleDev?benefits=" +
-          encodeURIComponent(JSON.stringify(selectedBenefits)),
+          "/my/renzheng/peopleDev?companyData=" +
+          encodeURIComponent(JSON.stringify(companyData)),
       });
+	  console.log(companyData);
     },
   },
   mounted() {

+ 98 - 66
my/renzheng/companyImg.vue

@@ -93,14 +93,15 @@ export default {
       maxCount: 20, // 最大上传数量
       uploading: false, // 是否正在上传
       uploadProgress: 0, // 上传进度
+	  companyData:{}
     };
   },
   components: {
     navBar,
   },
   onLoad(options) {
-    if (options.text) {
-      this.text = options.text;
+    if (options.companyData) {
+      this.companyData = JSON.parse(options.companyData);
     }
   },
   methods: {
@@ -136,84 +137,113 @@ export default {
       that.uploadProgress = 0;
 
       // 模拟上传进度
-      const progressTimer = setInterval(() => {
-        that.uploadProgress += 10;
-        if (that.uploadProgress >= 90) {
-          clearInterval(progressTimer);
-        }
-      }, 100);
+      // const progressTimer = setInterval(() => {
+      //   that.uploadProgress += 10;
+      //   if (that.uploadProgress >= 90) {
+      //     clearInterval(progressTimer);
+      //   }
+      // }, 100);
 
       // 模拟批量上传成功
-      setTimeout(() => {
-        clearInterval(progressTimer);
-        that.uploadProgress = 100;
+      // setTimeout(() => {
+      //   clearInterval(progressTimer);
+      //   that.uploadProgress = 100;
 
-        // 将新图片添加到列表
-        const newImages = filePaths.map(filePath => ({
-          url: filePath,
-          // 实际开发中这里应该是服务器返回的URL
-        }));
+      //   // 将新图片添加到列表
+      //   const newImages = filePaths.map(filePath => ({
+      //     url: filePath,
+      //     // 实际开发中这里应该是服务器返回的URL
+      //   }));
         
-        that.imageList = [...that.imageList, ...newImages];
+      //   that.imageList = [...that.imageList, ...newImages];
 
-        setTimeout(() => {
-          that.uploading = false;
-          uni.showToast({
-            title: `成功上传${newImages.length}张图片`,
-            icon: "success",
-          });
-        }, 500);
-      }, 1500);
+      //   setTimeout(() => {
+      //     that.uploading = false;
+      //     uni.showToast({
+      //       title: `成功上传${newImages.length}张图片`,
+      //       icon: "success",
+      //     });
+      //   }, 500);
+      // }, 1500);
 
       // 实际开发中应该使用下面的代码:
-      /*
       let uploadedCount = 0;
       const totalCount = filePaths.length;
       
       filePaths.forEach((filePath, index) => {
-        uni.uploadFile({
-          url: '你的上传接口地址',
-          filePath: filePath,
-          name: 'file',
-          formData: {
-            'type': 'company_photo'
-          },
-          success: (uploadRes) => {
-            uploadedCount++;
-            const data = JSON.parse(uploadRes.data);
-            if (data.code === 200) {
-              that.imageList.push({
-                url: data.data.url
-              });
-            }
+		this.$queue.uploadFile(filePath,(path)=>{
+				if(path) {
+					uploadedCount++;					
+					that.imageList.push({
+					  url: path
+					});
+					
+					// 更新进度
+					that.uploadProgress = Math.floor((uploadedCount / totalCount) * 100);
+					
+					// 所有图片上传完成
+					if (uploadedCount === totalCount) {
+					  that.uploading = false;
+					  uni.showToast({
+					    title: `成功上传${uploadedCount}张图片`,
+					    icon: 'success'
+					  });
+					}
+				}
+				else {
+					uploadedCount++;
+					console.log(`第${index + 1}张图片上传失败:`, error);
+					if (uploadedCount === totalCount) {
+					  that.uploading = false;
+					  uni.showToast({
+					    title: '部分图片上传失败',
+					    icon: 'none'
+					  });
+					}
+				}
+		})
+        // uni.uploadFile({
+        //   url: '你的上传接口地址',
+        //   filePath: filePath,
+        //   name: 'file',
+        //   formData: {
+        //     'type': 'company_photo'
+        //   },
+        //   success: (uploadRes) => {
+        //     uploadedCount++;
+        //     const data = JSON.parse(uploadRes.data);
+        //     if (data.code === 200) {
+        //       that.imageList.push({
+        //         url: data.data.url
+        //       });
+        //     }
             
-            // 更新进度
-            that.uploadProgress = Math.floor((uploadedCount / totalCount) * 100);
+        //     // 更新进度
+        //     that.uploadProgress = Math.floor((uploadedCount / totalCount) * 100);
             
-            // 所有图片上传完成
-            if (uploadedCount === totalCount) {
-              that.uploading = false;
-              uni.showToast({
-                title: `成功上传${uploadedCount}张图片`,
-                icon: 'success'
-              });
-            }
-          },
-          fail: (error) => {
-            uploadedCount++;
-            console.log(`第${index + 1}张图片上传失败:`, error);
+        //     // 所有图片上传完成
+        //     if (uploadedCount === totalCount) {
+        //       that.uploading = false;
+        //       uni.showToast({
+        //         title: `成功上传${uploadedCount}张图片`,
+        //         icon: 'success'
+        //       });
+        //     }
+        //   },
+        //   fail: (error) => {
+        //     uploadedCount++;
+        //     console.log(`第${index + 1}张图片上传失败:`, error);
             
-            if (uploadedCount === totalCount) {
-              that.uploading = false;
-              uni.showToast({
-                title: '部分图片上传失败',
-                icon: 'none'
-              });
-            }
-          }
-        });
+        //     if (uploadedCount === totalCount) {
+        //       that.uploading = false;
+        //       uni.showToast({
+        //         title: '部分图片上传失败',
+        //         icon: 'none'
+        //       });
+        //     }
+        //   }
+        // });
       });
-      */
     },
 
     // 预览图片
@@ -257,8 +287,10 @@ export default {
 
       // 跳转到下一页,传递图片数据
       const imageUrls = this.imageList.map(item => item.url);
+	  const companyData = this.companyData
+	  companyData.photos=imageUrls.join(',')
       uni.navigateTo({
-        url: "/my/renzheng/mainWorkIntro?photos=" + encodeURIComponent(JSON.stringify(imageUrls)),
+        url: "/my/renzheng/mainWorkIntro?companyData=" + encodeURIComponent(JSON.stringify(companyData)),
       });
     },
   },

+ 40 - 17
my/renzheng/companyLogo.vue

@@ -83,8 +83,9 @@ export default {
     navBar,
   },
   onLoad(options) {
-    if (options.text) {
-      this.text = options.text;
+    if (options.companyData) {
+      this.companyData = JSON.parse(options.companyData);
+	  console.log(this.companyData);
     }
   },
   methods: {
@@ -98,7 +99,7 @@ export default {
         success: (res) => {
           // 返回选定照片的本地文件路径列表,tempFilePath可以作为img标签的src属性显示图片
           const tempFilePaths = res.tempFilePaths;
-
+		  
           // 这里可以添加图片验证
           that.validateAndUploadImage(tempFilePaths[0]);
         },
@@ -154,7 +155,27 @@ export default {
           clearInterval(progressTimer);
         }
       }, 100);
-
+	  
+	  this.$queue.uploadFile(filePath,(path)=>{
+		if(path) {
+			clearInterval(progressTimer);
+			that.uploadProgress = 100;
+			that.logoImage = path
+			uni.showToast({
+			title: '上传成功',
+			icon: 'success'
+			});
+		}
+		else {
+			uni.showToast({
+				title: data.message || '上传失败',
+				icon: 'none'
+			});
+		}
+		setTimeout(() => {
+		  that.uploading = false;
+		}, 500);
+	  })
       // 这里替换为你的实际上传接口
       // uni.uploadFile({
       //   url: '你的上传接口地址',
@@ -196,19 +217,19 @@ export default {
       // });
 
       // 模拟上传成功(实际开发中请使用上面的上传代码)
-      setTimeout(() => {
-        clearInterval(progressTimer);
-        that.uploadProgress = 100;
-        that.logoImage = filePath; // 使用本地路径,实际开发中应该使用服务器返回的URL
+      // setTimeout(() => {
+      //   clearInterval(progressTimer);
+      //   that.uploadProgress = 100;
+      //   that.logoImage = filePath; // 使用本地路径,实际开发中应该使用服务器返回的URL
 
-        setTimeout(() => {
-          that.uploading = false;
-          uni.showToast({
-            title: "上传成功",
-            icon: "success",
-          });
-        }, 500);
-      }, 1500);
+      //   setTimeout(() => {
+      //     that.uploading = false;
+      //     uni.showToast({
+      //       title: "上传成功",
+      //       icon: "success",
+      //     });
+      //   }, 500);
+      // }, 1500);
     },
 
     // 预览图片
@@ -243,8 +264,10 @@ export default {
         });
         return;
       }
+	  const companyData = this.companyData
+	  companyData.companyLogo = this.logoImage
       uni.navigateTo({
-        url: "/my/renzheng/companyImg?logo=" + encodeURIComponent(this.logoImage),
+        url: "/my/renzheng/companyImg?companyData=" + encodeURIComponent(JSON.stringify(companyData)),
       });
     },
   },

+ 6 - 5
my/renzheng/companyMsg.vue

@@ -153,15 +153,16 @@ export default {
       }
 
       // 将选择的时间数据传递到下一页或保存
-      const workTimeData = {
+      const companyData = {
         workTime: `${this.startTime}-${this.endTime}`,
-        restTime: this.peopleList[this.check],
+        workRestTime: this.peopleList[this.check],
+		    workOverTime:this.workList[this.work]
       };
-
+	  
       uni.navigateTo({
         url:
-          "/my/renzheng/companyDev?workTime=" +
-          encodeURIComponent(workTimeData.workTime),
+          "/my/renzheng/companyDev?companyData=" +
+          encodeURIComponent(JSON.stringify(companyData)),
       });
     },
 

+ 78 - 73
my/renzheng/editCompany.vue

@@ -5,7 +5,7 @@
       <view class="ms-title">编辑公司及品牌信息</view>
       <view class="ms-item">
         <view class="ms-item-title" @click="checkBaseMsg">
-          <view class="ms-title-txt">基本信息5/5</view>
+          <view class="ms-title-txt">基本信息{{filledInCount[0]}}/5</view>
           <view class="ms-title-icon">
             <image
               src="@/static/images/my/my/top-up.svg"
@@ -25,35 +25,40 @@
           <view class="name-content-item">
             <view class="name-item">品牌logo</view>
             <view class="value-item">
-              <image src="" mode="scaleToFill" />
+			  <text v-if="!companyinfo.companyLogo">未添加</text>
+              <image :src="companyinfo.companyLogo" mode="scaleToFill" v-else/>
               <u-icon name="arrow-right" color="#999" size="20"></u-icon>
             </view>
           </view>
           <view class="name-content-item">
             <view class="name-item">公司名称</view>
             <view class="value-item">
-              <text>汉瑞国际</text>
+			  <text v-if="!companyinfo.companyName">未添加</text>
+              <text v-else>{{companyinfo.companyName}}</text>
               <u-icon name="arrow-right" color="#999" size="20"></u-icon>
             </view>
           </view>
           <view class="name-content-item">
             <view class="name-item">公司全称</view>
             <view class="value-item">
-              <text>深圳市汉睿国际猎头服务公司</text>
+              <text v-if="!companyinfo.companyAllName">未添加</text>
+              <text v-else>{{companyinfo.companyAllName}}</text>
               <u-icon name="arrow-right" color="#999" size="20"></u-icon>
             </view>
           </view>
           <view class="name-content-item">
             <view class="name-item">融资阶段</view>
             <view class="value-item">
-              <text>未融资</text>
+			  <text v-if="!companyinfo.companyDevelop">未添加</text>
+			  <text v-else>{{companyinfo.companyDevelop}}</text>
               <u-icon name="arrow-right" color="#999" size="20"></u-icon>
             </view>
           </view>
           <view class="name-content-item">
             <view class="name-item">人员规模</view>
             <view class="value-item">
-              <text>0-20人</text>
+              <text v-if="!companyinfo.companyPeople||companyinfo.companyPeople==='0'">未添加</text>
+              <text v-else>{{companyinfo.companyPeople}}</text>
               <u-icon name="arrow-right" color="#999" size="20"></u-icon>
             </view>
           </view>
@@ -61,7 +66,7 @@
       </view>
       <view class="ms-item">
         <view class="ms-item-title" @click="checkCompanyFund">
-          <view class="ms-title-txt">公司福利 2/2</view>
+          <view class="ms-title-txt">公司福利 {{filledInCount[1]}}/2</view>
           <view class="ms-title-icon">
             <image
               src="@/static/images/my/my/top-up.svg"
@@ -81,39 +86,31 @@
           <view class="name-content-item">
             <view class="name-item">标准工作时间</view>
             <view class="value-item">
-              <text>09:00-18:00</text>
+             <text v-if="!companyinfo.workTime">未添加</text>
+             <text v-else>{{companyinfo.workTime}}</text>
               <u-icon name="arrow-right" color="#999" size="20"></u-icon>
             </view>
           </view>
           <view class="name-content-item">
             <view class="name-item">福利待遇</view>
             <view class="value-item"
-              ><text>已添加2项</text>
+              >
+			  <text v-if="!companyinfo.welfare">未添加</text>
+			  <text v-else>已添加{{companyinfo.welfare.split(',').length}}项</text>
               <u-icon name="arrow-right" color="#999" size="20"></u-icon>
             </view>
           </view>
         </view>
       </view>
       <view class="ms-item">
-        <view class="ms-item-title" @click="checkCompanyDetail">
+        <view class="ms-item-title">
           <view class="ms-title-txt">公司介绍</view>
           <view class="ms-title-icon">
-            已添加
-            <image
-              src="@/static/images/my/my/top-up.svg"
-              mode="scaleToFill"
-              class="top"
-              v-if="companyDetail"
-            />
-            <image
-              src="@/static/images/my/my/right.svg"
-              mode="scaleToFill"
-              class="right"
-              v-else
-            />
+            <text v-if="!companyinfo.companyContent">未添加</text>
+            <text v-else>已添加</text>
           </view>
         </view>
-        <view class="ms-item-content" v-if="companyDetail">
+       <!-- <view class="ms-item-content" v-if="companyDetail">
           <view class="name-content-item">
             <view class="name-item">标准工作时间</view>
             <view class="value-item">
@@ -128,28 +125,17 @@
               <u-icon name="arrow-right" color="#999" size="20"></u-icon>
             </view>
           </view>
-        </view>
+        </view> -->
       </view>
       <view class="ms-item">
-        <view class="ms-item-title" @click="checkMainWork">
+        <view class="ms-item-title">
           <view class="ms-title-txt">主营业务</view>
           <view class="ms-title-icon">
-            去添加
-            <image
-              src="@/static/images/my/my/top-up.svg"
-              mode="scaleToFill"
-              class="top"
-              v-if="mainWork"
-            />
-            <image
-              src="@/static/images/my/my/right.svg"
-              mode="scaleToFill"
-              class="right"
-              v-else
-            />
+            <text v-if="!companyinfo.companyScope">未添加</text>
+            <text v-else>已添加{{companyinfo.companyScope.split(',').length}}项</text>
           </view>
         </view>
-        <view class="ms-item-content" v-if="mainWork">
+        <!-- <view class="ms-item-content" v-if="mainWork">
           <view class="name-content-item">
             <view class="name-item">标准工作时间</view>
             <view class="value-item">
@@ -164,28 +150,17 @@
               <u-icon name="arrow-right" color="#999" size="20"></u-icon>
             </view>
           </view>
-        </view>
+        </view> -->
       </view>
       <view class="ms-item">
-        <view class="ms-item-title" @click="checkCompanyImg">
+        <view class="ms-item-title">
           <view class="ms-title-txt">公司相册</view>
           <view class="ms-title-icon">
-            已添加3张
-            <image
-              src="@/static/images/my/my/top-up.svg"
-              mode="scaleToFill"
-              class="top"
-              v-if="companyImg"
-            />
-            <image
-              src="@/static/images/my/my/right.svg"
-              mode="scaleToFill"
-              class="right"
-              v-else
-            />
+           <text v-if="!companyinfo.photos">未添加</text>
+           <text v-else>已添加{{companyinfo.photos.split(',').length}}张</text>
           </view>
         </view>
-        <view class="ms-item-content" v-if="companyImg">
+        <!-- <view class="ms-item-content" v-if="companyImg">
           <view class="name-content-item">
             <view class="name-item">标准工作时间</view>
             <view class="value-item">
@@ -200,28 +175,17 @@
               <u-icon name="arrow-right" color="#999" size="20"></u-icon>
             </view>
           </view>
-        </view>
+        </view> -->
       </view>
       <view class="ms-item">
         <view class="ms-item-title" @click="checkPeopleDev">
           <view class="ms-title-txt">人才发展</view>
           <view class="ms-title-icon">
-            已添加4项
-            <image
-              src="@/static/images/my/my/top-up.svg"
-              mode="scaleToFill"
-              class="top"
-              v-if="peopleDev"
-            />
-            <image
-              src="@/static/images/my/my/right.svg"
-              mode="scaleToFill"
-              class="right"
-              v-else
-            />
+           <text v-if="!companyinfo.companyPeopleDevelop">未添加</text>
+           <text v-else>已添加{{companyinfo.companyPeopleDevelop.split(',').length}}项</text>
           </view>
         </view>
-        <view class="ms-item-content" v-if="peopleDev">
+       <!-- <view class="ms-item-content" v-if="peopleDev">
           <view class="name-content-item">
             <view class="name-item">标准工作时间</view>
             <view class="value-item">
@@ -236,7 +200,7 @@
               <u-icon name="arrow-right" color="#999" size="20"></u-icon>
             </view>
           </view>
-        </view>
+        </view> -->
       </view>
     </view>
   </view>
@@ -253,11 +217,30 @@ export default {
       mainWork: false,
       companyImg: false,
       peopleDev: false,
+	  companyinfo:{}
     };
   },
   components: {
     navBar,
   },
+  onLoad() {
+  	this.getcompanystatus()
+  },
+  computed: {
+  	filledInCount() {
+  		let arr = [0,0]
+		if(this.companyinfo.companyLogo) arr[0]+=1
+		if(this.companyinfo.companyName) arr[0]+=1
+		if(this.companyinfo.companyAllName) arr[0]+=1
+		if(this.companyinfo.companyDevelop) arr[0]+=1
+		if(this.companyinfo.companyPeople&&this.companyinfo.companyPeople!=='0') arr[0]+=1
+		
+		if(this.companyinfo.workTime) arr[1]+=1
+		if(this.companyinfo.welfare) arr[1]+=1
+		
+		return arr 
+  	}
+  },
   methods: {
     checkBaseMsg() {
       this.baseMsg = !this.baseMsg;
@@ -279,7 +262,29 @@ export default {
     },
     goCompanyMsg(){
         uni.navigateTo({ url: '/my/renzheng/companyMsg' })
-    }
+    },
+	// 查询用户企业状态
+	getcompanystatus() {
+		this.$Request.get("/app/company/selectCompanyByUserId", "")
+			.then((res) => {
+				if (res.code != 0) {
+					uni.showToast({
+						title: res.msg || "查询状态失败",
+						icon: "none"
+					});
+					return;
+				}
+				this.companyinfo = res.data || {};
+				console.log("查询用户企业状态", this.companyinfo)
+			})
+			.catch((err) => {
+				console.error("查询失败:", err);
+				uni.showToast({
+					title: "网络异常",
+					icon: "none"
+				});
+			});
+	},
   },
 };
 </script>

+ 21 - 4
my/renzheng/editCompanyDesc.vue

@@ -15,7 +15,6 @@
               v-model="text"
               placeholder="填写公司介绍(最少10个字)"
               maxlength="500"
-              @input="onInput"
               class="textarea"
             ></textarea>
             <view class="word-count">
@@ -36,19 +35,37 @@ export default {
   data() {
     return {
       text: "",
+	  companyData:{}
     };
   },
   components: {
     navBar,
   },
   onLoad(options) {
-    if (options.text) {
-      this.text = options.text;
+    if (options.companyData) {
+      this.companyData = JSON.parse(options.companyData);
     }
   },
   methods: {
     goJobPostingSecond(){
-        uni.navigateTo({ url: '/my/renzheng/companyLogo' })
+		const companyData = this.companyData
+		if (this.text === '') {
+		  uni.showToast({
+		    title: "请填写公司介绍",
+		    icon: "none",
+		  });
+		  return;
+		}
+		if (this.text.length < 10) {
+		  uni.showToast({
+		    title: "公司介绍最少10个字",
+		    icon: "none",
+		  });
+		  return;
+		}
+		companyData.companyContent=this.text
+        uni.navigateTo({ url: "/my/renzheng/companyLogo?companyData=" +
+          encodeURIComponent(JSON.stringify(companyData)) })
     }
   },
 };

+ 27 - 2
my/renzheng/mainWorkIntro.vue

@@ -114,14 +114,16 @@ export default {
       showDialog: false,
       // 临时标签输入
       tempTag: "",
+	  companyData:{}
     };
   },
   components: {
     navBar,
   },
   onLoad(options) {
-    if (options.text) {
-      this.text = options.text;
+    if (options.companyData) {
+      this.companyData = JSON.parse(options.companyData);
+	  console.log(this.companyData);
     }
   },
   methods: {
@@ -210,6 +212,29 @@ export default {
       }
 
       console.log("选中的业务标签:", allSelectedTags);
+	  
+	  const companyData = this.companyData
+	  companyData.companyScope = allSelectedTags.join(',')
+	  // 提交公司信息
+	  const data = { ...{companyId:this.$queue.getData('companyId'),...companyData}}
+	  this.$Request.postJson('/app/company/updateCompany', data).then(res => {
+		console.log(res)
+		if (res.code == 0) {
+			uni.showToast({
+				title: '提交成功',
+				duration: 1500,
+				
+			})
+			setTimeout(()=>{
+				uni.switchTab({
+					url: '/pages/my/index'
+				})
+			},1500)
+			
+		} else {
+		this.$queue.showToast(res.msg);
+	  }
+	  });
       return;
 
       // 跳转到下一页,传递选中的业务标签

+ 24 - 3
my/renzheng/peopleDev.vue

@@ -90,14 +90,16 @@ export default {
         "校招培养",
       ],
       power: null,
+	    companyData:{},
+	    companyPeopleDevelop:[]
     };
   },
   components: {
     navBar,
   },
   onLoad(options) {
-    if (options.text) {
-      this.text = options.text;
+    if (options.companyData) {
+      this.companyData = JSON.parse(options.companyData);
     }
   },
   methods: {
@@ -111,7 +113,26 @@ export default {
       this.power = index;
     },
     goJobPostingSecond(){
-        uni.navigateTo({ url: '/my/renzheng/editCompanyDesc' })
+		if(this.upList[this.up]){
+			this.companyPeopleDevelop.push(this.upList[this.up])
+		}
+		if(this.peopleList[this.people]){
+			this.companyPeopleDevelop.push(this.peopleList[this.people])
+		}
+		if(this.powerList[this.power]){
+			this.companyPeopleDevelop.push(this.powerList[this.power])
+		}
+		if (this.companyPeopleDevelop.length === 0) {
+		  uni.showToast({
+		    title: "请至少选择一项人才发展方向",
+		    icon: "none",
+		  });
+		  return;
+		}
+		const companyData = this.companyData
+		companyData.companyPeopleDevelop = this.companyPeopleDevelop.join(',')
+        uni.navigateTo({ url: "/my/renzheng/editCompanyDesc?companyData=" +
+          encodeURIComponent(JSON.stringify(companyData)) })
     }
   },
 };

+ 0 - 1
pages/my/changePosition.vue

@@ -39,7 +39,6 @@
 		<view class="bottom-confirm-btn" @click="confirmPosition">
 			<text>确定</text>
 		</view>
-		</view>
 	</view>
 </template>
 

+ 4 - 4
pages/my/jobApplicant/workRecord.vue

@@ -406,10 +406,10 @@ export default {
         sizeType: ["compressed"],
         sourceType: ["album", "camera"],
         success: (res) => {
-		  that.$queue.uploadFile(res.tempFilePaths[0],function(path){
-			  if(path)
-				that.formData.avatar = path;
-		  })
+		    that.$queue.uploadFile(res.tempFilePaths[0],function(path){
+		      if(path)
+		    	that.formData.avatar = path;
+		    })
         },
       });
     },