适配物流助手
4 mainītis faili ar 17 papildinājumiem un 10 dzēšanām
+ 0
- 5
src/app.js
@@ -59,11 +59,6 @@ App({
|
||
| 59 | 59 |
console.log('get share params', err)
|
| 60 | 60 |
}) |
| 61 | 61 |
} |
| 62 |
- |
|
| 63 |
- network.liveLogin({
|
|
| 64 |
- share_openid: 'test', |
|
| 65 |
- room_id: 1 |
|
| 66 |
- }) |
|
| 67 | 62 |
this._warrantyCardCallBack(options.referrerInfo) |
| 68 | 63 |
}, |
| 69 | 64 |
|
+ 15
- 3
src/pages/live/order/order.js
@@ -20,13 +20,22 @@ app.routerInterceptor.checkLoginStatus({
|
||
| 20 | 20 |
const that = this |
| 21 | 21 |
const { userInfo } = app.globalData
|
| 22 | 22 |
this.getGoods(options) |
| 23 |
+ console.log(app) |
|
| 23 | 24 |
|
| 24 | 25 |
if (userInfo.consignee_name !== '' && userInfo.consignee_name !== null) {
|
| 25 | 26 |
that.setData({
|
| 26 | 27 |
address: {
|
| 27 | 28 |
userName: userInfo.consignee_name, |
| 28 | 29 |
telNumber: userInfo.consignee_phone, |
| 29 |
- detailInfo: userInfo.consignee_address |
|
| 30 |
+ provinceName: userInfo.consignee_province, |
|
| 31 |
+ cityName: userInfo.consignee_city, |
|
| 32 |
+ countyName: userInfo.consignee_county, |
|
| 33 |
+ detailInfo: userInfo.consignee_address, |
|
| 34 |
+ combination: |
|
| 35 |
+ userInfo.consignee_province + |
|
| 36 |
+ userInfo.consignee_city + |
|
| 37 |
+ userInfo.consignee_county + |
|
| 38 |
+ userInfo.consignee_address |
|
| 30 | 39 |
}, |
| 31 | 40 |
hasAddress: true |
| 32 | 41 |
}) |
@@ -73,7 +82,7 @@ app.routerInterceptor.checkLoginStatus({
|
||
| 73 | 82 |
const that = this |
| 74 | 83 |
wx.chooseAddress({
|
| 75 | 84 |
success: res => {
|
| 76 |
- res.detailInfo = |
|
| 85 |
+ res.combination = |
|
| 77 | 86 |
res.provinceName + res.cityName + res.countyName + res.detailInfo |
| 78 | 87 |
that.setData({
|
| 79 | 88 |
address: res, |
@@ -96,7 +105,10 @@ app.routerInterceptor.checkLoginStatus({
|
||
| 96 | 105 |
amount: this.data.amount, |
| 97 | 106 |
name: this.data.address.userName || '', |
| 98 | 107 |
phone: this.data.address.telNumber || '', |
| 99 |
- address: this.data.address.detailInfo || '', |
|
| 108 |
+ province: this.data.address.provinceName, |
|
| 109 |
+ city: this.data.address.cityName, |
|
| 110 |
+ county: this.data.address.countyName, |
|
| 111 |
+ address: this.data.address.detailInfo, |
|
| 100 | 112 |
body: '尖货接龙' |
| 101 | 113 |
}, |
| 102 | 114 |
success(res1) {
|
+ 1
- 1
src/pages/live/order/order.wxml
@@ -13,7 +13,7 @@ |
||
| 13 | 13 |
<text class="name">{{ address.userName }}</text>
|
| 14 | 14 |
<text class="phone">{{ address.telNumber }}</text>
|
| 15 | 15 |
</view> |
| 16 |
- <view class="bottom">{{ address.detailInfo }}</view>
|
|
| 16 |
+ <view class="bottom">{{ address.combination }}</view>
|
|
| 17 | 17 |
</view> |
| 18 | 18 |
<view class="right"> |
| 19 | 19 |
<view class="icon arrow"></view> |
+ 1
- 1
src/project.config.json
@@ -60,7 +60,7 @@ |
||
| 60 | 60 |
"id": 0, |
| 61 | 61 |
"name": "pages/live/order/order", |
| 62 | 62 |
"pathName": "pages/live/order/order", |
| 63 |
- "query": "room_id=24&share_openid='ccc'&goods_id=nHUqwuwaygHpos4hiekz7f", |
|
| 63 |
+ "query": "room_id=17&share_openid='ccc'&goods_id=fRyLQwQiejcPC4UURRRK67", |
|
| 64 | 64 |
"scene": 1007 |
| 65 | 65 |
}, |
| 66 | 66 |
{
|