tijiao
This commit is contained in:
@@ -17,12 +17,11 @@
|
||||
</view>
|
||||
<!-- -->
|
||||
<view class="tanchu" style="position: relative">
|
||||
|
||||
<view
|
||||
v-if="status!=0"
|
||||
v-if="status != 0"
|
||||
style="
|
||||
min-height: 80vh;
|
||||
z-index: 100;
|
||||
min-height: 80vh;
|
||||
z-index: 100;
|
||||
background-color: #f0f0f0;
|
||||
opacity: 0.55;
|
||||
position: absolute;
|
||||
@@ -35,7 +34,6 @@
|
||||
<view class="listBox" v-if="list.length > 0">
|
||||
<view style="min-height: 40vh; overflow-y: scroll">
|
||||
<common-coupon :List="list" :source="'mine'"> </common-coupon>
|
||||
|
||||
</view>
|
||||
|
||||
<!-- <view style="font-size: 20rpx;color: #aaa;margin-top: 30rpx;">* 每笔订单只能使用一张优惠价</view> -->
|
||||
@@ -147,7 +145,7 @@ export default {
|
||||
userInfo: "", //用户信息
|
||||
userId: this.userInfo.id,
|
||||
},
|
||||
111111111111111111111111111
|
||||
111111111111111111111111111,
|
||||
);
|
||||
await this.$http
|
||||
.request({
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<template><page-meta
|
||||
:page-font-size="$baseFontSize() + 'px'"
|
||||
:root-font-size="$baseFontSize() + 'px'"
|
||||
></page-meta>
|
||||
<template>
|
||||
<page-meta
|
||||
:page-font-size="$baseFontSize() + 'px'"
|
||||
:root-font-size="$baseFontSize() + 'px'"
|
||||
></page-meta>
|
||||
<view>
|
||||
|
||||
<!-- 公共组件-每个页面必须引入 -->
|
||||
<public-module></public-module>
|
||||
<z-nav-bar
|
||||
@@ -15,17 +15,8 @@
|
||||
>
|
||||
</z-nav-bar>
|
||||
<!-- style="position: fixed; width: 100%; z-index: 10" -->
|
||||
<u-alert
|
||||
|
||||
type="warning"
|
||||
|
||||
size="20rpx"
|
||||
:title="goBuyTitle"
|
||||
:show-icon="true"
|
||||
|
||||
>
|
||||
|
||||
</u-alert>
|
||||
<u-alert type="warning" size="20rpx" :title="goBuyTitle" :show-icon="true">
|
||||
</u-alert>
|
||||
<view class="ACTable">
|
||||
<!-- <u-tabs :list="tab_list" @click="tab_click" lineColor="#54a966 100% 100%"
|
||||
:activeStyle="{color: '#303133',fontWeight: 'bold',transform: 'scale(1.1)'}" ></u-tabs> -->
|
||||
@@ -185,7 +176,8 @@ import { mapState } from "vuex";
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
goBuyTitle:'【天医币】仅为我平台支付使用币种 。一人民币=一天医币,仅为了方便用户支付使用。【天医币】可以用于在我平台支付书籍或课程使用。【天医币】这个名称是为适应我们平台的定位属性,所起名称。与区块链虚拟货币无任何关系。',
|
||||
goBuyTitle:
|
||||
"【天医币】仅为我平台支付使用币种 。一人民币=一天医币,仅为了方便用户支付使用。【天医币】可以用于在我平台支付书籍或课程使用。【天医币】这个名称是为适应我们平台的定位属性,所起名称。与区块链虚拟货币无任何关系。",
|
||||
playData: {},
|
||||
options: {},
|
||||
platform: null,
|
||||
@@ -336,7 +328,7 @@ export default {
|
||||
"/book/couponhistory/appGetUserCenterCoupon?userId=" +
|
||||
this.userInfo.id +
|
||||
"&useStatus=" +
|
||||
this.couponListTab
|
||||
this.couponListTab,
|
||||
)
|
||||
.then((res) => {
|
||||
// this.cardList = res.couponVos
|
||||
@@ -681,7 +673,7 @@ export default {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
background-image: linear-gradient(90deg, #3AB3AE 0%, #73ee9c 100%);
|
||||
background-image: linear-gradient(90deg, #3ab3ae 0%, #73ee9c 100%);
|
||||
color: #fff;
|
||||
border-top-left-radius: 15rpx;
|
||||
border-top-right-radius: 15rpx;
|
||||
@@ -699,11 +691,10 @@ export default {
|
||||
// right: 30rpx;
|
||||
// top: 20rpx;
|
||||
}
|
||||
/deep/.u-alert__content__title
|
||||
{
|
||||
/deep/.u-alert__content__title {
|
||||
// background-color: #f0f0f0;
|
||||
font-size: 24rpx !important;
|
||||
// color: #f4511a !important;
|
||||
line-height: 28rpx !important;
|
||||
font-size: 24rpx !important;
|
||||
// color: #f4511a !important;
|
||||
line-height: 28rpx !important;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
<template><page-meta
|
||||
:page-font-size="$baseFontSize() + 'px'"
|
||||
:root-font-size="$baseFontSize() + 'px'"
|
||||
></page-meta>
|
||||
<template>
|
||||
<page-meta
|
||||
:page-font-size="$baseFontSize() + 'px'"
|
||||
:root-font-size="$baseFontSize() + 'px'"
|
||||
></page-meta>
|
||||
<view class="commonPageBox">
|
||||
<!-- 公共组件-每个页面必须引入 -->
|
||||
<public-module></public-module>
|
||||
@@ -25,12 +26,11 @@
|
||||
> -->
|
||||
</view>
|
||||
<!-- :style="`height:calc(100vh - ${(120 + statusBarHeight) * 2}rpx)`" -->
|
||||
|
||||
|
||||
<view style="padding: 30rpx; padding-top: 0">
|
||||
<view class="AC_con">
|
||||
<view class="AC_jilu PM_font">积分记录</view>
|
||||
<common-list
|
||||
|
||||
:dataList="MoneyRecord"
|
||||
isCondition="true"
|
||||
isNoIcon="true"
|
||||
@@ -297,7 +297,7 @@ export default {
|
||||
"/book/couponhistory/appGetUserCenterCoupon?userId=" +
|
||||
this.userInfo.id +
|
||||
"&useStatus=" +
|
||||
this.couponListTab
|
||||
this.couponListTab,
|
||||
)
|
||||
.then((res) => {
|
||||
// this.cardList = res.couponVos
|
||||
@@ -389,7 +389,7 @@ export default {
|
||||
.AC_jilu {
|
||||
font-size: 42rpx;
|
||||
text-align: left;
|
||||
color:#7f2000 ;
|
||||
color: #7f2000;
|
||||
// background-image: linear-gradient(90deg, #3AB3AE 20%, #c3fade 100%);
|
||||
// margin-bottom: 30rpx;
|
||||
padding: 10rpx 20rpx 40rpx;
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
<template><page-meta
|
||||
:page-font-size="$baseFontSize() + 'px'"
|
||||
:root-font-size="$baseFontSize() + 'px'"
|
||||
></page-meta>
|
||||
<template>
|
||||
<page-meta
|
||||
:page-font-size="$baseFontSize() + 'px'"
|
||||
:root-font-size="$baseFontSize() + 'px'"
|
||||
></page-meta>
|
||||
<view>
|
||||
<!-- 公共组件-每个页面必须引入 -->
|
||||
<public-module></public-module>
|
||||
<z-nav-bar title="我的积分" bgColor="#3AB3AE" fontColor="#fff" > </z-nav-bar>
|
||||
<view class="ACTable" >
|
||||
<z-nav-bar title="我的积分" bgColor="#3AB3AE" fontColor="#fff"> </z-nav-bar>
|
||||
<view class="ACTable">
|
||||
<!-- <u-tabs :list="tab_list" @click="tab_click" lineColor="#54a966 100% 100%"
|
||||
:activeStyle="{color: '#303133',fontWeight: 'bold',transform: 'scale(1.1)'}" ></u-tabs> -->
|
||||
|
||||
@@ -16,15 +17,13 @@
|
||||
<view>
|
||||
<view class="AC_mes">
|
||||
<view class="wallet_title PM_font">积分</view>
|
||||
<view class="wallet_number">{{
|
||||
userMes.jf ? userMes.jf : 0
|
||||
}}</view>
|
||||
<view class="wallet_number">{{ userMes.jf ? userMes.jf : 0 }}</view>
|
||||
|
||||
<!-- <text v-if="platform != 'ios'" class="AC_chong" @click="buPoint()"
|
||||
>充值</text
|
||||
> -->
|
||||
</view>
|
||||
|
||||
|
||||
<view style="padding: 30rpx; padding-top: 0">
|
||||
<view class="AC_con">
|
||||
<view class="AC_jilu PM_font">积分记录</view>
|
||||
@@ -46,10 +45,9 @@
|
||||
>
|
||||
<text v-if="slotProps.row.changeAmount > 0">+</text>
|
||||
<text>{{ slotProps.row.changeAmount }}</text> </view
|
||||
><view
|
||||
class="AC_mark"
|
||||
v-if="slotProps.row.remark "
|
||||
>{{ slotProps.row.remark}}</view
|
||||
><view class="AC_mark" v-if="slotProps.row.remark">{{
|
||||
slotProps.row.remark
|
||||
}}</view
|
||||
><view class="AC_time">{{ slotProps.row.createTime }}</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -296,7 +294,7 @@ export default {
|
||||
"/book/couponhistory/appGetUserCenterCoupon?userId=" +
|
||||
this.userInfo.id +
|
||||
"&useStatus=" +
|
||||
this.couponListTab
|
||||
this.couponListTab,
|
||||
)
|
||||
.then((res) => {
|
||||
// this.cardList = res.couponVos
|
||||
@@ -637,14 +635,14 @@ export default {
|
||||
color: $themeColor !important;
|
||||
}
|
||||
.AC_chong {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
background-image: linear-gradient(90deg, #3AB3AE 0%, #73ee9c 100%);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
background-image: linear-gradient(90deg, #3ab3ae 0%, #73ee9c 100%);
|
||||
color: #fff;
|
||||
border-top-left-radius: 15rpx;
|
||||
border-top-right-radius: 15rpx;
|
||||
padding:20rpx 20rpx;
|
||||
padding: 20rpx 20rpx;
|
||||
font-size: 36rpx;
|
||||
font-weight: 800;
|
||||
text-align: right;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user