mkm/OfficeApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/OfficeApp

Browse Source
This commit is contained in:
weipengfei 2023-09-06 09:19:32 +08:00
commit 8d84fd1736
6 changed files with 432 additions and 424 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
pages/logistics/deliveryDetil.vue
View File

@ -1,4 +1,4 @@
<template>
<template>
<view>
<view v-if='showLoading'>
<u-loading-page :loading="showLoading"></u-loading-page>
@ -15,11 +15,13 @@
</map>
<view class="map_address">
<view style="display: flex;">
<view style="flex-shrink: 0;margin-right: 16rpx;"><text class="cir" style="background-color: #40BC5E;"></text> 起点:</view>
<view style="flex-shrink: 0;margin-right: 16rpx;"><text class="cir"
style="background-color: #40BC5E;"></text> 起点:</view>
<view>{{nowAddress}}</view>
</view>
<view style="display: flex;">
<view style="flex-shrink: 0;margin-right: 16rpx;"><text class="cir" style="background-color: #FF7C32;"></text>终点:</view>
<view style="flex-shrink: 0;margin-right: 16rpx;"><text class="cir"
style="background-color: #FF7C32;"></text>终点:</view>
<view>{{goodsDetil.logistics.shop_address}}</view>
</view>
</view>
@ -92,16 +94,18 @@
</view>
</template>
</template>
<script>
<script>
import {
getDetil
} from "@/api/logistics.js"
import {
takeGoods
} from "@/api/logistics.js"
import { Toast } from "../../libs/uniApi";
import {
Toast
} from "../../libs/uniApi";
export default {
data() {
return {
@ -170,7 +174,7 @@ import { Toast } from "../../libs/uniApi";
let that = this;
uni.getSystemInfo({
success(e) {
if(e.platform ==='ios'){
if (e.platform === 'ios') {
// Toast('不支持');
// iOS上获取本机是否安装了百度高德地图，需要在manifest里配置
// 在manifest.json文件app-plus->distribute->apple->urlschemewhitelist节点下添加
@ -178,36 +182,41 @@ import { Toast } from "../../libs/uniApi";
plus.nativeUI.actionSheet({
title: "选择地图应用",
cancel: "取消",
buttons: [{title: "高德地图"}]
buttons: [{
title: "高德地图"
}]
}, function(e) {
if(e.index!=1)return;
try{
let url = `iosamap://viewMap?sourceApplication=applicationName&poiname=${that.goodsDetil.logistics.shop_name}&lat=${that.markers[0].latitude}&lon=${that.markers[0].longitude}&dev=0`;
if (e.index != 1) return;
try {
let url =
`iosamap://viewMap?sourceApplication=applicationName&poiname=${that.goodsDetil.logistics.shop_name}&lat=${that.markers[0].latitude}&lon=${that.markers[0].longitude}&dev=0`;
if (url != "") {
url = encodeURI(url);
plus.runtime.openURL(url, function(e) {
plus.nativeUI.alert("您的手机没有安装高德地图");
});
}
}catch(e){
} catch (e) {
console.log(e);
Toast('暂不支持唤起地图')
}
})
}
else {
} else {
plus.nativeUI.actionSheet({
title: "选择地图应用",
cancel: "取消",
buttons: [{title: "高德地图"}]
buttons: [{
title: "高德地图"
}]
}, function(e) {
if(e.index!=1)return;
try{
if (e.index != 1) return;
try {
var packageName = 'com.autonavi.minimap';
var main = plus.android.runtimeMainActivity();
var packageManager = main.getPackageManager();
var PackageManager = plus.android.importClass(packageManager)
var packageInfo = packageManager.getPackageInfo(packageName, PackageManager.GET_ACTIVITIES);
var packageInfo = packageManager.getPackageInfo(packageName,
PackageManager.GET_ACTIVITIES);
if (packageInfo) {
var Uri = plus.android.importClass("android.net.Uri");
var url =
@ -223,8 +232,7 @@ import { Toast } from "../../libs/uniApi";
intent.setPackage("com.autonavi.minimap");
var main = plus.android.runtimeMainActivity();
main.startActivity(intent);
}
else {
} else {
// alert('未安装' + packageName + '')
uni.showToast({
title: `您的手机没有安装高德地图`,
@ -232,7 +240,7 @@ import { Toast } from "../../libs/uniApi";
})
}
console.log("唤醒高德线路规划")
}catch(e){
} catch (e) {
console.log(e);
Toast('启动出错')
}
@ -354,9 +362,9 @@ import { Toast } from "../../libs/uniApi";
})
},
}
</script>
</script>
<style lang='scss' scoped>
<style lang='scss' scoped>
.custom-map /deep/ .polyline {
stroke-width: 20px;
}
@ -455,4 +463,4 @@ import { Toast } from "../../libs/uniApi";
transform: translateX(-50%);
}
</style>
</style>

7
subpkg/property/chosseCompany.vue
View File

@ -58,7 +58,7 @@
</view>
<view class="car_info" v-if="carList.length">
<view class="car_type">
<text v-if="true">空闲车辆</text>
<text v-if="true">租赁车辆</text>
<text v-else>自有车辆</text>
</view>
<view class="car_li" v-for="item,index in carList">
@ -105,7 +105,7 @@
</view>
<!-- 审核中 -->
<view class="" v-if="dataList.status==0">
<u-button :disabled="true" type="primary" text="合同已上传,等待审核" @tap="contractFn" color="grey"></u-button>
<u-button :disabled="true" type="primary" text="合同已上传,等待审核" color="grey"></u-button>
</view>
<!-- 审核通过 -->
<view class="" v-if="dataList.status==1||dataList.status==2">
@ -136,7 +136,6 @@
color="#0122C7"></u-button>
</view>
</view>
<!--uview 组件 -->
<view class="">
<u-modal :show="showPop" @close="showPop=false" @confirm="confirm" :closeOnClickOverlay="true"
@ -270,7 +269,7 @@
}).then(res => {
this.navTo('/subpkg/property/success')
})
this.navTo('/subpkg/property/success')
// this.navTo('/subpkg/property/success')
},
// sendcontractFn() {

2
subpkg/property/contractList.vue
View File

@ -13,7 +13,7 @@
</view>
</view>
<!-- <view class="right" @click="navToContract(dataList.file)"> -->
<view class="right" @click="showContractFn(item.file)">
<view class="right" @click="showContractFn(item.contract_url)">
<uni-icons type="paperclip" color="#3274F9"></uni-icons>
<view>查看</view>
</view>

3
subpkg/property/success.vue
View File

@ -17,9 +17,12 @@
<script>
export default {
onLoad() {
setTimeout(() => {
uni.redirectTo({
url: '/subpkg/property/index'
})
}, 3000)
}
}
</script>

3
subpkg/property/vehicle_a.vue
View File

@ -73,7 +73,8 @@
</view>
</view>
<!-- <view class="right" @click="navToContract(dataList.file)"> -->
<view class="right" @click="showContractFn(datas.contract.file)">
<!-- <view class="right" @click="showContractFn(datas.contract.file)"> -->
<view class="right" @click="showContractFn(datas.contract.contract_url)">
<uni-icons type="paperclip" color="#3274F9"></uni-icons>
<view>查看</view>
</view>

5
utils/logistics.js
View File

@ -51,10 +51,7 @@ function baseRequestTwo(url, method, data, {
url: Url + '/api' + url,
method: method || 'GET',
header: {
...header,
...{
'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
}
...header
},
data: method != 'GET' ? data || {} : {},
params: method == 'GET' ? data : {},