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": "惠农生活", "name": "惠农生活",
"appid": "__UNI__3A527D1", "appid": "__UNI__3A527D1",
"description": "", "description": "",
"versionName": "2.0.44", "versionName": "2.0.47",
"versionCode": 2044, "versionCode": 2047,
"transformPx": false, "transformPx": false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus": { "app-plus": {

32
pages/gather/gather.vue
View File

@ -144,8 +144,10 @@
<view style="margin-right: 30rpx;" @click="scanQRcode" hover-class="none"> <view style="margin-right: 30rpx;" @click="scanQRcode" hover-class="none">
<view class="iconfont icon-saoma" style="color:#fff;font-size:40rpx;"> </view> <view class="iconfont icon-saoma" style="color:#fff;font-size:40rpx;"> </view>
</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> <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> </navigator>
</view> </view>
</view> </view>
@ -177,7 +179,7 @@
<view class="title-img"> <view class="title-img">
<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/807b8202403111125379295.webp" mode=""></image> <image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/807b8202403111125379295.webp" mode=""></image>
</view> </view>
<view class="business com special_work" v-if="jurisdiction == false"> <view class="business com special_work" v-if="jurisdiction == false">
<view class="content"> <view class="content">
<block v-if="nowMenuList.length > 0"> <block v-if="nowMenuList.length > 0">
@ -211,7 +213,6 @@
<u-transition v-for="(item, index) in AllMenuList" :key="item.name" show> <u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
<view class="examine" @click.stop="pushMenu(item)"> <view class="examine" @click.stop="pushMenu(item)">
<image class="icon_img" :src="item.pic" mode="aspectFit"> </image> <image class="icon_img" :src="item.pic" mode="aspectFit"> </image>
<!-- <u-icon class="icon" name="plus-circle-fill"></u-icon> -->
<view class="icon">添加</view> <view class="icon">添加</view>
<text class="text">{{ item.name }}</text> <text class="text">{{ item.name }}</text>
</view> </view>
@ -284,6 +285,7 @@
backColor: 'rgba(252, 252, 252, 0)', backColor: 'rgba(252, 252, 252, 0)',
newData: {}, newData: {},
activeRouter: '', activeRouter: '',
userInfo: {},
}; };
}, },
computed: { computed: {
@ -302,7 +304,7 @@
} }
this.getUserInfo(); this.getUserInfo();
this.imgUrls = uni.getStorageSync('swiperImgList'); this.imgUrls = uni.getStorageSync('swiperImgList');
// 加载缓存中的菜单 2024/04/28 // 加载缓存中的菜单 2024/04/28
let menu = uni.getStorageSync('gatherMenuList'); let menu = uni.getStorageSync('gatherMenuList');
if (menu) { if (menu) {
@ -344,6 +346,16 @@
} }
}, },
methods: { methods: {
/**
* 获取个人用户信息
*/
getUserInfo: function() {
let that = this;
getUserInfo().then(res => {
showTab(res.data);
this.userInfo = res.data;
});
},
changeSwiper(e) { changeSwiper(e) {
if (e.length > 0 && e[1].value) { if (e.length > 0 && e[1].value) {
uni.navigateTo({ 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 { .site-box {
width: 100%; width: 100%;
/* #ifdef MP || APP-PLUS */ /* #ifdef MP || APP-PLUS */

6
pages/goods_details/index.vue
View File

@ -157,7 +157,7 @@
{{storeInfo.store_info}} {{storeInfo.store_info}}
</view> </view>
</view> </view>
<view v-if="specsInfo.params && specsInfo.params.length>0" <view v-if="specsInfo.params && specsInfo.params.length>0"
class="attribute acea-row row-between-wrapper" @click="seeSpecs"> class="attribute acea-row row-between-wrapper" @click="seeSpecs">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
@ -263,7 +263,8 @@
:url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`" :url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`"
hover-class="none" class="info"> hover-class="none" class="info">
<view class="name line1"> <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 <image
v-if="margin_ico_switch==1 && margin_ico && storeInfo.merchant.is_margin == 10" v-if="margin_ico_switch==1 && margin_ico && storeInfo.merchant.is_margin == 10"
:src="margin_ico" class="store-margin"></image> :src="margin_ico" class="store-margin"></image>
@ -714,6 +715,7 @@
}, },
}, },
onLoad(options) { onLoad(options) {
console.log(options)
let that = this let that = this
if (options.spid) { if (options.spid) {
app.globalData.spid = options.spid; app.globalData.spid = options.spid;

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

File diff suppressed because it is too large Load Diff

58
pages/user/index.vue
View File

@ -100,19 +100,19 @@
</view> </view>
<view>补贴余额 (元)</view> <view>补贴余额 (元)</view>
</view> --> </view> -->
<view class="p_d_item" @click="authTo('/pages/users/user_money/index')"> <view class="p_d_item" @click="authTo('/pages/users/user_money/index')">
<view class="p_d_count"> <view class="p_d_count">
<image <image
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e41f4202401201745498894.png"> src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e41f4202401201745498894.png">
</image> </image>
<view style="font-size: 30rpx;">我的余额 (元)</view> <view style="font-size: 30rpx;">我的余额 (元)</view>
</view> </view>
</view> </view>
<view class="p_d_item" @click="authTo('/pages/users/user_money/index')"> <view class="p_d_item" @click="authTo('/pages/users/user_money/index')">
<view class="p_d_count"> <view class="p_d_count">
<view>￥{{userInfo.now_money||"0.00"}}</view> <view>￥{{userInfo.now_money||"0.00"}}</view>
</view> </view>
</view> </view>
</view> </view>
<view @click="goSvip" class="cardVipA acea-row row-between-wrapper" v-if="svip_switch_status == 1"> <view @click="goSvip" class="cardVipA acea-row row-between-wrapper" v-if="svip_switch_status == 1">
@ -238,7 +238,7 @@
<view class="">备案号:蜀ICP备2022030133号-2A</view> <view class="">备案号:蜀ICP备2022030133号-2A</view>
<view class="">增值电信营业许可证号:川B2-20221250</view> <view class="">增值电信营业许可证号:川B2-20221250</view>
<view class="">联系我们：08302669767</view> <view class="">联系我们：08302669767</view>
<view style="padding-top: 50rpx;">{{appVersion}}</view> <view style="padding-top: 50rpx;">{{appVersion}}</view>
</view> </view>
<!-- <view v-else class="copy-right"> <!-- <view v-else class="copy-right">
<view class="iconfont icon-crmeb"></view> <view class="iconfont icon-crmeb"></view>
@ -300,12 +300,14 @@
import Auth from '../../libs/wechat'; import Auth from '../../libs/wechat';
import { import {
HTTP_REQUEST_URL, HTTP_REQUEST_URL,
ENV ENV
} from '@/config/app'; } from '@/config/app';
import { import {
toLogin toLogin
} from '@/libs/login.js'; } from '@/libs/login.js';
import {showTab} from "@/utils/showTab.js"; import {
showTab
} from "@/utils/showTab.js";
const app = getApp(); const app = getApp();
export default { export default {
components: { components: {
@ -453,17 +455,17 @@
newData: {}, newData: {},
activeRouter: '', activeRouter: '',
sysHeight: sysHeight, sysHeight: sysHeight,
appVersion: '' appVersion: ''
} }
}, },
onLoad() { onLoad() {
// #ifdef APP-PLUS // #ifdef APP-PLUS
this.appVersion = 'V ' + uni.getSystemInfoSync().appWgtVersion; this.appVersion = 'V ' + uni.getSystemInfoSync().appWgtVersion;
// #endif // #endif
// #ifdef H5 // #ifdef H5
this.appVersion = 'V ' + uni.getSystemInfoSync().appVersion; this.appVersion = 'V ' + uni.getSystemInfoSync().appVersion;
// #endif // #endif
if (ENV != 'prod') this.appVersion += " Beta" if (ENV != 'prod') this.appVersion += " Beta"
}, },
onReady() { onReady() {
this.isNodes++; this.isNodes++;
@ -636,7 +638,7 @@
getUserInfo: function() { getUserInfo: function() {
let that = this; let that = this;
getUserInfo().then(res => { getUserInfo().then(res => {
showTab(res.data); showTab(res.data);
that.userInfo = res.data; that.userInfo = res.data;
that.is_promoter = res.data.is_promoter; that.is_promoter = res.data.is_promoter;
that.extension_status = res.data.extension_status; that.extension_status = res.data.extension_status;
@ -1263,11 +1265,11 @@
.iconnum { .iconnum {
min-width: 6px; min-width: 6px;
background-color: #fff; background-color: red;
color: var(--view-theme); color: #fff;
border-radius: 15rpx; border-radius: 15rpx;
position: absolute; position: absolute;
right: -10rpx; left: 50rpx;
top: -10rpx; top: -10rpx;
font-size: 10px; font-size: 10px;
padding: 0 4px; padding: 0 4px;