From 087ffe230de5bf7c1abfc5e19f4622c924a26ae8 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Thu, 27 May 2021 10:32:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E9=80=89=E6=8B=A9=E5=99=A8?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=A0=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/config/index.js                   |  8 +--
 manager/src/views/Main.vue                    |  2 +-
 .../src/views/lili-dialog/goods-dialog.vue    |  1 -
 manager/src/views/lili-dialog/index.vue       | 16 +++--
 .../shrinkable-menu/shrinkable-menu.vue       |  4 +-
 .../shrinkable-menu/styles/menu.scss          |  2 +-
 manager/src/views/main.scss                   |  6 +-
 .../views/page/article-manage/articleList.vue | 68 ++++++++++---------
 .../src/views/seller/shop/shopOperation.vue   |  4 +-
 seller/src/libs/routerJson.js                 |  4 +-
 seller/src/views/Main.vue                     |  2 +-
 .../views/goods/goods-seller/addGoods.scss    |  7 +-
 .../goods/goods-seller/goodsOperation.vue     |  2 +-
 .../shrinkable-menu/shrinkable-menu.vue       |  4 +-
 .../shrinkable-menu/styles/menu.scss          |  2 +-
 seller/src/views/main.scss                    |  9 ++-
 16 files changed, 71 insertions(+), 70 deletions(-)

diff --git a/manager/src/config/index.js b/manager/src/config/index.js
index 38f3e8e9..9f868153 100644
--- a/manager/src/config/index.js
+++ b/manager/src/config/index.js
@@ -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",
diff --git a/manager/src/views/Main.vue b/manager/src/views/Main.vue
index 491b10d4..d073cfa6 100644
--- a/manager/src/views/Main.vue
+++ b/manager/src/views/Main.vue
@@ -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}">
           <!-- 通知消息 -->
diff --git a/manager/src/views/lili-dialog/goods-dialog.vue b/manager/src/views/lili-dialog/goods-dialog.vue
index ba878753..fb7f0be3 100644
--- a/manager/src/views/lili-dialog/goods-dialog.vue
+++ b/manager/src/views/lili-dialog/goods-dialog.vue
@@ -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知道标识
diff --git a/manager/src/views/lili-dialog/index.vue b/manager/src/views/lili-dialog/index.vue
index 1fed5b96..49b3b1c1 100644
--- a/manager/src/views/lili-dialog/index.vue
+++ b/manager/src/views/lili-dialog/index.vue
@@ -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>
diff --git a/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue b/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
index fe5c2fe0..68738da7 100644
--- a/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
+++ b/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
@@ -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">
diff --git a/manager/src/views/main-components/shrinkable-menu/styles/menu.scss b/manager/src/views/main-components/shrinkable-menu/styles/menu.scss
index 63cf3b63..f2a71fac 100644
--- a/manager/src/views/main-components/shrinkable-menu/styles/menu.scss
+++ b/manager/src/views/main-components/shrinkable-menu/styles/menu.scss
@@ -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 {
diff --git a/manager/src/views/main.scss b/manager/src/views/main.scss
index 01f0d0b1..d696df11 100644
--- a/manager/src/views/main.scss
+++ b/manager/src/views/main.scss
@@ -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;
diff --git a/manager/src/views/page/article-manage/articleList.vue b/manager/src/views/page/article-manage/articleList.vue
index 6fe74ae4..c9a8af0b 100644
--- a/manager/src/views/page/article-manage/articleList.vue
+++ b/manager/src/views/page/article-manage/articleList.vue
@@ -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>
 
diff --git a/manager/src/views/seller/shop/shopOperation.vue b/manager/src/views/seller/shop/shopOperation.vue
index 61206931..05295e05 100644
--- a/manager/src/views/seller/shop/shopOperation.vue
+++ b/manager/src/views/seller/shop/shopOperation.vue
@@ -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>
diff --git a/seller/src/libs/routerJson.js b/seller/src/libs/routerJson.js
index aef6d9e4..3cbf4372 100644
--- a/seller/src/libs/routerJson.js
+++ b/seller/src/libs/routerJson.js
@@ -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",
diff --git a/seller/src/views/Main.vue b/seller/src/views/Main.vue
index 434db17e..8fb04bc0 100644
--- a/seller/src/views/Main.vue
+++ b/seller/src/views/Main.vue
@@ -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}">
           <!-- 用户头像 -->
diff --git a/seller/src/views/goods/goods-seller/addGoods.scss b/seller/src/views/goods/goods-seller/addGoods.scss
index d4730d99..dda4752a 100644
--- a/seller/src/views/goods/goods-seller/addGoods.scss
+++ b/seller/src/views/goods/goods-seller/addGoods.scss
@@ -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;
 }
 
 /*图片上传组件第一张图设置封面*/
diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index 58204d99..1458178b 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="goods-operation">
     <div style="height: 45px">
       <steps
         :current="activestep"
diff --git a/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue b/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
index 031824a7..ba04942a 100644
--- a/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
+++ b/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
@@ -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">
diff --git a/seller/src/views/main-components/shrinkable-menu/styles/menu.scss b/seller/src/views/main-components/shrinkable-menu/styles/menu.scss
index 59962e14..9169a5dc 100644
--- a/seller/src/views/main-components/shrinkable-menu/styles/menu.scss
+++ b/seller/src/views/main-components/shrinkable-menu/styles/menu.scss
@@ -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 {
diff --git a/seller/src/views/main.scss b/seller/src/views/main.scss
index 15864933..3bd07e64 100644
--- a/seller/src/views/main.scss
+++ b/seller/src/views/main.scss
@@ -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;