浏览代码

Merge branch 'ctt_dev' into dev

dev
chutingting 1年前
父节点
当前提交
950b7df682
共有 4 个文件被更改,包括 30 次插入7 次删除
  1. +1
    -1
      src/lang/package/en.ts
  2. +1
    -1
      src/lang/package/zh-cn.ts
  3. +6
    -0
      src/types/auto-imports.d.ts
  4. +22
    -5
      src/views/myStore/index.vue

+ 1
- 1
src/lang/package/en.ts 查看文件

@@ -268,7 +268,7 @@ export default {
store: {
priceRmb: 'original price',
glod: 'currency value',
createOrder: 'Create Order',
createOrder: 'BUY NOW',
payType:'Choose payment method',
cancel: 'Cancel',
confirm: 'Confirm',


+ 1
- 1
src/lang/package/zh-cn.ts 查看文件

@@ -267,7 +267,7 @@ export default {
store: {
priceRmb: '原价',
glod: '币值',
createOrder: '创建订单',
createOrder: '立即购买',
payType:'选择支付方式',
cancel: '取消',
confirm: '确定',


+ 6
- 0
src/types/auto-imports.d.ts 查看文件

@@ -2,6 +2,9 @@
export {}
declare global {
const EffectScope: typeof import('vue')['EffectScope']
const ElForm: typeof import('element-plus/es')['ElForm']
const ElMessage: typeof import('element-plus/es')['ElMessage']
const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
const asyncComputed: typeof import('@vueuse/core')['asyncComputed']
const autoResetRef: typeof import('@vueuse/core')['autoResetRef']
const computed: typeof import('vue')['computed']
@@ -268,6 +271,9 @@ import { UnwrapRef } from 'vue'
declare module 'vue' {
interface ComponentCustomProperties {
readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']>
readonly ElForm: UnwrapRef<typeof import('element-plus/es')['ElForm']>
readonly ElMessage: UnwrapRef<typeof import('element-plus/es')['ElMessage']>
readonly ElMessageBox: UnwrapRef<typeof import('element-plus/es')['ElMessageBox']>
readonly asyncComputed: UnwrapRef<typeof import('@vueuse/core')['asyncComputed']>
readonly autoResetRef: UnwrapRef<typeof import('@vueuse/core')['autoResetRef']>
readonly computed: UnwrapRef<typeof import('vue')['computed']>


+ 22
- 5
src/views/myStore/index.vue 查看文件

@@ -1,30 +1,33 @@
<template>
<div class="page">
<div class="commoditylIst" ref="scrollContainerRef" @wheel="handleWheel">
<div class="item" v-for="item in packageList" :key="item.typeDesc">
<div class="item" v-for="item in packageList" :key="item.typeDesc" :class="item.sellPriceRmb <= 0 ? 'dashed' : ''">
<div @click="clickPayDialog(item)">
<div class="line" :style="`background-color:${item.color} ;`"></div>
<div class="line" :style="`background-color:${ item.sellPriceRmb > 0 ? item.color : '#eee'} ;`"></div>
<div class="info">
<!-- 商品信息 -->
<div class="content">
<div class="titleBox">
<!-- <p class="iconText" v-if="item.sellPriceRmb <= 0" >会员权益</p> -->
<div class="title">
{{ item.title }}
</div>
</div>
<template v-if="item.sellPriceRmb > 0">
<div class="money">
<span class="price">{{
item.sellPriceRmb
item.sellPriceRmb / 100
}} ¥</span
>/ <span style="text-decoration:line-through;"> {{ $t("store.priceRmb") }}{{ item.priceRmb }}</span>
>/ <span style="text-decoration:line-through;"> {{ $t("store.priceRmb") }}{{ item.priceRmb / 100 }}</span>
</div>
<div class="time">
{{ $t("store.glod") }}<span>{{ item.glod }}</span
>
</div>
<div class="button" @click="createOrder(item)" :style="`background-color: #f3af00 ;`">
<div v-if="item.sellPriceRmb > 0" class="button" @click="createOrder(item)" :style="`background-color: #f3af00 ;`">
{{ $t("store.createOrder") }}
</div>
</template>
</div>
<!-- 商品权益 -->
<div class="authority">
@@ -439,6 +442,9 @@ function findStatus() {
overflow: hidden;
transition: all 0.2s;
cursor: pointer;
&.dashed {
border: 1px dashed #c0bfbd;
}
&:hover {
.mask {
display: block;
@@ -472,10 +478,21 @@ function findStatus() {
padding: 20px;
border-bottom: 1px solid #c0bfbd;
cursor: pointer;
position: relative;
.titleBox {
display: flex;
justify-content: space-between;
}
.iconText{
font-size: 14px;
position: absolute;
left:-20px;
top:0;
transform: rotate(-45deg);
background: rgb(243, 175, 0);
padding: 3px 10px;
color: #fff;
}
.title {
font-size: 30px;
font-weight: 700;


正在加载...
取消
保存