合并代码

This commit is contained in:
Teng 2026-01-06 08:32:56 +08:00
parent 5df021258c
commit 5ce6b38f90
16 changed files with 178 additions and 170 deletions

View File

@ -1,142 +1,143 @@
{
"name" : "护理单元",
"appid" : "__UNI__FB2D473",
"description" : "护理单元",
"versionName" : "1.0.021",
"versionCode" : 10021,
"transformPx" : false,
/* 5+App */
"app-plus" : {
"usingComponents" : true,
"nvueStyleCompiler" : "uni-app",
"compilerVersion" : 3,
"screenOrientation" : [
// "portrait-primary", //
"landscape-primary", // home
"landscape-secondary" // home
],
"splashscreen" : {
"alwaysShowBeforeRender" : true,
"waiting" : true,
"autoclose" : true,
"delay" : 0
},
/* */
"modules" : {
"Share" : {},
"VideoPlayer" : {},
"Camera" : {}
},
/* */
"distribute" : {
/* android */
"android" : {
"permissions" : [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>"
],
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
"minSdkVersion" : 22
},
/* ios */
"ios" : {
"dSYMs" : false
},
/* SDK */
"sdkConfigs" : {
"share" : {
"weixin" : {
"appid" : "wxda748470da82886e",
"UniversalLinks" : ""
}
},
"allowOldSDK" : true
},
"icons" : {
"android" : {
"hdpi" : "unpackage/res/icons/72x72.png",
"xhdpi" : "unpackage/res/icons/96x96.png",
"xxhdpi" : "unpackage/res/icons/144x144.png",
"xxxhdpi" : "unpackage/res/icons/192x192.png"
},
"ios" : {
"appstore" : "unpackage/res/icons/1024x1024.png",
"ipad" : {
"app" : "unpackage/res/icons/76x76.png",
"app@2x" : "unpackage/res/icons/152x152.png",
"notification" : "unpackage/res/icons/20x20.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"proapp@2x" : "unpackage/res/icons/167x167.png",
"settings" : "unpackage/res/icons/29x29.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"spotlight" : "unpackage/res/icons/40x40.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png"
},
"iphone" : {
"app@2x" : "unpackage/res/icons/120x120.png",
"app@3x" : "unpackage/res/icons/180x180.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"notification@3x" : "unpackage/res/icons/60x60.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"settings@3x" : "unpackage/res/icons/87x87.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png",
"spotlight@3x" : "unpackage/res/icons/120x120.png"
}
}
}
},
"nativePlugins" : {
"MonitorModule" : {
"__plugin_info__" : {
"name" : "MonitorModule",
"description" : "bugly升级",
"platforms" : "Android",
"url" : "",
"android_package_name" : "",
"ios_bundle_id" : "",
"isCloud" : false,
"bought" : -1,
"pid" : "",
"parameters" : {}
}
}
}
},
/* */
"quickapp" : {},
/* */
"mp-weixin" : {
"appid" : "wx8fc3e4305d2fbf0b",
"setting" : {
"urlCheck" : false
},
"usingComponents" : true
},
"mp-alipay" : {
"usingComponents" : true
},
"mp-baidu" : {
"usingComponents" : true
},
"mp-toutiao" : {
"usingComponents" : true
},
"uniStatistics" : {
"enable" : false
},
"vueVersion" : "3"
}
"name": "护理单元",
"appid": "__UNI__FB2D473",
"description": "护理单元",
"versionName": "1.0.021",
"versionCode": 10021,
"transformPx": false,
/* 5+App */
"app-plus": {
"usingComponents": true,
"nvueStyleCompiler": "uni-app",
"compilerVersion": 3,
"screenOrientation": [
// "portrait-primary", //
"landscape-primary", // home
"landscape-secondary" // home
],
"splashscreen": {
"alwaysShowBeforeRender": true,
"waiting": true,
"autoclose": true,
"delay": 0
},
/* */
"modules": {
"Share": {},
"VideoPlayer": {},
"Camera": {}
},
/* */
"distribute": {
/* android */
"android": {
"permissions": [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>"
],
"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
"minSdkVersion": 22
},
/* ios */
"ios": {
"dSYMs": false
},
/* SDK */
"sdkConfigs": {
"share": {
"weixin": {
"appid": "wxda748470da82886e",
"UniversalLinks": ""
}
},
"allowOldSDK": true
},
"icons": {
"android": {
"hdpi": "unpackage/res/icons/72x72.png",
"xhdpi": "unpackage/res/icons/96x96.png",
"xxhdpi": "unpackage/res/icons/144x144.png",
"xxxhdpi": "unpackage/res/icons/192x192.png"
},
"ios": {
"appstore": "unpackage/res/icons/1024x1024.png",
"ipad": {
"app": "unpackage/res/icons/76x76.png",
"app@2x": "unpackage/res/icons/152x152.png",
"notification": "unpackage/res/icons/20x20.png",
"notification@2x": "unpackage/res/icons/40x40.png",
"proapp@2x": "unpackage/res/icons/167x167.png",
"settings": "unpackage/res/icons/29x29.png",
"settings@2x": "unpackage/res/icons/58x58.png",
"spotlight": "unpackage/res/icons/40x40.png",
"spotlight@2x": "unpackage/res/icons/80x80.png"
},
"iphone": {
"app@2x": "unpackage/res/icons/120x120.png",
"app@3x": "unpackage/res/icons/180x180.png",
"notification@2x": "unpackage/res/icons/40x40.png",
"notification@3x": "unpackage/res/icons/60x60.png",
"settings@2x": "unpackage/res/icons/58x58.png",
"settings@3x": "unpackage/res/icons/87x87.png",
"spotlight@2x": "unpackage/res/icons/80x80.png",
"spotlight@3x": "unpackage/res/icons/120x120.png"
}
}
}
},
"nativePlugins": {
"MonitorModule": {
"__plugin_info__": {
"name": "MonitorModule",
"description": "bugly升级",
"platforms": "Android",
"url": "",
"android_package_name": "",
"ios_bundle_id": "",
"isCloud": false,
"bought": -1,
"pid": "",
"parameters": {}
}
}
}
},
/* */
"quickapp": {},
/* */
"mp-weixin": {
"appid": "wx8fc3e4305d2fbf0b",
"setting": {
"urlCheck": false
},
"usingComponents": true
},
"mp-alipay": {
"usingComponents": true
},
"mp-baidu": {
"usingComponents": true
},
"mp-toutiao": {
"usingComponents": true
},
"uniStatistics": {
"enable": false
},
"vueVersion": "3"
}

View File

@ -226,10 +226,11 @@
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app x",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8",
// "navigationBarBackgroundColor": "red",
// "backgroundColor": "red",
"navigationStyle": "custom",
"bounce": "none" //
},
"uniIdRouter": {}
}

View File

@ -1,6 +1,6 @@
<!-- 动画页 -->
<template>
<view @click="morerule=false">
<view>
<view class="home">
<image class="all-home" src="/static/index/warehouse/newindexhome/backdro.jpg" mode="aspectFit"></image>
</view>
@ -68,7 +68,7 @@
<donghua width="14vw" height="13vw" :interval="250" :links="officerarray" :playing="playall" :loop="true" />
</view>
<view class="Print tp">
<donghua width="6vw" height="6vw" :interval="300" :links="Printarray" :playing="playall" :loop="true" />
<donghua width="5vw" height="5vw" :interval="300" :links="Printarray" :playing="playall" :loop="true" />
</view>
<view class="fontend tp">
<image class="all-home" src="/static/index/warehouse/newindexhome/reception.png" mode="aspectFit"></image>
@ -500,6 +500,7 @@
return `${base}/${prefix}${idx}.${ext}`
})
}
// // px
// const x = ref(77)
// const y = ref(60)
@ -621,16 +622,17 @@
display: flex;
justify-content: center;
align-items: center;
background: linear-gradient(to right, #0089FD, #4CA5FF);
background: rgba(71, 188, 255, 0.2);
font-size: 1.5vw;
color: #fff;
color: #0089FE;
border-radius: 2vw;
position: relative;
z-index: 3;
border: 2rpx solid rgba(255, 255, 255, 0.6);
}
.office-font {
width: 9vw;
width: 10vw;
height: 3vw;
position: fixed;
top: 22vw;
@ -638,12 +640,13 @@
display: flex;
justify-content: center;
align-items: center;
background: linear-gradient(to right, #0089FD, #4CA5FF);
background: rgba(71, 188, 255, 0.2);
font-size: 1.5vw;
color: #fff;
color: #0089FE;
border-radius: 2vw;
position: relative;
z-index: 3;
border: 2rpx solid rgba(255, 255, 255, 0.6);
}
.fontroom-font {
@ -655,29 +658,31 @@
display: flex;
justify-content: center;
align-items: center;
background: linear-gradient(to right, #0089FD, #4CA5FF);
background: rgba(71, 188, 255, 0.2);
font-size: 1.5vw;
color: #fff;
color: #0089FE;
border-radius: 2vw;
position: relative;
z-index: 3;
border: 2rpx solid rgba(255, 255, 255, 0.6);
}
.back-font {
width: 7vw;
height: 3vw;
position: fixed;
top: 2vw;
left: 87vw;
top: 1vw;
left: 81vw;
display: flex;
justify-content: center;
align-items: center;
background: linear-gradient(to right, #0089FD, #4CA5FF);
background: rgba(71, 188, 255, 0.2);
font-size: 1.5vw;
color: #fff;
color: #0089FE;
border-radius: 2vw;
position: relative;
z-index: 3;
border: 2rpx solid rgba(255, 255, 255, 0.6);
}
.store-font {
@ -689,12 +694,13 @@
display: flex;
justify-content: center;
align-items: center;
background: linear-gradient(to right, #0089FD, #4CA5FF);
background: rgba(71, 188, 255, 0.2);
font-size: 1.5vw;
color: #fff;
color: #0089FE;
border-radius: 2vw;
position: relative;
z-index: 3;
border: 2rpx solid rgba(255, 255, 255, 0.6);
}
.font-ball {
@ -815,22 +821,22 @@
}
.Print {
width: 6vw;
height: 6vw;
width: 5vw;
height: 5vw;
position: fixed;
bottom: 21vw;
right: 12vw;
bottom: 22vw;
right: 13vw;
z-index: 1;
}
.button-setting {
width: 4.5vw;
height: 4.5vw;
width: 5vw;
height: 5vw;
border-radius: 50%;
border: 1rpx solid #A3B2CF;
position: fixed;
bottom: 2vw;
right: 8.5vw;
right: 9vw;
display: flex;
justify-content: center;
align-items: center;
@ -839,8 +845,8 @@
}
.button-back {
width: 4.5vw;
height: 4.5vw;
width: 5vw;
height: 5vw;
border-radius: 50%;
border: 1rpx solid #A3B2CF;
position: fixed;
@ -868,8 +874,8 @@
width: 5vw;
height: 6vw;
position: fixed;
bottom: 1vw;
left: 4vw;
bottom: -0.5vw;
left: 9vw;
}
// .tp {
// image {

View File

@ -609,7 +609,7 @@
firstgetqueryCgdList();
console.log("!!!!!!", res)
setTimeout(() => {
if (res.result.status == "success") {
if (res.success) {
uni.showToast({
title: res.result.message,
icon: 'none', // 'none'

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB