解决冲突

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 node_modules/
+unpackage/
 dist/
 npm-debug.log*
 yarn-debug.log*
@@ -22,4 +23,4 @@ selenium-debug.log
 package-lock.json
 yarn.lock
 
-unpackage/
+

.hbuilderx/launch.json

@@ -1,16 +1,20 @@
-{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+{
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-    "version": "0.0",
+    // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
-    "configurations": [{
+    "version" : "0.0",
-     	"app-plus" : 
+    "configurations" : [
-     	{
+        {
-     		"launchtype" : "local"
+            "app-plus" : {
-     	},
+                "launchtype" : "local"
-     	"default" : 
+            },
-     	{
+            "default" : {
-     		"launchtype" : "local"
+                "launchtype" : "local"
-     	},
+            },
-     	"type" : "uniCloud"
+            "type" : "uniCloud"
-     }
+        },
+        {
+            "playground" : "custom",
+            "type" : "uni-app:app-android"
+        }
     ]
 }

apis/http.js

@@ -3,9 +3,9 @@ class HttpConfig {
 	baseUrl = "/api"
 	// #endif
 	// #ifdef APP-PLUS
-	baseUrl = "http://112.29.103.165:21624"
+	// baseUrl = "http://112.29.103.165:21624"
 	// baseUrl = "http://192.168.0.14:21624"
-	// baseUrl = "http://112.29.103.165:21626"
+	baseUrl = "http://112.29.103.165:21626"
 	// baseUrl = "http://172.20.10.3:8080"
 	// baseUrl = "http://10.40.92.13:8080"
 	// baseUrl = "http://10.40.92.75:8080"

manifest.json

@@ -2,8 +2,8 @@
     "name" : "智慧仓储",
     "appid" : "__UNI__9D122E1",
     "description" : "",
-    "versionName" : "1.0.5",
+    "versionName" : "1.0.6",
-    "versionCode" : 105,
+    "versionCode" : 106,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue

@@ -145,6 +145,7 @@
 						taskId,
 						id,
 						typeId,
+						modelId,
 						manageType,
 						typeName,
 						typeCode,
@@ -154,6 +155,7 @@
 						taskId,
 						id,
 						typeId,
+						modelId,
 						manageType,
 						userId,
 						typeName,

pages/crashExam/crashExam.vue

@@ -36,7 +36,7 @@
 				</view>
 				<view>
 					<span>报废数量</span>
-					<h4>{{ fetch.backTime }}</h4>
+					<h4>{{ fetch.scrapNum2 }}</h4>
 				</view>
 				<view>
 					<span>申请日期</span>

pages/exitMaterial/exitMaterial.vue

@@ -59,8 +59,33 @@
 				</view>
 			</view>
 			<view class="sticky-area">
-				<image src="/static/passed.png" v-show="exit.taskStatus == '40'" mode=""></image>
+				<h4
-				<image src="/static/noPass.png" v-show="exit.taskStatus != '40'" mode=""></image>
+					v-show="exit.taskStatus == '37'"
+				>
+					待退料审核
+				</h4>
+				<h4
+					v-show="exit.taskStatus == '38'"
+				>
+					退料已审核
+				</h4>
+				<h4
+					v-show="exit.taskStatus == '39'"
+				>
+					退料核查中
+				</h4>
+				<h4
+					v-show="exit.taskStatus == '40'"
+					style="border: 1px solid #27D870; color: #27D870;"
+				>
+					退料完成
+				</h4>
+				<h4
+					v-show="exit.taskStatus == '101'"
+					style="border: 1px solid #EE603D; color: #EE603D;"
+				>
+					退料审核驳回
+				</h4>
 			</view>
 		</view>
 		<uni-popup
@@ -442,13 +467,23 @@ import { basePath } from '../../public'
 		}
 		.sticky-area{
 			position: absolute;
-			top: 0;
+			top: 20rpx;
-			right: 0;
+			right: 20rpx;
-			width: 11vh;
+			/* width: 11vh;
 			height: 10vh;
 			image{
 				width: 100%;
 				height: 100%;
+			} */
+			h4{
+				box-sizing: border-box;
+				padding: 8rpx 20rpx;
+				border-radius: 15rpx;
+				font-size: 14px;
+				font-weight: normal;
+				background-color: #fff;
+				border: 1px solid #3788FF; 
+				color: #3788FF;
 			}
 		}
 	}

pages/fixDetail/fixDetail.vue

@@ -28,7 +28,7 @@
 			</view>
 			<view v-show="fetch.code != ''">
 				<span>设备编号</span>
-				<h4>{{ fetch.code }}</h4>
+				<h4>{{ fetch.code == null ? '暂无' : fetch.code }}</h4>
 			</view>
 			<view>
 				<span>维修时间</span>
@@ -53,7 +53,6 @@
 					<uni-icons 
 						style="color: #AAAAAA; font-weight: bold;" 
 						type="closeempty" 
-						size="32"
 						@click="closePopup"
 					>
 					</uni-icons>

pages/newBuyDetail/newBuyDetail.vue

@@ -15,7 +15,7 @@
 							<text><span style="padding-right: 20rpx; color: #a6a6a6;">类型名称</span>{{item.typeName}}</text>
 							<text><span style="padding-right: 20rpx; color: #a6a6a6;">规格型号</span>{{item.specificationType}}</text>
 							<text><span style="padding-right: 20rpx; color: #a6a6a6;">待入库数量</span>{{item.checkNum}}</text>
-							<text><span style="padding-right: 20rpx; color: #a6a6a6;">机具编号</span>{{item.maCode}}</text>
+							<text><span style="padding-right: 20rpx; color: #a6a6a6;">机具编号</span>{{item.maCode == null ? '无' : item.maCode}}</text>
 						</view>
 					</view>
 				</view>
@@ -47,11 +47,11 @@
 				<text>全选</text>
 			</view>
 			<view style="display: flex;">
-				<view class="total" style="margin-right: 15rpx;">
+				<!-- <view class="total" style="margin-right: 15rpx;">
 					<view class="bill" @click="bindCode">
 						<text>绑定</text>
 					</view>
-				</view>
+				</view> -->
 				<view class="total">
 					<view class="bill" @click="finishCart">
 						<text>审核</text>

pages/newCheck/newCheckDetail.vue

@@ -15,7 +15,7 @@
 							<text><span style="padding-right: 20rpx; color: #a6a6a6;">类型名称</span>{{item.typeName}}</text>
 							<text><span style="padding-right: 20rpx; color: #a6a6a6;">规格型号</span>{{item.specificationType}}</text>
 							<text><span style="padding-right: 20rpx; color: #a6a6a6;">待入库数量</span>{{item.checkNum}}</text>
-							<text><span style="padding-right: 20rpx; color: #a6a6a6;">机具编号</span>{{item.maCode}}</text>
+							<text><span style="padding-right: 20rpx; color: #a6a6a6;">机具编号</span>{{item.maCode == null ? '无' : item.maCode}}</text>
 						</view>
 					</view>
 				</view>
@@ -268,9 +268,9 @@
 							res.data.data[i].checked = false
 						}
 					} */
-					that.list = res.data.data.filter(item => {
+					that.list = res.data.data/* .filter(item => {
 						return item.maCode != null
-					})
+					}) */
 				} else {
 					uni.showToast({
 						icon: 'none',

pages/numReceive/numReceive.vue

@@ -112,7 +112,7 @@
 				let list = []
 				const baseInfo = {
 					parentId: this.upperInfo.id,
-					typeId: this.upperInfo.typeId,
+					typeId: this.upperInfo.modelId,
 					manageType: this.upperInfo.manageType,
 					createBy: this.upperInfo.userId
 				}

pages/workSpace/workSpace.vue

@@ -77,11 +77,11 @@
 						pic: '/static/newInStore.png',
 						url: 'newInStore'
 					},
-					{
+					/* {
 						name: '退料入库',
 						pic: '/static/backMaterialInStore.png',
 						url: 'backMaterialInStore'
-					},
+					}, */
 					{
 						name: '修试入库',
 						pic: '/static/repairTestInStore.png',

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/19295bf0-a478-11ee-a0ba-6377b82c8237
+https://app.liuyingyong.cn/build/download/45b01760-f60e-11ee-af20-cdedf0f0a7ec

unpackage/cache/wgt/__UNI__9D122E1/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__9D122E1","name":"SmartStorage","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"autoclose":true,"delay":0,"target":"id:1","waiting":true},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"google":{"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\"/>"],"packagename":"uni.UNI9D122E1","aliasname":"","password":"","keystore":"html5plus://test","custompermissions":true},"apple":{"dSYMs":false,"devices":"universal"},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}},"orientation":"portrait-primary"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#FFFFFF","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.8.7","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#2c2c2c","selectedColor":"#1296db","borderStyle":"rgba(0,0,0,0.4)","backgroundColor":"#FFFFFF","iconWidth":"24px","list":[{"pagePath":"pages/index/index","iconPath":"static/home.png","selectedIconPath":"static/homeSelected.png","text":"首页"},{"pagePath":"pages/workSpace/workSpace","iconPath":"static/workSpace.png","selectedIconPath":"static/workSpaceSelected.png","text":"工作台"},{"pagePath":"pages/user/user","iconPath":"static/my.png","selectedIconPath":"static/mySelected.png","text":"个人中心"}],"height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html","adid":"129363090506"}}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__9D122E1","name":"智慧仓储","version":{"name":"1.0.6","code":106},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Camera":{},"Barcode":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"autoclose":true,"delay":0,"target":"id:1","waiting":true},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"compatible":{"ignoreVersion":true},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"icons":{"android":{"hdpi":"icon-android-hdpi.png","xhdpi":"icon-android-xhdpi.png","xxhdpi":"icon-android-xxhdpi.png","xxxhdpi":"icon-android-xxxhdpi.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"},"prerendered":"false"}},"google":{"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\"/>"],"packagename":"uni.UNI9D122E1","custompermissions":true},"apple":{"dSYMs":false,"idfa":false,"privacyDescription":{"NSCameraUsageDescription":"该应用需要扫描二维码或拍照，是否允许打开相机","NSLocationAlwaysAndWhenInUseUsageDescription":"该应用需要使用您的地理位置，以便为您提供当前位置信息","NSLocationAlwaysUsageDescription":"该应用需要使用您的地理位置，以便为您提供当前位置信息","NSLocationWhenInUseUsageDescription":"该应用需要使用您的地理位置，以便为您提供当前位置信息","NSMicrophoneUsageDescription":"该应用需要使用您的麦克风，以便视频录音","NSPhotoLibraryAddUsageDescription":"该应用上传照片信息时需要访问您的相册","NSPhotoLibraryUsageDescription":"该应用上传照片信息时需要访问您的相册"},"devices":"universal"},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}},"orientation":"portrait-primary"},"nativePlugins":{"BNS-RfidRed":{}},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#FFFFFF","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.8.7","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#2c2c2c","selectedColor":"#1296db","borderStyle":"rgba(0,0,0,0.4)","backgroundColor":"#FFFFFF","iconWidth":"24px","list":[{"pagePath":"pages/index/index","iconPath":"static/home.png","selectedIconPath":"static/homeSelected.png","text":"首页"},{"pagePath":"pages/workSpace/workSpace","iconPath":"static/workSpace.png","selectedIconPath":"static/workSpaceSelected.png","text":"工作台"},{"pagePath":"pages/user/user","iconPath":"static/my.png","selectedIconPath":"static/mySelected.png","text":"个人中心"}],"height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html","adid":"129363090506"}}

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

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__9D122E1","name":"SmartStorage","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"google":{"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\"/>"]},"apple":{"dSYMs":false},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#FFFFFF","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.8.7","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#2c2c2c","selectedColor":"#1296db","borderStyle":"rgba(0,0,0,0.4)","backgroundColor":"#FFFFFF","iconWidth":"24px","list":[{"pagePath":"pages/index/index","iconPath":"static/home.png","selectedIconPath":"static/homeSelected.png","text":"首页"},{"pagePath":"pages/workSpace/workSpace","iconPath":"static/workSpace.png","selectedIconPath":"static/workSpaceSelected.png","text":"工作台"},{"pagePath":"pages/user/user","iconPath":"static/my.png","selectedIconPath":"static/mySelected.png","text":"个人中心"}],"height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__9D122E1","name":"智慧仓储","version":{"name":"1.0.6","code":106},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Camera":{},"Barcode":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"compatible":{"ignoreVersion":true},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"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"}}},"google":{"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\"/>"]},"apple":{"dSYMs":false,"idfa":false,"privacyDescription":{"NSPhotoLibraryUsageDescription":"该应用上传照片信息时需要访问您的相册","NSPhotoLibraryAddUsageDescription":"该应用上传照片信息时需要访问您的相册","NSCameraUsageDescription":"该应用需要扫描二维码或拍照，是否允许打开相机","NSMicrophoneUsageDescription":"该应用需要使用您的麦克风，以便视频录音","NSLocationWhenInUseUsageDescription":"该应用需要使用您的地理位置，以便为您提供当前位置信息","NSLocationAlwaysUsageDescription":"该应用需要使用您的地理位置，以便为您提供当前位置信息","NSLocationAlwaysAndWhenInUseUsageDescription":"该应用需要使用您的地理位置，以便为您提供当前位置信息"}},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"nativePlugins":{"BNS-RfidRed":{"__plugin_info__":{"name":"BNS-RfidRed","description":"BNS-RfidRed","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#FFFFFF","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.8.7","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#2c2c2c","selectedColor":"#1296db","borderStyle":"rgba(0,0,0,0.4)","backgroundColor":"#FFFFFF","iconWidth":"24px","list":[{"pagePath":"pages/index/index","iconPath":"static/home.png","selectedIconPath":"static/homeSelected.png","text":"首页"},{"pagePath":"pages/workSpace/workSpace","iconPath":"static/workSpace.png","selectedIconPath":"static/workSpaceSelected.png","text":"工作台"},{"pagePath":"pages/user/user","iconPath":"static/my.png","selectedIconPath":"static/mySelected.png","text":"个人中心"}],"height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}}

unpackage/resources/__UNI__9D122E1/www/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__9D122E1","name":"SmartStorage","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#FFFFFF","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.8.7","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#2c2c2c","selectedColor":"#1296db","borderStyle":"rgba(0,0,0,0.4)","backgroundColor":"#FFFFFF","iconWidth":"24px","list":[{"pagePath":"pages/index/index","iconPath":"static/home.png","selectedIconPath":"static/homeSelected.png","text":"首页"},{"pagePath":"pages/workSpace/workSpace","iconPath":"static/workSpace.png","selectedIconPath":"static/workSpaceSelected.png","text":"工作台"},{"pagePath":"pages/user/user","iconPath":"static/my.png","selectedIconPath":"static/mySelected.png","text":"个人中心"}],"height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__9D122E1","name":"智慧仓储","version":{"name":"1.0.2","code":102},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Camera":{},"Barcode":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"compatible":{"ignoreVersion":true},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"BNS-RfidRed":{"__plugin_info__":{"name":"BNS-RfidRed","description":"BNS-RfidRed","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#FFFFFF","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.8.7","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#2c2c2c","selectedColor":"#1296db","borderStyle":"rgba(0,0,0,0.4)","backgroundColor":"#FFFFFF","iconWidth":"24px","list":[{"pagePath":"pages/index/index","iconPath":"static/home.png","selectedIconPath":"static/homeSelected.png","text":"首页"},{"pagePath":"pages/workSpace/workSpace","iconPath":"static/workSpace.png","selectedIconPath":"static/workSpaceSelected.png","text":"工作台"},{"pagePath":"pages/user/user","iconPath":"static/my.png","selectedIconPath":"static/mySelected.png","text":"个人中心"}],"height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}}