Merge branch 'master' of…

src/pages/signUp/addPost.vue

@@ -169,7 +169,7 @@
                             use-default-slot
                         >
                             <p :class="{ placeholder: !item.majorText }" class="text-single" style="width: 100%">
-                                {{ item.majorText || "请选择专业" }}
+                                {{ item.majorText || "不限" }}
                             </p>
                         </wd-col-picker>
                     </form-item>
@@ -237,12 +237,7 @@
                 </form-item>
                 <form-row :fill="false">
                     <form-item title="招聘人数" icon="edit" :required="true">
-                        <input
-                            @input="inputWorkNum($event, item)"
-                            type="number"
-                            v-model="item.recruitmentNumber"
-                            placeholder="请输入招聘人数"
-                        />
+                        <input type="number" v-model="item.recruitmentNumber" placeholder="请输入招聘人数" />
                     </form-item>
                     <form-item title="联系电话" icon="edit" :required="true">
                         <input type="number" v-model="item.contactPhone" placeholder="请输入联系电话" />
@@ -432,9 +427,6 @@ onLoad(({ articleId, type }) => {
         }
     });
 });
-function inputWorkNum(e, item) {
-    console.log("e", e, item);
-}
 getMajorTreeApi().then(res => {
     console.log(res);
     if (res.code === 200) {
@@ -836,8 +828,7 @@ const submitFrom = () => {
                             "minAgeRequirement",
                             "contactPhone",
                             "contactPerson",
-                            "recruitmentNumber",
-                            "majorRequirement"
+                            "recruitmentNumber"
                         ],
                         "post"
                     )

src/pages/user/feedbackDetails/index.vue

@@ -22,6 +22,18 @@
             </view>
         </view>
         <view class="tip" v-if="!id">上传图片（可上传0-3张图片）</view>
+        <view class="msg-t">
+            <view class="title">投诉时间</view>
+            <view class="hf">{{ $formatTimestamp(detail.createTime, "YYYY-MM-DD hh:mm") }}</view>
+        </view>
+        <view class="msg-t">
+            <view class="title">回复时间</view>
+            <view class="hf">{{ $formatTimestamp(detail.updateTime, "YYYY-MM-DD hh:mm") }}</view>
+        </view>
+        <view class="msg-t">
+            <view class="title">回复人</view>
+            <view class="hf">{{ detail.operator || "" }}</view>
+        </view>
         <view class="msg">
             <view class="title">平台回复</view>
             <view class="hf">{{ detail.replyMessage || "暂无回复" }}</view>
@@ -144,6 +156,24 @@ const feedbackAddFn = () => {
             margin-top: 16rpx;
         }
     }
+    .msg-t {
+        padding-top: 32rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        .title {
+            font-size: 32rpx;
+            font-weight: 600;
+            color: #1b2026;
+            position: relative;
+        }
+        .hf {
+            font-size: 28rpx;
+            line-height: 36rpx;
+            color: #4e5969;
+            margin-top: 16rpx;
+        }
+    }
     .title {
         font-size: 32rpx;
         font-weight: 600;

src/utils/request.js

@@ -106,6 +106,12 @@ instance.interceptors.response.use(
 
                 }
             });
+        } else if (code == 5) {
+            uni.showModal({
+                title: "企业用户被禁用",
+                showCancel: false,
+                confirmText: "确定"
+            });
         }
     },
     error => {

src/utils/utils.js

@@ -120,6 +120,8 @@ export const validateForm = (formData, requiredFields, type) => {
 
         } else if (fieldValue === null || fieldValue === undefined || fieldValue === "") {
             // const title = fieldMapping[field] || (type === "post" ? "岗位信息" : "表单");
+            console.log('fieldMapping[field]', field);
+
             const title = fieldMapping[field] || (type === "post" ? "相关信息" : "相关信息");
             uni.showToast({
                 title: `请${type === "post" ? "完善" : "完善"}${title}！`,