Merge remote-tracking branch 'origin/master'

xinkeaboard-seller/src/components/BusinessStateSelector/index.js

@@ -1,4 +1,4 @@
-import { Select } from "antd";
+import { Select, message } from "antd";
 import { connect } from "dva/index";
 import { Component } from "react";
 import { businessStateEnum } from "@/utils/utils";
@@ -13,21 +13,43 @@ export default class BusinessStateSelector extends Component {
     this.state = {
       stateList: Object.keys(businessStateEnum).map((key) => ({
         name: businessStateEnum[key],
-        value: key,
+        value: Number(key),
       })),
       currentBusinessState: "",
     };
   }
 
   handleChange = (value) => {
-    this.setState({ currentBusinessState: value });
+    const { dispatch } = this.props;
+    dispatch({
+      type: "store/update_business_state",
+      payload: {
+        businessState: value
+      },
+      callback: (res) => {
+        if (res.state === 200) {
+          message.success('设置成功')
+          this.setState({ currentBusinessState: value });
+        } else {
+          message.error(res.msg)
+        }
+      },
+    });
   };
 
   componentDidMount() {
-    // dispatch({
-    //   type: "store/get_business_state",
-    //   callback: (res) => {},
-    // });
+    const { dispatch } = this.props;
+    dispatch({
+      type: "store/get_business_state",
+      callback: (res) => {
+        if (res.state === 200) {
+          this.setState({ currentBusinessState: res.data });
+        } else {
+          this.setState({ currentBusinessState: 2 });
+          message.error(res.msg)
+        }
+      },
+    });
   }
 
   render() {

xinkeaboard-seller/src/global.less

@@ -2385,3 +2385,13 @@ body {
   }
 }
 
+.common_header_tip {
+  font-size: 12px;
+  font-weight: normal;
+  margin-left: 5px;
+}
+
+.common_header_tip_text {
+  color: @theme-color;
+}
+

xinkeaboard-seller/src/pages/store/models/store.js

@@ -13,14 +13,14 @@ export default {
 	effects: {
     // 获取当前店铺经营状态值
     * get_business_state({ payload, callback }, { call }) {
-			// const response = yield call(sldCommonService, payload, 'post', 'v3/seller/seller/store/updateSetting');
-			// if (callback) callback(response);
+			const response = yield call(sldCommonService, payload, 'get', 'v3/seller/seller/store/getBusinessState');
+			if (callback) callback(response);
 		},
 
     // 保存当前店铺经营状态值
-    * save_business_state({ payload, callback }, { call }) {
-			// const response = yield call(sldCommonService, payload, 'post', 'v3/seller/seller/store/updateSetting');
-			// if (callback) callback(response);
+    * update_business_state({ payload, callback }, { call }) {
+			const response = yield call(sldCommonService, payload, 'post', 'v3/seller/seller/store/updateBusinessState');
+			if (callback) callback(response);
 		},
 
 		//slodon_编辑店铺基本信息

xinkeaboard-seller/src/pages/store/pc_diy/index.js

@@ -29,12 +29,25 @@ export default class StorePCDiyIndex extends Component {
     this.setState({activeKey:e})
   }
 
+  renderHeaderTip = () => {
+      return (
+        <span className={global.common_header_tip}>
+          <span>{'('}</span>
+          <span>{sldComLanguage('将店铺状态设为')}</span>
+          <span className={global.common_header_tip_text}>{`“${sldComLanguage('经营中')}”`}</span>
+          <span>{'，'}</span>
+          <span>{sldComLanguage('立即上线营业')}</span>
+          <span>{' )'}</span>
+        </span>
+      )
+  }
+
   render() {
     const {activeKey} = this.state;
     return (
       <div className={global.common_page} style={{ flex: 1 }}>
         <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
-            {sldLlineRtextAddGoodsAddMargin('#69A2F2', `${sldComLanguage('店铺装修')}`, 0, 0, 10)}
+            {sldLlineRtextAddGoodsAddMargin('#69A2F2', `${sldComLanguage('店铺装修')}`, 0, 0, 10, this.renderHeaderTip())}
             <BusinessStateSelector />
         </div>
         <Tabs type="card" activeKey={activeKey} animated={false} onTabClick={this.onHandleTabClick}>

xinkeaboard-seller/src/pages/store/setting.js

@@ -879,6 +879,19 @@ export default class Setting extends Component {
     });
   }
 
+  renderHeaderTip = () => {
+    return (
+      <span className={global.common_header_tip}>
+        <span>{'('}</span>
+        <span>{sldComLanguage('将店铺状态设为')}</span>
+        <span className={global.common_header_tip_text}>{`“${sldComLanguage('经营中')}”`}</span>
+        <span>{'，'}</span>
+        <span>{sldComLanguage('立即上线营业')}</span>
+        <span>{' )'}</span>
+      </span>
+    )
+  }
+
 
   render() {
     const { imgModalList,imgModalvisible,data,honorData,factoryData,columns,info_data,initEditorFlag,getEditorContentFlag, initEditorContent,preview_img,submitting,show_preview_modal, preview_alt_con,modalVisible,addData,submitingModal,initLoading,title, flag,activeKey,search_con,scroll_h } = this.state;
@@ -887,7 +900,7 @@ export default class Setting extends Component {
         <div className={global.common_page_20}>
           {/*店铺设置*/}
           <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: '10px' }}>
-              {sldLlineRtextAddGoods('#69A2F2', `${sldComLanguage('店铺设置')}`)}
+              {sldLlineRtextAddGoods('#69A2F2', `${sldComLanguage('店铺设置')}`, this.renderHeaderTip())}
               <BusinessStateSelector />
           </div>
           <Tabs type="card" activeKey={activeKey} animated={false} onTabClick={this.onHandleTabClick}>

xinkeaboard-seller/src/utils/utils.js

@@ -484,10 +484,11 @@ export function sldLlineRtext(leftColor, Rtext) {
 }
 
 //返回左边一个竖线，右侧文字的结构_添加商品(字体大小，颜色变化)
-export function sldLlineRtextAddGoods(leftColor, Rtext) {
+export function sldLlineRtextAddGoods(leftColor, Rtext, tipSlot) {
   return <div className={styles.title_add_goods}>
     {/*<span style={{ backgroundColor: leftColor }} className={styles.left_border}/>*/}
     <span>{Rtext}</span>
+    {tipSlot}
   </div>;
 }
 
@@ -509,9 +510,10 @@ export function sldLlineRtextAddMargin(leftColor, Rtext, ml = 0, mt = 0, mb = 0)
 }
 
 //返回通用的标题(可以设置字体大小、颜色) 增加上下左边的距离
-export function sldLlineRtextAddGoodsAddMargin(leftColor, Rtext, ml = 0, mt = 0, mb = 0) {
+export function sldLlineRtextAddGoodsAddMargin(leftColor, Rtext, ml = 0, mt = 0, mb = 0, tipSlot) {
   return <div className={styles.title_add_goods} style={{ marginLeft: ml, marginTop: mt, marginBottom: mb }}>
     <span className={styles.title}>{Rtext}</span>
+    {tipSlot}
   </div>;
 }
 
@@ -1872,7 +1874,7 @@ export const webSiteContactRelation = {
 }
 
 export const businessStateEnum = {
-  1: '资质审核',
+  // 1: '资质审核',
   2: '装修筹备',
   3: '经营中',
   4: '暂停经营',