Browse Source
Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/ec.uniapp-master
Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/ec.uniapp-master
# Conflicts: # pages.jsonmaster
12 changed files with 1620 additions and 1045 deletions
-
6App.vue
-
14components/lf-adModal/lf-adModal.vue
-
4main.js
-
1024pages.json
-
2pages/address/add/add.less
-
42pages/address/add/add.vue
-
73pages/address/list/list.less
-
226pages/address/list/list.vue
-
1000pages/index/category/category.vue
-
39pages/index/index/index.vue
-
48pages/index/openScreenAd/openScreenAd.vue
-
187pages/user/register/register.vue
1024
pages.json
File diff suppressed because it is too large
View File
File diff suppressed because it is too large
View File
@ -0,0 +1,73 @@ |
|||||
|
#address-list{ |
||||
|
.list-box{ |
||||
|
// padding-bottom: 20px; |
||||
|
padding: 30rpx 32rpx; |
||||
|
width: 750rpx; |
||||
|
height: max-content; |
||||
|
box-sizing: border-box; |
||||
|
.list-item{ |
||||
|
font-size:14px; |
||||
|
background:#FFFFFF; |
||||
|
// padding:15px 40px 15px 15px; |
||||
|
// background-image:url("https://uto.ibrand.cc/m/static/img/ic_forward.png"); |
||||
|
// background-repeat:no-repeat; |
||||
|
// background-position:100%; |
||||
|
// background-size:20px; |
||||
|
width: 686rpx; |
||||
|
height: max-content; |
||||
|
background: #FFFFFF; |
||||
|
border-radius: 20rpx; |
||||
|
padding: 30rpx; |
||||
|
box-sizing: border-box; |
||||
|
margin-bottom: 30rpx; |
||||
|
|
||||
|
.user{ |
||||
|
display: flex; |
||||
|
align-items: center; |
||||
|
justify-content: space-between; |
||||
|
|
||||
|
.name{ |
||||
|
.phone{ |
||||
|
margin-left: 10px; |
||||
|
} |
||||
|
} |
||||
|
.default{ |
||||
|
color: #099fff; |
||||
|
} |
||||
|
} |
||||
|
.address{ |
||||
|
display: flex; |
||||
|
-webkit-box-pack: justify; |
||||
|
justify-content: space-between; |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
} |
||||
|
.add-address{ |
||||
|
display: flex; |
||||
|
justify-content: center; |
||||
|
// background-color: #ffffff; |
||||
|
padding:10px 12px; |
||||
|
position: fixed; |
||||
|
bottom: 130rpx; |
||||
|
left: calc(50% - 281rpx); |
||||
|
.small-btn{ |
||||
|
display: flex; |
||||
|
align-items: center; |
||||
|
justify-content:center; |
||||
|
// background-color:#FB5054; |
||||
|
color: #FFFFFF; |
||||
|
// border-radius:4px; |
||||
|
// height: 40px; |
||||
|
line-height: 40rpx; |
||||
|
width: 550rpx; |
||||
|
height: 100rpx; |
||||
|
background: #15716E; |
||||
|
border-radius: 50rpx; |
||||
|
.icon{ |
||||
|
margin-right: 15px; |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,226 @@ |
|||||
|
<template> |
||||
|
<view id="address-list"> |
||||
|
<lf-nav title="地址管理" :showIcon="true" bgColor="#fff"></lf-nav> |
||||
|
<view class="list-box"> |
||||
|
<view class="list-item" :data-info="JSON.stringify(item)" :data-id="item.id" v-for="(item, index) in list" :key="index"> |
||||
|
<!-- <view class="user"> |
||||
|
<view class="name"> |
||||
|
<text>{{item.accept_name}}</text> |
||||
|
<text class="phone">{{item.mobile}}</text> |
||||
|
</view> |
||||
|
<view class="default" v-if="item.is_default"> |
||||
|
默认 |
||||
|
</view> |
||||
|
</view> |
||||
|
<view class="address">{{item.address_name}} {{item.address}}</view> --> |
||||
|
|
||||
|
<view class="lf-font-28 user-item"> |
||||
|
<text class="lf-color-black lf-font-bold">{{item.accept_name}}</text> |
||||
|
<text class="lf-color-777 lf-m-l-20">{{item.mobile}}</text> |
||||
|
</view> |
||||
|
<view class="address-item lf-line-2"> |
||||
|
<text>{{item.address_name}}</text> |
||||
|
<text>{{item.address}}</text> |
||||
|
</view> |
||||
|
<view class="menu-item lf-row-between lf-m-t-30"> |
||||
|
<view class="lf-row-center"> |
||||
|
<radio-group @change="radioChange"> |
||||
|
<radio :checked="item.is_default" :value="index"></radio> |
||||
|
</radio-group> |
||||
|
<text class="lf-m-l-15 lf-font-24 lf-color-777">默认地址</text> |
||||
|
</view> |
||||
|
<view class="lf-row-between"> |
||||
|
<view @tap="setInfo(item)"> |
||||
|
<text class="lf-iconfont icon--1"></text> |
||||
|
<text class="lf-m-l-10">编辑</text> |
||||
|
</view> |
||||
|
<view class="lf-m-l-50" @click="deleteAddress(item)"> |
||||
|
<text class="lf-iconfont icon--1"></text> |
||||
|
<text class="lf-m-l-10">删除</text> |
||||
|
</view> |
||||
|
</view> |
||||
|
</view> |
||||
|
</view> |
||||
|
</view> |
||||
|
<view style="height: 230rpx;"></view> |
||||
|
<view class="add-address" @tap="add"> |
||||
|
<view class="small-btn"> |
||||
|
<text class="lf-iconfont icon--2"></text> |
||||
|
<text class="lf-m-l-10">新增收货地址</text> |
||||
|
</view> |
||||
|
</view> |
||||
|
</view> |
||||
|
|
||||
|
</template> |
||||
|
<script> |
||||
|
import {pageLogin, getUrl,config,is} from '@/common/js/utils.js'; |
||||
|
|
||||
|
export default { |
||||
|
data() { |
||||
|
return { |
||||
|
list: [], |
||||
|
order_no: '', |
||||
|
url: '', |
||||
|
id:'' |
||||
|
}; |
||||
|
}, |
||||
|
|
||||
|
onShow() { |
||||
|
this.queryAddressList(); // let app =getApp(); 暂时注释 |
||||
|
|
||||
|
// app.isBirthday().then(()=>{ |
||||
|
// if(this.$cookieStorage.get("birthday_gift")){ |
||||
|
// var giftData=this.$cookieStorage.get("birthday_gift").data; |
||||
|
// new app.ToastPannel().__page.showText(giftData); |
||||
|
// } |
||||
|
// }); |
||||
|
}, |
||||
|
|
||||
|
onLoad(e) { |
||||
|
// 暂时注释 |
||||
|
// pageLogin(getUrl()); |
||||
|
this.setData({ |
||||
|
order_no: e.order_no, |
||||
|
url: e.url |
||||
|
}); |
||||
|
}, |
||||
|
|
||||
|
components: {}, |
||||
|
props: {}, |
||||
|
methods: { |
||||
|
// 删除收货地址 |
||||
|
deleteAddress(item){ |
||||
|
console.log("item", item) |
||||
|
this.$http.ajax({ |
||||
|
api: '/api/address/'+ item.id, |
||||
|
method: 'DELETE', |
||||
|
header: { |
||||
|
Authorization: this.getToken() |
||||
|
} |
||||
|
}).then(res => { |
||||
|
console.log("删除地址", res); |
||||
|
}) |
||||
|
}, |
||||
|
// 切换默认地址 |
||||
|
radioChange(e){ |
||||
|
let current = e.target.value; |
||||
|
this.list.forEach((item, index) => { |
||||
|
if(current == index){ |
||||
|
item.is_default = 1; |
||||
|
}else{ |
||||
|
item.is_default = 0; |
||||
|
} |
||||
|
}) |
||||
|
}, |
||||
|
setInfo(e) { |
||||
|
// var from = e.currentTarget.dataset.info; |
||||
|
var from = e; |
||||
|
var data = this.$cookieStorage.get('order_form'); |
||||
|
// var from=JSON.parse(from); |
||||
|
|
||||
|
if (!data) { |
||||
|
return this.view(from.id); |
||||
|
} |
||||
|
|
||||
|
var order_no = this.order_no; |
||||
|
|
||||
|
if (order_no && data.order_no === order_no) { |
||||
|
data.address = from; |
||||
|
this.$cookieStorage.set('order_form', data); |
||||
|
wx.navigateBack({ |
||||
|
url: '/' + this.url |
||||
|
}); |
||||
|
} else { |
||||
|
return this.view(from.id); |
||||
|
} |
||||
|
}, |
||||
|
|
||||
|
view(id) { |
||||
|
wx.navigateTo({ |
||||
|
url: '/pages/address/add/add?id=' + id |
||||
|
}); |
||||
|
}, |
||||
|
|
||||
|
add() { |
||||
|
wx.navigateTo({ |
||||
|
url: '/pages/address/add/add' |
||||
|
}); |
||||
|
}, |
||||
|
|
||||
|
// 查询收货地址列表 |
||||
|
queryAddressList() { |
||||
|
var token = this.$cookieStorage.get('user_token'); |
||||
|
this.$http.get({ |
||||
|
api: 'api/address', |
||||
|
header: { |
||||
|
Authorization: token || this.getToken() |
||||
|
} |
||||
|
}).then(res => { |
||||
|
if (res.statusCode == 200) { |
||||
|
res = res.data; |
||||
|
|
||||
|
if (res.status) { |
||||
|
this.setData({ |
||||
|
list: res.data |
||||
|
}); |
||||
|
} else { |
||||
|
wx.showToast({ |
||||
|
title: res.message, |
||||
|
image: '../../../static/error.png' |
||||
|
}); |
||||
|
} |
||||
|
} else { |
||||
|
wx.showToast({ |
||||
|
title: '获取信息失败', |
||||
|
image: '../../../static/error.png' |
||||
|
}); |
||||
|
} |
||||
|
}); |
||||
|
}, |
||||
|
|
||||
|
setData: function (obj) { |
||||
|
let that = this; |
||||
|
let keys = []; |
||||
|
let val, data; |
||||
|
Object.keys(obj).forEach(function (key) { |
||||
|
keys = key.split('.'); |
||||
|
val = obj[key]; |
||||
|
data = that.$data; |
||||
|
keys.forEach(function (key2, index) { |
||||
|
if (index + 1 == keys.length) { |
||||
|
that.$set(data, key2, val); |
||||
|
} else { |
||||
|
if (!data[key2]) { |
||||
|
that.$set(data, key2, {}); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
data = data[key2]; |
||||
|
}); |
||||
|
}); |
||||
|
} |
||||
|
}, |
||||
|
computed: {}, |
||||
|
watch: {} |
||||
|
}; |
||||
|
</script> |
||||
|
|
||||
|
<style> |
||||
|
page{ |
||||
|
background-color: #F8F8F8; |
||||
|
} |
||||
|
</style> |
||||
|
<style rel="stylesheet/less" lang="less"> |
||||
|
@import "list"; |
||||
|
|
||||
|
.user-item, .menu-item{ |
||||
|
height: 50rpx; |
||||
|
width: 100%; |
||||
|
} |
||||
|
.address-item{ |
||||
|
width: 100%; |
||||
|
margin-top: 10rpx; |
||||
|
font-size: 28rpx; |
||||
|
color: #333333; |
||||
|
} |
||||
|
</style> |
||||
1000
pages/index/category/category.vue
File diff suppressed because it is too large
View File
File diff suppressed because it is too large
View File
Write
Preview
Loading…
Cancel
Save
Reference in new issue