jufubao-base 1.0.143-beta1 → 1.0.143-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.143-beta1",
+  "version": "1.0.143-beta2",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseAfterOrderList/JfbBaseAfterOrderList.vue

@@ -394,7 +394,7 @@ export default {
             flex: none;
           }
         }
-        & > :last-child{
+        & > view:last-child{
           .skeleton-wrap &{
             .skeleton-item(300rpx);
           }

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -96,7 +96,7 @@
               <view
                 class="jfb-base-order-list__body-order-item-content"
                 v-for="(Sitem, Sindex) in item.products"
-                :key="getKey(Sitem.product_id,Sindex)"
+                :key="Sitem.key"
                 v-if="(item['isOpen'] === false && Sindex < showLen) || item['isOpen']">
                 <image
                   :src="Sitem.product_thumb"
@@ -175,7 +175,7 @@
               class="jfb-base-order-list__body-order-item-pay"
               v-if="item.buttons.length"
             >
-              <view v-for="(btn,index) in item.buttons" :key="btn.action+index">
+              <view v-for="(btn,index) in item.buttons" :key="btn.key">
                 <xd-button
                   :type="getBtnType(btn.action)"
                   size="mini"
@@ -457,12 +457,17 @@ export default {
           console.log(res.list, "list");
           let list = res.list.map((item) => {
             item["isOpen"] = false;
-            item.products = item.products.map((prod) => {
+            item.products = item.products.map((prod, i) => {
+              prod['key'] = prod.product_id + i;
               prod["product_thumb"] = prod.product_thumb
                 ? getServiceUrl(prod.product_thumb)
                 : "";
               return prod;
             });
+            item.buttons = item.buttons.map((btn, i) => {
+              btn["key"] = btn.action + i;
+              return btn;
+            })
             item["created_time_text"] = this.$xdUniHelper.getDate(
               item["created_time"] * 1000
             ).fullTime;

package/src/components/JfbBaseSearch/JfbBaseSearch.vue

@@ -17,16 +17,24 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-search__body" :style="{height:layoutInfo.bodyMinHeightRpx+'rpx'}" v-if="layoutInfo!==null">
+      <!--#ifdef H5-->
       <xd-baidu-search
         @onSelect="handleSelect"
       ></xd-baidu-search>
+      <!-- #endif -->
+
+      <!-- #ifdef MP-WEIXIN -->
+      base Search
+      <!-- #endif -->
     </view>
   </view>
 </template>
 
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  // #ifdef H5
   import XdBaiduSearch from "./XdBaiduSearch";
+  // #endif
   import {jfbRootExec} from "@/utils/xd.event";
   import JfbBaseSearchMixin from "./JfbBaseSearchMixin";
   import componentsMixins from "@/mixins/componentsMixins";
@@ -37,7 +45,9 @@
     name: "JfbBaseSearch",
     components: {
       XdFontIcon,
-      XdBaiduSearch
+      // #ifdef H5
+      XdBaiduSearch,
+      // #endif
     },
     mixins: [componentsMixins,extsMixins,JfbBaseSearchMixin],
     data() {