Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini
This commit is contained in:
commit
1d9891a4f4
|
|
@ -143,9 +143,10 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive }
|
||||||
justify-content: flex-start;
|
justify-content: flex-start;
|
||||||
|
|
||||||
.leftbox {
|
.leftbox {
|
||||||
width: 14.2vw;
|
width: 15.2vw;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
border-right: 2px solid #f2f2f2;
|
border-right: 2px solid #f2f2f2;
|
||||||
|
padding-left: 0.2vw;
|
||||||
.cardfa {
|
.cardfa {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
margin-top: 0.6vw;
|
margin-top: 0.6vw;
|
||||||
|
|
@ -153,20 +154,26 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive }
|
||||||
align-items: center;
|
align-items: center;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
view {
|
view {
|
||||||
width: 6vw;
|
|
||||||
height: 2vw;
|
height: 2vw;
|
||||||
border-radius: 1vw;
|
border-radius: 1vw;
|
||||||
border: 1px solid #D2D2D2;
|
border: 1px solid #D2D2D2;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 1.1vw;
|
font-size: 0.9vw;
|
||||||
color: #555555;
|
color: #555555;
|
||||||
display: flex;
|
padding: 0 0.4vw;
|
||||||
justify-content: center;
|
margin: 0.5vw 0 0 0.25vw;
|
||||||
align-items: center;
|
|
||||||
margin: 0.25vw 0 0 0.3vw;
|
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
display: inline-block;
|
||||||
|
text-align: center;
|
||||||
|
line-height: 2.1vw;
|
||||||
|
&:nth-child(1),&:nth-child(2){
|
||||||
|
width: 6vw;
|
||||||
|
}
|
||||||
|
&:nth-child(3){
|
||||||
|
max-width: 8vw;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.img{
|
.img{
|
||||||
|
|
@ -174,8 +181,7 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive }
|
||||||
background: #f8f8f8;
|
background: #f8f8f8;
|
||||||
width: 10.2vw;
|
width: 10.2vw;
|
||||||
height: 9.2vw;
|
height: 9.2vw;
|
||||||
padding: 0.2vw;
|
margin: 0.3vw 0 0 1vw;
|
||||||
margin: 0.3vw auto;
|
|
||||||
border-radius: 1.6vw;
|
border-radius: 1.6vw;
|
||||||
>image {
|
>image {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
|
||||||
|
|
@ -268,7 +268,6 @@
|
||||||
// justify-content: space-around;
|
// justify-content: space-around;
|
||||||
|
|
||||||
view {
|
view {
|
||||||
max-width: 6vw;
|
|
||||||
height: 2vw;
|
height: 2vw;
|
||||||
border-radius: 1vw;
|
border-radius: 1vw;
|
||||||
border: 1px solid #D2D2D2;
|
border: 1px solid #D2D2D2;
|
||||||
|
|
@ -283,7 +282,12 @@
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
line-height: 2.1vw;
|
line-height: 2.1vw;
|
||||||
|
&:nth-child(1),&:nth-child(2){
|
||||||
|
width: 5vw;
|
||||||
|
}
|
||||||
|
&:nth-child(3){
|
||||||
|
max-width: 8vw;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.bgimg{
|
.bgimg{
|
||||||
|
|
|
||||||
|
|
@ -146,8 +146,6 @@
|
||||||
const swip = ()=>{
|
const swip = ()=>{
|
||||||
let nuId = uni.getStorageSync('nuId');
|
let nuId = uni.getStorageSync('nuId');
|
||||||
getPermissionList({employessId:uni.getStorageSync('userInfo').employessId}).then(res=>{
|
getPermissionList({employessId:uni.getStorageSync('userInfo').employessId}).then(res=>{
|
||||||
console.log(res)
|
|
||||||
console.log(nuId)
|
|
||||||
res.result.forEach(item=>{
|
res.result.forEach(item=>{
|
||||||
if(item.nuId == nuId){
|
if(item.nuId == nuId){
|
||||||
listarr.value = item.dataList
|
listarr.value = item.dataList
|
||||||
|
|
|
||||||
|
|
@ -960,14 +960,14 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view style="width: 100%;justify-content: space-between;display: flex;margin-top: 10rpx;">
|
<view style="width: 100%;justify-content: space-between;display: flex;margin-top: 10rpx;">
|
||||||
<view class="">
|
<view class="" style="white-space: nowrap;">
|
||||||
到货单价:
|
到货单价:
|
||||||
<text style="font-weight: 600;color: #555555;">
|
<text style="font-weight: 600;color: #555555;white-space: nowrap;">
|
||||||
¥{{Number(item.newPrice).toFixed(2)}}
|
¥{{Number(item.newPrice).toFixed(2)}}
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<view class="">
|
<view class="" style="white-space: nowrap;">
|
||||||
{{item.createTime.replace(/-/g, '.')}}
|
{{item.createTime.replace(/-/g, '.')}}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,8 @@
|
||||||
},1800)
|
},1800)
|
||||||
}else{
|
}else{
|
||||||
this.errmsg = res.message;
|
this.errmsg = res.message;
|
||||||
this.openerror = true
|
this.openerror = true;
|
||||||
|
this.$emit('back')
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -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