Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini
This commit is contained in:
commit
7b4d7f0c98
|
|
@ -27,7 +27,7 @@
|
||||||
default: true
|
default: true
|
||||||
},
|
},
|
||||||
style:{
|
style:{
|
||||||
type:String
|
// type:String
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -127,7 +127,7 @@
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
padding: 3.8vw 0 1vw 0;
|
padding: 2.3vw 0 1vw 0;
|
||||||
margin-right: 3vw;
|
margin-right: 3vw;
|
||||||
.logo{
|
.logo{
|
||||||
width: 3.8vw;
|
width: 3.8vw;
|
||||||
|
|
|
||||||
|
|
@ -111,8 +111,7 @@
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
show: {
|
show: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default:false,
|
default:false
|
||||||
required: true,
|
|
||||||
},
|
},
|
||||||
caigouobj:{
|
caigouobj:{
|
||||||
type:Object,
|
type:Object,
|
||||||
|
|
|
||||||
|
|
@ -75,16 +75,14 @@
|
||||||
import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineComponent } from 'vue';
|
import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineComponent } from 'vue';
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
InvoicingList: {
|
InvoicingList: {
|
||||||
type: Array,
|
type: Array
|
||||||
required: true
|
|
||||||
},
|
},
|
||||||
status: {
|
status: {
|
||||||
type: String
|
type: String
|
||||||
},
|
},
|
||||||
show: {
|
show: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false,
|
default: false
|
||||||
required: true,
|
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
const emit = defineEmits(['addcartory', 'scrolltolower','addcar','crk'])
|
const emit = defineEmits(['addcartory', 'scrolltolower','addcar','crk'])
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,8 @@ const base_url = 'https://www.focusnu.com/opeapi'
|
||||||
// const base_url = 'http://localhost:8091/opeapi'
|
// const base_url = 'http://localhost:8091/opeapi'
|
||||||
// 请求超出时间
|
// 请求超出时间
|
||||||
const timeout = 5000
|
const timeout = 5000
|
||||||
|
// 登录过期防止多次弹出
|
||||||
|
let loginout = false;
|
||||||
// 需要修改token,和根据实际修改请求头
|
// 需要修改token,和根据实际修改请求头
|
||||||
export default (params) => {
|
export default (params) => {
|
||||||
let url = params.url;
|
let url = params.url;
|
||||||
|
|
@ -32,12 +33,15 @@ export default (params) => {
|
||||||
// console.log(res.statusCode);
|
// console.log(res.statusCode);
|
||||||
if (res.statusCode == 200) {
|
if (res.statusCode == 200) {
|
||||||
resolve(res.data);
|
resolve(res.data);
|
||||||
|
loginout = false;
|
||||||
} else {
|
} else {
|
||||||
console.log("http", /^https?:\/\//.test(url) ? url : base_url + url)
|
console.log("http", /^https?:\/\//.test(url) ? url : base_url + url)
|
||||||
console.log("res",response)
|
console.log("res",response)
|
||||||
console.log("data",data)
|
console.log("data",data)
|
||||||
switch (res.statusCode) {
|
switch (res.statusCode) {
|
||||||
case 401:
|
case 401:
|
||||||
|
if(loginout == true){return}
|
||||||
|
loginout = true;
|
||||||
uni.showModal({
|
uni.showModal({
|
||||||
title: "提示",
|
title: "提示",
|
||||||
content: "登录过期",
|
content: "登录过期",
|
||||||
|
|
|
||||||
|
|
@ -574,7 +574,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
||||||
)
|
)
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
|
const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]);
|
||||||
export {
|
export {
|
||||||
camera as default
|
camera as default
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -578,7 +578,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
||||||
)
|
)
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]);
|
const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]);
|
||||||
export {
|
export {
|
||||||
fullcamera as default
|
fullcamera as default
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue