abu/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

商品选择器组件修改，菜单栏调整

Browse Source
This commit is contained in:
mabo 2021-05-27 10:32:05 +08:00
parent f5786e46c3
commit 087ffe230d
16 changed files with 71 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manager/src/config/index.js
View File

@ -17,10 +17,10 @@ export default {
* @description api请求基础路径
*/
api_dev: {
common: "http://192.168.0.103:8890",
buyer: "http://192.168.0.103:8888",
seller: "http://192.168.0.103:8889",
manager: "http://192.168.0.103:8887"
common: "https://common-api.pickmall.cn",
buyer: "https://buyer-api.pickmall.cn",
seller: "https://store-api.pickmall.cn",
manager: "https://admin-api.pickmall.cn"
},
api_prod: {
common: "https://common-api.pickmall.cn",

2
manager/src/views/Main.vue
View File

@ -12,7 +12,7 @@
<shrinkable-menu></shrinkable-menu>
</div>
<!-- 顶部标题栏主体 -->
<div class="main-header-con" style="padding-left:240px">
<div class="main-header-con">
<div class="main-header">
<div :class="{'header-avator-con':navType!=4, 'header-avator-con nav4':navType == 4}">
<!-- 通知消息 -->

1
manager/src/views/lili-dialog/goods-dialog.vue
View File

@ -111,7 +111,6 @@ export default {
initGoods(res) {
if (res.result.records.length !=0) {
console.log(this.selectedWay);
res.result.records.forEach((item) => {
item.selected = false;
item.___type = "goods"; //设置为goods让pc wap知道标识

16
manager/src/views/lili-dialog/index.vue
View File

@ -1,12 +1,14 @@
<template>
<Modal :styles="{ top: '120px' }" width="1160" @on-cancel="clickClose" @on-ok="clickOK" v-model="flag" :mask-closable="false" scrollable>
<goodsDialog @selected="(val) => {goodsData = val;}"
v-if="goodsFlag" ref="goodsDialog" :selectedWay='goodsData'/>
<linkDialog @selectedLink="
(val) => {
linkData = val;
}
" v-else class="linkDialog" />
<template v-if="flag">
<goodsDialog @selected="(val) => {goodsData = val;}"
v-if="goodsFlag" ref="goodsDialog" :selectedWay='goodsData'/>
<linkDialog @selectedLink="
(val) => {
linkData = val;
}
" v-else class="linkDialog" />
</template>
</Modal>
</template>
<script>

4
manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
View File

@ -3,7 +3,7 @@
<template>
<div class="ivu-shrinkable-menu">
<!-- 一级菜单 -->
<Menu ref="sideMenu" width="110px" theme="dark" :active-name="currNav" @on-select="selectNav">
<Menu ref="sideMenu" width="80px" theme="dark" :active-name="currNav" @on-select="selectNav">
<MenuItem v-for="(item, i) in navList" :key="i" :name="item.name">
{{item.title}}
</MenuItem>
@ -12,7 +12,7 @@
<Menu
ref="childrenMenu"
:active-name="$route.name"
width="130px"
width="100px"
@on-select="changeMenu"
>
<template v-for="item in menuList">

2
manager/src/views/main-components/shrinkable-menu/styles/menu.scss
View File

@ -1,6 +1,6 @@
.ivu-shrinkable-menu{
height: calc(100% - 60px);
width: 240px;
width: 180px;
display: flex;
}
.ivu-menu-vertical .ivu-menu-item-group-title {

6
manager/src/views/main.scss
View File

@ -52,7 +52,7 @@
box-sizing: border-box;
position: fixed;
display: block;
padding-left: 200px;
padding-left: 180px;
width: 100%;
height: 100px;
z-index: 20;
@ -256,12 +256,12 @@
.single-page-con {
min-width: 740px;
position: relative;
left: 240px;
left: 180px;
top: 100px;
right: 0;
bottom: 0;
height: calc(100% - 110px);
width: calc(100% - 240px);
width: calc(100% - 180px);
overflow: auto;
background-color: #f0f0f0;
z-index: 1;

68
manager/src/views/page/article-manage/articleList.vue
View File

@ -40,39 +40,41 @@
</Page>
</Row>
<Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="1100">
<Form ref="form" :model="form" :label-width="100">
<FormItem label="文章标题" prop="title">
<Input v-model="form.title" clearable style="width: 40%" />
</FormItem>
<FormItem label="文章分类" prop="categoryId">
<Select v-model="treeValue" placeholder="请选择" clearable style="width: 180px">
<Option :value="treeValue" style="display: none">{{
treeValue
}}
</Option>
<Tree :data="treeData" @on-select-change="handleCheckChange"></Tree>
</Select>
</FormItem>
<FormItem label="文章排序" prop="sort">
<Input type="number" v-model="form.sort" clearable style="width: 10%" />
</FormItem>
<FormItem class="form-item-view-el" label="文章内容" prop="content">
<editor v-model="form.content"></editor>
</FormItem>
<FormItem label="是否展示" prop="openStatus">
<i-switch size="large" v-model="form.openStatus" :true-value="open" :false-value="close">
<span slot="open">展示</span>
<span slot="close">隐藏</span>
</i-switch>
</FormItem>
</Form>
<div slot="footer">
<Button type="text" @click="modalVisible = false">取消</Button>
<Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
</div>
</Modal>
<template v-if="!selected">
<Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="1100">
<Form ref="form" :model="form" :label-width="100">
<FormItem label="文章标题" prop="title">
<Input v-model="form.title" clearable style="width: 40%" />
</FormItem>
<FormItem label="文章分类" prop="categoryId">
<Select v-model="treeValue" placeholder="请选择" clearable style="width: 180px">
<Option :value="treeValue" style="display: none">{{
treeValue
}}
</Option>
<Tree :data="treeData" @on-select-change="handleCheckChange"></Tree>
</Select>
</FormItem>
<FormItem label="文章排序" prop="sort">
<Input type="number" v-model="form.sort" clearable style="width: 10%" />
</FormItem>
<FormItem class="form-item-view-el" label="文章内容" prop="content">
<editor v-model="form.content"></editor>
</FormItem>
<FormItem label="是否展示" prop="openStatus">
<i-switch size="large" v-model="form.openStatus" :true-value="open" :false-value="close">
<span slot="open">展示</span>
<span slot="close">隐藏</span>
</i-switch>
</FormItem>
</Form>
<div slot="footer">
<Button type="text" @click="modalVisible = false">取消</Button>
<Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
</div>
</Modal>
</template>
</Card>
</Col>

4
manager/src/views/seller/shop/shopOperation.vue
View File

@ -65,13 +65,13 @@
<FormItem label="详细地址" prop="salesConsigneeDetail">
<Input v-model="shopForm.salesConsigneeDetail" clearable style="width: 350px" />
</FormItem>
<Divider orientation="left">腾讯云智服</Divider>
<!-- <Divider orientation="left">腾讯云智服</Divider>
<FormItem label="唯一标识" prop="salesConsigneeDetail">
<Input v-model="shopForm.yzfSign" clearable style="width: 350px" />
</FormItem>
<FormItem label="小程序唯一标识" prop="salesConsigneeDetail">
<Input v-model="shopForm.yzfMpSign" clearable style="width: 350px" />
</FormItem>
</FormItem> -->
<Spin fix v-if="loading"></Spin>
</div>
</TabPane>

4
seller/src/libs/routerJson.js
View File

@ -431,7 +431,7 @@ export const result = [
showAlways: true,
level: 2,
type: 0,
title: "小程序直播",
title: "直播管理",
path: "live",
component: "promotion/live/live",
icon: "md-person",
@ -684,7 +684,7 @@ export const result = [
showAlways: true,
level: 2,
type: 0,
title: "自提点管理",
title: "自提管理",
path: "shopAddress",
component: "shop/shopAddress",
icon: "md-log-in",

2
seller/src/views/Main.vue
View File

@ -11,7 +11,7 @@
<shrinkable-menu></shrinkable-menu>
</div>
<!-- 顶部标题栏主体 -->
<div class="main-header-con" style="padding-left:240px">
<div class="main-header-con">
<div class="main-header">
<div :class="{'header-avator-con':navType!=4, 'header-avator-con nav4':navType == 4}">
<!-- 用户头像 -->

7
seller/src/views/goods/goods-seller/addGoods.scss
View File

@ -222,14 +222,13 @@ div.base-info-item {
/** 底部步骤 */
.footer {
width: 88.7%;
width: 100%;
padding: 10px;
background-color: #ffc;
position: fixed;
position: sticky;
bottom: 0px;
left: 10%;
text-align: center;
z-index: 9999;
z-index: 9;
}
/*图片上传组件第一张图设置封面*/

2
seller/src/views/goods/goods-seller/goodsOperation.vue
View File

@ -1,5 +1,5 @@
<template>
<div>
<div class="goods-operation">
<div style="height: 45px">
<steps
:current="activestep"

4
seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
View File

@ -5,7 +5,7 @@
<template>
<div class="ivu-shrinkable-menu">
<!-- 一级菜单 -->
<Menu ref="sideMenu" width="110px" theme="dark" :active-name="currNav" @on-select="selectNav">
<Menu ref="sideMenu" width="80px" theme="dark" :active-name="currNav" @on-select="selectNav">
<MenuItem v-for="(item, i) in navList" :key="i" :name="item.name">
{{item.title}}
</MenuItem>
@ -14,7 +14,7 @@
<Menu
ref="childrenMenu"
:active-name="$route.name"
width="130px"
width="100px"
@on-select="changeMenu"
>
<template v-for="item in menuList">

2
seller/src/views/main-components/shrinkable-menu/styles/menu.scss
View File

@ -1,6 +1,6 @@
.ivu-shrinkable-menu{
height: calc(100% - 60px);
width: 240px;
width: 180px;
display: flex;
}
.ivu-menu-vertical .ivu-menu-item-group-title {

9
seller/src/views/main.scss
View File

@ -52,7 +52,7 @@
box-sizing: border-box;
position: fixed;
display: block;
padding-left: 200px;
padding-left: 180px;
width: 100%;
height: 100px;
z-index: 20;
@ -253,14 +253,13 @@
.single-page-con {
min-width: 740px;
left: 240px;
left: 180px;
position: relative;
top: 100px;
right: 0;
bottom: 0;
height: calc(100% + 200px);
width: calc(100% - 240px);
height: calc(100% - 110px);
width: calc(100% - 180px);
background-color: #f0f0f0;
z-index: 1;
transition: left 0.3s;