Merge branch 'master' of…

.vscode/settings.json

@@ -20,7 +20,7 @@
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
     "[javascript]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
+        "editor.defaultFormatter": "vscode.typescript-language-features"
     },
     "[typescriptreact]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"

src/api/user.js

@@ -23,6 +23,8 @@ export const getUserResumeApi = () => instance.post("/personal/user/resume/get")
 
 // 获取投递列表
 export const getApplicationListApi = params => instance.post("/job/getApplicationList", params);
+// 用户申诉
+export const userAppeal = params => instance.post("/user/appeal", params);
 // 获取面试列表
 export const getInterviewListApi = params => instance.post("/job/getInterviewList", params);
 
@@ -58,6 +60,8 @@ export const positionuUdateList = params => instance.post("/b/position/updateLis
 export const feedbackById = params => instance.post(`/feedback/${params}`);
 //根据id获取反馈信息
 export const jobFair = params => instance.post(`/jobFair/${params}`);
+//根据id获取反馈信息
+export const messageFn = id => instance.post(`/message/${id}`);
 
 
 // 参加招聘会

src/pages/login/index.vue

@@ -18,9 +18,10 @@
 <script setup>
 import NavBar from "@/components/navBar/index.vue";
 import { xinhuaMpLogin, getLoginUserApi } from "@/api/user.js";
-import { setToken } from "@/utils/token";
+import { setToken, removeToken } from "@/utils/token";
 const res = ref("");
 const login = () => {
+    removeToken();
     xma.xh.getUserProfile({
         range: ["ACCOUNT", "MOBILE"],
         success(info) {

src/pages/login/test.vue

@@ -10,10 +10,11 @@
 
 <script setup>
 import { testLogin, getSmsCode, getLoginUserApi } from "@/api/user";
-import { setToken } from "@/utils/token";
+import { setToken, removeToken } from "@/utils/token";
 getLoginUserApi;
 const phone = ref("");
 const login = async () => {
+    removeToken();
     const a = await getSmsCode({ username: phone.value });
     const loginRes = await testLogin({
         username: phone.value,

src/pages/user/businessLicense/fillIn.vue

@@ -49,7 +49,7 @@
             </view>
             <view class="name" v-if="step === 2">
                 <view class="t1">账户申述</view>
-                <textarea v-model="value" placeholder="请填写申述理由" />
+                <textarea v-model="appealMessage" placeholder="请填写申述理由" />
             </view>
             <view class="image-upload" v-if="step === 3">
                 <view class="t1">营业执照照片</view>
@@ -95,7 +95,7 @@ import { ref } from "vue";
 import evn from "@/utils/config";
 import { uploadFiles } from "@/utils/fileUpload";
 import { validateForm } from "@/utils/utils";
-import { ocrLicense, getLoginUserApi, saveBasicInfoApi } from "@/api/user.js";
+import { ocrLicense, getLoginUserApi, saveBasicInfoApi, userAppeal } from "@/api/user.js";
 import { useDefineStore } from "./store";
 const pinias = useDefineStore();
 const params = reactive({
@@ -104,6 +104,7 @@ const params = reactive({
     phone: "",
     position: ""
 });
+const appealMessage = ref(null);
 onLoad(({ steps }) => {
     step.value = steps * 1;
 });
@@ -112,7 +113,9 @@ const name = ref("");
 const showPopout = ref(false);
 
 onShow(() => {
-    getLoginUserApiFn();
+    if (step.value === 1) {
+        getLoginUserApiFn();
+    }
 });
 function ocrLicenseFn(uri) {
     return ocrLicense({ uri }).then(res => {
@@ -168,10 +171,24 @@ const nextStep = () => {
             flag = saveBasicInfoApiFn();
             break;
         case 2:
-            if (!pinias.formData.creditCode) flag = true;
+            if (!appealMessage.value) {
+                flag = true;
+            } else {
+                userAppeal({ appealMessage: appealMessage.value }).then(res => {
+                    if (res.code == 200) {
+                        uni.showModal({
+                            title: "申诉中",
+                            content: "您的申述已提交请等待审核",
+                            showCancel: false,
+                            confirmText: "好的"
+                        });
+                    }
+                });
+            }
+
             break;
         case 3:
-            wx.navigateTo({
+            xma.navigateTo({
                 url: `/pages/user/businessLicense/submit`
             });
             break;

src/utils/request.js

 import axios from "axios";
 import { getToken, removeToken } from "@/utils/token";
-// const baseURL = "https://lygsh-api.wjzpgz.com/";
-const baseURL = "http://192.168.11.48:8080/";
+import { messageFn } from '@/api/user'
+const baseURL = "https://lygsh-api.wjzpgz.com/";
+// const baseURL = "http://192.168.11.48:8080/";
 // 创建一个 axios 实例
 const instance = axios.create({
     baseURL, // 设置基础 URL
@@ -65,6 +66,37 @@ instance.interceptors.response.use(
                 icon: "none",
                 duration: 1900
             });
+        } else if (code == 13) {
+            uni.showModal({
+                title: '您的帐号已失效',
+                content: '由于您超过1月未登录现已将您的账号禁用您可完成申述后继续使用',
+                showCancel: true,
+                confirmText: '立即申述',
+                success: function (confirm) {
+                    if (confirm.confirm) {
+                        xma.navigateTo({
+                            url: '/pages/user/businessLicense/fillIn?steps=2'
+                        })
+                    }
+
+                }
+            });
+        } else if (code == 12) {
+            uni.showModal({
+                title: response.data.data.title,
+                content: response.data.data.content,
+                showCancel: false,
+                confirmText: '去看看',
+                success: function (confirm) {
+                    messageFn(response.data.data.id)
+                    if (confirm.confirm) {
+                        xma.switchTab({
+                            url: '/pages/recommend/index'
+                        })
+                    }
+
+                }
+            });
         }
     },
     error => {