Skip to content

S
self-support
Commit e57cddec authored by Damon's avatar Damon
Browse files
Options

Merge branch 'dev' of https://git.banshouhui.com/lijundan/self-support into dev

parents 54414262 86f4ed66
Hide whitespace changes
Inline Side-by-side
Showing with 201 additions and 94 deletions
src/pages.json
View file @ e57cddec
...@@ -276,7 +276,8 @@ ...@@ -276,7 +276,8 @@
"navigationStyle": "custom", "navigationStyle": "custom",
"navigationBarTitleText": " ", // 配件单物流 "navigationBarTitleText": " ", // 配件单物流
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#F4F5F7" "navigationBarBackgroundColor": "#F4F5F7",
"disableScroll": true
} }
}, },
{ {
......
src/pages/mine/warehouse/express.vue
View file @ e57cddec
<template> <template>
<view class="parts-detail"> <view class="parts-detail">
<u-navbar back-icon-color="#333333" background="#F4F5F7" title="物流信息" titleColor="#333333" :border-bottom="false" title-bold> <u-navbar back-icon-color="#333333" background="#F4F5F7" title="物流信息" titleColor="#333333"
:border-bottom="false" title-bold>
</u-navbar> </u-navbar>
<view class="content-view"> <view class="content-view">
<view class="contacts-view"> <view class="contacts-view">
<view><image class="image-view" :src="imageUrl"></image></view> <view>
<view class="right-view"> <image class="image-view" :src="imageUrl"></image>
<view class="title-view">{{title}}</view> </view>
<view>{{'物流公司：' + info.express.com}}</view> <view class="right-view">
<view class="number-view"> <view class="title-view">{{title}}</view>
<text>{{'物流单号：' + info.express.number}}</text> <view>{{'物流公司：' + info.express.com}}</view>
<text class="copy-view" @click="$u.throttle(handleClick, 500)">复制</text> <view class="number-view">
</view> <text>{{'物流单号：' + info.express.number}}</text>
</view> <text class="copy-view" @click="$u.throttle(handleClick, 500)">复制</text>
</view> </view>
<view class="record-view"> </view>
</view>
<view class="record-view">
<view class="express-record-list">
<view class="dashed-line-view"></view>
<view class="express-list">
<view v-for="(item, index) in logisticsRecords" :key="index" class="order-cell">
<view class="node-view">
<view :class="['node-border-view', {'first': index == 0}]">
<view :class="['node-middle-view', {'first': index == 0}]"></view>
</view>
</view>
<view class="right-view">
<view class="line-view-time">
<text>{{item.datetime}}</text>
</view>
<view class="line-view-context">
<text>{{item.context}}</text>
</view>
</view>
</view>
</view>
</view>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
...@@ -26,7 +48,10 @@ ...@@ -26,7 +48,10 @@
export default { export default {
data() { data() {
return { return {
info: {items:[], express: []}, info: {
items: [],
express: []
},
logisticsRecords: [], // 物流 logisticsRecords: [], // 物流
}; };
}, },
...@@ -44,10 +69,10 @@ ...@@ -44,10 +69,10 @@
'-1': '审核未通过', '-1': '审核未通过',
'1': '已取消' '1': '已取消'
} }
}, },
imageUrl() { imageUrl() {
let item = this.info.items[0] || {} let item = this.info.items[0] || {}
return item.images ? item.images.split(',').shift() : this.placeholderImage return item.images ? item.images.split(',').shift() : this.placeholderImage
}, },
titleColor() { titleColor() {
switch (String(this.info.status)) { switch (String(this.info.status)) {
...@@ -60,11 +85,11 @@ ...@@ -60,11 +85,11 @@
} }
}, },
total() { // 合计 total() { // 合计
var i = 0 var i = 0
for (var item of this.info.items) { for (var item of this.info.items) {
i += item.quantity i += item.quantity
} }
return i return i
}, },
placeholderImage() { placeholderImage() {
...@@ -72,13 +97,12 @@ ...@@ -72,13 +97,12 @@
}, },
}, },
onLoad(e) { onLoad(e) {
getApp().trackPage('配件单物流信息') getApp().trackPage('配件单物流信息')
var pages = getCurrentPages(); var pages = getCurrentPages();
if (pages.length >= 2) { if (pages.length >= 2) {
var page = pages[pages.length - 2]; var page = pages[pages.length - 2];
console.log('-------page.info------', page.info) this.info = page.info
this.info = page.info }
}
this.getLogistics() this.getLogistics()
}, },
methods: { methods: {
...@@ -139,8 +163,8 @@ ...@@ -139,8 +163,8 @@
} }
} }
if (res.code == 200) { if (res.code == 200) {
if (res.data && res.data.records) { if (res.data && res.data.expressInfo && res.data.expressInfo.records) {
this.logisticsRecords = res.data.records this.logisticsRecords = res.data.expressInfo.records
} }
} else { } else {
console.log(res.message) console.log(res.message)
...@@ -148,13 +172,13 @@ ...@@ -148,13 +172,13 @@
}); });
}, },
handleClick() { handleClick() {
uni.setClipboardData({ uni.setClipboardData({
data: this.info.orderNumber, data: this.info.orderNumber,
success: function() { success: function() {
console.log('success'); console.log('success');
} }
}); });
} }
} }
}; };
...@@ -168,50 +192,132 @@ ...@@ -168,50 +192,132 @@
background-color: #F4F5F7; background-color: #F4F5F7;
height: 100vh; height: 100vh;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.content-view { .content-view {
padding: 30rpx; padding: 30rpx;
height: 100%; height: 100%;
overflow: auto; overflow: auto;
.contacts-view { .contacts-view {
padding: 30rpx; padding: 30rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 12rpx; border-radius: 12rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 12rpx; border-radius: 12rpx;
.image-view {
width: 120rpx; .image-view {
height: 120rpx; width: 120rpx;
border-radius: 12rpx; height: 120rpx;
} border-radius: 12rpx;
.right-view { }
font-size: 26rpx;
color: #333333; .right-view {
padding-left: 30rpx; font-size: 26rpx;
width: 100%; color: #333333;
.title-view { padding-left: 30rpx;
font-weight: bold; width: 100%;
font-size: 32rpx;
} .title-view {
.number-view { font-weight: bold;
display: flex; font-size: 32rpx;
justify-content: space-between; }
align-items: center;
.copy-view { .number-view {
color: #2272FF; display: flex;
padding-left: 30rpx; justify-content: space-between;
} align-items: center;
}
} .copy-view {
color: #2272FF;
padding-left: 30rpx;
flex-shrink: 0;
}
}
}
} }
.record-view {
background-color: #FFFFFF; .record-view {
border-radius: 12rpx; background-color: #FFFFFF;
border-radius: 12rpx;
padding: 30rpx 30rpx 0 30rpx;
position: relative;
display: flex;
justify-content: space-between;
.express-record-list {
position: relative;
.dashed-line-view {
position: absolute;
width: 2rpx;
border-left: 1px dashed #999999;
height: calc(100% - 64rpx);
top: 14rpx;
left: 11rpx;
}
.express-list {
width: 100%;
.order-cell {
margin-bottom: 50rpx;
display: flex;
.node-view {
margin-right: 18rpx;
flex-shrink: 0;
margin-top: 8rpx;
z-index: 1;
.node-border-view {
border: 2rpx solid #999999;
border-radius: 11rpx;
width: 22rpx;
height: 22rpx;
padding: 5rpx;
background-color: #FFFFFF;
&.first {
border: 2rpx solid #2272FF;
}
.node-middle-view {
width: 10rpx;
height: 10rpx;
background-color: #999999;
border-radius: 6rpx;
&.first {
background-color: #2272FF;
}
}
}
}
.right-view {
width: 100%;
.line-view-time {
font-size: 28rpx;
font-weight: bold;
color: #333333;
margin-bottom: 20rpx;
}
.line-view-context {
font-size: 26rpx;
color: #666666;
}
}
}
}
}
} }
} }
......
src/pages/mine/warehouse/partsDetail.vue
View file @ e57cddec
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<view class="detail-info-view"> <view class="detail-info-view">
<view v-for="(value, key) in detailKey" :key="key" class="info-item"> <view v-for="(value, key) in detailKey" :key="key" class="info-item">
<view class="detail-left-view"> <view class="detail-left-view">
<text>{{ value }}:</text> <text>{{ value }}</text>
<text @longpress="handleLongpress(key, detail[key] )">{{ detail[key] }}</text> <text @longpress="handleLongpress(key, detail[key] )">{{ detail[key] }}</text>
</view> </view>
<text class="copy-view" v-if="key == 'orderNumber'" @click="$u.throttle(handleClickCopy, 500)"> <text class="copy-view" v-if="key == 'orderNumber'" @click="$u.throttle(handleClickCopy, 500)">
...@@ -131,9 +131,9 @@ ...@@ -131,9 +131,9 @@
}, },
detailKey() { // 详情 detailKey() { // 详情
return { return {
'orderNumber': '申请单号', 'orderNumber': '申请单号：',
'createTime': '申请时间', 'createTime': '申请时间：',
'deliveryTime': '发货时间', 'deliveryTime': '发货时间：',
} }
} }
}, },
...@@ -207,7 +207,8 @@ ...@@ -207,7 +207,8 @@
.express-view { .express-view {
color: #2272FF; color: #2272FF;
font-size: 26rpx; font-size: 26rpx;
margin-bottom: 6rpx;
} }
} }
...@@ -279,7 +280,7 @@ ...@@ -279,7 +280,7 @@
.left-view { .left-view {
display: flex; display: flex;
align-items: center; align-items: flex-start;
.image-view { .image-view {
width: 120rpx; width: 120rpx;
......
src/pages/parts/application.vue
View file @ e57cddec
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
</template> </template>
<script> <script>
import Utils from '@/utils/callUtils.js'
import SelectParts from '@/components/select-parts/adjust.vue' import SelectParts from '@/components/select-parts/adjust.vue'
export default { export default {
components: { components: {
...@@ -96,11 +95,6 @@ export default { ...@@ -96,11 +95,6 @@ export default {
this.orderId = e && Number(e.orderId) || 0 this.orderId = e && Number(e.orderId) || 0
this.initData() this.initData()
}, },
mounted() {
Utils.$on('update-site',(site)=>{
this.updateSite(site);
})
},
methods: { methods: {
initData() { initData() {
this.loadMineAddress() this.loadMineAddress()
...@@ -144,10 +138,11 @@ export default { ...@@ -144,10 +138,11 @@ export default {
this.order.contactCityText, this.order.contactCityText,
this.order.contactCommunityText, this.order.contactCommunityText,
] ]
let address = region.join("") + (this.order.contactStreetText || '') + this.order.contactAddress
this.customer = { this.customer = {
name: this.order.contactName, name: this.order.contactName,
mobile: this.order.contactPhone, mobile: this.order.contactPhone,
address: region.join("") + this.order.contactStreetText + this.order.contactAddress, address: address,
region: region, region: region,
code: [ code: [
this.order.contactProvince, this.order.contactProvince,
...@@ -192,7 +187,11 @@ export default { ...@@ -192,7 +187,11 @@ export default {
}) })
}, },
updateSite(site) { updateSite(site) {
console.log("updateSite", site) if(this.curType) {
this.customer = site
} else {
this.mine = site
}
}, },
addParts() { addParts() {
this.$u.route({ this.$u.route({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment