This commit is contained in:
zpc 2026-02-28 17:49:44 +08:00
parent c51cfc3b29
commit e6cd4fa432
3 changed files with 26 additions and 10 deletions

View File

@ -31,7 +31,7 @@
<view class="info-section" v-if="orderData && orderData.goods_extend && orderData.goods_extend.pay_currency2 == 1">
<view class="info-row">
<text class="info-label">{{ $config.getAppSetting('currency2_name') }}{{ goodsInfo.price * 100 }}</text>
<text class="info-value info-sub">(剩余:{{ orderData.use_integral }})</text>
<text class="info-value info-sub">(剩余:{{ orderData.score || 0 }})</text>
</view>
</view>
@ -43,9 +43,17 @@
</view>
</view>
<!-- 商品详情 -->
<view class="detail-section" v-if="goodsInfo.goods_describe">
<!-- 商品详情 -->
<view class="detail-section" v-if="goodsInfo.imgurl_detail">
<text class="detail-title">商品详情</text>
<view class="detail-content">
<image :src="goodsInfo.imgurl_detail" mode="widthFix" style="width: 100%;"></image>
</view>
</view>
<!-- 商品描述 -->
<view class="detail-section" v-if="goodsInfo.goods_describe">
<text class="detail-title" v-if="!goodsInfo.imgurl_detail">商品详情</text>
<view class="detail-content">
<rich-text :nodes="goodsInfo.goods_describe"></rich-text>
</view>
@ -109,7 +117,7 @@
<view class="pay-method-item" @click="zhifu = 1"
v-if="orderData.goods_extend && orderData.goods_extend.pay_currency2 == 1">
<text style="color: #333;">{{ $config.getAppSetting('currency2_name') }}
{{ orderData.goods.price * 100 }} (剩余:{{ orderData.use_integral }})</text>
{{ orderData.goods.price * 100 }} (剩余:{{ orderData.score || 0 }})</text>
<image :src="zhifu == 1 ? $img1('common/check_act.png') : $img1('common/check.png')"
style="width: 32rpx; height: 32rpx;"></image>
</view>
@ -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;
}

View File

@ -21,7 +21,7 @@
</view>
<view class="price-box">
<view class="price">
<text>{{ item.price * 100 }}<text style="font-size: 20rpx;">{{ $config.getAppSetting('currency2_name') }}</text></text>
<text>{{ item.price * 100 }}{{ $config.getAppSetting('currency2_name') }}</text>
</view>
</view>
<view class="num-box">
@ -71,7 +71,7 @@
v-if="orderData != null && orderData.goods_extend && orderData.goods_extend.pay_currency2 == 1">
<view class="label-with-tip">
<text class="label">{{ $config.getAppSetting('currency2_name') }} {{ orderData.goods.price * 100 }}</text>
<text class="tip">剩余{{ orderData.score }}</text>
<text class="tip">剩余{{ orderData.score || 0 }}</text>
</view>
<view class="radio" :class="{ active: zhifu == 1 }"></view>
</view>
@ -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;
}
}

View File

@ -163,14 +163,14 @@ export const GoodsTypeFieldConfigs: Record<number, GoodsTypeFieldConfig> = {
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,
},
// 福利屋:时间配置、盒子描述,不需要封面图、详情图、价格、首抽五折