Commit 0ed0adce by LJM

bug

parent 6cfd2826
Showing with 26 additions and 9 deletions
<template>
<view class="page-userAddress">
<navElement title="地址管理"></navElement>
<template v-if="from">
<navElement title="选择收货地址"></navElement>
</template>
<template v-else>
<navElement title="地址管理"></navElement>
</template>
<view class="tip row verCenter" style="margin-bottom: 16rpx;margin-top: 0;">
<text class="iconfont icon-ts"></text>
<text class="t1">已创建</text>
......@@ -17,17 +22,25 @@
</view>
<view class="p2">{{ item.province_val }}{{ item.city_val }}{{ item.district_val }}{{ item.detail_address }}</view>
<view class="operate row bothSide verCenter">
<template v-if="item.is_default == 1">
<view class="row verCenter default-curr">
<template v-if="from">
<view class="row verCenter">
<view class="default"></view>
<text class="default-text">默认地址</text>
<text class="default-text">选择</text>
</view>
</template>
<template v-else>
<view class="row verCenter" @click="setdefault(item.address_id)">
<view class="default"></view>
<text class="default-text">设为默认</text>
</view>
<template v-if="item.is_default == 1">
<view class="row verCenter default-curr">
<view class="default"></view>
<text class="default-text">默认地址</text>
</view>
</template>
<template v-else>
<view class="row verCenter" @click="setdefault(item.address_id)">
<view class="default"></view>
<text class="default-text">设为默认</text>
</view>
</template>
</template>
<view class="row verCenter">
<navigator class="edit row verCenter" :url="'/user/userAddressEdit?address_id=' + item.address_id" hover-class="none">
......@@ -65,9 +78,13 @@ export default {
},
data() {
return {
from: '',
list: []
};
},
onLoad(options) {
this.from = options.from || '';
},
onShow() {
this.getData();
},
......
......@@ -310,7 +310,7 @@ const router = new Router({
//全局路由前置守卫
router.beforeEach((to, from, next) => {
if (to.meta.auth) {
if (to.meta && to.meta.auth) {
if (!getCookie('Yo4teW_uid') || getCookie('Yo4teW_uid') == 0) {
uni.navigateTo({
url: '/login?referer=' + to.aliasPath
......
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 sign in to comment