diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index c6b5ad4..0befa43 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -620,6 +620,7 @@ Page({ ee.setData({ data: t.data.data, sele_g: t.data.data, + userInfo:getApp().globalData.userInfo }); //获取门店 diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index 0130c2d..85793b3 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -733,10 +733,15 @@ - + + + + + + diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss index 70b40d8..b91940a 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxss +++ b/pages/goods/goodsInfo/goodsInfo.wxss @@ -2560,4 +2560,9 @@ border-radius: 55rpx; .carde_frame{ height: 50rpx; line-height: 18rpx +} + +button.custom-service { line-height: normal; border: 0;} +button.custom-service::after{ + border: 0; } \ No newline at end of file diff --git a/pages/user/address_list/address_list.js b/pages/user/address_list/address_list.js index ce198f7..ad0b36a 100644 --- a/pages/user/address_list/address_list.js +++ b/pages/user/address_list/address_list.js @@ -154,5 +154,59 @@ Page({ - } + } , + + //获取微信地址 + get_wx:function(){ + var th=this; + wx.getSetting({ + success(res) { + console.log("vres.authSetting['scope.address']:", res.authSetting['scope.address']) + if (res.authSetting['scope.address']) { + wx.chooseAddress({ + success(res) { + th.save_wx_addr(res); + } + }) + + } else { + if (res.authSetting['scope.address'] == false) { + console.log("222") + wx.openSetting({ + success(res) {} + }) + } else { + + wx.chooseAddress({ + success(res) { + th.save_wx_addr(res); + } + }) + } + } + } + }) + }, + + save_wx_addr:function (res) { + var pd={},th=this; + pd.store_id=os.stoid; + pd.user_id=getApp().globalData.user_id; + pd.userName=res.userName; + pd.provinceName=res.provinceName; + pd.countryName=res.countyName; + pd.cityName=res.cityName; + pd.detailInfo=res.detailInfo; + pd.postalCode=res.postalCode; + pd.telNumber=res.telNumber; + getApp().request.promisePost("/api/weshop/useraddress/saveWx",{data:pd}).then(res=>{ + if(res.data.code==0){ + getApp().my_warnning("保存成功",1,th); + setTimeout(function () { + th.onShow(); + },1000) + } + }) + + } }); \ No newline at end of file diff --git a/pages/user/address_list/address_list.wxml b/pages/user/address_list/address_list.wxml index 26def32..4db2918 100644 --- a/pages/user/address_list/address_list.wxml +++ b/pages/user/address_list/address_list.wxml @@ -69,12 +69,17 @@ - - - - + - 新建收货地址 - - + + + + + + 获取微信地址 + + + + + + 新建收货地址 + + \ No newline at end of file diff --git a/pages/user/address_list/address_list.wxss b/pages/user/address_list/address_list.wxss index d6a4958..d20eeaa 100644 --- a/pages/user/address_list/address_list.wxss +++ b/pages/user/address_list/address_list.wxss @@ -213,14 +213,14 @@ page { } .container .new { - width: 100%; + width: 86%; display: flex; - justify-content: center; position: fixed; bottom: 0rpx; height: 204rpx; align-items: center; background-color: rgb(255, 255, 255); + margin-left:7% } .container .new .add { @@ -229,7 +229,7 @@ page { .container navigator { display: flex; - width: 430rpx; + width: 300rpx; height: 62rpx; background-color: rgb(239, 22, 51); border-radius: 40rpx; @@ -238,3 +238,10 @@ page { color: rgb(255, 255, 255); font-size: 27rpx; } + +.container navigator.ye{ + background-color: #fc872d; +} +.nothing .address navigator.ye{ + background-color: #fc872d; +}