Commit 5bc36eea authored by lujinlei's avatar lujinlei

-a

parent bad9828c
......@@ -7,6 +7,7 @@ App({
cloud,
cloudName: "filaStar", //待修改
cloudName2:"filaStar",
cloudName3:"filaStar2",
onLaunch(options) {
// 第一次打开
// options.query == {number:1}///"enableSkia": "true"
......
......@@ -108,6 +108,7 @@ Page({
})
if (userAddress) { //格式需要修改具体
const { name, phone, provinceName ,receiveName,cityName,countyName,streetName,detailInfo,cityCode,address} = userAddress.duibaAddress
my.confirm({
title: '提示',
content: '确认使用该收货地址:' + name + phone + address,
......@@ -117,12 +118,11 @@ Page({
const { confirm } = result
if (confirm) {
//发接口提交地址
const { cloud, activityId, cloudName } = app
cloud.function.invoke(cloudName, {
const { cloud, activityId, cloudName3 } = app
cloud.function.invoke(cloudName3, {
activityId,
_id: prizeId,
provinceName,
name,
phone,
receiveName,
cityName,
......@@ -131,7 +131,7 @@ Page({
detailInfo,
cityCode,
// address: JSON.stringify(userAddress.duibaAddress)
}, "filaStar2.receiveObjectPrize")
}, "receiveObjectPrize")
.then(res => {
if (res && res.success) {
//确认发送成功信息
......@@ -141,7 +141,7 @@ Page({
this.postMessage('mine.getUserAddress', { success: false })
}
})
.catch(() => {
.catch(() => {
//新增失败0514
this.postMessage('mine.getUserAddress', { success: false })
})
......
This diff is collapsed.
......@@ -200,7 +200,7 @@ export const getUserAddress = (opts = {}) => {
searchAddress,
locateAddress
}, res => {
const { error, provinceName, countyName, cityName, streetName, detailInfo, name, telNumber } = res;
const { error, provinceName, countyName, cityName, streetName, detailInfo, name, telNumber,receiveName,cityCode } = res;
// 如果有error为用户取消操作不做操作
if (error) {
resolve(false);
......@@ -210,7 +210,14 @@ export const getUserAddress = (opts = {}) => {
duibaAddress: {
name,
phone: telNumber,
address: [provinceName, cityName, countyName, streetName, detailInfo].join(joinTag)
provinceName,
receiveName:name,
cityName,
countyName,
streetName,
detailInfo,
cityCode,
address: [provinceName, cityName, countyName, streetName, detailInfo,receiveName,cityCode].join(joinTag)
}
});
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment