diff --git a/mallplusui-uniapp-app/common/api.js b/mallplusui-uniapp-app/common/api.js
index 5b7e8bd..66af339 100644
--- a/mallplusui-uniapp-app/common/api.js
+++ b/mallplusui-uniapp-app/common/api.js
@@ -1,8 +1,8 @@
import store from '../store/index';
export default {
// qq 237524947 wx15d4269d3210863d
- // BASEURI: 'http://br68s5.natappfree.cc/api/',
- BASEURI: 'http://mall.yyundong.com/portalapi/api/',
+ BASEURI: 'http://192.168.3.9:8111/api/',
+ // BASEURI: 'http://mall.yyundong.com/portalapi/api/',
// BASEURI: 'http://192.168.31.52:8083/api/',
ADMINURI: 'http://mall.yyundong.com/adminapi/',
ESURI: 'http://www.yyundong.com:8081/',
diff --git a/mallplusui-uniapp-app/pages/category/category.vue b/mallplusui-uniapp-app/pages/category/category.vue
index 1e9c453..885bc4a 100644
--- a/mallplusui-uniapp-app/pages/category/category.vue
+++ b/mallplusui-uniapp-app/pages/category/category.vue
@@ -34,7 +34,7 @@
- {{titem.name}}
+ {{titem.name}}
@@ -65,7 +65,7 @@
statusBarHeight: '',
};
},
- onLoad() {
+ onShow() {
this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight
this.height = uni.getSystemInfoSync().windowHeight - (this.statusBarHeight + 80)
console.log("height", this.height);
@@ -74,12 +74,16 @@
methods: {
async loadData() {
- let list = this.$db.get('categoryList')
- if (!list) {
+ // let list = this.$db.get('categoryList')
+ let list=[]
+ this.flist =[]
+ this.tlist = []
+ // if (!list) {
let params = {};
list = await Api.apiCall('get', Api.goods.typeGoodsList, params);
+ console.log("list>>>>>", list);
this.$db.set('categoryList', list)
- }
+ // }
if (list) {
list.forEach(item => {
@@ -245,7 +249,8 @@
width: 130upx;
height: 130upx;
}
- text{
+
+ text {
padding-left: 5px;
padding-right: 5px;
overflow: hidden;
diff --git a/mallplusui-uniapp-app/pages/index/user.vue b/mallplusui-uniapp-app/pages/index/user.vue
index c4f5388..6d6e787 100644
--- a/mallplusui-uniapp-app/pages/index/user.vue
+++ b/mallplusui-uniapp-app/pages/index/user.vue
@@ -227,12 +227,14 @@
this.userDetailInfo = {}
this.couponList = []
this.viewList = []
+ this.listCollect = 0
this.getData();
},
async onShow() {
this.userDetailInfo = {}
this.couponList = []
this.viewList = []
+ this.listCollect = 0
this.getData();
},
@@ -308,6 +310,7 @@
this.logout();
this.couponList = []
this.viewList = []
+ this.listCollect = 0
this.getHistory();
} else {
this.userDetailInfo = data1.member;
diff --git a/mallplusui-uniapp-app/pages/order/createOrder.vue b/mallplusui-uniapp-app/pages/order/createOrder.vue
index 77eda14..f232b94 100644
--- a/mallplusui-uniapp-app/pages/order/createOrder.vue
+++ b/mallplusui-uniapp-app/pages/order/createOrder.vue
@@ -9,8 +9,7 @@
{{ addressData.name }}
{{ addressData.phoneNumber }}
- {{ addressData.region }}-{{ addressData.detailAddress }}
+ {{ addressData.region }}-{{ addressData.detailAddress }}
请设置收货地址
@@ -110,7 +109,7 @@
实付款
￥
- {{ calcAmount.payAmount-coupon.amount }}
+ {{ (calcAmount.payAmount-coupon.amount) | numFilter}}
提交订单
@@ -223,6 +222,7 @@
this.groupId = option.groupId;
if (this.skuId) {
+ console.log(option)
let params = {
orderType: 2,
groupId: option.groupId,
@@ -230,6 +230,7 @@
skuId: this.skuId
};
data = await Api.apiCall('post', Api.order.addGroup, params);
+ console.log("url1", Api.order.addGroup)
} else {
let params = {
orderType: 2,
@@ -237,6 +238,7 @@
goodsId: option.id
};
data = await Api.apiCall('post', Api.order.addGroup, params);
+ console.log("url2", Api.order.addGroup)
}
} else {
if (option.type == 1) { // 详情
@@ -247,6 +249,7 @@
type: option.type
};
data = await Api.apiCall('get', Api.order.preOrder, params);
+ console.log("url3", Api.order.preOrder)
} else if (option.type == 2) { // 购物车
let params = {
cartIds: option.cartIds,
@@ -254,6 +257,7 @@
};
data = await Api.apiCall('get', Api.order.preOrder, params);
this.cartIds = option.cartIds;
+ console.log("url4", Api.order.preOrder)
} else if (option.type == 6) { // 秒杀
let params = {
skillId: option.skillId,
@@ -261,6 +265,7 @@
};
data = await Api.apiCall('get', Api.order.preOrder, params);
this.skillId = option.skillId;
+ console.log("url5", Api.order.preOrder)
}
}
@@ -271,7 +276,7 @@
});
} */
/* this.memberIntegration=data.memberIntegration; */
- /* this.basicGiftsList = data.basicGiftsList; */
+ this.basicGiftsList = data.basicGiftsList;
if (this.basicGiftsList) {
let basicGiftsVar = '';
@@ -309,6 +314,11 @@
let date = new Date(time);
return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
},
+ numFilter(value) {
+ // 截取当前数据到小数点后两位
+ let realVal = parseFloat(value).toFixed(2)
+ return realVal
+ }
},
methods: {
getSource() {
diff --git a/mallplusui-uniapp-app/pages/public/reg.vue b/mallplusui-uniapp-app/pages/public/reg.vue
index 4ae19eb..8eabb6a 100644
--- a/mallplusui-uniapp-app/pages/public/reg.vue
+++ b/mallplusui-uniapp-app/pages/public/reg.vue
@@ -152,28 +152,21 @@
};
}
let data = await Api.apiCall('post', Api.index.simpleReg, params);
-
- if(data.data.code==500){
+ console.log("1111111111",data);
+ if(data){
uni.showToast({
icon: 'none',
mask: true,
- title:data.data.data,
+ title: vel ? "恭喜您注册成功，并成为惠农会员。" : "恭喜您注册成功。",
duration: 2000
});
- return
+ setTimeout(function() {
+ that.request();
+ }, 3000);
}
- uni.showToast({
- icon: 'none',
- mask: true,
- title: vel ? "恭喜您注册成功，并成为惠农会员。" : "恭喜您注册成功。",
- duration: 2000
-
- });
- setTimeout(function() {
- that.request();
- }, 3000);
+
},
async request() {
var that = this;
diff --git a/mallplusui-uniapp-app/pagesU/user/coupon.vue b/mallplusui-uniapp-app/pagesU/user/coupon.vue
index 6b89be2..090dc70 100644
--- a/mallplusui-uniapp-app/pagesU/user/coupon.vue
+++ b/mallplusui-uniapp-app/pagesU/user/coupon.vue
@@ -181,6 +181,7 @@
let params = {};
let data = await Api.apiCall('get', Api.index.listMemberCoupon, params);
let viewList = data;
+ console.log("viewList》》》》",viewList);
viewList.forEach(item => {
if (item.useStatus == 0) {
this.couponValidList.push(item);