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

add

Browse Source
This commit is contained in:
zmj 2024-04-30 09:33:23 +08:00
parent 8084522158
commit a0592d25ca
12 changed files with 687 additions and 1995 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
pages.json
View File

@ -21,17 +21,31 @@
"app-plus": { "app-plus": {
"scrollIndicator": false, //禁用原生导航栏 "scrollIndicator": false, //禁用原生导航栏
"subNVues": [{ "subNVues": [{
"id": "concatIndex", // 唯一标识 "id": "concatIndex", // 唯一标识
"path": "pages/index/subnvue/concat", // 页面路径 "path": "pages/index/subnvue/concat", // 页面路径
"type": "popup", "type": "popup",
"style": { "style": {
"position": "absolute", "position": "absolute",
"dock": "right", "dock": "right",
"width": "750rpx", "width": "750rpx",
"height": "1000px", "height": "1000px",
"background": "rgba(0,0,0,0.2)" "background": "rgba(0,0,0,0.2)"
}
},
{
"id": "newUser", // 唯一标识
"path": "pages/index/subnvue/newUser", // 页面路径
"type": "popup",
"style": {
"position": "absolute",
"dock": "right",
"width": "750rpx",
"height": "1000px",
"background": "rgba(0,0,0,0.2)"
}
} }
}]
]
} }
} }
}, { }, {
@ -81,7 +95,22 @@
"style": { "style": {
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"navigationBarTitleText": "个人中心", "navigationBarTitleText": "个人中心",
"navigationStyle": "custom" "navigationStyle": "custom",
"app-plus": {
"scrollIndicator": false, //禁用原生导航栏
"subNVues": [{
"id": "userSubnvu", // 唯一标识
"path": "pages/user/subnvue/index", // 页面路径
"type": "popup",
"style": {
"position": "absolute",
"dock": "right",
"width": "750rpx",
"height": "1500rpx",
"background": "rgba(0,0,0,0.2)"
}
}]
}
} }
}, },
{ {
@ -832,7 +861,8 @@
{ {
"path": "settled/index", "path": "settled/index",
"style": { "style": {
"navigationBarTitleText": "商家入驻" "navigationBarTitleText": "商家入驻",
"navigationStyle": "custom"
} }
}, },
{ {

63
pages/gather/gather.vue
View File

@ -172,11 +172,9 @@
</view> </view>
</view> </view>
</view> </view>
<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>
<button @click="test">jiaowoanjhsd</button>
<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">
@ -247,6 +245,9 @@
} from "@/api/public"; } from "@/api/public";
// #ifdef APP-PLUS // #ifdef APP-PLUS
import uniMP from '@/utils/uniMP.js'; import uniMP from '@/utils/uniMP.js';
import {
isNewMer
} from '@/api/user.js';
// #endif // #endif
export default { export default {
@ -301,6 +302,19 @@
}, },
onShow() { onShow() {
// #ifdef APP-PLUS
if (Boolean(this.$store.state.app.userInfo.service?.mer_id)) {
isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id).then(res => {
console.log('resdata', res.data)
if (res.data == 'true' && this.elInfo) {
this.subNvue = uni.getSubNVueById('concat')
this.subNvue.show('slide-in-left', 300)
// this.openDiver()
}
})
}
// #endif
this.street = this.$store.state.storage.address.townName; this.street = this.$store.state.storage.address.townName;
this.getNav(); this.getNav();
if (this.isLogin) { if (this.isLogin) {
@ -320,8 +334,10 @@
}, },
beforeDestroy() {}, beforeDestroy() {},
onReady() { onReady() {
if (uni.getStorageSync('is_new_user')) { // #ifdef APP-PLUS
let that = this let that = this
if (Boolean(this.$store.state.app.userInfo.service?.mer_id)) {
this.initMenu(true)
setTimeout(() => { setTimeout(() => {
const query = uni.createSelectorQuery().in(this); const query = uni.createSelectorQuery().in(this);
query query
@ -329,13 +345,33 @@
.boundingClientRect((data) => { .boundingClientRect((data) => {
let info = JSON.stringify(data) let info = JSON.stringify(data)
that.elInfo = data that.elInfo = data
// #ifdef APP-PLUS
that.openDiver() that.openDiver()
// #endif
}) })
.exec(); .exec();
}, 1000) }, 1000)
} }
// #endif
// if (uni.getStorageSync('is_new_user')) {
// let that = this
// setTimeout(() => {
// const query = uni.createSelectorQuery().in(this);
// query
// .select(".gatherDiver")
// .boundingClientRect((data) => {
// let info = JSON.stringify(data)
// that.elInfo = data
// // #ifdef APP-PLUS
// that.openDiver()
// // #endif
// })
// .exec();
// }, 1000)
// }
}, },
// #ifdef APP-PLUS // #ifdef APP-PLUS
onPageScroll(e) { onPageScroll(e) {
@ -356,17 +392,6 @@
uni.$emit('showLoading', false); uni.$emit('showLoading', false);
}, },
methods: { methods: {
test() {
let data = {
"name": "供销助农平台",
"app_id": "__UNI__1EE148C",
"pic": "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0fa43202312291702314919.png",
"url": "https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/457d9202404291733397921.wgt",
"version": "1.4.5"
}
uniMP.loadAppletMP(data)
},
openDiver() { openDiver() {
this.subNVue.show('zoom-out', 300) this.subNVue.show('zoom-out', 300)
uni.$emit('diverGatherEmit', this.elInfo); uni.$emit('diverGatherEmit', this.elInfo);
@ -465,7 +490,7 @@
} }
}, },
// 初始化菜单 // 初始化菜单
initMenu() { initMenu(flag = false) {
let nowMenu = uni.getStorageSync('gatherMenuList'); let nowMenu = uni.getStorageSync('gatherMenuList');
try { try {
let list = JSON.parse(nowMenu || '[]'); let list = JSON.parse(nowMenu || '[]');
@ -476,7 +501,7 @@
else now.push(item) else now.push(item)
}) })
// if() // if()
if (uni.getStorageSync('is_new_user') && !now.length) now[0] = all[0]; if (flag && !now.length) now[0] = all[0];
// console.log(all, now) // console.log(all, now)
this.AllMenuList = all; this.AllMenuList = all;

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

@ -41,7 +41,6 @@
this.subNVue.hide('zoom-in', 300, ) this.subNVue.hide('zoom-in', 300, )
setTimeout(() => { setTimeout(() => {
uni.$emit('diverGatherSubEmit'); uni.$emit('diverGatherSubEmit');
uni.setStorageSync('is_new_user', false)
}, 500) }, 500)
}, },
@ -54,7 +53,6 @@
let that = this let that = this
this.subNVue = uni.getSubNVueById('concat') this.subNVue = uni.getSubNVueById('concat')
uni.$on('diverGatherEmit', (data) => { uni.$on('diverGatherEmit', (data) => {
console.log('收到data', data)
that.left = data.left that.left = data.left
that.top = data.top that.top = data.top
}) })

60
pages/index/index.vue
View File

@ -597,16 +597,28 @@
}; };
}, },
// #endif // #endif
created(options) {
let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
let curRoute = routes[routes.length - 1].route //获取当前页面路由
this.activeRouter = '/' + curRoute
},
onLoad(options) { onLoad(options) {
// #ifdef APP // #ifdef APP
this.subNVue = uni.getSubNVueById('concatIndex') uni.$on('offSubnvue', () => {
uni.$on('diverIndexSubEmit', function(data) { this.subNvue.hide('slide-out-left')
that.subNVue.hide('slide-out-right', 300) uni.switchTab({
setTimeout(() => { url: '/pages/user/index'
uni.switchTab({ })
url: '/pages/gather/gather' })
}) uni.$on('diverIndexSubEmit', () => {
}, 400) this.subNvue.hide('slide-out-left')
uni.switchTab({
url: '/pages/gather/gather'
})
}) })
// #endif // #endif
@ -627,21 +639,35 @@
that.pageLoad(options); that.pageLoad(options);
this.$store.dispatch('INIT_CONFIG'); this.$store.dispatch('INIT_CONFIG');
}, },
created(options) {
let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
let curRoute = routes[routes.length - 1].route //获取当前页面路由
this.activeRouter = '/' + curRoute
},
onShow() { onShow() {
console.log(Boolean(this.$store.state.app.userInfo.service?.mer_id))
let that = this; let that = this;
// console.log() // #ifdef APP-PLUS
if (this.$store.state.app.userInfo.service?.mer_id) { if (Boolean(uni.getStorageSync('is_new_user'))) {
this.subNvue = uni.getSubNVueById('newUser')
this.subNvue.show('slide-in-left', 300)
}
if (Boolean(this.$store.state.app.userInfo.service?.mer_id)) {
isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id).then(res => { isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id).then(res => {
console.log('resdata', res.data)
if (res.data == 'true') { if (res.data == 'true') {
this.openDiver() this.subNvue = uni.getSubNVueById('concatIndex')
this.subNvue.show('slide-in-left', 300)
// this.openDiver()
} }
}) })
} }
// #endif
// console.log()
// if (this.$store.state.app.userInfo.service?.mer_id) {
// isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id).then(res => {
// if (res.data == 'true') {
// this.openDiver()
// }
// })
// }
// if (this.$store.state.app.userInfo) { // if (this.$store.state.app.userInfo) {
// console.log(this.$store.state.app.userInfo.service?.mer_id, 'sdsd') // console.log(this.$store.state.app.userInfo.service?.mer_id, 'sdsd')
@ -702,7 +728,7 @@
methods: { methods: {
openDiver() { openDiver() {
this.subNVue.show('slide-in-left', 300) this.subNVue.show('slide-in-left', 300)
uni.$emit('diverIndexEmit', this.userInfo); // uni.$emit('diverIndexEmit', this.userInfo);
}, },
loadCoupon() { loadCoupon() {
if (!this.showCoupon && !uni.getStorageSync('show_coupon') && uni.getStorageSync('is_new_user')) { if (!this.showCoupon && !uni.getStorageSync('show_coupon') && uni.getStorageSync('is_new_user')) {

165
pages/index/subnvue/newUser.nvue Normal file
View File

@ -0,0 +1,165 @@
<template>
<view class="">
<view class="jump" @click="jump">
<text class="font">跳过</text>
</view>
<view class="next-btn center" :style="{ left:screenWidth/2,top:(screenHeight-96)}">
<text class="next-btn-text font" style="line-height: 76rpx;" @click="next">下一步(1/2)</text>
</view>
<view class="target" :style="{left:screenWidth/4*3,top:screenHeight-68}">
<image src="/static/images/fabu.png" class="target-icon"></image>
<text class="target-text">我的</text>
</view>
<view :style="{left:screenWidth/4*3,top:screenHeight-130}">
<image src="/static/images/pointer.png" style="width: 254rpx;height: 254rpx;"></image>
</view>
<view class="tips-box" :style="{right:20,top:screenHeight-220}">
<view class="tips" style="position: absolute;padding-left: 20px;">
<view class="tras" :class="{act:isAct}">
<text style="font-size: 28rpx;line-height: 100rpx;color: white;">点击我的页面，进行商户入驻</text>
</view>
</view>
<image src="/static/images/starpng.png" class="start" mode="">
</image>
</view>
<image src="/static/images/greenLine.png" class="greenLine"
:style="{left:screenWidth/4*3+15,top:screenHeight-120}" mode=""></image>
</view>
</template>
<script>
export default {
data() {
return {
screenHeight: 800,
screenWidth: 375,
isAct: false
}
},
methods: {
jump() {
uni.$emit('offSubnvue');
uni.setStorageSync("is_new_user", 0)
},
next() {
uni.$emit('offSubnvue');
}
},
onLoad() {
let that = this
const res = uni.getSystemInfo({
success: (res => {
this.screenHeight = res.screenHeight
this.screenWidth = res.screenWidth
})
});
setTimeout(() => {
that.isAct = true
})
}
}
</script>
<style>
.jump {
position: absolute;
right: 30rpx;
top: 80rpx;
border: 1px solid white;
padding: 10rpx 20rpx;
border-radius: 30rpx;
}
.font {
font-size: 28rpx;
color: white;
lines: 1;
text-align: center;
}
.center {
transform: translateX(-50%);
}
.next-btn {
position: absolute;
width: 240rpx;
height: 76rpx;
border: 1px solid white;
border-radius: 38rpx;
}
.target {
width: 136rpx;
height: 136rpx;
background-color: white;
border-radius: 136rpx;
}
.target-icon {
width: 50rpx;
height: 50rpx;
position: absolute;
left: 68rpx;
transform: translate(-50%, -50%);
top: 68rpx;
}
.target-text {
font-size: 20rpx;
position: absolute;
left: 68rpx;
transform: translate(-50%, 0);
top: 100rpx;
}
.pointer {
position: absolute;
}
.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 {
width: 462rpx;
height: 106rpx;
background-color: #5BE157;
border-radius: 20rpx;
}
.tras {
width: 0px;
transition-property: width;
transition-duration: 3s;
transition-delay: 0.1s;
transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1.0);
}
.act {
width: 462rpx;
}
.greenLine {
width: 35px;
height: 60px;
position: absolute;
}
</style>

108
pages/store/applicationRecord/index.vue
View File

@ -1,7 +1,43 @@
<template> <template>
<view> <view style="padding: 42rpx 50rpx;">
<view class="card" v-for="item in listData" :key="item.mer_intention_id">
<view class="" style="display: flex;align-items: center;">
<view class="ciecle"
style="width: 24rpx;height: 24rpx;border-radius: 24rpx;border: 1px solid #DDDDDD;margin-right: 30rpx;">
</view>
<view class="" style="color: #777777;font-size: 24rpx;">
{{item.create_time}}
</view>
</view>
<view class=""
style="padding:40rpx;margin: 30rpx 0; width: 606rpx;margin-left: 30rpx;border-radius: 16rpx;box-shadow: 0rpx 6rpx 12rpx 2rpx rgba(0,0,0,0.16);">
<view class="" v-if="item.status==1" style="color: #20B128;font-size: 32rpx;">
审核通过
</view>
<view class="" v-if="item.status==2" style="color: #FC452F;font-size: 32rpx;">
审核失败
</view>
<u-line style="margin: 28rpx 0;"></u-line>
<view class="" style="margin-bottom: 20rpx;">
{{item.mer_name}}
</view>
<view class="" v-if="item.status==1" style="font-size: 24rpx; color: #777777;">
可以登录我们的工作台，把您的商品推向市场了
</view>
<view class="" v-if='item.status==2' style="font-size: 24rpx; color: #777777;">
备注:{{item.fail_msg}}
</view>
</view>
</view>
<view class="application-record" v-if="listData.length"> <view class="application-record" v-if="listData.length">
<view class="card-list" v-for="item in listData" :key="item.mer_intention_id"> <!-- <view class="card-list" v-for="item in listData" :key="item.mer_intention_id">
<view class="card-top"> <view class="card-top">
<view class="title">{{item.mer_name}}</view> <view class="title">{{item.mer_name}}</view>
<view class="time">提交时间：{{item.create_time}}</view> <view class="time">提交时间：{{item.create_time}}</view>
@ -17,7 +53,7 @@
</view> </view>
<view class="status-btn" @click="jump(item)">{{statusBtn(item.status)}}</view> <view class="status-btn" @click="jump(item)">{{statusBtn(item.status)}}</view>
</view> </view>
</view> </view> -->
</view> </view>
<view class='no-shop' v-if="!listData.length && !loading"> <view class='no-shop' v-if="!listData.length && !loading">
<view class='pictrue' style="margin: 0 auto;"> <view class='pictrue' style="margin: 0 auto;">
@ -41,11 +77,13 @@
import { import {
getApplicationRecordList getApplicationRecordList
} from '@/api/store.js' } from '@/api/store.js'
import {HTTP_REQUEST_URL} from '@/config/app'; import {
HTTP_REQUEST_URL
} from '@/config/app';
export default { export default {
data() { data() {
return { return {
domain:HTTP_REQUEST_URL, domain: HTTP_REQUEST_URL,
loading: false, loading: false,
listData: [], listData: [],
pageData: { pageData: {
@ -127,72 +165,20 @@
align-items: center; align-items: center;
background-color: #F5F5F5; background-color: #F5F5F5;
padding: 20rpx 30rpx; padding: 20rpx 30rpx;
.card-list {
width: 100%;
background-color: #fff;
padding: 20rpx 24rpx;
margin: 10rpx 20rpx;
border-radius: 12rpx;
.card-top {
height: 140rpx;
.title {
font-size: 28rpx;
font-weight: bold;
color: #333333;
}
.time {
color: #999999;
font-size: 24rpx;
padding: 5rpx 0;
}
.reason {
color: #E93323;
font-weight: bold;
font-size: 24rpx;
}
}
.line {
height: 2rpx;
margin: 20rpx 0 20rpx 0;
background-color: #EEEEEE;
}
.card-bottom {
display: flex;
justify-content: space-between;
align-items: center;
color: #333;
.card-status {
display: flex;
align-items: center;
.status-icon {
width: 30rpx;
height: 30rpx;
margin: 10rpx;
}
.status-text {
font-size: 28rpx;
font-weight: 500;
}
}
.status-btn {
font-size: 26rpx;
color: #555;
border: 1px solid #999999;
padding: 8rpx 32rpx;
border-radius: 40rpx;
}
}
}
} }
.no-shop { .no-shop {
width: 100%; width: 100%;
background-color: #fff; background-color: #fff;
height: 100vh; height: 100vh;
.pictrue { .pictrue {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
color: $uni-nothing-text; color: $uni-nothing-text;
image { image {
width: 414rpx; width: 414rpx;
height: 380rpx; height: 380rpx;

1946
pages/store/settled/index.vue
View File

File diff suppressed because it is too large Load Diff

98
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">
@ -174,13 +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">我的服务</view> <view class="title skeleton-rect">我的2服务</view>
<view class="menu-box"> <view class="menu-box">
<block v-for="(item,index) in personalMenu" :key="index"> <block v-for="(item,index) in personalMenu" :key="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" :id="'target'+index"
<image v-else :src="item.pic"></image> class="skeleton_image skeleton-radius"></image>
<image v-else :src="item.pic" :id="'target'+index" class="target"></image>
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
</view> </view>
@ -238,7 +239,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 +301,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: {
@ -331,9 +334,11 @@
}, },
data() { data() {
return { return {
elInfo: '',
//#ifdef H5 //#ifdef H5
isWeixin: this.$wechat.isWeixin(), isWeixin: this.$wechat.isWeixin(),
//#endif //#endif
subNvue: '',
domain: HTTP_REQUEST_URL, domain: HTTP_REQUEST_URL,
showSkeleton: true, //骨架屏显示隐藏 showSkeleton: true, //骨架屏显示隐藏
isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取 isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取
@ -453,25 +458,60 @@
newData: {}, newData: {},
activeRouter: '', activeRouter: '',
sysHeight: sysHeight, sysHeight: sysHeight,
appVersion: '' appVersion: ''
} }
}, },
onLoad() { onLoad() {
// #ifdef APP-PLUS // #ifdef APP-PLUS
this.appVersion = 'V ' + uni.getSystemInfoSync().appWgtVersion; uni.$on('offuserSubnvue', () => {
// #endif this.subNvue.hide('slide-out-right');
// #ifdef H5 })
this.appVersion = 'V ' + uni.getSystemInfoSync().appVersion; this.appVersion = 'V ' + uni.getSystemInfoSync().appWgtVersion;
// #endif // #endif
if (ENV != 'prod') this.appVersion += " Beta" // #ifdef H5
this.appVersion = 'V ' + uni.getSystemInfoSync().appVersion;
// #endif
if (ENV != 'prod') this.appVersion += " Beta"
}, },
onReady() { onReady() {
// #ifdef APP
this.isNodes++; this.isNodes++;
let that = this
setTimeout(() => {
const query = uni.createSelectorQuery().in(this);
query
.select("#target0")
.boundingClientRect((data) => {
that.elInfo = data
// #ifdef APP-PLUS
if (Boolean(uni.getStorageSync('is_new_user'))) {
that.subNvue = uni.getSubNVueById('userSubnvu')
that.subNvue.show('slide-in-left', 300)
uni.$emit('openUserSubnvue', JSON.stringify(data))
}
// #endif
})
.exec();
}, 500)
// #endif
}, },
mounted: function() { mounted: function() {
this.getVersion() this.getVersion()
}, },
onShow: function() { onShow: function() {
// #ifdef APP-PLUS
if (Boolean(uni.getStorageSync('is_new_user')) && this.elInfo) {
this.subNvue = uni.getSubNVueById('userSubnvu')
this.subNvue.show('slide-in-left', 300)
uni.$emit('openUserSubnvue', JSON.stringify(data))
}
// #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
@ -636,7 +676,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;

172
pages/user/subnvue/index.nvue Normal file
View File

@ -0,0 +1,172 @@
<template>
<view class="">
<view class="jump" @click="jump">
<text class="font">跳过</text>
</view>
<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>
</view>
<view class="target" :style="{left:left-13.5,top:top-13.5}">
<image src="/static/images/fabu.png" class="target-icon"></image>
<text class="target-text">商家入驻</text>
</view>
<view :style="{left:left-13.5,top:top-70}">
<image src="/static/images/pointer.png" style="width: 254rpx;height: 254rpx;"></image>
</view>
<view class="tips-box" :style="{left:left,top:top-170}">
<view class="tips" style="position: absolute;padding-left: 20px;">
<view class="tras" :class="{act:isAct}">
<text style="font-size: 28rpx;line-height: 100rpx;color: white;">点击我的页面，进行商户入驻</text>
</view>
</view>
<image src="/static/images/starpng.png" class="start" mode="">
</image>
</view>
<image src="/static/images/greenLine.png" class="greenLine" :style="{left:left,top:top-70}" mode="">
</image>
</view>
</template>
<script>
export default {
data() {
return {
screenHeight: 800,
screenWidth: 375,
isAct: false,
left: 36.272727966308594,
top: 401
}
},
methods: {
jump() {
uni.$emit('offuserSubnvue');
uni.setStorageSync("is_new_user", 0)
},
next() {
uni.$emit('offuserSubnvue');
uni.setStorageSync("is_new_user", 0)
}
},
onLoad() {
let that = this
uni.$on('openUserSubnvue', (data) => {
that.left = JSON.parse(data).left
that.top = JSON.parse(data).top
})
const res = uni.getSystemInfo({
success: (res => {
this.screenHeight = res.screenHeight
this.screenWidth = res.screenWidth
})
});
setTimeout(() => {
that.isAct = true
})
}
}
</script>
<style>
.jump {
position: absolute;
right: 30rpx;
top: 80rpx;
border: 1px solid white;
padding: 10rpx 20rpx;
border-radius: 30rpx;
}
.font {
font-size: 28rpx;
color: white;
lines: 1;
text-align: center;
}
.center {
transform: translateX(-50%);
}
.next-btn {
position: absolute;
width: 240rpx;
height: 76rpx;
border: 1px solid white;
border-radius: 38rpx;
}
.target {
width: 136rpx;
height: 136rpx;
background-color: white;
border-radius: 136rpx;
}
.target-icon {
width: 50rpx;
height: 50rpx;
position: absolute;
left: 68rpx;
transform: translate(-50%, -50%);
top: 68rpx;
}
.target-text {
font-size: 20rpx;
position: absolute;
left: 68rpx;
transform: translate(-50%, 0);
top: 100rpx;
}
.pointer {
position: absolute;
}
.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 {
width: 462rpx;
height: 106rpx;
background-color: #5BE157;
border-radius: 20rpx;
}
.tras {
width: 0px;
transition-property: width;
transition-duration: 3s;
transition-delay: 0.1s;
transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1.0);
}
.act {
width: 462rpx;
}
.greenLine {
width: 35px;
height: 60px;
position: absolute;
}
</style>

12
pages/users/login/login_copy.vue
View File

@ -89,7 +89,7 @@
</view> </view>
</view> </view>
<view class="logon" @click="loginMobile" :hidden="current !== 0">登5445录</view> <view class="logon" @click="loginMobile" :hidden="current !== 0">登录</view>
<view class="logon" @click="submit" :hidden="current === 0">账号登录</view> <view class="logon" @click="submit" :hidden="current === 0">账号登录</view>
<view class="protocol acea-row row-between-wrapper"> <view class="protocol acea-row row-between-wrapper">
<checkbox-group class="checkgroup" @change='isAgree=!isAgree'> <checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
@ -229,7 +229,7 @@
<u-overlay :show="showTips"> <u-overlay :show="showTips">
<view class="tips"> <view class="tips">
<view class="" style="font-size: 32rpx;"> <view class="" style="font-size: 32rpx;">
{{tispTile}} 温馨提示
</view> </view>
<block v-if="tispTile=='密码错误'"> <block v-if="tispTile=='密码错误'">
<view class=""> <view class="">
@ -261,10 +261,18 @@
</view> </view>
</block> </block>
<block v-else> <block v-else>
<view class="">
{{tispTile}}
</view>
<view class="" style="display: flex;width: 236rpx;"> <view class="" style="display: flex;width: 236rpx;">
<u-button color="#46BF6F" text="确定" @tap="showTips=false"></u-button> <u-button color="#46BF6F" text="确定" @tap="showTips=false"></u-button>
</view> </view>
</block> </block>
</view> </view>
</u-overlay> </u-overlay>
<!-- tips结束 --> <!-- tips结束 -->

BIN
static/images/pointer.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB