jufubao-base 1.0.196 → 1.0.197-beta2

package/package.json

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

package/src/components/JfbBaseAddress/JfbBaseAddress.vue

@@ -184,7 +184,8 @@ export default {
       location_url: "",
       addressList: null,
       ...styleForm.getDataItem(),
-      version: ''
+      version: '',
+      cache_key: ''
     };
   },
   filters: {
@@ -214,6 +215,9 @@ export default {
   methods: {
     onJfbLoad(options) {
       let { back } = options;
+      if(options.cache_key) {
+        this.cache_key = options.cache_key
+      }
       this.backStatus = back;
       jfbRootExec("getVersion", {
         vm: this,
@@ -242,7 +246,8 @@ export default {
       jfbRootExec("getBaseAddressList", {
         vm: this,
         data: {
-          version: this.version
+          version: this.version,
+          cache_key: this.cache_key
         },
       })
         .then((res) => {
@@ -349,6 +354,7 @@ export default {
           data: {
             address_nnid: address_nnid,
             member_address: params,
+            cache_key: this.cache_key
           },
         })
           .then((res) => {
@@ -374,6 +380,7 @@ export default {
           vm: this,
           data: {
             member_address: params,
+            cache_key: this.cache_key
           },
         })
           .then((res) => {
@@ -470,7 +477,8 @@ export default {
         data: {
           address_nnid: item.address_nnid,
           is_select: "Y",
-          version: this.version
+          version: this.version,
+          cache_key: this.cache_key
         },
       })
         .then((res) => {
@@ -536,7 +544,8 @@ export default {
               vm: this,
               data: {
                 address_nnid: item.address_nnid,
-                version: this.version
+                version: this.version,
+                cache_key: this.cache_key
               },
             })
               .then(() => {

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -222,6 +222,23 @@
                 <view v-html="Ditem.value"></view>
               </view>
             </view>
+            <view
+              class="jfb-base-order-detail__body-delivery-bottom"
+              v-if="item.pick_up_addr_info && item.pick_up_addr_info.length > 0"
+            >
+              <view class="jfb-base-order-detail__body-delivery-bottom-title">预约信息</view>
+              <view
+                v-for="(Ditem, Dindex) in item.pick_up_addr_info"
+                :key="Dindex"
+                class="jfb-base-order-detail__body-delivery-bottom-item"
+              >
+                <view style="width: 130rpx;display: flex;">
+                  <view v-html="Ditem.label"></view>
+                  <text v-if="Ditem.label">:</text>
+                </view>
+                <view v-html="Ditem.value"></view>
+              </view>
+            </view>
           </view>
         </view>
         <view