This commit is contained in:
aihe 2024-07-14 19:49:39 +08:00
parent 403bbf757d
commit 84efdda22c
8 changed files with 277 additions and 83 deletions

View File

@ -62,11 +62,6 @@ export const getMonthpayAccountList = (data = {})=> {
return coreRequest(url.getMonthpayAccountList, data, {}, "GET")
}
// 目的地列表
export const getDestPositionList = (data = {})=> {
return coreRequest(url.getDestPositionList, data, {}, "GET")
}
// 发件网点列表
export const getSendSiteList = (data = {})=> {
return coreRequest(url.getSendSiteList, data, {}, "GET")

View File

@ -4,7 +4,7 @@ export const host = curEnvConf.apiHost
export default {
uploadFile: '/common/ossUpload',
loginByApp: `/loginByApp`, // 登录
loginByApp: `/loginByAccount`, // 登录
loginByMP: `/loginByWeixin`, // 小程序登录 -- DONE
bindPhone: `/bindPhoneByWx`, // 绑定手机号 -- DONE
getInfoByApp: `/getInfoByWxApp`,// 获取用户基本信息 -- DONE
@ -25,10 +25,9 @@ export default {
submitOrder: `/oms2c/emisWaybill/realSubmitOrder`, // 提交订单
getCustomerUserList: `/oms2c/emisCustomerUser/listSimple`, // 获取网点客户列表
getPickStaffList: `/oms2c/emisStaff/getStaffList`, // 获取操作、收派 员用户列表
getGoodsList: `/oms2c/emisGoods/listSimple`, // 获取历史--货物列表
getHotGoodsList: `/oms2c/emisGoods/listHotGoods`, // 获取热门--货物列表
getMonthpayAccountList: `/oms2c/emisMonthpayAccount/listSimple`, // 月结账号列表
getDestPositionList: `/oms2c/emisDestination/listSimple`, // 目的地 列表
getGoodsList: `/oms2c/emisGoods/listSimple`, // 获取历史--货物列表 -- DONE
getHotGoodsList: `/oms2c/emisGoods/listHotGoods`, // 获取热门--货物列表 -- DONE
getMonthpayAccountList: `/oms2c/emisMonthpayAccount/listSimple`, // 月结账号列表 -- DONE
getCaculteDestSite: `/oms2c/emisDestination/getDestSite`, // 自动计算目的地 -- DONE
getSendSiteList: `/oms2c/emisSite/listSimple`, // 出发地-网点列表
calcWaybillFee: `/oms2c/emisWaybill/calcWaybillFee`, // 计算运费

View File

@ -0,0 +1,53 @@
<template>
<u-row justify="between">
<text class="clr-sub">您的专属快递员</text>
<u-row>
<text class="">李晓</text>
<view class="ml-10">
<u-avatar size="50" :src="''"></u-avatar>
</view>
</u-row>
</u-row>
</template>
<script>
import * as apiService from "@/common/api"
export default {
computed: {
modelInfo: {
get(){
return this.value
}
},
},
watch: {
},
props: {
value: {
default () {
return { }
}
}
},
data() {
return {
}
},
created() {
},
onHide() {
},
unmounted() {
},
methods: {
}
}
</script>
<style scoped lang="scss">
</style>

View File

@ -0,0 +1,72 @@
<template>
<u-row align="top">
<u-checkbox-group placement="column" @change="handleAgree()">
<u-checkbox size="26" labelSize="26" :checked="modelInfo._agreePrivateRule" label="我已同意接受"
label-color=":#999" activeColor="#B12D29"
custom-style="margin-bottom: 10rpx;"></u-checkbox>
</u-checkbox-group>
<view @click="handleDialogClick(privacyModal)" class="pl-10" style="padding-top: 6rpx;">
<u-text text="《快件运单契约条款》" size="26"></u-text>
</view>
</u-row>
<view @click="handleAgree()">
<u-row>
<view class="mr-10">
<u-text text="预估" :bold="true" size="28"></u-text>
</view>
<u-text :text="80" mode="price" color="#B12D29" :bold="true" size="28"></u-text>
</u-row>
<u-text margin="10rpx 0 0 0" text="温馨提示:具体费用以快递小哥核实为准" color="#999" size="26"></u-text>
</view>
<buns-privacy-dialog v-model:show="privacyModal.show"> </buns-privacy-dialog>
</template>
<script>
import * as apiService from "@/common/api"
export default {
computed: {
modelInfo: {
get(){
return this.value
}
},
},
watch: {
},
props: {
value: {
default () {
return { }
}
}
},
data() {
return {
privacyModal: {
show: false,
},
}
},
created() {
},
onHide() {
},
unmounted() {
},
methods: {
handleAgree() {
this.modelInfo._agreePrivateRule = !this.modelInfo._agreePrivateRule
},
handleDialogClick(curModal){
curModal.show = true
}
}
}
</script>
<style scoped lang="scss">
</style>

View File

@ -0,0 +1,69 @@
<template>
<tpx-checkitems :list="[{}]" v-model:value="modelInfo.productType" v-slot="curPro" min-checked="1" type="single">
<view slot :class="`yunf-item ${curPro.checked?'active':''}`">
<u-row justify="between">
<u-col span="8">
<u-text :text="`柬埔寨-国际特快`" size="28" :bold="true"></u-text>
<u-text margin="6rpx" text="1-2工作日 ¥80元起" size="26" color="#999"></u-text>
</u-col>
<u-col span="4">
<u-text align="right" text="运费预估" size="26" color="#999"></u-text>
<u-text align="right" margin="6rpx" text="32" size="26" :bold="true" mode="price"
color="#B12D29"></u-text>
</u-col>
</u-row>
</view>
</tpx-checkitems>
<tpx-empty v-if="false" size="sm"></tpx-empty>
</template>
<script>
import * as apiService from "@/common/api"
export default {
computed: {
modelInfo: {
get(){
return this.value
}
},
},
watch: {
},
props: {
value: {
default () {
return { }
}
}
},
data() {
return {
}
},
created() {
},
onHide() {
},
unmounted() {
},
methods: {
}
}
</script>
<style scoped lang="scss">
.yunf-item {
margin-bottom: 20rpx;
padding: 30rpx;
background: #F6F6F6;
border-radius: 20rpx;
border: 2rpx solid transparent;
&.active {
border-color: $uni-color-primary;
}
}
</style>

View File

@ -0,0 +1,64 @@
<template>
<tpx-tags :list="dicData.emis_order_remark_list" v-model:value="modelInfo._tips" @onItemClick="handleItemChange"></tpx-tags>
<u-textarea v-model="modelInfo.remark" border="surround" height="160" placeholder="其他说明"
maxlength="50" count></u-textarea>
</template>
<script>
import * as apiService from "@/common/api"
export default {
computed: {
modelInfo: {
get(){
return this.value
}
},
dicData() {
return this.$store.getters.dicData
},
},
watch: {
},
props: {
value: {
default () {
return { }
}
}
},
data() {
return {
}
},
created() {
},
onHide() {
},
unmounted() {
},
methods: {
handleItemChange(item){
setTimeout(()=> {
let remark = this.modelInfo.remark || ''
let val = item.val
if(
this.modelInfo._tips?.indexOf?.(val) == -1
) {
// 取消选中
remark = remark.replace(val, "")
} else {
remark += `${val}`
}
this.modelInfo.remark = remark
}, 300)
},
}
}
</script>
<style scoped lang="scss">
</style>

View File

@ -88,7 +88,7 @@ export const getOrderModels = () => {
operateEmployeeCode: undefined, // 操作员
blMessage: '1', // 寄件 短信开关
blAcceptMessage: '1', // 签收 短信开关
remark: undefined, // 备注
remark: '', // 备注
customerCode: undefined, // 客户code
feeItems: [ // 计费信息
// {

View File

@ -10,6 +10,10 @@
<u-text size="24" color="#fff" text="下单后会有业务员及时联系您,请保持电话畅通!"></u-text>
</u-row>
</view>
<view class="mt-20">
<bpe-bindedpost-tmp v-model:value="submitParam"></bpe-bindedpost-tmp>
</view>
<view class="blcok-white">
<!-- 地址选择 -->
@ -60,7 +64,6 @@
</u-row>
</u-row>
</view>
<view class="yunf-input-item">
<tpx-select v-model:value="submitParam.paymentType" :list="dicData.emis_payment_type"
@ -109,39 +112,12 @@
<view class="com-section mt-30">产品类型</view>
<view class="blcok-white yunf-list" style="padding-bottom: 2rpx;">
<tpx-checkitems :list="[{}]" v-model:value="submitParam.prodId" v-slot="curPro" min-checked="1" type="single">
<view slot :class="`yunf-item ${curPro.checked?'active':''}`">
<u-row justify="between">
<u-col span="8">
<u-text :text="`柬埔寨-国际特快`" size="28" :bold="true"></u-text>
<u-text margin="6rpx" text="1-2工作日 ¥80元起" size="26" color="#999"></u-text>
</u-col>
<u-col span="4">
<u-text align="right" text="运费预估" size="26" color="#999"></u-text>
<u-text align="right" margin="6rpx" text="32" size="26" :bold="true" mode="price"
color="#B12D29"></u-text>
</u-col>
</u-row>
</view>
</tpx-checkitems>
<tpx-empty v-if="false" size="sm"></tpx-empty>
<bpe-choosetypelist-tmp v-model:value="submitParam"></bpe-choosetypelist-tmp>
</view>
<view class="com-section mt-30">给快递员捎话</view>
<view class="blcok-white">
<tpx-tags :list="dicData.emis_order_remark_list" v-model:value="submitParam._tips" @handleChange="handleTipsChange"></tpx-tags>
<u-textarea v-model="submitParam.otherDes" border="surround" height="160" placeholder="其他说明"
maxlength="50" count></u-textarea>
<u-line margin="20rpx 0 10rpx 0"></u-line>
<u-row justify="between">
<text class="clr-sub">您的专属快递员</text>
<u-row>
<text class="">李晓</text>
<view class="ml-10">
<u-avatar size="50" :src="''"></u-avatar>
</view>
</u-row>
</u-row>
<bpe-remark-tmp v-model:value="submitParam"></bpe-remark-tmp>
</view>
</view>
@ -150,25 +126,7 @@
<view class="pos-rlt blcok-white" style="border-radius: 0;margin-top: 0;">
<u-row justify="between">
<view>
<u-row align="top">
<u-checkbox-group placement="column" @change="handleAgree()">
<u-checkbox size="26" labelSize="26" :checked="agreePrivateRule" label="我已同意接受"
label-color=":#999" activeColor="#B12D29"
custom-style="margin-bottom: 10rpx;"></u-checkbox>
</u-checkbox-group>
<view @click="handleDialogClick(privacyModal)" class="pl-10" style="padding-top: 6rpx;">
<u-text text="《快件运单契约条款》" size="26"></u-text>
</view>
</u-row>
<view @click="handleAgree()">
<u-row>
<view class="mr-10">
<u-text text="预估" :bold="true" size="28"></u-text>
</view>
<u-text :text="80" mode="price" color="#B12D29" :bold="true" size="28"></u-text>
</u-row>
<u-text margin="10rpx 0 0 0" text="温馨提示:具体费用以快递小哥核实为准" color="#999" size="26"></u-text>
</view>
<bpe-checkagree-tmp v-model:value="submitParam"></bpe-checkagree-tmp>
</view>
<u-row>
<u-button size="large" shape="circle"
@ -179,8 +137,6 @@
</template>
</tpx-layout>
<buns-privacy-dialog v-model:show="privacyModal.show"> </buns-privacy-dialog>
<buns-revtime-sheet v-model:show="revtimeModal.show" v-model:value="submitParam.revtime"></buns-revtime-sheet>
<buns-edit-sheet percentHeight="70" title="货物信息" v-model:show="goodChooseModal.show" v-model:value="submitParam" v-slot="tempObject" @onSure="handleGoodInfoSure">
@ -203,12 +159,17 @@
import BpeGoodstaticTmp from "@/components/buns-post-edit-templates/bpe-goodstatic-tmp"
import BpeGooditemEditTmp from "@/components/buns-post-edit-templates/bpe-gooditem-edit-tmp"
import BpeGoodphotoTmp from "@/components/buns-post-edit-templates/bpe-goodphoto-tmp"
import BpeBindedpostTmp from "@/components/buns-post-edit-templates/bpe-bindedpost-tmp"
import BpeChoosetypelistTmp from "@/components/buns-post-edit-templates/bpe-choosetypelist-tmp"
import BpeRemarkTmp from "@/components/buns-post-edit-templates/bpe-remark-tmp"
import BpeCheckagreeTmp from "@/components/buns-post-edit-templates/bpe-checkagree-tmp"
import { debounce } from "@/common/util"
import * as apiService from "@/common/api"
import { getOrderModels } from "./model"
export default {
components: { BpeAddressinfoTmp, BpeGoodstaticTmp, BpeGooditemEditTmp, BpeGoodphotoTmp },
components: { BpeAddressinfoTmp, BpeGoodstaticTmp, BpeGooditemEditTmp, BpeGoodphotoTmp, BpeBindedpostTmp, BpeChoosetypelistTmp, BpeRemarkTmp, BpeCheckagreeTmp },
props: {
// hasLeftWin: {
// type: Boolean
@ -261,10 +222,6 @@
wayRes: { list: [] },
productRes: { list: [] },
yuejieRes: { list: [] },
agreePrivateRule: false,
privacyModal: {
show: false,
},
revtimeModal: {
show: false,
},
@ -326,12 +283,7 @@
this.submitParam.dispatchUnderlingSiteCode = data.siteCode;
this.submitParam.dispatchUnderlingSiteName = data.siteName;
},
handleTipsChange(val){
debugger
},
handleAgree() {
this.agreePrivateRule = !this.agreePrivateRule
},
handleDialogClick(curModal){
curModal.show = true
}
@ -348,16 +300,6 @@
}
</style>
<style scoped lang="scss">
.yunf-item {
margin-bottom: 20rpx;
padding: 30rpx;
background: #F6F6F6;
border-radius: 20rpx;
border: 2rpx solid transparent;
&.active {
border-color: $uni-color-primary;
}
}
.yunf-input-item{
padding: 26rpx 0;
border-bottom: 2rpx solid #F6F6F6;