소스 검색

Merge branch 'develop_szhj05' of http://git.chelingzhu.com/jianguan-web/qpls-md-app into develop_szhj05

chenrui 2 년 전
부모
커밋
275d7f619c

+ 5 - 3
App.vue

@@ -40,10 +40,11 @@
 				}
 				skJGPush.requestNotificationAuthorization((result)=>{
 					let status = result.status
+					console.log(result,'通知权限')
 					if (status < 2) {
 						uni.showModal({
 							title: '提示',
-							content: '您还没有打开通知权限',
+							content: '您未打开通知权限,应用将无法收到消息通知,确定开启通知权限吗?',
 							success: function (res) {
 								if (res.confirm) {
 									skJGPush.openSettingsForNotification()
@@ -75,13 +76,14 @@
 				if(result.notificationEventType == 'notificationOpened'){
 					this.setRead(result)
 				}else if(result.notificationEventType == 'notificationArrived'){
-					if(bgAudioManager){
+					// 安卓铃声
+					if(bgAudioManager&&uni.getSystemInfoSync().platform != "ios"){
 						bgAudioManager.src = '/static/notes.mp3';
 						bgAudioManager.play()
 					}
 				}else{
 					// 清空角标
-					skJGPush.setBadge(1)
+					skJGPush.setBadge(0)
 				}
 			})
 			

+ 3 - 1
components/kk-printer/index.vue

@@ -167,7 +167,9 @@
 			}
 		},
 		mounted() {
-			this.handlePrintTap(0)
+			if(this.autoConnect){
+				this.handlePrintTap(0)
+			}
 		},
 		beforeDestroy(){
 			this.stopSearchBtnTap();

+ 16 - 0
manifest.json

@@ -100,6 +100,8 @@
                     "NSPhotoLibraryAddUsageDescription" : "扫描识别产品需要访问设备相册,是否同意?", //可选,字符串类型,系统相册写入权限描述
                     "NSCameraUsageDescription" : "扫描识别产品二维码需要访问相机,是否同意?", //可选,字符串类型,摄像头使用权限描述
                     "NSLocationWhenInUseUsageDescription" : "连接打印机需要开启位置权限,是否同意?", //可选,字符串类型,运行期访问位置权限描述
+					"NSLocationAlwaysUsageDescription": "连接打印机需要开启位置权限,是否同意?",  //可选,字符串类型,后台运行访问位置权限描述
+					"NSLocationAlwaysAndWhenInUseUsageDescription": "连接打印机需要开启位置权限,是否同意?", //可选,字符串类型,运行期后后台访问位置权限描述
                     "NSBluetoothPeripheralUsageDescription" : "连接打印机需要开启蓝牙权限,是否同意?", //可选,字符串类型,使用蓝牙权限描述
                     "NSBluetoothAlwaysUsageDescription" : "连接打印机需要开启蓝牙权限,是否同意?" //可选,字符串类型,后台使用蓝牙权限描述
                 }
@@ -298,6 +300,20 @@
                         }
                     }
                 }
+            },
+            "DCloud-PushSound" : {
+                "__plugin_info__" : {
+                    "name" : "自定义推送铃声和渠道",
+                    "description" : "自定义推送铃声同时支持 Android、iOS 平台",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=7482",
+                    "android_package_name" : "com.iscm.arrow360",
+                    "ios_bundle_id" : "com.iscm.arrow360",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "7482",
+                    "parameters" : {}
+                }
             }
         }
     },

BIN
nativePlugins/DCloud-PushSound/android/res/raw/pushsound.mp3


BIN
nativePlugins/DCloud-PushSound/android/uniplugin_custom_push_channel-release.aar


BIN
nativePlugins/DCloud-PushSound/ios/pushsound.caf


+ 36 - 0
nativePlugins/DCloud-PushSound/package.json

@@ -0,0 +1,36 @@
+{
+	"name": "DCloud-PushSound",
+	"id": "DCloud-PushSound",
+	"version": "1.0.1",
+	"description": "自定义推送铃声",
+	"_dp_type": "nativeplugin",
+	"_dp_nativeplugin": {
+		"ios": {
+			"plugins": [{
+				"type": "module",
+				"name": "DCloud-PushSound",
+				"class": "DCPushSound"
+			}],
+			"deploymentTarget": "9.0",
+			"integrateType": "library",
+			"resources": [
+				"pushsound.caf"
+			]
+		},
+		"android": {
+		    "plugins": [
+		        {
+		            "type": "module",
+		            "name": "DCloud-PushSound",
+		            "class": "io.dcloud.uniplugin.custom_push_channel.CustomNotificationChannel"
+		        }
+		    ],
+		    "integrateType": "aar",
+		    "compileOptions": {
+		        "sourceCompatibility": "1.8",
+		        "targetCompatibility": "1.8"
+		    },
+		    "minSdkVersion": "19"
+		}
+	}
+}

+ 3 - 1
pages/replenishmentManage/confirm.vue

@@ -104,7 +104,8 @@
 						arr.push({
 							productSn: item.productSn,
 							confirmQty: item.confirmQty,
-							replenishBillDetailSn: item.replenishBillDetailSn
+							replenishBillDetailSn: item.replenishBillDetailSn,
+							id: item.id
 						})
 					}
 				})
@@ -136,6 +137,7 @@
 			},
 			// 提交确认
 			confirmFun (params) {
+				this.loading = true
 				shelfReplenishConfirm(params).then(res => {
 					this.loading = false
 					if (res.status == 200) {

+ 2 - 1
pages/replenishmentManage/sendOutGoods.vue

@@ -133,7 +133,8 @@
 				  arr.push({
 				    productSn: item.productSn,
 				    confirmQty: item.confirmQty,
-				    replenishBillDetailSn: item.replenishBillDetailSn
+				    replenishBillDetailSn: item.replenishBillDetailSn,
+					id:item.id
 				  })
 				})
 				const params = {

+ 2 - 1
pages/replenishmentManage/signWarehousing.vue

@@ -108,7 +108,8 @@
 						putQty: item.putQty,
 						replenishBillDetailSn: item.replenishBillDetailSn,
 						shelfPlaceSn: item.shelfPlaceSn,
-						shelfPlaceCode: item.shelfPlaceCode
+						shelfPlaceCode: item.shelfPlaceCode,
+						id: item.id
 					})
 				  }
 				})

+ 1 - 1
pages/shelfSetting/quickReplenish.vue

@@ -13,7 +13,7 @@
 			<view>系统检测到以下产品缺货,请选择需要补货的产品</view>
 		</view>
 		<view class="partlist">
-			<quickProductList :list="partList" ref="productList" noDataText="暂无产品" @allChecked="allCheckedCallback"></quickProductList>
+			<quickProductList ref="productList" noDataText="暂无产品" @allChecked="allCheckedCallback"></quickProductList>
 		</view>
 		<view class="part-footer flex align_item justify_between">
 			<view>