diff --git a/App.vue b/App.vue
index e2fe2ec..75c30c8 100644
--- a/App.vue
+++ b/App.vue
@@ -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);
diff --git a/common/appUpdate/index.js b/common/appUpdate/index.js
index a5af0f5..0f991b8 100644
--- a/common/appUpdate/index.js
+++ b/common/appUpdate/index.js
@@ -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
}
diff --git a/common/env.js b/common/env.js
index 31da121..f14ff80 100644
--- a/common/env.js
+++ b/common/env.js
@@ -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',
}
diff --git a/components/buns-post-edit-templates/bpe-cost-tmp.vue b/components/buns-post-edit-templates/bpe-cost-tmp.vue
index e021942..d014181 100644
--- a/components/buns-post-edit-templates/bpe-cost-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-cost-tmp.vue
@@ -94,6 +94,10 @@
+
+
+
diff --git a/components/buns-post-edit-templates/bpe-coststatic-tmp.vue b/components/buns-post-edit-templates/bpe-coststatic-tmp.vue
index a469c8e..ed992ca 100644
--- a/components/buns-post-edit-templates/bpe-coststatic-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-coststatic-tmp.vue
@@ -66,6 +66,10 @@
费用备注
{{modelInfo.feeRemark || '-'}}
+
+ 代收备注
+ {{modelInfo.codFeeDesc || '-'}}
+
diff --git a/manifest.json b/manifest.json
index 5da99e4..fcc888e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -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" : [
- "",
- "",
+ "",
+ "",
"",
"",
"",
@@ -102,7 +102,19 @@
"appkey_android" : "b7feefb9882f1d0953fbeffb1cef8aec"
}
},
- "push" : {}
+ "push" : {},
+ "oauth" : {
+ "weixin" : {
+ "appid" : "wxcb329faf410bc997",
+ "UniversalLinks" : ""
+ }
+ },
+ "share" : {
+ "weixin" : {
+ "appid" : "wxcb329faf410bc997",
+ "UniversalLinks" : ""
+ }
+ }
},
"orientation" : [ "portrait-primary" ],
"splashscreen" : {
diff --git a/pages/bill/detail.vue b/pages/bill/detail.vue
index 63f6b5b..d344df0 100644
--- a/pages/bill/detail.vue
+++ b/pages/bill/detail.vue
@@ -151,7 +151,7 @@
- 分享给客户支付
@@ -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');
diff --git a/pages/post/model.js b/pages/post/model.js
index 4d6808d..153a627 100644
--- a/pages/post/model.js
+++ b/pages/post/model.js
@@ -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,
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 494d672..50afd8e 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -174,7 +174,7 @@
staticInfo: {
commStat: {},
orderStat: {},
- },
+ }
}
},
onShareAppMessage() {
diff --git a/store/modules/user.js b/store/modules/user.js
index 9a4ebad..965c103 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -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)
},