Merge remote-tracking branch 'origin/master'

src/app/basicVersion/caseShow/CaseShow.jsx

@@ -84,18 +84,17 @@ class CaseShow extends Component {
                         {
                             !showCustom ?
                                 <div>
-                                    <div className={'schema-name'} style={{fontSize: 25}}><FormattedMessage
-                                        id='scan and use'/></div>
+                                    <div className={'schema-name'} style={{fontSize: 25}}><FormattedMessage id='scan and use'/></div>
                                     <div>
                                         <div className={'schema-name'}><FormattedMessage id='ioobot case'/></div>
-                                        <div className="caseAllShow">
+                                        <div>
                                             {
                                                 this.state.examplesIoobot.length === 0 ?
                                                     <Spin/>
                                                     :
                                                     this.state.examplesIoobot.map((item, index) => (
-                                                        <Row key={index}>
-                                                            <Col span={16}>
+                                                        <Row key={index} className='case-item'>
+                                                            <Col span={12}>
                                                                 <Query query={gql(SHOW_CASE)} variables={{id: item.id}}>
                                                                     {
                                                                         ({loading, error, data}) => {
@@ -126,35 +125,37 @@ class CaseShow extends Component {
                                                                                             alt=""
                                                                                             height="500"/>
                                                                                     </div>
-                                                                                    <div>
-                                                                                        <div
-                                                                                            className={'schema-name'}>想要定制化该案例
-                                                                                        </div>
-                                                                                        <div>
-                                                                                            <div>联系作者</div>
-                                                                                            <div>
-                                                                                                <Icon type="mail"/>
-                                                                                                {
-                                                                                                    thisCase.user_id.email ? thisCase.user_id.email : '该作者未留下联系方式'
-                                                                                                }
-                                                                                            </div>
-                                                                                        </div>
-                                                                                        <div>
-                                                                                            <div>自行修改代码</div>
-                                                                                            <div>
-                                                                                                <Icon type="github"/>
-                                                                                                {
-                                                                                                    thisCase.codeAddress ? thisCase.codeAddress : '该作者未留下代码仓库地址'
-                                                                                                }
-                                                                                            </div>
-                                                                                        </div>
-                                                                                    </div>
                                                                                 </div>
                                                                             )
                                                                         }
                                                                     }
                                                                 </Query>
                                                             </Col>
+                                                            <Col span={4}>
+                                                                <div>
+                                                                    <div
+                                                                        className={'schema-name'}>想要定制化该案例
+                                                                    </div>
+                                                                    <div>
+                                                                        <div>联系作者</div>
+                                                                        <div>
+                                                                            <Icon type="mail"/>
+                                                                            {
+                                                                                item.user_id.email ? item.user_id.email : '该作者未留下联系方式'
+                                                                            }
+                                                                        </div>
+                                                                    </div>
+                                                                    <div>
+                                                                        <div>自行修改代码</div>
+                                                                        <div>
+                                                                            <Icon type="github"/>
+                                                                            {
+                                                                                item.codeAddress ? item.codeAddress : '该作者未留下代码仓库地址'
+                                                                            }
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </Col>
                                                             <Col span={8}>
                                                                 <div style={{padding: '10px 0'}}>
                                                                     <Card

src/app/basicVersion/caseShow/index.css

@@ -75,4 +75,8 @@
 .column-menu span{
     font-size: 18px;
     padding-left: 10px;
+}
+
+.case-item {
+    margin-bottom: 20px;
 }

src/language/zh_CN.js

@@ -163,7 +163,7 @@ const zh_CN = {
 
     'Example': '案例',
     'My deploy': '我的部署',
-    'Communication': '互动',
+    'Communication': '联系我们',
     'loading': '加载中...',
     'nothing': '暂无部署...',
     'new': '新!',
@@ -179,14 +179,14 @@ const zh_CN = {
     'there is this cloud, click to check': '存在该服务商的 key，点我检查',
     'Using the default system configuration, you can click to modify.': '默认使用系统配置，点击此处可修改',
     'back to case show': '返回该案例',
-    'back to all case show': '返回案例商城',
-    'scan and use': '案例商城，扫码体验',
+    'back to all case show': '返回案例模板',
+    'scan and use': '案例模板，扫码体验',
     'i want to use it directly': '我要直接使用',
     'showIDE': '开始数据操作',
     'closeIDE': '关闭它',
     'step more': '进一步',
     'one more step': '更进一步',
-    'ioobot case': '官方案例',
+    'ioobot case': '模板案例',
     'other developer case': '其他开发者提交的案例'
 };
 export default zh_CN;