Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into v3.5.1

src/pages/building/list/add/components/base.jsx

@@ -360,9 +360,12 @@ function AddBuilding(props) {
               rules: [{ required: true, message: '请选择销售状态' }],
             })(
               <Select placeholder="销售状态" style={{ width: '1016px' }}>
-                <Option value="待定">待定</Option>
+                {/* <Option value="待定">待定</Option>
                 <Option value="在售">在售</Option>
-                <Option value="售完">售完</Option>
+                <Option value="售完">售完</Option> */}
+                <Option value="待售">待售</Option>
+                <Option value="在售">在售</Option>
+                <Option value="售罄">售罄</Option>
               </Select>,
             )}
           </Form.Item>

src/pages/building/list/index.jsx

@@ -96,16 +96,18 @@ function CartBody(props) {
       },
     });
   }
-
+// src={((data.buildingImg && data.buildingImg[0]) || {}).url}background: `url(${item.caseCoverImg})` style={{ background: `url(((data.buildingImg && data.buildingImg[0]) || {}).url)` }}
   const { buildingImg } = data
-  console.log("buildingImg: ", data.buildingImg, "data: ", data)
+  console.log("buildingImg: ", data.buildingImg, "data: ")
   return (
     <Card
       hoverable
       style={{ minWidth: '330px', borderRadius: '12px', margin: '10px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)' }}
-      cover={<img alt="example" src={((data.buildingImg && data.buildingImg[0]) || {}).url} style={{ borderRadius: '12px 12px 0 0', width: '100%', height: '14vw' }}></img>}
-      bodyStyle={{ padding: '10px 20px' }}
+      // cover={}
+      // bodyStyle={{ padding: '10px 20px' }}
     >
+    <img className={Styles.cover} style={{ background: `url(${((data.buildingImg && data.buildingImg[0]) || {}).url})` }}   ></img>
+    <div style={{ padding: '10px 20px' }}>
       <p className={Styles.cardText}>
         <span className={Styles.title}>楼盘编号</span>
         <span >：{data.code}</span>
@@ -155,6 +157,7 @@ function CartBody(props) {
         </span>
       </AuthButton>
       </p>
+      </div>
     </Card>
   )
 }

src/pages/building/list/style.less

@@ -56,4 +56,13 @@
   white-space: nowrap;
   overflow: hidden;
 }
+.cover{
+  width: 100%;
 
+  padding-bottom: 56.25%;
+  background-size: 100% 100% !important;
+ 
+  border-radius: 12px 12px 0 0;
+  
+    // height: '14vw';
+}

src/pages/carouselFigure/editCarousel.jsx

@@ -86,6 +86,23 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
             { required: true, message: '请选择所属项目' },
           ],
         },
+        {
+          label: '发布位置',
+          name: 'showPosition',
+          type: FieldTypes.Select,
+          dict: [{
+            label: '首页',
+            value: 'index',
+          },
+          {
+            label: '积分商城',
+            value: 'mall',
+          }],
+          value: data.showPosition,
+          rules: [
+            { required: true, message: '请选择发布位置' },
+          ],
+        },
         {
           label: () => (locationType ? '积分商城轮播图' : '首页轮播图'),
           name: 'image',
@@ -105,23 +122,6 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
             { required: true, message: '请输入标题' },
           ],
         },
-        {
-          label: '发布位置',
-          name: 'showPosition',
-          type: FieldTypes.Select,
-          dict: [{
-            label: '首页',
-            value: 'index',
-          },
-          {
-            label: '积分商城',
-            value: 'mall',
-          }],
-          value: data.showPosition,
-          rules: [
-            { required: true, message: '请选择发布位置' },
-          ],
-        },
         {
           label: '类型',
           name: 'contentType',

src/pages/integralMall/writeOff.jsx

@@ -146,7 +146,7 @@ function header(props) {
           <div style={{ margin: '110px auto', display: 'block', textAlign: 'center' }}>
             <Input placeholder="请输入手机号" style={{ width: '200px' }} onChange={changeTel} />
             <AuthButton name="admin.taPointsExchange.recId.put" noRight={null}>
-              <Button type="primary" style={{ marginLeft: '10px', padding: '6px 46px', backgroundColor: '#EA2323', border: 'none' }} onClick={verifyTel}>立即核销</Button>
+              <Button type="primary" style={{ marginLeft: '10px', padding: '0px 46px', backgroundColor: '#EA2323', border: 'none' }} onClick={verifyTel}>立即核销</Button>
             </AuthButton>
           </div>
         </TabPane>