Commit 840bea4b authored by Morson's avatar Morson

我的地址问题修复

配件押金问题修改
parent 7a508973
...@@ -10,25 +10,20 @@ ...@@ -10,25 +10,20 @@
<view class="left">电话</view> <view class="left">电话</view>
<input disabled v-model="mobile" type="text" placeholder-class="line" placeholder="请填写电话" /> <input disabled v-model="mobile" type="text" placeholder-class="line" placeholder="请填写电话" />
</view> </view>
<u-field <view class="item address">
v-model="address" <view class="left label">地址</view>
label="地址" <textarea v-model="address" type="text" placeholder-class="line" placeholder="请填写地址" />
label-width="88" <view class="right" @tap="autoLocation">
type="textarea" <u-icon
:border-bottom="false" name="map"
placeholder="请填写地址"> color="#2272FF"
<view slot="right" class="right" @tap="autoLocation"> size="30"
<u-icon name="map" color="#2272FF" size="30"></u-icon> label="自动定位"
<text>自动定位</text> label-size="24"
label-color="#2272FF"
></u-icon>
</view> </view>
</u-field>
<!-- <view class="site-clipboard">
<textarea placeholder-class="line" value="" placeholder="粘贴文本,可自动识别姓名和地址等" />
<view class="clipboard">
地址粘贴板
<u-icon name="arrow-down" class="icon" :size="20"></u-icon>
</view> </view>
</view> -->
</view> </view>
<view class="bottom"> <view class="bottom">
<button class="btn, bottom-btn" @click="show = true"> <button class="btn, bottom-btn" @click="show = true">
...@@ -70,7 +65,6 @@ ...@@ -70,7 +65,6 @@
<script> <script>
let r = require("libs/bmap-wx.min.js"); let r = require("libs/bmap-wx.min.js");
let h = new r.BMapWX({ let h = new r.BMapWX({
// ak: "rpVq5d3yxaRCoKzVwmFMo0o4iC524CAG",
ak: "lF1HoyXdiv4uZx6TrGQEZs48F5y8kEHI" ak: "lF1HoyXdiv4uZx6TrGQEZs48F5y8kEHI"
}); });
export default { export default {
...@@ -142,8 +136,6 @@ export default { ...@@ -142,8 +136,6 @@ export default {
}; };
if (lat && long) { if (lat && long) {
let e = lat + "," + long let e = lat + "," + long
// let e = "113.88308" + ',' + "22.55329"
// let e = "22.55329" + ',' + "113.88308"
t.location = e; t.location = e;
} }
h.regeocoding(t); h.regeocoding(t);
...@@ -176,14 +168,11 @@ export default { ...@@ -176,14 +168,11 @@ export default {
address: self.address address: self.address
} }
let res = await self.$u.api.syncAddress(params) let res = await self.$u.api.syncAddress(params)
if(res && res.code == 200) { const callback = (vm, res) => {
self.$u.route({ vm.$u.route({type: 'back'})
type: 'redirect',
url: "pages/mine/address/index",
params: {
sync: true
} }
}) if(res && res.code == 200) {
getApp().getBaseInfo(this, callback);
} }
} }
} }
...@@ -218,59 +207,24 @@ export default { ...@@ -218,59 +207,24 @@ export default {
text-align: left; text-align: left;
} }
} }
/deep/ .u-field {
.address {
padding: 24rpx 0; padding: 24rpx 0;
border-bottom: solid 2rpx $u-border-color; align-items: flex-start;
.u-label-text {
font-weight: 400;
color: #999999;
}
textarea { textarea {
line-height: 40rpx; height: 240rpx;
} background-color: #f7f7f7;
.u-button-wrap { line-height: 60rpx;
align-self: flex-start; padding: 20rpx;
margin-left: 42rpx; width: 400rpx;
} }
.right { .right {
text-align: right;
width: 160rpx;
font-size: 24rpx; font-size: 24rpx;
font-weight: 400; font-weight: 400;
color: #2272FF; color: #2272FF;
line-height: 40rpx; line-height: 88rpx;
}
}
.address {
padding: 20rpx 0;
textarea {
// width: 100%;
height: 150rpx;
background-color: #f7f7f7;
line-height: 60rpx;
margin: 40rpx auto;
padding: 20rpx;
}
}
.site-clipboard {
padding-right: 40rpx;
textarea {
// width: 100%;
height: 150rpx;
background-color: #f7f7f7;
line-height: 60rpx;
margin: 40rpx auto;
padding: 20rpx;
}
.clipboard {
display: flex;
justify-content: center;
align-items: center;
font-size: 26rpx;
color: $u-tips-color;
height: 80rpx;
.icon {
margin-top: 6rpx;
margin-left: 10rpx;
}
} }
} }
} }
......
<template> <template>
<view class="address-wrap"> <view class="address-wrap">
<w-navbar title="收货地址"></w-navbar> <w-navbar title="收货地址"></w-navbar>
<view class="item" v-if="hasAdderss"> <view class="item" v-if="hasAdderss" @tap="toAddSite('修改地址')">
<view class="top"> <view class="top">
<view class="name">{{ settled.id_card_name || settled.nickname || settled.name || '--' }}</view> <view class="name">{{ settled.id_card_name || settled.nickname || settled.name || '--' }}</view>
<view class="phone">{{ settled.mobile }}</view> <view class="phone">{{ settled.mobile }}</view>
</view> </view>
<view class="bottom"> <view class="bottom">
<view class="address">{{ settled.address }}</view> <view class="address">{{ settled.address }}</view>
<u-icon :name="editPen" :size="32" color="#999999" @tap="toAddSite('修改地址')"></u-icon> <u-icon :name="editPen" :size="32" color="#999999"></u-icon>
</view> </view>
<view class="default" v-show="true"> <view class="default" v-show="true">
<u-icon name="checkmark-circle" color="#2272FF" size="32"></u-icon> <u-icon name="checkmark-circle" color="#2272FF" size="32"></u-icon>
<text class="txt">默认地址</text> <text class="txt">默认地址</text>
</view> </view>
</view> </view>
<!-- <view class="addSite" @tap="toAddSite('新增地址')">
<view class="add">
<u-icon name="plus" color="#ffffff" class="icon" :size="30"></u-icon>新建收货地址
</view>
</view> -->
</view> </view>
</template> </template>
...@@ -45,11 +40,9 @@ export default { ...@@ -45,11 +40,9 @@ export default {
return this.settled && this.settled.address && this.settled.id_card_name return this.settled && this.settled.address && this.settled.id_card_name
}, },
}, },
onLoad(e) { onShow() {
if(!this.vuex_token) { if(!this.vuex_token) {
this.$u.route({url: 'pages/login/index'}) this.$u.route({url: 'pages/login/index'})
} else if (e && e.sync) {
this.getData();
} else if(!this.settled) { } else if(!this.settled) {
this.getData(); this.getData();
} }
...@@ -61,7 +54,6 @@ export default { ...@@ -61,7 +54,6 @@ export default {
}, },
toAddSite(title){ toAddSite(title){
this.$u.route({ this.$u.route({
type: 'redirect',
url: 'pages/mine/address/addSite', url: 'pages/mine/address/addSite',
params: { params: {
title: title title: title
...@@ -120,24 +112,4 @@ export default { ...@@ -120,24 +112,4 @@ export default {
} }
} }
} }
.addSite {
display: flex;
justify-content: space-around;
width: 600rpx;
line-height: 100rpx;
position: absolute;
bottom: 30rpx;
left: 80rpx;
background-color: red;
border-radius: 60rpx;
font-size: 30rpx;
.add{
display: flex;
align-items: center;
color: #ffffff;
.icon{
margin-right: 10rpx;
}
}
}
</style> </style>
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
}, },
computed: { computed: {
amount() { amount() {
return this.settled && this.settled.deposit || '0.00'; return this.vuex_settled && this.vuex_settled.hasPaid || '0.00';
}, },
settled() { settled() {
return this.vuex_settled && this.vuex_settled.record || null return this.vuex_settled && this.vuex_settled.record || null
......
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