diff --git a/pages/NursingNew/component/doctorask/doctorask.vue b/pages/NursingNew/component/doctorask/doctorask.vue index 882cdc0..9ab28e7 100644 --- a/pages/NursingNew/component/doctorask/doctorask.vue +++ b/pages/NursingNew/component/doctorask/doctorask.vue @@ -453,12 +453,12 @@ } .photowall { position: fixed; - top: 54%; + top: 50%; left: 50%; transform: translate(-50%, -50%); width: 80vw; height: 83%; - border-radius: 30rpx; + border-radius: 40rpx; background-color: #fff; transition: all 0.3s; z-index: 999; @@ -469,7 +469,7 @@ display: flex; justify-content: space-between; width: 100%; - margin-bottom: 50rpx; + margin-bottom: 20rpx; .photowall-name { font-size: 38rpx; diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue index ce93506..0ab52fe 100644 --- a/pages/NursingNew/component/index.vue +++ b/pages/NursingNew/component/index.vue @@ -118,11 +118,11 @@ - + {{v.directiveName?.substring(0,4)}} - {{v.directiveName?.substring(4,12)}} + style="white-space: nowrap;width: 100%;text-overflow: ellipsis;overflow: hidden;">{{v.directiveName?.substring(0,5)}} + {{v.directiveName?.substring(5,12)}} - + {{ item.nuName.length>6?item.nuName.substring(0,6)+'.':item.nuName }} @@ -390,8 +390,10 @@ nuId: nuId, elderId: elderId } + // console.log("入参",data) queryAll(data).then(res => { zlarr.value = res.result; + // console.log("看看图标",res.result) shtab(fwzlindex.value) }) } @@ -818,7 +820,7 @@ display: flex; align-items: center; margin-left: 2vw; - font-size: 1.4vw; + font-size: 32rpx; font-weight: 600; border-bottom: 1px solid #F2F2F2; } @@ -894,7 +896,7 @@ .right-bottom { margin-top: 2vh; width: 100%; - height: 23.4vw; + height: 24vw; background-color: #fff; border-radius: 3vh; padding-top: 1vh; @@ -910,7 +912,7 @@ justify-content: space-between; .bottom-carmera { - margin-top: 0.5vw; + margin-top: 0.7vw; width: 3vw; height: 3vw; } @@ -1022,8 +1024,8 @@ &:nth-child(2) { font-weight: 400; - font-size: 1vw; - color: #333333; + font-size: 1.2vw; + color: #9d9d9d; } } } @@ -1105,7 +1107,7 @@ } .blue-button { - margin-top: 0.5vw; + margin-top: 0.7vw; width: 7vw; height: 2.5vw; background: linear-gradient(to bottom, #009DEF, #0076FF); @@ -1268,8 +1270,8 @@ flex-wrap: wrap; .cdk { - width: 6.1vw; - height: 6.1vw; + width: 7.5vw; + height: 7.5vw; background: #F8F8F8; border-radius: 1.6vw; margin: 1.5vw 1.5vw 0 0vw; @@ -1279,16 +1281,16 @@ overflow: hidden; image { - width: 2vw; - height: 2vw; - margin: 1vw auto 0vw; + width: 2.6vw; + height: 2.6vw; + margin: 1.2vw auto 0vw; } text { display: block; text-align: center; font-weight: 400; - font-size: 1.1vw; + font-size: 1.2vw; color: #333333; width: 100%; } @@ -1296,9 +1298,10 @@ view { text-align: center; font-weight: 400; - font-size: 0.7vw; + font-size: 0.9vw; color: #555; width: 100%; + margin-top: -0.3vw; } } @@ -1347,7 +1350,7 @@ .tittop { height: 2vw; font-weight: 400; - font-size: 1.4vw; + font-size: 1.5vw; color: #333333; display: flex; align-items: center; @@ -1367,7 +1370,7 @@ width: 2.2vw; height: 1.1vw; top: 9.68vw; - right: 2.5vw; + right: 4.3vw; z-index: 220; image { @@ -1408,6 +1411,7 @@ z-index: 200; display: flex; padding: 1.6vw 1.6vw 0; + overflow: hidden; .carfd { width: 11.5vw; diff --git a/pages/NursingNew/component/leftcontent/serveswipe.vue b/pages/NursingNew/component/leftcontent/serveswipe.vue index c41b4fa..8903d76 100644 --- a/pages/NursingNew/component/leftcontent/serveswipe.vue +++ b/pages/NursingNew/component/leftcontent/serveswipe.vue @@ -1763,12 +1763,12 @@ .photowall { position: fixed; - top: 54%; + top: 50%; left: 50%; transform: translate(-50%, -50%); width: 80vw; height: 83%; - border-radius: 30rpx; + border-radius: 40rpx; background-color: #fff; transition: all 0.3s; z-index: 9990; @@ -1780,7 +1780,7 @@ display: flex; justify-content: space-between; width: 100%; - margin-bottom: 50rpx; + margin-bottom: 20rpx; .photowall-name { font-size: 38rpx; diff --git a/pages/NursingNew/component/warehouse/warehouse.vue b/pages/NursingNew/component/warehouse/warehouse.vue index caedde8..85a763e 100644 --- a/pages/NursingNew/component/warehouse/warehouse.vue +++ b/pages/NursingNew/component/warehouse/warehouse.vue @@ -453,12 +453,12 @@ } .photowall { position: fixed; - top: 54%; + top: 50%; left: 50%; transform: translate(-50%, -50%); width: 80vw; height: 83%; - border-radius: 30rpx; + border-radius: 40rpx; background-color: #fff; transition: all 0.3s; z-index: 999; @@ -469,7 +469,7 @@ display: flex; justify-content: space-between; width: 100%; - margin-bottom: 50rpx; + margin-bottom: 20rpx; .photowall-name { font-size: 38rpx; diff --git a/pages/Warehouse/finish.vue b/pages/Warehouse/finish.vue index 1a67281..be2456b 100644 --- a/pages/Warehouse/finish.vue +++ b/pages/Warehouse/finish.vue @@ -3185,12 +3185,12 @@ .photowall { position: absolute; - top: 54%; + top: 50%; left: 50%; transform: translate(-50%, -50%); width: 80%; height: 83%; - border-radius: 30rpx; + border-radius: 40rpx; background-color: #fff; transition: all 0.3s; z-index: 999; @@ -3202,7 +3202,7 @@ display: flex; justify-content: space-between; width: 100%; - margin-bottom: 50rpx; + margin-bottom: 20rpx; .photowall-name { font-size: 38rpx; diff --git a/pages/Warehouse/index/component/index.vue b/pages/Warehouse/index/component/index.vue index 2b7a2bf..49ecbb8 100644 --- a/pages/Warehouse/index/component/index.vue +++ b/pages/Warehouse/index/component/index.vue @@ -135,7 +135,7 @@ - + {{ item.nuName }} @@ -454,12 +454,12 @@ .photowall { position: fixed; - top: 54%; + top: 50%; left: 50%; transform: translate(-50%, -50%); width: 80vw; height: 83%; - border-radius: 30rpx; + border-radius: 40rpx; background-color: #fff; transition: all 0.3s; z-index: 9990; @@ -471,7 +471,7 @@ display: flex; justify-content: space-between; width: 100%; - margin-bottom: 50rpx; + margin-bottom: 20rpx; .photowall-name { font-size: 38rpx; @@ -569,7 +569,7 @@ display: flex; align-items: center; margin-left: 2vw; - font-size: 1.4vw; + font-size: 32rpx; font-weight: 600; border-bottom: 1px solid #F2F2F2; } @@ -892,7 +892,7 @@ &:nth-child(2) { font-weight: 400; - font-size: 1vw; + font-size: 1.2vw; color: #333333; } } @@ -1382,7 +1382,7 @@ justify-content: space-between; .bottom-carmera { - margin-top: 0.5vw; + margin-top: 0.7vw; width: 3vw; height: 3vw; } diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue index bc1afdc..63eca2d 100644 --- a/pages/Warehouse/picking.vue +++ b/pages/Warehouse/picking.vue @@ -42,32 +42,26 @@ - - - - 采购单价: - - ¥{{ gaijia }} - - - - - - 到货单价: - - - ¥ {{ gaijia }} - - - - + + + + + 到货单价: + + + ¥ {{ gaijia }} + + + + + @@ -80,8 +74,8 @@ - - + + 1 @@ -93,7 +87,7 @@ 3 - + 4 @@ -105,7 +99,7 @@ 6 - + 7 @@ -117,7 +111,7 @@ 9 - + 清零 @@ -129,6 +123,7 @@ . + @@ -140,7 +135,7 @@ 物料信息 - + ¥{{showvalue.totalPrice}} @@ -262,7 +257,7 @@ @touchend="handleTouchEnd"> - - + {{v}} @@ -286,51 +281,51 @@ - - + + 1 - + 2 - + 3 - - + + 4 - + 5 - + 6 - - + + 7 - + 8 - + 9 - - + + 清零 - + 0 - + @@ -679,7 +674,8 @@ - + 作废 @@ -1172,7 +1168,7 @@ }, 100) } const opengaijiaclick = () => { - if(!showvalue.value.jianhuobtn){ + if (!showvalue.value.jianhuobtn) { return } opengaijia.value = true; @@ -2437,7 +2433,7 @@ height: 675rpx; // margin-top: 20rpx; // background-color: blue; - + // border-radius: 30rpx; } } @@ -2451,8 +2447,8 @@ .middle-Y-father { display: flex; height: 100%; - - .middle-one-white{ + + .middle-one-white { min-width: 400rpx; max-width: 400rpx; height: 100%; @@ -2919,14 +2915,15 @@ top: 50%; left: 50%; transform: translate(-50%, -50%); - width: 50%; - height: 55%; - border-radius: 40rpx; + width: 38%; + height: 81%; + border-radius: 50rpx; background-color: #fff; transition: all 0.3s; z-index: 999; box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1); padding: 0 60rpx; + } .jianhuofather { @@ -2953,24 +2950,24 @@ .photowall { position: fixed; - top: 54%; + top: 50%; left: 50%; transform: translate(-50%, -50%); width: 80%; height: 83%; - border-radius: 30rpx; + border-radius: 40rpx; background-color: #fff; transition: all 0.3s; z-index: 999; box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1); - padding: 0 90rpx; + padding: 0 60rpx; .photowall-title { margin-top: 50rpx; display: flex; justify-content: space-between; width: 100%; - margin-bottom: 50rpx; + margin-bottom: 20rpx; .photowall-name { font-size: 38rpx; @@ -3047,24 +3044,50 @@ font-size: 40rpx; font-weight: 600; background-color: #f3f5f9; - border-radius: 35rpx; + border-radius: 45rpx; // box-shadow: 2px 3px 6px rgba(0, 0, 0, 0.12); color: #555555; - width: 100rpx; - height: 100rpx; + width: 135rpx; + height: 110rpx; + border: 1rpx solid #eeeeee; + display: flex; + justify-content: center; + align-items: center; + margin-right: 60rpx; + margin-bottom: 30rpx; + transition: .1s; + -webkit-transform-style: preserve-3d; + -webkit-overflow-scrolling: touch; + } + .gray-button-jianpan-jian:active { + background: linear-gradient(to top, #00C9FF, #0076FF); + color: #fff; + font-size: 44rpx; + font-weight: 700; + border: 1rpx solid #00C9FF; + } + + .gray-button-jianpan-jian { + font-size: 40rpx; + font-weight: 600; + background-color: #f3f5f9; + border-radius: 45rpx; + // box-shadow: 2px 3px 6px rgba(0, 0, 0, 0.12); + color: #555555; + width: 135rpx; + height: 110rpx; border: 1rpx solid #eeeeee; display: flex; justify-content: center; align-items: center; margin-right: 30rpx; - margin-bottom: 20rpx; + margin-bottom: 30rpx; transition: .1s; -webkit-transform-style: preserve-3d; -webkit-overflow-scrolling: touch; } - .gray-input { - font-size: 50rpx; + font-size: 40rpx; font-weight: 600; background-color: #f3f5f9; border-radius: 20rpx; @@ -3083,8 +3106,8 @@ .jianhuo-jianpan { position: absolute; - right: -10rpx; - bottom: 12%; + right: 30rpx; + bottom: 130rpx; } .text-anim { diff --git a/pages/login/api.js b/pages/login/api.js index 010dde9..70e78b2 100644 --- a/pages/login/api.js +++ b/pages/login/api.js @@ -20,7 +20,7 @@ export const getLoginCode = (time) => { }) } //获得图片base -export const getPublicMediaUrl = (time) => { +export const getPublicMediaUrl = () => { return request({ url: `/api/baseInfo/getPublicMediaUrl`, method: 'get', diff --git a/pages/procurement/addtory.vue b/pages/procurement/addtory.vue index f8add05..e9a2ff6 100644 --- a/pages/procurement/addtory.vue +++ b/pages/procurement/addtory.vue @@ -25,7 +25,7 @@ - + @@ -244,7 +244,8 @@ width: 91vw; height: 53vw; margin: 0vw auto 0; - overflow: hidden; + // overflow: hidden; + } diff --git a/pages/procurement/common/toryitem.vue b/pages/procurement/common/toryitem.vue index eae6c19..acc331f 100644 --- a/pages/procurement/common/toryitem.vue +++ b/pages/procurement/common/toryitem.vue @@ -1,9 +1,12 @@