|
@@ -15,6 +15,7 @@
|
|
|
<view class="store-image flex flex_column justify_center align_center">
|
|
|
<u-image :src="pageInfo.receiveAddressVO.headerImageList? pageInfo.receiveAddressVO.headerImageList[0]:'/static/index/def_home_shop.png'" width="172" height="172" ></u-image>
|
|
|
<text v-if="pageInfo.userId">骑手张三的店铺</text>
|
|
|
+ <text v-else>{{mobile}}</text>
|
|
|
</view>
|
|
|
<!-- 表单 -->
|
|
|
<view class="list-container">
|
|
@@ -31,6 +32,7 @@
|
|
|
<view class="list-item-left">
|
|
|
<text>通信地址</text>
|
|
|
</view>
|
|
|
+ <!-- {{form.receiveAddress.receiveAreasName}} -->
|
|
|
<view class="list-item-right flex_1">
|
|
|
<u-input class="flex_1" :custom-style="inputClass" v-model="form.receiveAddress.receiveAreasName" @click="selectAddress" :disabled="true" placeholder="请选择通信地址" placeholder-style="color:'#bbb';font-size:18px"/>
|
|
|
<u-icon class="back-img" name="arrow-right" color="#9DA8B5" @click="selectAddress"></u-icon>
|
|
@@ -173,12 +175,21 @@
|
|
|
if(this.hasLogin){
|
|
|
this.pageInit()
|
|
|
}else{
|
|
|
- uni.navigateTo({
|
|
|
- url:'/pages/login/login'
|
|
|
- })
|
|
|
+ this.loginModal()
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ computed: {
|
|
|
+ // user() {
|
|
|
+ // return this.userData
|
|
|
+ // },
|
|
|
+ // name(){
|
|
|
+ // return this.$store.state.vuex_userInfoData.contactName
|
|
|
+ // },
|
|
|
+ mobile(){
|
|
|
+ return this.$store.state.vuex_userInfoData.contactMobile
|
|
|
+ }
|
|
|
+ },
|
|
|
methods:{
|
|
|
pageInit() {
|
|
|
this.geRubbishTypeList()
|
|
@@ -187,16 +198,18 @@
|
|
|
},
|
|
|
// 返回
|
|
|
onClickBack(){
|
|
|
- uni.navigateBack({
|
|
|
-
|
|
|
+ uni.switchTab({
|
|
|
+ url:'/pages/index/index'
|
|
|
})
|
|
|
},
|
|
|
// 选择通信地址
|
|
|
selectAddress(){
|
|
|
+ console.log(this.form.receiveAddress.receiveAreasName,'==========')
|
|
|
wx.chooseLocation({
|
|
|
success:(res)=>{
|
|
|
if(res){
|
|
|
- this.getArea(res.address)
|
|
|
+ console.log(res,res.address,'----------------------')
|
|
|
+ // this.getArea(res.address)
|
|
|
// this.form.contactAddress=res.address
|
|
|
this.form.receiveAddress.lat=res.latitude
|
|
|
this.form.receiveAddress.lng=res.longitude
|
|
@@ -210,6 +223,7 @@
|
|
|
getSaomaInfo(){
|
|
|
saomaOrder().then(res=>{
|
|
|
if(res.status==200){
|
|
|
+ // this.form=Object.assign(this.form,res.data)
|
|
|
this.pageInfo=res.data
|
|
|
this.form.mobile=res.data.mobile
|
|
|
this.form.receiveAddress.provinceName=res.data.receiveAddressVO?res.data.receiveAddressVO.provinceName:''
|
|
@@ -348,8 +362,7 @@
|
|
|
})
|
|
|
return false
|
|
|
}
|
|
|
- const params=Object.assign(this.form)
|
|
|
- userInfoSave(params).then(res=>{
|
|
|
+ userInfoSave(this.form).then(res=>{
|
|
|
if(res.status==200){
|
|
|
// uni.$emit('pageType', {data: 'userInfo' })
|
|
|
setTimeout(()=>{
|
|
@@ -368,7 +381,7 @@
|
|
|
success: (res)=> {
|
|
|
if (res.confirm) {
|
|
|
uni.navigateTo({
|
|
|
- url: '/pages/login/login'
|
|
|
+ url: '/pages/login/login?pageType=order'
|
|
|
})
|
|
|
} else if (res.cancel) {
|
|
|
console.log('用户点击取消');
|