6.19重庆仓储演示问题修改

apis/apis.js

@@ -783,6 +783,8 @@ const indexScan = {
 	},
 }
 
+const url = HttpConfig.systemPath
+
 export default{
 	login,
 	index,
@@ -804,5 +806,6 @@ export default{
 	update,
 	rfidBinding,
 	qrcodeBinding,
-	indexScan
+	indexScan,
+	url
 }

apis/http.js

@@ -9,9 +9,10 @@ class HttpConfig {
 	baseUrl = "http://112.29.103.165:21626"
 	// baseUrl = "http://172.20.10.3:8080"
 	// baseUrl = "http://10.40.92.9:8080"
-	// baseUrl = "http://10.40.92.52:28080"
+	// baseUrl = "http://10.40.92.60:28080"
 	// baseUrl = "http://10.40.92.138:28080"
 	// baseUrl = "http://10.40.92.52:28080"
+	// baseUrl = "http://10.40.92.140:28080"
 	// baseUrl = "https://z.csgmall.com.cn/gl"
 	// #endif
 	// 基地址

manifest.json

@@ -2,8 +2,8 @@
     "name" : "智慧仓储",
     "appid" : "__UNI__9D122E1",
     "description" : "",
-    "versionName" : "1.0.7",
+    "versionName" : "1.0.9",
-    "versionCode" : 107,
+    "versionCode" : 109,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages.json

@@ -7,13 +7,13 @@
 				"app-plus": {
 					"titleNView": {
 						"buttons": [ 
-							{
+							/* {
 								"text": "权限",
 								"fontSize": "14px",
 								"color": "#4e6ef2",
 								   "width": "auto" ,
 								   "float": "left"
-							},
+							}, */
 							{
 								"text": "扫一扫",
 								"fontSize": "14px",

pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue

@@ -273,6 +273,7 @@ export default {
 		},
 		scanCode() {
 			const that = this
+			console.log(that.infoList);
 			that.closePopup1()
 			uni.scanCode({
 				success: (res) => {
@@ -285,7 +286,7 @@ export default {
 						})
 					} else {
 						uni.navigateTo({
-							url: `/pages/scanReceive/scanReceive?code=${fixedCode}&typeId=${that.infoList.modelId}&num=${that.infoList.num}&parentId=${that.infoList.id}&manageType=${that.infoList.manageType}&taskId=${that.taskId}&createBy=${userId}&scanType="back"`
+							url: `/pages/scanReceive/scanReceive?code=${fixedCode}&typeId=${that.infoList.modelId}&num=${that.infoList.num}&parentId=${that.infoList.id}&manageType=${that.infoList.manageType}&taskId=${that.taskId}&createBy=${userId}&scanType="back"&agreementId=${that.infoList.agreementId}`
 						})
 					}
 				}

pages/exitMaterial/exitMaterial.vue

@@ -7,7 +7,7 @@
 		>
 			<view class="exit-upper">
 				<view class="upper-lef">
-					{{ exit.backPerson.slice(0, 1) }}
+					{{ exit.backPerson == null ? '' : exit.backPerson.slice(0, 1) }}
 				</view>
 				<view class="upper-rig">
 					<h4 style="font-size: 16px;">{{ exit.backPerson }}</h4>

pages/fetchMaterial/fetchMaterial.vue

@@ -82,7 +82,7 @@
 				subList: [],
 				itemList: [],
 				badgeNum: '',
-				photoUrl: 'http://112.29.103.165:21624/dev-api/system',
+				photoUrl: ''
 			}
 		},
 		methods: {
@@ -175,10 +175,11 @@
 		},
 		onShow() {
 			let that = this
-			if (uni.getStorageSync('goodList').length == 0 || !uni.getStorageSync('goodList')) {
+			that.photoUrl = that.$api.url
+			/* if (uni.getStorageSync('goodList').length == 0 || !uni.getStorageSync('goodList')) {
 				uni.setStorageSync('goodList', [])
 			}
-			console.log(uni.getStorageSync('goodList'));
+			console.log(uni.getStorageSync('goodList')); */
 			
 			this.selectType(1, 0, 0)
 			that.switchStatus = 0

pages/index/index.vue

@@ -61,7 +61,7 @@
 			</view>
 			<view class="sysh" @click="jumpUrl('testExam')">
 				<h4>{{ waitList.trialNum }}</h4>
-				<h5>试验检验待审核</h5>
+				<h5>维修待审核</h5>
 			</view>
 		</view>
 		<h4 style="width: 90%; margin: 3vh auto; display: flex; justify-content: space-between; align-items: center;">

pages/login/login.vue

@@ -200,6 +200,7 @@ export default {
 						uni.setStorageSync('token', res.data.data.access_token)
 						uni.setStorageSync('roles', res.data.data.login_user.roles)
 						uni.setStorageSync('deptId', res.data.data.login_user.sysUser.dept.deptId)
+						uni.setStorageSync('pwd', formData.password)
 						uni.showToast({
 							icon: 'none',
 							title: '登录成功！',
@@ -224,6 +225,11 @@ export default {
 				})
 			})
 		}
+	},
+	onShow() {
+		if (uni.getStorageSync('pwd')) {
+			this.accountFormData.password = uni.getStorageSync('pwd')
+		}
 	}
 }
 </script>

pages/scanReceive/scanReceive.vue

@@ -30,7 +30,7 @@
 				<span>1</span>
 			</view> -->
 		</view>
-		<view style="width: 90%; margin: 15rpx auto;">
+		<view style="width: 90%; margin: 15rpx auto;" v-show="infoList.length != 0">
 			<uni-data-checkbox v-model="fixVal" :localdata="fixRange"></uni-data-checkbox>
 		</view>
 		<view class="sub-btn" v-show="infoList.length != 0" @click="outStore">
@@ -67,6 +67,7 @@
 		methods: {
 			outStore() {
 				let that = this
+				console.log(this.infoList);
 				console.log(this.infoList[0].typeId, this.typeId);
 				if (!this.fixVal) {
 					uni.showToast({
@@ -154,9 +155,10 @@
 				this.parentId = params.parentId
 				// 根据扫出的编码查询设备
 				that.$api.backMaterialReceive.backMaterialQrcodeQuery({
-					qrCode: params.code
+					qrCode: params.code,
-				}, null).then(res => {
+					agreementId: params.agreementId
-					console.log("backMaterialQrcodeQuery", res.data.data);
+				}).then(res => {
+					console.log("backMaterialQrcodeQuery", res);
 					if (res.data.data.length == 0) {
 						// qrcodeQuery  页面数据
 						uni.showToast({

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://app.liuyingyong.cn/build/download/87214af0-2a2a-11ef-a66e-032054b34404
+https://app.liuyingyong.cn/build/download/93b61b30-2de6-11ef-9277-a7bed861287c

unpackage/dist/dev/app-plus/app-view.js

@@ -630,7 +630,7 @@ var render = function () {
             },
             [
               _c("h4", { attrs: { _i: 36 } }, [_vm._v(_vm._$g(36, "t0-0"))]),
-              _c("h5", { attrs: { _i: 37 } }, [_vm._v("试验检验待审核")]),
+              _c("h5", { attrs: { _i: 37 } }, [_vm._v("维修待审核")]),
             ],
             1
           ),
@@ -27666,6 +27666,14 @@ var render = function () {
       _c(
         "uni-view",
         {
+          directives: [
+            {
+              name: "show",
+              rawName: "v-show",
+              value: _vm._$g(14, "v-show"),
+              expression: "_$g(14,'v-show')",
+            },
+          ],
           staticStyle: { width: "90%", margin: "15rpx auto" },
           attrs: { _i: 14 },
         },

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

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__9D122E1","name":"智慧仓储","version":{"name":"1.0.7","code":107},"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"}}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__9D122E1","name":"智慧仓储","version":{"name":"1.0.9","code":109},"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"}}