faiz
/
hwms-shop-mer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
faiz 2024-05-31 15:09:33 +08:00
parent 89c37c4749
commit f28a5de2e7
17 changed files with 9089 additions and 9083 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/mobilePage/home_bargain.vue
View File

@ -27,7 +27,7 @@
<div class="title line1" v-if="titleShow">{{item.store_name}}</div> <div class="title line1" v-if="titleShow">{{item.store_name}}</div>
<div class="price"> <div class="price">
<span :style="'color:'+priceColor" v-if="barginShow" class="price-name">助力价</span> <span :style="'color:'+priceColor" v-if="barginShow" class="price-name">助力价</span>
<p :style="'color:'+priceColor" v-if="priceShow">￥<span class="price-label">{{item.price}}</span></p> <p :style="'color:'+priceColor" v-if="priceShow">HK$<span class="price-label">{{item.price}}</span></p>
</div> </div>
</div> </div>
<div v-if="bntShow && bgColor.length > 0" class="btn" :class="conStyle?'':'bargainOn'" :style="{background: `linear-gradient(180deg,${bgColor[0].item} 0%,${bgColor[1].item} 100%)`}">发起助力</div> <div v-if="bntShow && bgColor.length > 0" class="btn" :class="conStyle?'':'bargainOn'" :style="{background: `linear-gradient(180deg,${bgColor[0].item} 0%,${bgColor[1].item} 100%)`}">发起助力</div>
@ -38,7 +38,7 @@
<div class="item" v-for="(item,index) in list" :index="index" v-if="index<3" :class="conStyle?'':'bargainOn'"> <div class="item" v-for="(item,index) in list" :index="index" v-if="index<3" :class="conStyle?'':'bargainOn'">
<div class="info" v-if="titleShow || priceShow || bntShow"> <div class="info" v-if="titleShow || priceShow || bntShow">
<div class="title line1" v-if="titleShow">{{item.store_name}}</div> <div class="title line1" v-if="titleShow">{{item.store_name}}</div>
<div class="price line1" :style="'color:'+priceColor" v-if="priceShow">¥{{item.price}}</div> <div class="price line1" :style="'color:'+priceColor" v-if="priceShow">HK${{item.price}}</div>
<span class="box-btn" v-if="bntShow">去助力<span class="iconfont-diy iconjinru"></span></span> <span class="box-btn" v-if="bntShow">去助力<span class="iconfont-diy iconjinru"></span></span>
</div> </div>
<div class="img-box"> <div class="img-box">

12
src/components/mobilePage/home_coupon.vue
View File

@ -9,21 +9,21 @@
<div class="coupon" v-if="style == 0"> <div class="coupon" v-if="style == 0">
<div class="item" :class="'item'+style"> <div class="item" :class="'item'+style">
<div class="top" :style="{color:`${themeColor.item}`}"> <div class="top" :style="{color:`${themeColor.item}`}">
<div class="num"><span>￥</span>10</div> <div class="num"><span>HK$</span>10</div>
<div class="txt">满100元可用</div> <div class="txt">满100元可用</div>
</div> </div>
<div class="coupon-btn" :style="{background:`${themeColor.item}`}"><span>立即领取</span></div> <div class="coupon-btn" :style="{background:`${themeColor.item}`}"><span>立即领取</span></div>
</div> </div>
<div class="item" :class="'item'+style"> <div class="item" :class="'item'+style">
<div class="top" :style="{color:`${themeColor.item}`}"> <div class="top" :style="{color:`${themeColor.item}`}">
<div class="num"><span>￥</span>50</div> <div class="num"><span>HK$</span>50</div>
<div class="txt">满100元可用</div> <div class="txt">满100元可用</div>
</div> </div>
<div class="coupon-btn" :style="{background:`${themeColor.item}`}"><span>去使用</span></div> <div class="coupon-btn" :style="{background:`${themeColor.item}`}"><span>去使用</span></div>
</div> </div>
<div class="item" :class="'item'+style"> <div class="item" :class="'item'+style">
<div class="top" :style="{color:`${themeColor.item}`}"> <div class="top" :style="{color:`${themeColor.item}`}">
<div class="num"><span>￥</span>50</div> <div class="num"><span>HK$</span>50</div>
<div class="txt">满100元可用</div> <div class="txt">满100元可用</div>
</div> </div>
<div class="coupon-btn" :style="{background:`${themeColor.item}`}"><span>立即领取</span></div> <div class="coupon-btn" :style="{background:`${themeColor.item}`}"><span>立即领取</span></div>
@ -32,21 +32,21 @@
<div class="coupon" v-if="style == 1"> <div class="coupon" v-if="style == 1">
<div class="item" :class="'item'+style" :style="{background:`${themeColor.item}`}"> <div class="item" :class="'item'+style" :style="{background:`${themeColor.item}`}">
<div class="left" :style="{color:`${themeColor.item}`}"> <div class="left" :style="{color:`${themeColor.item}`}">
<div class="num"><span>￥</span>50</div> <div class="num"><span>HK$</span>50</div>
<div class="txt">满100元可用</div> <div class="txt">满100元可用</div>
</div> </div>
<div class="right">立<br>即<br>领<br>取</div> <div class="right">立<br>即<br>领<br>取</div>
</div> </div>
<div class="item gary" :class="'item'+style" :style="{background:`${themeColor.item}`}"> <div class="item gary" :class="'item'+style" :style="{background:`${themeColor.item}`}">
<div class="left" :style="{color:`${themeColor.item}`}"> <div class="left" :style="{color:`${themeColor.item}`}">
<div class="num"><span>￥</span>50</div> <div class="num"><span>HK$</span>50</div>
<div class="txt">满100元可用</div> <div class="txt">满100元可用</div>
</div> </div>
<div class="right">去<br>使<br>用</div> <div class="right">去<br>使<br>用</div>
</div> </div>
<div class="item" :class="'item'+style" :style="{background:`${themeColor.item}`}"> <div class="item" :class="'item'+style" :style="{background:`${themeColor.item}`}">
<div class="left" :style="{color:`${themeColor.item}`}"> <div class="left" :style="{color:`${themeColor.item}`}">
<div class="num"><span>￥</span>50</div> <div class="num"><span>HK$</span>50</div>
<div class="txt">满100元可用</div> <div class="txt">满100元可用</div>
</div> </div>
<div class="right">立<br>即<br>领<br>取</div> <div class="right">立<br>即<br>领<br>取</div>

46
src/components/mobilePage/home_goods_list.vue
View File

@ -21,9 +21,9 @@
</div> </div>
<div class="price" :style="{color:fontColor}"> <div class="price" :style="{color:fontColor}">
<div class="num" v-if="priceShow"> <div class="num" v-if="priceShow">
￥<span>{{item.price}}</span> HK$<span>{{item.price}}</span>
</div> </div>
<!-- <div class="old-price" v-if="opriceShow">¥{{item.ot_price}}</div> --> <!-- <div class="old-price" v-if="opriceShow">HK${{item.ot_price}}</div> -->
</div> </div>
</div> </div>
@ -45,9 +45,9 @@
</div> </div>
<div class="price" :style="{color:fontColor}"> <div class="price" :style="{color:fontColor}">
<div class="num" v-if="priceShow"> <div class="num" v-if="priceShow">
¥<span>199</span> HK$<span>199</span>
</div> </div>
<!-- <div class="old-price" v-if="opriceShow">¥399</div> --> <!-- <div class="old-price" v-if="opriceShow">HK$399</div> -->
</div> </div>
</div> </div>
</div> </div>
@ -66,9 +66,9 @@
</div> </div>
<div class="price" :style="{color:fontColor}"> <div class="price" :style="{color:fontColor}">
<div class="num" v-if="priceShow"> <div class="num" v-if="priceShow">
¥<span>199</span> HK$<span>199</span>
</div> </div>
<!-- <div class="old-price" v-if="opriceShow">¥399</div> --> <!-- <div class="old-price" v-if="opriceShow">HK$399</div> -->
</div> </div>
</div> </div>
</div> </div>
@ -88,7 +88,7 @@
</div> </div>
<div class="price" :style="{color:fontColor}"> <div class="price" :style="{color:fontColor}">
<div class="num" v-if="priceShow"> <div class="num" v-if="priceShow">
￥<span>{{item.price}}</span> HK$<span>{{item.price}}</span>
</div> </div>
</div> </div>
<div class="text"> <div class="text">
@ -109,7 +109,7 @@
</div> </div>
<div class="price" :style="{color:fontColor}"> <div class="price" :style="{color:fontColor}">
<div class="num" v-if="priceShow"> <div class="num" v-if="priceShow">
￥<span>66.66</span> HK$<span>66.66</span>
</div> </div>
</div> </div>
<div class="text"> <div class="text">
@ -128,7 +128,7 @@
</div> </div>
<div class="price" :style="{color:fontColor}"> <div class="price" :style="{color:fontColor}">
<div class="num" v-if="priceShow"> <div class="num" v-if="priceShow">
￥<span>66.66</span> HK$<span>66.66</span>
</div> </div>
</div> </div>
<div class="text"> <div class="text">
@ -153,9 +153,9 @@
</div> </div>
<div class="price" :style="{color:fontColor}"> <div class="price" :style="{color:fontColor}">
<div class="num" v-if="priceShow"> <div class="num" v-if="priceShow">
￥<span>{{item.price}}</span> HK$<span>{{item.price}}</span>
</div> </div>
<!-- <div class="old-price" v-if="opriceShow">¥{{item.ot_price}}</div> --> <!-- <div class="old-price" v-if="opriceShow">HK${{item.ot_price}}</div> -->
</div> </div>
</div> </div>
</div> </div>
@ -171,9 +171,9 @@
</div> </div>
<div class="price" :style="{color:fontColor}"> <div class="price" :style="{color:fontColor}">
<div class="num" v-if="priceShow"> <div class="num" v-if="priceShow">
¥<span>66.66</span> HK$<span>66.66</span>
</div> </div>
<!-- <div class="old-price" v-if="opriceShow">¥99.99</div> --> <!-- <div class="old-price" v-if="opriceShow">HK$99.99</div> -->
</div> </div>
</div> </div>
</div> </div>
@ -187,9 +187,9 @@
</div> </div>
<div class="price" :style="{color:fontColor}"> <div class="price" :style="{color:fontColor}">
<div class="num" v-if="priceShow"> <div class="num" v-if="priceShow">
¥<span>66.66</span> HK$<span>66.66</span>
</div> </div>
<!-- <div class="old-price" v-if="opriceShow">¥99.99</div> --> <!-- <div class="old-price" v-if="opriceShow">HK$99.99</div> -->
</div> </div>
</div> </div>
</div> </div>
@ -205,8 +205,8 @@
</div> </div>
<div class="name line2"><span v-if="titleShow">{{item.store_name}}</span></div> <div class="name line2"><span v-if="titleShow">{{item.store_name}}</span></div>
<div class="price" :style="{color:fontColor}"> <div class="price" :style="{color:fontColor}">
<span v-if="priceShow">￥<span class="num">{{item.price}}</span></span> <span v-if="priceShow">HK$<span class="num">{{item.price}}</span></span>
<!-- <span class="old-price" v-if="opriceShow">¥{{item.ot_price}}</span> --> <!-- <span class="old-price" v-if="opriceShow">HK${{item.ot_price}}</span> -->
</div> </div>
</div> </div>
</div> </div>
@ -217,8 +217,8 @@
</div> </div>
<div class="name line2"><span v-if="titleShow">商品名称</span></div> <div class="name line2"><span v-if="titleShow">商品名称</span></div>
<div class="price" :style="{color:fontColor}"> <div class="price" :style="{color:fontColor}">
<span v-if="priceShow">¥<span class="num">66.66</span></span> <span v-if="priceShow">HK$<span class="num">66.66</span></span>
<!-- <span class="old-price" v-if="opriceShow">¥99.99</span> --> <!-- <span class="old-price" v-if="opriceShow">HK$99.99</span> -->
</div> </div>
</div> </div>
<div class="itemBig" :class="conStyle?'':'itemOn'"> <div class="itemBig" :class="conStyle?'':'itemOn'">
@ -227,8 +227,8 @@
</div> </div>
<div class="name line2"><span v-if="titleShow">商品名称</span></div> <div class="name line2"><span v-if="titleShow">商品名称</span></div>
<div class="price" :style="{color:fontColor}"> <div class="price" :style="{color:fontColor}">
<span v-if="priceShow">¥<span class="num">66.66</span></span> <span v-if="priceShow">HK$<span class="num">66.66</span></span>
<!--<span class="old-price" v-if="opriceShow">¥99.99</span> --> <!--<span class="old-price" v-if="opriceShow">HK$99.99</span> -->
</div> </div>
</div> </div>
<div class="itemBig" :class="conStyle?'':'itemOn'"> <div class="itemBig" :class="conStyle?'':'itemOn'">
@ -237,8 +237,8 @@
</div> </div>
<div class="name line2"><span v-if="titleShow">商品名称</span></div> <div class="name line2"><span v-if="titleShow">商品名称</span></div>
<div class="price" :style="{color:fontColor}"> <div class="price" :style="{color:fontColor}">
<span v-if="priceShow">¥<span class="num">66.66</span></span> <span v-if="priceShow">HK$<span class="num">66.66</span></span>
<!-- <span class="old-price" v-if="opriceShow">¥99.99</span> --> <!-- <span class="old-price" v-if="opriceShow">HK$99.99</span> -->
</div> </div>
</div> </div>
</div> </div>

4
src/components/mobilePage/home_pink.vue
View File

@ -18,7 +18,7 @@
<div class="price"> <div class="price">
<span class="label" :style="{background:txtBg,color:txtColor}" v-if="pinkShow">2人团</span> <span class="label" :style="{background:txtBg,color:txtColor}" v-if="pinkShow">2人团</span>
<p class="num line1" :style="{color:txtColor}" v-if="priceShow"> <p class="num line1" :style="{color:txtColor}" v-if="priceShow">
<span>￥</span> <span>HK$</span>
{{item.price}} {{item.price}}
</p> </p>
</div> </div>
@ -30,7 +30,7 @@
<div class="item" v-for="(item,index) in list" :index="index" v-if="index<3" :class="conStyle?'':'presellOn'"> <div class="item" v-for="(item,index) in list" :index="index" v-if="index<3" :class="conStyle?'':'presellOn'">
<div class="info"> <div class="info">
<div class="title line1" v-if="titleShow">{{item.name}}</div> <div class="title line1" v-if="titleShow">{{item.name}}</div>
<div class="price line1" v-if="priceShow" :style="{color:txtColor}">¥{{item.price}}</div> <div class="price line1" v-if="priceShow" :style="{color:txtColor}">HK${{item.price}}</div>
<span class="box-btn" v-if="bntShow">去拼团<span class="iconfont-diy iconjinru"></span></span> <span class="box-btn" v-if="bntShow">去拼团<span class="iconfont-diy iconjinru"></span></span>
</div> </div>
<div class="img-box" :class="conStyle?'':'pinkOn'"> <div class="img-box" :class="conStyle?'':'pinkOn'">

4
src/components/mobilePage/home_presell.vue
View File

@ -14,7 +14,7 @@
<span class="box-bg" v-if="presellShow" :class="conStyle?'':'presellOn'">火热预定中</span> <span class="box-bg" v-if="presellShow" :class="conStyle?'':'presellOn'">火热预定中</span>
</div> </div>
<div class="info"> <div class="info">
<div class="price line1" :style="'color:'+themeColor" v-if="priceShow"><span>预售价:</span>¥{{item.price}}</div> <div class="price line1" :style="'color:'+themeColor" v-if="priceShow"><span>预售价:</span>HK${{item.price}}</div>
<div class="title line1" v-if="titleShow">{{item.store_name}}</div> <div class="title line1" v-if="titleShow">{{item.store_name}}</div>
</div> </div>
</div> </div>
@ -23,7 +23,7 @@
<div class="item" v-for="(item,index) in list" :index="index" v-if="index<3"> <div class="item" v-for="(item,index) in list" :index="index" v-if="index<3">
<div class="info"> <div class="info">
<div class="title line1" v-if="titleShow">{{item.store_name}}</div> <div class="title line1" v-if="titleShow">{{item.store_name}}</div>
<div class="price line1" :style="'color:'+themeColor" v-if="priceShow">¥{{item.price}}</div> <div class="price line1" :style="'color:'+themeColor" v-if="priceShow">HK${{item.price}}</div>
<span class="box-btn" v-if="presellShow">去预定<span class="iconfont-diy iconjinru"></span></span> <span class="box-btn" v-if="presellShow">去预定<span class="iconfont-diy iconjinru"></span></span>
</div> </div>
<div class="img-box"> <div class="img-box">

6
src/components/mobilePage/home_seckill.vue
View File

@ -21,9 +21,9 @@
<div class="title line1" v-if="titleShow">{{ item.name }}</div> <div class="title line1" v-if="titleShow">{{ item.name }}</div>
<div v-if="progressShow" class="label" :style="{ borderColor: themeColor, color: themeColor }">20%</div> <div v-if="progressShow" class="label" :style="{ borderColor: themeColor, color: themeColor }">20%</div>
<div class="price"> <div class="price">
<span class="num-label" :style="{ color: themeColor }">￥</span> <span class="num-label" :style="{ color: themeColor }">HK$</span>
<span class="num" :style="{ color: themeColor }">{{item.price}}</span> <span class="num" :style="{ color: themeColor }">{{item.price}}</span>
<span v-if="priceShow" class="ot_price">￥{{item.ot_price}}</span> <span v-if="priceShow" class="ot_price">HK${{item.ot_price}}</span>
</div> </div>
</div> </div>
</div> </div>
@ -32,7 +32,7 @@
<div class="list-item" v-for="(item, index) in list" :index="index" v-if="index<3"> <div class="list-item" v-for="(item, index) in list" :index="index" v-if="index<3">
<div class="info"> <div class="info">
<div class="title line1" v-if="titleShow">{{item.name}}</div> <div class="title line1" v-if="titleShow">{{item.name}}</div>
<div class="price line1" v-if="priceShow" :style="{color:themeColor}">¥{{item.price}}</div> <div class="price line1" v-if="priceShow" :style="{color:themeColor}">HK${{item.price}}</div>
<span class="box-btn">去抢购<span class="iconfont-diy iconjinru"></span></span> <span class="box-btn">去抢购<span class="iconfont-diy iconjinru"></span></span>
</div> </div>
<div class="img-box"> <div class="img-box">

2
src/components/mobilePage/wechat_live.vue
View File

@ -50,7 +50,7 @@
<template v-if="item.goods.length>0"> <template v-if="item.goods.length>0">
<div class="goods-item" v-for="(goods,index) in item.goods" :key="index" > <div class="goods-item" v-for="(goods,index) in item.goods" :key="index" >
<img :src="goods.img" alt=""> <img :src="goods.img" alt="">
<span>￥{{goods.price}}</span> <span>HK${{goods.price}}</span>
</div> </div>
</template> </template>
<template v-else> <template v-else>

18047
src/styles/iconfont2/demo_index.html
View File

File diff suppressed because it is too large Load Diff

5
src/styles/iconfont2/iconfont.json
View File

@ -4,8 +4,7 @@
"font_family": "iconfont", "font_family": "iconfont",
"css_prefix_text": "icon-", "css_prefix_text": "icon-",
"description": "外包项目图标添加", "description": "外包项目图标添加",
"glyphs": [ "glyphs": [{
{
"icon_id": "5387812", "icon_id": "5387812",
"name": "购物_o", "name": "购物_o",
"font_class": "gouwu_o", "font_class": "gouwu_o",
@ -3710,7 +3709,7 @@
}, },
{ {
"icon_id": "7561200", "icon_id": "7561200",
"name": "￥", "name": "HK$",
"font_class": "icon-test", "font_class": "icon-test",
"unicode": "e6f6", "unicode": "e6f6",
"unicode_decimal": 59126 "unicode_decimal": 59126

4
src/views/accounts/reconciliation/record.vue
View File

@ -72,7 +72,7 @@
/> />
</div> </div>
<span class="tabBox_tit">{{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }}</span> <span class="tabBox_tit">{{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }}</span>
<span class="tabBox_pice">{{ '￥'+ val.cart_info.productAttr.price + ' x '+ val.product_num }}</span> <span class="tabBox_pice">{{ 'HK$'+ val.cart_info.productAttr.price + ' x '+ val.product_num }}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -198,7 +198,7 @@
/> />
</div> </div>
<span class="tabBox_tit">{{ val.product.cart_info.product.store_name + ' | ' }}{{ val.product.cart_info.productAttr.sku }}</span> <span class="tabBox_tit">{{ val.product.cart_info.product.store_name + ' | ' }}{{ val.product.cart_info.productAttr.sku }}</span>
<span class="tabBox_pice">{{ '￥'+ val.product.cart_info.productAttr.price + ' x '+ val.product.product_num }}</span> <span class="tabBox_pice">{{ 'HK$'+ val.product.cart_info.productAttr.price + ' x '+ val.product.product_num }}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>

4
src/views/accounts/statement/record.vue
View File

@ -72,7 +72,7 @@
/> />
</div> </div>
<span class="tabBox_tit">{{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }}</span> <span class="tabBox_tit">{{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }}</span>
<span class="tabBox_pice">{{ '￥'+ val.cart_info.productAttr.price + ' x '+ val.product_num }}</span> <span class="tabBox_pice">{{ 'HK$'+ val.cart_info.productAttr.price + ' x '+ val.product_num }}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -198,7 +198,7 @@
/> />
</div> </div>
<span class="tabBox_tit">{{ val.product.cart_info.product.store_name + ' | ' }}{{ val.product.cart_info.productAttr.sku }}</span> <span class="tabBox_tit">{{ val.product.cart_info.product.store_name + ' | ' }}{{ val.product.cart_info.productAttr.sku }}</span>
<span class="tabBox_pice">{{ '￥'+ val.product.cart_info.productAttr.price + ' x '+ val.product.product_num }}</span> <span class="tabBox_pice">{{ 'HK$'+ val.product.cart_info.productAttr.price + ' x '+ val.product.product_num }}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>

4
src/views/notify/smsPay/index.vue
View File

@ -34,7 +34,7 @@
:class="{active:index === current}" :class="{active:index === current}"
@click="check(item,index)" @click="check(item,index)"
> >
<div class="list-goods-list-item-title" :class="{active:index === current}">¥ <i>{{ item.price }}</i></div> <div class="list-goods-list-item-title" :class="{active:index === current}">HK$ <i>{{ item.price }}</i></div>
<div class="list-goods-list-item-price" :class="{active:index === current}"> <div class="list-goods-list-item-price" :class="{active:index === current}">
<span>{{ all[isChecked] }}条数: {{ item.num }}</span> <span>{{ all[isChecked] }}条数: {{ item.num }}</span>
</div> </div>
@ -56,7 +56,7 @@
<span class="ivu-text-right ivu-block">支付金额：</span> <span class="ivu-text-right ivu-block">支付金额：</span>
</el-col> </el-col>
<el-col :xs="11" :sm="13" :md="19" :lg="20"> <el-col :xs="11" :sm="13" :md="19" :lg="20">
<span class="list-goods-list-item-number">￥{{ checkList.price }}</span> <span class="list-goods-list-item-number">HK${{ checkList.price }}</span>
</el-col> </el-col>
</el-col> </el-col>
<el-col :span="24" class="ivu-text-left mb20"> <el-col :span="24" class="ivu-text-left mb20">

6
src/views/order/index.vue
View File

@ -178,9 +178,9 @@
</div> </div>
<span class="tabBox_tit">{{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }}</span> <span class="tabBox_tit">{{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }}</span>
<span class="tabBox_pice"> <span class="tabBox_pice">
<span v-if="scope.row.activity_type === 2 && val.cart_info.productPresellAttr">{{ '￥'+ val.cart_info.productPresellAttr.presell_price + ' x '+ val.product_num }}</span> <span v-if="scope.row.activity_type === 2 && val.cart_info.productPresellAttr">{{ 'HK$'+ val.cart_info.productPresellAttr.presell_price + ' x '+ val.product_num }}</span>
<span v-else-if="scope.row.activity_type === 3 && val.cart_info.productAssistAttr">{{ '￥'+ val.cart_info.productAssistAttr.assist_price + ' x '+ val.product_num }}</span> <span v-else-if="scope.row.activity_type === 3 && val.cart_info.productAssistAttr">{{ 'HK$'+ val.cart_info.productAssistAttr.assist_price + ' x '+ val.product_num }}</span>
<span v-else>{{ '￥'+ val.cart_info.productAttr.price + ' x '+ val.product_num }}</span> <span v-else>{{ 'HK$'+ val.cart_info.productAttr.price + ' x '+ val.product_num }}</span>
<em v-if="val.refund_num < val.product_num && val.refund_num >= 0" style="color: red;font-style: normal;">(-{{ val.product_num - val.refund_num }})</em> <em v-if="val.refund_num < val.product_num && val.refund_num >= 0" style="color: red;font-style: normal;">(-{{ val.product_num - val.refund_num }})</em>
</span> </span>
</div> </div>

2
src/views/order/orderCancellate/index.vue
View File

@ -97,7 +97,7 @@
>{{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }}</span> >{{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }}</span>
<span <span
class="tabBox_pice" class="tabBox_pice"
>{{ '￥'+ val.cart_info.productAttr.price + ' x '+ val.product_num }}</span> >{{ 'HK$'+ val.cart_info.productAttr.price + ' x '+ val.product_num }}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>

8
src/views/order/orderDetails.vue
View File

@ -65,8 +65,8 @@
<li class="item"> <li class="item">
<div class="title">实际支付</div> <div class="title">实际支付</div>
<div> <div>
¥{{ orderDetailList.pay_price }} HK${{ orderDetailList.pay_price }}
<span v-if="orderDetailList.finalOrder&&orderDetailList.finalOrder.pay_price&&orderDetailList.finalOrder.paid==1">尾款¥{{orderDetailList.finalOrder.pay_price}}</span> <span v-if="orderDetailList.finalOrder&&orderDetailList.finalOrder.pay_price&&orderDetailList.finalOrder.paid==1">尾款HK${{orderDetailList.finalOrder.pay_price}}</span>
</div> </div>
</li> </li>
<li class="item"> <li class="item">
@ -136,7 +136,7 @@
<div>实际支付：</div> <div>实际支付：</div>
<div class="value"> <div class="value">
{{ orderDetailList.pay_price }} {{ orderDetailList.pay_price }}
<span v-if="orderDetailList.finalOrder&&orderDetailList.finalOrder.pay_price&&orderDetailList.finalOrder.paid==1">尾款¥{{orderDetailList.finalOrder.pay_price}}</span> <span v-if="orderDetailList.finalOrder&&orderDetailList.finalOrder.pay_price&&orderDetailList.finalOrder.paid==1">尾款HK${{orderDetailList.finalOrder.pay_price}}</span>
</div> </div>
</li> </li>
<li class="item"> <li class="item">
@ -405,7 +405,7 @@
class="tabBox_tit" class="tabBox_tit"
>{{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }}</span> >{{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }}</span>
<span class="tabBox_pice"> <span class="tabBox_pice">
{{ '￥'+ val.cart_info.productAttr.price + ' x '+ val.product_num }} {{ 'HK$'+ val.cart_info.productAttr.price + ' x '+ val.product_num }}
<em <em
v-if="val.refund_num < val.product_num && val.refund_num > 0" v-if="val.refund_num < val.product_num && val.refund_num > 0"
style="color: red;font-style: normal;" style="color: red;font-style: normal;"

6
src/views/order/orderRefund/index.vue
View File

@ -180,15 +180,15 @@
<span <span
v-if="scope.row.order && scope.row.order.activity_type === 2 && val.product && val.product.cart_info.productPresellAttr" v-if="scope.row.order && scope.row.order.activity_type === 2 && val.product && val.product.cart_info.productPresellAttr"
class="tabBox_pice" class="tabBox_pice"
>{{ '￥'+ val.product && val.product.cart_info.productPresellAttr.presell_price + ' x '+ val.refund_num }}</span> >{{ 'HK$'+ val.product && val.product.cart_info.productPresellAttr.presell_price + ' x '+ val.refund_num }}</span>
<span <span
v-else-if="scope.row.order && scope.row.order.activity_type === 3 && val.product && val.product.cart_info.productAssistAttr.assist_price" v-else-if="scope.row.order && scope.row.order.activity_type === 3 && val.product && val.product.cart_info.productAssistAttr.assist_price"
class="tabBox_pice" class="tabBox_pice"
>{{ '￥'+ val.product && val.product.cart_info.productAssistAttr.assist_price + ' x '+ val.refund_num }}</span> >{{ 'HK$'+ val.product && val.product.cart_info.productAssistAttr.assist_price + ' x '+ val.refund_num }}</span>
<span <span
v-else v-else
class="tabBox_pice" class="tabBox_pice"
>{{ '￥'+ val.product && val.product.cart_info.productAttr.price + ' x '+ val.refund_num }}</span> >{{ 'HK$'+ val.product && val.product.cart_info.productAttr.price + ' x '+ val.refund_num }}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>

8
src/views/systemForm/setSystem/modifyStoreInfo.vue
View File

@ -65,7 +65,7 @@
<div> <div>
<vue-qr class="bicode" :text="qrCode" :size="310" /> <vue-qr class="bicode" :text="qrCode" :size="310" />
<div class="pay_type" >请使用微信扫码支付</div> <div class="pay_type" >请使用微信扫码支付</div>
<div class="pay_price" >￥{{marginPrice}}元</div> <div class="pay_price" >HK${{marginPrice}}元</div>
<div class="pay_time">支付码过期时间： {{qrEndTime}}</div> <div class="pay_time">支付码过期时间： {{qrEndTime}}</div>
</div> </div>
</div> </div>
@ -82,7 +82,7 @@
<div> <div>
<img src="@/assets/images/margin03.png"/> <img src="@/assets/images/margin03.png"/>
<div class="alic"> <div class="alic">
<span class="text_g">剩余保证金￥{{merData.margin}}元</span> <span class="text_g">剩余保证金HK${{merData.margin}}元</span>
<el-button v-if="merData.margin>0" type="primary" size="small" @click="applyReturn">申请退回保证金</el-button> <el-button v-if="merData.margin>0" type="primary" size="small" @click="applyReturn">申请退回保证金</el-button>
</div> </div>
</div> </div>
@ -97,7 +97,7 @@
<div> <div>
<vue-qr class="bicode" :text="qrCode" :size="310" /> <vue-qr class="bicode" :text="qrCode" :size="310" />
<div class="pay_type" >请使用微信扫码支付</div> <div class="pay_type" >请使用微信扫码支付</div>
<div class="pay_price" >￥{{marginPrice}}元</div> <div class="pay_price" >HK${{marginPrice}}元</div>
<div class="pay_time">支付码过期时间： {{qrEndTime}}</div> <div class="pay_time">支付码过期时间： {{qrEndTime}}</div>
</div> </div>
</div> </div>
@ -116,7 +116,7 @@
<img v-if="merData.is_margin == -1" src="@/assets/images/margin02.png"/> <img v-if="merData.is_margin == -1" src="@/assets/images/margin02.png"/>
<img v-if="merData.is_margin == 10" src="@/assets/images/margin03.png"/> <img v-if="merData.is_margin == 10" src="@/assets/images/margin03.png"/>
<div class="alic" v-if="merData.is_margin == 10"> <div class="alic" v-if="merData.is_margin == 10">
<span class="text_g">剩余保证金￥{{merData.margin}}元</span> <span class="text_g">剩余保证金HK${{merData.margin}}元</span>
<el-button v-if="merData.margin>0" type="primary" size="small" @click="applyReturn">申请退回保证金</el-button> <el-button v-if="merData.margin>0" type="primary" size="small" @click="applyReturn">申请退回保证金</el-button>
</div> </div>
<div class="alic" v-if="merData.is_margin == -1"> <div class="alic" v-if="merData.is_margin == -1">