Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini

pages/NursingNew/component/pleasetake/component/requestform.vue

@@ -93,11 +93,11 @@
 
 							</view>
 							<view class="middle-heng-father">
-
-								<view class="middle-ball" style="background-color: #1083F8;"
+								<image class="middle-ball-img" style="width: 32rpx;height: 32rpx;" v-if="v?.status === '2' || v?.status === '3'" src="/static/index/requestform/iserror.png" />
+								<!-- <view class="middle-ball" style="background-color: #1083F8;"
 									:style=" v?.status === '2' || v?.status === '3' ?{backgroundColor:`#FF5757`}:{}"
 									v-if="Number(v.status)<4">
-								</view>
+								</view> -->
 								<image class="middle-ball-img" v-else src="/static/index/requestform/isok.png" />
 							</view>
 							<view class="end-font">

pages/NursingNew/component/pleasetake/component/returnorder.vue

@@ -105,11 +105,11 @@
 
 							</view>
 							<view class="middle-heng-father">
-
-								<view class="middle-ball" style="background-color: #1083F8;"
+								<image class="middle-ball-img" style="width: 32rpx;height: 32rpx;" v-if="v?.status === '2' || v?.status === '3'" src="/static/index/requestform/iserror.png" />
+								<!-- <view class="middle-ball" style="background-color: #1083F8;"
 									:style=" v?.status === '2' || v?.status === '3' ?{backgroundColor:`#FF5757`}:{}"
 									v-if="Number(v.status)<4">
-								</view>
+								</view> -->
 								<image class="middle-ball-img" v-else src="/static/index/requestform/isok.png" />
 							</view>
 							<view class="end-font">

unpackage/dist/build/app-plus/manifest.json

@@ -7,8 +7,8 @@
   "id": "__UNI__FB2D473",
   "name": "护理单元",
   "version": {
-    "name": "1.0.014",
-    "code": 10014
+    "name": "1.0.016",
+    "code": 10016
   },
   "description": "护理单元",
   "developer": {

unpackage/resources/__UNI__FB2D473/www/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.0.014","code":10014},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"VideoPlayer":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.0.016","code":10016},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"VideoPlayer":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}