Merge branch 'master' of…

src/pages.json

@@ -245,7 +245,7 @@
                 "pagePath": "pages/recommend/index",
                 "iconPath": "static/image/tabBar/home.png",
                 "selectedIconPath": "static/image/tabBar/homeActive.png",
-                "text": "首页"
+                "text": "招聘"
             },
             {
                 "pagePath": "pages/policy/index",

src/pages/signUp/addPost.vue

@@ -447,7 +447,7 @@ getTreeListApi({ provinceName: "贵州省" }).then(res => {
     cityOpstion.value.push(res.data[0].children);
 });
 getEnumWorkMode();
-positionList({ stutas: 3 }).then(res => {
+positionList({ status: 3 }).then(res => {
     res.data = res.data.map(item => {
         item.workDic = EnumWorkMode.value.find(v => v.code == item.workMode).text;
         return item;

src/pages/user/myCompany/index.vue

@@ -52,7 +52,7 @@
                     </wd-col-picker>
                 </formItem>
                 <formItem title="详细地址" icon="">
-                    <p>{{ params.location || "请选择公司所在地" }}</p>
+                    <p style="color: #77818f">{{ params.location || "请选择公司所在地" }}</p>
                 </formItem>
                 <div class="textarea-wrap" v-if="[1].includes(pageStatus)">
                     <p class="label">公司介绍</p>
@@ -130,6 +130,8 @@ const companyInfo = ref({});
 function getCompanyInfoApiFn() {
     getCompanyInfoApi().then(async res => {
         companyInfo.value = res.data;
+        console.log("res.data", res.data);
+
         Object.keys(params).forEach(key => {
             params[key] = res.data[key];
         });
@@ -143,10 +145,9 @@ function getCompanyInfoApiFn() {
             creditCode,
             cityCode,
             districtCode,
-            provinceCode,
-            companyName
+            provinceCode
         } = res.data;
-        params.companyName = companyName;
+        params.companyName = name;
         params.introduction = introduction;
         params.logoPath = logoPath;
         params.creditCode = creditCode;

src/pages/user/myCompany/licenseInfo.vue

@@ -140,7 +140,7 @@ function getCompanyInfoApiFn() {
         companyInfo = res.data;
         status.value = res.data.status;
         myLicensePath.value = res.data.licensePath;
-        companyName.value = res.data.companyName;
+        companyName.value = res.data.name;
         myCode.value = res.data.creditCode;
         myLicenseValidityPeriod.value = res.data.licenseValidityPeriod;
     });