diff --git a/im/src/config/config.js b/im/src/config/config.js index 7cc7377c..d5396129 100644 --- a/im/src/config/config.js +++ b/im/src/config/config.js @@ -1,10 +1,30 @@ + +/** + * 读取公共配置API路径。 + * 工程会读取根目录下的 env 。 + * 根目录下的.env文件是用来定义环境变量的。 + * 它可以包含各种键值对，每个键代表一个环境变量。 + * 这些环境变量可以在应用程序的整个生命周期内使用，例如在代码中访问、配置webpack或在构建部署过程中使用不同的值。 + * env中的 ODE_ENV指定当前的环境。 + * 可以分别创建.env.development、.env.production等文件。 + * 默认.env 文件中的变量作为开发环境的环境变量。 + * env文件修改的话需要重新编译项目。 + */ export default { + // 网站名称 WEBSITE_NAME: process.env.VUE_APP_WEBSITE_NAME || "LiLi IM", - BASE_API_URL: process.env.VUE_APP_API_BASE_URL || "", - BASE_WS_URL: process.env.VUE_APP_WEB_SOCKET_URL || "", - BASE_COMMON: process.env.VUE_APP_COMMON || "", - BASE_BUYER: process.env.VUE_APP_BUYER || "", + // 默认请求IM的API + BASE_API_URL: process.env.VUE_APP_API_BASE_URL || "", + // 默认请求的WS + BASE_WS_URL: process.env.VUE_APP_WEB_SOCKET_URL || "", + // 默认请求公有接口相关 API + BASE_COMMON: process.env.VUE_APP_COMMON || "", + // 默认请求用户相关API + BASE_BUYER: process.env.VUE_APP_BUYER || "", + // 默认请求卖家相关的API BASE_SELLER: process.env.VUE_APP_SELLER || "", + // 点击商品跳转到的地址 PC_URL: process.env.VUE_APP_PC_URL || "https://pc-b2b2c.pickmall.cn", + // 订单跳转商家订单页面 PC_STORE: process.env.VUE_APP_PC_STORE || 'https://store-b2b2c.pickmall.cn', }; diff --git a/im/src/main.js b/im/src/main.js index 321eab3a..2fdf7f6c 100644 --- a/im/src/main.js +++ b/im/src/main.js @@ -1,20 +1,33 @@ import 'core-js/stable' import 'regenerator-runtime/runtime' +// 引入 Vue 和应用程序组件 import Vue from 'vue' import App from '@/App' + +// 引入 store 和 router import store from '@/store' import router from '@/router' + +// 引入自定义的 mixin import MainMixin from './mixins/main-mixin' + +// 引入全局组件 import face from '@/components/face' import faceNull from '@/components/face-null' + +// 引入配置文件和其他核心模块 import config from "@/config/config"; import './core/lazy-use' import './core/global-component' import './core/filter' import './core/directives' + +// 引入权限控制和图标库 import '@/permission' import '@/icons' + +// 引入自定义过滤器，并注册为全局过滤器 import * as filters from "./plugins/filters"; Object.keys(filters).forEach((key) => { Vue.filter(key, filters[key]); @@ -23,11 +36,16 @@ Object.keys(filters).forEach((key) => { // 引入自定义全局css import '@/assets/css/global.less' +// 关闭生产提示 Vue.config.productionTip = false -Vue.mixin(MainMixin) // 引入mixins + +// 注册全局 mixin +Vue.mixin(MainMixin) Vue.component('face', face) Vue.component('face-null', faceNull) + +// 添加自定义原型方法 Vue.prototype.linkToGoods = function (goodsId, skuId) { // 跳转买家端商品 if (localStorage.getItem('storeFlag') == 'false') { window.open(`${config.PC_URL}goodsDetail?skuId=${skuId}&goodsId=${goodsId}`, '_blank') diff --git a/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue b/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue index f0675d31..f36647e9 100644 --- a/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue +++ b/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue @@ -3,7 +3,8 @@
- + + 配置买家端站点名称 @@ -16,6 +17,7 @@ + 后台管理左上角logo展示 17∶6 @@ -24,6 +26,7 @@ + 后台管理网站icon展示 1∶1 @@ -31,6 +34,7 @@ + 买家端logo展示 17∶6 @@ -38,6 +42,7 @@ + 买家端网站icon展示 1∶1 @@ -45,6 +50,7 @@ + 商家端logo展示 17∶6 @@ -52,11 +58,13 @@ + 商家端icon展示 1∶1 - + + diff --git a/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue b/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue index 86f3e9ba..4e780525 100644 --- a/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue +++ b/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue @@ -7,6 +7,7 @@ 关闭 + 商品审核关闭后，商家添加商品则无需审核直接上架
diff --git a/manager/src/views/sys/setting-manage/setting/IM_SETTING.vue b/manager/src/views/sys/setting-manage/setting/IM_SETTING.vue index 36a47c8a..3d4c374d 100644 --- a/manager/src/views/sys/setting-manage/setting/IM_SETTING.vue +++ b/manager/src/views/sys/setting-manage/setting/IM_SETTING.vue @@ -3,7 +3,9 @@ + 配置买家端联系客服以及商家端登录客服跳转的路径 +
diff --git a/manager/src/views/sys/setting-manage/setting/style.scss b/manager/src/views/sys/setting-manage/setting/style.scss index 9994b8af..7c442b2b 100644 --- a/manager/src/views/sys/setting-manage/setting/style.scss +++ b/manager/src/views/sys/setting-manage/setting/style.scss @@ -10,6 +10,11 @@ padding: 10px 0; } +.desc{ + margin-left: 10px; + color: #999; + font-size: 12px; +} .ivu-input-wrapper { width: 150px; diff --git a/seller/src/views/shop/bill/billDetail.vue b/seller/src/views/shop/bill/billDetail.vue index c16d6024..63e424b8 100644 --- a/seller/src/views/shop/bill/billDetail.vue +++ b/seller/src/views/shop/bill/billDetail.vue @@ -33,39 +33,37 @@

结算详细

+

退单金额

-{{bill.refundPrice || 0 | unitPrice('￥')}}

 -

平台收取佣金

-{{bill.commissionPrice || 0 | unitPrice('￥')}}

 - -

退单产生退还佣金金额

-

+{{bill.refundCommissionPrice || 0 | unitPrice('￥')}}

- -

分销返现支出

-{{bill.distributionCommission || 0 | unitPrice('￥')}}

 - -

退单分销返现返还

-

+{{bill.distributionRefundCommission || 0 | unitPrice('￥')}}

- -

退单平台优惠券补贴返还

-{{bill.siteCouponRefundCommission || 0 | unitPrice('￥')}}

 - +
+

平台优惠券补贴

+{{bill.siteCouponCommission || 0 | unitPrice('￥')}}

 - + +

退单产生退还佣金金额

+

+{{bill.refundCommissionPrice || 0 | unitPrice('￥')}}

+ + +

退单分销返现返还

+

+{{bill.distributionRefundCommission || 0 | unitPrice('￥')}}

+

积分结算金额

+{{bill.pointSettlementPrice || 0 | unitPrice('￥')}}

@@ -74,6 +72,7 @@

砍价商品结算金额

+{{bill.kanjiaSettlementPrice || 0 | unitPrice('￥')}}

 +
@@ -263,7 +262,7 @@ export default { this.$options.filters.unitPrice(params.row.siteCouponCommission, "￥") ); } - + }, }, { @@ -669,11 +668,10 @@ table { } } .bill-detail-price { - display: flex; - align-items: center; - flex-wrap: wrap; + width: 1200px; + margin: 10px 0; padding: 10px; - > span { + /deep/ span { font-size: 14px; text-align: center; width: 200px; @@ -685,5 +683,12 @@ table { .increase-color { color: green; } + div{ + + margin: 20px 0; + } +} +.bill-item{ + justify-content: flex-start; } diff --git a/seller/src/views/shop/shopSetting.vue b/seller/src/views/shop/shopSetting.vue index 1cbad7b6..85aa5d25 100644 --- a/seller/src/views/shop/shopSetting.vue +++ b/seller/src/views/shop/shopSetting.vue @@ -49,9 +49,11 @@ + 店铺楼层装修是否开启，开启后移动端PC端将会自动展示装修的内容 + 店铺是否开启自提功能