Uniapp/lucky_shop
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

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

Browse Source
This commit is contained in:
ZF Sun
2026-01-04 09:40:09 +08:00
parent 26f8537d24
commit 4da852944e
145 changed files with 13781 additions and 11628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pages_promotion/point/detail.vue
View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view>
<view :style="themeColor">
<view scroll-y="true" class="goods-detail" :class="isIphoneX ? 'active' : ''">
<view class="goods-container">
<view class="goods-media">

17
pages_promotion/point/goods_list.vue
View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view class="content">
<view class="content" :style="themeColor">
<view class="head-wrap">
<!-- 搜索区域 -->
<view class="search-wrap uni-flex uni-row">
@@ -116,11 +115,25 @@
</template>
<script>
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
import uniDrawer from '@/components/uni-drawer/uni-drawer.vue';
export default {
components: {
uniDrawer,
MescrollUni,
nsLogin,
loadingCover,
nsEmpty,
// #ifdef MP-WEIXIN
privacyPopup
// #endif
},
data() {
return {

3
pages_promotion/point/list.vue
View File

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

20
pages_promotion/point/order_list.vue
View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view class="order-container">
<view class="order-container" :style="themeColor">
<view class="order-nav" v-if="storeToken">
<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="statusItem.status == orderStatus ? 'uni-tab-item-title-active color-base-text' : ''">
@@ -84,7 +83,24 @@
</template>
<script>
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,
nsEmpty,
// #ifdef MP-WEIXIN
privacyPopup
// #endif
},
data() {
return {
orderList: [],

25
pages_promotion/point/payment.vue
View File

@@ -1,6 +1,5 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view class="order-container" :class="{ 'safe-area': isIphoneX }">
<view class="order-container" :style="themeColor" :class="{ 'safe-area': isIphoneX }">
<!-- #ifdef MP-WEIXIN -->
<view class="payment-navbar" :style="{
'padding-top': menuButtonBounding.top + 'px',
@@ -280,10 +279,26 @@
<script>
import payment from './public/js/payment.js';
import uniPopup from '@/components/uni-popup/uni-popup.vue';
import nsSelectTime from '@/components/ns-select-time/ns-select-time.vue';
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: {
uniPopup,
nsSelectTime,
nsLogin,
MescrollUni,
loadingCover,
nsEmpty,
// #ifdef MP-WEIXIN
privacyPopup
// #endif
},
mixins: [payment]
};
@@ -292,18 +307,18 @@
<style lang="scss">
@import "@/common/css/order_parment.scss";
</style>
<style scoped>
<style lang="scss" scoped>
/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
background: none;
max-height: unset !important;
overflow-y: hidden !important;
}
>>>.uni-popup__wrapper {
/deep/ .uni-popup__wrapper {
border-radius: 20rpx 20rpx 0 0;
}
>>>.uni-popup {
/deep/ .uni-popup {
z-index: 8;
}
</style>

185
pages_promotion/point/result.vue
View File

@@ -1,93 +1,92 @@
<template>
<page-meta :page-style="themeColor"></page-meta>
<view class="container">
<view class="image-wrap">
<image :src="$util.img('public/uniapp/pay/pay_success.png')" class="result-image" mode="widthFix"></image>
</view>
<view class="msg">{{ $lang('exchangeSuccess') }}</view>
<view class="action">
<view class="btn color-base-border color-base-text" @click="toOrderList()">{{ $lang('see') }}</view>
<view class="btn go-home color-base-bg" @click="toIndex">{{ $lang('goHome') }}</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {};
},
onShow() {
},
methods: {
toOrderList() {
this.$util.redirectTo('/pages_promotion/point/order_list', {}, 'redirectTo');
},
toIndex() {
this.$util.redirectTo('/pages/index/index');
}
}
};
</script>
<style lang="scss">
.container {
width: 100vw;
height: 100vh;
background: #fff;
.image-wrap {
display: flex;
justify-content: center;
padding: 200rpx 0 40rpx 0;
.result-image {
width: 166rpx;
}
}
.msg {
text-align: center;
line-height: 1;
margin-bottom: 50rpx;
font-size: $font-size-base;
color: #000;
}
.pay-amount {
color: #999;
text-align: center;
line-height: 1;
margin-bottom: 30rpx;
}
.action {
width: 90%;
margin: 0 auto;
text-align: center;
margin-top: 150rpx;
display: flex;
justify-content: space-between;
.btn {
width: 310rpx;
height: 78rpx;
border: 2rpx solid #ffffff;
border-radius: $border-radius;
font-size: $font-size-tag;
display: flex;
align-items: center;
justify-content: center;
}
.alone {
margin-left: 0;
width: 60%;
}
.go-home {
color: #fff;
}
}
}
</style>
<template>
<view class="container" :style="themeColor">
<view class="image-wrap">
<image :src="$util.img('public/uniapp/pay/pay_success.png')" class="result-image" mode="widthFix"></image>
</view>
<view class="msg">{{ $lang('exchangeSuccess') }}</view>
<view class="action">
<view class="btn color-base-border color-base-text" @click="toOrderList()">{{ $lang('see') }}</view>
<view class="btn go-home color-base-bg" @click="toIndex">{{ $lang('goHome') }}</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {};
},
onShow() {
},
methods: {
toOrderList() {
this.$util.redirectTo('/pages_promotion/point/order_list', {}, 'redirectTo');
},
toIndex() {
this.$util.redirectTo('/pages/index/index');
}
}
};
</script>
<style lang="scss">
.container {
width: 100vw;
height: 100vh;
background: #fff;
.image-wrap {
display: flex;
justify-content: center;
padding: 200rpx 0 40rpx 0;
.result-image {
width: 166rpx;
}
}
.msg {
text-align: center;
line-height: 1;
margin-bottom: 50rpx;
font-size: $font-size-base;
color: #000;
}
.pay-amount {
color: #999;
text-align: center;
line-height: 1;
margin-bottom: 30rpx;
}
.action {
width: 90%;
margin: 0 auto;
text-align: center;
margin-top: 150rpx;
display: flex;
justify-content: space-between;
.btn {
width: 310rpx;
height: 78rpx;
border: 2rpx solid #ffffff;
border-radius: $border-radius;
font-size: $font-size-tag;
display: flex;
align-items: center;
justify-content: center;
}
.alone {
margin-left: 0;
width: 60%;
}
.go-home {
color: #fff;
}
}
}
</style>