diff --git a/honey_box/pages/mall/detail.vue b/honey_box/pages/mall/detail.vue
index 8f6ba414..3f9d6d99 100644
--- a/honey_box/pages/mall/detail.vue
+++ b/honey_box/pages/mall/detail.vue
@@ -31,7 +31,7 @@
{{ $config.getAppSetting('currency2_name') }}{{ goodsInfo.price * 100 }}
- (剩余:{{ orderData.use_integral }})
+ (剩余:{{ orderData.score || 0 }})
@@ -43,9 +43,17 @@
-
-
+
+
商品详情
+
+
+
+
+
+
+
+ 商品详情
@@ -109,7 +117,7 @@
{{ $config.getAppSetting('currency2_name') }}
- {{ orderData.goods.price * 100 }} (剩余:{{ orderData.use_integral }})
+ {{ orderData.goods.price * 100 }} (剩余:{{ orderData.score || 0 }})
@@ -289,7 +297,7 @@ export default {
async payByCurrency() {
const pri = this.goodsInfo.price * 100;
- if (this.orderData.use_integral < pri) {
+ if ((this.orderData.score || 0) < pri) {
this.$c.msg(this.$config.getAppSetting('currency2_name') + '不足');
return;
}
diff --git a/honey_box/pages/mall/index.vue b/honey_box/pages/mall/index.vue
index 448737fc..70bdea05 100644
--- a/honey_box/pages/mall/index.vue
+++ b/honey_box/pages/mall/index.vue
@@ -21,7 +21,7 @@
- {{ item.price * 100 }}{{ $config.getAppSetting('currency2_name') }}
+ {{ item.price * 100 }}{{ $config.getAppSetting('currency2_name') }}
@@ -71,7 +71,7 @@
v-if="orderData != null && orderData.goods_extend && orderData.goods_extend.pay_currency2 == 1">
{{ $config.getAppSetting('currency2_name') }} {{ orderData.goods.price * 100 }}
- (剩余{{ orderData.score }})
+ (剩余{{ orderData.score || 0 }})
@@ -212,6 +212,14 @@ export default {
order_money(data) {
+ const token = uni.getStorageSync('token');
+ if (!token) {
+ uni.showToast({ title: '请先登录', icon: 'none' });
+ setTimeout(() => {
+ uni.navigateTo({ url: '/pages/user/login' });
+ }, 300);
+ return;
+ }
uni.navigateTo({
url: '/pages/mall/detail?goods_id=' + data.id + '&imgurl=' + encodeURIComponent(data.imgurl || '')
});
@@ -385,7 +393,7 @@ export default {
.price {
font-weight: 500;
- font-size: 16rpx;
+ font-size: 24rpx;
color: #333333;
}
}
diff --git a/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/views/business/goods/config/typeFieldConfig.ts b/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/views/business/goods/config/typeFieldConfig.ts
index 0b835b57..84326dc1 100644
--- a/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/views/business/goods/config/typeFieldConfig.ts
+++ b/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/views/business/goods/config/typeFieldConfig.ts
@@ -163,14 +163,14 @@ export const GoodsTypeFieldConfigs: Record = {
showCoverImage: true, showDetailImage: true,
showPrice: true, showShouZhe: true,
},
- // 商城赏:套数、盒子描述,不需要详情图、首抽五折
+ // 商城赏:套数、盒子描述、详情图
[GoodsType.ShangChengShang]: {
showStock: true, showLock: false, showDailyLimit: false,
showRage: false, showItemCard: false, showLingzhu: false,
showLianji: false, showTimeConfig: false, showAutoXiajia: false,
showCoupon: false, showIntegral: false, showDescription: true,
showQuanjuXiangou: false, showShowIs: false, showUnlockAmount: true,
- showCoverImage: true, showDetailImage: false,
+ showCoverImage: true, showDetailImage: true,
showPrice: true, showShouZhe: false,
},
// 福利屋:时间配置、盒子描述,不需要封面图、详情图、价格、首抽五折