Compare commits
3 Commits
b9ba2072db
...
f36a63952e
Author | SHA1 | Date | |
---|---|---|---|
![]() |
f36a63952e | ||
![]() |
5ca0c40754 | ||
![]() |
d2ef187ae7 |
@ -62,16 +62,16 @@
|
|||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<el-form-item v-if="waringTags.length > 0" label="提示:">
|
<el-form-item v-if="waringTags.length > 0" label="提示">
|
||||||
<el-tag v-for="(tag, index) in waringTags" :key="index" class="m-r-5" type="warning">{{ tag }}</el-tag>
|
<el-tag v-for="(tag, index) in waringTags" :key="index" class="m-r-5" type="warning">{{ tag }}</el-tag>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="订单ID:">
|
<el-form-item label="订单ID">
|
||||||
{{ executeOrder.id }}
|
{{ executeOrder.id }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="收货站点:">
|
<el-form-item label="收货站点">
|
||||||
{{ executeOrder.receive_site_name }}
|
{{ executeOrder.receive_site_name }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="联系电话:">
|
<el-form-item label="联系电话">
|
||||||
{{ executeOrder.tel }}
|
{{ executeOrder.tel }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</template>
|
</template>
|
||||||
@ -811,7 +811,7 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 超出飞机载重 提示
|
// 超出飞机载重 提示
|
||||||
if (this.plane.weight_max < order.total_weight) {
|
if (Number(this.plane.weight_max) < Number(order.total_weight)) {
|
||||||
if (cIndex === -1) {
|
if (cIndex === -1) {
|
||||||
this.waringTags.push('超出飞机载重')
|
this.waringTags.push('超出飞机载重')
|
||||||
}
|
}
|
||||||
|
@ -85,17 +85,18 @@ label {
|
|||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Element-ui 全局部分*/
|
||||||
.el-button {
|
.el-button {
|
||||||
font-size: 16px !important;
|
font-size: 16px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*抽屉样式 默认上侧加圆角*/
|
//抽屉样式 默认上侧加圆角
|
||||||
.el-drawer {
|
.el-drawer {
|
||||||
border-top-left-radius: 10px;
|
border-top-left-radius: 10px;
|
||||||
border-top-right-radius: 10px;
|
border-top-right-radius: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 抽屉样式 大于480px时的圆角样式 */
|
//抽屉样式 大于480px时的圆角样式
|
||||||
.el-drawer-large {
|
.el-drawer-large {
|
||||||
border-top-left-radius: 10px !important;
|
border-top-left-radius: 10px !important;
|
||||||
border-bottom-left-radius: 10px !important;
|
border-bottom-left-radius: 10px !important;
|
||||||
@ -103,7 +104,7 @@ label {
|
|||||||
border-bottom-right-radius: 0px !important;
|
border-bottom-right-radius: 0px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*抽屉样式 小于480px时的圆角样式 */
|
// 抽屉样式 小于480px时的圆角样式
|
||||||
.el-drawer-small {
|
.el-drawer-small {
|
||||||
border-top-left-radius: 10px !important;
|
border-top-left-radius: 10px !important;
|
||||||
border-top-right-radius: 10px !important;
|
border-top-right-radius: 10px !important;
|
||||||
@ -111,6 +112,48 @@ label {
|
|||||||
border-bottom-right-radius: 0px !important;
|
border-bottom-right-radius: 0px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.el-transfer__buttons {
|
||||||
|
margin-top: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-row {
|
||||||
|
margin-top: 10px;
|
||||||
|
|
||||||
|
.el-header {
|
||||||
|
color: $maintext-color;
|
||||||
|
padding: 0px;
|
||||||
|
background-color: $border4-color;
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-main {
|
||||||
|
padding: 0px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//表单label
|
||||||
|
.el-form-item__label {
|
||||||
|
font-style: italic;
|
||||||
|
font-weight: bold;
|
||||||
|
color: #303133 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 当屏幕宽度小于等于480px时 */
|
||||||
|
@media (max-width: 480px) {
|
||||||
|
.el-dialog {
|
||||||
|
width: 90% !important;
|
||||||
|
/* 根据需要调整宽度 */
|
||||||
|
max-width: 360px !important;
|
||||||
|
/* 根据需要设置最大宽度 */
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-message-box {
|
||||||
|
width: 90% !important;
|
||||||
|
/* 调整宽度以适应小屏幕 */
|
||||||
|
max-width: 360px !important;
|
||||||
|
/* 根据需要设置最大宽度 */
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//mapboxgl
|
//mapboxgl
|
||||||
.mapboxgl-ctrl-bottom-left a {
|
.mapboxgl-ctrl-bottom-left a {
|
||||||
display: none !important;
|
display: none !important;
|
||||||
@ -253,36 +296,7 @@ label {
|
|||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-row {
|
|
||||||
margin-top: 10px;
|
|
||||||
|
|
||||||
.el-header {
|
|
||||||
color: $maintext-color;
|
|
||||||
padding: 0px;
|
|
||||||
background-color: $border4-color;
|
|
||||||
}
|
|
||||||
|
|
||||||
.el-main {
|
|
||||||
padding: 0px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 当屏幕宽度小于等于420px时 */
|
|
||||||
@media (max-width: 420px) {
|
|
||||||
.el-dialog {
|
|
||||||
width: 90% !important;
|
|
||||||
/* 根据需要调整宽度 */
|
|
||||||
max-width: 360px !important;
|
|
||||||
/* 根据需要设置最大宽度 */
|
|
||||||
}
|
|
||||||
|
|
||||||
.el-message-box {
|
|
||||||
width: 90% !important;
|
|
||||||
/* 调整宽度以适应小屏幕 */
|
|
||||||
max-width: 360px !important;
|
|
||||||
/* 根据需要设置最大宽度 */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*隐藏声音api 的弹出框*/
|
/*隐藏声音api 的弹出框*/
|
||||||
.rvNotification {
|
.rvNotification {
|
||||||
|
@ -163,6 +163,11 @@ export class FollowControl {
|
|||||||
// 监听地图 mousedown 事件
|
// 监听地图 mousedown 事件
|
||||||
this._map.on('mousedown', this._handleMapMouseDown.bind(this))
|
this._map.on('mousedown', this._handleMapMouseDown.bind(this))
|
||||||
|
|
||||||
|
// 监听触摸事件
|
||||||
|
this._map.getCanvasContainer().addEventListener('touchstart', this._handleMapMouseDown.bind(this))
|
||||||
|
this._map.getCanvasContainer().addEventListener('touchmove', this._handleMapMouseDown.bind(this))
|
||||||
|
this._map.getCanvasContainer().addEventListener('touchend', this._handleMapMouseDown.bind(this))
|
||||||
|
|
||||||
return this._container
|
return this._container
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -10,8 +10,8 @@
|
|||||||
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
<el-main class="border p-20">
|
<el-main class="border p-20 m-b-20">
|
||||||
<el-form ref="form" :model="form" label-width="120px">
|
<el-form ref="form" :model="form" label-width="120px" :label-position="$store.state.app.isWideScreen?'top':'right'">
|
||||||
<el-form-item v-if="pageState === 'add'" label="所属商铺">
|
<el-form-item v-if="pageState === 'add'" label="所属商铺">
|
||||||
<SelectionShopId v-model="form.shop_id" />
|
<SelectionShopId v-model="form.shop_id" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
@ -10,8 +10,8 @@
|
|||||||
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
<el-main class="border p-20">
|
<el-main class="border p-20 m-b-20">
|
||||||
<el-form ref="form" :model="form" label-width="120px">
|
<el-form ref="form" :model="form" label-width="120px" :label-position="$store.state.app.isWideScreen?'top':'right'">
|
||||||
<el-form-item v-if="pageState === 'add'" label="所属商铺">
|
<el-form-item v-if="pageState === 'add'" label="所属商铺">
|
||||||
<SelectionShopId v-model="form.shop_id" />
|
<SelectionShopId v-model="form.shop_id" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
@ -10,8 +10,8 @@
|
|||||||
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
<el-main class="border p-20">
|
<el-main class="border p-20 m-b-20">
|
||||||
<el-form ref="form" :model="form" label-width="120px">
|
<el-form ref="form" :model="form" label-width="120px" :label-position="$store.state.app.isWideScreen?'top':'right'">
|
||||||
<el-form-item v-if="pageState === 'add'" label="所属商铺">
|
<el-form-item v-if="pageState === 'add'" label="所属商铺">
|
||||||
<SelectionShopId v-model="form.shop_id" />
|
<SelectionShopId v-model="form.shop_id" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
@ -10,8 +10,8 @@
|
|||||||
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
<el-main class="border p-20">
|
<el-main class="border p-20 m-b-20">
|
||||||
<el-form ref="form" :model="form" label-width="120px">
|
<el-form ref="form" :model="form" label-width="120px" :label-position="$store.state.app.isWideScreen?'top':'right'">
|
||||||
<!-- 用户select选项 -->
|
<!-- 用户select选项 -->
|
||||||
<el-form-item v-if="pageState === 'edit'" label="商铺选择">
|
<el-form-item v-if="pageState === 'edit'" label="商铺选择">
|
||||||
<SelectionShopId v-model="form.shop_id" />
|
<SelectionShopId v-model="form.shop_id" />
|
||||||
|
@ -10,8 +10,8 @@
|
|||||||
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
<font class="m-l-10 f-s-18 fb">{{ $route.meta.title }}</font>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
<el-main class="border p-20">
|
<el-main class="border p-20 m-b-20">
|
||||||
<el-form ref="form" :model="form" label-width="120px">
|
<el-form ref="form" :model="form" label-width="120px" :label-position="$store.state.app.isWideScreen?'top':'right'">
|
||||||
<el-form-item v-if="pageState === 'add'" label="所属商铺">
|
<el-form-item v-if="pageState === 'add'" label="所属商铺">
|
||||||
<SelectionShopId v-model="form.shop_id" />
|
<SelectionShopId v-model="form.shop_id" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
Loading…
Reference in New Issue
Block a user