新增订单时增加检查质保协议
This commit is contained in:
parent
81179bd404
commit
26a1f81df1
@ -61,6 +61,16 @@ export function salemainpiAoKouList(data) {
|
||||
})
|
||||
}
|
||||
|
||||
// 点击新增的时候先调用检查质保协议
|
||||
export function salemaincheckQa(data) {
|
||||
return request({
|
||||
url: '/bussiness/salemain/checkQa',
|
||||
method: 'post',
|
||||
params: data,
|
||||
isEncrypt: false
|
||||
})
|
||||
}
|
||||
|
||||
// 新增
|
||||
export function addsalemain(data) {
|
||||
return request({
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
</view>
|
||||
<view class="input-item flex align-center">
|
||||
<view class="iconfont icon-password icon"></view>
|
||||
<input v-model="loginForm.password" :type="passwordVisible ? 'text' : 'password'" class="input" placeholder="请输入密码" maxlength="20" />
|
||||
<input v-model="loginForm.password" :type="passwordVisible ? 'text' : 'password'" class="input" placeholder="请输入密码" maxlength="20" :show-password="false" />
|
||||
<view class="password-eye" @click="togglePasswordVisible">
|
||||
<uni-icons :type="passwordVisible ? 'eye-slash' : 'eye'" size="20" color="#999"></uni-icons>
|
||||
</view>
|
||||
@ -103,14 +103,20 @@
|
||||
|
||||
// 密码登录（有微信ID时调用autobind，无微信ID时调用普通登录）
|
||||
async function pwdLogin() {
|
||||
// 从本地存储获取微信ID
|
||||
const storedWeixinId = uni.getStorageSync('weixinId')
|
||||
// 优先使用内存中的，如果没有则使用本地存储的
|
||||
const currentWeixinId = weixinId.value || storedWeixinId
|
||||
|
||||
// proxy.$modal.msgSuccess("currentWeixinId微信ID" + currentWeixinId)
|
||||
// 如果有微信ID，调用绑定接口
|
||||
if (weixinId.value) {
|
||||
if (currentWeixinId) {
|
||||
const params = {
|
||||
username: loginForm.value.username,
|
||||
password: loginForm.value.password,
|
||||
code: loginForm.value.code,
|
||||
uuid: loginForm.value.uuid,
|
||||
weixinId: weixinId.value
|
||||
weixinId: currentWeixinId
|
||||
}
|
||||
|
||||
autobind(params).then(res => {
|
||||
@ -119,13 +125,18 @@
|
||||
// 保存token
|
||||
if (res.data && res.data.token) {
|
||||
setToken(res.data.token)
|
||||
}
|
||||
proxy.$modal.msgSuccess("绑定成功，登录中...")
|
||||
// 绑定成功后，清除URL参数并跳转
|
||||
removeWeixinIdFromUrl()
|
||||
// 绑定成功后，清除本地存储中的微信ID
|
||||
uni.removeStorageSync('weixinId')
|
||||
setTimeout(() => {
|
||||
loginSuccess()
|
||||
}, 1500)
|
||||
} else {
|
||||
proxy.$modal.msgError("绑定失败，请重试")
|
||||
if (captchaEnabled.value) {
|
||||
getCode()
|
||||
}
|
||||
}
|
||||
} else {
|
||||
proxy.$modal.msgError(res.msg || "绑定失败，请重试")
|
||||
if (captchaEnabled.value) {
|
||||
@ -215,11 +226,14 @@
|
||||
const id = getWeixinIdFromUrl()
|
||||
|
||||
if (id) {
|
||||
// 保存weixinId
|
||||
// 保存weixinId到内存
|
||||
weixinId.value = id
|
||||
// 保存到本地存储（先删除旧的，再保存新的）
|
||||
uni.removeStorageSync('weixinId')
|
||||
uni.setStorageSync('weixinId', id)
|
||||
autoLoginExecuted = true
|
||||
|
||||
// 先清除URL参数，防止跳转后再次触发
|
||||
// 清除URL参数，防止跳转后再次触发
|
||||
removeWeixinIdFromUrl()
|
||||
|
||||
// 调用自动登录接口
|
||||
@ -236,13 +250,13 @@
|
||||
// 保存token
|
||||
if (res.data && res.data.token) {
|
||||
setToken(res.data.token)
|
||||
}
|
||||
proxy.$modal.msgSuccess("登录成功")
|
||||
// 绑定成功后，清除本地存储中的微信ID
|
||||
uni.removeStorageSync('weixinId')
|
||||
// 获取用户信息并跳转
|
||||
useUserStore().getInfo().then(() => {
|
||||
proxy.$tab.reLaunch('/pages/work/index')
|
||||
}).catch(() => {
|
||||
// 即使获取用户信息失败，只要有token就尝试跳转
|
||||
if (getToken()) {
|
||||
proxy.$tab.reLaunch('/pages/work/index')
|
||||
} else {
|
||||
@ -251,15 +265,19 @@
|
||||
}
|
||||
})
|
||||
} else {
|
||||
proxy.$modal.msgWarning(res?.msg || "请绑定账号后登录")
|
||||
// 未绑定，显示普通登录界面
|
||||
proxy.$modal.msgError("登录异常，请使用账号密码登录")
|
||||
getCode()
|
||||
}
|
||||
}).catch(error => {
|
||||
} else if (res && res.code === 500) {
|
||||
proxy.$modal.msgError(res?.msg || "服务器错误")
|
||||
getCode()
|
||||
} else {
|
||||
proxy.$modal.msgError(res?.msg || "自动登录失败")
|
||||
getCode()
|
||||
}
|
||||
}).catch(() => {
|
||||
proxy.$modal.closeLoading()
|
||||
console.error('自动登录错误：', error)
|
||||
proxy.$modal.msgError(error.message || "自动登录失败，请使用账号密码登录")
|
||||
// 自动登录失败，显示普通登录界面
|
||||
// 自动登录失败，显示普通登录界面（weixinId 已保存在本地存储）
|
||||
getCode()
|
||||
})
|
||||
} else {
|
||||
|
||||
@ -182,7 +182,8 @@
|
||||
|
||||
<script setup>
|
||||
import { onMounted, ref, nextTick } from 'vue'
|
||||
import { productListWithUserId, addsalemain, getsalemaincheckAmount, listsaleBusGoodsList, salemainpiAoKouList } from '../../../../api/orderManager/index.js'
|
||||
import { productListWithUserId, addsalemain, getsalemaincheckAmount, listsaleBusGoodsList,
|
||||
salemainpiAoKouList, salemaincheckQa } from '../../../../api/orderManager/index.js'
|
||||
import { useUserStore } from '@/store'
|
||||
import MBLoading from "@/components/MB/MBLoading.vue";
|
||||
const userStore = useUserStore()
|
||||
@ -322,7 +323,35 @@ function getEdu() {
|
||||
}
|
||||
GetlistsaleBusGoodsList()
|
||||
getsalemainpiAoKouList()
|
||||
getQa()
|
||||
})
|
||||
|
||||
}
|
||||
// 修改调用质保协议
|
||||
const getQa = () => {
|
||||
return new Promise((resolve) => {
|
||||
const huozhuid = form.value.companyId
|
||||
const paramsdata= {
|
||||
companyId:huozhuid,
|
||||
}
|
||||
salemaincheckQa(paramsdata).then(res => {
|
||||
if(res.code === 500 || res.code === 601){
|
||||
proxy.$modal.msgError(res.msg)
|
||||
btnloading.value = true; // 禁用保存和提交按钮
|
||||
resolve(false)
|
||||
}else if(res.code === 200){
|
||||
btnloading.value = false; // 启用保存和提交按钮
|
||||
resolve(true)
|
||||
}else{
|
||||
// 其他未知状态，默认禁用
|
||||
btnloading.value = true; // 禁用保存和提交按钮
|
||||
resolve(false)
|
||||
}
|
||||
}).catch(() => {
|
||||
btnloading.value = true; // 禁用保存和提交按钮
|
||||
resolve(false)
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
/** 显示补差列表 */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user