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:
zmj 2024-05-05 22:22:45 +08:00
parent 4972fb2884
commit 42afabe62f
13 changed files with 484 additions and 419 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.45",
"versionCode" : 2037, "versionCode": 2045,
"transformPx": false, "transformPx": false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus": { "app-plus": {

1
pages/gather/gather.vue
View File

@ -366,7 +366,6 @@
}, },
methods: { methods: {
openDiver() { openDiver() {
// console.log("open")
this.subNVue.show('zoom-out', 300) this.subNVue.show('zoom-out', 300)
uni.$emit('diverGatherEmit', this.elInfo); uni.$emit('diverGatherEmit', this.elInfo);
}, },

41
pages/gather/subnvue/concat.nvue
View File

@ -4,7 +4,8 @@
<text class="font">跳过</text> <text class="font">跳过</text>
</view> </view>
<view class="tabbar" :style="{top:(top-12)+'px',left:(left-12)+'px'}"> <view class="tabbar" :style="{top:(top-12)+'px',left:(left-12)+'px'}">
<image src="/static/images/fabu.png" class="tab-icon"></image> <image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0fa43202312291702314919.png" class="tab-icon">
</image>
</view> </view>
<view class="" class="pointe" :style="{ left:(left-10)+'px',top:(top)+'px'}"> <view class="" class="pointe" :style="{ left:(left-10)+'px',top:(top)+'px'}">
<image src="/static/images/pointer.png" style="width: 254rpx;height: 254rpx;" mode=""></image> <image src="/static/images/pointer.png" style="width: 254rpx;height: 254rpx;" mode=""></image>
@ -12,11 +13,22 @@
<view class="center" :style="{left:(left+20)+'px', top:(top+60)+'px'}"> <view class="center" :style="{left:(left+20)+'px', top:(top+60)+'px'}">
<image src="/static/images/greenLineDown.png" style="width:35px;height: 60px;" mode=""></image> <image src="/static/images/greenLineDown.png" style="width:35px;height: 60px;" mode=""></image>
</view> </view>
<view class="tips" :style="{ left:left+'px',top:(top+120)+'px'}"> <!-- <view class="tips" :style="{ left:left+'px',top:(top+120)+'px'}">
<view class="tras" :class="{act:isActive}"> <view class="tras" :class="{act:isActive}">
<text class="font" style="line-height: 106rpx;">点击供销助农平台进入商户平台</text> <text class="font" style="line-height: 106rpx;">点击供销助农平台进入商户平台</text>
</view> </view>
</view> -->
<view class="tips-box" :style="{ left:left+'px',top:(top+120)+'px'}">
<view class="tips" style="position: absolute;padding-left: 20px;">
<view class="tras" :class="{act:isActive}">
<text style="font-size: 28rpx;line-height: 100rpx;color: white;">点击我的页面，进行商户入驻</text>
</view> </view>
</view>
<image src="/static/images/starpng.png" class="start" mode="">
</image>
</view>
<view class="next-btn center"> <view class="next-btn center">
<text class="next-btn-text font" @click="next">下一步(2/4)</text> <text class="next-btn-text font" @click="next">下一步(2/4)</text>
</view> </view>
@ -52,9 +64,7 @@
done: 1 done: 1
}).then(res => { }).then(res => {
console.log(res, 'res') console.log(res, 'res')
// uni.$emit('diverGatherSubEmit');
}) })
// uni.setStorageSync('is_new_user', false)
} }
}, },
onLoad() { onLoad() {
@ -81,11 +91,34 @@
border-radius: 30rpx; border-radius: 30rpx;
} }
/* .tips {
width: 462rpx;
height: 106rpx;
background-color: #5BE157;
border-radius: 20rpx;
} */
.tips-box {
width: 462rpx;
height: 178rpx;
position: absolute;
padding-top: 72rpx;
position: absolute;
}
.start {
width: 72rpx;
height: 72rpx;
position: absolute;
right: 0;
top: 20px;
}
.tips { .tips {
width: 462rpx; width: 462rpx;
height: 106rpx; height: 106rpx;
background-color: #5BE157; background-color: #5BE157;
border-radius: 20rpx; border-radius: 20rpx;
} }
.center { .center {

11
pages/helpPeople/helpPeople.vue
View File

@ -18,6 +18,13 @@
我是农民用户 我是农民用户
</view> </view>
</view> </view>
<view class="li" style="margin-top: 50rpx;" @click="navSw('/pages/index/index',true)">
<u-image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/48aed202402260946123969.webp" width="690rpx"
height="200rpx" style="position: absolute;"></u-image>
<view class="btn">
我是商户
</view>
</view>
</view> </view>
</template> </template>
@ -37,7 +44,9 @@
url url
}) })
}, },
navSw(url) { navSw(url, isNewStore) {
uni.setStorageSync('newStore', Boolean(isNewStore))
// return
uni.switchTab({ uni.switchTab({
url: url url: url
}) })

63
pages/index/index.vue
View File

@ -525,7 +525,8 @@
preview: false, preview: false,
isSupport: true, isSupport: true,
isIndexClick: true, isIndexClick: true,
scrollTop: 0 scrollTop: 0,
// newStore:
}; };
}, },
@ -597,30 +598,13 @@
}; };
}, },
// #endif // #endif
created(options) { created(options) {
let routes = getCurrentPages(); // 获取当前打开过的页面路由数组 let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
let curRoute = routes[routes.length - 1].route //获取当前页面路由 let curRoute = routes[routes.length - 1].route //获取当前页面路由
this.activeRouter = '/' + curRoute this.activeRouter = '/' + curRoute
}, },
onLoad(options) { onLoad(options) {
// #ifdef APP
uni.$on('offSubnvue', () => {
this.subNvue.hide('slide-out-left')
uni.switchTab({
url: '/pages/user/index'
})
})
uni.$on('diverIndexSubEmit', () => {
this.subNvue.hide('slide-out-left')
uni.switchTab({
url: '/pages/gather/gather'
})
})
// #endif
let that = this let that = this
this._options = options; this._options = options;
@ -641,14 +625,8 @@
}, },
onShow() { onShow() {
if (uni.getStorageSync('newStore')) this.openDiver();
let that = this; let that = this;
// #ifdef APP-PLUS
if (Boolean(uni.getStorageSync('is_new_user'))) {
this.subNvue = uni.getSubNVueById('newUser')
this.subNvue.show('slide-in-left', 300)
}
// #endif
that.isIntegral = uni.getStorageSync('isIntegral') that.isIntegral = uni.getStorageSync('isIntegral')
// #ifdef APP-PLUS // #ifdef APP-PLUS
if (that.appUpdate.openUpgrade == '1') { if (that.appUpdate.openUpgrade == '1') {
@ -694,8 +672,37 @@
}, },
methods: { methods: {
/*新商户引导页相关*/
openDiver() { openDiver() {
// #ifdef APP
this.subNvue = uni.getSubNVueById('newUser')
this.subNvue.show('slide-in-left', 300)
uni.$on('offSubnvue', () => {
this.subNvue.hide('slide-out-left')
if (uni.getStorageSync("newStore")) {
uni.switchTab({
url: '/pages/user/index'
})
}
});
// uni.$on('diverIndexSubEmit', () => {
// this.subNvue.hide('slide-out-left')
// uni.switchTab({
// url: '/pages/gather/gather'
// })
// })
// #endif
},
/* 新商户发布商品引导页 */
openListGoodsDiver() {
if (Boolean(this.userInfo.service?.mer_id)) { if (Boolean(this.userInfo.service?.mer_id)) {
uni.$on('diverIndexSubEmit', () => {
this.subNvue.hide('slide-out-left')
uni.switchTab({
url: '/pages/gather/gather'
})
})
isNewMer(this.userInfo.uid, this.userInfo.service?.mer_id).then( isNewMer(this.userInfo.uid, this.userInfo.service?.mer_id).then(
res => { res => {
if (res.data == 'true') { if (res.data == 'true') {
@ -1042,7 +1049,9 @@
showTab(res.data); showTab(res.data);
that.userInfo = res.data; that.userInfo = res.data;
this.$store.commit('SET_USERINFO', res.data); this.$store.commit('SET_USERINFO', res.data);
this.openDiver() // #ifdef APP
this.openListGoodsDiver()
// #endif
}); });
}, },
// 记录会员访问 // 记录会员访问

36
pages/index/subnvue/concat.nvue
View File

@ -6,11 +6,15 @@
<view class="next-btn" :style="{top:(offsetY-250)+'px'}"> <view class="next-btn" :style="{top:(offsetY-250)+'px'}">
<text class="next-btn-text font" @click="next">下一步(1/4)</text> <text class="next-btn-text font" @click="next">下一步(1/4)</text>
</view> </view>
<view class="tips center" :style="{top:(offsetY-178)+'px'}"> <view class="tips-box" :style="{right:20, top:(offsetY-218)+'px'}">
<view class="tips" style="position: absolute;padding-left: 20px;">
<view class="tras" :class="{act:isActive}"> <view class="tras" :class="{act:isActive}">
<text class="font" style="line-height: 106rpx;">点击生产页面，进入办公助手</text> <text style="font-size: 28rpx;line-height: 100rpx;color: white;">点击我的页面，进行商户入驻</text>
</view> </view>
</view> </view>
<image src="/static/images/starpng.png" class="start" mode="">
</image>
</view>
<view style="position: absolute;" class="center" :style="{top:(offsetY-120)+'px'}"> <view style="position: absolute;" class="center" :style="{top:(offsetY-120)+'px'}">
<image src="/static/images/greenLine.png" style="width:35px;height: 60px;" mode=""></image> <image src="/static/images/greenLine.png" style="width:35px;height: 60px;" mode=""></image>
</view> </view>
@ -25,6 +29,9 @@
</template> </template>
<script> <script>
import {
isNewMer
} from '@/api/user.js';
export default { export default {
data() { data() {
return { return {
@ -42,7 +49,11 @@
}, },
jump() { jump() {
uni.setStorageSync('is_new_user', false) isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id, {
done: 1
}).then(res => {
console.log(res, 'res')
})
uni.$emit('diverIndexSubEmit'); uni.$emit('diverIndexSubEmit');
} }
}, },
@ -73,11 +84,28 @@
top: 80rpx; top: 80rpx;
} }
.tips-box {
width: 462rpx;
height: 178rpx;
position: absolute;
padding-top: 72rpx;
position: absolute;
}
.start {
width: 72rpx;
height: 72rpx;
position: absolute;
right: 0;
top: 20px;
}
.tips { .tips {
width: 462rpx; width: 462rpx;
height: 106rpx; height: 106rpx;
background-color: #5BE157; background-color: #5BE157;
border-radius: 20rpx; border-radius: 20rpx;
} }
.center { .center {
@ -139,7 +167,7 @@
padding-left: 20rpx; padding-left: 20rpx;
position: absolute; position: absolute;
z-index: 999 !important; z-index: 999 !important;
width: 20px; width: 0px;
transition-property: width; transition-property: width;
transition-duration: 3s; transition-duration: 3s;
transition-delay: 0.1s; transition-delay: 0.1s;

4
pages/index/subnvue/newUser.nvue
View File

@ -7,7 +7,7 @@
<text class="next-btn-text font" style="line-height: 76rpx;" @click="next">下一步(1/2)</text> <text class="next-btn-text font" style="line-height: 76rpx;" @click="next">下一步(1/2)</text>
</view> </view>
<view class="target" :style="{left:screenWidth/4*3,top:screenHeight-68}"> <view class="target" :style="{left:screenWidth/4*3,top:screenHeight-68}">
<image src="/static/images/fabu.png" class="target-icon"></image> <image src="/static/images/ydwd.png" class="target-icon"></image>
<text class="target-text">我的</text> <text class="target-text">我的</text>
</view> </view>
<view :style="{left:screenWidth/4*3,top:screenHeight-130}"> <view :style="{left:screenWidth/4*3,top:screenHeight-130}">
@ -38,8 +38,8 @@
}, },
methods: { methods: {
jump() { jump() {
uni.setStorageSync("newStore", false)
uni.$emit('offSubnvue'); uni.$emit('offSubnvue');
uni.setStorageSync("is_new_user", 0)
}, },
next() { next() {
uni.$emit('offSubnvue'); uni.$emit('offSubnvue');

2
pages/store/settled/index1.vue
View File

@ -89,7 +89,7 @@
<view class="businessBox" <view class="businessBox"
:style="{'color':(business_name == '' || business_name.length == 5)?'#B2B2B2':''}" :style="{'color':(business_name == '' || business_name.length == 5)?'#B2B2B2':''}"
style="width: 400rpx;word-break: keep-all;line-height: 40rpx;font-size: 30rpx;"> style="width: 400rpx;word-break: keep-all;line-height: 40rpx;font-size: 30rpx;">
{{(business_name == '' || business_name.length == 5)?'请选择商圈':business_name}} {{(business_name == '' || business_name.length == 5)?'请选择商12圈':business_name}}
</view> </view>
<view class='iconfont icon-jiantou'></view> <view class='iconfont icon-jiantou'></view>
</picker> </picker>

14
pages/user/index.vue
View File

@ -174,14 +174,14 @@
</view> </view>
<!-- 会员菜单 --> <!-- 会员菜单 -->
<view class="user-menus" style="margin-top: 20rpx;"> <view class="user-menus" style="margin-top: 20rpx;">
<view class="title skeleton-rect">我的2服务</view> <view class="title skeleton-rect">我的服务</view>
<view class="menu-box"> <view class="menu-box">
<block v-for="(item,index) in personalMenu" :key="index" :id="'target'+index"> <block v-for="(item,index) in personalMenu" :key="index" :id="'target'+index">
<view v-if="item.isShow" class="item "> <view v-if="item.isShow" class="item ">
<view @click="authTo(item.url)" class="item-count"> <view @click="authTo(item.url)" class="item-count">
<image v-if="showSkeleton" class="skeleton_image skeleton-radius"></image> <image v-if="showSkeleton" class="skeleton_image skeleton-radius"></image>
<image v-else :src="item.pic" class="targets"></image> <image v-else :src="item.pic" class="targets"></image>
<text>{{item.name+index}}</text> <text>{{item.name}}</text>
</view> </view>
</view> </view>
</block> </block>
@ -483,12 +483,11 @@
.boundingClientRect((data) => { .boundingClientRect((data) => {
that.elInfo = data that.elInfo = data
// #ifdef APP-PLUS // #ifdef APP-PLUS
if (Boolean(uni.getStorageSync('is_new_user'))) { if (Boolean(uni.getStorageSync('newStore'))) {
that.subNvue = uni.getSubNVueById('userSubnvu') that.subNvue = uni.getSubNVueById('userSubnvu')
that.subNvue.show('slide-in-left', 300) that.subNvue.show('slide-in-left', 300)
uni.$emit('openUserSubnvue', JSON.stringify(data)) uni.$emit('openUserSubnvue', JSON.stringify(data))
} }
// #endif // #endif
}) })
.exec(); .exec();
@ -503,17 +502,12 @@
}, },
onShow: function() { onShow: function() {
// #ifdef APP-PLUS // #ifdef APP-PLUS
// this.subNvue = uni.getSubNVueById('userSubnvu') if ((uni.getStorageSync('newStore')) && this.elInfo) {
// this.subNvue.show('slide-in-left', 300)
// uni.$emit('openUserSubnvue', JSON.stringify(this.elInfo))
if (Boolean(uni.getStorageSync('is_new_user')) && this.elInfo) {
this.subNvue = uni.getSubNVueById('userSubnvu') this.subNvue = uni.getSubNVueById('userSubnvu')
this.subNvue.show('slide-in-left', 300) this.subNvue.show('slide-in-left', 300)
uni.$emit('openUserSubnvue', JSON.stringify(this.elInfo)) uni.$emit('openUserSubnvue', JSON.stringify(this.elInfo))
} }
// #endif // #endif
let that = this; let that = this;
let routes = getCurrentPages(); let routes = getCurrentPages();
let curRoute = routes[routes.length - 1].route let curRoute = routes[routes.length - 1].route

15
pages/user/subnvue/index.nvue
View File

@ -1,13 +1,14 @@
<template> <template>
<view class=""> <view class="">
<view class="jump" @click="jump"> <view class="jump" @click="next">
<text class="font">跳过</text> <text class="font">跳过</text>
</view> </view>
<view class="next-btn center" :style="{ left:screenWidth/2,top:(screenHeight-96)}"> <view class="next-btn center" :style="{ left:screenWidth/2,top:(screenHeight-96)}">
<text class="next-btn-text font" style="line-height: 76rpx;" @click="next">我知道了</text> <text class="next-btn-text font" style="line-height: 76rpx;" @click="next">我知道了</text>
</view> </view>
<view class="target" :style="{left:left-20,top:top-13.5}"> <view class="target" :style="{left:left-20,top:top-13.5}">
<image src="/static/images/fabu.png" class="target-icon"></image> <image src="http://lihai001.oss-cn-chengdu.aliyuncs.com/def/6202d269b6163b9ec7a4383559fc67a8.png"
class="target-icon"></image>
<text class="target-text">商家入驻</text> <text class="target-text">商家入驻</text>
</view> </view>
<view :style="{left:left-20,top:top-70}" class="trans1"> <view :style="{left:left-20,top:top-70}" class="trans1">
@ -39,20 +40,14 @@
} }
}, },
methods: { methods: {
jump() {
uni.$emit('offuserSubnvue');
uni.setStorageSync("is_new_user", 0)
},
next() { next() {
uni.$emit('offuserSubnvue'); uni.$emit('offuserSubnvue');
uni.setStorageSync("is_new_user", 0) uni.setStorageSync("newStore", false)
} }
}, },
onLoad() { onLoad() {
let that = this let that = this
uni.$on('openUserSubnvue', (data) => { uni.$on('openUserSubnvue', (data) => {
console.log('获取到的data')
console.log(JSON.parse(data))
that.left = JSON.parse(data).left that.left = JSON.parse(data).left
that.top = JSON.parse(data).top that.top = JSON.parse(data).top
}) })
@ -65,8 +60,6 @@
setTimeout(() => { setTimeout(() => {
that.isAct = true that.isAct = true
}) })
} }

BIN
static/images/pointer.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
static/images/ydwd.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

10
utils/uniMP.js
View File

@ -49,8 +49,8 @@ const loadMP = async (id) => {
else uni.$emit('showLoading', true, `初始化中... 99%`) else uni.$emit('showLoading', true, `初始化中... 99%`)
}, 200) }, 200)
let downloadTask = uni.downloadFile({ let downloadTask = uni.downloadFile({
// url: info.data.version_info?.dow_url, url: info.data.version_info?.dow_url,
url: "https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/36e40202405031202367449.wgt", // url: "https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/36e40202405031202367449.wgt",
success(res) { success(res) {
wgtFile = res.tempFilePath; wgtFile = res.tempFilePath;
setTimeout(() => { setTimeout(() => {
@ -221,8 +221,8 @@ const loadAppletMP = async (data) => {
else uni.$emit('showLoading', true, `初始化中... 99%`) else uni.$emit('showLoading', true, `初始化中... 99%`)
}, 200) }, 200)
let downloadTask = uni.downloadFile({ let downloadTask = uni.downloadFile({
// url: data.url, url: data.url,
url: "https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/3ffde202405031254278460.wgt", // url: "https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/3ffde202405031254278460.wgt",
success(res) { success(res) {
wgtFile = res.tempFilePath; wgtFile = res.tempFilePath;
console.log('初始化完成', wgtFile); console.log('初始化完成', wgtFile);
@ -356,7 +356,7 @@ const open = (id = null) => {
mp.sendUniMPEvent(appid, 'tocustomlist', id, (ret) => { mp.sendUniMPEvent(appid, 'tocustomlist', id, (ret) => {
console.log("开始发送消息") console.log("开始发送消息")
}); });
}, 3000) }, 1000)
} }
}); });