调整购物商品兑换,节点中心调整,权证转让管理增加筛选,调整交易市场

This commit is contained in:
唐明明
2021-11-11 16:40:19 +08:00
parent d3ca6422a0
commit 8dec48f748
9 changed files with 1144 additions and 997 deletions

View File

@@ -1,178 +1,182 @@
<template> <template>
<view class="OrderTemplate" > <view class="OrderTemplate">
<view class="top" v-if="isTop"> <view class="top" v-if="isTop">
<view class="company"> <view class="company">
<view class="company-logo"> <view class="company-logo">
<image :src="item.shop.cover" mode="aspectFill" /> <image :src="item.shop.cover" mode="aspectFill" />
<view class="name ellipsis">{{item.shop.name}}</view> <view class="name ellipsis">{{ item.shop.name }}</view>
</view> </view>
<view class="flexrow"> <view class="flexrow">
<view class="no ellipsis">区块链地址 {{item.account.addr}}</view> <span class="copy" @click="copy(item.account.addr)">复制</span> <view class="no ellipsis">区块链地址 {{ item.account.addr }}</view>
</view> <span class="copy" @click="copy(item.account.addr)">复制</span>
</view> </view>
</view> </view>
<view class="goods-info" @click="goDetail(item.goods.goods_id)"> </view>
<image class="goods-img" :src="item.goods.cover" mode="aspectFill" /> <view class="goods-info" @click="goDetail(item.goods.goods_id)">
<view class="goods"> <image class="goods-img" :src="item.goods.cover" mode="aspectFill" />
<view class="name"> <view class="goods">
<view class="name1 ellipsis-2">{{item.goods.goods_name}}</view> <view class="name">
<!-- <span>{{item.account.balance}}</span> --> <view class="name1 ellipsis-2">{{ item.goods.goods_name }}</view>
</view> <!-- <span>{{item.account.balance}}</span> -->
<view class="sku">权证个数 <span>x {{item.account.balance}}</span> </view> </view>
</view> <view class="sku">
</view> 权证个数
</view> <span>x {{ item.account.balance }}</span>
</view>
</view>
</view>
</view>
</template> </template>
<script> <script>
export default { export default {
name: "OrderTemplate", name: 'OrderTemplate',
data() { data() {
return { return {};
},
}; props: {
}, item: Object,
props:{ isTop: {
item : Object,
isTop : {
type: Boolean, type: Boolean,
default: true default: true
} }
}, },
onShow() { onShow() {
console.log(this.item,'onshow,numtempa') console.log(this.item, 'onshow,numtempa');
}, },
methods: { methods: {
// 跳转到商品详情页面 // 跳转到商品详情页面
goDetail(id) { goDetail(id) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/goods/details?id='+id url: '/pages/goods/details?id=' + id
}) });
}, },
// 复制 // 复制
copy(e){ copy(e) {
uni.setClipboardData({ uni.setClipboardData({
data: e, data: e,
success: res=>{ success: res => {
console.log('res',res) console.log('res', res);
} }
}) });
} }
} }
} };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
// 顶部信息 // 顶部信息
.top { .top {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
box-sizing: border-box; box-sizing: border-box;
padding-bottom: 20rpx; padding-bottom: 20rpx;
border-bottom: solid 1rpx #f7f7f7; border-bottom: solid 1rpx #f7f7f7;
.company-logo { .company-logo {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: flex-start; justify-content: flex-start;
box-sizing: border-box; box-sizing: border-box;
image { image {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
border-radius: 50%; border-radius: 50%;
margin-right: 20rpx; margin-right: 20rpx;
} }
.name { .name {
width: 600rpx; width: 600rpx;
font-size: 30rpx; font-size: 30rpx;
color: #484848; color: #484848;
font-weight: bold; font-weight: bold;
} }
} }
.no {
margin-top: 10rpx;
font-size: $title-size * 0.8;
color: #999;
width: 500rpx;
}
.no { .status {
margin-top: 10rpx; color: #999;
font-size: $title-size*0.8; font-size: $title-size;
color: #999; }
width: 500rpx; }
}
.status { // 商品信息
color: #999; .goods-info {
font-size: $title-size; display: flex;
} flex-direction: row;
} align-items: flex-start;
justify-content: flex-start;
box-sizing: border-box;
margin-top: 36rpx;
.goods-img {
width: 120rpx;
height: 120rpx;
border-radius: 10rpx;
}
.goods {
flex: 1;
margin-left: 20rpx;
margin-bottom: 10rpx;
// 商品信息 .name {
.goods-info { width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: flex-start; align-items: flex-start;
justify-content: flex-start; justify-content: space-between;
box-sizing: border-box; box-sizing: border-box;
margin-top: 36rpx; font-size: 30rpx;
.goods-img { // font-weight: bold;
width: 120rpx;
height: 120rpx;
border-radius: 10rpx;
}
.goods {
flex: 1;
margin-left: 20rpx;
margin-bottom: 10rpx;
.name { .name1 {
width: 100%; // width: 340rpx;
display: flex; }
flex-direction: row;
align-items: flex-start;
justify-content: space-between;
box-sizing: border-box;
font-size: 30rpx;
// font-weight: bold;
.name1 { span {
// width: 340rpx; font-size: 32rpx;
font-weight: normal;
} }
}
span { .sku {
font-size: 32rpx; flex: 1;
font-weight: normal; display: flex;
} flex-direction: row;
} align-items: center;
justify-content: space-between;
.sku { box-sizing: border-box;
flex: 1; margin-top: 10rpx;
display: flex; font-size: 28rpx;
flex-direction: row; color: #999;
align-items: center; }
justify-content: space-between; }
box-sizing: border-box; }
margin-top: 10rpx; .flexrow {
font-size: 28rpx; position: relative;
color: #999; padding-right: 200rpx;
} line-height: 50rpx;
} .no{
} white-space:nowrap;
.flexrow{ }
display: flex; .copy {
flex-direction: row; line-height: 50rpx;
align-items: center; position: absolute;
justify-content: space-between; right: 30rpx;
box-sizing: border-box; top: 0;
width: 100%; color: $mian-color;
.copy{ font-size: $title-size * 0.8;
color: $mian-color; font-weight: 400;
font-size: $title-size*0.8; padding: 0 30rpx;
font-weight: 400; }
padding: 0 30rpx; }
}
}
</style> </style>

View File

@@ -292,9 +292,17 @@
line-height: 90rpx; line-height: 90rpx;
font-size: $title-size; font-size: $title-size;
} }
textarea{
width: 100%;
padding: 20rpx 0;
line-height: 50rpx;
font-size: $title-size;
}
.picker-text { .picker-text {
position: relative; position: relative;
padding-right: 90rpx; padding-right: 90rpx;
line-height: 90rpx;
font-size: $title-size;
.picker-icon { .picker-icon {
position: absolute; position: absolute;
right: 0; right: 0;

View File

@@ -73,8 +73,7 @@
<scroll-view scroll-y="true" style="height: 1000rpx;" class="scrollView"> <scroll-view scroll-y="true" style="height: 1000rpx;" class="scrollView">
<view class="coupon-title">可用优惠券列表</view> <view class="coupon-title">可用优惠券列表</view>
<view class="coupon-list-item" v-for="(item,index) in list" :key="index" v-if="list.length>0"> <view class="coupon-list-item" v-for="(item,index) in list" :key="index" v-if="list.length>0">
<u-icon v-if="coupon_grant_id!== item.coupon_grant_id" name="checkmark-circle" color="#cacaca" <u-icon v-if="coupon_grant_id !== item.coupon_grant_id" name="checkmark-circle" color="#cacaca" size="50">
size="50">
</u-icon> </u-icon>
<u-icon v-else name="checkmark-circle-fill" color="#8b64fd" size="50"></u-icon> <u-icon v-else name="checkmark-circle-fill" color="#8b64fd" size="50"></u-icon>
<couponTemplate style="flex: 1;" :item="{...item}" :showUse='false' /> <couponTemplate style="flex: 1;" :item="{...item}" :showUse='false' />
@@ -168,7 +167,6 @@
}, },
// 触发支付 // 触发支付
nowPay() { nowPay() {
this.canPay = false
let apiUrl = '' let apiUrl = ''
let data = {} let data = {}
if (this.selectTypeId === '2') { if (this.selectTypeId === '2') {
@@ -183,13 +181,26 @@
order_no: this.order_no, order_no: this.order_no,
type: 'app' type: 'app'
} }
} else {
apiUrl = ebPay
data = {
order_no: this.order_no
}
} }
apiUrl(data).then(res => { apiUrl(data).then(res => {
// 不需要支付
console.log(res.canPay)
if(!res.canPay){
uni.showModal({
title : '提示',
content : '商品兑换成功',
showCancel : false,
success () {
uni.reLaunch({
url: '/pages/goods/payStatus?success=true'
})
}
})
return
}
// 微信支付 // 微信支付
if (this.selectTypeId === '2') { if (this.selectTypeId === '2') {
let payInfo = JSON.parse(res) let payInfo = JSON.parse(res)
@@ -200,7 +211,6 @@
uni.reLaunch({ uni.reLaunch({
url: '/pages/goods/payStatus?success=true' url: '/pages/goods/payStatus?success=true'
}) })
this.canPay = true
}, },
fail: (err) => { fail: (err) => {
uni.showToast({ uni.showToast({
@@ -220,7 +230,6 @@
uni.reLaunch({ uni.reLaunch({
url: '/pages/goods/payStatus?success=true' url: '/pages/goods/payStatus?success=true'
}) })
this.canPay = true
}, },
fail: (err) => { fail: (err) => {
uni.showToast({ uni.showToast({
@@ -235,13 +244,9 @@
}).catch(err => { }).catch(err => {
uni.showToast({ uni.showToast({
title: err.message, title: err.message,
duration: 3000,
mask: true, mask: true,
icon: 'none' icon: 'none'
}) })
setTimeout(res => {
this.canPay = true
}, 2000)
}) })
}, },
@@ -249,10 +254,8 @@
selectCoupon(item) { selectCoupon(item) {
if (this.coupon_grant_id === item.coupon_grant_id) { if (this.coupon_grant_id === item.coupon_grant_id) {
this.coupon_grant_id = '' this.coupon_grant_id = ''
// this.coupon_price = ''
} else { } else {
this.coupon_grant_id = item.coupon_grant_id this.coupon_grant_id = item.coupon_grant_id
// this.coupon_price = item.price
} }
this.mallBuyGoods(this.params, 'get') this.mallBuyGoods(this.params, 'get')
this.showCouponList = false this.showCouponList = false

View File

@@ -19,13 +19,9 @@
{{info.skusUnit}} {{info.skusUnit}}
</view> </view>
<view class="info-item"> <view class="info-item">
<label>提供企业</label> <label>供应商</label>
{{info.companyName}} {{info.companyName}}
</view> </view>
<view class="info-item">
<label>企业诚信</label>
{{info.integrity}}
</view>
<view class="info-item"> <view class="info-item">
<label>权证销量</label> <label>权证销量</label>
{{info.sales}} {{info.sales}}

View File

@@ -1,5 +1,10 @@
<template> <template>
<view class="NumberWeight"> <view class="NumberWeight">
<view class="header-tabs">
<view class="tabs-item" :class="{'show' : status === ''}" @click="onTabs('')">全部</view>
<view class="tabs-item" :class="{'show' : status === 1}" @click="onTabs(1)">转让中</view>
<view class="tabs-item" :class="{'show' : status === 2}" @click="onTabs(2)">已取消</view>
</view>
<!-- 有订单列表 --> <!-- 有订单列表 -->
<view v-if="lists.length > 0"> <view v-if="lists.length > 0">
<block v-for="(item, index) in lists" :key="index"> <block v-for="(item, index) in lists" :key="index">
@@ -18,10 +23,10 @@
</view> </view>
</view> </view>
</block> </block>
<uni-load-more :status="pageMore"></uni-load-more>
</view> </view>
<!-- 没有订单列表 --> <!-- 没有订单列表 -->
<no-list v-if="lists.length === 0" name="no-order" txt="暂无数据~" /> <no-list v-if="lists.length === 0" name="no-order" txt="暂无数据~" />
<u-toast ref="uToast" />
</view> </view>
</template> </template>
@@ -30,47 +35,45 @@ import { marketsMag, marketsCancel } from '@/apis/interfaces/market';
export default { export default {
data() { data() {
return { return {
lists: [], lists : [],
page: 1, page : 1,
total: 0 status : '',
total : 0,
pageMore: 'more'
}; };
}, },
onLoad() { onLoad() {
this.getList(); this.getList();
}, },
onReachBottom() { onReachBottom() {
if (this.total > this.lists.length) { if (this.pageMore) {
this.page = this.page + 1; this.page = this.page + 1;
this.getList(); this.getList();
} else {
this.$refs.uToast.show({
title: '吼吼吼~我是有底的~',
type: 'error',
icon: false,
duration: 3000
});
} }
}, },
methods: { methods: {
onTabs(status){
this.status = status
this.page = 1
this.getList()
},
getList() { getList() {
let data = { if(this.page === 1){
perPage: 10, this.lists = []
page: this.page }
}; marketsMag({
marketsMag(data) status : this.status,
.then(res => { page : this.page
console.log(res.markets.data); }).then(res => {
this.lists = this.lists.concat(res.markets.data); this.lists = this.lists.concat(res.markets.data);
this.total = res.markets.page.total; this.total = res.markets.page.current;
this.pageMore = res.markets.page.has_more ? 'more' : 'noMore';
}).catch(err => {
uni.showToast({
title: err.message,
icon : 'none'
}) })
.catch(err => { });
this.$refs.uToast.show({
title: err.message,
type: 'error',
icon: false,
duration: 3000
});
});
}, },
// 取消转让 // 取消转让
removeGoods(id, index) { removeGoods(id, index) {
@@ -79,12 +82,20 @@ export default {
icon : 'none', icon : 'none',
title: res title: res
}) })
let statusObj = this.lists[index]
statusObj.status = { if(this.status === ''){
value: 2, let statusObj = this.lists[index]
text : '已取消', statusObj.status = {
value: 2,
text : '已取消',
}
this.$set(this.lists, index, statusObj)
return
}
if(this.status === 1 || this.status === 2){
this.lists.splice(index, 1)
} }
this.$set(this.lists, index, statusObj)
}).catch(err => { }).catch(err => {
uni.showToast({ uni.showToast({
icon : 'none', icon : 'none',
@@ -102,6 +113,29 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.NumberWeight { .NumberWeight {
box-sizing: border-box; box-sizing: border-box;
padding-top: 90rpx;
.header-tabs{
position: fixed;
top: 0;
left: 0;
width: 100%;
line-height: 90rpx;
font-size: $title-size-lg;
height: 90rpx;
z-index: 99;
display: flex;
justify-content: space-around;
background: white;
.tabs-item{
color: $text-gray;
width: 33.33%;
text-align: center;
&.show{
color: $mian-color;
font-weight: bold;
}
}
}
// 订单列表 // 订单列表
.order-item { .order-item {
background-color: white; background-color: white;

View File

@@ -56,7 +56,7 @@
<view class="userVip" :class="{ animated: animatedShow }"> <view class="userVip" :class="{ animated: animatedShow }">
<view class="userVip-top"> <view class="userVip-top">
<view class="userVip-top-name" v-if="userIdentity.right"> <view class="userVip-top-name" v-if="userIdentity.right">
{{ userData.identity.id == 1 ? '开通' + userIdentity.right.name : '到期时间' + userIdentity.times.ended_at}} {{ userData.identity.id == 1 ? '开通' + userIdentity.right.name : userIdentity.times.name + '会员'}}
</view> </view>
<!-- v-if="userData.identity.id != 5" --> <!-- v-if="userData.identity.id != 5" -->
<view class="userVip-top-btn" @click="openVip(userIdentity.right.identity_id)" > <view class="userVip-top-btn" @click="openVip(userIdentity.right.identity_id)" >
@@ -172,64 +172,66 @@
</view> </view>
</view> </view>
<!-- 企业工具 --> <!-- 企业工具 -->
<view class="userPartner" v-if="userData.is_company"> <block v-if="userData.identity.id > 1">
<view class="partner-title">企业工具</view> <view class="userPartner" v-if="userData.is_company">
<view class="tool-list">
<view class="tool-label" v-if="permission.manageGoods" @click="$Router.push({name: 'goodsManagement'})">
<image class="tool-label-img" src="/static/user/userTool-00.png" mode=""></image>
<view class="tool-label-name">商品权证</view>
</view>
<view class="tool-label" v-if="permission.manageCoupons" @click="$Router.push({name: 'couponsManagement'})">
<image class="tool-label-img" src="/static/user/userTool-01.png" mode=""></image>
<view class="tool-label-name">优惠券管理</view>
</view>
<view class="tool-label" v-if="permission.orderShipment" @click="$Router.push({name: 'Deliver'})">
<image class="tool-label-img" src="/static/user/userTool-08.png" mode=""></image>
<view class="tool-label-name">发货单管理</view>
</view>
<view class="tool-label" v-if="permission.orderRefund" @click="$Router.push({name: 'Return'})">
<image class="tool-label-img" src="/static/user/userTool-07.png" mode=""></image>
<view class="tool-label-name">退换货管理</view>
</view>
<view class="tool-label" @click="$Router.push({name: 'instrumentSpread'})">
<image class="tool-label-img" src="/static/user/userTool-02.png" mode=""></image>
<view class="tool-label-name">营销推广码</view>
</view>
<view class="tool-label" v-if="isOwnCompany" @click="$Router.push({name: 'instrumentBasics'})">
<image class="tool-label-img" src="/static/user/userTool-03.png" mode=""></image>
<view class="tool-label-name">基础信息</view>
</view>
<view class="tool-label" v-if="permission.manageStore" @click="$Router.push({name: 'shopLists'})">
<image class="tool-label-img" src="/static/user/userTool-04.png" mode=""></image>
<view class="tool-label-name">门店管理</view>
</view>
<view class="tool-label" v-if="permission.manageEmployee" @click="$Router.push({name: 'employeesList'})">
<image class="tool-label-img" src="/static/user/userTool-05.png" mode=""></image>
<view class="tool-label-name">员工管理</view>
</view>
<view class="tool-label" v-if="permission.manageScan" @click="$Router.push({name: 'verificationIndex'})">
<image class="tool-label-img" src="/static/user/userTool-06.png" mode=""></image>
<view class="tool-label-name">扫码核销</view>
</view>
</view>
</view>
<view class="userPartner" style="display: flex;flex-direction: column;" v-else>
<block v-if="companyCreateInfo.code !== 1" >
<view class="partner-title">企业工具</view> <view class="partner-title">企业工具</view>
<view class="partner-open" @click="company(companyCreateInfo.code)"> <view class="tool-list">
<image class="partner-icon" src="@/static/icons/company-icon.png" mode="widthFix"></image> <view class="tool-label" v-if="permission.manageGoods" @click="$Router.push({name: 'goodsManagement'})">
<view> <image class="tool-label-img" src="/static/user/userTool-00.png" mode=""></image>
<view class="partner-open-title"> <view class="tool-label-name">商品权证</view>
<text v-if="companyCreateInfo.code === -1">开通企业认证</text> </view>
<text v-if="companyCreateInfo.code === 0">企业认证审核中</text> <view class="tool-label" v-if="permission.manageCoupons" @click="$Router.push({name: 'couponsManagement'})">
<text v-if="companyCreateInfo.code === 2">企业认证被已驳回</text> <image class="tool-label-img" src="/static/user/userTool-01.png" mode=""></image>
</view> <view class="tool-label-name">优惠券管理</view>
<view class="partner-open-text">发布权证优惠券为店铺引流</view> </view>
<view class="tool-label" v-if="permission.orderShipment" @click="$Router.push({name: 'Deliver'})">
<image class="tool-label-img" src="/static/user/userTool-08.png" mode=""></image>
<view class="tool-label-name">发货单管理</view>
</view>
<view class="tool-label" v-if="permission.orderRefund" @click="$Router.push({name: 'Return'})">
<image class="tool-label-img" src="/static/user/userTool-07.png" mode=""></image>
<view class="tool-label-name">退换货管理</view>
</view>
<view class="tool-label" @click="$Router.push({name: 'instrumentSpread'})">
<image class="tool-label-img" src="/static/user/userTool-02.png" mode=""></image>
<view class="tool-label-name">营销推广码</view>
</view>
<view class="tool-label" v-if="isOwnCompany" @click="$Router.push({name: 'instrumentBasics'})">
<image class="tool-label-img" src="/static/user/userTool-03.png" mode=""></image>
<view class="tool-label-name">基础信息</view>
</view>
<view class="tool-label" v-if="permission.manageStore" @click="$Router.push({name: 'shopLists'})">
<image class="tool-label-img" src="/static/user/userTool-04.png" mode=""></image>
<view class="tool-label-name">门店管理</view>
</view>
<view class="tool-label" v-if="permission.manageEmployee" @click="$Router.push({name: 'employeesList'})">
<image class="tool-label-img" src="/static/user/userTool-05.png" mode=""></image>
<view class="tool-label-name">员工管理</view>
</view>
<view class="tool-label" v-if="permission.manageScan" @click="$Router.push({name: 'verificationIndex'})">
<image class="tool-label-img" src="/static/user/userTool-06.png" mode=""></image>
<view class="tool-label-name">扫码核销</view>
</view> </view>
</view> </view>
<!-- <view class="onOpen" v-else ></view> --> </view>
</block> <view class="userPartner" style="display: flex;flex-direction: column;" v-else>
</view> <block v-if="companyCreateInfo.code !== 1" >
<view class="partner-title">企业工具</view>
<view class="partner-open" @click="company(companyCreateInfo.code)">
<image class="partner-icon" src="@/static/icons/company-icon.png" mode="widthFix"></image>
<view>
<view class="partner-open-title">
<text v-if="companyCreateInfo.code === -1">开通企业认证</text>
<text v-if="companyCreateInfo.code === 0">企业认证审核中</text>
<text v-if="companyCreateInfo.code === 2">企业认证被已驳回</text>
</view>
<view class="partner-open-text">发布权证优惠券为店铺引流</view>
</view>
</view>
<!-- <view class="onOpen" v-else ></view> -->
</block>
</view>
</block>
<!-- 我的权证 --> <!-- 我的权证 -->
<view class="userPartner"> <view class="userPartner">
<view class="partner-title"> <view class="partner-title">
@@ -685,6 +687,7 @@
font-size: 30rpx; font-size: 30rpx;
flex: 1; flex: 1;
line-height: 24px; line-height: 24px;
font-weight: bold;
} }
.userVip-top-btn { .userVip-top-btn {

View File

@@ -6,7 +6,7 @@
<view class="order-list" v-for="(item,index) in lists" :key="index"> <view class="order-list" v-for="(item,index) in lists" :key="index">
<NumberWeightTemplate :item="item" /> <NumberWeightTemplate :item="item" />
<view class="actions"> <view class="actions">
<view @click="navMarkets(item.symbol)" class="nowPay">权证转让</view> <view @click="navMarkets(item.symbol)" class="nowPay make">权证转让</view>
<view @click="nowTake(item.symbol)" class="nowPay">去提货</view> <view @click="nowTake(item.symbol)" class="nowPay">去提货</view>
</view> </view>
</view> </view>
@@ -163,6 +163,11 @@
margin-left: 20rpx; margin-left: 20rpx;
margin-top: 20rpx; margin-top: 20rpx;
background-color: $mian-color; background-color: $mian-color;
&.make{
background: white;
border:solid 1rpx $mian-color;
color: $mian-color;
}
} }
.cancelOrder { .cancelOrder {

View File

@@ -3,8 +3,8 @@
<!-- 订单状态 --> <!-- 订单状态 -->
<view class="order-status"> <view class="order-status">
<view class="info"> <view class="info">
提货 提货
<span>确认提货后快递会坐着火箭朝您飞来</span> <span>申请提货后商家将为您迅速处理</span>
</view> </view>
<image src="/static/imgs/fire.png" mode="widthFix" /> <image src="/static/imgs/fire.png" mode="widthFix" />
</view> </view>
@@ -306,7 +306,7 @@
.order-status { .order-status {
width: 100%; width: 100%;
height: 300rpx; height: 300rpx;
background-image: linear-gradient(to bottom, $mian-color, $mian-color-light); background-image: linear-gradient(to right, #7c52fc, #976dff);
color: #Fff; color: #Fff;
font-size: 36rpx; font-size: 36rpx;
padding: 30rpx 50rpx; padding: 30rpx 50rpx;

File diff suppressed because one or more lines are too long