diff --git a/manifest.json b/manifest.json index 25770bb..a8588ee 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "appid" : "__UNI__0801766", "description" : "Verification Service", "versionName" : "1.1.5", - "versionCode" : 115, + "versionCode" : 2023111402, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -34,7 +34,8 @@ "permissions" : [ "", "", - "" + "", + "" ], "autoSdkPermissions" : false, "permissionPhoneState" : { diff --git a/pages/detailedList/index.vue b/pages/detailedList/index.vue index 7f0f675..9b5d4a4 100644 --- a/pages/detailedList/index.vue +++ b/pages/detailedList/index.vue @@ -162,22 +162,8 @@ export default { }; }, onLoad: function () { - // 写死 - // this.machineId = "861741042996303"; - // this.getDataList(); - // return; - - plus.device.getInfo({ - success: (e) => { - const imei = e.imei.split(","); - this.machineId = imei[0]; - this.getDataList(); - }, - fail: function (e) { - console.log("getDeviceInfo failed: " + JSON.stringify(e)); - }, - }); - // this.getDataList() + this.machineId = uni.getStorageSync("store_obj").imei + this.getDataList() }, methods: { all_price(spendAmount, couponAmount, pointAmount) { diff --git a/pages/index/index.vue b/pages/index/index.vue index ba4856a..df11b1b 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -130,21 +130,31 @@ export default { onLoad() { uni.showLoading(); - // 写死 - // this.machineId = "861299032410223"; - // this.getShopInfoApi(); - // return; + // #ifdef APP-PLUS + let imelSet = [] + var Build = plus.android.importClass("android.os.Build"); + var SystemProperties = plus.android.importClass("android.os.SystemProperties"); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + imelSet.push(SystemProperties.get('ro.sunmi.serial')) + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + imelSet.push(Build.getSerial()) + } else{ + imelSet.push(Build.SERIAL) + } plus.device.getInfo({ success: (e) => { const imei = e.imei.split(","); - this.machineId = imei[0]; + imelSet.push(imei[0]) + this.machineId = imelSet.join(','); + this.getShopInfoApi(); }, fail: function (e) { console.log("getDeviceInfo failed: " + JSON.stringify(e)); }, }); + // #endif }, methods: { // 人数