diff --git a/manifest.json b/manifest.json index c65f8e9..e0197d0 100644 --- a/manifest.json +++ b/manifest.json @@ -195,6 +195,18 @@ "router" : { "mode" : "hash", "base" : "" + }, + "devServer" : { + "port" : 5173, + "proxy" : { + "/proxy-api" : { + "target" : "https://api.o.tbmall.xin", + "changeOrigin" : true, + "pathRewrite" : { + "^/proxy-api" : "" + } + } + } } } } diff --git a/pages/home/home.vue b/pages/home/home.vue index 9c63c0e..3453f47 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -772,7 +772,7 @@ export default { left: 0; right: 0; height: 4px; - background: linear-gradient(270deg, #af39c4 0%, #7732ff 100%); + //background: linear-gradient(270deg, #af39c4 0%, #7732ff 100%); pointer-events: none; } } diff --git a/pages/other_package/productInfo/productInfo.vue b/pages/other_package/productInfo/productInfo.vue index d763a1b..8f418b9 100644 --- a/pages/other_package/productInfo/productInfo.vue +++ b/pages/other_package/productInfo/productInfo.vue @@ -216,14 +216,14 @@ {{ selectSpecificationTempl.price }} - {{ skuBySpecInfo.supplyPrice }} + {{ skuBySpecInfo.originalPrice }} - {{ skuBySpecInfo.price }} 优惠券{{ orderInfo.couponPrice }} - ¥{{ skuBySpecInfo.supplyPrice }} + ¥{{ skuBySpecInfo.originalPrice }} 优惠券已优惠¥{{ orderInfo.couponPrice }} @@ -1224,7 +1224,7 @@ export default { const skuBySpecBash = this.getSkuBySpecValueIds(this.selectedSpecValueIds) || {}; console.log("----111", skuBySpecBash) - this.skuBySpecInfo = { ...this.orderInfo, skuImage: skuBySpecBash.skuImage, stock: skuBySpecBash.stock, supplyPrice: skuBySpecBash.supplyPrice, price: skuBySpecBash.price, skuName: skuBySpecBash.skuName } + this.skuBySpecInfo = { ...this.orderInfo, skuImage: skuBySpecBash.skuImage, stock: skuBySpecBash.stock, supplyPrice: skuBySpecBash.supplyPrice, price: skuBySpecBash.price, skuName: skuBySpecBash.skuName, originalPrice: skuBySpecBash.originalPrice } console.log("----222", this.orderInfo) if (this.selectedSpecValueIds.every((id) => id != null)) { diff --git a/pages/rwa_package/setting/setting.vue b/pages/rwa_package/setting/setting.vue index 1e3cc9a..d2baaa7 100644 --- a/pages/rwa_package/setting/setting.vue +++ b/pages/rwa_package/setting/setting.vue @@ -4,25 +4,21 @@
- - {{item.text}} + + {{ item.text }} - {{item.value}} + {{ item.value }} - + - - {{item.text}} + + {{ item.text }} @@ -36,34 +32,34 @@