diff --git a/pages/activity/groupon/detail.vue b/pages/activity/groupon/detail.vue
index 66976f3c..7b606ec6 100644
--- a/pages/activity/groupon/detail.vue
+++ b/pages/activity/groupon/detail.vue
@@ -313,10 +313,21 @@
// 加载商品信息
const { data: spu } = await SpuApi.getSpuDetail(activity.spuId);
state.goodsId = spu.id;
+ // 默认显示最低价
activity.products.forEach((product) => {
spu.price = Math.min(spu.price, product.combinationPrice); // 设置 SPU 的最低价格
});
state.goodsInfo = spu;
+ // 价格、库存使用活动的
+ spu.skus.forEach((sku) => {
+ const product = activity.products.find((product) => product.skuId === sku.id);
+ if (product) {
+ sku.price = product.combinationPrice;
+ } else {
+ // 找不到可能是没配置,则不能发起秒杀
+ sku.stock = 0;
+ }
+ });
} else {
state.data = null;
}
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 4366a9fb..ed0119fa 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -170,7 +170,6 @@
运费
¥{{ fen2yuan(state.orderInfo.deliveryPrice) }}
-
优惠劵金额
-¥{{ fen2yuan(state.orderInfo.couponPrice) }}
@@ -325,7 +324,7 @@
});
}
- // 确认收货 TODO 芋艿:待测试
+ // 确认收货
async function onConfirm(orderId, ignore = false) {
// 需开启确认收货组件
// todo: 芋艿:待接入微信
diff --git a/sheep/api/migration/chat.js b/sheep/api/migration/chat.js
deleted file mode 100644
index 140dd75d..00000000
--- a/sheep/api/migration/chat.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import request from '@/sheep/request';
-
-// TODO 芋艿:暂不支持 socket 聊天
-export default {
- // 获取聊天token
- unifiedToken: () =>
- request({
- url: 'unifiedToken',
- custom: {
- showError: false,
- showLoading: false,
- },
- }),
-};
diff --git a/sheep/libs/sdk-h5-weixin.js b/sheep/libs/sdk-h5-weixin.js
index 1df26f94..984b8dbd 100644
--- a/sheep/libs/sdk-h5-weixin.js
+++ b/sheep/libs/sdk-h5-weixin.js
@@ -78,7 +78,7 @@ export default {
});
},
- //获取微信收货地址 TODO 芋艿:未测试
+ // 获取微信收货地址
openAddress(callback) {
this.isReady(() => {
jweixin.openAddress({
diff --git a/sheep/platform/provider/wechat/miniProgram.js b/sheep/platform/provider/wechat/miniProgram.js
index 26d42d42..5e95edad 100644
--- a/sheep/platform/provider/wechat/miniProgram.js
+++ b/sheep/platform/provider/wechat/miniProgram.js
@@ -53,7 +53,6 @@ const mobileLogin = async (e) => {
} else {
return resolve(false);
}
- // TODO 芋艿:shareInfo: uni.getStorageSync('shareLog') || {},
});
};
diff --git a/sheep/platform/provider/wechat/officialAccount.js b/sheep/platform/provider/wechat/officialAccount.js
index 404b8660..ed7beb32 100644
--- a/sheep/platform/provider/wechat/officialAccount.js
+++ b/sheep/platform/provider/wechat/officialAccount.js
@@ -24,7 +24,6 @@ async function login(code = '', state = '') {
// 解密 code 发起登陆
const loginResult = await AuthUtil.socialLogin(socialType, code, state);
if (loginResult.code === 0) {
- // TODO 芋艿:shareLog
setOpenid(loginResult.data.openid);
return loginResult;
}