diff --git a/src/pagesB/ConfirmOrder/fictitiousOrder.vue b/src/pagesB/ConfirmOrder/fictitiousOrder.vue
index 37a895b..b059e13 100644
--- a/src/pagesB/ConfirmOrder/fictitiousOrder.vue
+++ b/src/pagesB/ConfirmOrder/fictitiousOrder.vue
@@ -34,7 +34,13 @@
-
+
+
+
+
+ 默认地址
+
+ 4564864afdvsdag645sdf
@@ -56,9 +62,10 @@
return {
load: true,
data:[],
- total: '',
+ total: 0,
point: '',
- value1: ''
+ value1: '',
+ addressList: [],
};
},
onLoad(option) {
@@ -66,11 +73,24 @@
console.log(this.data)
},
onShow() {
- this.total =''
+ this.total = 0
this.getTotal()
this.getUserInfo()
+ this.getAddress()
},
methods:{
+ getAddress() {
+ this.http.request('/address/list', {}, "GET").then(res => {
+ if (res.code == 200) {
+ this.addressList = res.data
+ }
+ }).catch(e => {
+ uni.showToast({
+ title: e.data.message,
+ icon: "none",
+ });
+ })
+ },
getUserInfo(){
let _this = this
this.http.request('/user/userInfo', {}, "GET").then(res => {
@@ -88,6 +108,7 @@
getTotal(){
let _this = this
this.data.forEach(function(item){
+
let num = item.count * item.money
_this.total += num
})
@@ -102,7 +123,10 @@
this.data.forEach(function(item){
data.push({
goodsId: item.goodsId,
- count: item.count
+ count: item.count,
+ addressId: item.addressId,
+ remark: item.remark,
+ shopCarId: item.shopCarId,
})
})
this.http.request('/order/newOrder', data, "POST").then(res => {
diff --git a/src/pagesB/PersonalCenter/ReEditSingleInfo.vue b/src/pagesB/PersonalCenter/ReEditSingleInfo.vue
index 8df43ea..f08919c 100644
--- a/src/pagesB/PersonalCenter/ReEditSingleInfo.vue
+++ b/src/pagesB/PersonalCenter/ReEditSingleInfo.vue
@@ -30,12 +30,14 @@
+
+
@@ -241,7 +243,7 @@
}
// 请求 协会 内容
if (this.Edkey == '所属协会') {
- this.http.request('/association/list', {}, "GET").then((res) => {
+ this.http.request('/association/list', {isShow:true}, "GET").then((res) => {
res.data.map((v, i) => {
return this.xiehuiObj[v.name] = v.id
@@ -672,7 +674,7 @@