diff --git a/component/rightItemsindex/index.css b/component/rightItemsindex/index.css index 71bc980..0c20824 100644 --- a/component/rightItemsindex/index.css +++ b/component/rightItemsindex/index.css @@ -1,11 +1,9 @@ .right-container { width: calc(100% - 235rpx); height: 100vh; - // opacity: 0; transition: opacity 1s ease; .right-container-sec { - width: 100%; display: flex; position: relative; @@ -34,11 +32,8 @@ .carousel { position: relative; width: 30rpx; - /* 轮播图的宽度 */ height: 80rpx; - /* 轮播图的高度 */ - /* 背景色（示例） */ .dots { position: absolute; top: 50%; @@ -91,7 +86,6 @@ /* 背景颜色 #f4f9ff，透明度 70% */ position: relative; display: flex; - // justify-content: center; flex-direction: column; box-shadow: 0px 8rpx 16rpx rgba(0, 0, 0, 0.3); overflow: hidden; @@ -99,7 +93,6 @@ .uni-margin-wrap { margin-top: 200rpx; width: 1200rpx; - // width: 100%; .swiper { height: 900rpx; @@ -120,57 +113,6 @@ .time-tra-next { height: 100%; width: 700rpx; - - .time-button-view-fin { - display: flex; - margin-top: 50rpx; - margin-left: -50rpx; - - .time-button-start { - width: 220rpx; - height: 80rpx; - border-radius: 50rpx; - background: linear-gradient(to top, #047ADB, #0EA7DD); - border-left: 2rpx solid #fff; - display: flex; - justify-content: center; - align-items: center; - color: #fff; - font-size: 32rpx; - margin-right: 25rpx; - box-shadow: 3rpx 3rpx 10rpx rgba(0, 0, 0, 0.3); - transition: all 0.4s ease-in-out; - } - - .time-button-end { - width: 220rpx; - height: 80rpx; - border-radius: 50rpx; - background-color: #fff; - display: flex; - justify-content: center; - align-items: center; - font-size: 32rpx; - box-shadow: 3rpx 3rpx 10rpx rgba(0, 0, 0, 0.3); - transition: all 0.4s ease-in-out; - } - - .time-button-end-dark { - width: 220rpx; - height: 80rpx; - border-radius: 50rpx; - display: flex; - justify-content: center; - align-items: center; - font-size: 32rpx; - box-shadow: 3rpx 3rpx 10rpx rgba(0, 0, 0, 0.3); - background: linear-gradient(to top, #6B87BA, #FFFFFF); - transition: all 0.4s ease-in-out; - /* 渐变从下到上 */ - } - - } - .time-people { display: flex; margin-bottom: 20rpx; @@ -179,11 +121,9 @@ width: 42rpx; height: 42rpx; margin-right: 5rpx; - // margin-left: 50rpx; } .time-people-font { - // color: #586787; font-size: 30rpx; margin-right: 90rpx; } @@ -235,7 +175,6 @@ } .right-container-right-down-father { - // margin-left: 5%; width: 100%; height: 560rpx; display: flex; @@ -258,9 +197,6 @@ display: flex; box-shadow: 2rpx 0 0 2rpx; background-color: rgb(22, 48, 76); - - // background-image: url('/static/index/cardbgc/newbgc.png'); - // background-position: 50% 60%; border: 2rpx solid #fff; @@ -398,7 +334,6 @@ } } - // align-items: center; .right-container-right-title { width: 100%; height: 170rpx; @@ -430,19 +365,15 @@ } .right-container-right-father { - // margin-left: 2%; width: 100%; height: 630rpx; border-radius: 35rpx; border: 2rpx solid #fff; background-image: url('/static/index/mountain.png'); background-color: rgba(200, 216, 238, 0.8); - // background-image: url('/static/index/mountain.png'); background-position: 60% 50%; - /* 背景颜色 #f4f9ff，透明度 70% */ position: relative; display: flex; - // justify-content: center; flex-direction: column; box-shadow: 0px 8rpx 16rpx rgba(0, 0, 0, 0.3); overflow: hidden; @@ -450,7 +381,6 @@ .uni-margin-wrap { margin-top: 200rpx; width: 1200rpx; - // width: 100%; .swiper { height: 900rpx; @@ -472,55 +402,6 @@ height: 100%; width: 700rpx; - .time-button-view-fin { - display: flex; - margin-top: 50rpx; - margin-left: -50rpx; - - .time-button-start { - width: 220rpx; - height: 80rpx; - border-radius: 50rpx; - background: linear-gradient(to top, #047ADB, #0EA7DD); - border-left: 2rpx solid #fff; - display: flex; - justify-content: center; - align-items: center; - color: #fff; - font-size: 32rpx; - margin-right: 25rpx; - box-shadow: 3rpx 3rpx 10rpx rgba(0, 0, 0, 0.3); - transition: all 0.4s ease-in-out; - } - - .time-button-end { - width: 220rpx; - height: 80rpx; - border-radius: 50rpx; - background-color: #fff; - display: flex; - justify-content: center; - align-items: center; - font-size: 32rpx; - box-shadow: 3rpx 3rpx 10rpx rgba(0, 0, 0, 0.3); - transition: all 0.4s ease-in-out; - } - - .time-button-end-dark { - width: 220rpx; - height: 80rpx; - border-radius: 50rpx; - display: flex; - justify-content: center; - align-items: center; - font-size: 32rpx; - box-shadow: 3rpx 3rpx 10rpx rgba(0, 0, 0, 0.3); - background: linear-gradient(to top, #6B87BA, #FFFFFF); - transition: all 0.4s ease-in-out; - /* 渐变从下到上 */ - } - - } .time-people { display: flex; @@ -530,11 +411,9 @@ width: 42rpx; height: 42rpx; margin-right: 5rpx; - // margin-left: 50rpx; } .time-people-font { - // color: #586787; font-size: 30rpx; margin-right: 90rpx; } @@ -568,7 +447,6 @@ .time-text { margin-left: 10rpx; - // color: #364464; font-size: 70rpx; font-weight: 700; width: 800rpx; @@ -587,7 +465,6 @@ } .right-container-right-down-father { - // margin-left: 5%; width: 100%; height: 560rpx; display: flex; @@ -610,9 +487,6 @@ display: flex; box-shadow: 2rpx 0 0 2rpx; background-color: rgb(22, 48, 76); - - // background-image: url('/static/index/cardbgc/newbgc.png'); - // background-position: 50% 60%; border: 2rpx solid #fff; @@ -750,7 +624,6 @@ } } - // align-items: center; .right-container-right-title { width: 100%; height: 170rpx; @@ -782,28 +655,21 @@ } .right-container-left { - // width: 55%; height: 630rpx; border-radius: 45rpx; border: 1rpx solid #fff; - // background-color: rgba(203, 219, 238, 0.8); - /* 背景颜色 #f4f9ff，透明度 70% */ position: relative; display: flex; justify-content: center; align-items: center; background-color: rgba(255, 255, 255, 0.5); - /* 白色背景透明度为 10% */ background-image: url('/static/index/mountain.png'); background-position: 70% 45%; overflow: hidden; box-shadow: 0px 8rpx 16rpx rgba(0, 0, 0, 0.3); - // box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.1); /* 阴影效果 */ - /* 背景图片从左上角25%和30%的位置开始 */ } .right-container-left-dark { - // width: 55%; height: 630rpx; border-radius: 45rpx; background-color: rgb(22, 48, 76); @@ -813,7 +679,6 @@ linear-gradient(45deg, #9bc4f8, #285399, #9bc4f8, #285399, #9bc4f8) border-box; background-clip: padding-box, border-box; background-color: rgba(12, 25, 47, 0.1); - /* 背景颜色 #f4f9ff，透明度 70% */ position: relative; display: flex; justify-content: center; @@ -823,7 +688,6 @@ .uni-margin-wrap { width: 1000rpx; - // width: 100%; .swiper { height: 700rpx; @@ -846,26 +710,21 @@ height: 50rpx; width: 50rpx; margin-right: 10rpx; - // margin-left: 10rpx; z-index: 11; } .right-huli-fir { width: 250rpx; height: 100%; - // background-color: #047ADB; margin-top: 0rpx; display: flex; justify-content: center; align-items: center; flex-direction: column; - - .right-huli-view { margin-left: 8rpx; height: 750rpx; - // background-color: #047ADB; overflow: auto; display: flex; justify-content: center; @@ -929,7 +788,6 @@ .right-container-photo-img { width: 310rpx; height: 350rpx; - // margin-top: 30rpx; margin-bottom: 10rpx; } @@ -949,7 +807,6 @@ .right-container-fir-left-card-main-left { height: 50rpx; width: 50rpx; - // margin-right: 22rpx; margin-left: 30rpx; } @@ -980,7 +837,6 @@ .time-text { margin-left: 10rpx; - // color: #586787; font-size: 35rpx; width: 450rpx; margin-bottom: 40rpx; @@ -1032,7 +888,6 @@ } .time-people-font { - // color: #586787; font-size: 30rpx; margin-right: 20rpx; } @@ -1045,7 +900,6 @@ .time-people-thi { display: flex; - // margin-bottom: 15rpx; .time-people-img { width: 42rpx; @@ -1055,13 +909,11 @@ } .time-people-font { - // color: #586787; font-size: 30rpx; margin-right: 20rpx; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; - // width: 300rpx; } .time-people-font-dark { @@ -1076,14 +928,13 @@ .time-button-view { display: flex; - // margin-top: 80rpx; margin-left: 0rpx; transition: all 0.4s ease-in-out; .time-button-start { width: 230rpx; height: 80rpx; - border-radius: 40rpx; + border-radius: 30rpx; background: linear-gradient(to bottom, #AF8ED7, #4D3E9B); border-left: 2rpx solid #fff; display: flex; @@ -1099,7 +950,7 @@ .time-button-end { width: 230rpx; height: 80rpx; - border-radius: 40rpx; + border-radius: 30rpx; background-color: #fff; display: flex; justify-content: center; @@ -1112,7 +963,7 @@ .time-button-end-dark { width: 230rpx; height: 80rpx; - border-radius: 40rpx; + border-radius: 30rpx; display: flex; justify-content: center; align-items: center; @@ -1171,13 +1022,11 @@ } .time-people-font { - // color: #586787; font-size: 30rpx; margin-right: 20rpx; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; - // width: 300rpx; } .time-people-font-dark { @@ -1198,7 +1047,7 @@ .time-button-start { width: 230rpx; height: 80rpx; - border-radius: 40rpx; + border-radius: 30rpx; background: linear-gradient(to top, #0DA0B1, #04D3AF); border-left: 2rpx solid #fff; display: flex; @@ -1214,7 +1063,7 @@ .time-button-end { width: 230rpx; height: 80rpx; - border-radius: 40rpx; + border-radius: 30rpx; background-color: #fff; display: flex; justify-content: center; @@ -1227,7 +1076,7 @@ .time-button-end-dark { width: 230rpx; height: 80rpx; - border-radius: 40rpx; + border-radius: 30rpx; display: flex; justify-content: center; align-items: center; @@ -1282,7 +1131,6 @@ } .time-people-font { - // color: #586787; font-size: 30rpx; margin-right: 90rpx; transition: all 0.4s ease-in-out; @@ -1300,9 +1148,6 @@ width: 100%; height: 580rpx; display: flex; - - - // background-color: red; .right-container-fir-left-nav { width: 63%; height: 548rpx; @@ -1322,10 +1167,7 @@ .carousel { position: relative; width: 150rpx; - /* 轮播图的宽度 */ height: 100rpx; - /* 轮播图的高度 */ - // background-color: #f0f0f0; /* 背景色（示例） */ .dots { @@ -1404,8 +1246,6 @@ width: 100%; height: 100%; - // margin-top: 60rpx; - .split-line-white-right-left { width: 2rpx; /* 线条的宽度 */ @@ -1446,17 +1286,13 @@ } } } - .right-container-fir-left-card-main-right { height: 50rpx; width: 50rpx; margin-right: 25rpx; - // margin-left: 20rpx; z-index: 1; } - - .time-tra-fir { margin-top: 40rpx; margin-left: 30rpx; @@ -1473,7 +1309,7 @@ .time-button-start { width: 230rpx; height: 80rpx; - border-radius: 40rpx; + border-radius: 30rpx; background: linear-gradient(to top, #047ADB, #0EA7DD); border-left: 2rpx solid #fff; display: flex; @@ -1489,7 +1325,7 @@ .time-button-end { width: 230rpx; height: 80rpx; - border-radius: 40rpx; + border-radius: 30rpx; background-color: #fff; display: flex; justify-content: center; @@ -1502,7 +1338,7 @@ .time-button-end-dark { width: 230rpx; height: 80rpx; - border-radius: 40rpx; + border-radius: 30rpx; display: flex; justify-content: center; align-items: center; @@ -1526,7 +1362,6 @@ } .time-people-font { - // color: #586787; font-size: 30rpx; } @@ -1538,7 +1373,6 @@ .time-font { font-size: 70rpx; - // text-shadow: 0 -3rpx 3rpx; margin-bottom: 30rpx; background: linear-gradient(to top, #334160, #687898); -webkit-background-clip: text; @@ -1549,7 +1383,6 @@ .time-font-dark { font-size: 70rpx; - // text-shadow: 0 -3rpx 3rpx; margin-bottom: 30rpx; background: linear-gradient(to right, #EBF4FF, #ADC4E0); -webkit-background-clip: text; @@ -1560,7 +1393,6 @@ .time-text { margin-left: 10rpx; - // color: #586787; font-size: 35rpx; width: 530rpx; margin-bottom: 40rpx; @@ -1586,7 +1418,6 @@ align-items: center; flex-direction: column; position: relative; - // margin-top: 20rpx; margin-left: 50rpx; .right-container-fir-left-card-zhixing { @@ -1649,7 +1480,6 @@ } .right-container-fir-left-card-img { - // margin-top: 100rpx; width: 360rpx; height: 270rpx; } @@ -1683,7 +1513,6 @@ } .right-container-fir-right { - // margin-top: 6rpx; margin-left: 2%; margin-right: 2%; width: 700rpx; @@ -1716,7 +1545,6 @@ margin-left: 40rpx; position: relative; - // height: 700rpx; .right-container-card-right { position: absolute; right: 0; @@ -1831,7 +1659,6 @@ .right-container-date { font-size: 35rpx; - // color: #7080A1; display: block; margin: 0; margin-left: 18rpx; @@ -1853,18 +1680,13 @@ .right-container-day { font-size: 35rpx; font-weight: 600; - // color: #7080A1; margin-left: 18rpx; - - } .right-container-day-dark { font-size: 35rpx; font-weight: 600; - // color: #7080A1; margin-left: 18rpx; - background: linear-gradient(to bottom, #FFFFFF, #B2C8E2); -webkit-background-clip: text; color: transparent; @@ -1928,8 +1750,6 @@ } } - - //分割线 .split-line { margin-left: 20rpx; margin-top: 120rpx; @@ -1946,9 +1766,7 @@ height: 800rpx; /* 高度占满父容器 */ background: linear-gradient(to top, rgba(0, 0, 0, 0) 0%, #fff 50%, rgba(0, 0, 0, 0) 100%); - // wmargin-left: 20rpx; position: relative; - // z-index: -1; .split-line-white-img { position: absolute; @@ -1997,7 +1815,6 @@ align-items: flex-start; /* 垂直方向对齐方式可以调整 */ flex-direction: column; - // margin-left: -65rpx; height: 450rpx; .right-huli-view-dis { @@ -2133,7 +1950,6 @@ width: 100%; height: 150rpx; - // background-color: red; .under-father-view { margin-left: 10rpx; margin-right: 150rpx; @@ -2212,16 +2028,13 @@ } .swiper-item-flex { - // transition: all 0.4s ease-in-out; .time-tra-thi-photo { display: flex; justify-content: center; align-items: center; width: 300rpx; - // height: 100%; flex-direction: column; - // margin-left: -100rpx; transition: all 0.4s ease-in-out; margin-left: 20rpx; @@ -2315,21 +2128,17 @@ /* 平滑过渡 */ transform-origin: right bottom; background-color: rgba(220, 230, 254, 1); - // z-index: 998; border-radius: 50rpx; } .right-container-left-big { transform: scale(1.5); - // margin-left: 2%; width: 55%; /* 初始状态 */ transition: transform 0.5s ease; /* 平滑过渡 */ transform-origin: left bottom; background-color: rgba(183, 200, 243, 1); - // background-color: #fff; - // z-index: 999; border-radius: 50rpx; } @@ -2341,6 +2150,5 @@ /* 平滑过渡 */ transform-origin: left bottom; background-color: rgba(183, 200, 243, 1); - // z-index: 998; border-radius: 50rpx; } \ No newline at end of file diff --git a/component/storeroom/index.vue b/component/storeroom/index.vue index 228dde4..b13c0a9 100644 --- a/component/storeroom/index.vue +++ b/component/storeroom/index.vue @@ -16,8 +16,27 @@ 拼音检索 + - + + + + + + + + + {{ 99 + `+` }} + + + + + + + 请购单 + + + @@ -38,6 +57,45 @@ + + + + + 纸尿裤-拉拉裤 + + 护理类 + + + + + + 规格型号：800mm*690mm + + + + 采购单位：片 + + + 库存 + ↑ + ：1000 + + + + + 库存数量： + + 50 + + + + + 库存 + ↓ + ：5 + + + 请购 @@ -47,13 +105,6 @@ - - - 纸尿裤-拉拉裤 - ZHYP044 - - - @@ -64,7 +115,7 @@ 长春市朝阳区久泰开运养老服务有限公司 - + @@ -73,11 +124,40 @@ @click="opendetail" /> - + + + + + 1000 + 库存上限 + + + + + + + 10 + 库存下限 + + + + + + + 50 + 库存数量 + - + + + 纸尿裤-拉拉裤 + + + ZHYP044 + + @@ -85,8 +165,8 @@ \ No newline at end of file diff --git a/component/storeroom/orders.vue b/component/storeroom/orders.vue index 616813c..87c37c3 100644 --- a/component/storeroom/orders.vue +++ b/component/storeroom/orders.vue @@ -27,15 +27,17 @@ 供应商 - + 采购日期 - + {{stateTarget ? stateTarget : `请输入采购日期`}} - + @@ -51,92 +53,114 @@ - - - - - - - - - - 采购 - - - - - 拣货 - - - - - 结账 - + + + + + + + + + + + 采购 - - 已作废 + + + 拣货 + + + + + 结账 + - - - - - - - - - - - 采购 - - - - - 拣货 - - - - - 结账 - - - - - 已结账 - + + {{stateArray[item.cardType]}} - - - - - - - - - - 采购 - + + + 采购单号: + A0120250301001555 + + + + + 采 购 人： - - - 拣货 - - - - - 结账 - + + 王法 - - 未确认 + + + 采购日期 ： + + + 2025.03.02 + + + + 联 系 人 ： + + + 李月 + + + + + 联系电话 ： + + + 13355653333 + + + + + 供 应 商 ： + + + 宽城区珂爱个人卫生用品店 + + + + + + + 详情 + + + 结账 + + + 拣货 + + + + 回退 + + + + 确认 + + + 作废 + + + @@ -158,7 +182,9 @@ @click="opendetail" /> + + @@ -180,6 +206,45 @@ }); // 使用watch监听isShow变化 const transition = ref(true); + const getBallFirst = (type : number) => { + switch (type) { + case 0: + return `ball-red` + case 1: + return `ball-yellow` + default: + return 'ball-green' + } + } + const getBallSecond = (type : number) => { + switch (type) { + case 0: + return `ball-white` + case 1: + return `ball-white` + case 2: + return `ball-yellow` + case 3: + return `ball-yellow` + case 4: + return `ball-green` + case 5: + return `ball-green` + // default: + // return 'ball-green' + } + } + const getBallThird = (type : number) => { + switch (type) { + + case 4: + return `ball-yellow` + case 5: + return `ball-green` + default: + return 'ball-white' + } + } watch( () => props.isShow, (newVal, oldVal) => { @@ -196,32 +261,131 @@ const secondBall = ref(0); const thirdBall = ref(0); const calendarShow = ref(false); - const firstBallClick = () =>{ + const isDelete = (index : number) => { + firstBall.value = 0 secondBall.value = 0 thirdBall.value = 0 - if(firstBall.value<3){ + cardArray.value[index].cardType = 0 + sliceArray.value = cardArray.value; + } + const isRight = (index : number) => { + firstBall.value = 0 + secondBall.value = 0 + thirdBall.value = 0 + cardArray.value[index].cardType++ + sliceArray.value = cardArray.value; + } + const isBack = (index : number) => { + firstBall.value = 0 + secondBall.value = 0 + thirdBall.value = 0 + cardArray.value[index].cardType-- + sliceArray.value = cardArray.value; + } + const firstBallClick = () => { + secondBall.value = 0 + thirdBall.value = 0 + if (firstBall.value < 3) { firstBall.value++ - }else{ + } else { firstBall.value = 0 } - } - const secondBallClick = () =>{ - firstBall.value = 0 - thirdBall.value = 0 - if(secondBall.value<2){ - secondBall.value++ - }else{ - secondBall.value = 0 + if (firstBall.value) { + let saveArray = [] + switch (firstBall.value) { + case 1: + + cardArray.value.forEach((element : any) => { + if (element.cardType == 1) { + saveArray.push(element) + } + }) + sliceArray.value = saveArray; + break + case 2: + cardArray.value.forEach((element : any) => { + if (element.cardType > 2) { + saveArray.push(element) + } + }) + sliceArray.value = saveArray; + break + case 3: + cardArray.value.forEach((element : any) => { + if (element.cardType == 0) { + saveArray.push(element) + } + }) + sliceArray.value = saveArray; + break + } + } else { + sliceArray.value = cardArray.value; } } - const thirdBallClick = () =>{ + const secondBallClick = () => { + firstBall.value = 0 + thirdBall.value = 0 + if (secondBall.value < 2) { + secondBall.value++ + } else { + secondBall.value = 0 + } + if (secondBall.value) { + let saveArray = [] + switch (secondBall.value) { + case 1: + cardArray.value.forEach((element : any) => { + if (element.cardType == 2 || element.cardType == 3) { + saveArray.push(element) + } + }) + sliceArray.value = saveArray; + break + case 2: + cardArray.value.forEach((element : any) => { + if (element.cardType > 3) { + saveArray.push(element) + } + }) + sliceArray.value = saveArray; + break + } + } else { + sliceArray.value = cardArray.value; + } + } + const thirdBallClick = () => { secondBall.value = 0 firstBall.value = 0 - if(thirdBall.value<2){ + if (thirdBall.value < 2) { thirdBall.value++ - }else{ + } else { thirdBall.value = 0 } + if (thirdBall.value) { + let saveArray = [] + switch (thirdBall.value) { + case 1: + cardArray.value.forEach((element : any) => { + if (element.cardType == 4) { + saveArray.push(element) + } + }) + sliceArray.value = saveArray; + break + case 2: + cardArray.value.forEach((element : any) => { + if (element.cardType == 5) { + saveArray.push(element) + } + }) + sliceArray.value = saveArray; + break + } + } else { + sliceArray.value = cardArray.value; + } } // 表格弹窗 const detailisopen = ref(false); @@ -234,10 +398,21 @@ ]); const stateTarget = ref(""); - const stateArray = ref(['所有状态', '未确认', '已确认', '未完结', '待结账', '已结账', '已作废']); + const stateArray = ref(['已作废', '未确认', '已确认', '未完结', '待结账', '已结账']); + // 注意cardType 0是已作废，1是未确认，2是已确认，3是未完结，4是待结账，5是已结账 const cardArray = ref( Array.from({ length: 6 }, (_, index) => ({ cardType: index })) ); + const sliceArray = ref([]); + // const sliceTheArray = (type:number) =>{ + // let saveArray = [] + // cardArray.value.forEach((element:any)=>{ + // if(element.cardType>=type){ + // saveArray.push(element) + // } + // }) + // sliceArray.value = saveArray + // } const clickBall = (index : number) => { switch (index) { case 0: @@ -260,10 +435,13 @@ // const changeStateTarget = (e : any) => { // stateTarget.value = e.detail.value // } - const calendarchange = (e:any) =>{ + const calendarchange = (e : any) => { stateTarget.value = e.result // console.log("E",e.result) } + onMounted(() => { + sliceArray.value = cardArray.value; + }) - \ No newline at end of file diff --git a/component/zy-upgrade/zy-upgrade.vue b/component/zy-upgrade/zy-upgrade.vue index 04b8f5d..3e3831b 100644 --- a/component/zy-upgrade/zy-upgrade.vue +++ b/component/zy-upgrade/zy-upgrade.vue @@ -92,14 +92,11 @@ }, mounted() { - //console.log(`1111`,"检测升级") let app_flag = false // #ifdef APP-PLUS app_flag = true // #endif if((this.h5preview || app_flag) && this.autocheckupdate){ - - //console.log(`5610`,"检测升级") this.check_update() } }, @@ -113,11 +110,9 @@ methods:{ //检测升级 check_update(){ - // console.log(`99999`,this.key) let that = this // #ifdef APP-PLUS plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) { - console.log("版本信息："+JSON.stringify(widgetInfo)); that.currentversion = widgetInfo.version that.versionname = widgetInfo.name that.versioncode = widgetInfo.versionCode @@ -131,32 +126,14 @@ // #endif }, updatebusiness: function(that){ //具体升级的业务逻辑 - - // let platform = uni.getSystemInfoSync().platform - // let formdata = { - // appid:'', - // method: "upgrade", - // version: that.currentversion, - // name: that.versionname, - // code: that.versioncode, - // ts:(new Date()).valueOf(), - // transid:'', - // sign:'', - // platform: platform - // } - // console.log("!!!!!!!!!",formdata) - //console.log("请求地址："+JSON.stringify(formdata)); uni.request({ url: `http://smartnu.blxinchuang.com/nursing-unit/api/pad/versionUpdate?platform=1&version=${that.currentversion}`, method: 'GET', - // data:formdata, dataType:'json', success: (res) => { - console.log("????",res) if(res.data.code==100){ //提示升级 if(res.data.data.update_url){ - // //console.log("执行") that.dshow = true; that.update_tips = res.data.data.update_tips; that.forceupgrade = res.data.data.forceupdate==1; @@ -165,7 +142,6 @@ that.wgt_flag = res.data.data.wgt_flag; that.wgt_url = res.data.data.wgt_url; that.size = res.data.data.size; - // console.log(`444`,that.updated2version) that.getnewbanben(); }else{ // if(that.noticeflag){ @@ -232,7 +208,7 @@ url: targetUrl, header:this.header, success:function(res){ - console.log("!!!",res) + // console.log("!!!",res) if(res.statusCode == 200){ //开始安装 plus.runtime.install(res.tempFilePath, { @@ -266,7 +242,7 @@ } }) this.downloadTask.onProgressUpdate(function(res){ - console.log("99999",res) + // console.log("99999",res) that.update_process = res.progress if(res.progress == Infinity){ //使用size计算 diff --git a/manifest.json b/manifest.json index a17a2b0..171cd71 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "养老App", "appid" : "__UNI__FB2D473", "description" : "养老App", - "versionName" : "1.0.0", - "versionCode" : 100, + "versionName" : "1.0.6", + "versionCode" : 106, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/Nursing/index.vue b/pages/Nursing/index.vue index 71c0eff..9c8753b 100644 --- a/pages/Nursing/index.vue +++ b/pages/Nursing/index.vue @@ -52,9 +52,7 @@ - - + @@ -64,7 +62,7 @@ import rightItemsfirst from "../../component/rightItemsindex/index.vue" import rightItemssecond from "../../component/rightItemssecond/index.vue" import { onShow } from '@dcloudio/uni-app'; - import ZyUpdate from '@/component/zy-upgrade/zy-upgrade.vue' + // 初始化左侧菜单列表 const iconList = ref([ @@ -271,15 +269,14 @@ return result; } - const zyupgrade = ref(null) // 生命周期钩子 onShow(() => { - zyupgrade.value?.check_update() //首次加载和跳转回来需要重新做个动画 setTimeout(() => { changeMenu(menuIndex.value) }, 50) }); +