专题装修导航店铺添加

admin/src/components/MDiyItemEdit/index.js

@@ -366,6 +366,17 @@ export default class MDiyItem extends Component {
         <Input maxLength={250} style={{ width: 300 }} value={data.info.name} disabled={true}/>
       </FormItem>
       </div>;
+    } else if (data.url_type == 'storeinfo') {
+      render_con = <div className={`${styles.sub_part}`} style={{ borderBottomWidth: 0 }}>
+        <div className={`${styles.subtitle}`}>店铺名称</div>
+        <FormItem
+        key={`link_storeinfo_${index}`}
+        {...formItemLayoutModal}
+        label={''}
+      >
+        <Input maxLength={250} style={{ width: 300 }} value={data.info.storeName} disabled={true}/>
+      </FormItem>
+      </div>;
     } else if (data.url_type == 'svideo') {
       render_con = <div className={`${styles.sub_part}`} style={{ borderBottomWidth: 0 }}>
         <div className={`${styles.subtitle}`}>短视频名称</div>
@@ -418,6 +429,9 @@ export default class MDiyItem extends Component {
     } else if (data.url_type == 'live') {
       render_con = <Input key={`${select_data.type}_${select_data.id}_live${index}`} className={styles.more_link_input}
                           value={data.info.name} disabled={true}/>;
+    } else if (data.url_type == 'storeinfo') {
+      render_con = <Input key={`${select_data.type}_${select_data.id}_storeinfo${index}`} className={styles.more_link_input}
+                          value={data.info.storeName} disabled={true}/>;
     } else if (data.url_type == 'svideo') {
       render_con = <Input key={`${select_data.type}_${select_data.id}_svideo${index}`} className={styles.more_link_input}
                           value={data.info.videoName} disabled={true}/>;
@@ -485,7 +499,12 @@ export default class MDiyItem extends Component {
       data.url = '';//直播id
       data.url_type = 'live';//直播类型
       data.info = '';//用于存放额外信息
-    }  else if (val == 'svideo') {
+    } else if (val == 'storeinfo') {
+      //店铺详情
+      data.url = '';//店铺id
+      data.url_type = 'storeinfo';//店铺类型
+      data.info = '';//用于存放额外信息
+    } else if (val == 'svideo') {
       //短视频
       data.url = '';//短视频id
       data.url_type = 'svideo';//短视频类型
@@ -539,6 +558,10 @@ export default class MDiyItem extends Component {
       // data.url = val.liveId;
       data.url = val.roomId;
       data.info = val;
+    } else if (data.url_type == 'storeinfo') {
+      // data.url = val.liveId;
+      data.url = val.storeId;
+      data.info = val;
     } else if (data.url_type == 'svideo') {
       data.url = val.videoId;
       data.info = val;

admin/src/components/SldSelGoodsSingleDiy/index.js

@@ -157,6 +157,21 @@ export default class SldSelGoodsSingleDiy extends Component {
     }, 
   ];
 
+  storeinfo_columns = [
+    {
+      title: ' ',
+      dataIndex: 'storeId',
+      align: 'center',
+      width: 30,
+      render: (text, record, index) => getTableNum(this.state.params, pageSize, index),
+    }, {
+      title: `店铺名称`,//店铺名称
+      align: 'center',
+      dataIndex: 'storeName',
+      width: 300,
+    },  
+  ];
+
   cat_columns = [
     {
       title: `${sldComLanguage('分类名称')}`,//分类名称
@@ -258,7 +273,8 @@ export default class SldSelGoodsSingleDiy extends Component {
 
   componentWillReceiveProps(nextProps, nextContext) {
     let { columns, modaltitle, search_data, sldpagination } = this.state;
-    if (nextProps.link_type == 'goods' || nextProps.link_type == 'live' || nextProps.link_type == 'category' || nextProps.link_type == 'topic' || nextProps.link_type == 'seckill' || nextProps.link_type == 'voucher') {
+    if (nextProps.link_type == 'goods' || nextProps.link_type == 'live' || nextProps.link_type == 'storeinfo' || nextProps.link_type == 'category' 
+        || nextProps.link_type == 'topic' || nextProps.link_type == 'seckill' || nextProps.link_type == 'voucher') {
       if (nextProps.link_type == 'goods') {
         columns = this.goods_columns;
         modaltitle = `${sldComLanguage('选择商品')}`;//选择商品
@@ -281,6 +297,17 @@ export default class SldSelGoodsSingleDiy extends Component {
         }];//筛选器
         sldpagination = true;
         this.rowKey = 'roomId';
+      }  else if (nextProps.link_type == 'storeinfo') {
+        columns = this.storeinfo_columns;
+        modaltitle = `选择店铺`;//选择店铺
+        search_data = [{
+          type: 'input',
+          label: `店铺名称`,//店铺名称
+          name: 'storeName',
+          placeholder: `请输入店铺名称`,//请输入店铺名称
+        }];//筛选器
+        sldpagination = true;
+        this.rowKey = 'storeId';
       }  else if (nextProps.link_type == 'category') {
         columns = this.cat_columns;
         modaltitle = `${sldComLanguage('选择分类')}`;//选择分类
@@ -390,6 +417,9 @@ export default class SldSelGoodsSingleDiy extends Component {
     } else if (link_type == 'live') {
       //获取直播数据
       dis_type = 'project/get_live_lists';
+    } else if (link_type == 'storeinfo') {
+      //获取直播数据
+      dis_type = 'project/get_storeinfo_lists';
     } else if (link_type == 'category') {
       //获取分类数据
       dis_type = 'project/get_cate_list_by_id';
@@ -415,13 +445,16 @@ export default class SldSelGoodsSingleDiy extends Component {
       dis_type = 'project/get_seckill_list';
       new_params = params;
     }
+    console.log(dis_type+new_params);
     dispatch({
       type: dis_type,
       payload: new_params,
       callback: (res) => {
         this.setState({ loading: false });
         if (res.state == 200) {
-          if (link_type == 'goods' || link_type == 'live' || link_type == 'topic' || link_type == 'seckill' || link_type == 'voucher') {
+          console.log(res);
+          if (link_type == 'goods' || link_type == 'live' || link_type == 'storeinfo' || link_type == 'topic' 
+                || link_type == 'seckill' || link_type == 'voucher') {
             data = res.data;
           } else if (link_type == 'category') {
             //id为0直接赋值
@@ -551,6 +584,10 @@ export default class SldSelGoodsSingleDiy extends Component {
       modalTableSeleData.roomId = record.roomId;
       modalTableSeleData.name = record.name;
       modalTableSeleData.anchorName = record.anchorName;
+    } else if (link_type == 'storeinfo') {
+      modalTableSeleData.storeId = record.storeId;
+      modalTableSeleData.storeName = record.storeName;
+      modalTableSeleData.anchorName = record.anchorName;
     } else if (link_type == 'topic') {
       if (this.props.client == 'mobile') {
         modalTableSeleData.decoId = record.decoId;

admin/src/models/project.js

@@ -36,6 +36,11 @@ export default {
       const response = yield call(sldCommonService, payload, 'get', 'v3/live/admin/broad/list');
       if (callback) callback(response);
     },
+    //slodon_获取店铺列表
+    * get_storeinfo_lists({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', 'v3/seller/admin/store/listinfo');
+      if (callback) callback(response);
+    },
     //slodon_获取移动端装修列表
     * get_diy_page_lists({ payload, callback }, { call }) {
       const response = yield call(sldCommonService, payload, 'get', 'v3/system/admin/mobileDeco/list');

admin/src/pages/manage/goods/add_goods.js

@@ -14,7 +14,7 @@ import {
   isEqualArray,
   sldCommonTitleByBg,
 } from '@/utils/utils';
-import global from './global.less';
+import global from './globals.less';
 // import { apiUrl,uploadLimit } from '@/utils/sldconfig.js';
 import { uploadLimit } from '@/utils/sldconfig.js';
 import SldReactQuill from '@/components/SldReactQuill';

admin/src/pages/manage/goods/product.less

@@ -1,83 +0,0 @@
-.right_nav {
-  position: fixed;
-  top: 20vh;
-  right: 10px;
-  width:120px;
-  background:rgba(255,255,255,1);
-  box-shadow:0 0 15px 0 rgba(153,153,153,0.15);
-  .nav_title{
-    height:38px;
-    line-height: 38px;
-    width: 100%;
-    display: inline-block;
-    background:rgba(236,245,255,1);
-    text-align:center;
-    color: #08A9B7;
-    font-size: 14px;
-    font-weight: 700;
-  }
-  .nav_item{
-    color: #999;
-    font-size: 12px;
-    font-weight: 700;
-    padding: 9px 35px 9px 26px;
-    width:111px;
-    height:30px;
-    line-height: 12px;
-    background:#fff;
-    border-radius:15px 0 0 15px;
-    display: block;
-    margin: 10px 0 10px 9px;
-  }
-  .nav_item:hover,.nav_item.nav_sel{
-    color: #333;
-    background:rgba(65,157,253,.1);
-  }
-}
-
-.goods_detail_body{
-  border: 1px solid #F2F2F2;
-  padding: 15px;
-}
-
-.goods_info{
-  .goods_detail{
-    height: 80px;
-    margin-left: 10px;
-    flex: 1;
-  }
-  .goods_img{
-    width:80px;
-    height:80px;
-    background:rgba(248,248,248,1);
-    border:1px solid rgba(226,229,246,1);
-    border-radius:3px;
-    overflow: hidden;
-    display: inline-block;
-  }
-  .goods_name{
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    /*! autoprefixer: off */
-    -webkit-box-orient: vertical;
-    word-break: break-word;
-    color:#333;
-    font-size: 14px;
-    line-height: 17px;
-    text-align: left;
-    height: 34px;
-    flex-shrink: 0;
-  }
-  .goods_brief{
-    color: #666;
-    font-size: 12px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    text-align: left;
-    width: 100%;
-    display: inline-block;
-  }
-}

admin/src/pages/manage/goods/sel_goods_cat.js

@@ -7,7 +7,7 @@ import {
 	getSldEmptyH,sldFullHeight,
 	sldComLanguage,
 } from '@/utils/utils';
-import global from './global.less';
+import global from './globals.less';
 import { Scrollbars } from 'react-custom-scrollbars';
 
 let sthis = '';

admin/src/pages/manage/product/goods_check_lists.js

@@ -146,7 +146,7 @@ export default class GoodsCheckLists extends Component {
           title: `${sldComLanguage('实际/虚拟销量')}`,
           dataIndex: 'actualSales',
           align: 'center',
-          width: 150,
+          width: 140,
           render: (text, record) => {
             return <div>{record.actualSales}/{record.virtualSales}</div>
           },
@@ -155,7 +155,7 @@ export default class GoodsCheckLists extends Component {
           title: `${sldComLanguage('状态')}`,
           dataIndex: 'stateValue',
           align: 'center',
-          width: 100,
+          width: 90,
         },
         {
           title: `${sldComLanguage('拒绝理由')}`,//拒绝理由
@@ -170,12 +170,12 @@ export default class GoodsCheckLists extends Component {
           title: `${sldComLanguage('发布时间')}`,//发布时间
           dataIndex: 'createTime',
           align: 'center',
-          width: 130,
+          width: 120,
         },
         {
           title: `${sldComLanguage('操作')}`,//操作
           align: 'center',
-          width: 120,
+          width: 150,
           render: (text, record) => {
             return (record.state == 20||record.state == 21)?<Fragment>
               {sldPopConfirmDiy('leftBottom', `${sldComLanguage('确认审核通过该商品吗？')}`, () => this.operateGoods({goodsIds:record.goodsId,state:1}), `${sldComLanguage('确定')}`, `${sldComLanguage('取消')}`,

admin/src/utils/util_data.js

@@ -727,6 +727,7 @@ export function m_diy_link_type() {
     { key: 'point', name: `${sldComLanguage('积分商城')}` },
     { key: 'svideo_center', name: `${sldComLanguage('短视频中心')}` },
     { key: 'live', name: `${sldComLanguage('直播中心')}` },
+    { key: 'storeinfo', name: `${sldComLanguage('店铺')}` },
     { key: 'sign_center', name: `${sldComLanguage('签到中心')}` },
   ];
 }