From 2bdd70ca1c232e1ff691d9e5572b54decc5fdd48 Mon Sep 17 00:00:00 2001 From: 15820893422 <1978476055@qq.com> Date: Fri, 31 May 2024 15:08:56 +0800 Subject: [PATCH] 1 --- .env.development | 4 +- src/components/mobilePage/home_bargain.vue | 4 +- src/components/mobilePage/home_coupon.vue | 12 +- src/components/mobilePage/home_goods_list.vue | 50 +- src/components/mobilePage/home_pink.vue | 4 +- src/components/mobilePage/home_presell.vue | 4 +- src/components/mobilePage/home_seckill.vue | 6 +- src/components/mobilePage/home_shop.vue | 2 +- src/components/mobilePage/wechat_live.vue | 2 +- src/styles/iconfont2/demo_index.html | 18047 ++++++++-------- src/styles/iconfont2/iconfont.json | 5 +- src/views/dashboard/components/toDay.vue | 2 +- .../marketing/assist/assist_goods/detail.vue | 2 +- .../marketing/integral/orderList/index.vue | 2 +- src/views/merchant/list/record.vue | 4 +- src/views/merchant/type/record.vue | 4 +- src/views/notify/smsPay/index.vue | 4 +- src/views/order/list/index.vue | 2 +- src/views/order/list/orderDetails.vue | 4 +- src/views/order/orderCancellate/index.vue | 2 +- src/views/order/refund/index.vue | 2 +- src/views/promoter/order/index.vue | 2 +- src/views/promoter/order/orderDetails.vue | 4 +- src/views/sms/smsPay/index.vue | 4 +- 24 files changed, 9092 insertions(+), 9086 deletions(-) diff --git a/.env.development b/.env.development index 00601dc..42b6a53 100644 --- a/.env.development +++ b/.env.development @@ -3,8 +3,8 @@ ENV = 'development' # http://192.168.1.43:8324/admin # http://mer.crmeb.net/admin # base api -# VUE_APP_BASE_API = 'http://192.168.1.110:8088' -VUE_APP_BASE_API = 'http://oversea.hwms.shop' +VUE_APP_BASE_API = 'http://192.168.1.50:8090' +# VUE_APP_BASE_API = 'http://oversea.hwms.shop' # socket 连接地址 # VUE_APP_WS_URL = 'ws://0.0.0.0:8324' diff --git a/src/components/mobilePage/home_bargain.vue b/src/components/mobilePage/home_bargain.vue index 236c757..2ac00b4 100644 --- a/src/components/mobilePage/home_bargain.vue +++ b/src/components/mobilePage/home_bargain.vue @@ -27,7 +27,7 @@
{{item.store_name}}
助力价 -

￥{{item.price}}

+

HK${{item.price}}

发起助力
@@ -38,7 +38,7 @@
{{item.store_name}}
-
¥{{item.price}}
+
HK${{item.price}}
去助力
diff --git a/src/components/mobilePage/home_coupon.vue b/src/components/mobilePage/home_coupon.vue index 9c5983f..0fe82a4 100644 --- a/src/components/mobilePage/home_coupon.vue +++ b/src/components/mobilePage/home_coupon.vue @@ -9,21 +9,21 @@
-
￥10
+
HK$10
满100元可用
立即领取
-
￥50
+
HK$50
满100元可用
去使用
-
￥50
+
HK$50
满100元可用
立即领取
@@ -32,21 +32,21 @@
-
￥50
+
HK$50
满100元可用
立
即
领
取
-
￥50
+
HK$50
满100元可用
去
使
用
-
￥50
+
HK$50
满100元可用
立
即
领
取
diff --git a/src/components/mobilePage/home_goods_list.vue b/src/components/mobilePage/home_goods_list.vue index 9fd9b97..452358e 100644 --- a/src/components/mobilePage/home_goods_list.vue +++ b/src/components/mobilePage/home_goods_list.vue @@ -21,9 +21,9 @@
- ￥{{item.price}} + HK${{item.price}}
- +
@@ -44,9 +44,9 @@
- ¥199 + HK$199
- +
@@ -65,9 +65,9 @@
- ¥199 + HK$199
- +
@@ -87,7 +87,7 @@
- ¥{{item.price}} + HK${{item.price}}
@@ -109,9 +109,9 @@
- ¥66.66 + HK$66.66
- +
@@ -129,9 +129,9 @@
- ￥66.66 + HK$66.66
- +
@@ -155,9 +155,9 @@
- ¥{{item.price}} + HK${{item.price}}
- +
@@ -173,9 +173,9 @@
- ¥66.66 + HK$66.66
- +
@@ -189,9 +189,9 @@
- ¥66.66 + HK$66.66
- +
@@ -205,9 +205,9 @@
- ¥66.66 + HK$66.66
- +
@@ -222,8 +222,8 @@
{{item.store_name}}
-
￥{{item.price}} - +
HK${{item.price}} +
@@ -233,8 +233,8 @@
商品名称
-
¥66.66 - +
HK$66.66 +
@@ -242,8 +242,8 @@
商品名称
-
¥66.66 - +
HK$66.66 +
diff --git a/src/components/mobilePage/home_pink.vue b/src/components/mobilePage/home_pink.vue index 8b27e89..197b6d5 100644 --- a/src/components/mobilePage/home_pink.vue +++ b/src/components/mobilePage/home_pink.vue @@ -18,7 +18,7 @@
2人团

- ￥ + HK$ {{item.price}}

@@ -30,7 +30,7 @@
{{item.name}}
-
¥{{item.price}}
+
HK${{item.price}}
去拼团
diff --git a/src/components/mobilePage/home_presell.vue b/src/components/mobilePage/home_presell.vue index 81351e4..9d86520 100644 --- a/src/components/mobilePage/home_presell.vue +++ b/src/components/mobilePage/home_presell.vue @@ -14,7 +14,7 @@ 火热预定中
-
预售价:¥{{item.price}}
+
预售价:HK${{item.price}}
{{item.store_name}}
@@ -23,7 +23,7 @@
{{item.store_name}}
-
¥{{item.price}}
+
HK${{item.price}}
去预定
diff --git a/src/components/mobilePage/home_seckill.vue b/src/components/mobilePage/home_seckill.vue index e9593c3..6148252 100644 --- a/src/components/mobilePage/home_seckill.vue +++ b/src/components/mobilePage/home_seckill.vue @@ -21,9 +21,9 @@
{{ item.name }}
20%
- ￥ + HK$ {{item.price}} - ￥{{item.ot_price}} + HK${{item.ot_price}}
@@ -32,7 +32,7 @@
{{item.name}}
-
¥{{item.price}}
+
HK${{item.price}}
去抢购
diff --git a/src/components/mobilePage/home_shop.vue b/src/components/mobilePage/home_shop.vue index 1fb1dde..1211b11 100644 --- a/src/components/mobilePage/home_shop.vue +++ b/src/components/mobilePage/home_shop.vue @@ -29,7 +29,7 @@
{{itm.store_name}}
-
¥ {{itm.price}}
+
HK$ {{itm.price}}
diff --git a/src/components/mobilePage/wechat_live.vue b/src/components/mobilePage/wechat_live.vue index 4eac80f..ae4338e 100644 --- a/src/components/mobilePage/wechat_live.vue +++ b/src/components/mobilePage/wechat_live.vue @@ -50,7 +50,7 @@ @@ -167,7 +167,7 @@ {{ val.product.cart_info.product.store_name + ' | ' }}{{ val.product.cart_info.productAttr.sku }} - {{ '￥'+ val.product.cart_info.productAttr.price + ' x '+ val.product.product_num }} + {{ 'HK$'+ val.product.cart_info.productAttr.price + ' x '+ val.product.product_num }} diff --git a/src/views/merchant/type/record.vue b/src/views/merchant/type/record.vue index 84a2ffc..b5deaf4 100644 --- a/src/views/merchant/type/record.vue +++ b/src/views/merchant/type/record.vue @@ -80,7 +80,7 @@ {{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }} - {{ '￥'+ val.cart_info.productAttr.price + ' x '+ val.product_num }} + {{ 'HK$'+ val.cart_info.productAttr.price + ' x '+ val.product_num }} @@ -167,7 +167,7 @@ {{ val.product.cart_info.product.store_name + ' | ' }}{{ val.product.cart_info.productAttr.sku }} - {{ '￥'+ val.product.cart_info.productAttr.price + ' x '+ val.product.product_num }} + {{ 'HK$'+ val.product.cart_info.productAttr.price + ' x '+ val.product.product_num }} diff --git a/src/views/notify/smsPay/index.vue b/src/views/notify/smsPay/index.vue index 75a46e2..895f8af 100644 --- a/src/views/notify/smsPay/index.vue +++ b/src/views/notify/smsPay/index.vue @@ -33,7 +33,7 @@
-
¥ {{item.price }}
+
HK$ {{item.price }}
{{all[isChecked]}}条数: {{ item.num }}
@@ -55,7 +55,7 @@ 支付金额： - ￥{{checkList.price}} + HK${{checkList.price}} diff --git a/src/views/order/list/index.vue b/src/views/order/list/index.vue index 3d3bad5..aa7f52e 100644 --- a/src/views/order/list/index.vue +++ b/src/views/order/list/index.vue @@ -246,7 +246,7 @@ class="tabBox_tit" >{{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }} - {{ '￥'+ val.cart_info.productAttr.price + ' x '+ val.product_num }} + {{ 'HK$'+ val.cart_info.productAttr.price + ' x '+ val.product_num }}
  • 实际支付
    -
    ¥ {{ orderDetailList.pay_price }}
    +
    HK$ {{ orderDetailList.pay_price }}
  • 支付方式
    @@ -353,7 +353,7 @@ class="tabBox_tit" >{{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }} - {{ '￥'+ val.cart_info.productAttr.price + ' x '+ val.product_num }} + {{ 'HK$'+ val.cart_info.productAttr.price + ' x '+ val.product_num }} {{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }} {{ '￥'+ val.cart_info.productAttr.price + ' x '+ val.product_num }} + >{{ 'HK$'+ val.cart_info.productAttr.price + ' x '+ val.product_num }}
    • diff --git a/src/views/order/refund/index.vue b/src/views/order/refund/index.vue index febcd38..7325903 100644 --- a/src/views/order/refund/index.vue +++ b/src/views/order/refund/index.vue @@ -134,7 +134,7 @@ >{{ val.product && val.product.cart_info.product.store_name + ' | ' }}{{ val.product && val.product.cart_info.productAttr.sku }} {{ '￥'+ val.product.cart_info.productAttr.price + ' x '+ val.product.product_num }} + >{{ 'HK$'+ val.product.cart_info.productAttr.price + ' x '+ val.product.product_num }} diff --git a/src/views/promoter/order/index.vue b/src/views/promoter/order/index.vue index 2ff6c67..fca2c3a 100644 --- a/src/views/promoter/order/index.vue +++ b/src/views/promoter/order/index.vue @@ -241,7 +241,7 @@ class="tabBox_tit" >{{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }} - {{ '￥'+ val.cart_info.productAttr.price + ' x '+ val.product_num }} + {{ 'HK$'+ val.cart_info.productAttr.price + ' x '+ val.product_num }}
  • 实际支付
    -
    ¥ {{ orderDetailList.pay_price }}
    +
    HK$ {{ orderDetailList.pay_price }}
  • 支付方式
    @@ -347,7 +347,7 @@ class="tabBox_tit" >{{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }} - {{ '￥'+ val.cart_info.productAttr.price + ' x '+ val.product_num }} + {{ 'HK$'+ val.cart_info.productAttr.price + ' x '+ val.product_num }} -
    ¥ {{ item.price }}
    +
    HK$ {{ item.price }}
    短信条数: {{ item.num }}
    @@ -61,7 +61,7 @@ 支付金额： - ￥{{ checkList.price }} + HK${{ checkList.price }}