chore(代码合并): 代码从Custom/common分支合并

This commit is contained in:
2026-01-04 09:40:09 +08:00
parent 26f8537d24
commit 4da852944e
145 changed files with 13781 additions and 11628 deletions

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view>
<view :style="themeColor">
<mescroll-uni ref="mescroll" @getData="getData" v-if="storeToken">
<block slot="list">
<view class="nc-info-list-content">
@@ -66,12 +65,20 @@
import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
import nsLogin from '@/components/ns-login/ns-login.vue';
import loadingCover from '@/components/loading-cover/loading-cover.vue';
import nsEmpty from '@/components/ns-empty/ns-empty.vue';
// #ifdef MP-WEIXIN
import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
// #endif
export default {
components: {
MescrollUni,
nsLogin,
loadingCover
loadingCover,
nsEmpty,
// #ifdef MP-WEIXIN
privacyPopup
// #endif
},
data() {
return {

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view class="account-list-content">
<view class="account-list-content" :style="themeColor">
<view class="edit-item">
<text class="tit">{{ $lang('name') }}</text>
<input class="desc uni-input" type="text" maxlength="30" placeholder="请输入真实姓名" name="name" v-model="formData.realname" />

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view class="address-edit-content">
<view class="address-edit-content" :style="themeColor">
<view class="edit-wrap">
<view class="tip">地址信息</view>
<view class="edit-item">

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view class="container">
<view class="container" :style="themeColor">
<view class="bank-account-wrap" @click="goAccount()">
<view class="tx-wrap" v-if="bankAccountInfo.withdraw_type">
<text class="tx-to">提现到</text>

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view class="container">
<view class="container" :style="themeColor">
<view class="assets-wrap">
<view class="assets-block">
<view class="assets-tips"><text>风险提示确认申请后您的资产将被清空且不可找回!</text></view>

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view class="balance">
<view class="balance" :style="themeColor">
<!-- #ifdef MP-WEIXIN -->
<view class="custom-navbar" :style="{
'padding-top': menuButtonBounding.top + 'px',

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view>
<view :style="themeColor">
<!-- <scroll-view id="tab-bar" class="order-nav" :scroll-x="true" :show-scrollbar="false" :scroll-into-view="scrollInto">
<view v-for="(statusItem, statusIndex) in statusList" :key="statusIndex" class="uni-tab-item" :id="statusItem.id" :data-current="statusIndex" @click="ontabtap">
<text class="uni-tab-item-title" :class="statusIndex == orderStatus ? 'uni-tab-item-title-active' : ''">{{ statusItem.name }}</text>
@@ -55,12 +54,18 @@
import nsLogin from '@/components/ns-login/ns-login.vue';
import loadingCover from '@/components/loading-cover/loading-cover.vue';
import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
// #ifdef MP-WEIXIN
import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
// #endif
export default {
components: {
nsEmpty,
nsLogin,
loadingCover,
MescrollUni
MescrollUni,
// #ifdef MP-WEIXIN
privacyPopup
// #endif
},
data() {
const currentDate = this.getDate({

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view class="container">
<view class="container" :style="themeColor">
<view class="agreement-box">
<view class="agreement-intro">
<view class="align-center agreement-title">{{ agreement.title }}</view>

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view class="container">
<view class="container" :style="themeColor">
<view class="cancel-wrap">
<view class="cancel-img"><image :src="$util.img('public/uniapp/member/refuse.png')"></image></view>
<view class="cancel-title">您的申请已拒绝</view>

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view class="container">
<view class="container" :style="themeColor">
<view class="cancelstatus-wrap">
<view class="cancelstatus-block">
<view class="cancelstatus-box">

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view class="container">
<view class="container" :style="themeColor">
<view class="cancel-wrap">
<view class="cancel-img">
<image :src="$util.img('public/uniapp/member/success.png')"></image>

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view class="member-level">
<view class="member-level" :style="themeColor">
<view class="level-top">
<image :src="$util.img('public/uniapp/level/card-top-bg.png')"></image>
</view>

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view class="page">
<view class="page" :style="themeColor">
<view class="agreement-title">{{ title }}</view>
<view class="agreement-content"><rich-text :nodes="content"></rich-text></view>
</view>

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view class="member-level">
<view class="member-level" :style="themeColor">
<block v-if="levelList.length">
<view class="level-top">
<image :src="$util.img('public/uniapp/level/card-top-bg.png')"></image>

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view>
<view :style="themeColor">
<mescroll-uni ref="mescroll" @getData="getData" class="member-point" :size="8" @listenRefresh="listenRefresh" v-if="storeToken">
<view class="goods_list" slot="list">
<block v-if="collectionList.length > 0">
@@ -41,6 +40,9 @@ import nsEmpty from '@/components/ns-empty/ns-empty.vue';
import nsLogin from '@/components/ns-login/ns-login.vue';
import loadingCover from '@/components/loading-cover/loading-cover.vue';
import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
// #ifdef MP-WEIXIN
import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
// #endif
import collection from './public/js/collection.js';
export default {
@@ -49,7 +51,10 @@ export default {
nsEmpty,
nsLogin,
loadingCover,
MescrollUni
MescrollUni,
// #ifdef MP-WEIXIN
privacyPopup
// #endif
},
mixins: [collection],
data() {

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view class="contact">
<view class="contact" :style="themeColor">
<image :src="$util.img('public/uniapp/member/contact_service.png')" mode="widthFix"></image>
<!--<ns-contact><button type="primary">联系客服</button></ns-contact>-->
</view>

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view :class="isIphoneX ? 'iphone-x' : ''">
<view :style="themeColor" :class="isIphoneX ? 'iphone-x' : ''">
<view class="cf-container color-line-border" v-if="storeToken">
<view class="tab">
<view @click="changeState(1)"><text :class="state == 1 ? 'color-base-text active color-base-border-bottom' : ''">未使用</text></view>
@@ -75,12 +74,18 @@ import nsEmpty from '@/components/ns-empty/ns-empty.vue';
import nsLogin from '@/components/ns-login/ns-login.vue';
import loadingCover from '@/components/loading-cover/loading-cover.vue';
import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
// #ifdef MP-WEIXIN
import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
// #endif
export default {
components: {
nsEmpty,
nsLogin,
loadingCover,
MescrollUni
MescrollUni,
// #ifdef MP-WEIXIN
privacyPopup
// #endif
},
data() {
return {

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view class="container">
<view class="container" :style="themeColor">
<view class="head-wrap" v-if="storeToken">
<text @click="manageFootprint">{{ manage ? '完成' : '管理' }}</text>
</view>
@@ -69,13 +68,19 @@ import nsEmpty from '@/components/ns-empty/ns-empty.vue';
import nsLogin from '@/components/ns-login/ns-login.vue';
import loadingCover from '@/components/loading-cover/loading-cover.vue';
import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
// #ifdef MP-WEIXIN
import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
// #endif
export default {
components: {
nsEmpty,
nsLogin,
loadingCover,
MescrollUni
MescrollUni,
// #ifdef MP-WEIXIN
privacyPopup
// #endif
},
data() {
return {

View File

@@ -1,65 +1,75 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch"
:style="{ backgroundImage: bgImg }">
<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="true" />
</view>
<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl"
:scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
:haveTopCategory="true" />
<ns-copyright v-show="isShowCopyRight" />
</diy-index-page>
<view v-else class="bg-index"
:style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" />
<ns-copyright v-show="isShowCopyRight" />
<view class="foot">
<view class="item" @click="tourl('/pages_tool/agreement/contenr?type=0')">{{ isEnEnv ? 'Privacy Policy' : '隐私协议'}}</view>
<view class="item" @click="tourl('/pages_tool/agreement/contenr?type=1')">{{ isEnEnv ? 'Registration Agreement' : '注册协议'}}</view>
<view :style="themeColor">
<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }"
class="page-img">
<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch"
:style="{ backgroundImage: bgImg }">
<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="true" />
</view>
</view>
<template
v-if="diyData.global && diyData.global.popWindow && diyData.global.popWindow.count != -1 && diyData.global.popWindow.imageUrl">
<view @touchmove.prevent.stop>
<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
<view class="image-wrap">
<image :src="$util.img(diyData.global.popWindow.imageUrl)" :style="popWindowStyle"
@click="uniPopupWindowFn()" mode="aspectFit" />
</view>
<text class="iconfont icon-round-close" @click="closePopupWindow"></text>
</uni-popup>
<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl"
:scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
:haveTopCategory="true" />
<ns-copyright v-show="isShowCopyRight" />
</diy-index-page>
<view v-else class="bg-index"
:style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" />
<ns-copyright v-show="isShowCopyRight" />
<view class="foot">
<view class="item" @click="tourl('/pages_tool/agreement/contenr?type=0')">{{
$lang('privacyPolicy') }}</view>
<view class="item" @click="tourl('/pages_tool/agreement/contenr?type=1')">{{
$lang('registrationAgreement') }}</view>
</view>
<!-- 退出登录和账号注销按钮 -->
<view class="action-buttons" v-if="storeToken">
<view class="action-btn cancel-btn" @click="cancellation">{{ $lang('cancellation') }}</view>
<view class="action-btn logout-btn" @click="logout">{{ $lang('logout') }}</view>
</view>
</view>
</template>
<!-- 底部tabBar -->
<view id="tab-bar" :class="{ hide: bottomNavHidden }" v-if="openBottomNav">
<diy-bottom-nav @callback="callback" />
</view>
<template
v-if="diyData.global && diyData.global.popWindow && diyData.global.popWindow.count != -1 && diyData.global.popWindow.imageUrl">
<view @touchmove.prevent.stop>
<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
<view class="image-wrap">
<image :src="$util.img(diyData.global.popWindow.imageUrl)" :style="popWindowStyle"
@click="uniPopupWindowFn()" mode="aspectFit" />
</view>
<text class="iconfont icon-round-close" @click="closePopupWindow"></text>
</uni-popup>
</view>
</template>
<!-- 收藏 -->
<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
<view v-if="showTip" class="collectPopupWindow"
:style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit" />
<text @click="closeCollectPopupWindow">我知道了</text>
<!-- 底部tabBar -->
<view id="tab-bar" :class="{ hide: bottomNavHidden }" v-if="openBottomNav">
<diy-bottom-nav @callback="callback" />
</view>
</uni-popup>
<ns-birthday-gift ref="birthdayGift"></ns-birthday-gift>
<ns-new-gift ref="nsNewGift"></ns-new-gift>
<!-- 收藏 -->
<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
<view v-if="showTip" class="collectPopupWindow"
:style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit" />
<text @click="closeCollectPopupWindow">我知道了</text>
</view>
</uni-popup>
<ns-birthday-gift ref="birthdayGift"></ns-birthday-gift>
<ns-new-gift ref="nsNewGift"></ns-new-gift>
<hover-nav></hover-nav>
<!-- #ifdef MP-WEIXIN -->
<!-- 小程序隐私协议 -->
<privacy-popup ref="privacyPopup"></privacy-popup>
<!-- #endif -->
<hover-nav></hover-nav>
<!-- #ifdef MP-WEIXIN -->
<!-- 小程序隐私协议 -->
<privacy-popup ref="privacyPopup"></privacy-popup>
<!-- #endif -->
</view>
</view>
</template>
@@ -79,6 +89,52 @@ export default {
tourl(url) {
this.$util.redirectTo(url);
},
// 退出登录
logout() {
uni.showModal({
title: this.$lang('logoutTitle'),
content: this.$lang('logoutContent'),
success: (res) => {
if (res.confirm) {
this.$store.commit('setToken', '');
this.$store.commit('setMemberInfo', '');
this.$store.dispatch('emptyCart');
uni.removeStorageSync('authInfo');
this.$util.redirectTo('/pages/member/index');
}
}
});
},
// 账号注销
cancellation() {
uni.showModal({
title: this.$lang('cancellationTitle'),
content: this.$lang('cancellationContent'),
confirmColor: '#000000',
success: res => {
if (res.confirm) {
this.$api.sendRequest({
url: '/membercancel/api/membercancel/apply',
success: rres => {
if (rres.code >= 0) {
this.$store.commit('setToken', '');
this.$store.commit('setMemberInfo', '');
this.$store.dispatch('emptyCart');
uni.removeStorageSync('authInfo');
this.$util.redirectTo('/pages/member/index');
} else {
this.$util.showToast({
title: rres.message
});
}
}
});
}
}
});
}
}
@@ -100,6 +156,7 @@ export default {
color: #F4391c
}
}
</style>
<style scoped>
@@ -133,4 +190,33 @@ export default {
/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
max-height: unset !important;
}
.action-buttons {
display: flex;
flex-direction: column;
align-items: center;
margin: 20rpx 30rpx 40rpx;
gap: 20rpx;
}
.action-btn {
width: 80%;
height: 80rpx;
line-height: 80rpx;
text-align: center;
border-radius: 40rpx;
font-size: 28rpx;
font-weight: 500;
}
.logout-btn {
background-color: var(--main-color);
color: #fff;
border: 1rpx solid #ddd;
}
.cancel-btn {
background-color:var(--main-color);
color: #fff;
}
</style>

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view>
<view :style="themeColor">
<view v-if="indent == 'all' && memberInfo" class="info-wrap">
<!-- 头像@click="headImage" -->
<view class="info-list-cell info-item info-list-con" hover-class="cell-hover">

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view>
<view :style="themeColor">
<template v-if="memberInfo">
<!-- 修改用户名 -->
<view v-if="indent == 'username'" class="edit-info">

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view>
<view :style="themeColor">
<view v-if="info" style="background-color: #fff;">
<view class="invite_adv">

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view class="member-level">
<view :style="themeColor" class="member-level">
<view class="level-top">
<image :src="$util.img('public/uniapp/level/level-top-bg.png')"></image>
</view>

View File

@@ -1,275 +1,274 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view class="member-level">
<view class="grow-explain">
<view class="explain-title">
<image :src="$util.img('public/uniapp/level/growth_that_left.png')" mode="aspectFit"></image>
成长值说明
<image :src="$util.img('public/uniapp/level/growth_that_right.png')" mode="aspectFit"></image>
</view>
<view class="explain-table">
<view class="explain-tr">
<text class="explain-th">等级</text>
<text class="explain-th">成长值</text>
</view>
<view class="explain-tr" v-for="(item, index) in levelList" :key="index">
<text class="explain-td">{{ item.level_name }}</text>
<text class="explain-td">{{ item.growth }}</text>
</view>
</view>
</view>
<view class="grow-value">
<view class="title">
<image :src="$util.img('public/uniapp/level/explain.png')" mode="aspectFit"></image>
<text>什么是成长值</text>
</view>
<view class="content color-tip">成长值是消费者在店铺成为会员后通过消费计算出来的值成长值决定会员等级会员等级越高所享受的会员权益和会员礼包就越多</view>
</view>
<view class="acquisition-grow">
<view class="title">
<image :src="$util.img('public/uniapp/level/explain.png')" mode="aspectFit"></image>
<text>如何获得成长值</text>
</view>
<view class="content color-tip">
<text>1注册会员送x成长值</text>
<text>2会员充值到余额送x成长值</text>
<text>3会员签到送x成长值</text>
<text>4会员消费x元交易完成即可获得x个成长值</text>
</view>
</view>
<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
<loading-cover ref="loadingCover"></loading-cover>
</view>
</template>
<script>
import nsProgress from '@/pages_tool/components/ns-progress/ns-progress.vue';
import toTop from '@/components/toTop/toTop.vue';
import scroll from '@/common/js/scroll-view.js';
export default {
components: {
nsProgress,
toTop
},
mixins: [scroll],
data() {
return {
curIndex: 0,
descIndex: 0,
isDescAnimating: false,
scaleX: (634 / 540).toFixed(4),
scaleY: (378 / 330).toFixed(4),
swiperConfig: {
//type==1时的默认参数
indicatorDots: false,
indicatorColor: 'rgba(255, 255, 255, .4)',
indicatorActiveColor: 'rgba(255, 255, 255, 1)',
interval: 3000,
duration: 300,
circular: false,
previousMargin: '58rpx',
nextMargin: '58rpx'
},
levelList: [{
needGrowth: 0,
growth: 0
}],
levelId: 0,
growth: 0,
nowIndex: 0, //我当前所在等级的index
rule: [] //成长值规则
};
},
computed: {
listLen() {
return this.levelList.length;
},
},
onLoad() {
//会员等级
this.getLevelList();
this.getLevelRule();
},
onShow() {},
filters: {
rate(index, list, growth) {
let nowGrowth = Number(growth);
let minGrouth = Number(list[index].growth);
if (index == list.length - 1) {
return nowGrowth > minGrouth ? 100 : 0;
} else {
let maxGrouth = Number(list[index + 1].growth);
let num2 = nowGrowth - minGrouth;
let num1 = maxGrouth - minGrouth;
let num = Math.floor((num2 / num1) * 100);
return num > 100 ? 100 : num;
}
}
},
methods: {
swiperChange(e) {
let that = this;
this.curIndex = e.detail.current;
this.isDescAnimating = true;
let timer = setTimeout(function() {
that.descIndex = e.detail.current;
clearTimeout(timer);
}, 150);
},
animationfinish(e) {
this.isDescAnimating = false;
},
getBannerDetail(index) {
uni.showLoading({
title: '将前往详情页面',
duration: 2000,
mask: true
});
},
getLevelList() {
this.$api.sendRequest({
url: '/api/memberlevel/lists',
success: res => {
if (res.data && res.code == 0) {
this.levelList = res.data;
this.levelId = this.memberInfo.member_level;
this.growth = this.memberInfo.growth;
for (let i = 0; i < this.levelList.length; i++) {
if (this.levelList[i].level_id == this.levelId) {
this.curIndex = i;
this.descIndex = i;
this.nowIndex = i;
break;
}
}
this.levelList.forEach((v, i) => {
let rate = 0;
if (i != this.levelList.length - 1) {
v.needGrowth = Number(this.levelList[i + 1].growth) - Number(this.growth); //距离下一阶段需要多少成长值
if (v.needGrowth <= 0) {
rate = 100;
} else {
rate = (this.growth / this.levelList[i + 1].growth).toFixed(2) * 100;
}
} else {
v.needGrowth = Number(this.levelList[i].growth) - Number(this.growth); //距离下一阶段需要多少成长值
if (v.needGrowth <= 0) {
rate = 100;
} else {
rate = (this.growth / this.levelList[i].growth).toFixed(2) * 100;
}
}
v.rate = rate;
});
this.levelList.forEach(v => {
if (v.consume_discount) {
v.consume_discount = (v.consume_discount / 10).toFixed(2);
}
});
if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
} else {
this.$util.showToast({
title: res.message
});
if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
}
}
});
},
getLevelRule() {
this.$api.sendRequest({
url: '/api/member/accountrule',
success: res => {
if (res.code == 0 && res.data && res.data.growth) {
this.rule = res.data.growth;
}
}
});
}
}
};
</script>
<style lang="scss">
page {
background-color: #fff;
}
.grow-explain {
padding: 30rpx;
margin-top: 30rpx;
.explain-title {
display: flex;
align-items: center;
justify-content: center;
line-height: 1;
image {
margin: 0 20rpx;
width: 54rpx;
height: 18rpx;
}
margin-bottom: 40rpx;
}
.explain-tr {
display: flex;
}
.explain-th {
padding: 10rpx 30rpx;
&~.explain-th {
border-left: 4rpx solid #fff;
}
flex: 1;
background-color: #f6f1e4;
}
.explain-td {
padding: 10rpx 30rpx;
&~.explain-td {
border-left: 4rpx solid #fff;
}
height: 60rpx;
line-height: 60rpx;
flex: 1;
background-color: #fcfbf7;
}
}
.grow-value,
.acquisition-grow {
padding: 0 30rpx 30rpx;
.title {
display: flex;
align-items: center;
image {
width: 30rpx;
height: 30rpx;
margin-right: 10rpx;
}
}
.content {
font-size: 24rpx;
margin-left: 40rpx;
text {
display: block;
}
}
}
<template>
<view :style="themeColor" class="member-level">
<view class="grow-explain">
<view class="explain-title">
<image :src="$util.img('public/uniapp/level/growth_that_left.png')" mode="aspectFit"></image>
成长值说明
<image :src="$util.img('public/uniapp/level/growth_that_right.png')" mode="aspectFit"></image>
</view>
<view class="explain-table">
<view class="explain-tr">
<text class="explain-th">等级</text>
<text class="explain-th">成长值</text>
</view>
<view class="explain-tr" v-for="(item, index) in levelList" :key="index">
<text class="explain-td">{{ item.level_name }}</text>
<text class="explain-td">{{ item.growth }}</text>
</view>
</view>
</view>
<view class="grow-value">
<view class="title">
<image :src="$util.img('public/uniapp/level/explain.png')" mode="aspectFit"></image>
<text>什么是成长值</text>
</view>
<view class="content color-tip">成长值是消费者在店铺成为会员后通过消费计算出来的值成长值决定会员等级会员等级越高所享受的会员权益和会员礼包就越多</view>
</view>
<view class="acquisition-grow">
<view class="title">
<image :src="$util.img('public/uniapp/level/explain.png')" mode="aspectFit"></image>
<text>如何获得成长值</text>
</view>
<view class="content color-tip">
<text>1注册会员送x成长值</text>
<text>2会员充值到余额送x成长值</text>
<text>3会员签到送x成长值</text>
<text>4会员消费x元交易完成即可获得x个成长值</text>
</view>
</view>
<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
<loading-cover ref="loadingCover"></loading-cover>
</view>
</template>
<script>
import nsProgress from '@/pages_tool/components/ns-progress/ns-progress.vue';
import toTop from '@/components/toTop/toTop.vue';
import scroll from '@/common/js/scroll-view.js';
export default {
components: {
nsProgress,
toTop
},
mixins: [scroll],
data() {
return {
curIndex: 0,
descIndex: 0,
isDescAnimating: false,
scaleX: (634 / 540).toFixed(4),
scaleY: (378 / 330).toFixed(4),
swiperConfig: {
//type==1时的默认参数
indicatorDots: false,
indicatorColor: 'rgba(255, 255, 255, .4)',
indicatorActiveColor: 'rgba(255, 255, 255, 1)',
interval: 3000,
duration: 300,
circular: false,
previousMargin: '58rpx',
nextMargin: '58rpx'
},
levelList: [{
needGrowth: 0,
growth: 0
}],
levelId: 0,
growth: 0,
nowIndex: 0, //我当前所在等级的index
rule: [] //成长值规则
};
},
computed: {
listLen() {
return this.levelList.length;
},
},
onLoad() {
//会员等级
this.getLevelList();
this.getLevelRule();
},
onShow() {},
filters: {
rate(index, list, growth) {
let nowGrowth = Number(growth);
let minGrouth = Number(list[index].growth);
if (index == list.length - 1) {
return nowGrowth > minGrouth ? 100 : 0;
} else {
let maxGrouth = Number(list[index + 1].growth);
let num2 = nowGrowth - minGrouth;
let num1 = maxGrouth - minGrouth;
let num = Math.floor((num2 / num1) * 100);
return num > 100 ? 100 : num;
}
}
},
methods: {
swiperChange(e) {
let that = this;
this.curIndex = e.detail.current;
this.isDescAnimating = true;
let timer = setTimeout(function() {
that.descIndex = e.detail.current;
clearTimeout(timer);
}, 150);
},
animationfinish(e) {
this.isDescAnimating = false;
},
getBannerDetail(index) {
uni.showLoading({
title: '将前往详情页面',
duration: 2000,
mask: true
});
},
getLevelList() {
this.$api.sendRequest({
url: '/api/memberlevel/lists',
success: res => {
if (res.data && res.code == 0) {
this.levelList = res.data;
this.levelId = this.memberInfo.member_level;
this.growth = this.memberInfo.growth;
for (let i = 0; i < this.levelList.length; i++) {
if (this.levelList[i].level_id == this.levelId) {
this.curIndex = i;
this.descIndex = i;
this.nowIndex = i;
break;
}
}
this.levelList.forEach((v, i) => {
let rate = 0;
if (i != this.levelList.length - 1) {
v.needGrowth = Number(this.levelList[i + 1].growth) - Number(this.growth); //距离下一阶段需要多少成长值
if (v.needGrowth <= 0) {
rate = 100;
} else {
rate = (this.growth / this.levelList[i + 1].growth).toFixed(2) * 100;
}
} else {
v.needGrowth = Number(this.levelList[i].growth) - Number(this.growth); //距离下一阶段需要多少成长值
if (v.needGrowth <= 0) {
rate = 100;
} else {
rate = (this.growth / this.levelList[i].growth).toFixed(2) * 100;
}
}
v.rate = rate;
});
this.levelList.forEach(v => {
if (v.consume_discount) {
v.consume_discount = (v.consume_discount / 10).toFixed(2);
}
});
if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
} else {
this.$util.showToast({
title: res.message
});
if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
}
}
});
},
getLevelRule() {
this.$api.sendRequest({
url: '/api/member/accountrule',
success: res => {
if (res.code == 0 && res.data && res.data.growth) {
this.rule = res.data.growth;
}
}
});
}
}
};
</script>
<style lang="scss">
page {
background-color: #fff;
}
.grow-explain {
padding: 30rpx;
margin-top: 30rpx;
.explain-title {
display: flex;
align-items: center;
justify-content: center;
line-height: 1;
image {
margin: 0 20rpx;
width: 54rpx;
height: 18rpx;
}
margin-bottom: 40rpx;
}
.explain-tr {
display: flex;
}
.explain-th {
padding: 10rpx 30rpx;
&~.explain-th {
border-left: 4rpx solid #fff;
}
flex: 1;
background-color: #f6f1e4;
}
.explain-td {
padding: 10rpx 30rpx;
&~.explain-td {
border-left: 4rpx solid #fff;
}
height: 60rpx;
line-height: 60rpx;
flex: 1;
background-color: #fcfbf7;
}
}
.grow-value,
.acquisition-grow {
padding: 0 30rpx 30rpx;
.title {
display: flex;
align-items: center;
image {
width: 30rpx;
height: 30rpx;
margin-right: 10rpx;
}
}
.content {
font-size: 24rpx;
margin-left: 40rpx;
text {
display: block;
}
}
}
</style>

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view class="nc-modify-content">
<view :style="themeColor" class="nc-modify-content">
<view class="modify">
<view>
<image v-if="newImg == ''" :src="memberImg ? $util.img(memberImg) : $util.getDefaultImage().head" @error="memberImg = $util.getDefaultImage().head" mode="aspectFill"/>

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view class="container">
<view :style="themeColor" class="container">
<view class="tips" v-if="step != 0">请输入6位支付密码建议不要使用重复或连续数字</view>
<view class="tips" v-else>验证码已发送至{{ memberInfo.mobile | mobile }}请在下方输入4位数字验证码</view>
<view class="password-wrap">

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view class="point">
<view :style="themeColor" class="point">
<!-- #ifdef MP-WEIXIN -->
<view class="custom-navbar" :style="{
'padding-top': menuButtonBounding.top + 'px',

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view>
<view :style="themeColor">
<!-- <view class="tab color-bg">
<view class="tab-left">
<picker mode="date" :value="searchType.date" @change="bindDateChange" fields="month">
@@ -50,12 +49,18 @@ import nsEmpty from '@/components/ns-empty/ns-empty.vue';
import nsLogin from '@/components/ns-login/ns-login.vue';
import loadingCover from '@/components/loading-cover/loading-cover.vue';
import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
// #ifdef MP-WEIXIN
import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
// #endif
export default {
components: {
nsEmpty,
nsLogin,
loadingCover,
MescrollUni
MescrollUni,
// #ifdef MP-WEIXIN
privacyPopup
// #endif
},
data() {
const currentDate = this.getDate({

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view>
<view :style="themeColor">
<mescroll-uni @getData="getData" class="member-point">
<view slot="list">
<block v-if="dataList.length">
@@ -35,12 +34,18 @@ import nsEmpty from '@/components/ns-empty/ns-empty.vue';
import nsLogin from '@/components/ns-login/ns-login.vue';
import loadingCover from '@/components/loading-cover/loading-cover.vue';
import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
// #ifdef MP-WEIXIN
import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
// #endif
export default {
components: {
nsEmpty,
nsLogin,
loadingCover,
MescrollUni
MescrollUni,
// #ifdef MP-WEIXIN
privacyPopup
// #endif
},
data() {
return {

View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view>
<view :style="themeColor">
<view class="money-wrap">
<text>-{{ detail.apply_money }}</text>
</view>