aike/emis-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lbs调整

Browse Source
This commit is contained in:
linfso 2025-06-29 09:25:27 +08:00
parent bc3158555a
commit 195a1650a9
10 changed files with 104 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
App.vue
View File

@ -10,7 +10,7 @@
import { checkUpdate } from "@/common/appUpdate"
import { setSessionSystemInfo, getSessionSystemInfo } from "@/session"
import { onPushMessage } from "@/common/messageNotice"
export default {
globalData: {
@ -38,6 +38,8 @@
// 成功
this.setUniverifyErrorMsg();
console.log("preLogin success: ", res);
},
fail: (res) => {
this.setUniverifyLogin(false);

2
common/appUpdate/index.js
View File

@ -8,7 +8,7 @@ import * as apiService from "@/common/api"
export const getSystemInfo = () => {
let info = uni.getSystemInfoSync()
console.log('getSystemInfo=====', info)
// console.log('getSystemInfo=====', info)
return info
}

10
common/env.js
View File

@ -1,11 +1,13 @@
let envMap = {
development: {
apiHost: 'http://47.102.220.189:58089/api/bizsvr',
socketHost: 'ws://47.102.220.189:58089/api/bizsvr',
apiHost: 'https://api-emis.tanex56.com/api/bizsvr',
socketHost: 'wss://api-emis.tanex56.com/api/bizsvr',
// apiHost: 'http://47.102.220.189:58089/api/bizsvr',
// socketHost: 'ws://47.102.220.189:58089/api/bizsvr',
},
production: {
apiHost: 'http://api-emis.tanex56.com/api/bizsvr',
socketHost: 'ws://api-emis.tanex56.com/api/bizsvr',
apiHost: 'https://api-emis.tanex56.com/api/bizsvr',
socketHost: 'wss://api-emis.tanex56.com/api/bizsvr',
// apiHost: 'http://api-emis.jtrs56.com/api/bizsvr',
// socketHost: 'ws://api-emis.jtrs56.com/api/bizsvr',
}

4
components/buns-post-edit-templates/bpe-cost-tmp.vue
View File

@ -94,6 +94,10 @@
<u-textarea v-model="modelInfo.feeRemark" border="surround" height="120" placeholder="费用备注"
maxlength="300" count></u-textarea>
</view>
<view class="pt-20">
<tpx-input v-model="modelInfo.codFeeDesc" border="surround" custom-style="height: 46rpx;" placeholder="代收备注"
maxlength="50" count></tpx-input>
</view>
</view>
<buns-edit-sheet percentHeight="40" :title="costModal.item.feeName" v-model:show="costModal.show" v-model:value="costModal.item" v-slot="tempObject" @onSure="handleCostItemSure" :okCloseModal="false">

4
components/buns-post-edit-templates/bpe-coststatic-tmp.vue
View File

@ -66,6 +66,10 @@
<text class="clr-sub pr-10">费用备注</text>
<text>{{modelInfo.feeRemark || '-'}}</text>
</u-row>
<u-row>
<text class="clr-sub pr-10">代收备注</text>
<text>{{modelInfo.codFeeDesc || '-'}}</text>
</u-row>
</u-row>
</view>
</view>

20
manifest.json
View File

@ -3,7 +3,7 @@
"appid" : "__UNI__BCB0FB5",
"description" : "探路国际速运",
"versionName" : "1.0.1",
"versionCode" : 1063,
"versionCode" : 1062,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
@ -42,8 +42,8 @@
/* android打包配置 */
"android" : {
"permissions" : [
"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
@ -102,7 +102,19 @@
"appkey_android" : "b7feefb9882f1d0953fbeffb1cef8aec"
}
},
"push" : {}
"push" : {},
"oauth" : {
"weixin" : {
"appid" : "wxcb329faf410bc997",
"UniversalLinks" : ""
}
},
"share" : {
"weixin" : {
"appid" : "wxcb329faf410bc997",
"UniversalLinks" : ""
}
}
},
"orientation" : [ "portrait-primary" ],
"splashscreen" : {

121
pages/bill/detail.vue
View File

@ -151,7 +151,7 @@
<template #footer>
<view v-if="info.paymentStatus!=1&&info.blLockOnlinePay!='T'" class="blcok-white-noradius">
<u-button @click="shareToWeixin()" type="primary" size="large" shape="circle"
<u-button @click="shareToWeixin()" type="primary" size="large" shape="circle" open-type="share"
custom-style="height:80rpx;font-size: 30rpx;"
>分享给客户支付</u-button>
</view>
@ -215,69 +215,70 @@
// let res = await apiService.getWxPayQrCode({settleBillNo: this.queryOption.blNo, _loading: true })
// this.payQrImageUrl = res.data
},
async handleCallPay(){
let info = this.$store.getters.userInfo
// console.log('==>info.openId==>', info.openId);
let openId = info.openId;
let res = await apiService.sumbitWxPay({settleBillNo: this.queryOption.blNo,openId:openId,_loading: true })
// 调起微信支付
// console.log('==>res.data=>', res.data);
let weChatPayData = res.data;
// console.log('==>weChatPayData=>', weChatPayData);
uni.requestPayment({
provider: 'wxpay',
timeStamp: weChatPayData.timeStamp,
nonceStr: weChatPayData.nonceStr,
package: weChatPayData.package,
signType: weChatPayData.signType,
paySign: weChatPayData.paySign,
success: function(res) {
uni.showToast({
title: '支付成功',
icon: 'none'
});
// console.log('支付成功', res);
// 业务逻辑
},
fail: function(err) {
uni.showToast({
title: '支付失败:'+err,
icon: 'none'
});
// console.log('支付失败', err);
}
});
// 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'
})
}
})
uni.share({
provider: platform,
scene: scene,
type: 0,
title: "请使用微信支付探路速运账单费用:"+this.queryOption.blNo,
summary: "请使用微信付款",
href: 'https://oms.tanex56.com/onlinePay?bid='+this.queryOption.blNo,
imageUrl: 'https://oms.tanex56.com/shorticon.png',
success: (res) => {
uni.showToast({
title: '分享成功',
icon: 'none'
})
},
fail: (err) => {
console.error('分享失败:', JSON.stringify(err))
uni.showToast({
title: '分享失败:'+JSON.stringify(err),
icon: 'none'
})
}
})
// var weixinShare = null;
// plus.share.getServices(function(services) {
// for (var i in services) {
// var service = services[i];
// // 获取微信分享对象
// if (service.id == 'weixin') {
// weixinShare = service;
// break;
// }
// }
// if(weixinShare==null){
// uni.showToast({
// title: '分享失败:获取微信分享服务失败',
// icon: 'none'
// })
// return;
// }
// weixinShare.send( {
// content: '我正在使用HBuilderX开发App，赶紧跟我一起来体验！'
// }, function(){
// // 分享成功
// }, function(err) {
// // 分享操作失败
// uni.showToast({
// title: '分享失败1:'+JSON.stringify(err),
// icon: 'none'
// })
// })
// }, function(err) {
// // 获取 services 失败
// uni.showToast({
// title: '分享失败2:'+JSON.stringify(err),
// icon: 'none'
// })
// })
},
formatSendDay(sendDate){
return dayjs(sendDate).format('YYYY-MM-DD');

3
pages/post/model.js
View File

@ -68,8 +68,11 @@ export const getOrderModels = () => {
blOverWeight: undefined,
overWeightNumber: undefined,
feeRemark: undefined, // 付款方式-其他-备注
codFeeDesc: undefined, // 代收备注
realValue: undefined, // 货值, 单位：美元
blDispFd: undefined,
blVirtual: undefined, // 是否虚拟单
masterBillCode: undefined, // 虚拟单主单
transferCode: undefined,
transferBillcode: undefined,
dispFdDate: undefined,

2
pages/tabBar/home/home.vue
View File

@ -174,7 +174,7 @@
staticInfo: {
commStat: {},
orderStat: {},
},
}
}
},
onShareAppMessage() {

5
store/modules/user.js
View File

@ -8,6 +8,7 @@ import {
import * as apiService from "@/common/api"
import { goto } from "@/common/untool"
import { createSocketMessage, currentSocketTask } from "@/common/messageNotice/socket"
import XdLbsUniSdk from "@/common/lbs/XdLbsUniSdk.js"
export default {
state: {
@ -87,6 +88,10 @@ export default {
// 链接socket
createSocketMessage({ userInfo: info })
// lbs serice
XdLbsUniSdk.getInstance("1000003").init(info.empCode)
commit(USERKEY.GETUSERINFO, info)
},