From 084e5d1395b1c07c76e6f921ff57d7cc03ccfefd Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Wed, 18 Mar 2026 15:17:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9F=AD=E8=A7=86=E9=A2=91ap?= =?UTF-8?q?p=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 7 ------- components/cart/cart.vue | 1 - pages/buy/buy.vue | 1 - 3 files changed, 9 deletions(-) diff --git a/App.vue b/App.vue index 40adf1c4..5bb90074 100644 --- a/App.vue +++ b/App.vue @@ -7,17 +7,10 @@ data: { // 基础配置 // 数据接口请求地址 -<<<<<<< HEAD request_url:'https://d1.shopxo.vip/', // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/） static_url:'https://d1.shopxo.vip/', -======= - request_url:'https://new.shopxo.vip/', - - // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/） - static_url:'https://new.shopxo.vip/', ->>>>>>> dev-yxl // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立） system_type: 'default', diff --git a/components/cart/cart.vue b/components/cart/cart.vue index 14e0fd65..13ccd819 100644 --- a/components/cart/cart.vue +++ b/components/cart/cart.vue @@ -1044,7 +1044,6 @@ preferential_price: data.base.preferential_price, increase_price: data.base.increase_price, all_total_price: data.base.total_price, - buy_currency_symbol: data.currency_symbol, discount_detail_list: data.goods_list, }); } else { diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue index 6b208475..c040ba80 100644 --- a/pages/buy/buy.vue +++ b/pages/buy/buy.vue @@ -599,7 +599,6 @@ // 基础数据 this.setData({ - currency_symbol: data.currency_symbol || app.globalData.currency_symbol(), payment_list: data.payment_list || [], });