diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 179fe2d..07d9281 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -16,7 +16,7 @@ "type" : "uniCloud" }, { - "playground" : "custom", + "playground" : "standard", "type" : "uni-app:app-android" } ] diff --git a/common/appUpdate/index.js b/common/appUpdate/index.js index 9099387..a5af0f5 100644 --- a/common/appUpdate/index.js +++ b/common/appUpdate/index.js @@ -19,7 +19,8 @@ export const getCurrentAppInfo = () => { plus.runtime.getProperty(plus.runtime.appid, (widgetInfo) => { console.log('plus.runtime.appid=========', plus.runtime.appid); console.log('widgetInfo=========', widgetInfo); - widgetInfo._appVersion = `${widgetInfo.version}.${widgetInfo.versionCode}` + widgetInfo._appVersion = `${widgetInfo.version}.${widgetInfo.versionCode}`; + uni.setStorageSync('_appVersion', widgetInfo._appVersion); resolve(widgetInfo) }); // #endif diff --git a/common/enum.js b/common/enum.js index c1572b3..dbea26f 100644 --- a/common/enum.js +++ b/common/enum.js @@ -91,7 +91,7 @@ const dealBtnMap = { woDeRenWu: { title: '我的任务', subTitle: "", icon: getCdnUrl(`mine/kehu.png`), url: 'tabBar/order/order', code: authCodeEnum.woDeRenWu }, jiTiMingXi: { title: '计提明细', subTitle: "", icon: getCdnUrl(`mine/jitmx.png`), url: 'user/withdraw', code: authCodeEnum.jiTiMingXi }, yeWuTongJi: { title: '业务统计', subTitle: "", icon: getCdnUrl(`mine/shj.png`), url: 'user/bunsStatic', code: authCodeEnum.yeWuTongJi }, - daiHuiKuan: { title: '待回款', subTitle: "", icon: getCdnUrl(`mine/jitmx.png`), url: 'bill/list', code: authCodeEnum.daiHuiKuan }, + daiHuiKuan: { title: '待回款', subTitle: "", icon: getCdnUrl(`mine/daihuikuan.png`), url: 'bill/list', code: authCodeEnum.jiTiMingXi }, mianDanDayin: { title: '面单打印', subTitle: "", icon: getCdnUrl(`home/mdbuda.png`), url: 'print/courierNote', code: authCodeEnum.mianDanDaYin }, kuaiJianGenZong: { title: '快件跟踪', subTitle: "", icon: getCdnUrl(`home/kdchxun.png`), url: 'post/query', code: authCodeEnum.kuaiJianGenZong }, heBaoScan: { title: '合包扫描', subTitle: "", icon: getCdnUrl(`home/hebaosm.png`), url: 'tms/coPackingScanning', code: authCodeEnum.heBaoScan }, diff --git a/common/manageServer.js b/common/manageServer.js index 86ee871..90800e3 100644 --- a/common/manageServer.js +++ b/common/manageServer.js @@ -4,14 +4,14 @@ import { setSessionXToken, getSessionXToken } from "@/session" import { textEncoder, textDecoder } from "./util" import { getCurrentAppInfo } from "@/common/appUpdate" - -let _appVersion="1.0.0" +// let _appVersion="1.0.0" // getCurrentAppInfo().then(res=> { // _appVersion = res._appVersion // }) + const getCommonReqData = ()=> { const xToken = getSessionXToken() - + const _appVersion = uni.getStorageSync('_appVersion'); return { header: { "dataFrom": "app", diff --git a/manifest.json b/manifest.json index b23ec29..5da99e4 100644 --- a/manifest.json +++ b/manifest.json @@ -1,9 +1,9 @@ { "name" : "探路国际速运", - "appid" : "__UNI__0985657", + "appid" : "__UNI__BCB0FB5", "description" : "探路国际速运", "versionName" : "1.0.1", - "versionCode" : "1061", + "versionCode" : 1063, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -27,18 +27,23 @@ "Share" : {}, "Speech" : {}, "VideoPlayer" : {}, - "Barcode" : {}, "Bluetooth" : {}, "Contacts" : {}, "Camera" : {}, "Geolocation" : {}, - "Maps" : {} + "Maps" : {}, + "Barcode" : {} }, - /* 应用发布信息 */ + /* 应用发布信息 + + + */ "distribute" : { /* android打包配置 */ "android" : { "permissions" : [ + "", + "", "", "", "", @@ -57,7 +62,6 @@ "", "", "", - "", "", "", "", @@ -66,7 +70,6 @@ "", "", "", - "", "", "", "", @@ -176,21 +179,20 @@ "uniStatistics" : { "enable" : true }, - "nativePlugins" : { - "Ba-Scanner" : { - "__plugin_info__" : { - "name" : "扫码原生插件 - 新（连续扫码、设置格式、任意自定义界面）Ba-Scanner", - "description" : "Ba-Scanner 是一款毫秒级扫码插件，采用Google MLKit。支持连续扫码，持续万次不卡顿；支持自定义任意界面、任意点击事件、权限说明；支持多码、相册、闪光灯、焦距缩放、提示音、震动等等。", - "platforms" : "Android", - "url" : "https://ext.dcloud.net.cn/plugin?id=9669", - "android_package_name" : "uni.UNIBCB0FB5", - "ios_bundle_id" : "uni.UNIBCB0FB5", - "isCloud" : true, - "bought" : 1, - "pid" : "9669", - "parameters" : {} - } - } + "nativePlugins" : {} + }, + "Ba-Scanner" : { + "__plugin_info__" : { + "name" : "扫码原生插件 - 新（连续扫码、设置格式、任意自定义界面）Ba-Scanner", + "description" : "Ba-Scanner 是一款毫秒级扫码插件，采用Google MLKit。支持连续扫码，持续万次不卡顿；支持自定义任意界面、任意点击事件、权限说明；支持多码、相册、闪光灯、焦距缩放、提示音、震动等等。", + "platforms" : "Android", + "url" : "https://ext.dcloud.net.cn/plugin?id=9669", + "android_package_name" : "uni.UNIBCB0FB5", + "ios_bundle_id" : "uni.UNIBCB0FB5", + "isCloud" : true, + "bought" : 1, + "pid" : "9669", + "parameters" : {} } }, /* 快应用特有相关 */ diff --git a/pages/bill/detail.vue b/pages/bill/detail.vue index 2949ca5..63f6b5b 100644 --- a/pages/bill/detail.vue +++ b/pages/bill/detail.vue @@ -73,7 +73,7 @@ - + 备注： @@ -127,7 +127,7 @@ - - + @@ -251,6 +251,34 @@ // console.log(res) // debugger }, + + shareToWeixin(){ + this.shareTo('weixin', 'WXSceneSession') + }, + shareTo(platform, scene = '') { + uni.share({ + provider: platform, + scene: scene, + type: 0, + title: "探路速运运单支付:"+this.queryOption.blNo, + summary: "请使用微信付款", + href: 'https://oms.tanex56.com/onlinePay?bid='+this.queryOption.blNo, + imageUrl: '', + success: (res) => { + uni.showToast({ + title: '分享成功', + icon: 'none' + }) + }, + fail: (err) => { + console.error('分享失败:', err) + uni.showToast({ + title: '分享失败，请稍后重试', + icon: 'none' + }) + } + }) + }, formatSendDay(sendDate){ return dayjs(sendDate).format('YYYY-MM-DD'); }, diff --git a/pages/bill/list.vue b/pages/bill/list.vue index 9313510..219274b 100644 --- a/pages/bill/list.vue +++ b/pages/bill/list.vue @@ -120,7 +120,7 @@ 去付款 + @click="handleDealItem(item, { type: 1 })" custom-style="height: 54rpx;margin-left: 12rpx;">收款