zhuce
/
lilishop-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style: ✨ 新增部分代码注释 页面新增部分提示

master
学习很差啦 2023-03-31 18:16:33 +08:00
parent 8c286610ba
commit 16b0d457fc
8 changed files with 96 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
im/src/config/config.js
View File

@ -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',
};

20
im/src/main.js
View File

@ -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')

12
manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue
View File

@ -3,7 +3,8 @@
<Form ref="formValidate" :label-width="150" label-position="right" :model="formValidate" :rules="ruleValidate">
<FormItem label="站点名称" prop="siteName">
<Input v-model="formValidate.siteName" />
<Input style="width:200px;" v-model="formValidate.siteName" />
<span class="desc">配置买家端站点名称</span>
</FormItem>
<FormItem label="icp" prop="icp">
@ -16,6 +17,7 @@
<img v-if="formValidate.domainLogo" class="img" :src="formValidate.domainLogo" />
<img v-else class="img" src="../../../../assets/emptyImg.png" alt="">
<Button @click="onClickImg('domainLogo')">选择图片</Button>
<span class="desc">后台管理左上角logo展示 17∶6</span>
</div>
</FormItem>
<FormItem label="后台Icon" prop="domainIcon">
@ -24,6 +26,7 @@
<img v-if="formValidate.domainIcon" class="img" :src="formValidate.domainIcon" />
<img v-else class="img" src="../../../../assets/emptyImg.png" alt="">
<Button @click="onClickImg('domainIcon')">选择图片</Button>
<span class="desc">后台管理网站icon展示 1∶1</span>
</div>
</FormItem>
<FormItem label="买家端Logo" prop="buyerSideLogo">
@ -31,6 +34,7 @@
<img v-if="formValidate.buyerSideLogo" class="img" :src="formValidate.buyerSideLogo" />
<img v-else class="img" src="../../../../assets/emptyImg.png" alt="">
<Button @click="onClickImg('buyerSideLogo')">选择图片</Button>
<span class="desc">买家端logo展示 17∶6</span>
</div>
</FormItem>
<FormItem label="买家端Icon" prop="buyerSideIcon">
@ -38,6 +42,7 @@
<img v-if="formValidate.buyerSideIcon" class="img" :src="formValidate.buyerSideIcon" />
<img v-else class="img" src="../../../../assets/emptyImg.png" alt="">
<Button @click="onClickImg('buyerSideIcon')">选择图片</Button>
<span class="desc">买家端网站icon展示 1∶1</span>
</div>
</FormItem>
<FormItem label="商家端Logo" prop="storeSideLogo">
@ -45,6 +50,7 @@
<img v-if="formValidate.storeSideLogo" class="img" :src="formValidate.storeSideLogo" />
<img v-else class="img" src="../../../../assets/emptyImg.png" alt="">
<Button @click="onClickImg('storeSideLogo')">选择图片</Button>
<span class="desc">商家端logo展示 17∶6</span>
</div>
</FormItem>
<FormItem label="商家端Icon" prop="storeSideIcon">
@ -52,11 +58,13 @@
<img v-if="formValidate.storeSideIcon" class="img" :src="formValidate.storeSideIcon" />
<img v-else class="img" src="../../../../assets/emptyImg.png" alt="">
<Button @click="onClickImg('storeSideIcon')">选择图片</Button>
<span class="desc">商家端icon展示 1∶1</span>
</div>
</FormItem>
<FormItem label="站点地址" prop="staticPageAddress">
<Input v-model="formValidate.staticPageAddress" />
<Input style="width:200px;" v-model="formValidate.staticPageAddress" />
</FormItem>
<FormItem label="wap站点地址" prop="staticPageWapAddress">
<Input v-model="formValidate.staticPageWapAddress" />

1
manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue
View File

@ -7,6 +7,7 @@
<Radio label="false">关闭</Radio>
</RadioGroup>
<span class="desc">商品审核关闭后，商家添加商品则无需审核直接上架</span>
</FormItem>
<div class="label-item">
<FormItem class="label-item" label="缩略图宽" prop="abbreviationPictureWidth">

2
manager/src/views/sys/setting-manage/setting/IM_SETTING.vue
View File

@ -3,7 +3,9 @@
<Form ref="formValidate" :label-width="150" label-position="right" :model="formValidate" :rules="ruleValidate">
<FormItem label="云IM地址" prop="httpUrl">
<Input v-model="formValidate.httpUrl"/>
<span class="desc">配置买家端联系客服以及商家端登录客服跳转的路径</span>
</FormItem>
<div class="label-btns">
<Button type="primary" @click="submit('formValidate')">保存</Button>
</div>

5
manager/src/views/sys/setting-manage/setting/style.scss
View File

@ -10,6 +10,11 @@
padding: 10px 0;
}
.desc{
margin-left: 10px;
color: #999;
font-size: 12px;
}
.ivu-input-wrapper {
width: 150px;

41
seller/src/views/shop/bill/billDetail.vue
View File

@ -33,39 +33,37 @@
<div>
<h3 class="ml_10">结算详细</h3>
<div class="bill-detail-price">
<div class="flex bill-item">
<span>
<p>退单金额</p>
<p class="theme_color">-{{bill.refundPrice || 0 | unitPrice('￥')}}</p>
</span>
<span>
<p>平台收取佣金</p>
<p class="theme_color">-{{bill.commissionPrice || 0 | unitPrice('￥')}}</p>
</span>
<span>
<p>退单产生退还佣金金额</p>
<p class="increase-color">+{{bill.refundCommissionPrice || 0 | unitPrice('￥')}}</p>
</span>
<span>
<p>分销返现支出</p>
<p class="theme_color">-{{bill.distributionCommission || 0 | unitPrice('￥')}}</p>
</span>
<span>
<p>退单分销返现返还</p>
<p class="increase-color">+{{bill.distributionRefundCommission || 0 | unitPrice('￥')}}</p>
</span>
<span>
<p>退单平台优惠券补贴返还</p>
<p class="theme_color">-{{bill.siteCouponRefundCommission || 0 | unitPrice('￥')}}</p>
</span>
</div>
<div class="flex bill-item">
<span>
<p>平台优惠券补贴</p>
<p class="increase-color">+{{bill.siteCouponCommission || 0 | unitPrice('￥')}}</p>
</span>
<span>
<p>退单产生退还佣金金额</p>
<p class="increase-color">+{{bill.refundCommissionPrice || 0 | unitPrice('￥')}}</p>
</span>
<span>
<p>退单分销返现返还</p>
<p class="increase-color">+{{bill.distributionRefundCommission || 0 | unitPrice('￥')}}</p>
</span>
<span>
<p>积分结算金额</p>
<p class="increase-color">+{{bill.pointSettlementPrice || 0 | unitPrice('￥')}}</p>
@ -74,6 +72,7 @@
<p>砍价商品结算金额</p>
<p class="increase-color">+{{bill.kanjiaSettlementPrice || 0 | unitPrice('￥')}}</p>
</span>
</div>
</div>
</div>
</Card>
@ -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;
}
</style>

14
seller/src/views/shop/shopSetting.vue
View File

@ -49,9 +49,11 @@
</FormItem>
<FormItem label="店铺楼层" prop="content" class="wangEditor">
<i-switch v-model="form.pageShow" @on-change="pageShow"></i-switch>
<span class="desc">店铺楼层装修是否开启，开启后移动端PC端将会自动展示装修的内容</span>
</FormItem>
<FormItem label="开启自提" prop="content" class="wangEditor">
<i-switch v-model="form.selfPickFlag" @on-change="changeSelfPickFlag"></i-switch>
<span class="desc">店铺是否开启自提功能</span>
</FormItem>
<Form-item>
<Button
@ -216,6 +218,7 @@
style="width: 20%"
/>
</FormItem>
<Form-item>
<Button
@click="stockWarningHandleSubmit"
@ -227,7 +230,8 @@
</Form-item>
</Form>
</TabPane>
<TabPane label="客服设置" name="UDESK">
<!-- Udesk 坐席功能 后续维护 -->
<!-- <TabPane label="客服设置" name="UDESK">
<Form
ref="udeskForm"
:model="udeskForm"
@ -252,7 +256,7 @@
</Button>
</Form-item>
</Form>
</TabPane>
</TabPane> -->
</Tabs>
</Card>
@ -597,3 +601,9 @@ export default {
},
};
</script>
<style scoped lang="scss">
.desc{
margin-left: 10px;
color: #999;
}
</style>