This commit is contained in:
Teng 2025-10-17 15:16:25 +08:00
commit da263c97a0
16 changed files with 2083 additions and 567 deletions

View File

@ -0,0 +1,35 @@
// 引入 request 文件
import request from '@/request/guanli.js'
// 查询仓库对应物料
export const queryInvoicingList = (params) => {
return request({
url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/queryInvoicingList`,
method: 'get',
data: params,
})
}
export const getMaterialTreeData = () => {
return request({
url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getMaterialTreeData`,
method: 'get'
})
}
export const queryNuInfoByNuId = (params) => {
return request({
url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/queryNuInfoByNuId`,
method: 'get',
data: params,
})
}
// 修改库房启用停用
export const updateKfstatus = (params) => {
return request({
url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/updateKfstatus`,
method: 'post',
data: params,
})
}

View File

@ -0,0 +1,42 @@
<template>
<view>
<view class="shadow guodu" :class="opacity?'heig':''" ></view>
</view>
</template>
<script>
export default {
props: {
opacity: {
type: Boolean,
default: false, //
}
},
data() {
return {
};
}
}
</script>
<style lang="less">
.shadow {
width: 100%;
height: 0;
position: absolute;
left: 0;
bottom: 0vw;
border-radius: 50%;
filter: blur(15rpx);
background: linear-gradient(to top, RGBA(239, 240, 244, 1), RGBA(239, 240, 244, .1)); /* 根据需要调整 */
}
.guodu{
transition: .4s;
-webkit-transform-style: preserve-3d;
-webkit-overflow-scrolling: touch;
}
.heig{
height: 16vw !important;
}
</style>

View File

@ -2,33 +2,72 @@
<view>
<!-- 采购 -->
<view class="box">
<view class="lefts">
<scroll-view scroll-y="true" scroll-with-animation :scroll-top="scrolltop" class="scroll-Y" @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll">
<view class="boxitem" v-for="(v,i) in 66" :key='i' :class="{'yujing':i==1,'active':i==0}">
<view>纸尿裤-拉拉裤纸尿裤-拉拉裤</view>
<view>规格型号: 800mm*680mm</view>
<view>采购单位 </view>
<view class="leftr" v-if="shyp">
<scroll-view scroll-y="true" scroll-with-animation :scroll-top="scrolltop" class="scroll-Y" @scrolltolower="scrolltolower" :lower-threshold="400" @scroll="scrollview">
<view class="boxibigtem" v-for="(v,i) in InvoicingList" :key='i'
:class="{'yujing':Number(v.lowerLimit)>=Number(v.kcsl),'active':shopitem==i}" @click="shopclick(i,2)">
<view>{{v.materialName}}</view>
<view>规格型号: {{v.specificationModel}}</view>
<view>采购单位 {{v.materialUnits}}</view>
<view>
<view class="carditem" :class="{'hl':i==0,'yl':i==1,'bj':i>=2}">
<image src="/static/index/warehouse/procurement/hl.png" mode="aspectFill" v-if="i==0"></image>
<image src="/static/index/warehouse/procurement/yl.png" mode="aspectFill" v-if="i==1"></image>
<image src="/static/index/warehouse/procurement/bj.png" mode="aspectFill" v-if="i>=2"></image>
保洁
<view class="carditem" :class="{'hl':v.tagType==1,'yl':v.tagType==2,'bj':v.tagType>2}">
<image src="/static/index/warehouse/procurement/hl.png" mode="aspectFill" v-if="v.tagType==1"></image>
<image src="/static/index/warehouse/procurement/yl.png" mode="aspectFill" v-if="v.tagType==2"></image>
<image src="/static/index/warehouse/procurement/bj.png" mode="aspectFill" v-if="v.tagType>2"></image>
{{v.tagName}}
</view>
<view class="znk">
<image src="/static/index/warehouse/procurement/znk.png" mode="aspectFill"></image>
<image :src="v.materialImg?serverUrl + v.materialImg : '/static/index/warehouse/procurement/k.png'" mode="aspectFill"></image>
</view>
<view class="num">
<view>500</view>
<view>{{v.kcsl}}</view>
<view>库存数量</view>
</view>
</view>
</view>
<view style="height: 23vw;"></view>
<view style="height: 23vw;width: 100%;padding:10vw 40vw ;">
<u-loadmore :status="status" />
</view>
</scroll-view>
<shadowview :opacity="opacity" ></shadowview>
<view class="mblbg"> </view>
<view class="fxj">
<arrowkeys @movecard="movecard" :getblue="getblue" :moveleft="45" rightbuttonname="扫描"/>
<arrowkeys @movecard="movecard($event,1)" :getblue="getblue" :moveleft="45" />
<text>长春市朝阳区久泰开运养老服务有限公司</text>
</view>
</view>
<view class="lefts" v-if="!shyp">
<scroll-view scroll-y="true" scroll-with-animation :scroll-top="scrolltop" class="scroll-Y" @scrolltolower="scrolltolower" :lower-threshold="200" @scroll="scrollview">
<view class="boxitem" v-for="(v,i) in InvoicingList" :key='i' :class="{'yujing':Number(v.lowerLimit)>=Number(v.kcsl),'active':shopitem==i}" @click="shopclick(i)">
<view>{{v.materialName}}</view>
<view>规格型号: {{v.specificationModel}}</view>
<view>采购单位 {{v.materialUnits}}</view>
<view>
<view class="carditem" :class="{'hl':v.tagType==1,'yl':v.tagType==2,'bj':v.tagType>2}">
<image src="/static/index/warehouse/procurement/hl.png" mode="aspectFill" v-if="v.tagType==1"></image>
<image src="/static/index/warehouse/procurement/yl.png" mode="aspectFill" v-if="v.tagType==2"></image>
<image src="/static/index/warehouse/procurement/bj.png" mode="aspectFill" v-if="v.tagType>2"></image>
{{v.tagName}}
</view>
<view class="znk">
<image :src="v.materialImg?serverUrl + v.materialImg : '/static/index/warehouse/procurement/k.png'" mode="aspectFill"></image>
</view>
<view class="num">
<view>{{v.kcsl}}</view>
<view>库存数量</view>
</view>
</view>
</view>
<view style="height: 23vw;width: 100%;padding:10vw 40vw ;">
<u-loadmore :status="status" />
</view>
</scroll-view>
<shadowview :opacity="opacity" ></shadowview>
<view class="mblbg"> </view>
<view class="fxj">
<arrowkeys @movecard="movecard" :getblue="getblue" :moveleft="45" />
<text>长春市朝阳区久泰开运养老服务有限公司</text>
</view>
</view>
<view class="rights">
@ -41,20 +80,20 @@
<view class="guodu"></view>
</view>
<text>
{{shyp?'启用':'停用'}}
{{!shyp?'两列':'三列'}}
</text>
</view>
</view>
<view class="jqry">
<view class="left tp">
<image src="/static/index/warehouse/procurement/jqr.png" mode="aspectFill"></image>
<image :src="cellobj?.fzrHeadPath?serverUrl + cellobj?.fzrHeadPath:'/static/index/warehouse/procurement/jqr.png'" mode="aspectFill"></image>
</view>
<view class="rigname">
<view>李树奎</view>
<view>{{cellobj?.fzr}}</view>
<view>
<text></text>
<text>50</text>
<text>13358863266</text>
<!-- <text></text>
<text>50</text> -->
<text>{{cellobj?.fzrTel?cellobj?.fzrTel:'-'}}</text>
</view>
</view>
</view>
@ -67,29 +106,28 @@
<view class="scroltype">
<scroll-view scroll-y="true" scroll-with-animation
:scroll-top="scroll.scrolltop3" class="scroll-Y" >
<view :class="scroll.act3==i?'act':''" v-for="(v,i) in ['活血化瘀止痛类','通络止痛类']" @click="typescroll(3,i)">
{{v}}
<view :class="scroll.act3==i?'act':''" v-for="(v,i) in TreeData[scroll.act1]?.children[scroll.act2]?.children"
@click="typescroll(3,i,v)">
{{v.title}}
</view>
</scroll-view>
<scroll-view scroll-y="true" scroll-with-animation
:scroll-top="scroll.scrolltop2" class="scroll-Y" >
<view :class="scroll.act2==i?'act':''" v-for="(v,i) in ['液体制剂','中药制剂','中医辩证']" @click="typescroll(2,i)">
{{v}}
<view :class="scroll.act2==i?'act':''" v-for="(v,i) in TreeData[scroll.act1]?.children" @click="typescroll(2,i,v)">
{{v.title}}
</view>
</scroll-view>
<scroll-view scroll-y="true" scroll-with-animation
:scroll-top="scroll.scrolltop1" class="scroll-Y">
:scroll-top="scroll.scrolltop1" class="scroll-Y scrl1">
<view :class="scroll.act1==i?'act':''"
v-for="(v,i) in
['中医中药','生活用品','医疗用品','医疗器械','耗材用品','食材用品','生活用品',
'中医中药','生活用品','医疗用品','医疗器械','耗材用品','食材用品','生活用品']"
@click="typescroll(1,i)">
<image src="/static/index/warehouse/procurement/Purchase/Purchase09.png" mode="aspectFill" v-if="scroll.act1==i"></image>
<image src="/static/index/warehouse/procurement/Purchase/Purchase01.png" mode="aspectFill" v-else></image>
v-for="(v,i) in TreeData"
@click="typescroll(1,i,v)">
<image :src="serverUrl + v.appCheckIconPath" mode="aspectFill" v-if="scroll.act1==i"></image>
<image :src="serverUrl + v.appIconPath" mode="aspectFill" v-else></image>
<text>
{{v}}
{{v.title}}
</text>
</view>
</scroll-view>
@ -99,7 +137,7 @@
<view v-for="(v,i) in animArray" :key="i" @click="admiclick(i)">
<view>
<image :src="v.imgurl" mode="aspectFill" v-if="anmidex!=i"></image>
<donghua width="1.5vw" height="1.5vw" :links="v.url" :playing="i === anmidex"
<donghua width="2vw" height="2vw" :links="v.url" :playing="i === anmidex"
v-show="i === anmidex" class="donghua"/>
</view>
@ -109,8 +147,11 @@
</view>
</view>
<view class="serchs">
<input type="text" placeholder="物料名称/物料编码/物料简拼" />
<view>
<view class="ipt">
<input type="text" placeholder="物料名称/物料编码/物料简拼" v-model="form.wlParamInfo"/>
<image src="/static/index/warehouse/procurement/x.png" mode="aspectFill" v-if="form.wlParamInfo" @click="search(0)"></image>
</view>
<view @click="search" class="scr">
检索
</view>
</view>
@ -122,35 +163,175 @@
<script setup lang="ts">
import { ref, onMounted, reactive,onBeforeUnmount, computed, nextTick,defineProps } from 'vue';
import { queryInvoicingList ,getMaterialTreeData,queryNuInfoByNuId,updateKfstatus } from './api/lunpan.js'
import { onShow, onLoad, onHide ,onPageScroll } from "@dcloudio/uni-app"
import shadowview from './components/ShadowView.vue';
const navurl = ref('');
const InvoicingList = ref([]);
const TreeData = ref([]);
const cellobj = ref({});
const serverUrl = ref('');
const scrolltop = ref(0)
const shopitem = ref(0)
const getblue = ref(false);
const shyp = ref(false);
const scroll = reactive({scrolltop1:0,scrolltop2:0,scrolltop3:0,act1:0,act2:0,act3:0});
const opacity = ref(false);
const scrollnum = ref(0);
const switchshyp = ( )=>{
shyp.value = shyp.value?false:true;
const scroll = reactive({scrolltop1:0,scrolltop2:0,scrolltop3:0,act1:-1,act2:-1,act3:-1});
const form = reactive({
nuId:'',
pageNo:1,
pageSize:9,
categoryId:'',
typeId:'',
medicationId:'',
wlParamInfo:''
})
const switchshyp = ()=>{
let obj = {
id:cellobj.value.id,
status:shyp.value?'5':'2'
}
updateKfstatus(obj).then(res=>{
console.log(res)
if(res.success){
shyp.value = shyp.value?false:true;
cell();
}else{
uni.showToast({
icon:'error',
title:res.message
})
}
})
}
const shopclick = (i:number , k:number )=>{
if(k==2){
let num = Math.ceil((i+1)/2)
scrolltop.value = (num -2) * 270;
shopitem.value =i;
}else{
let num = Math.ceil((i+1)/3)
scrolltop.value = (num -2) * 240;
shopitem.value =i;
}
}
const typescroll = (e: number,i: number,v:object)=>{
if(e==1){
scroll.act2 = -1;
scroll.act3 = -1;
scroll.scrolltop2 = 0;
scroll.scrolltop3 = 0;
form.categoryId = v?.categoryId;
form.typeId = '';
form.medicationId = '';
if(scroll.act1 == i){
scroll.act1 = -1;
form.categoryId = '';
form.pageNo = 1;
InvoicingList.value = [];
queryInvo();
return
}
}
if(e==2){
scroll.act3 = -1;
scroll.scrolltop3 = 0;
form.categoryId = v?.categoryId;
form.typeId = v?.typeId;
form.medicationId = '';
}
if(e==3){
form.categoryId = v?.categoryId;
form.typeId = v?.typeId;
form.medicationId = v?.key;
}
const typescroll = (e: number,i: number)=>{
scroll['act'+e] = i;
scroll['scrolltop'+e] = (i -2) * 50;
console.log(scroll['scrolltop'+e]);
console.log(scroll['act'+e])
form.pageNo = 1;
InvoicingList.value = [];
shopitem.value = 0;
queryInvo();
}
const movecard = (type : number) => {
console.log(type)
const search = (x:number)=>{
if(x===0){form.wlParamInfo = ''}
form.pageNo = 1;
InvoicingList.value = [];
queryInvo();
}
onLoad(()=>{
form.nuId = uni.getStorageSync('nuId');
serverUrl.value = uni.getStorageSync('serverUrl')+'/sys/common/static/';
getMaterial();
queryInvo();
cell();
})
const cell = ()=>{
queryNuInfoByNuId(form).then(res=>{
console.log(res.result)
cellobj.value = res.result;
shyp.value = res.result.status==5?false:true
})
}
const getMaterial = () =>{
getMaterialTreeData().then(res=>{
TreeData.value = res.result
})
}
const setout = ref(true)
let times = null;
const status = ref('loadmore')
onPageScroll((e)=>{
console.log(e)
})
const scrolltolower = ()=>{
if(!setout){return}
status.value = 'loading'
setout.value = false;
form.pageNo++;
queryInvo()
times = setTimeout(()=>{
setout.value = true
},1000)
}
const scrollview = (e:number)=>{
if(e.detail.scrollTop>scrollnum.value){
opacity.value = true;
setTimeout(()=>{
opacity.value = false;
},900)
}else{
opacity.value = false;
}
scrollnum.value = e.detail.scrollTop;
}
const queryInvo = ()=>{
queryInvoicingList(form).then(res=>{
InvoicingList.value.push(...res.result.records);
status.value = res.result.total == InvoicingList.value.length? 'nomore':'loadmore'
})
}
const movecard = (type : number,l:number) => {
if(l==1){
switch (type){
case 0:
//
shopitem.value = shopitem.value<1?shopitem.value=0:shopitem.value-2
break;
case 1:
//
shopitem.value = shopitem.value>=InvoicingList.value.length-1?InvoicingList.value.length-1:shopitem.value+1
break;
case 2:
//
shopitem.value = shopitem.value>=InvoicingList.value.length-2?shopitem.value=0:shopitem.value+2
break;
case 3:
shopitem.value = shopitem.value==0?shopitem.value=InvoicingList.value.length-1:shopitem.value-1
//
break;
case 4:
@ -159,12 +340,50 @@
break;
case 5:
//
uni.navigateBack()
uni.navigateBack({
delta:1
})
break;
default:
break;
}
shopclick(shopitem.value,2)
}else{
switch (type){
case 0:
//
shopitem.value = shopitem.value<2?shopitem.value=0:shopitem.value-3
break;
case 1:
//
shopitem.value = shopitem.value>InvoicingList.value.length?shopitem.value=0:shopitem.value+1
break;
case 2:
//
shopitem.value = shopitem.value>InvoicingList.value.length?shopitem.value=0:shopitem.value+3
break;
case 3:
shopitem.value = shopitem.value==0?shopitem.value=InvoicingList.value.length:shopitem.value-1
//
break;
case 4:
//
break;
case 5:
//
uni.navigateBack({
delta:1
})
break;
default:
break;
}
shopclick(shopitem.value,0)
}
}
//
function genPaths(base, prefix, count, ext = 'png', startIndex = 0, pad = false) {
@ -268,13 +487,13 @@
display: flex;
justify-content: space-between;
flex-wrap: wrap;
padding: 0vw 2vw 0;
padding: 0vw 1vw 0;
.rights{
width: 25vw;
width: 27vw;
height:calc(100% - 4vw);
margin-top: 4vw;
.serchs{
width: 23.2vw;
width: 27vw;
height: 3.2vw;
background: rgba(255,255,255,.5);
border-radius: 1.6vw;
@ -282,13 +501,24 @@
justify-content: space-between;
padding: 0.5vw;
align-items: center;
margin-top: 1.1vw;
.ipt{
display: flex;
align-items: center;
image{
width: 2.2vw;
height: 2.2vw;
margin-left: 0.5vw;
}
input{
width: 18vw;
height: 2.4vw;
font-size: 0.9vw;
font-size: 1.1vw;
padding-left: 1.6vw;
}
view{
}
.scr{
width: 4.2vw;
height: 2.4vw;
background: url('/static/index/warehouse/procurement/sh.png')no-repeat;
@ -311,22 +541,22 @@
flex-wrap: wrap;
>view{
width: 8vw;
height: 3.2vw;
width:8.5vw;
height: 3.7vw;
display: flex;
justify-content: center;
align-items: center;
font-weight: 400;
font-size: .9vw;
font-size: 1.3vw;
color: #212327;
background: #FFFFFF;
margin: .7vw 0;
margin: 0.25vw 0;
border-radius: 1.6vw;
view{
margin-right: .4vw;
image{
width: 1.5vw;
height: 1.5vw;
width: 2vw;
height: 2vw;
}
.donghua{
margin: 0;
@ -334,7 +564,6 @@
}
text{
margin-top: 0.1vw;
white-space: nowrap;
}
@ -349,15 +578,15 @@
display: flex;
justify-content: space-around;
.scroll-Y{
width: 7vw;
width: 8.5vw;
height:calc(54vh - 2vw);
view{
width: 7vw;
width: 100%;
height: 3.8vw;
background: rgba(255,255,255,.5);
border-radius: 1.9vw;
font-weight: 400;
font-size: .9vw;
font-size: 1.3vw;
color: #212327;
display: flex;
justify-content: center;
@ -369,12 +598,13 @@
white-space: nowrap;
}
>image{
width: 1.8vw;
height: 1.8vw;
width: 2vw;
height: 2vw;
}
}
.act{
background: rgba(255,255,255,1) !important;
font-weight: 600;
color: #0385FA !important;
}
}
@ -385,26 +615,25 @@
display: flex;
justify-content: space-around;
margin: .4vw 0 .4vw 0;
>view{
view{
width: 7vw;
height: 1.9vw;
background: rgba(255,255,255,.5);
border-radius: .9vw;
border-radius: 1vw;
display: flex;
justify-content: center;
align-items: center;
font-weight: 400;
font-size: .9vw;
font-size: 1.2vw;
color: #333333;
}
}
}
.shitem{
width: 24.0vw;
width: 27vw;
height: 10.3vw;
background: #E8E9ED;
border-radius: 1.6vw;
padding: 1.8vw;
padding:1.2vw 1.8vw;
.jqry{
width: 100%;
display: flex;
@ -412,12 +641,16 @@
.left{
width: 5vw;
height: 5vw;
margin-right: .8vw;
border-radius: .3vw;
overflow: hidden;
}
.rigname{
height: 3vw;
height: 4vw;
display: flex;
flex-direction: column;
justify-content: space-around;
view{
&:nth-child(1){
font-weight: bold;
font-size: 1.4vw;
@ -432,16 +665,18 @@
justify-content: space-between;
}
}
}
}
.shypk{
width: 100%;
display: flex;
justify-content: space-between;
align-items: center;
view{
&:nth-child(1){
font-weight: bold;
font-size: 1.0vw;
font-size: 1.1vw;
color: #333333;
}
&:nth-child(2){
@ -450,7 +685,7 @@
align-items: center;
text{
font-weight: 400;
font-size: .8vw;
font-size: 1vw;
color: #666666;
}
.guodu{
@ -504,6 +739,17 @@
bottom: 2vw;
z-index: 11;
border-radius: 1.6vw;
text{
width: 100%;
font-weight: 400;
font-size: .9vw;
color: #999999;
display: flex;
justify-content: center;
position: absolute;
left: 0;
bottom: 0vw;
}
}
.mblbg{
width: 24.5vw;
@ -552,20 +798,24 @@
}
>&:nth-child(1){
&:nth-child(1){
font-weight: bold;
font-size: 1.3vw;
color: #212327;
font-size: 1.5vw;
color: #333;
white-space: nowrap;
overflow: hidden;
width: 100%;
text-overflow: ellipsis;
}
>&:nth-child(2){
&:nth-child(2){
font-weight: 400;
font-size: 10rpx;
font-size: 1.2vw;
color: #555555;
margin-top: .9vw;
margin-top: .6vw;
}
>&:nth-child(3){
&:nth-child(3){
font-weight: 400;
font-size: 10rpx;
font-size: 1.2vw;
color: #666666;
margin-top: .6vw;
}
@ -583,27 +833,27 @@
left: 2.5vw;
display: flex;
flex-direction: column;
justify-content: center;
view{
&:nth-child(1){
font-weight: bold;
font-size: 2.2vw;
color: #333333;
margin-bottom: .6vw;
color: #555;
}
&:nth-child(2){
font-weight: 400;
font-size: .9vw;
font-size: 1vw;
color: #999999;
}
}
}
.znk{
width: 12vw;
height: 11.5vw;
width: 10vw;
height: 9.5vw;
position: absolute;
right: 0;
bottom: 0;
right: 1.5vw;
bottom:1vw;
image{
width: 100%;
height: 100%;
@ -626,10 +876,13 @@
}
}
}
.yujing{
background:rgba(255, 87, 87, 0.095);
}
}
.yujing{
border: 2px solid rgba(255, 102, 107, 0.51) !important;
box-shadow: 0 0 8px rgba(255, 102, 107, 0.51);
box-shadow: 0 0 8px rgba(255, 102, 107, 0.051) inset;
view{
.num{
view{
@ -644,8 +897,164 @@
.active{
border: 2px dashed #017DE9 !important;
}
//
.leftr{
width: 70vw;
margin-left: 1vw;
height:calc(100%);
position: relative;
.fxj{
width: 30vw;
height: 16vw;
position: absolute;
left: 1vw;
bottom: 0vw;
z-index: 11;
border-radius: 1.6vw;
text{
width: 76%;
font-weight: 400;
font-size: .9vw;
color: #999999;
display: flex;
justify-content: center;
position: absolute;
left: 0;
bottom: 0vw;
}
}
.mblbg{
width: 35vw;
height: 16vw;
position: absolute;
left: -1vw;
bottom: 0vw;
border-radius: 1.6vw;
filter: blur(15rpx);
background: RGBA(239, 240, 244, 1);
z-index: 10;
}
.scroll-Y{
width: 100%;
height: 100%;
display: flex;
flex-wrap: wrap;
.boxitem{
&:nth-child(1),&:nth-child(2),&:nth-child(3){
margin-top: 4vw;
}
}
}
.boxibigtem{
&:nth-child(1),&:nth-child(2){
margin-top: 4vw;
}
}
.boxibigtem{
width: 33.3vw;
height: 21.7vw;
background: rgba(255,255,255,.7);
border-radius: 1.6vw;
margin: 0 1.3vw 1.2vw 0;
border: 2px dashed #fff;
display: inline-block;
padding: 2.3vw;
position: relative;
>view{
.hl{
color: #0385FA;
background: #E7F0FB;
}
.yl{
background:#DCF6F3;
color: #00C6A9;
}
.bj{
background: #E9EBFC;
color: #727BFF;
}
&:nth-child(1){
font-weight: bold;
font-size: 1.5vw;
color: #333;
white-space: nowrap;
overflow: hidden;
width: 100%;
text-overflow: ellipsis;
}
&:nth-child(2){
font-weight: 400;
font-size: 1.2vw;
color: #555555;
margin-top: .9vw;
}
&:nth-child(3){
font-weight: 400;
font-size: 1.2vw;
color: #666666;
margin-top: .6vw;
}
>&:nth-child(4){
width: 100%;
height: 10vw;
position: absolute;
left: 0;
bottom: 0;
}
.num{
position: absolute;
bottom: 2vw;
left: 2.5vw;
display: flex;
flex-direction: column;
justify-content: center;
view{
&:nth-child(1){
font-weight: bold;
font-size: 2.2vw;
color: #555;
}
&:nth-child(2){
font-weight: 400;
font-size: 1vw;
color: #999999;
}
}
}
.znk{
width: 12vw;
height: 11.5vw;
position: absolute;
right: 1.5vw;
bottom:1vw;
image{
width: 100%;
height: 100%;
}
}
.carditem{
width: 5.8vw;
height: 2.1vw;
border-radius: 1.0vw;
display: flex;
justify-content: center;
align-items: center;
font-weight: 400;
font-size: .9vw;
margin-top: .8vw;
image{
width: 1.4vw;
height: 1.4vw;
}
}
}
}
}
</style>
<style>

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 794 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View File

@ -591,7 +591,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/pages/camera.nvue"]]);
const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app/pages/camera.nvue"]]);
export {
camera as default
};

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,176 @@
/**
* 这里是uni-app内置的常用样式变量
*
* uni-app 官方扩展插件及插件市场https://ext.dcloud.net.cn上很多三方插件均使用了这些样式变量
* 如果你是插件开发者建议你使用scss预处理并在插件代码中直接使用这些变量无需 import 这个文件方便用户通过搭积木的方式开发整体风格一致的App
*
*/
/**
* 如果你是App开发者插件使用者你可以通过修改这些变量来定制自己的插件主题实现自定义主题功能
*
* 如果你的项目同样使用了scss预处理你也可以直接在你的 scss 代码中使用如下变量同时无需 import 这个文件
*/
/* 颜色变量 */
/* 行为相关颜色 */
/* 文字基本颜色 */
/* 背景颜色 */
/* 边框颜色 */
/* 尺寸变量 */
/* 文字尺寸 */
/* 图片尺寸 */
/* Border Radius */
/* 水平间距 */
/* 垂直间距 */
/* 透明度 */
/* 文章场景相关 */
.u-line[data-v-3e1cc47b] {
vertical-align: middle;
}
/**
* 这里是uni-app内置的常用样式变量
*
* uni-app 官方扩展插件及插件市场https://ext.dcloud.net.cn上很多三方插件均使用了这些样式变量
* 如果你是插件开发者建议你使用scss预处理并在插件代码中直接使用这些变量无需 import 这个文件方便用户通过搭积木的方式开发整体风格一致的App
*
*/
/**
* 如果你是App开发者插件使用者你可以通过修改这些变量来定制自己的插件主题实现自定义主题功能
*
* 如果你的项目同样使用了scss预处理你也可以直接在你的 scss 代码中使用如下变量同时无需 import 这个文件
*/
/* 颜色变量 */
/* 行为相关颜色 */
/* 文字基本颜色 */
/* 背景颜色 */
/* 边框颜色 */
/* 尺寸变量 */
/* 文字尺寸 */
/* 图片尺寸 */
/* Border Radius */
/* 水平间距 */
/* 垂直间距 */
/* 透明度 */
/* 文章场景相关 */
.u-loading-circle[data-v-32db0ed8] {
display: inline-flex;
vertical-align: middle;
width: 0.875rem;
height: 0.875rem;
background: 0 0;
border-radius: 50%;
border: 2px solid;
border-color: #e5e5e5 #e5e5e5 #e5e5e5 #8f8d8e;
animation: u-circle-32db0ed8 1s linear infinite;
}
.u-loading-flower[data-v-32db0ed8] {
width: 20px;
height: 20px;
display: inline-block;
vertical-align: middle;
animation: u-flower-32db0ed8 1s steps(12) infinite;
background: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;
background-size: 100%;
}
@keyframes u-flower-32db0ed8 {
0% {
transform: rotate(0deg);
}
to {
transform: rotate(1turn);
}
}
@keyframes u-circle-32db0ed8 {
0% {
transform: rotate(0deg);
}
to {
transform: rotate(1turn);
}
}
/**
* 这里是uni-app内置的常用样式变量
*
* uni-app 官方扩展插件及插件市场https://ext.dcloud.net.cn上很多三方插件均使用了这些样式变量
* 如果你是插件开发者建议你使用scss预处理并在插件代码中直接使用这些变量无需 import 这个文件方便用户通过搭积木的方式开发整体风格一致的App
*
*/
/**
* 如果你是App开发者插件使用者你可以通过修改这些变量来定制自己的插件主题实现自定义主题功能
*
* 如果你的项目同样使用了scss预处理你也可以直接在你的 scss 代码中使用如下变量同时无需 import 这个文件
*/
/* 颜色变量 */
/* 行为相关颜色 */
/* 文字基本颜色 */
/* 背景颜色 */
/* 边框颜色 */
/* 尺寸变量 */
/* 文字尺寸 */
/* 图片尺寸 */
/* Border Radius */
/* 水平间距 */
/* 垂直间距 */
/* 透明度 */
/* 文章场景相关 */
.u-load-more-wrap[data-v-e9906cfb] {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
}
.u-load-more-inner[data-v-e9906cfb] {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
padding: 0 0.375rem;
}
.u-more[data-v-e9906cfb] {
position: relative;
display: flex;
flex-direction: row;
justify-content: center;
}
.u-dot-text[data-v-e9906cfb] {
font-size: 0.875rem;
}
.u-loadmore-icon-wrap[data-v-e9906cfb] {
margin-right: 0.25rem;
}
.u-loadmore-icon[data-v-e9906cfb] {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
}
.shadow[data-v-f6ef18d5] {
width: 100%;
height: 0;
position: absolute;
left: 0;
bottom: 0vw;
border-radius: 50%;
filter: blur(0.46875rem);
background: linear-gradient(to top, #eff0f4, rgba(239, 240, 244, 0.1));
/* 根据需要调整 */
}
.guodu[data-v-f6ef18d5] {
transition: 0.4s;
-webkit-transform-style: preserve-3d;
-webkit-overflow-scrolling: touch;
}
.heig[data-v-f6ef18d5] {
height: 16vw !important;
}
.tp uni-image {
width: 100%;
height: 100%;
@ -8,15 +181,15 @@
display: flex;
justify-content: space-between;
flex-wrap: wrap;
padding: 0vw 2vw 0;
padding: 0vw 1vw 0;
}
.box .rights {
width: 25vw;
width: 27vw;
height: calc(100% - 4vw);
margin-top: 4vw;
}
.box .rights .serchs {
width: 23.2vw;
width: 27vw;
height: 3.2vw;
background: rgba(255, 255, 255, 0.5);
border-radius: 1.6vw;
@ -24,14 +197,24 @@
justify-content: space-between;
padding: 0.5vw;
align-items: center;
margin-top: 1.1vw;
}
.box .rights .serchs uni-input {
.box .rights .serchs .ipt {
display: flex;
align-items: center;
}
.box .rights .serchs .ipt uni-image {
width: 2.2vw;
height: 2.2vw;
margin-left: 0.5vw;
}
.box .rights .serchs .ipt uni-input {
width: 18vw;
height: 2.4vw;
font-size: 0.9vw;
font-size: 1.1vw;
padding-left: 1.6vw;
}
.box .rights .serchs uni-view {
.box .rights .serchs .scr {
width: 4.2vw;
height: 2.4vw;
background: url('../../static/index/warehouse/procurement/sh.png') no-repeat;
@ -53,30 +236,29 @@
flex-wrap: wrap;
}
.box .rights .anmikc > uni-view {
width: 8vw;
height: 3.2vw;
width: 8.5vw;
height: 3.7vw;
display: flex;
justify-content: center;
align-items: center;
font-weight: 400;
font-size: 0.9vw;
font-size: 1.3vw;
color: #212327;
background: #FFFFFF;
margin: 0.7vw 0;
margin: 0.25vw 0;
border-radius: 1.6vw;
}
.box .rights .anmikc > uni-view uni-view {
margin-right: 0.4vw;
}
.box .rights .anmikc > uni-view uni-view uni-image {
width: 1.5vw;
height: 1.5vw;
width: 2vw;
height: 2vw;
}
.box .rights .anmikc > uni-view uni-view .donghua {
margin: 0;
}
.box .rights .anmikc > uni-view uni-text {
margin-top: 0.1vw;
white-space: nowrap;
}
.box .rights .typeitem {
@ -90,16 +272,16 @@
justify-content: space-around;
}
.box .rights .typeitem .scroltype .scroll-Y {
width: 7vw;
width: 8.5vw;
height: calc(54vh - 2vw);
}
.box .rights .typeitem .scroltype .scroll-Y uni-view {
width: 7vw;
width: 100%;
height: 3.8vw;
background: rgba(255, 255, 255, 0.5);
border-radius: 1.9vw;
font-weight: 400;
font-size: 0.9vw;
font-size: 1.3vw;
color: #212327;
display: flex;
justify-content: center;
@ -112,11 +294,12 @@
white-space: nowrap;
}
.box .rights .typeitem .scroltype .scroll-Y uni-view > uni-image {
width: 1.8vw;
height: 1.8vw;
width: 2vw;
height: 2vw;
}
.box .rights .typeitem .scroltype .scroll-Y .act {
background: #ffffff !important;
font-weight: 600;
color: #0385FA !important;
}
.box .rights .typeitem .toptype {
@ -126,24 +309,23 @@
justify-content: space-around;
margin: 0.4vw 0 0.4vw 0;
}
.box .rights .typeitem .toptype > uni-view {
.box .rights .typeitem .toptype uni-view {
width: 7vw;
height: 1.9vw;
background: rgba(255, 255, 255, 0.5);
border-radius: 0.9vw;
border-radius: 1vw;
display: flex;
justify-content: center;
align-items: center;
font-weight: 400;
font-size: 0.9vw;
font-size: 1.2vw;
color: #333333;
}
.box .rights .shitem {
width: 24vw;
width: 27vw;
height: 10.3vw;
background: #E8E9ED;
border-radius: 1.6vw;
padding: 1.8vw;
padding: 1.2vw 1.8vw;
}
.box .rights .shitem .jqry {
width: 100%;
@ -153,19 +335,22 @@
.box .rights .shitem .jqry .left {
width: 5vw;
height: 5vw;
margin-right: 0.8vw;
border-radius: 0.3vw;
overflow: hidden;
}
.box .rights .shitem .jqry .rigname {
height: 3vw;
height: 4vw;
display: flex;
flex-direction: column;
justify-content: space-around;
}
.box .rights .shitem .jqry .rigname:nth-child(1) {
.box .rights .shitem .jqry .rigname uni-view:nth-child(1) {
font-weight: bold;
font-size: 1.4vw;
color: #212327;
}
.box .rights .shitem .jqry .rigname:nth-child(2) {
.box .rights .shitem .jqry .rigname uni-view:nth-child(2) {
width: 11vw;
font-weight: 400;
font-size: 1vw;
@ -177,11 +362,10 @@
width: 100%;
display: flex;
justify-content: space-between;
align-items: center;
}
.box .rights .shitem .shypk uni-view:nth-child(1) {
font-weight: bold;
font-size: 1vw;
font-size: 1.1vw;
color: #333333;
}
.box .rights .shitem .shypk uni-view:nth-child(2) {
@ -191,7 +375,7 @@
}
.box .rights .shitem .shypk uni-view:nth-child(2) uni-text {
font-weight: 400;
font-size: 0.8vw;
font-size: 1vw;
color: #666666;
}
.box .rights .shitem .shypk uni-view:nth-child(2) .guodu {
@ -240,6 +424,17 @@
z-index: 11;
border-radius: 1.6vw;
}
.box .lefts .fxj uni-text {
width: 100%;
font-weight: 400;
font-size: 0.9vw;
color: #999999;
display: flex;
justify-content: center;
position: absolute;
left: 0;
bottom: 0vw;
}
.box .lefts .mblbg {
width: 24.5vw;
height: 21vw;
@ -285,20 +480,24 @@
background: #E9EBFC;
color: #727BFF;
}
> .box .lefts .boxitem > uni-view:nth-child(1) {
.box .lefts .boxitem > uni-view:nth-child(1) {
font-weight: bold;
font-size: 1.3vw;
color: #212327;
font-size: 1.5vw;
color: #333;
white-space: nowrap;
overflow: hidden;
width: 100%;
text-overflow: ellipsis;
}
> .box .lefts .boxitem > uni-view:nth-child(2) {
.box .lefts .boxitem > uni-view:nth-child(2) {
font-weight: 400;
font-size: 0.3125rem;
font-size: 1.2vw;
color: #555555;
margin-top: 0.9vw;
margin-top: 0.6vw;
}
> .box .lefts .boxitem > uni-view:nth-child(3) {
.box .lefts .boxitem > uni-view:nth-child(3) {
font-weight: 400;
font-size: 0.3125rem;
font-size: 1.2vw;
color: #666666;
margin-top: 0.6vw;
}
@ -315,24 +514,24 @@
left: 2.5vw;
display: flex;
flex-direction: column;
justify-content: center;
}
.box .lefts .boxitem > uni-view .num uni-view:nth-child(1) {
font-weight: bold;
font-size: 2.2vw;
color: #333333;
margin-bottom: 0.6vw;
color: #555;
}
.box .lefts .boxitem > uni-view .num uni-view:nth-child(2) {
font-weight: 400;
font-size: 0.9vw;
font-size: 1vw;
color: #999999;
}
.box .lefts .boxitem > uni-view .znk {
width: 12vw;
height: 11.5vw;
width: 10vw;
height: 9.5vw;
position: absolute;
right: 0;
bottom: 0;
right: 1.5vw;
bottom: 1vw;
}
.box .lefts .boxitem > uni-view .znk uni-image {
width: 100%;
@ -353,17 +552,163 @@
width: 1.4vw;
height: 1.4vw;
}
.box .lefts .yujing {
background: rgba(255, 87, 87, 0.095);
.yujing {
border: 2px solid rgba(255, 102, 107, 0.51) !important;
box-shadow: 0 0 8px rgba(255, 102, 107, 0.51);
box-shadow: 0 0 8px rgba(255, 102, 107, 0.051) inset;
}
.box .lefts .yujing uni-view .num uni-view:nth-child(1) {
.yujing uni-view .num uni-view:nth-child(1) {
color: #FF5757 !important;
}
.box .lefts .active {
.active {
border: 2px dashed #017DE9 !important;
}
.leftr {
width: 70vw;
margin-left: 1vw;
height: calc(100%);
position: relative;
}
.leftr .fxj {
width: 30vw;
height: 16vw;
position: absolute;
left: 1vw;
bottom: 0vw;
z-index: 11;
border-radius: 1.6vw;
}
.leftr .fxj uni-text {
width: 76%;
font-weight: 400;
font-size: 0.9vw;
color: #999999;
display: flex;
justify-content: center;
position: absolute;
left: 0;
bottom: 0vw;
}
.leftr .mblbg {
width: 35vw;
height: 16vw;
position: absolute;
left: -1vw;
bottom: 0vw;
border-radius: 1.6vw;
filter: blur(0.46875rem);
background: #eff0f4;
z-index: 10;
}
.leftr .scroll-Y {
width: 100%;
height: 100%;
display: flex;
flex-wrap: wrap;
}
.leftr .scroll-Y .boxitem:nth-child(1),
.leftr .scroll-Y .boxitem:nth-child(2),
.leftr .scroll-Y .boxitem:nth-child(3) {
margin-top: 4vw;
}
.leftr .boxibigtem:nth-child(1),
.leftr .boxibigtem:nth-child(2) {
margin-top: 4vw;
}
.leftr .boxibigtem {
width: 33.3vw;
height: 21.7vw;
background: rgba(255, 255, 255, 0.7);
border-radius: 1.6vw;
margin: 0 1.3vw 1.2vw 0;
border: 2px dashed #fff;
display: inline-block;
padding: 2.3vw;
position: relative;
}
.leftr .boxibigtem > uni-view .hl {
color: #0385FA;
background: #E7F0FB;
}
.leftr .boxibigtem > uni-view .yl {
background: #DCF6F3;
color: #00C6A9;
}
.leftr .boxibigtem > uni-view .bj {
background: #E9EBFC;
color: #727BFF;
}
.leftr .boxibigtem > uni-view:nth-child(1) {
font-weight: bold;
font-size: 1.5vw;
color: #333;
white-space: nowrap;
overflow: hidden;
width: 100%;
text-overflow: ellipsis;
}
.leftr .boxibigtem > uni-view:nth-child(2) {
font-weight: 400;
font-size: 1.2vw;
color: #555555;
margin-top: 0.9vw;
}
.leftr .boxibigtem > uni-view:nth-child(3) {
font-weight: 400;
font-size: 1.2vw;
color: #666666;
margin-top: 0.6vw;
}
> .leftr .boxibigtem > uni-view:nth-child(4) {
width: 100%;
height: 10vw;
position: absolute;
left: 0;
bottom: 0;
}
.leftr .boxibigtem > uni-view .num {
position: absolute;
bottom: 2vw;
left: 2.5vw;
display: flex;
flex-direction: column;
justify-content: center;
}
.leftr .boxibigtem > uni-view .num uni-view:nth-child(1) {
font-weight: bold;
font-size: 2.2vw;
color: #555;
}
.leftr .boxibigtem > uni-view .num uni-view:nth-child(2) {
font-weight: 400;
font-size: 1vw;
color: #999999;
}
.leftr .boxibigtem > uni-view .znk {
width: 12vw;
height: 11.5vw;
position: absolute;
right: 1.5vw;
bottom: 1vw;
}
.leftr .boxibigtem > uni-view .znk uni-image {
width: 100%;
height: 100%;
}
.leftr .boxibigtem > uni-view .carditem {
width: 5.8vw;
height: 2.1vw;
border-radius: 1vw;
display: flex;
justify-content: center;
align-items: center;
font-weight: 400;
font-size: 0.9vw;
margin-top: 0.8vw;
}
.leftr .boxibigtem > uni-view .carditem uni-image {
width: 1.4vw;
height: 1.4vw;
}
body{

View File

@ -63,7 +63,7 @@ if (typeof uni !== 'undefined' && uni && uni.requireGlobal) {
}
});
// ../../../../hldy_app/unpackage/dist/dev/.nvue/pages/camera.js
// ../../../../项目/hldy_app/unpackage/dist/dev/.nvue/pages/camera.js
var import_vue = __toESM(require_vue());
function requireNativePlugin(name) {
return weex.requireModule(name);
@ -657,7 +657,7 @@ if (typeof uni !== 'undefined' && uni && uni.requireGlobal) {
)
]);
}
var camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app/pages/camera.nvue"]]);
var camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/\u9879\u76EE/hldy_app/pages/camera.nvue"]]);
// <stdin>
var webview = plus.webview.currentWebview();

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 794 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 28 KiB

File diff suppressed because one or more lines are too long