mkm/new_shop_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

消息通知修改

Browse Source
This commit is contained in:
1154079537 2024-05-06 17:12:43 +08:00
parent 448be8de75
commit 926df5bad0
5 changed files with 770 additions and 738 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifest.json
View File

@ -2,8 +2,8 @@
"name": "惠农生活",
"appid": "__UNI__3A527D1",
"description": "",
"versionName": "2.0.44",
"versionCode": 2044,
"versionName": "2.0.47",
"versionCode": 2047,
"transformPx": false,
/* 5+App特有相关 */
"app-plus": {

28
pages/gather/gather.vue
View File

@ -144,8 +144,10 @@
<view style="margin-right: 30rpx;" @click="scanQRcode" hover-class="none">
<view class="iconfont icon-saoma" style="color:#fff;font-size:40rpx;"> </view>
</view>
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none"
style="position: relative;">
<view class="iconfont icon-xiaoxi" style="color:#fff;font-size:40rpx;"> </view>
<text class="iconnum" v-if="userInfoData.user_unread">{{userInfoData.user_unread}}</text>
</navigator>
</view>
</view>
@ -211,7 +213,6 @@
<u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
<view class="examine" @click.stop="pushMenu(item)">
<image class="icon_img" :src="item.pic" mode="aspectFit"> </image>
<!-- <u-icon class="icon" name="plus-circle-fill"></u-icon> -->
<view class="icon">添加</view>
<text class="text">{{ item.name }}</text>
</view>
@ -284,6 +285,7 @@
backColor: 'rgba(252, 252, 252, 0)',
newData: {},
activeRouter: '',
userInfo: {},
};
},
computed: {
@ -344,6 +346,16 @@
}
},
methods: {
/**
* 获取个人用户信息
*/
getUserInfo: function() {
let that = this;
getUserInfo().then(res => {
showTab(res.data);
this.userInfo = res.data;
});
},
changeSwiper(e) {
if (e.length > 0 && e[1].value) {
uni.navigateTo({
@ -600,6 +612,18 @@
}
}
.iconnum {
min-width: 14rpx;
color: #fff;
background: #E93323;
border-radius: 15rpx;
position: absolute;
left: 20rpx;
top: -10rpx;
font-size: 10px;
padding: 0 5px;
}
.site-box {
width: 100%;
/* #ifdef MP || APP-PLUS */

4
pages/goods_details/index.vue
View File

@ -263,7 +263,8 @@
:url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`"
hover-class="none" class="info">
<view class="name line1">
<text class="line1" style="max-width:450rpx;">{{storeInfo.merchant.mer_name ? storeInfo.merchant.mer_name : ''}}</text>
<text class="line1"
style="max-width:450rpx;">{{storeInfo.merchant.mer_name ? storeInfo.merchant.mer_name : ''}}</text>
<image
v-if="margin_ico_switch==1 && margin_ico && storeInfo.merchant.is_margin == 10"
:src="margin_ico" class="store-margin"></image>
@ -714,6 +715,7 @@
},
},
onLoad(options) {
console.log(options)
let that = this
if (options.spid) {
app.globalData.spid = options.spid;

16
pages/index/component/homeComb.vue
View File

@ -6,15 +6,18 @@
<view class="location">
<view class="box flex_a_c_j_sb">
<view class="place_wrapper flex_a_c">
<view v-if="street&&street!='未开启定位'" @click="changeMap" class="iconfont icon-weizhi" style="color:#fff;font-size:40rpx;"></view>
<view v-if="street&&street!='未开启定位'" @click="changeMap" class="iconfont icon-weizhi"
style="color:#fff;font-size:40rpx;"></view>
<view v-if="street&&street!='未开启定位'" @click="changeMap" class="town_name">{{street}}</view>
</view>
<view class="flex_a_c_j_sb">
<view style="margin-right: 30rpx;" @click="scanQRcode" hover-class="none">
<view class="iconfont icon-saoma" style="color:#fff;font-size:40rpx;"> </view>
</view>
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none"
style="position: relative;">
<view class="iconfont icon-xiaoxi" style="color:#fff;font-size:40rpx;"> </view>
<text class="iconnum" v-if="userInfo.user_unread">{{userInfo.user_unread}}</text>
</navigator>
</view>
</view>
@ -26,7 +29,8 @@
<view class="swiper page_swiper" v-if="imgUrls.length">
<swiper :autoplay="true" :circular="circular" :interval="intervals" :duration="duration"
indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff" :current="swiperCur"
style="height:330rpx;margin: 0 auto;width:710rpx;" @change="swiperChange" :class="{ scalex:isScale }">
style="height:330rpx;margin: 0 auto;width:710rpx;" @change="swiperChange"
:class="{ scalex:isScale }">
<block v-for="(item,index) in imgUrls" :key="index">
<swiper-item :class="{ active: index == swiperCur,scalex:isScale }">
<view @click="goDetail(item)" class='slide-navigator acea-row row-between-wrapper'>
@ -439,11 +443,11 @@
.iconnum {
min-width: 14rpx;
color: #E93323;
background: #fff;
color: #fff;
background: #E93323;
border-radius: 15rpx;
position: absolute;
right: -10rpx;
left: 20rpx;
top: -10rpx;
font-size: 10px;
padding: 0 5px;

10
pages/user/index.vue
View File

@ -305,7 +305,9 @@
import {
toLogin
} from '@/libs/login.js';
import {showTab} from "@/utils/showTab.js";
import {
showTab
} from "@/utils/showTab.js";
const app = getApp();
export default {
components: {
@ -1263,11 +1265,11 @@
.iconnum {
min-width: 6px;
background-color: #fff;
color: var(--view-theme);
background-color: red;
color: #fff;
border-radius: 15rpx;
position: absolute;
right: -10rpx;
left: 50rpx;
top: -10rpx;
font-size: 10px;
padding: 0 4px;