diff --git a/pages.json b/pages.json
index be17dd4..c3f38d4 100644
--- a/pages.json
+++ b/pages.json
@@ -157,15 +157,6 @@
"group": "商品"
}
},
- {
- "path": "comment/add",
- "style": {
- "navigationBarTitleText": "评价商品"
- },
- "meta": {
- "auth": true
- }
- },
{
"path": "comment/list",
"style": {
diff --git a/pages/activity/groupon/order.vue b/pages/activity/groupon/order.vue
index a19aa45..a549801 100644
--- a/pages/activity/groupon/order.vue
+++ b/pages/activity/groupon/order.vue
@@ -140,13 +140,6 @@
});
}
- // 评价
- function onComment(orderSN) {
- sheep.$router.go('/pages/order/comment/add', {
- orderSN,
- });
- }
-
// 确认收货
async function onConfirm(orderId) {
const { code, data } = await sheep.$api.order.confirm(orderId);
diff --git a/pages/announcement/detail.vue b/pages/announcement/detail.vue
index 411ffb6..b139a5a 100644
--- a/pages/announcement/detail.vue
+++ b/pages/announcement/detail.vue
@@ -4,7 +4,7 @@
diff --git a/pages/commission/teamNew.vue b/pages/commission/teamNew.vue
index 7cd16e0..11d455d 100644
--- a/pages/commission/teamNew.vue
+++ b/pages/commission/teamNew.vue
@@ -81,6 +81,7 @@
background: #fff;
border-radius: 15rpx 15rpx 15rpx 15rpx;
padding: 38rpx 40rpx 34rpx;
+ margin-bottom: 15rpx;
&-top {
padding-bottom: 38rpx;
border-bottom: 1rpx solid #eee;
diff --git a/pages/coupon/list.vue b/pages/coupon/list.vue
index 9214089..3a98f4f 100644
--- a/pages/coupon/list.vue
+++ b/pages/coupon/list.vue
@@ -168,13 +168,14 @@
}
}
async function commissionCouponList() {
- const { code, data ,msg } = await sheep.$api.coupon.commissionCouponList();
+ const { code, data, msg } = await sheep.$api.coupon.commissionCouponList();
if (code === 1 && data && `${data.is_get}` === '0') {
state.dataList.forEach((item) => {
item.typeList = data[item.key].map(val => ({ name: val.name, time: `${val.get_start_time}~${val.get_end_time}`, id: val.id }))
});
state.show = true;
state.level = data.level_name;
+ console.log(111111111);
} else {
getCoupon();
}
@@ -191,9 +192,14 @@
}
async function getProgramIds(key) {
const { typeList } = state.dataList.find((val) => val.key === key);
- const { code, data } = await sheep.$api.coupon.getIds(typeList.map(val => (val.id)).join());
+ const { code, data, msg } = await sheep.$api.coupon.getIds(typeList.map(val => (val.id)).join());
state.show = false;
- getCoupon();
+ if (code !== 1) {
+ sheep.$helper.toast(msg);
+ }
+ setTimeout(() => {
+ getCoupon();
+ }, 500)
}
onLoad((Option) => {
state.type = Option.type;
diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index d3e31a4..7aa4fa0 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -31,7 +31,7 @@
¥{{ state.selectedSkuPrice.price || (state.goodsInfo && formatPrice(state.goodsInfo.price)) }}
- 返{{ state.selectedSkuPrice.back_score || 0 }}积分
+ 返{{ state.goodsInfo.back_score || 0 }}积分
{{ state.selectedSkuPrice.original_price || state.goodsInfo.original_price }}
diff --git a/pages/index/category.vue b/pages/index/category.vue
index 2f20fed..f278e12 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -11,7 +11,7 @@
{{ unit.title }}
¥{{ unit.price[0] }}
- 返{{ unit.title.back_score || 0 }}积分
+ 返{{ unit.back_score || 0 }}积分
diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index 983960d..6f33fb0 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -20,6 +20,7 @@
+
{
+ state.orderPayload = {...state.orderPayload, ...e };
+ console.log(e, state.orderPayload, 2222)
+ });
+ }
+
// 更改收货人地址&计算订单信息
async function changeConsignee(addressInfo = {}) {
if (isEmpty(addressInfo)) {
@@ -363,9 +372,8 @@
}
.uni-easyinput__content-input {
- font-size: 28rpx;
- height: 72rpx;
- text-align: right !important;
+ font-size: 26rpx !important;
+ height: 60rpx !important;
padding-right: 0 !important;
.uni-input-input {
@@ -387,6 +395,9 @@
font-size: 30rpx !important;
color: var(--ui-BG-Main) !important;
}
+ .uni-calendar--fixed {
+ bottom: 130rpx;
+ }
}
.score-img {
width: 36rpx;
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 14caa82..4c4a6a1 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -101,17 +101,6 @@
-
-
-
@@ -367,21 +343,6 @@
});
}
- // 申请退款
- async function onRefund(orderId) {
- uni.showModal({
- title: '提示',
- content: '确定要申请退款吗?',
- success: async function (res) {
- if (res.confirm) {
- const { code, data } = await sheep.$api.order.applyRefund(orderId);
- if (code === 1) {
- getOrderDetail(data.order_sn);
- }
- }
- },
- });
- }
// 查看物流
async function onExpress(orderId) {
@@ -460,15 +421,6 @@
});
}
- // 评价
- function onComment(orderSN) {
- uni.$once('SELECT_INVOICE', (e) => {
- state.invoiceInfo = e.invoiceInfo;
- });
- sheep.$router.go('/pages/goods/comment/add', {
- orderSN,
- });
- }
async function getOrderDetail(id) {
let res = {};
diff --git a/pages/order/list.vue b/pages/order/list.vue
index 3f8f2c1..4d965c8 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -38,17 +38,6 @@
>
-
-
- 评价晒单
-
-->
@@ -176,14 +162,6 @@
取消订单
-
-