diff --git a/CoreCms.Net.Uni-App/CoreShop/common/utils/commonHelper.js b/CoreCms.Net.Uni-App/CoreShop/common/utils/commonHelper.js
index c2518ec..d150d2e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/common/utils/commonHelper.js
+++ b/CoreCms.Net.Uni-App/CoreShop/common/utils/commonHelper.js
@@ -51,7 +51,7 @@ function formatMoney(number, places, symbol, thousand, decimal) {
// console.log(places)
number = number || 0
places = !isNaN((places = Math.abs(places))) ? places : 2
- symbol = symbol !== undefined ? symbol : '¥'
+ symbol = symbol !== undefined ? symbol : ''
thousand = thousand || ','
decimal = decimal || '.'
var negative = number < 0 ? '-' : '',
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-coupon.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-coupon.vue
index 138ddda..1bbdae9 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-coupon.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-coupon.vue
@@ -58,7 +58,7 @@
coupons: [
{
color: '#9F6DFA', ltBg: "#FFFFFF", height: '180rpx',
- unit: "¥", number: 5, txt: "满50元可用", title: "全场通用券", desc: "有效期至 2018-05-20",
+ unit: "", number: 5, txt: "满50元可用", title: "全场通用券", desc: "有效期至 2018-05-20",
btn: "领取", drawed: "已抢2100张"
}
]
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-groupPurchase.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-groupPurchase.vue
index 73fbb10..2a23f5a 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-groupPurchase.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-groupPurchase.vue
@@ -13,7 +13,7 @@
{{item.name}}
{{item.goods.name}}
- ¥{{item.goods.product.price}} {{item.goods.product.mktprice}}元
+ {{item.goods.product.price}} {{item.goods.product.mktprice}}元
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-pinTuan.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-pinTuan.vue
index 480e9ca..380dea6 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-pinTuan.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-pinTuan.vue
@@ -17,8 +17,8 @@
- ¥{{item.pinTuanPrice}}
- ¥{{item.pinTuanPrice + item.discountAmount}}
+ {{item.pinTuanPrice}}
+ {{item.pinTuanPrice + item.discountAmount}}
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-service.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-service.vue
index f51d6ca..cc9a10d 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-service.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-service.vue
@@ -12,7 +12,7 @@
{{item.title}}
{{item.description}}
- ¥{{item.money}}
+ {{item.money}}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.vue
index c4f88a9..63c13c7 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.vue
@@ -293,7 +293,7 @@
{{ product.price || ''}}
- ¥{{ product.mktprice || ''}}
+ {{ product.mktprice || ''}}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/list/list.vue
index 0ca50a9..01cc7e0 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/list/list.vue
@@ -1,4 +1,4 @@
-
+
@@ -18,8 +18,8 @@
- ¥{{ item.price }}
- ¥{{ item.mktprice }}
+ {{ item.price }}
+ {{ item.mktprice }}
{{ btnType[tabCurrent].name }}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/details/details.vue
index 849f4da..95c7427 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/details/details.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/details/details.vue
@@ -385,25 +385,25 @@
- ¥{{ product.price || '0' }}
+ {{ product.price || '0' }}
单独购买
- ¥{{ pinTuanPrice || '0' }}
+ {{ pinTuanPrice || '0' }}
发起拼团
- ¥{{ pinTuanPrice || '0' }}
+ {{ pinTuanPrice || '0' }}
即将开团
- ¥{{ pinTuanPrice || '0' }}
+ {{ pinTuanPrice || '0' }}
拼团已结束
@@ -450,7 +450,7 @@
{{ price || ''}}
- ¥{{ product.mktprice || ''}}
+ {{ product.mktprice || ''}}
已选: {{ product.spesDesc || '无'}}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/list/list.vue
index 75ae0b4..0109788 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/list/list.vue
@@ -30,8 +30,8 @@
- ¥{{ item.pinTuanPrice }}
- ¥{{ item.price }}
+ {{ item.pinTuanPrice }}
+ {{ item.price }}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/details/details.vue
index 19e9b94..6216fb4 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/details/details.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/details/details.vue
@@ -295,7 +295,7 @@
{{ product.price || ''}}
- ¥{{ product.mktprice || ''}}
+ {{ product.mktprice || ''}}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.vue
index 86b016f..225ea58 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.vue
@@ -1,4 +1,4 @@
-
+
@@ -26,8 +26,8 @@
- ¥{{ item.price }}
- ¥{{ item.mktprice }}
+ {{ item.price }}
+ {{ item.mktprice }}
{{ btnType[tabCurrent].name }}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/article/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/article/list/list.vue
index 9208dd8..36df147 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/article/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/article/list/list.vue
@@ -1,4 +1,4 @@
-
+
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/form/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/form/details/details.vue
index 1078cf2..b8aa487 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/form/details/details.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/form/details/details.vue
@@ -44,7 +44,7 @@
已售{{item.good.buyCount}}
- ¥{{item.good.price}}
+ {{item.good.price}}
选规格
@@ -208,7 +208,7 @@
合计
- ¥{{goodsTotalMoney}}
+ {{goodsTotalMoney}}
@@ -242,7 +242,7 @@
{{goodsInfoName}}
- ¥{{goodsInfoPrint}}
+ {{goodsInfoPrint}}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue
index ded8b8f..fb2f5a0 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue
@@ -21,7 +21,7 @@
{{ product.price || '0.00' }}结缘
@@ -334,7 +334,7 @@
{{ product.price || ''}}结缘
-
+
@@ -178,7 +178,7 @@
-
+
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/list/list.vue
index ea9a2dc..1c2f761 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/list/list.vue
@@ -1,4 +1,4 @@
-
+
@@ -26,7 +26,7 @@
- 退款金额:¥{{item.refundAmount}}
+ 退款金额:{{item.refundAmount}}
查看详情
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue
index 072da8c..a82a709 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue
@@ -91,7 +91,7 @@
- 可修改,最多¥{{maxRefund}},含发货邮费¥{{costFreight}}
+ 可修改,最多{{maxRefund}},含发货邮费{{costFreight}}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/commissionDetails/commissionDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/commissionDetails/commissionDetails.vue
index 76f4576..51ee1dd 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/commissionDetails/commissionDetails.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/commissionDetails/commissionDetails.vue
@@ -31,7 +31,7 @@
{{ selDateText }}
- 收入¥{{ totalMoney || '0.00' }}
+ 收入{{ totalMoney || '0.00' }}
+
@@ -113,7 +113,7 @@
{{ item.addon ? item.addon : '' }}
- ¥{{ item.amount || 0 }}
+ {{ item.amount || 0 }}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/search/index.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/search/index.scss
index 9ca1d19..df712ba 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/search/index.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/search/index.scss
@@ -1,4 +1,4 @@
-// 遮罩
+// 遮罩
.mask { width: 100%; height: 100%; position: fixed; z-index: 20; }
// 商户信息
.head-box { position: relative; height: 320rpx; background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; background-color: #19be6b; color: #ffffff;
@@ -79,7 +79,7 @@
.order-list { background: #fff; margin: 20rpx 0; padding: 0 20rpx;
.order-bottom { height: 80rpx; /*padding: 0 20rpx;*/ .total-price-title { color: #999999; font-size: 24rpx; }
.total-price { color: #333; font-size: 26rpx;
- &::before { content: '¥'; font-size: 20rpx; }
+ &::before { content: ''; font-size: 20rpx; }
}
}
.order-head { /* padding: 0 25rpx;*/ height: 77rpx; border-bottom: 1rpx solid #dfdfdf;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/search/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/search/index.vue
index a440fe9..db565a3 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/search/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/search/index.vue
@@ -1,4 +1,4 @@
-
+
@@ -33,7 +33,7 @@
{{ item.addon ? item.addon : '' }}
- ¥{{ item.amount || 0 }}
+ {{ item.amount || 0 }}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/index.vue
index c1de4ec..7ad0357 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/index.vue
@@ -32,7 +32,7 @@
BN码:{{v.bn}}
- ¥{{ v.price }}
+ {{ v.price }}
x{{ v.nums }}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/list.vue
index 1ab1bfa..846e88a 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/list.vue
@@ -20,7 +20,7 @@
订单号:{{v.orderId}}
- ¥{{ v.price }}
+ {{ v.price }}
x{{ v.nums }}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/index/index.vue
index a31f5a9..7f6b43c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/index/index.vue
@@ -1,4 +1,4 @@
-
+
@@ -26,7 +26,7 @@
- ¥{{ goods.price }}
+ {{ goods.price }}
x{{ goods.nums }}
@@ -34,7 +34,7 @@
共{{ order.items.length }}件商品 合计:
- ¥{{ order.orderAmount }}
+ {{ order.orderAmount }}
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/images/common/bg1.png b/CoreCms.Net.Uni-App/CoreShop/static/images/common/bg1.png
new file mode 100644
index 0000000..faf4e8f
Binary files /dev/null and b/CoreCms.Net.Uni-App/CoreShop/static/images/common/bg1.png differ
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index01.png b/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index01.png
index e7ad6a6..09bef6f 100644
Binary files a/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index01.png and b/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index01.png differ
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index01_1.png b/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index01_1.png
index 7ced71c..e7be290 100644
Binary files a/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index01_1.png and b/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index01_1.png differ
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index02.png b/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index02.png
index 17cfb59..c72a0f2 100644
Binary files a/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index02.png and b/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index02.png differ
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index02_1.png b/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index02_1.png
index 83f2f7d..521ba0b 100644
Binary files a/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index02_1.png and b/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index02_1.png differ
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index03.png b/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index03.png
index f5eb724..3ba0b59 100644
Binary files a/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index03.png and b/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index03.png differ
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index03_1.png b/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index03_1.png
index 0c1c57e..1079b8f 100644
Binary files a/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index03_1.png and b/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index03_1.png differ
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index04.png b/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index04.png
index 3729797..126eea6 100644
Binary files a/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index04.png and b/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index04.png differ
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index04_1.png b/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index04_1.png
index 59fa2cf..304290b 100644
Binary files a/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index04_1.png and b/CoreCms.Net.Uni-App/CoreShop/static/images/indexMenus/index04_1.png differ
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/images/payments/balancepay.png b/CoreCms.Net.Uni-App/CoreShop/static/images/payments/balancepay.png
index 7dc59b6..4ec0bd0 100644
Binary files a/CoreCms.Net.Uni-App/CoreShop/static/images/payments/balancepay.png and b/CoreCms.Net.Uni-App/CoreShop/static/images/payments/balancepay.png differ
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/images/payments/pay.png b/CoreCms.Net.Uni-App/CoreShop/static/images/payments/pay.png
index 242a9ba..9d80894 100644
Binary files a/CoreCms.Net.Uni-App/CoreShop/static/images/payments/pay.png and b/CoreCms.Net.Uni-App/CoreShop/static/images/payments/pay.png differ
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss b/CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss
index f69c482..0ec3fc7 100644
--- a/CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss
@@ -1,4 +1,4 @@
-/*page { background: #f6f7f9; }*/
+/*page { background: #f6f7f9; }*/
page, .bg-page { background: #f7f7f7; }
@@ -137,7 +137,7 @@ page, .bg-page { background: #f7f7f7; }
.coreshop-line-height-initial { line-height: initial }
/*人民币符号*/
-.coreshop-text-price::before { content: "¥"; font-size: 80%; margin-right: 4upx; }
+.coreshop-text-price::before { content: ""; font-size: 80%; margin-right: 4upx; }
/*字体格式*/
.coreshop-text-bold { font-weight: bold; }