diff --git a/api/http.js b/api/http.js
index 3c18457..99e1615 100644
--- a/api/http.js
+++ b/api/http.js
@@ -17,7 +17,7 @@ function http(uri, data, callback, method = 'GET', showLoading, title) {
method: method,
header: {
'X-Access-Token': uni.getStorageSync('token'),
- 'Content-Type' : method == 'POST' ? 'application/x-www-form-urlencoded' : 'application/json'
+ 'Content-Type' : 'application/x-www-form-urlencoded'
},
success: (res) => {
diff --git a/api/model/index.js b/api/model/index.js
index 5c4b3d3..e6712ba 100644
--- a/api/model/index.js
+++ b/api/model/index.js
@@ -59,12 +59,31 @@ const api = {
method: 'GET',
auth : true,
},
+ // 删除购物车信息
+ deleteCart: {
+ url: '/rice_index/deleteCart',
+ method: 'DELETE',
+ auth : true,
+ },
+ // 修改购物车信息数量
+ updateCartNum: {
+ url: '/rice_index/updateCartNum',
+ method: 'POST',
+ auth : true,
+ debounce : 300,
+ },
// 创建订单
createOrder: {
url: '/rice_index/createOrder',
method: 'GET',
auth : true,
},
+ // 多商品创建订单
+ createSumOrder: {
+ url: '/rice_index/createSumOrder',
+ method: 'POST',
+ auth : true,
+ },
}
export default api
\ No newline at end of file
diff --git a/api/model/info.js b/api/model/info.js
index 2eff673..64d48a4 100644
--- a/api/model/info.js
+++ b/api/model/info.js
@@ -11,13 +11,20 @@ const api = {
// 增加或修改地址信息
addOrUpdateAddress: {
url: '/rice_info/addOrUpdateAddress',
+ method: 'POST',
+ limit : 500,
+ auth : true,
+ },
+ // 删除地址
+ deleteAddress: {
+ url: '/rice_info/deleteAddress',
method: 'GET',
limit : 500,
auth : true,
},
- // 获取购物车信息列表带分页
- getCartPageList: {
- url: '/rice_info/getCartPageList',
+ // 修改默认地址
+ updateDefaultAddress: {
+ url: '/rice_info/updateDefaultAddress',
method: 'GET',
auth : true,
},
@@ -45,6 +52,12 @@ const api = {
method: 'GET',
auth : true,
},
+ // 获取订单详情
+ getOrderDetail: {
+ url: '/rice_info/getOrderDetail',
+ method: 'GET',
+ auth : true,
+ },
// 获取流水记录带分页
getWaterPageList: {
url: '/rice_info/getWaterPageList',
@@ -66,6 +79,11 @@ const api = {
url: '/rice_info/getRiceInfo',
method: 'GET',
},
+ // 获取购物车信息列表带分页
+ getCartPageList: {
+ url: '/rice_info/getCartPageList',
+ method: 'GET',
+ },
}
export default api
\ No newline at end of file
diff --git a/components/product/productItem.vue b/components/product/productItem.vue
index 1228adc..2c4d90e 100644
--- a/components/product/productItem.vue
+++ b/components/product/productItem.vue
@@ -14,7 +14,7 @@
{{ item.sku }}
- {{ item.price }}
+ ￥{{ item.price }}
@@ -46,6 +46,7 @@
display: flex;
width: 100%;
box-sizing: border-box;
+ border-bottom: 1rpx solid #00000012;
.item-image {
width: 140rpx;
@@ -78,8 +79,11 @@
.price {
text-align: right;
color: #f40;
- font-size: 30rpx;
- font-weight: 900;
+ font-size: 26rpx;
+ text{
+ font-size: 30rpx;
+ font-weight: 900;
+ }
}
}
}
diff --git a/config.js b/config.js
index 35d1689..4938f33 100644
--- a/config.js
+++ b/config.js
@@ -7,7 +7,7 @@ import uvUI from '@/uni_modules/uv-ui-tools'
Vue.use(uvUI);
// 当前环境
-const type = 'prod'
+const type = 'dev'
// 环境配置
diff --git a/pages.json b/pages.json
index 60f95e3..7c26f33 100644
--- a/pages.json
+++ b/pages.json
@@ -50,7 +50,10 @@
"root": "pages_order",
"pages": [
{
- "path": "order/orderDetail"
+ "path": "order/orderDetail",
+ "style": {
+ "enablePullDownRefresh": true
+ }
},
{
"path": "mine/purse"
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
index 3be211c..5d162a9 100644
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@@ -10,9 +10,10 @@
+ :key="item.id">
@@ -51,7 +52,7 @@
+ @change="e => valChange(item, e)">
@@ -62,6 +63,13 @@
+
+
@@ -129,8 +137,11 @@
},
},
methods: {
- valChange(){
-
+ valChange(item, e) {
+ this.$api('updateCartNum', {
+ id: item.id,
+ num: e.value,
+ })
},
// 立即下单
submit(){
@@ -154,6 +165,13 @@
this.$utils.navigateTo('/pages_order/order/createOrder')
},
+ deleteCart(e, item){
+ this.$api('deleteCart', {
+ id : item.id
+ }, res => {
+ this.getData()
+ })
+ },
}
}
diff --git a/pages/index/category.vue b/pages/index/category.vue
index c498558..7e31faf 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -48,8 +48,9 @@
}
},
methods: {
- change({index}) {
- this.queryParams.classId = this.category[index].id
+ change(e) {
+ this.queryParams.classId = this.category[e].id
+ this.getData()
},
}
}
diff --git a/pages/index/center.vue b/pages/index/center.vue
index abe18d1..9289254 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -5,14 +5,14 @@
-
+
{{ userInfo.nickName }}
-
+
@@ -239,28 +239,31 @@
.vip {
color: #909294;
font-size: 24rpx;
-
}
.name {
display: flex;
align-items: center;
-
+
.one {
color: #343140;
font-size: 32rpx;
font-weight: 600;
+ margin-right: 20rpx;
}
.two {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-shrink: 0;
// font-size: 24rpx;
// margin-left: 10rpx;
// padding: 3rpx 16rpx;
// border-radius: 18rpx;
// background-color: rgb(252, 213, 157);
image{
- width: 100rpx;
- height: 50rpx;
+ width: 120rpx;
}
}
}
diff --git a/pages/index/member.vue b/pages/index/member.vue
index 091d4bc..7c37edc 100644
--- a/pages/index/member.vue
+++ b/pages/index/member.vue
@@ -182,13 +182,16 @@
},
// 开通会员
submitOpen(){
- this.$api('applyRiceVip', res => {
- if(res.code == 200){
- uni.showToast({
- title: '开通成功',
- icon : 'none'
- })
- }
+ uni.showModal({
+ title: this.configList.vip_rloe,
+ confirmText: '去开通',
+ success : res => {
+ if(res.confirm){
+ uni.navigateTo({
+ url: '/pages/index/category'
+ })
+ }
+ },
})
},
}
diff --git a/pages/index/order.vue b/pages/index/order.vue
index 447b200..7a5a492 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -31,21 +31,23 @@
-
+
-
+
- 商品：{{item.title}}
+ 商品：{{good.title}}
- 规格：{{item.sku}}
+ 规格：{{good.sku}}
- 数量：{{item.num}}
+ 数量：{{good.num}}
-
+
-
- 服务项目
+ background: #A3D250;border-radius: 6rpx;"
+ />
+ 产品
-
+
-
+
- {{msgOrder.projectName}}
+ {{good.title}}
- ￥{{msgOrder.money}}
+ ￥{{good.price}}
- 规格：{{msgOrder.unit}}
+ 规格：{{good.sku}}
+
+ 收货地址
+
-
+
- {{msgOrder.name}} {{msgOrder.phone}}
- {{msgOrder.address}}
+ {{order.name}} {{order.phone}}
+ {{order.address}} {{order.addressDetails}}
@@ -136,31 +137,7 @@
实付款
- ￥{{ msgOrder.money }}
-
-
-
-
- 租赁费用
-
-
- ￥{{ msgOrder.price }}
-
-
-
-
- 水洗费用
-
-
- ￥{{ msgOrder.price}}
-
-
-
-
- 押金
-
-
- ￥{{ msgOrder.price }}
+ ￥{{ order.price }}
@@ -177,7 +154,7 @@
订单编号
- {{msgOrder.id}}
+ {{order.id}}
@@ -185,7 +162,7 @@
下单时间
- {{msgOrder.createTime}}
+ {{order.createTime}}
@@ -193,14 +170,14 @@
-
+
联系客服
@@ -213,10 +190,9 @@
diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue
index 88c4c74..eea11a3 100644
--- a/pages_order/product/productDetail.vue
+++ b/pages_order/product/productDetail.vue
@@ -38,6 +38,7 @@