dolphin-weex-bc 0.0.44 → 0.0.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dolphin-weex-bc",
-  "version": "0.0.44",
+  "version": "0.0.45",
   "description": "",
   "main": "index.js",
   "directories": {

package/packages/dof-bc-consumables/assets/css/index.css

@@ -498,21 +498,11 @@
   box-sizing: border-box;
 }
 .slider {
-  /* padding: 0 32px; */
-  /* margin-top: 25px; */
-  /* margin-left: 25px; */
-  /* padding: 32px 10px; */
   width: 686px;
-  height: 232px;
-  /* border-width: 1px; */
-  /* border-style: solid; */
-  /* border-color: #41B883; */
-  border-radius: 32px;
-  /* margin-bottom: 20px; */
+  height: 176px;
   flex-direction: row;
   background: #FFFFFF;
-  box-shadow: 0 1px 10px 0 rgba(0,0,0,0.04);
-  
+  /* background-color: #f00; */
 }
 .frame {
   width: 700px;
@@ -670,34 +660,37 @@
 
 .middleBox {
   width: 686px;
-  height: 100px;
+  /* height: 272px; */
   /* padding: 0px 0; */
   padding-top: 32px;
   /* margin-top: 8px; */
   background-color: #ffffff;
+  /* background-color: #00a4f2; */
   position: relative;
-  border-radius: 32px 32px 0 0;
-  /* margin-bottom: 20px; */
+  border-radius: 32px;
+  padding-bottom: 32px;
+  overflow: hidden;
+  box-shadow: 0 1px 10px 0 rgba(0,0,0,0.04);
 }
 
 .middleBox-not-button{
   border-radius: 32px;
 }
 
-.middleBox-lfour{
+/* .middleBox-lfour{
   height: 232px;
-  overflow: hidden;
-}
+} */
 
 .middleBox-lfour-ios{
    height: 216px;
 }
 
 .car-card-box{
+  margin-top:32px;
   width: 686px;
-  height: 104px;
+  height: 72px;
   background-color: #ffffff;
-  border-radius: 0 0 32px 32px;
+  /* background-color: #F56428; */
 }
 
 .car-card{
@@ -707,7 +700,6 @@
   height: 72px;
   line-height: 72px;
   text-align: center;
-  margin-bottom: 32px;
   margin-left: 48px;
   justify-content: center;
   align-items: center;
@@ -729,7 +721,7 @@
   display: flex;
   flex-direction: row;
   justify-content: center;
-  margin-top: -32px;
+  /* margin-top: -32px; */
   /* padding: 32px; */
 }
 .recommendSliderOut {

package/packages/dof-bc-consumables/index.vue

@@ -2,7 +2,7 @@
   <div class="material-wrapper">
     <template v-if="layoutMode == 'row'">
       <div
-        :class="['middleBox', (!showAddCartButton || insufficientGoodinfoList.length == 0) && 'middleBox-not-button', dealDeviceMaterialList[0].consumables.length <= 4 && 'middleBox-lfour']"
+        :class="['middleBox', dealDeviceMaterialList[0].consumables.length <= 4 && 'middleBox-lfour']"
         ref="recommend"
       >
         <scroller class="slider" show-scrollbar="false" scroll-direction="horizontal" @scroll="scrollEvent1">
@@ -86,15 +86,16 @@
             ></div>
           </div>
         </div>
-      </div>
-      <!-- 显示一键加购 -->
-      <template v-if="showAddCartButton && insufficientGoodinfoList.length > 0">
-        <div class="car-card-box">
-          <div class="car-card" @click="showGoodsList()">
-            <text class="car-card-text">立即购买</text>
+        <!-- 显示一键加购 -->
+        <template v-if="showAddCartButton && insufficientGoodinfoList.length > 0">
+          <div class="car-card-box">
+            <div class="car-card" @click="showGoodsList()">
+              <text class="car-card-text">立即购买</text>
+            </div>
           </div>
-        </div>
-      </template>
+        </template>
+      </div>
+      
     </template>
 
     <scroller

package/packages/dof-material-add-card/settings/utils.js

@@ -42,6 +42,15 @@ const appConfig = {
 }
 const isDummy = false
 
+const serviceList = {
+    queryBatchMaterialByHomeGroupList: '/v2/remaining/queryByHomeGroupList', // 批量查询设备的耗材余量(批量查询家庭)V2 10.1 发布 https://yapi.smartmidea.net/project/465/interface/api/43894,
+    getDeviceAuth: '/v1/appliance/auth/batch/get', // 获取设备确权状态（批量）https://yapi.smartmidea.net/project/131/interface/api/13778 放达
+    queryBatchMaterialByHomeId: '/v2/remaining/queryBatch', // 批量查询设备的耗材余量(传家庭id)V2 10.1 发布 https://yapi.smartmidea.net/project/465/interface/api/43390
+    querySkuIdByItemCodes: '/api/cms_bff/mtc-bff-app/m2c/querySkuIdByItemCodes', //https://api.midea.com/project/6804/interface/882168?groupId=19962&cateId=123676&filterText=kuIdByItemCodes&label=%E5%95%86%E5%93%81%E6%9C%8D%E5%8A%A1&tab=
+    shopCartBatchSave: '/api/cms_bff/mtc-bff-app/shopCart/batchSave', //https://api.midea.com/project/6804/interface/882168?groupId=19962&cateId=123676&filterText=kuIdByItemCodes&label=%E5%95%86%E5%93%81%E6%9C%8D%E5%8A%A1&tab=
+    shopCartBatchRemove: '/api/cms_bff/mtc-bff-app/shopCart/batchRemove'
+  }
+
 const utils = {
   serviceList: {
     queryBatchMaterialByHomeGroupList: '/v2/remaining/queryByHomeGroupList', // 批量查询设备的耗材余量(批量查询家庭)V2 10.1 发布 https://yapi.smartmidea.net/project/465/interface/api/43894,