Merge branch 'master' of http://git.luyuan.tk/pplokijuhyg/deguodaigou into pplok
This commit is contained in:
commit
68a7aea72c
@ -21,6 +21,9 @@
|
||||
color: #999999;
|
||||
font-size: 28rpx;
|
||||
}
|
||||
.shurupla1{
|
||||
color: #333333;
|
||||
}
|
||||
.arrow {
|
||||
width: 14rpx;
|
||||
height: 25rpx;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<view class="shuru">
|
||||
<view class="left">{{left}}</view>
|
||||
<view class="right"wx:if="{{ifarrow}}" bindtap="choose">
|
||||
<text class="shurupla">{{right}}</text>
|
||||
<text class="shurupla1">{{right}}</text>
|
||||
<view class="arrow"></view>
|
||||
</view>
|
||||
<view class="right" wx:else>
|
||||
|
||||
@ -1,37 +1 @@
|
||||
.shuru {
|
||||
width: 670rpx;
|
||||
height: 100rpx;
|
||||
border-bottom: 2rpx solid #E8E8E8;
|
||||
margin: 0 auto;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
line-height: 100rpx;
|
||||
font-size: 28rpx;
|
||||
}
|
||||
|
||||
.shuru .left {
|
||||
color: #333333;
|
||||
}
|
||||
|
||||
.shuru .right {
|
||||
margin: auto 0;
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.shuru .right .shuru1 {
|
||||
width: 280rpx;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.shuru .right .shurupla {
|
||||
color: #999999;
|
||||
font-size: 28rpx;
|
||||
}
|
||||
|
||||
.shuru .right .arrow {
|
||||
width: 14rpx;
|
||||
height: 25rpx;
|
||||
background-color: #999999;
|
||||
margin: auto 0;
|
||||
margin-left: 27rpx;
|
||||
}
|
||||
.shuru{width:670rpx;height:100rpx;border-bottom:2rpx solid #E8E8E8;margin:0 auto;display:flex;justify-content:space-between;line-height:100rpx;font-size:28rpx}.shuru .left{color:#333333}.shuru .right{margin:auto 0;display:flex}.shuru .right .shuru1{width:280rpx;text-align:right}.shuru .right .shurupla{color:#999999;font-size:28rpx}.shuru .right .shurupla1{color:#333333}.shuru .right .arrow{width:14rpx;height:25rpx;background-color:#999999;margin:auto 0;margin-left:27rpx}
|
||||
|
||||
@ -10,8 +10,17 @@ Page({
|
||||
no: 0,
|
||||
userid:"",
|
||||
show: false,
|
||||
arealist:[],
|
||||
area:["请选择","请选择","请选择"]
|
||||
arealist1:[],
|
||||
arealist2:[],
|
||||
arealist3:[],
|
||||
area:["请选择","请选择","请选择"],
|
||||
tagDis:[false,true,true],
|
||||
active:0,
|
||||
addressCity:"请选择 请选择 请选择",
|
||||
countrys:[],
|
||||
countryid:44,
|
||||
nowcountry:"中国",
|
||||
areaid:[]
|
||||
},
|
||||
|
||||
/**
|
||||
@ -23,17 +32,37 @@ Page({
|
||||
urldata:{
|
||||
parent_id:0
|
||||
},
|
||||
|
||||
}).then((res)=>{
|
||||
console.log(res)
|
||||
// console.log(res)
|
||||
this.setData({
|
||||
arealist:res.data.result
|
||||
arealist1:res.data.result
|
||||
})
|
||||
console.log(this.data.arealist)
|
||||
})
|
||||
|
||||
request({
|
||||
url: "User/getCountry",
|
||||
}).then((res)=>{
|
||||
let country=[]
|
||||
console.log(res,10000)
|
||||
for(let i=0;i<res.data.result.length;i++){
|
||||
country[i]=res.data.result[i].name
|
||||
}
|
||||
this.setData({
|
||||
countrys:country
|
||||
})
|
||||
})
|
||||
|
||||
},
|
||||
bindPickerChange(e) {
|
||||
console.log(e)
|
||||
console.log(e.detail.value)
|
||||
let nowcountry=this.data.countrys[e.detail.value]
|
||||
this.setData({
|
||||
countryid:e.detail.value+1,
|
||||
nowcountry:nowcountry
|
||||
})
|
||||
console.log(nowcountry,"zxc")
|
||||
},
|
||||
showPopup() {
|
||||
this.setData({ show: true });
|
||||
@ -43,7 +72,7 @@ Page({
|
||||
this.setData({ show: false });
|
||||
},
|
||||
onMyEvent(e) {
|
||||
console.log(e)
|
||||
// console.log(e)
|
||||
for (let i = 0; i < 8; i++) {
|
||||
if (i == e.currentTarget.dataset.no) {
|
||||
this.data.canshu[i] = e.detail
|
||||
@ -51,10 +80,10 @@ Page({
|
||||
|
||||
}
|
||||
|
||||
console.log(this.data.canshu)
|
||||
// console.log(this.data.canshu)
|
||||
},
|
||||
choose(e){
|
||||
console.log(e.currentTarget.dataset.id,e.currentTarget.dataset.name,e.currentTarget.dataset)
|
||||
choose1(e){
|
||||
// console.log(e.currentTarget.dataset.id,e.currentTarget.dataset.name,e.currentTarget.dataset)
|
||||
let type=parseInt(e.currentTarget.dataset.type)
|
||||
request({
|
||||
url: "User/getArea",
|
||||
@ -62,30 +91,112 @@ Page({
|
||||
parent_id:e.currentTarget.dataset.id
|
||||
},
|
||||
}).then((res)=>{
|
||||
console.log(res)
|
||||
if(res.data.result.length){
|
||||
// console.log(res)
|
||||
this.setData({
|
||||
arealist1:res.data.result
|
||||
arealist2:res.data.result,
|
||||
active:1
|
||||
})
|
||||
// this.data.area[type]=e.currentTarget.dataset.name
|
||||
|
||||
console.log(this.data.area,123)
|
||||
|
||||
}
|
||||
this.setData({
|
||||
tagDis:[false,false,true]
|
||||
})
|
||||
// console.log(this.data.area,123)
|
||||
this.data.area[0]=e.currentTarget.dataset.name
|
||||
this.data.areaid[0]=e.currentTarget.dataset.id
|
||||
// for(let i in this.data.area){
|
||||
// if(i==type){
|
||||
// this.data.area[i]=e.currentTarget.dataset.name
|
||||
// }
|
||||
// }
|
||||
this.data.area[0]=e.currentTarget.dataset.name
|
||||
this.setData({
|
||||
area:this.data.area
|
||||
})
|
||||
|
||||
console.log(this.data.area,this.data.arealist)
|
||||
// console.log(this.data.area,this.data.arealist)
|
||||
})
|
||||
},
|
||||
choose2(e){
|
||||
// console.log(e.currentTarget.dataset.id,e.currentTarget.dataset.name,e.currentTarget.dataset)
|
||||
let type=parseInt(e.currentTarget.dataset.type)
|
||||
request({
|
||||
url: "User/getArea",
|
||||
urldata:{
|
||||
parent_id:e.currentTarget.dataset.id
|
||||
},
|
||||
}).then((res)=>{
|
||||
|
||||
this.setData({
|
||||
arealist3:res.data.result,
|
||||
active:2,
|
||||
tagDis:[false,false,false]
|
||||
})
|
||||
|
||||
// this.data.area[type]=e.currentTarget.dataset.name
|
||||
|
||||
// console.log(this.data.area,123)
|
||||
|
||||
this.data.area[1]=e.currentTarget.dataset.name
|
||||
this.data.areaid[1]=e.currentTarget.dataset.id
|
||||
// for(let i in this.data.area){
|
||||
// if(i==type){
|
||||
// this.data.area[i]=e.currentTarget.dataset.name
|
||||
// }
|
||||
// }
|
||||
|
||||
this.setData({
|
||||
area:this.data.area
|
||||
})
|
||||
|
||||
// console.log(this.data.area,this.data.arealist)
|
||||
console.log(this.data.arealist3+"001",this.data.active+"002",this.data.tagDis+"003")
|
||||
})
|
||||
|
||||
|
||||
},
|
||||
choose3(e){
|
||||
// console.log(e.currentTarget.dataset.id,e.currentTarget.dataset.name,e.currentTarget.dataset)
|
||||
let type=parseInt(e.currentTarget.dataset.type)
|
||||
request({
|
||||
url: "User/getArea",
|
||||
urldata:{
|
||||
parent_id:e.currentTarget.dataset.id
|
||||
},
|
||||
}).then((res)=>{
|
||||
// console.log(res)
|
||||
this.setData({
|
||||
arealist1:res.data.result,
|
||||
tagDis:[false,false,false],
|
||||
active:1
|
||||
})
|
||||
// this.data.area[type]=e.currentTarget.dataset.name
|
||||
|
||||
// console.log(this.data.area,123)
|
||||
|
||||
this.data.area[2]=e.currentTarget.dataset.name
|
||||
this.data.areaid[2]=e.currentTarget.dataset.id
|
||||
// for(let i in this.data.area){
|
||||
// if(i==type){
|
||||
// this.data.area[i]=e.currentTarget.dataset.name
|
||||
// }
|
||||
// }}
|
||||
console.log(93)
|
||||
this.setData({
|
||||
area:this.data.area,
|
||||
show: false,
|
||||
addressCity:this.data.area[0]+this.data.area[1]+this.data.area[2]
|
||||
})
|
||||
console.log(this.data.active,94)
|
||||
// console.log(this.data.area,this.data.arealist)
|
||||
})
|
||||
},
|
||||
save() {
|
||||
// wx.navigateTo({
|
||||
// url: "/pages/chooseaddr/chooseaddr"
|
||||
// })
|
||||
console.log(this.data.canshu)
|
||||
console.log(this.data.countryid)
|
||||
console.log(this.data.area)
|
||||
console.log(this.data.areaid)
|
||||
request({
|
||||
url: "User/validateOpenid",
|
||||
}).then((res)=>{
|
||||
@ -100,17 +211,18 @@ Page({
|
||||
},
|
||||
method:"POST",
|
||||
data: {
|
||||
address: "Wesrdtfyguhijkl",
|
||||
city: "339",
|
||||
consignee: "srdtfyguhijokl",
|
||||
country: 1,
|
||||
district: "361",
|
||||
// address: this.data.canshu[4],
|
||||
city: this.data.areaid[1],
|
||||
consignee: this.data.canshu[0],
|
||||
country: this.data.countryid,
|
||||
address: this.data.canshu[4],
|
||||
is_default: 0,
|
||||
mobile: "19953879035",
|
||||
province: "338",
|
||||
twon: 0,
|
||||
user_id: "9",
|
||||
zipcode: "271103",
|
||||
mobile: this.data.canshu[1],
|
||||
province: this.data.areaid[0],
|
||||
twon: this.data.areaid[2],
|
||||
user_id:this.data.userid,
|
||||
zipcode: this.data.canshu[5],
|
||||
idcard: this.data.canshu[6],
|
||||
}
|
||||
}).then((res)=>{
|
||||
console.log(res)
|
||||
|
||||
@ -1,34 +1,34 @@
|
||||
<view class="addaddress">
|
||||
<shuru left="收件人" right="姓名需和身份证一致" bindmyevent="onMyEvent" data-no="0"></shuru>
|
||||
<shuru left="手机号" right="请填入常用的手机号码" bindmyevent="onMyEvent" data-no="1"></shuru>
|
||||
<picker bindchange="bindPickerChange" value="{{item.item_id?item.item_id:0}}" range="{{info.goods.goods_spec_list?info.goods.goods_spec_list:['默认规格']}}">
|
||||
<shuru left="国家" right="CN中国大陆" ifarrow="{{true}}" data-no="2"></shuru>
|
||||
<picker bindchange="bindPickerChange" value="{{index}}" range="{{countrys}}">
|
||||
<shuru left="国家" right="{{nowcountry}}" ifarrow="{{true}}" data-no="2"></shuru>
|
||||
</picker>
|
||||
<!-- <picker bindchange="bindPickerChange" value="{{item.item_id?item.item_id:0}}" range="{{info.goods.goods_spec_list?info.goods.goods_spec_list:['默认规格']}}">
|
||||
<shuru left="城市信息" right="北京市 北京市 东城区" ifarrow="{{true}}" data-no="3"></shuru>
|
||||
</picker> -->
|
||||
<view bindtap="showPopup">
|
||||
<shuru left="城市信息" right="北京市 北京市 东城区" ifarrow="{{true}}" data-no="3"></shuru>
|
||||
<shuru left="城市信息" right="{{addressCity}}" ifarrow="{{true}}" data-no="3"></shuru>
|
||||
</view>
|
||||
<van-popup show="{{ show }}" position="bottom" bind:close="onClose">
|
||||
<van-tabs class="tab" swipe-threshold="5">
|
||||
<van-tab title="{{area[0]}}">
|
||||
<van-popup show="{{ show }}" position="bottom" bind:close="onClose" >
|
||||
<van-tabs class="tab" swipe-threshold="5" active="{{active}}">
|
||||
<van-tab title="{{area[0]}}" disabled="{{tagDis[0]}}">
|
||||
<view class="choose">
|
||||
<view class="item" wx:for="{{arealist}}" bindtap="choose" data-type="0" data-id="{{item.id}}" data-name="{{item.name}}">
|
||||
<view class="item" wx:for="{{arealist1}}" bindtap="choose1" data-type="0" data-id="{{item.id}}" data-name="{{item.name}}">
|
||||
{{item.name}}
|
||||
</view>
|
||||
</view>
|
||||
</van-tab>
|
||||
<van-tab title="{{area[1]}}">
|
||||
<van-tab title="{{area[1]}}" disabled="{{tagDis[1]}}" bingtap="choose2">
|
||||
<view class="choose">
|
||||
<view class="item" wx:for="{{arealist1}}" data-type="1" data-id="{{item.id}}" data-name="{{item.name}}">
|
||||
<view class="item" wx:for="{{arealist2}}" bindtap="choose2" data-type="1" data-id="{{item.id}}" data-name="{{item.name}}">
|
||||
{{item.name}}
|
||||
</view>
|
||||
</view>
|
||||
</van-tab>
|
||||
<van-tab title="{{area[2]}}">
|
||||
<van-tab title="{{area[2]}}" disabled="{{tagDis[2]}}">
|
||||
<view class="choose">
|
||||
<view class="item" wx:for="{{arealist2}}" data-type="2" data-id="{{item.id}}" data-name="{{item.name}}">
|
||||
<view class="item" wx:for="{{arealist3}}" bindtap="choose3" data-type="2" data-id="{{item.id}}" data-name="{{item.name}}">
|
||||
{{item.name}}
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -46,38 +46,43 @@ Page({
|
||||
wx.showModal({
|
||||
title: '确认',
|
||||
content: '要删除这个地址吗？',
|
||||
success(){
|
||||
success(res){
|
||||
|
||||
|
||||
console.log(e.currentTarget.dataset.id)
|
||||
|
||||
request({
|
||||
url: "User/validateOpenid",
|
||||
}).then((res)=>{
|
||||
t.setData({
|
||||
userid:res.data.data.user_id
|
||||
})
|
||||
if (res.confirm) {
|
||||
console.log('用户点击确定')
|
||||
request({
|
||||
url: "User/del_address",
|
||||
urldata:{
|
||||
user_id:res.data.data.user_id,
|
||||
id:e.currentTarget.dataset.id
|
||||
},
|
||||
url: "User/validateOpenid",
|
||||
}).then((res)=>{
|
||||
console.log(res)
|
||||
t.setData({
|
||||
userid:res.data.data.user_id
|
||||
})
|
||||
request({
|
||||
url: "User/getAddressList",
|
||||
url: "User/del_address",
|
||||
urldata:{
|
||||
user_id:t.data.userid
|
||||
user_id:res.data.data.user_id,
|
||||
id:e.currentTarget.dataset.id
|
||||
},
|
||||
}).then((res)=>{
|
||||
console.log(res)
|
||||
t.setData({
|
||||
addresslist:res.data.result
|
||||
request({
|
||||
url: "User/getAddressList",
|
||||
urldata:{
|
||||
user_id:t.data.userid
|
||||
},
|
||||
}).then((res)=>{
|
||||
console.log(res)
|
||||
t.setData({
|
||||
addresslist:res.data.result
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
} else if (res.cancel) {
|
||||
console.log('用户点击取消')
|
||||
console.log("不能动啊")
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,4 +1,7 @@
|
||||
.chooseaddress {
|
||||
.box{
|
||||
height: 910rpx
|
||||
}
|
||||
.addr {
|
||||
margin-left: 30rpx;
|
||||
}
|
||||
|
||||
@ -1,7 +1,10 @@
|
||||
<view class="chooseaddress">
|
||||
<scroll-view class="box" scroll-y="{{true}}">
|
||||
<view class="addr" wx:for="{{addresslist}}">
|
||||
<address binddelete="delete" binddefault="setdefault"data-id="{{item.address_id}}" username="{{item.consignee}}" address="{{item.address}}" tel="{{item.mobile}}" youzheng="{{item.zipcode}}" isdefault="{{item.is_default}}"></address>
|
||||
</view>
|
||||
</scroll-view>
|
||||
|
||||
<!-- <view class="addr">
|
||||
<address></address>
|
||||
</view>
|
||||
|
||||
@ -1,9 +1 @@
|
||||
.chooseaddress .addr {
|
||||
margin-left: 30rpx;
|
||||
}
|
||||
|
||||
.chooseaddress .btn1 {
|
||||
position: fixed;
|
||||
bottom: 149rpx;
|
||||
left: 50rpx;
|
||||
}
|
||||
.chooseaddress .box{height:910rpx}.chooseaddress .addr{margin-left:30rpx}.chooseaddress .btn1{position:fixed;bottom:149rpx;left:50rpx}
|
||||
|
||||
@ -1,5 +1,8 @@
|
||||
// pages/undetermined/undetermined.js
|
||||
<<<<<<< HEAD
|
||||
import bin from "../../utils/bin"
|
||||
=======
|
||||
>>>>>>> 260785c6fe0a4997462040f4f8890f1da9a0deb6
|
||||
Page({
|
||||
|
||||
/**
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user