diff --git a/src/components/SimpleAddress/SimpleAddress.vue b/src/components/SimpleAddress/SimpleAddress.vue
index 6bf3a63..01f769e 100644
--- a/src/components/SimpleAddress/SimpleAddress.vue
+++ b/src/components/SimpleAddress/SimpleAddress.vue
@@ -221,6 +221,7 @@ export default {
},
methods: {
init () {
+ console.log(this.pickerValueDefault)
this.handPickValueDefault() // 对 pickerValueDefault 做兼容处理
this.provinceDataList = provinceData
this.cityDataList = cityData[this.pickerValueDefault[0]]
diff --git a/src/pages/address/addAddress.vue b/src/pages/address/addAddress.vue
index 9a801e8..55e324d 100644
--- a/src/pages/address/addAddress.vue
+++ b/src/pages/address/addAddress.vue
@@ -116,15 +116,17 @@ export default {
uni.setNavigationBarTitle({
title: '编辑地址'
})
- const { name, mobile, sex, add_detail: addDetial, default: isDefault } = this.$store.state.address.details
+ const { name, mobile, sex, add_detail: addDetial, default: isDefault,address } = this.$store.state.address.details
console.log('---', this.$store.state.address.details)
const index = this.$refs.SimpleAddress.queryIndex(this.$store.state.address.details.address.split('-'), 'label')
+ console.log(index)
this.cityPickerValueDefault = index.index
this.name = name
this.mobile = Number(mobile)
this.sexIndex = sex
this.addDetial = addDetial
this.isDefalutAddress = !!Number(isDefault)
+ this.pickerText = address
})
}
},
@@ -200,6 +202,7 @@ export default {
params.add_id = this.addId
}
store.dispatch('address/edit', params).then(() => {
+ console.log('fanhui')
uni.navigateBack({
delta: 1
})
diff --git a/src/pages/address/addressList.vue b/src/pages/address/addressList.vue
index eec3dc3..f949109 100644
--- a/src/pages/address/addressList.vue
+++ b/src/pages/address/addressList.vue
@@ -24,13 +24,13 @@
{{item.address.replace(/[-]/g,' ')}}\n{{item.add_detail}}
{
- console.error('跳转出现错误', error)
- }
- })
+ let pages = getCurrentPages();
+ let prevPage = pages[pages.length - 2]; //上一个页面
+ const addressId=addId
+ // console.log(addressId)
+ prevPage.onShow(addressId);
+ uni.navigateBack();
+ // uni.navigateTo({
+ // url: `../confirmOrder/confirmOrder?addressId=${addId}`,
+ // fail: (error) => {
+ // console.error('跳转出现错误', error)
+ // }
+ // })
}
}
}
@@ -116,7 +125,8 @@ export default {
height: 108rpx;
width: 100%;
align-items: center;
- margin-left: 126rpx;
+ padding-left: 126rpx;
+ box-sizing: border-box;
.name {
display: flex;
justify-content: space-between;
diff --git a/src/pages/confirmOrder/confirmOrder.vue b/src/pages/confirmOrder/confirmOrder.vue
index f4467bc..1d62577 100644
--- a/src/pages/confirmOrder/confirmOrder.vue
+++ b/src/pages/confirmOrder/confirmOrder.vue
@@ -196,7 +196,23 @@ export default {
// isAnonymous:
}
},
- onLoad({ pid, addressId, isCart ,count,name}) {
+ onShow(addressId) {
+ // console.log('+-+-*-*-+-+',addressId)
+ if (addressId) {
+ store
+ .dispatch('address/details', {
+ add_id: addressId,
+ })
+ .then(({ code, data }) => {
+ if (code === 1) {
+ // console.log('code', code, data)
+ this.showAddress = true
+ this.addressInfo = data
+ }
+ })
+ }
+ },
+ onLoad({ pid, addressId,isCart ,count,name}) {
this.pid = pid;
this.count = count;
this.name = name;
diff --git a/src/pages/frameDetail/components/BottomSheet.vue b/src/pages/frameDetail/components/BottomSheet.vue
index c0c844f..eddcaab 100644
--- a/src/pages/frameDetail/components/BottomSheet.vue
+++ b/src/pages/frameDetail/components/BottomSheet.vue
@@ -238,86 +238,6 @@
v-show="!show[index]"
>* {{attrList[index].attr[current[index]].name}}
-
{
const current = []
const show = []
for (let index = 0; index < this.attrList.length; index++) {
@@ -456,14 +340,12 @@ import store from '@/store'
}
this.current = current
this.show = show
- })
//获取关心的人列表
store.dispatch('myLoveList/getLoveList', {
uid: this.$store.state.user.userInfo.uid,
});
- store.dispatch('myLoveList/getLoveList')
// 初始化SPL、CYL、AXI的值
for (let j = 0; j < 3; j++) {
@@ -502,11 +384,6 @@ import store from '@/store'
for (let index = 0; index < loveList.length; index++) {
if (name === loveList[index].name && name!==this.name) {
this.isDataName = true
- uni.showModal({
- title: '提示',
- content: `是否填充已有的"${name}"的数据`,
- success: (res) => {
- if (res.confirm) {
this.kinds = 2
this.name = loveList[index].name
this.pd = loveList[index].pd
@@ -530,11 +407,6 @@ import store from '@/store'
} else {
this.pickerInfoList[3].nameArray3.unshift(loveList[index].in_time.toString().slice(8, 10))
}
- } else if (res.cancel) {
- this.kinds = 2
- }
- },
- })
}
}
this.name = name;