jufubao-mall 1.0.97 → 1.0.99

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "1.0.97",
+  "version": "1.0.99",
   "private": false,
   "description": "聚福宝商城业务组件插件包",
   "main": "index.js",

package/src/components/JfbMallBrandWall/JfbMallBrandWall.vue

@@ -193,6 +193,8 @@
         stateCity: state => state.cityLocation.city
       }),
       showTabs(){
+        console.log(this.tabs,'showTabs');
+        
         this.tabs.forEach((item1, index) => {
         const item2 = this.newLabel.find((item) => item.value === item1.value);
 
@@ -202,7 +204,12 @@
           item1.isShow = item2.isShow
         }
         });
-        this.tabs = this.tabs.filter(item => item.isShow)
+        this.tabs = this.tabs.filter(item =>{
+          if(typeof item.isShow!=='boolean') {
+            return true
+          }
+          return item.isShow
+        })
         
         this.tabs.sort((a,b)=>a.sort - b.sort)
         console.log(this.tabs,this.has_sell,'pappapp');
@@ -259,6 +266,12 @@
         deep:true,
         handler(n,o) {
           if(this.isPreview) {
+            n = n.map(item=>{
+              if(!('isShow' in item)) {
+                item.isShow = true
+              }
+              return item;
+            })
             n = n.filter(item => item.isShow)
             this.tabs = n
             this.tabs.sort((a,b)=>a.sort - b.sort)
@@ -327,7 +340,6 @@
           {label: "电子码", value: "code",sort:4,isShow: true}
         ]);
         console.log(this.newLabel,'newLabel');
-        
       },
       switchTab(i){
         this.tabIndex = i;

package/src/components/JfbMallConfirm/Api.js

@@ -288,5 +288,20 @@ module.exports = [
     },
     isConsole: true,
     disabled: true
+  },
+  {
+    mapFnName: "getTimeInfo",
+    title: "获取预约时间",
+    path: "/order/v1/order/get-subscribe-time-info",
+    isRule: false,
+    data: {
+      product_info_items: ['商品信息', 'array', true],
+      address_nnid: ['地址id', 'string', true],
+      address_nnid_items: ['地址id集合', 'array', true],
+      date: ['时间', 'string', true],
+      business_code: ['业务线', 'string', true],
+    },
+    isConsole: true,
+    disabled: true
   }
 ];

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -18,17 +18,34 @@
       '--main-color': mainColor,
     }">
       <template>
-        <view v-if="haveLogistics" class="shipping-address section" @click="toAddress">
-          <view v-if="curAddr" class="addr_l">
+        <view v-if="show_pick_up_address==='Y'" class="shipping-address section" @click="toAddress('Y')">
+          <view v-if="curCacheAddr" class="addr_l">
             <view class="person_info">
-              <view v-if="curAddr.is_default == 'Y'" class="default_tag">默认</view>
-              <view>{{curAddr.name}}</view>
+              <view v-if="curCacheAddr.is_default == 'Y'" class="default_tag">默认</view>
+              <view>{{curCacheAddr.name}}</view>
+              <view style="margin-left: 16rpx;">{{curCacheAddr.phone}}</view>
+            </view>
+            <view class="addr_detail">{{curCacheAddr.address_detail}}{{curCacheAddr.house_number}}</view>
+            <view class="addr_info">{{curCacheAddr.province_name}}{{curCacheAddr.city_name}}{{curCacheAddr.area_name}}{{curCacheAddr.street_name}}</view>
+          </view>
+          <view v-else class="addr_l" style="text-align:left;">请设置地址</view>
+          <xd-font-icon size="32" style="color: #B1B1B1;" icon="iconxiangyou_xian"></xd-font-icon>
+        </view>
+        <view v-if="show_receive_address==='Y'" class="shipping-address section" @click="toAddress">
+          <view v-if="curAddr" class="addr_l">
+            <view>
+              <view class="person_info">
+                <view v-if="curAddr.is_default == 'Y'" class="default_tag">默认</view>
+                <view>{{curAddr.name}}</view>
               <view style="margin-left: 16rpx;">{{curAddr.phone}}</view>
+              </view>
+              <view class="addr_detail">{{curAddr.address_detail}}{{curAddr.house_number}}</view>
+              <view class="addr_info">{{curAddr.province_name}}{{curAddr.city_name}}{{curAddr.area_name}}{{curAddr.street_name}}</view>
             </view>
-            <view class="addr_detail">{{curAddr.address_detail}}{{curAddr.house_number}}</view>
-            <view class="addr_info">{{curAddr.province_name}}{{curAddr.city_name}}{{curAddr.area_name}}{{curAddr.street_name}}</view>
           </view>
-          <view v-else class="addr_l" style="text-align:left;">添加收货地址</view>
+          <view v-else class="addr_l" style="text-align:left;">
+            请设置地址
+          </view>
           <xd-font-icon size="32" style="color: #B1B1B1;" icon="iconxiangyou_xian"></xd-font-icon>
         </view>
         <view v-if="showBuyer == 'Y'" class="buyer_info section">
@@ -70,11 +87,9 @@
                 </view>
               </view>
             </view>
-
-            <!-- <template v-if="shop.is_support_delivery === 'Y'"> -->
               <!-- 配送信息 -->
-              <view v-if="showDelivery == 'Y' && shop.support_delivery_method_options.length" class="delivery">
-                <xd-list-item label="配送方式" showRight paddingLR="60rpx" showBottom size="large">
+              <view v-if="shop.support_delivery_method_options.length" class="delivery">
+                <xd-list-item v-if="shop.sub_show_delivery_method==='Y'" label="配送方式" showRight paddingLR="60rpx" showBottom size="large">
                   <picker @change="e => bindPickerChange(e, shopIndex)"
                     range-key="label" :range="shop.support_delivery_method_options"
                     :value="shop.support_delivery_method_options.findIndex(ll => ll.value == shop.deliveryPickValue)"
@@ -82,40 +97,30 @@
                     <view style="color: #999999;">{{shop.deliveryPickLabel || "选择配送方式"}}</view>
                   </picker>
                 </xd-list-item>
-                <template v-for="delivery in shop.support_delivery_method_options">
-                  <template v-if="delivery.value=='samecity'">
-                    <view v-show="shop.deliveryPickValue === 'samecity' && shop.is_support_delivery == 'Y'" :key="delivery.value">
-                      <!-- 配送方式：专人配送 -->
-                      <xd-list-item v-if="!gift_id" label="配送费" paddingLR="50rpx">
-                        <xd-unit :price="shop.user_logistics_amount_origin" :isOld="false"></xd-unit>
-                      </xd-list-item>
-                      <xd-list-item label="配送时间" showRight paddingLR="50rpx" @click="toSetSelectTime(shopIndex)">
-                        {{shop.selectTime ? shop.selectTime.dateTime : "选择配送时间"}}
-                      </xd-list-item>
+                <view>
+                  <xd-list-item v-if="shop.sub_show_delivery_price==='Y'" label="配送费" paddingLR="50rpx">
+                    <xd-unit :price="shop.user_logistics_amount_origin" :isOld="false"></xd-unit>
+                  </xd-list-item>
+                  <xd-list-item v-if="shop.deliveryPickValue === 'samecity' && shop.is_support_delivery == 'Y'" :label="shop.time_label" showRight paddingLR="50rpx" @click="toSetSelectTime(shopIndex,shop)">
+                    {{shop.selectTime ? shop.selectTime.dateTime : "请选择"}}
+                  </xd-list-item>
+                  <view v-if="shop.deliveryPickValue === 'takeout'" >
+                    <!-- 配送方式：到店自提 -->
+                    <xd-list-item label="选择门店" show-right paddingLR="50rpx" @click="toSetSelectShop(shopIndex)">
+                    <view style="color: #999999;">
+                      {{shop.choseShop ? shop.choseShop.resource_shop_name : "请选择"}}
                     </view>
-                  </template>
-                  <template v-if="delivery.value=='takeout'">
-                    <view v-show="shop.deliveryPickValue === 'takeout'" :key="delivery.value">
-                      <!-- 配送方式：到店自提 -->
-                      <xd-list-item label="选择门店" show-right paddingLR="50rpx" @click="toSetSelectShop(shopIndex)">
-                        <view style="color: #999999;">
-                          {{shop.choseShop ? shop.choseShop.resource_shop_name : "请选择"}}
-                        </view>
-                      </xd-list-item>
-                      <xd-list-item v-if="shop.takeoutTimeList" label="到店时间" show-right paddingLR="50rpx" @click="toSetTakeoutTime(shopIndex)">
-                        <view style="color: #999999;">{{shop.takeoutTime ? shop.takeoutTime.dateTime : '请选择'}}</view>
-                      </xd-list-item>
-                    </view>
-                  </template>
-                </template>
+                    </xd-list-item>
+                    <xd-list-item v-if="shop.takeoutTimeList" :label="shop.time_label" show-right paddingLR="50rpx" @click="toSetTakeoutTime(shopIndex,shop)">
+                      <view style="color: #999999;">{{shop.takeoutTime ? shop.takeoutTime.dateTime : '请选择'}}</view>
+                    </xd-list-item>
+                  </view>
+                </view>
               </view>
               <xd-list-item v-if="shop.delivery_message" :label="shop.delivery_message" paddingLR="60rpx" size="large"></xd-list-item>
-            <!-- </template>
-            <template v-else> -->
               <view v-if="shop.is_support_delivery == 'N'" :style="{background:bgColor,color:warningColor}" class="err_message">
                 {{shop.message}}
               </view>
-            <!-- </template> -->
           </view>
         </view>
 
@@ -131,11 +136,10 @@
             <xd-list-item label="商品总额" paddingLR="60rpx" size="small">
               <xd-unit :price="gift_id ? orderFee.product_amount : goodTotal" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
             </xd-list-item>
-
-            <xd-list-item v-if="showLogisticsAmount" label="配送费用" paddingLR="60rpx" paddingTB="0" size="small">
+            <xd-list-item v-if="showLogisticsAmount&&main_show_delivery_price==='Y'" label="配送费用" paddingLR="60rpx" paddingTB="0" size="small">
               <xd-unit :price="orderFee.user_logistics_amount_origin" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
             </xd-list-item>
-            <xd-list-item v-if="showLogisticsDiscount" label="运费减免" showBottom paddingLR="60rpx" size="small">
+            <xd-list-item v-if="showLogisticsDiscount&&main_show_delivery_price==='Y'" label="运费减免" showBottom paddingLR="60rpx" size="small">
               <xd-unit :price="orderFee.user_logistics_discount_amount" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
             </xd-list-item>
           </template>
@@ -261,12 +265,24 @@
           :setSettleSelectCoupon="setSettleSelectCoupon"
         ></CusCouponChose>
         <xd-select-time
+          v-if="showSelectTime"
           :show.sync="showSelectTime"
+          :is_sync="selectTimeIsSync"
+          :product_info_items="selectTimeProductInfoItems"
+          :address_nnid_items="selectTimeAddressNnidItems"
+          :address_nnid="curAddr.address_nnid"
+          :business_code="xnamespace"
           @onTimeSlotList="handleTimeSlotList"
           @onSelect="handleTimeSelect"
         ></xd-select-time>
         <xd-select-time
+          v-if="showTakeoutTime"
           :show.sync="showTakeoutTime"
+          :is_sync="selectTimeIsSync"
+          :product_info_items="selectTimeProductInfoItems"
+          :address_nnid_items="selectTimeAddressNnidItems"
+          :address_nnid="curAddr.address_nnid"
+          :business_code="xnamespace"
           @onTimeSlotList="handleTakeoutTimeSlotList"
           @onSelect="handleTakeoutTimeSelect"
         ></xd-select-time>
@@ -341,6 +357,8 @@
         order_id: "",
         addressList: [],
         address_nnid: "",
+        addressCacheList: [], //临时缓存地址列表，在收货地址和取货地址都需要选择的情况下，当做收货地址列表使用
+        address_cache_nnid: "",
         productList: [],
         shopList: [],
         tempShopList: [],
@@ -392,13 +410,13 @@
         xnamespace: "",
         showBuyer: "",
         showWish: "",
-        showDelivery: "",
         showOrderComment: "",
         shipAddressPath: "",
         payPath: "",
         paySuccessPath: "",
         choseCityPath: "",  //选择城市路径
         bgColor: '',
+        bgColor2: '',
         preview: "N",
         showActivityPrice: 'N',
         bindCard: '1',
@@ -413,6 +431,15 @@
         couponBtnTextStyle: {}, //优惠券包登录按钮文字背景色设置
         couponUseBtnPadding: {},
         couponImageUrl: "",
+
+        show_pick_up_address: 'N', //显示取货地址
+        show_receive_address: 'Y', //显示收货地址
+        main_show_delivery_price: 'Y', //显示主单配送费
+        selectTimeIsSync: 'Y', //是否同步获取时间
+        selectTimeProductInfoItems: [],
+        selectTimeAddressNnidItems: [],
+
+        isFirst: true,
       }
     },
     computed: {
@@ -431,6 +458,15 @@
           return curClickChoose || curSelect || curDefault || this.addressList[0];
         }
       },
+      curCacheAddr(){
+        if(!this.addressCacheList.length) return null;
+        else{
+          let curClickChoose = this.addressCacheList.find(item => item.address_nnid == this.address_cache_nnid);
+          let curSelect = this.addressCacheList.find(item => item.is_select == "Y");
+          let curDefault = this.addressCacheList.find(item => item.is_default == "Y");
+          return curClickChoose || curSelect || curDefault || this.addressCacheList[0];
+        }
+      },
       showLogisticsAmount(){
         let amount = this.orderFee.user_logistics_amount_origin;
         return !(amount === "" || amount === "-1" || amount === null || amount === undefined);
@@ -526,6 +562,9 @@
         let total_amount = this.orderFee.total_amount ? this.orderFee.total_amount : 0;
         let result = this.$xdUniHelper.cutFloatNumber(total_amount, total);
         return result;
+      },
+      isSame() {
+        return (this.curAddr.address_nnid === this.curCacheAddr.address_nnid);
       }
     },
     watch: {
@@ -540,6 +579,13 @@
           this.p_getCartConfirm();
         }
       },
+      curCacheAddr(n, o){
+        if((n != o || n.address_nnid != o.address_nnid)){
+          this.shopList = [];
+          this.tempShopList = [];
+          this.p_getCartConfirm();
+        }
+      },
       curSubscribeTimeInfo(n, o){
         console.log("watch shopList 1", n, o)
         // this.p_getCartConfirm();
@@ -564,7 +610,8 @@
         this.scene = options.scene || "";
 
         await this.p_getAddrList();
-        this.p_getCartConfirm();
+        await this.p_getCacheAddrList();
+        await this.p_getCartConfirm();
         this.validImageAPIUrl = this.brandInfo['api_host'] + '/common/v1/valid_code/image/show'
         // #ifdef H5
         jfbRootExec("getH5WxAuthorize", {
@@ -583,9 +630,9 @@
        */
       init(container) {
         this.bgColor = this.$colorChange(this.warningColor).alpha(0.1).toString();
+        this.bgColor2 = this.$colorChange(this.mainColor).alpha(0.1).toString();
         this.xnamespace = getContainerPropsValue(container, 'content.xnamespace', this.projectAttr.business_code);
         this.showBuyer = getContainerPropsValue(container, 'content.showBuyer');
-        this.showDelivery = getContainerPropsValue(container, 'content.showDelivery', "Y");
         this.showOrderComment = getContainerPropsValue(container, 'content.showOrderComment', "Y");
         this.shipAddressPath = getContainerPropsValue(container, 'content.shipAddressPath', {value: ""}).value;
         this.payPath = getContainerPropsValue(container, 'content.payPath', { value: "" }).value;
@@ -764,12 +811,14 @@
       },
       //使用钱包跟票券一同支付
       useTickAndWalletPay(selected_card_list, selected_wallet_list){
+        let address_nnid_items = this.handleGetAddressItems()
         this.createSettleOrder({
           total_price: this.orderFee.total_amount,
           selected_card_list_json: JSON.stringify(selected_card_list),
           selected_wallet_list_json: JSON.stringify(selected_wallet_list),
           need_pay_price: this.orderNeedPayPrice,
-          scene: this.scene
+          scene: this.scene,
+          address_nnid_items
         }, (res) => {
           console.warn("创建订单成功");
           console.warn(res);
@@ -796,11 +845,31 @@
           });
         })
       },
-      toSetSelectTime(index){
+      toSetSelectTime(index,item){
+        this.selectTimeIsSync = item.is_sync;
+        this.selectTimeProductInfoItems = item.product.map(item=>{
+          return {
+            product_id: item.product_id,
+            product_sku_id: item.product_sku_id,
+            product_num: item.product_num
+          }
+        })
+        let address_nnid_items = this.handleGetAddressItems()
+        this.selectTimeAddressNnidItems = address_nnid_items
         this.showTimeShopIndex = index;
         this.showSelectTime = true;
       },
-      toSetTakeoutTime(index){
+      toSetTakeoutTime(index,item){
+        this.selectTimeIsSync = item.is_sync;
+        this.selectTimeProductInfoItems = item.product.map(item=>{
+          return {
+            product_id: item.product_id,
+            product_sku_id: item.product_sku_id,
+            product_num: item.product_num
+          }
+        })
+        let address_nnid_items = this.handleGetAddressItems()
+        this.selectTimeAddressNnidItems = address_nnid_items
         this.showTakeoutShopIndex = index;
         this.showTakeoutTime = true;
       },
@@ -835,13 +904,15 @@
           err_text = "请填写正确的订购人手机号";
         }
         let subscribeTimeInfo = this.shopList.map(item => {
+          console.log(item,'ajaajjaja');
+          
           let result = {};
           if(item.support_delivery_method_options.length && !item.deliveryPickValue) err_text = "请选择配送方式";
           else if(item.deliveryPickValue === 'takeout'){
             if(!item.choseShop){
               err_text = "请选择自提门店";
             }else if(!item.takeoutTime){
-              err_text = "请选择到店时间";
+              err_text = `请选择${item.time_label}`;
             }else{
               result['shop_id'] = item.choseShop.resource_shop_id;
               result['date'] = item.takeoutTime.dateItem['name'];
@@ -850,7 +921,7 @@
             }
           }else if(item.deliveryPickValue === 'samecity'){
             if(!item.selectTime){
-              err_text = "请选择配送时间";
+              err_text = `请选择${item.time_label}`;
             }else{
               result['date'] = item.selectTime.dateItem.date;
               result['hourSpan'] = item.selectTime.dateTimeItem.name;
@@ -932,6 +1003,30 @@
             })
         })
       },
+      p_getCacheAddrList() {
+        if(this.gift_id && this.preview === 'Y'){
+          this.addressList = [{"address_nnid":"kEC8GbLa2IGQOrp9KqCb9","user_id":5000025,"province_code":"1","city_code":"jfb1","area_code":"2809","street_code":"51231","province_name":"北京","city_name":"北京","area_name":"城区","street_name":"南池子街道","address_detail":"测试地址","name":"测试账号","phone":"15000000001","is_default":"Y","tag":0,"is_select":"Y","latitude":"39.911427","longitude":"116.64813","partner_id":161,"site_id":"17928cc37788be02","created_time":1689319677,"updated_time":1689319677,"house_number":"某大厦南园12号楼3单元1203","is_valid":"Y","request_id":"ca1febcf5fb61320"}];
+          return Promise.resolve();
+        }
+        this.$xdShowLoading({});
+        return new Promise((resolve, reject) => {
+          jfbRootExec("getAddressList", {
+            vm: this,
+            data: {
+              cache_key: this.order_id
+            }
+          }).then(res => {
+            this.$xdHideLoading();
+            if(!res.address_nnid) this.addressCacheList = [];
+            else this.addressCacheList = [res];
+            resolve(res);
+          }).catch(err => {
+            this.$xdLog.catch(err);
+              this.$xdHideLoading();
+              reject(err);
+            })
+        })
+      },
       p_getCartConfirm(){
         console.log('this.xnamespace', this.xnamespace);
         this.$xdShowLoading({});
@@ -957,12 +1052,14 @@
         if(this.timer) clearTimeout(this.timer);
         this.timer = setTimeout(() => {
           console.log('this.xnamespace',this.xnamespace, this)
+          let address_nnid_items = this.handleGetAddressItems()
           jfbRootExec("getMallCartConfirm", {
             vm: this,
             data: {
               namespace: this.xnamespace,
               cart_order_id: this.order_id,
               address_nnid: this.curAddr? this.curAddr.address_nnid:'',
+              address_nnid_items: address_nnid_items,
               gift_mode: this.gift_mode,
               gift_id: this.gift_id,
               subscribeTimeInfo: this.curSubscribeTimeInfo,
@@ -971,6 +1068,7 @@
             }
           }).then(res => {
             this.$xdHideLoading();
+            this.isFirst = false;
             this.handlerConfirmRes(res);
           }).catch(err => {
             this.$xdHideLoading();
@@ -978,6 +1076,39 @@
           })
         },150)
       },
+      handleGetAddressItems() {
+        // 定义一个空数组，用于存储地址信息
+        let address_nnid_items = []
+        // 定义一个基础数组，包含两种类型的地址信息
+        const baseItems = [
+          {
+            address_type: 1,
+            address_nnid: this.curCacheAddr ? this.curCacheAddr.address_nnid : ''
+          },
+          {
+            address_type: 2,
+            address_nnid: this.curAddr ? this.curAddr.address_nnid : ''
+          }
+        ];
+        // 判断是否是第一次加载
+        if (this.isFirst) {
+          // 如果是第一次加载，将基础数组赋值给address_nnid_items
+          address_nnid_items = baseItems;
+        } else {
+          // 如果不是第一次加载，根据show_pick_up_address和show_receive_address的值，决定address_nnid_items的值
+          if (this.show_pick_up_address === 'Y' && this.show_receive_address === 'Y') {
+          // 如果show_pick_up_address和show_receive_address都为Y，将基础数组赋值给address_nnid_items
+            address_nnid_items = baseItems;
+          } else if (this.show_pick_up_address === 'Y') {
+          // 如果show_pick_up_address为Y，将基础数组中的第二个元素赋值给address_nnid_items
+            address_nnid_items = [baseItems[0]];
+          } else if (this.show_receive_address === 'Y') {
+          // 如果show_receive_address为Y，将基础数组中的第一个元素赋值给address_nnid_items
+            address_nnid_items = [baseItems[1]];
+          }
+        }
+        return address_nnid_items;
+      },
       handlerConfirmRes(res){
         if (!res.shop_group) {
           this.$xdLog.setARMSCustomError('mallConfirm_shopGroup_init_undefined', res);
@@ -1039,6 +1170,9 @@
         });
         this.is_can_buy = res.is_can_buy;
         this.gift_pay_method = res.gift_pay_method;
+        this.show_receive_address = res.show_receive_address; 
+        this.show_pick_up_address = res.show_pick_up_address;
+        this.main_show_delivery_price = res.main_show_delivery_price;
         let priceChange = this.orderFee.total_amount && this.orderFee.total_amount != res.total_amount;
         this.orderFee = {
           logistics_amount: res.logistics_amount,
@@ -1076,13 +1210,19 @@
         })
       },
 
-      toAddress(){
+      toAddress(isCache='N'){
         if (this.preview === 'Y') {
           return this.$xdAlert({content: "体验模式不支持配送地址设置", width: '65vw'})
         }
-        this.$xdUniHelper.navigateTo({
-          url: this.shipAddressPath + "?back=true"
-        })
+        if(isCache === 'Y') {
+          this.$xdUniHelper.navigateTo({
+            url: this.shipAddressPath + "?back=true&cache_key="+ this.order_id
+          })
+        } else {
+          this.$xdUniHelper.navigateTo({
+            url: this.shipAddressPath + "?back=true"
+          })
+        }
       },
 
       bindPickerChange(e, index){
@@ -1102,6 +1242,7 @@
       onJfbShow(options) {
         console.log('event.onJfbShow', options)
         this.p_getAddrList();
+        this.p_getCacheAddrList()
       },
       onJfbUnload(){
         clearTimeout(this.orderTimer);
@@ -1121,6 +1262,19 @@
         margin-bottom: 16rpx;
         background: #FFFFFF;
       }
+      .same-addr{
+        display: flex;
+        &>view {
+          font-size: 28rpx;
+          color: #333;
+        }
+        &>text {
+          font-size: 20rpx;
+          padding: 4rpx 10rpx;
+          border-radius: 10rpx;
+          margin-left: 20rpx;
+        }
+      }
       .shipping-address{
         padding: 40rpx 60rpx;
         display: flex;

package/src/components/JfbMallConfirm/XdSelectTime.vue

@@ -20,15 +20,16 @@
             {{DItem.name}}
           </view>
         </scroll-view>
-        <scroll-view class="app-body__right" :scroll-y="true">
+        <scroll-view v-if="rightList&&rightList.length>0" class="app-body__right" :scroll-y="true">
           <view
             class="app-body__right-item"
             v-for="(TItem,TIndex) in rightList"
-            :style="{'background':timeBackground,'color':TIndex===timeSelectIndex?timeSelectColor:''}"
+            :style="{'background':timeBackground,'color':TItem.is_subscribe_full==='Y'?'#C0C4CC':TIndex===timeSelectIndex?timeSelectColor:''}"
             :key="TIndex"
             @click="handleSelectTime(TItem, TIndex)"
           >
             {{TItem.name}}
+            <text v-if="TItem.is_subscribe_full==='Y'" class="app-body__right-item-full">已约满</text>
           </view>
         </scroll-view>
       </view>
@@ -38,6 +39,7 @@
 
 <script>
   import XdDownDrawer from "@/components/XdDownDrawer/XdDownDrawer";
+  import { jfbRootExec } from "@/utils/xd.event";
 
   /**
    * @property {String}  dateBackground          日期选择区域背景色
@@ -74,7 +76,27 @@
       timeSelectColor: {
         type: String,
         default: '#f2dd39'
-      }
+      },
+      is_sync: {
+        type: String,
+        default: 'Y'
+      },
+      product_info_items: {
+        type: Array,
+        default: () => []
+      },
+      address_nnid_items: {
+        type: Array,
+        default: () => []
+      },
+      address_nnid: {
+        type: String,
+        default: ''
+      },
+      business_code: {
+        type: String,
+        default: ''
+      },
     },
     components: {
       XdDownDrawer
@@ -258,13 +280,36 @@
        * @description 获取时间段列表
        */
       getList() {
-        this.$emit('onTimeSlotList', (list) => {
+        this.$emit('onTimeSlotList',  (list) => {
           if (list === null) {
             this.leftList = this.$xdUniHelper.cloneDeep(this.testDataList);
           } else {
             this.leftList = list
           }
           if (this.leftList.length > 0) {
+            if(this.is_sync==='N'){
+              jfbRootExec('getTimeInfo', {
+                vm: this,
+                data: {
+                  product_info_items: this.product_info_items,
+                  address_nnid: this.address_nnid,
+                  address_nnid_items: this.address_nnid_items,
+                  date: this.leftList[0].year_date,
+                  business_code: this.business_code
+                }
+              }).then(res=>{
+                this.rightList = res.subscribe_time_list.map(item=>{
+                  return {
+                    ...item,
+                    name: item.time
+                  }
+                })
+                this.date = this.leftList[0].name
+                this.dateTime = `${this.date}  ${res.subscribe_time_list[0].name}`;
+                this.dateItem = this.leftList[this.dateSelectIndex];
+              })
+              return
+            }
             this.rightList = this.leftList[0].item_list
             this.date = this.leftList[0].name
             this.dateTime = `${this.date}  ${this.rightList[0].name}`;
@@ -280,6 +325,34 @@
        */
       handleSelectDate(DIndex, DItem) {
         if (DIndex === this.dateSelectIndex) return;
+        if(this.is_sync==='N') {
+          jfbRootExec('getTimeInfo', {
+            vm: this,
+            data: {
+              product_info_items: this.product_info_items,
+              address_nnid: this.address_nnid,
+              address_nnid_items: this.address_nnid_items,
+              date: DItem.year_date,
+              business_code: this.business_code
+            }
+
+          }).then(res=>{
+            if(!(res.subscribe_time_list)||res.subscribe_time_list.length===0) {
+              this.rightList = [];
+            } else {
+              this.rightList = res.subscribe_time_list.map(item=>{
+                return {
+                  ...item,
+                  name: item.time
+                }
+              })
+            }
+            this.dateSelectIndex = DIndex;
+            this.date = DItem.name;
+            this.dateItem = DItem;
+          })
+          return;
+        }
         this.rightList = DItem.item_list;
         this.dateSelectIndex = DIndex;
         // this.timeSelectIndex = 0;
@@ -291,6 +364,9 @@
        * @description 选择时间
        */
       handleSelectTime(TItem, TIndex) {
+        if(TItem.is_subscribe_full==='Y') {
+          return
+        }
         if (TIndex === this.timeSelectIndex) return;
         this.dateTime = `${this.date}  ${TItem.name}`;
         this.timeSelectIndex = TIndex;
@@ -337,7 +413,15 @@
 
       &-item {
         padding: unit(30, rpx);
-        border-bottom: unit(1, rpx) solid #f0f0f0
+        border-bottom: unit(1, rpx) solid #f0f0f0;
+        text-align: right;
+        &-full {
+          padding: 10rpx;
+          background: rgba(235, 11, 11, 0.149);
+          color: #F40808;
+          border-radius: 10rpx;
+          margin-left: 20rpx;
+        }
       }
     }
   }

package/src/components/JfbMallConfirm/orderMixin.js

@@ -157,6 +157,7 @@ export default {
     //创建其他订单 is_use_jfb_pay = "N"
     createOtherOrder(){
       let other = this.getCreateOrderParams();
+      let address_nnid_items = this.handleGetAddressItems();
       if(!other) return false;
       this.$xdShowLoading({})
       jfbRootExec("createOrder", {
@@ -169,6 +170,7 @@ export default {
           namespace: this.xnamespace,
           cart_order_id: this.order_id,
           address_nnid: this.curAddr ? this.curAddr.address_nnid : "",
+          address_nnid_items,
           notify_provider_id: this.projectAttr['notify_provider_id']
         }
       }).then(async res => {