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 @@ <text class="address">{{item.address.replace(/[-]/g,' ')}}\n{{item.add_detail}}</text> </view> <image - @tap="toEditAddress(item.add_id)" + @click.stop="toEditAddress(item.add_id)" v-if="item.default === '1'" class="arrow" src="../../static/right.png" ></image> <image - @tap="toEditAddress(item.add_id)" + @click.stop="toEditAddress(item.add_id)" v-else class="arrow pen" src="../../static/icon-pen.png" @@ -64,6 +64,9 @@ export default { } store.dispatch('address/list') }, + onShow() { + store.dispatch('address/list') + }, methods: { toAddAddress() { console.log('aaaaa-a') @@ -85,12 +88,18 @@ export default { }, toOrder (addId) { if (this.edit) { - uni.navigateTo({ - url: `../confirmOrder/confirmOrder?addressId=${addId}`, - fail: (error) => { - 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}}</view> </view> - <!-- <view class="chooseItem_1 chooseItem"> - <UniCollapse @change="change(1)"> - <UniCollapseItem - open=true - title="款式挑选" - showAnimation=false - > - <view - class="chooseRes" - v-show="show[1]" - >* {{chooseRes1}}</view> - <view class="chooseItem_1_content"> - <view class="itemsWrap"> - <view - class="item1" - v-for="(item,index) in chooseItem1" - :key="index" - :style="item.style" - :class="{ active1: current1 === index }" - @click="onClickItem1(index)" - ></view> - </view> - </view> - </UniCollapseItem> - </UniCollapse> - <view - class="chooseRes" - v-show="show[1]" - >* {{chooseRes1}}</view> - </view> - <view class="chooseItem_2 chooseItem "> - <UniCollapse @change="change(2)"> - <UniCollapseItem - open=true - title="直径" - showAnimation=false - > - <view class="chooseItem_1_content"> - <view class="itemsWrap"> - <view - class="item2" - v-for="(item,index) in chooseItem2" - :key="index" - :class="{ active2: current2 === index }" - @click="onClickItem2(index)" - >{{item.num}}</view> - </view> - </view> - </UniCollapseItem> - </UniCollapse> - <view - class="chooseRes" - v-show="show[2]" - >* {{chooseRes2}}</view> - </view> - <view class="chooseItem_3 chooseItem"> - <UniCollapse @change="change(3)"> - <UniCollapseItem - open=true - title="度数" - showAnimation=false - > - <view class="chooseItem_1_content"> - <view class="itemsWrap"> - <view - class="item2" - v-for="(item,index) in chooseItem3" - :key="index" - :class="{ active2: current3 === index }" - @click="onClickItem3(index)" - >{{item}}</view> - </view> - </view> - </UniCollapseItem> - </UniCollapse> - <view - class="chooseRes" - v-show="show[3]" - >* {{chooseRes3}}</view> - </view> --> </view> <view class="button" @@ -356,42 +276,9 @@ import store from '@/store' opIsOpen: true, addDisabled: false, desDisabled: false, - // current1: 0, - // current2: 0, - // current3: 0, current: [], show: [], - chooseRes1: { - sku_name: 'Miss 黑二代【减龄自然】', - sk_id: '128', - }, checkedData: {}, - chooseRes2: '14.0', - chooseRes3: 0, - chooseItem1: [ - { style: 'opacity: 0.7;background-image: radial-gradient(50% 148%, #ECEAEA 50%, #8D8C8C 100%);', describ: 'Miss 黑1代【减龄自然】' }, - { style: 'background-image: radial-gradient(50% 143%, #AEA8A8 45%, #624B3F 100%);', describ: 'Miss 黑二代【防紫外线】' }, - { style: 'background-image: radial-gradient(50% 148%, #FDF8F6 50%, #94380B 100%);', describ: 'Miss 黑3代【防紫外线】' }, - { style: 'background-image: radial-gradient(50% 148%, #FFFFFF 50%, #324A05 100%);', describ: 'Miss 黑4代【防紫外线】' }, - { style: 'background-image: radial-gradient(50% 143%, #AEA8A8 45%, #624B3F 100%);', describ: 'Miss 黑5代【防紫外线】' }, - { style: 'opacity: 0.7;background-image: radial-gradient(50% 150%, #F0EEE7 50%, #6F0838 100%);', describ: 'Miss 黑6代【防紫外线】' }, - { style: 'background-image: radial-gradient(50% 143%, #AEA8A8 45%, #370B4E 100%);', describ: 'Miss 黑7代【防紫外线】' }, - { style: 'background-image: radial-gradient(50% 148%, #FFFFFF 50%, #324A05 100%);', describ: 'Miss 黑4代【防紫外线】' }, - { style: 'background-image: radial-gradient(50% 143%, #AEA8A8 45%, #624B3F 100%);', describ: 'Miss 黑5代【防紫外线】' }, - { style: 'opacity: 0.7;background-image: radial-gradient(50% 150%, #F0EEE7 50%, #6F0838 100%);', describ: 'Miss 黑6代【防紫外线】' }, - { style: 'background-image: radial-gradient(50% 143%, #AEA8A8 45%, #370B4E 100%);', describ: 'Miss 黑7代【防紫外线】' }, - { style: 'background-image: radial-gradient(50% 148%, #FFFFFF 50%, #324A05 100%);', describ: 'Miss 黑4代【防紫外线】' }, - { style: 'background-image: radial-gradient(50% 143%, #AEA8A8 45%, #624B3F 100%);', describ: 'Miss 黑5代【防紫外线】' }, - { style: 'opacity: 0.7;background-image: radial-gradient(50% 150%, #F0EEE7 50%, #6F0838 100%);', describ: 'Miss 黑6代【防紫外线】' }, - { style: 'background-image: radial-gradient(50% 143%, #AEA8A8 45%, #370B4E 100%);', describ: 'Miss 黑7代【防紫外线】' }, - ], - chooseItem2: [ - { num: '14.0' }, - { num: '14.2' }, - { num: '14.4' }, - { num: '14.5' }, - ], - chooseItem3: [0, 100, 125, 150, 175, 200, 225, 250, 275, 300, 325, 350, 375, 400, 425, 450, 470, 500, 525, 550, 575, 600, 1000], // 度数相关数据 pickerInfoList: [ { nameC: '度数', nameE: '(SPH)', nameArray1: [''], nameIndex1: 0, nameArray2: [''], nameIndex2: 0, key: 0 }, @@ -424,7 +311,7 @@ import store from '@/store' }, computed: { loveList() { - console.log('**********loveList',this.$store.state.myLoveList.loveList) + // console.log('**********loveList',this.$store.state.myLoveList.loveList) return this.$store.state.myLoveList.loveList || [] }, attrList() { @@ -445,9 +332,6 @@ import store from '@/store' created() { const pid = this.pid console.log('this.goodInfo',this.goodInfo) - store.dispatch('read/fetch', { - pid, - }).then(() => { 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;