mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'new' of https://gitea.lihaink.cn/mkm/nk-shop2.0 into new

Browse Source
This commit is contained in:
wpf 2024-03-08 18:10:01 +08:00
commit e06d250588
3 changed files with 132 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pages/helpPeople/formTable.vue
View File

@ -840,7 +840,9 @@
},
async submit() {
if (this.saveNum < 2) return
if (this.saveNum < 2) return this.$util.Tips({
title: '请至少填写两项！'
})
let that = this
uni.request({
url: HTTP_REQUEST_URL_SIX + (that.mode == 'add' ? '/api/index/addVillagerInfo' :
@ -881,10 +883,10 @@
this.SaveList.splice(index, 1, true);
this.open(index)
},
edit(index) {
this.SaveList.splice(index, 1, false);
},
}
}
}
</script>

1
pages/helpPeople/helpPeople.vue
View File

@ -74,6 +74,7 @@
}
}
.bg_back {
height: 34rpx;
width: 20rpx;

31
pages/user/index.vue
View File

@ -17,7 +17,8 @@
<!-- 自定义顶部背景颜色 -->
<view class="new-users skeleton" :style="{visibility: showSkeleton ? 'hidden' : 'visible'}">
<view class="head">
<view class="user-card" style="padding-bottom: 0;" :class="userInfo.svip_open && svip_switch_status == 1 ? 'svip-card' : ''">
<view class="user-card" style="padding-bottom: 0;"
:class="userInfo.svip_open && svip_switch_status == 1 ? 'svip-card' : ''">
<view class="bg"></view>
<view class="user-info">
<view class="avatar-box" :class="{on:userInfo.is_svip > 0 && svip_switch_status == 1}">
@ -87,14 +88,18 @@
<view class="packet_card">
<view class="p_d_item" @click="authTo('/pages/users/user_money/index')">
<view class="p_d_count">
<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e41f4202401201745498894.png"></image>
<image
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e41f4202401201745498894.png">
</image>
<view>￥{{userInfo.now_money||"0.00"}}</view>
</view>
<view>我的余额 (元)</view>
</view>
<view class="p_d_item" @click="authTo('/pages/redpacket/redpack_type')">
<view class="p_d_count">
<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/d2868202401201750014779.png"></image>
<image
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/d2868202401201750014779.png">
</image>
<view>￥{{userInfo.red_pack_balance||"0.00"}}</view>
</view>
<view>补贴余额 (元)</view>
@ -220,11 +225,7 @@
<view class="">增值电信营业许可证号:川B2-20221250</view>
<view class="" style="margin-top: 10rpx;">{{ appVersion }}</view>
</view>
<!-- <view v-else class="copy-right">
<view class="iconfont icon-crmeb"></view>
<view class="text">众邦科技提供技术支持</view>
</view> -->
<view style="height: 50rpx;"></view>
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"
:isGoIndex="false"></authorize>
@ -627,7 +628,9 @@
},
// 订单数字
orderNum() {
orderData({source: 103}).then(({
orderData({
source: 103
}).then(({
data
}) => {
// console.log(data);
@ -672,9 +675,11 @@
if (rooms[1]) query = rooms[1].split('&'); //分割参数
query.forEach(item => { // 遍历参数
let t = item.split('='); // 获取键值对
if(t.length>1 && t[0]=='type_code' ){ // 判断是否包含正确参数, 参数名称是否为type_code
if (t.length > 1 && t[0] ==
'type_code') { // 判断是否包含正确参数, 参数名称是否为type_code
let x = t[1].split(','); // 逗号分割多种用户
if(!x.includes(this.$store.state.app.userInfo.mer_info.type_code)) flag = true;
if (!x.includes(this.$store.state.app.userInfo.mer_info
.type_code)) flag = true;
}
})
if (!flag) that.personalMenu.push(item);
@ -1353,6 +1358,7 @@
font-size: 24rpx;
}
}
.packet_card {
height: 140rpx;
width: 710rpx;
@ -1364,6 +1370,7 @@
color: #fff;
display: flex;
justify-content: space-between;
.p_d_item {
position: absolute;
font-size: 26rpx;
@ -1374,18 +1381,22 @@
justify-content: center;
flex-direction: column;
align-items: center;
&:nth-child(1) {
top: 20rpx;
left: 30rpx;
}
&:nth-child(2) {
top: 20rpx;
right: 30rpx;
}
.p_d_count {
display: flex;
align-items: center;
font-size: 38rpx;
image {
width: 53rpx;
height: 53rpx;