Commit 46b7c5ec authored by Morson's avatar Morson

feat(parts):申请配件UI调整

parent f977f50d
(function () { (function () {
let NODE_ENV = 'dev'; // dev:开发环境 | test:测试环境 | prod:生产环境 let NODE_ENV = 'test'; // dev:开发环境 | test:测试环境 | prod:生产环境
let ENV_VAR = null; let ENV_VAR = null;
let VERSION_NUMBER = '1.3.9';//版本号 let VERSION_NUMBER = '1.3.9';//版本号
//小程序是否审核通过,参数配置在ucenter库version表,对应版本号的is_audit设置为1,将显示学习视频 //小程序是否审核通过,参数配置在ucenter库version表,对应版本号的is_audit设置为1,将显示学习视频
......
...@@ -6,6 +6,7 @@ const UNI_APP = { ...@@ -6,6 +6,7 @@ const UNI_APP = {
}, },
systemUrl: { systemUrl: {
apiUrl: 'https://system.dev.banshouhui.com', //java端域名请求头 apiUrl: 'https://system.dev.banshouhui.com', //java端域名请求头
// apiUrl: 'http://apidoc.banshouhui.com:3000/mock/31', // mock端域名请求头
}, },
qn_base_url: 'https://qn-static.banshouhui.com/self-support/', qn_base_url: 'https://qn-static.banshouhui.com/self-support/',
qn_asset_url: 'https://qn-static.banshouhui.com', qn_asset_url: 'https://qn-static.banshouhui.com',
......
@font-face { @font-face {
font-family: "wxh"; /* Project id 2600874 */ font-family: "wxh"; /* Project id 2600874 */
/* Color fonts */
src: src:
url('//at.alicdn.com/t/font_2600874_5qa57hzmhg6.woff2?t=1624432377798') format('woff2'); url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAQUAAsAAAAACBgAAAPFAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACDDAqEFINfATYCJAMQCwoABCAFhDEHOxsUBxHVm0PJfiTGMSnrzJJXUa4yEzzQe9abzLQL+2Cu08seiGTvi9AfoQbA5mYMV6MiFEtyHvwv35G2zPRCGD9wTn36LrAAwHh1W9LBblaR4hfGKwyvdRnHIAB3SlEDrV6DZtl49+4wuC/hKMxKAUmq6N2jWwdcBTmqIVXgisDedahCfMUG2gTtLDAt+L14QxnhCho2iblSq671O3P8uXgupek0cci7FE+Xg+YaYAMkkLkxpchv1rdBRv5MJO5VekUyra8Q8Fw6nc+FR9/2Xx5INAQIOybfE9RyAQnPhUNPBBp4BAIJ5oUvpQBwBVyAVcA7THHkNF0kIigsINw7IWTUxOyrFmDmXAMm5d0ArNzrkuETHcznWGlM0k7KuVajNbOvdumhu0/cKAqtTR4ekzZQ4FY114+auHHhopC83OzZIcdir7XpxJ60nA1Llqdmz06eGNx1rrVpUlCXOQvmr+8/MX3u0gh9Wc1u89at2ZDLCOw8OzA7b14Ir5m0YQk/w+Fy7WeP8J54/bqwWTdueHhNOjXG9DtQ5tWrsTK0X1FFvXwFR0XjfsWiCrpegSLvGxUdFcrryPsVjfIOR/lu9i8LuhspevKUKcl6inHRRv3IKZP1ZCP1IlBETp6crKcaF2FN0qdMqchO6bP7etC9IK26yxOOxG2Vd4WMe5Txy/OZfrjdxnnzLpyfO+99xr2M9wsXxHu98n34kGUX45Ma7/2D3ocEv0+/l+5/d6NxaPrbG1Flz8woVT5qTLxlLpi7Nr5njwnF1sGSmR8+ZH45aFnvM865vS+2/F5Gl29F+eXm7rT6Sam1Ux6nuGjYKO1YZJ1aX86NnxcdlJ2N/gA4xyrkOOd/p6U0WUyCpvwirR/ejDa3fxwr8qn2zdXjmV13///aFmDdKWMTcEUDnv57tSgaCP8LaU5Q6svgjULVPQ5FUyS8GuBumcFJzf7cn0IYpNJACIMSUMOFUFAiiSEqajxow4Mk0I6kFOhOBmVHexCAgUQoNyCdAYQrIFwEUMObFaDEzjaiou4BbQRziGu3hJcAupPLjSk9SBZZrqrLqAUdmD9MlnZv1xR1P/GF4Vw1Rxhq/ZCPiXZoqyYTGnFH7t7juEIn4sEzbTD0XA3XlSAxzWiliiKpr2tf9aDK0paprC6jFnRg/jBZ2r23qqhs2BNfGM5Vc5EB7Q9V/TF1Toa2aqqJI39vKrjErMcVOhEPnmmDcFhUi6vlJ0jV2TNaqSg+wJv6minnu/KrzQu3d8gFJZh7qFwTUihhw2ZXskuZcC8d2SwDAAAA') format('woff2');
} }
.wxh { .wxh {
...@@ -13,6 +12,10 @@ ...@@ -13,6 +12,10 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.wxh-clock:before {
content: "\e603";
}
.wxh-pen:before { .wxh-pen:before {
content: "\e602"; content: "\e602";
} }
......
...@@ -11,9 +11,10 @@ ...@@ -11,9 +11,10 @@
<view class="card"> <view class="card">
<view class="header" v-if="showTimeView"> <view class="header" v-if="showTimeView">
<view class="header-left-view"> <view class="header-left-view">
<image class="bottom-tag-view" :src="tagImage"></image> <u-icon name="clock" margin-left="10" custom-prefix="wxh"
<view class="tip-text" :style="{'color': countColor}">{{tipText}}</view> :color="countColor" size="40" :label="tipText" label-size="32"
</view> :label-color="countColor" :custom-style="{'font-weight': 'bold'}" />
</view>
<!-- 倒计时 --> <!-- 倒计时 -->
<view class="title"> <view class="title">
<u-count-down :timestamp="timestamp" font-size="28" show-days separator="zh" separator-size="32" height="40" <u-count-down :timestamp="timestamp" font-size="28" show-days separator="zh" separator-size="32" height="40"
...@@ -238,15 +239,6 @@ ...@@ -238,15 +239,6 @@
wenjianImage() { wenjianImage() {
return process.uniEnv.qn_base_url + 'wenjian.png' return process.uniEnv.qn_base_url + 'wenjian.png'
}, },
tagImage() {
return this.timeout ? this.chaoshiImage : this.shengyuImage
},
chaoshiImage() {
return process.uniEnv.qn_base_url + 'chaoshi-red.png'
},
shengyuImage() {
return process.uniEnv.qn_base_url + 'shengyu-blue.png'
},
types() { types() {
return { return {
'waitAccept': 0, // 待接单、待抢单 'waitAccept': 0, // 待接单、待抢单
...@@ -1030,17 +1022,7 @@ ...@@ -1030,17 +1022,7 @@
.header-left-view { .header-left-view {
display: flex; display: flex;
align-items: center; align-items: center;
.bottom-tag-view {
width: 40rpx;
height: 40rpx;
margin-right: 10rpx;
}
.tip-text {
font-size: 32rpx;
font-weight: bold;
color: #2272FF;
}
} }
} }
} }
......
...@@ -31,14 +31,6 @@ ...@@ -31,14 +31,6 @@
</view> </view>
<view class="card address"> <view class="card address">
<view class="title">收件信息</view> <view class="title">收件信息</view>
<view class="subsection">
<u-subsection
:list="siteTypes" :current="curType"
:bold="false" font-size="26" height="76"
active-color="#FFFFFF" inactive-color="#333333"
bg-color="#FFFFFF" button-color="#2272FF"
@change="typeChange" />
</view>
<view class="body"> <view class="body">
<w-address :info="addressInfo" @editSite="editSite" /> <w-address :info="addressInfo" @editSite="editSite" />
</view> </view>
...@@ -66,12 +58,8 @@ export default { ...@@ -66,12 +58,8 @@ export default {
parts: [], parts: [],
disabled: false, disabled: false,
remark: '', remark: '',
siteTypes: [{name: '我的地址'}, {name: '客户地址'}],
curType: 0, curType: 0,
mine: { addressInfo: {
name: '', mobile: '', address: '', region: []
},
customer: {
name: '', mobile: '', address: '', region: [] name: '', mobile: '', address: '', region: []
}, },
}; };
...@@ -90,9 +78,6 @@ export default { ...@@ -90,9 +78,6 @@ export default {
fontWeight: 600, fontWeight: 600,
} }
}, },
addressInfo() {
return this.curType ? this.customer : this.mine
},
}, },
onLoad(e) { onLoad(e) {
this.orderId = e && Number(e.orderId) || 0 this.orderId = e && Number(e.orderId) || 0
...@@ -101,20 +86,14 @@ export default { ...@@ -101,20 +86,14 @@ export default {
}, },
methods: { methods: {
initData() { initData() {
this.loadMineAddress() this.loadAddress()
this.loadOrderInfo() this.loadOrderInfo()
this.parts = [
{part_id: 15866, name: '挚达-沃尔沃-充电桩', quantity: 2},
{part_id: 15867, name: '直达充电桩', quantity: 1},
{part_id: 15868, name: '郭小清-物料配件', quantity: 0},
{part_id: 2010, name: '通用品牌配件测试', quantity: 100}
]
}, },
loadMineAddress() { loadAddress() {
this.$u.api.getSiteAddress().then((res) => { this.$u.api.getSiteAddress().then((res) => {
if(res.code == 200 && res.data) { if(res.code == 200 && res.data) {
this.mine.address = res.data.address this.addressInfo.address = res.data.address
this.mine.region = [ this.addressInfo.region = [
res.data.provinceName, res.data.provinceName,
res.data.cityName, res.data.cityName,
res.data.districtName res.data.districtName
...@@ -126,37 +105,24 @@ export default { ...@@ -126,37 +105,24 @@ export default {
this.$u.api.orderDetail({}, this.orderId).then((res) => { this.$u.api.orderDetail({}, this.orderId).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.order = res.data this.order = res.data
this.initCustomer() this.initAddressInfo()
} else { } else {
console.log(res.message, "获取订单详情失败!"); console.log(res.message, "获取订单详情失败!");
} }
}); });
}, },
initCustomer() { initAddressInfo() {
if(this.$u.test.isEmpty(this.order)) { if(this.$u.test.isEmpty(this.order)) {
this.customer = {name: '', mobile: '', address: '', region: []} this.addressInfo.name = ''
this.addressInfo.mobile = ''
} else { } else {
this.mine.name = this.order.maintainWorkerName this.addressInfo.name = this.order.maintainWorkerName
this.mine.mobile = this.order.maintainWorkerPhone this.addressInfo.mobile = this.order.maintainWorkerPhone
// this.applyType = this.order.inGuaranteePeriod == 'Y' ||
this.customer = {
name: this.order.contactName,
mobile: this.order.contactPhone,
address: this.order.contactAddress,
region: [
this.order.contactProvinceText,
this.order.contactCityText,
this.order.contactCommunityText,
],
}
} }
}, },
qnFile(src) { qnFile(src) {
return process.uniEnv.qn_base_url + src return process.uniEnv.qn_base_url + src
}, },
typeChange(index) {
this.curType = index
},
editSite() { editSite() {
this.$u.route({ this.$u.route({
url: "pages/mine/address/addSite", url: "pages/mine/address/addSite",
...@@ -170,15 +136,14 @@ export default { ...@@ -170,15 +136,14 @@ export default {
}) })
}, },
updateSite(site) { updateSite(site) {
if(this.curType) { this.addressInfo = site
this.customer = site
} else {
this.mine = site
}
}, },
addParts() { addParts() {
this.$u.route({ this.$u.route({
url: "pages/parts/addParts" url: "pages/parts/addParts",
params: {
categaryId: this.order.categoryId
}
}) })
}, },
updateParts(parts) { updateParts(parts) {
...@@ -309,15 +274,6 @@ export default { ...@@ -309,15 +274,6 @@ export default {
.parts { .parts {
} }
.address { .address {
.subsection {
margin: -6rpx 0 34rpx 0;
padding: 0 129rpx;
/deep/ .u-subsection {
.u-item-bg {
border-radius: 32rpx !important;
}
}
}
.body { .body {
border-top: 2rpx solid #F4F5F7; border-top: 2rpx solid #F4F5F7;
padding-top: 10rpx; padding-top: 10rpx;
......
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