diff --git a/components/company/company.vue b/components/company/company.vue
index bdaf462..07e06e5 100644
--- a/components/company/company.vue
+++ b/components/company/company.vue
@@ -480,7 +480,7 @@
border-radius: 30rpx;
opacity: 1;
overflow: hidden;
- box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
+ // box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
.cards_head {
padding: 28rpx;
diff --git a/components/logistiComptent/logistiCard/logistiBriefCard.vue b/components/logistiComptent/logistiCard/logistiBriefCard.vue
index d3fd858..e78e278 100644
--- a/components/logistiComptent/logistiCard/logistiBriefCard.vue
+++ b/components/logistiComptent/logistiCard/logistiBriefCard.vue
@@ -1,10 +1,13 @@
-
+
取货点: {{goodsInfo.shop_name}}
收货人: {{ fuzzyName(goodsInfo.receiver_name) }}
+
+
+
-
+
店主姓名: {{goodsInfo.shop_user}}
@@ -24,12 +27,12 @@
-
+
待取货/点击查看
-
+
待配送/点击查看
@@ -88,6 +91,8 @@
font-size: 30rpx;
font-weight: bold;
padding: 20rpx 15rpx;
+ display: flex;
+ justify-content: space-between
}
.content {
diff --git a/components/logistiComptent/logistiCard/logistiCard.vue b/components/logistiComptent/logistiCard/logistiCard.vue
index 82363bb..23c2b0d 100644
--- a/components/logistiComptent/logistiCard/logistiCard.vue
+++ b/components/logistiComptent/logistiCard/logistiCard.vue
@@ -383,7 +383,7 @@
overflow: hidden;
margin: 2vh 2vw;
- box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
+ /* box-shadow: 0 0 10px rgba(0, 0, 0, 0.5); */
/* padding: 2vh 2vw; */
.tit {
diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue
index 9551f23..b12079e 100644
--- a/components/task/taskItem.vue
+++ b/components/task/taskItem.vue
@@ -22,14 +22,15 @@
进行中
-
+
- 完成时间 :
- {{datas.end_time}}
-
- 进行中
+ 完成时间 :
+ {{datas.end_time}}
+
+ 进行中
已完成
已关闭
@@ -221,7 +222,7 @@
.personnel_list {
// padding: 28rpx 0;
- padding-bottom: 28rpx;
+ padding-bottom: 28rpx;
.cards {
@@ -232,7 +233,7 @@
border-radius: 30rpx;
opacity: 1;
overflow: hidden;
- box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
+ // box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
.cards_head {
padding: 28rpx;
diff --git a/pages/logistics/deliveryDetil.vue b/pages/logistics/deliveryDetil.vue
index ba5d398..25ad01f 100644
--- a/pages/logistics/deliveryDetil.vue
+++ b/pages/logistics/deliveryDetil.vue
@@ -105,6 +105,7 @@
export default {
data() {
return {
+ is_captain: 0,
mapClass: 'custom-map',
showLoading: true,
showPop: false,
@@ -290,6 +291,7 @@
},
},
onLoad(options) {
+ console.log(JSON.parse(uni.getStorageSync("USER_INFO")).is_captain)
getDetil({
logistics_id: options.id
}).then(res => {
diff --git a/pages/logistics/logisticDetil.vue b/pages/logistics/logisticDetil.vue
index cb035b5..08fcad6 100644
--- a/pages/logistics/logisticDetil.vue
+++ b/pages/logistics/logisticDetil.vue
@@ -346,7 +346,7 @@
overflow: hidden;
margin: 2vh 2vw;
- box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
+ /* box-shadow: 0 0 10px rgba(0, 0, 0, 0.5); */
/* padding: 2vh 2vw; */
.tit {
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index dc0a64e..a3507e0 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -5,12 +5,12 @@
\ No newline at end of file
diff --git a/test.vue b/test.vue
index 830376e..42dc2ea 100644
--- a/test.vue
+++ b/test.vue
@@ -1,119 +1,111 @@
-
-
-
- 最后更新:2020-25-2
- 更新档案
- 查看档案
-
-
-
-
- 人员姓名 :
- { item.name }
-
-
- 联系电话 :
- { item.phone }
-
-
- 所属片区 :
- 所属片区
-
-
+
+
+
+ 最后更新:2020-25-2
+ 更新档案
+ 查看档案
+
+
+
+
+ 人员姓名 :
+ { item.name }
+
+
+ 联系电话 :
+ { item.phone }
+
+
+ 所属片区 :
+ 所属片区
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ transform: translate(-50%, -50%);
+ }
+ }
+ }
+
\ No newline at end of file