diff --git a/mallplusui-uniapp-app/common/api.js b/mallplusui-uniapp-app/common/api.js
index fda3a12..7db1d22 100644
--- a/mallplusui-uniapp-app/common/api.js
+++ b/mallplusui-uniapp-app/common/api.js
@@ -2,8 +2,8 @@ import store from '../store/index';
export default {
// qq 237524947 wx15d4269d3210863d
// BASEURI: 'http://je4r5e.natappfree.cc/api/',
- BASEURI: 'http://mall.yyundong.com/portalapi/api/',
- // BASEURI: 'http://192.168.3.116:8083/api/',
+ // BASEURI: 'http://mall.yyundong.com/portalapi/api/',
+ BASEURI: 'http://192.168.3.9:8083/api/',
ADMINURI: 'http://mall.yyundong.com/adminapi/',
ESURI: 'http://www.yyundong.com:8081/',
h5Appid: 'wxb4660f37187c0b8e', // h5微信登录的appId 暂时测试用
diff --git a/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue b/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue
index 71a31cb..b58b19d 100644
--- a/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue
+++ b/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue
@@ -143,7 +143,7 @@
.coupon-money {
padding: 15px;
- width: 523upx;
+ width: 73.5%;
height: auto;
display: flex;
flex-direction: column;
@@ -211,7 +211,7 @@
width: 40upx;
height: 20upx;
position: absolute;
- left: 500upx;
+ left: 70%;
top: -1px;
border-radius: 0 0 40upx 40upx;
content: "";
@@ -225,7 +225,7 @@
width: 40upx;
height: 20upx;
position: absolute;
- left: 500upx;
+ left:70%;
bottom: -1px;
border-radius: 40upx 40upx 0 0;
content: "";
diff --git a/mallplusui-uniapp-app/manifest.json b/mallplusui-uniapp-app/manifest.json
index f9ad71e..b9bbd36 100644
--- a/mallplusui-uniapp-app/manifest.json
+++ b/mallplusui-uniapp-app/manifest.json
@@ -2,8 +2,8 @@
"name" : "汇融云链",
"appid" : "__UNI__FB2C9C4",
"description" : "",
- "versionName" : "1.0.1.3",
- "versionCode" : 1013,
+ "versionName" : "1.0.1.4",
+ "versionCode" : 1014,
"transformPx" : false,
"app-plus" : {
"usingComponents" : true,
diff --git a/mallplusui-uniapp-app/pages/index/messageList.vue b/mallplusui-uniapp-app/pages/index/messageList.vue
index 0caab99..2cbba58 100644
--- a/mallplusui-uniapp-app/pages/index/messageList.vue
+++ b/mallplusui-uniapp-app/pages/index/messageList.vue
@@ -79,7 +79,7 @@
setTimeout(function() {
uni.stopPullDownRefresh();
}, 2000);
-
+
},
//加载更多
onReachBottom() {
@@ -188,23 +188,19 @@
}
.listcard-content {
+ flex: 1;
display: flex;
flex-direction: column;
padding-left: 10px;
- width: 100%;
- justify-content: space-between;
.listcard-content_title {
display: flex;
flex-direction: row;
- justify-content: space-between;
- font-size: 14px;
- color: #333;
- font-weight: 400;
- line-height: 1.2;
- position: relative;
+ align-items: center;
text {
+ flex:2.5;
+ margin-right: 10px;
font-size: 22px;
overflow: hidden;
text-overflow: ellipsis;
@@ -214,9 +210,9 @@
}
.text2 {
+ flex: 1;
color: #999;
- margin-right: 10px;
- font-size: 18px;
+ font-size: 15px;
}
}
diff --git a/mallplusui-uniapp-app/pages/index/user.vue b/mallplusui-uniapp-app/pages/index/user.vue
index 0db6a8e..f0f9cb5 100644
--- a/mallplusui-uniapp-app/pages/index/user.vue
+++ b/mallplusui-uniapp-app/pages/index/user.vue
@@ -130,7 +130,7 @@
mode="aspectFill">
+ @eventClick="navTo('../../pages/order/order?status=0')">
-
+
-
+
@@ -326,8 +326,13 @@
this.userDetailInfo = data1.member;
uni.setStorageSync('userInfos', data1.member);
console.log(this.userDetailInfo);
- let couponList = data1.histories;
- this.couponList = couponList;
+ data1.histories.forEach(item => {
+ if (item.useStatus == 0) {
+ this.couponList.push(item);
+ }
+ });
+
+ console.log("couponList>>>>>", this.couponList);
}
},
// 获取浏览历史
diff --git a/mallplusui-uniapp-app/pages/order/createOrder.vue b/mallplusui-uniapp-app/pages/order/createOrder.vue
index 6b6c55c..9f6fc2b 100644
--- a/mallplusui-uniapp-app/pages/order/createOrder.vue
+++ b/mallplusui-uniapp-app/pages/order/createOrder.vue
@@ -38,7 +38,7 @@
{{ item.productName }}
- {{ item.productAttr }}
+
￥{{ item.price }}
x {{ item.quantity }}
@@ -564,8 +564,8 @@
image {
flex-shrink: 0;
display: block;
- width: 140upx;
- height: 140upx;
+ width: 100upx;
+ height: 100upx;
border-radius: 4upx;
}
@@ -576,7 +576,7 @@
}
.title {
- font-size: 30upx;
+ font-size: 28upx;
color: $font-color-dark;
}
@@ -588,9 +588,7 @@
.price-box {
display: flex;
align-items: center;
- font-size: 32upx;
- color: $font-color-dark;
- padding-top: 25upx;
+ padding-top: 10upx;
.price {
margin-bottom: 4upx;
diff --git a/mallplusui-uniapp-app/pages/order/createOrder1.vue b/mallplusui-uniapp-app/pages/order/createOrder1.vue
index 53222e1..805d975 100644
--- a/mallplusui-uniapp-app/pages/order/createOrder1.vue
+++ b/mallplusui-uniapp-app/pages/order/createOrder1.vue
@@ -29,10 +29,10 @@
-
+
{{ item.productName }}
- {{ item.productAttr }}
+
￥{{ item.price }}
x {{ item.quantity }}
@@ -439,7 +439,7 @@ import Api from '@/common/api';
}
.title {
- font-size: 30 upx;
+ font-size: 28 upx;
color: $font-color-dark;
}
@@ -451,8 +451,6 @@ import Api from '@/common/api';
.price-box {
display: flex;
align-items: center;
- font-size: 32 upx;
- color: $font-color-dark;
padding-top: 10 upx;
.price {
diff --git a/mallplusui-uniapp-app/pages/order/createStoreOrder.vue b/mallplusui-uniapp-app/pages/order/createStoreOrder.vue
index 968ad9a..f4e82e6 100644
--- a/mallplusui-uniapp-app/pages/order/createStoreOrder.vue
+++ b/mallplusui-uniapp-app/pages/order/createStoreOrder.vue
@@ -37,7 +37,7 @@
-->
-
+
{{ item.productName }}
{{ item.productAttr }}
@@ -531,13 +531,14 @@
.g-item {
display: flex;
+ padding-top: 15px;
margin: 20upx 30upx;
image {
flex-shrink: 0;
display: block;
- width: 140upx;
- height: 140upx;
+ width: 100upx;
+ height: 100upx;
border-radius: 4upx;
}
@@ -548,7 +549,6 @@
}
.title {
- margin-top: 10px;
font-size: 30upx;
color: $font-color-dark;
}
diff --git a/mallplusui-uniapp-app/pages/order/order.vue b/mallplusui-uniapp-app/pages/order/order.vue
index 0d604f6..ab52afe 100644
--- a/mallplusui-uniapp-app/pages/order/order.vue
+++ b/mallplusui-uniapp-app/pages/order/order.vue
@@ -35,8 +35,9 @@
{{ goodsItem.productName }}
- x {{ goodsItem.productQuantity }}
{{ goodsItem.productPrice }}
+ x {{ goodsItem.productQuantity }}
+
@@ -537,13 +538,14 @@
margin-top: 5px;
.attr-box {
- flex: 1;
+
font-size: $font-sm + 2upx;
color: $font-color-light;
margin: 0 2upx 0 8upx;
}
.price {
+ flex: 1;
font-size: $font-base + 2upx;
color: $font-color-dark;
diff --git a/mallplusui-uniapp-app/pages/order/orderDetail.vue b/mallplusui-uniapp-app/pages/order/orderDetail.vue
index 830fbc8..f74e5d1 100644
--- a/mallplusui-uniapp-app/pages/order/orderDetail.vue
+++ b/mallplusui-uniapp-app/pages/order/orderDetail.vue
@@ -22,8 +22,9 @@
{{ goodsItem.productName }}
+ {{ goodsItem.productPrice }}
x {{ goodsItem.productQuantity }}
- {{ goodsItem.productPrice }}
+
-->
-
+
+
+ 共
+ {{ orderInfo.orderItemList.length }}
+ 件商品
+
+
+
+ 优惠券抵扣
+ {{ orderInfo.couponAmount }}
+ , 运费
+ {{ orderInfo.freightAmount }}
, 实付款
{{ orderInfo.payAmount }}
+
+
+