21
This commit is contained in:
parent
d51bd79d42
commit
db81e13b58
|
|
@ -74,6 +74,21 @@
|
|||
"autoApprove": [
|
||||
"execute_sql"
|
||||
]
|
||||
},
|
||||
"lanhu": {
|
||||
"url": "http://localhost:8000/mcp?role=开发&name=developer",
|
||||
"disabled": false,
|
||||
"autoApprove": [
|
||||
"lanhu_get_pages",
|
||||
"lanhu_get_designs",
|
||||
"lanhu_get_design_slices",
|
||||
"lanhu_get_ai_analyze_page_result",
|
||||
"lanhu_get_ai_analyze_design_result",
|
||||
"lanhu_resolve_invite_link",
|
||||
"lanhu_say_list",
|
||||
"lanhu_say_detail",
|
||||
"lanhu_get_members"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -148,6 +148,11 @@ uni-tabbar {
|
|||
src: url($imgurl + "font/zihun147hao-xingyuanhei.TTF") format("truetype");
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: "STHupo";
|
||||
src: url("https://youdas-1308826010.cos.ap-shanghai.myqcloud.com/static/STHupo.ttf") format("truetype");
|
||||
}
|
||||
|
||||
page {
|
||||
overflow-x: hidden;
|
||||
|
||||
|
|
|
|||
|
|
@ -200,7 +200,6 @@ const defaultConfig = {
|
|||
"exchange_times": "2",
|
||||
"balance_name": "钻石",
|
||||
"balance_icon": "https://youdas-1308826010.cos.ap-shanghai.myqcloud.com/app/icons/20250412/a482b527477e74f8a18ec02ebc7f0b4e.png",
|
||||
|
||||
"currency1_name": "HH币",
|
||||
"currency1_icon": "https://youdas-1308826010.cos.ap-shanghai.myqcloud.com/app/icons/20250412/3d1741965e9439372d1ce101bd110616.png",
|
||||
"currency2_name": "哈尼券",
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
// 测试环境配置 - .NET 10 后端
|
||||
const testing = {
|
||||
// baseUrl: 'https://app.zpc-xy.com/honey/api',
|
||||
baseUrl: 'https://api.hanimanghe.top',
|
||||
baseUrl: 'https://api.ejp.shhmkjgs.cn',
|
||||
// baseUrl: 'http://192.168.1.24:5238',
|
||||
// baseUrl: 'http://192.168.195.15:2822',
|
||||
imageUrl: 'https://youdas-1308826010.cos.ap-shanghai.myqcloud.com',
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ class BasePlatform {
|
|||
id: 1,
|
||||
show: true,
|
||||
title: '消费记录',
|
||||
icon: 'my/s1.png',
|
||||
icon: 'ms/s1.png',
|
||||
path: '/pages/other/order_list',
|
||||
handler: this.navigateToPath.bind(this)
|
||||
},
|
||||
|
|
@ -138,7 +138,7 @@ class BasePlatform {
|
|||
id: 3,
|
||||
show: true,
|
||||
title: '我的收藏',
|
||||
icon: 'my/s3.png',
|
||||
icon: 'ms/s3.png',
|
||||
path: '/package/mine/collect',
|
||||
handler: this.navigateToPath.bind(this)
|
||||
},
|
||||
|
|
@ -146,7 +146,7 @@ class BasePlatform {
|
|||
id: 4,
|
||||
show: true,
|
||||
title: '优惠券',
|
||||
icon: 'my/s4.png',
|
||||
icon: 'ms/s4.png',
|
||||
path: '/pages/user/coupon',
|
||||
handler: this.navigateToPath.bind(this)
|
||||
},
|
||||
|
|
@ -154,7 +154,7 @@ class BasePlatform {
|
|||
id: 5,
|
||||
show: true,
|
||||
title: '邀请好友',
|
||||
icon: 'my/s5.png',
|
||||
icon: 'ms/s5.png',
|
||||
path: '/pages/user/tui-guang',
|
||||
handler: this.navigateToPath.bind(this)
|
||||
},
|
||||
|
|
@ -162,7 +162,7 @@ class BasePlatform {
|
|||
id: 6,
|
||||
show: true,
|
||||
title: '加入福利群',
|
||||
icon: 'my/s6.png',
|
||||
icon: 'ms/s6.png',
|
||||
path: '',
|
||||
handler: this.handleJoinGroup.bind(this)
|
||||
},
|
||||
|
|
@ -170,7 +170,7 @@ class BasePlatform {
|
|||
id: 11,
|
||||
show: true,
|
||||
title: '设置',
|
||||
icon: 'my/settings.png',
|
||||
icon: 'ms/settings.png',
|
||||
path: '/pages/user/settings',
|
||||
handler: this.navigateToPath.bind(this)
|
||||
}
|
||||
|
|
@ -181,7 +181,7 @@ class BasePlatform {
|
|||
id: 10,
|
||||
show: false,
|
||||
title: '关于',
|
||||
icon: 'my/about.png',
|
||||
icon: 'ms/about.png',
|
||||
path: '/pages/other/about',
|
||||
handler: this.navigateToPath.bind(this)
|
||||
};
|
||||
|
|
|
|||
|
|
@ -277,7 +277,7 @@ class MiniProgramPlatform extends BasePlatform {
|
|||
id: 9,
|
||||
show: true,
|
||||
title: '客服',
|
||||
icon: 'my/s9.png',
|
||||
icon: 'ms/s9.png',
|
||||
path: '',
|
||||
isCustomService: true,
|
||||
// 客服按钮不需要处理函数,由微信小程序原生组件处理
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<view class="info-section">
|
||||
<view class="info-row">
|
||||
<text class="info-label">库存</text>
|
||||
<text class="info-value">{{ goodsInfo.stock || 0 }}</text>
|
||||
<text class="info-value">{{ goodsInfo.goodslist_surplus_stock != null ? goodsInfo.goodslist_surplus_stock : (goodsInfo.stock || 0) }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="info-section" v-if="orderData && orderData.goods_extend && orderData.goods_extend.pay_currency2 == 1">
|
||||
|
|
@ -278,8 +278,10 @@ export default {
|
|||
return;
|
||||
}
|
||||
|
||||
// 检查库存
|
||||
const remainStock = (this.goodsInfo.stock || 0) - (this.goodsInfo.sale_stock || 0);
|
||||
// 检查库存(商城赏用奖品维度的剩余库存)
|
||||
const remainStock = this.goodsInfo.goodslist_surplus_stock != null
|
||||
? this.goodsInfo.goodslist_surplus_stock
|
||||
: (this.goodsInfo.stock || 0) - (this.goodsInfo.sale_stock || 0);
|
||||
if (remainStock <= 0) {
|
||||
this.$c.msg('库存不足,兑换失败');
|
||||
return;
|
||||
|
|
@ -342,7 +344,9 @@ export default {
|
|||
}
|
||||
|
||||
// 再次检查库存(防止并发购买)
|
||||
const remainStock = (this.goodsInfo.stock || 0) - (this.goodsInfo.sale_stock || 0);
|
||||
const remainStock = this.goodsInfo.goodslist_surplus_stock != null
|
||||
? this.goodsInfo.goodslist_surplus_stock
|
||||
: (this.goodsInfo.stock || 0) - (this.goodsInfo.sale_stock || 0);
|
||||
if (remainStock <= 0) {
|
||||
this.$c.msg('库存不足,兑换失败');
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -156,8 +156,7 @@
|
|||
<!-- 群聊弹窗 -->
|
||||
<uni-popup ref="qunliao_show" type="center" maskBackgroundColor="rgba(0,0,0,0.8)">
|
||||
<view class="pop-ball">
|
||||
<image show-menu-by-longpress
|
||||
:src="erweimaUrl" mode="aspectFit"
|
||||
<image show-menu-by-longpress :src="erweimaUrl" mode="aspectFit"
|
||||
style="width:80vw;height:468px;position:relative;top:-14%;left:0;">
|
||||
</image>
|
||||
</view>
|
||||
|
|
@ -202,7 +201,8 @@
|
|||
},
|
||||
// 福利群二维码图片URL
|
||||
erweimaUrl() {
|
||||
return this.$config.getBaseConfigKey('erweima') || 'https://youdas-1308826010.cos.ap-shanghai.myqcloud.com/topic/20250418/0b40de65d2fc4801517569193bfd4cac.png';
|
||||
return this.$config.getBaseConfigKey('erweima') ||
|
||||
'https://youdas-1308826010.cos.ap-shanghai.myqcloud.com/topic/20250418/0b40de65d2fc4801517569193bfd4cac.png';
|
||||
}
|
||||
},
|
||||
onLoad(e) {
|
||||
|
|
@ -437,7 +437,7 @@
|
|||
right: 0;
|
||||
bottom: 0;
|
||||
z-index: -1;
|
||||
background-image: url('/static/main_bg.jpg');
|
||||
background-image: url('https://youdas-1308826010.cos.ap-shanghai.myqcloud.com/static/image/Rectangle.png');
|
||||
background-size: cover;
|
||||
background-position: center;
|
||||
background-repeat: no-repeat;
|
||||
|
|
@ -472,17 +472,17 @@
|
|||
.nick {
|
||||
max-width: 200rpx;
|
||||
font-size: 32rpx;
|
||||
font-family: Source Han Sans CN;
|
||||
font-family: STHupo, Source Han Sans CN;
|
||||
font-weight: 400;
|
||||
color: #333333;
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
.user-day {
|
||||
margin-top: 10rpx;
|
||||
font-size: 24rpx;
|
||||
font-family: Source Han Sans CN;
|
||||
font-size: 22rpx;
|
||||
font-family: STHupo, Source Han Sans CN;
|
||||
font-weight: 400;
|
||||
color: #8A8A8A;
|
||||
color: rgba(0, 0, 0, 0.75);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -499,9 +499,10 @@
|
|||
position: absolute;
|
||||
left: 32rpx;
|
||||
top: 16rpx;
|
||||
font-weight: 500;
|
||||
font-size: 48rpx;
|
||||
color: #333333;
|
||||
font-weight: 400;
|
||||
font-size: 56rpx;
|
||||
font-family: STHupo, Source Han Sans CN;
|
||||
color: #404040;
|
||||
width: 100rpx;
|
||||
}
|
||||
|
||||
|
|
@ -512,8 +513,9 @@
|
|||
|
||||
>text {
|
||||
font-weight: 400;
|
||||
font-size: 16rpx;
|
||||
color: #4C4C4C;
|
||||
font-size: 20rpx;
|
||||
font-family: STHupo, Source Han Sans CN;
|
||||
color: #404040;
|
||||
}
|
||||
|
||||
>view {
|
||||
|
|
@ -528,16 +530,20 @@
|
|||
}
|
||||
|
||||
&-detail {
|
||||
width: 96rpx;
|
||||
height: 36rpx;
|
||||
width: 112rpx;
|
||||
height: 40rpx;
|
||||
position: absolute;
|
||||
left: 34rpx;
|
||||
top: 86rpx;
|
||||
font-weight: 400;
|
||||
font-size: 16rpx;
|
||||
color: #4C4C4C;
|
||||
border-radius: 6rpx;
|
||||
background-color: #E6F791;
|
||||
font-size: 20rpx;
|
||||
font-family: STHupo, Source Han Sans CN;
|
||||
color: #404040;
|
||||
border-radius: 10rpx;
|
||||
background-color: #FFED94;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -574,34 +580,39 @@
|
|||
width: 100%;
|
||||
|
||||
.title {
|
||||
font-size: 28rpx;
|
||||
font-weight: 600;
|
||||
color: #333333;
|
||||
font-size: 30rpx;
|
||||
font-weight: 400;
|
||||
font-family: STHupo, Source Han Sans CN;
|
||||
color: rgba(64, 64, 64, 0.85);
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.recharge-tag {
|
||||
margin-left: 10rpx;
|
||||
padding: 4rpx 12rpx;
|
||||
background-color: #E6F791;
|
||||
border-radius: 6rpx;
|
||||
padding: 2rpx 8rpx;
|
||||
background-color: #FFED94;
|
||||
border-radius: 78rpx;
|
||||
border: 2rpx solid #FFBE14;
|
||||
font-size: 20rpx;
|
||||
font-weight: 400;
|
||||
color: #333333;
|
||||
|
||||
color: #404040;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.title {
|
||||
font-size: 28rpx;
|
||||
font-weight: 600;
|
||||
color: #333333;
|
||||
font-size: 30rpx;
|
||||
font-weight: 400;
|
||||
font-family: STHupo, Source Han Sans CN;
|
||||
color: rgba(64, 64, 64, 0.85);
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
|
||||
.num {
|
||||
font-size: 28rpx;
|
||||
font-weight: 400;
|
||||
font-family: STHupo, Source Han Sans CN;
|
||||
color: #333333;
|
||||
}
|
||||
|
||||
|
|
@ -713,9 +724,9 @@
|
|||
border-radius: 16rpx;
|
||||
|
||||
&-title {
|
||||
font-weight: 500;
|
||||
font-size: 28rpx;
|
||||
color: #333333;
|
||||
font-weight: bold;
|
||||
font-size: 36rpx;
|
||||
color: #404040;
|
||||
padding-top: 36rpx;
|
||||
padding-left: 32rpx;
|
||||
padding-bottom: 20rpx;
|
||||
|
|
@ -752,7 +763,7 @@
|
|||
flex: 1;
|
||||
font-size: 28rpx;
|
||||
font-weight: 400;
|
||||
color: #333333;
|
||||
color: #464646;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
<!-- 用户协议 -->
|
||||
<view class="settings-item" @click="handleUserAgreement">
|
||||
<view class="item-left">
|
||||
<image class="item-icon" :src="$img1('my/s7.png')" mode=""></image>
|
||||
<image class="item-icon" :src="$img1('ms/s8.png')" mode=""></image>
|
||||
<text class="item-title">用户协议</text>
|
||||
</view>
|
||||
<view class="item-right">
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
<!-- 隐私政策 -->
|
||||
<view class="settings-item" @click="handlePrivacyPolicy">
|
||||
<view class="item-left">
|
||||
<image class="item-icon" :src="$img1('my/s7.png')" mode=""></image>
|
||||
<image class="item-icon" :src="$img1('ms/s7.png')" mode=""></image>
|
||||
<text class="item-title">隐私政策</text>
|
||||
</view>
|
||||
<view class="item-right">
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
<view v-if="isLoggedIn" class="divider-line"></view>
|
||||
<view v-if="isLoggedIn" class="settings-item" @click="handleLogout">
|
||||
<view class="item-left">
|
||||
<image class="item-icon" :src="$img1('my/exit.png')" mode=""></image>
|
||||
<image class="item-icon" :src="$img1('ms/s10.png')" mode=""></image>
|
||||
<text class="item-title">退出登录</text>
|
||||
</view>
|
||||
<view class="item-right">
|
||||
|
|
@ -183,7 +183,8 @@ export default {
|
|||
|
||||
.item-title {
|
||||
font-size: 28rpx;
|
||||
color: #333333;
|
||||
font-weight: 400;
|
||||
color: #464646;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -782,6 +782,7 @@ public class OrderService : IOrderService
|
|||
g.Id,
|
||||
g.Title,
|
||||
g.ImgUrl,
|
||||
g.ImgUrlBanner,
|
||||
g.ImgUrlDetail,
|
||||
g.Type,
|
||||
g.Price,
|
||||
|
|
@ -834,6 +835,7 @@ public class OrderService : IOrderService
|
|||
Id = goods.Id,
|
||||
Title = goods.Title,
|
||||
ImgUrl = FormatImageUrl(goods.ImgUrl),
|
||||
ImgUrlBanner = FormatImageUrl(goods.ImgUrlBanner),
|
||||
ImgUrlDetail = FormatImageUrl(goods.ImgUrlDetail),
|
||||
Price = goods.Price.ToString("0.##"),
|
||||
Stock = goods.Stock,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user