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请求基础路径 * @description api请求基础路径
*/ */
api_dev: { api_dev: {
common: "http://192.168.0.103:8890", common: "https://common-api.pickmall.cn",
buyer: "http://192.168.0.103:8888", buyer: "https://buyer-api.pickmall.cn",
seller: "http://192.168.0.103:8889", seller: "https://store-api.pickmall.cn",
manager: "http://192.168.0.103:8887" manager: "https://admin-api.pickmall.cn"
}, },
api_prod: { api_prod: {
common: "https://common-api.pickmall.cn", common: "https://common-api.pickmall.cn",

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

@ -12,7 +12,7 @@
<shrinkable-menu></shrinkable-menu> <shrinkable-menu></shrinkable-menu>
</div> </div>
<!-- 顶部标题栏主体 --> <!-- 顶部标题栏主体 -->
<div class="main-header-con" style="padding-left:240px"> <div class="main-header-con">
<div class="main-header"> <div class="main-header">
<div :class="{'header-avator-con':navType!=4, 'header-avator-con nav4':navType == 4}"> <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) { initGoods(res) {
if (res.result.records.length !=0) { if (res.result.records.length !=0) {
console.log(this.selectedWay);
res.result.records.forEach((item) => { res.result.records.forEach((item) => {
item.selected = false; item.selected = false;
item.___type = "goods"; //设置为goods让pc wap知道标识 item.___type = "goods"; //设置为goods让pc wap知道标识

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

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

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

@ -3,7 +3,7 @@
<template> <template>
<div class="ivu-shrinkable-menu"> <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"> <MenuItem v-for="(item, i) in navList" :key="i" :name="item.name">
{{item.title}} {{item.title}}
</MenuItem> </MenuItem>
@ -12,7 +12,7 @@
<Menu <Menu
ref="childrenMenu" ref="childrenMenu"
:active-name="$route.name" :active-name="$route.name"
width="130px" width="100px"
@on-select="changeMenu" @on-select="changeMenu"
> >
<template v-for="item in menuList"> <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{ .ivu-shrinkable-menu{
height: calc(100% - 60px); height: calc(100% - 60px);
width: 240px; width: 180px;
display: flex; display: flex;
} }
.ivu-menu-vertical .ivu-menu-item-group-title { .ivu-menu-vertical .ivu-menu-item-group-title {

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

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

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

@ -40,7 +40,7 @@
</Page> </Page>
</Row> </Row>
<template v-if="!selected">
<Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="1100"> <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="1100">
<Form ref="form" :model="form" :label-width="100"> <Form ref="form" :model="form" :label-width="100">
<FormItem label="文章标题" prop="title"> <FormItem label="文章标题" prop="title">
@ -73,6 +73,8 @@
<Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button> <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
</div> </div>
</Modal> </Modal>
</template>
</Card> </Card>
</Col> </Col>

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

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

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

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

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

@ -11,7 +11,7 @@
<shrinkable-menu></shrinkable-menu> <shrinkable-menu></shrinkable-menu>
</div> </div>
<!-- 顶部标题栏主体 --> <!-- 顶部标题栏主体 -->
<div class="main-header-con" style="padding-left:240px"> <div class="main-header-con">
<div class="main-header"> <div class="main-header">
<div :class="{'header-avator-con':navType!=4, 'header-avator-con nav4':navType == 4}"> <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 { .footer {
width: 88.7%; width: 100%;
padding: 10px; padding: 10px;
background-color: #ffc; background-color: #ffc;
position: fixed; position: sticky;
bottom: 0px; bottom: 0px;
left: 10%;
text-align: center; 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> <template>
<div> <div class="goods-operation">
<div style="height: 45px"> <div style="height: 45px">
<steps <steps
:current="activestep" :current="activestep"

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

@ -5,7 +5,7 @@
<template> <template>
<div class="ivu-shrinkable-menu"> <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"> <MenuItem v-for="(item, i) in navList" :key="i" :name="item.name">
{{item.title}} {{item.title}}
</MenuItem> </MenuItem>
@ -14,7 +14,7 @@
<Menu <Menu
ref="childrenMenu" ref="childrenMenu"
:active-name="$route.name" :active-name="$route.name"
width="130px" width="100px"
@on-select="changeMenu" @on-select="changeMenu"
> >
<template v-for="item in menuList"> <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{ .ivu-shrinkable-menu{
height: calc(100% - 60px); height: calc(100% - 60px);
width: 240px; width: 180px;
display: flex; display: flex;
} }
.ivu-menu-vertical .ivu-menu-item-group-title { .ivu-menu-vertical .ivu-menu-item-group-title {

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

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