jufubao-food 1.0.12-beta5 → 1.0.12-beta6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-food",
-  "version": "1.0.12-beta5",
+  "version": "1.0.12-beta6",
   "private": false,
   "description": "聚福宝业务组件餐饮插件包",
   "main": "index.js",

package/src/components/JfbFoodConfirmV2/Api.js

@@ -105,13 +105,21 @@ module.exports = [
   },
   {
     mapFnName: 'createFoodOrder',
-    title: '创建订单',
-    path: '/hourdash/v1/order/submit/:cart_order_id',
+    title: '餐饮 - 创建订单',
+    path: '/mall/v1/order/pre/submit',
     isRule: false,
     data: {
-      selected_card_list_json: ['被操作的卡券的卡号', 'String', '必选'],
-      buy_product: ['临时订单号', 'Number', '必选'],
-      need_pay_price: ['仍需支付金额', 'Number', '必选'],
+      pay_card_list: [
+        '被操作的卡券的卡号',
+        `[
+          {card_number:123,card_point:100,card_price:200},
+          {card_number:234,card_point:100,card_price:200,card_password:abc},
+          {card_number:456,card_point:100,card_price:200,qrcode:aaa}]`,
+        '必选',
+      ],
+      total_price: ['总金额', 'Number', '必选'],
+      main_order_id: ['main_order_id', 'number', '必选'],
+      notify_provider_id: ['notify_provider_id', 'String', '可选']
     },
     isConsole: true,
     disabled: true,

package/src/components/JfbFoodConfirmV2/JfbFoodConfirmV2.vue

@@ -93,15 +93,9 @@
         <xd-list-item label="商品价格" paddingLR="60rpx" size="small">
           <xd-unit :price="orderInfo.product_total_amount" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
         </xd-list-item>
-        <!-- <xd-list-item label="商品运费" paddingLR="60rpx" size="small">
-          <xd-unit :price="orderFee.user_logistics_amount_origin" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
-        </xd-list-item> -->
       </view>
       
       <view class="section">
-        <!-- <xd-list-item label="运费减免" :showBottom="!!showPayMethods.length" paddingLR="60rpx" size="small">
-          <xd-unit :largeZero="false" :price="-orderFee.user_logistics_discount_amount" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
-        </xd-list-item> -->
         <template v-for="item in otherPayMethod">
           <xd-list-item v-if="item.method === 'card'" :key="item.method" :label="item.show_name" paddingLR="60rpx" size="small" :showRight="!(choseCoupon && choseCoupon.cardPayPrice)" @click="toChoseCard">
             <view slot="label">{{item.show_name}} <text v-if="choseCard && choseCard.cardPayPrice" style="color:red;margin-left: 4px;">(已选{{ choseCard.selectedCardList.length }}张)</text></view>
@@ -278,11 +272,10 @@
         order_id: "", //订单ID
         comment: "", //订单备注
         buyer_phone_number: "", //订购人手机号
-        meal_method: "in_store", //订餐方式
+        meal_method: "", //订餐方式
         productList: [],
         orderInfo: {},
         shopInfo: {},
-        orderFee: {},
         otherPayMethod: [],
         otherPayLoaded: false,
         is_can_buy: "Y",
@@ -290,6 +283,7 @@
         vipCardList: [],
         vip_card_id: "",
         plus_saving_money: 0,
+        main_order_id: "",
         
         showDialogConfirmShop: false,
         showDialogChangeShop: false,
@@ -481,7 +475,9 @@
               is_show_price: this.showPrice,
               latitude: this.stateLocation.latitude,
               longitude: this.stateLocation.longitude,
-              vip_card_id: this.vip_card_id
+              card_id: this.vip_card_id,
+              meal_method: this.meal_method,
+              main_order_id: this.main_order_id
             }
           }).then(res => {
             this.$xdHideLoading();
@@ -493,39 +489,32 @@
         },150)
       },
       handlerConfirmRes(res){
-        this.is_first_use_card = res.is_first_use_card || "Y";
-        this.is_use_jfb_pay = res.is_use_jfb_pay || "Y";
+        // this.is_first_use_card = res.is_first_use_card || "Y";
+        // this.is_use_jfb_pay = res.is_use_jfb_pay || "Y";
         this.is_show_vip_card_list = res.is_show_vip_card_list;
 
+        // this.is_can_buy = res.is_can_buy;
+        let priceChange = this.orderInfo.real_total_amount && this.orderInfo.real_total_amount != res.order_info.real_total_amount;
+
         this.productList = res.product_infos;
         this.orderInfo = res.order_info;
         this.shopInfo = res.shop_info;
+        let mealMethods = res.shop_info.meal_method;
+        if(!this.meal_method && mealMethods.length){
+          this.meal_method = mealMethods[0].value;
+        }
+        this.plus_saving_money = res.plus_saving_money || 0;
+        this.main_order_id = res.order_info.main_order_id
 
-        // 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,
-        //   total_amount: res.total_amount,
-        //   user_logistics_discount_amount: res.user_logistics_discount_amount,
-        //   user_logistics_amount_origin: res.user_logistics_amount_origin,
-        //   product_amount: res.product_amount,
-        //   plus_saving_money: res.plus_saving_money,
-        //   origin_amount: res.origin_amount,
-        // }
         //支付方式跟用户相关，与订单无关。
         //只获取一次。
         if(!this.otherPayLoaded){
           this.p_getPayMethod(res.support_payment_methods);
         }
         //确认订单价格改变，清空选择
-        // if(priceChange){
-        //   this.clearCheckedWhenPriceChange();
-        // }
+        if(priceChange){
+          this.clearCheckedWhenPriceChange();
+        }
         if(res.vip_card_item){
           if(res.vip_card_item.is_can_buy === 'Y'){
             this.vip_card_id = res.vip_card_item.vip_card_id;
@@ -551,6 +540,7 @@
       },
       handleSelectMeal(method){
         this.meal_method = method;
+        this.p_getCartConfirm();
       },
       //确认订单价格改变，清空选择
       clearCheckedWhenPriceChange(){
@@ -609,7 +599,7 @@
       handleSwitchShop(){
         this.showDialogChangeShop = false;
         this.$xdUniHelper.navigateTo({
-          url: this.switchStorePath
+          url: this.switchStorePath + '?brand_id=' + this.shopInfo.brand_id,
         })
       },
       handleChangeStop(){
@@ -665,7 +655,7 @@
       //使用钱包跟票券一同支付
       useTickAndWalletPay(selected_card_list, selected_wallet_list){
         this.createSettleOrder({
-          total_price: this.orderFee.total_amount,
+          total_price: this.orderInfo.real_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,

package/src/components/JfbFoodConfirmV2/orderMixin.js

@@ -192,11 +192,11 @@ export default {
           ...options,
           ...other,
           namespace: this.xnamespace,
-          cart_order_id: this.order_id,
+          main_order_id: this.main_order_id,
           notify_provider_id: this.projectAttr['notify_provider_id'],
         }
       }).then(async res => {
-        successCb({...res, order_id: res.main_order_id })
+        successCb({...res, order_id: res.order_id })
         // setTimeout(() => {
         //   this.p_getOrderInfo(res, (res1) => {
         //     successCb(res1)

package/src/components/JfbFoodProductInfo/Attr.js

@@ -7,7 +7,19 @@ export default {
   style: [],
   content: (data) => {
     return [
-      
+      {
+        label: '商品列表页',
+        ele: 'xd-select-pages-path',
+        valueKey: 'foodProductListPath',
+        placeholder: '请选择商品列表页跳转地址',
+        value: data.foodProductListPath || null,
+        labelInline: true,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        groupKey:'advanced',
+        className: 'input100',
+      },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbFoodProductInfo/JfbFoodProductInfo.vue

@@ -132,6 +132,7 @@
         bottomBtnFill: "",
         bottomPadding: {},
         bottomBtnOrder: "",
+        foodProductListPath: "",
       }
     },
     computed: {
@@ -206,6 +207,7 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
+        this.foodProductListPath = getContainerPropsValue(container, 'content.foodProductListPath', {value: ""}).value;
         this.shopBtnBgColor = gCPVal(container, 'shopBtnBgColor', this.mainColor, {sKey:'cartBtnStatus',fields:['shopBtnBgColor']});
       },
       handleSkuChange(sku){
@@ -267,7 +269,14 @@
             }
           }
         }).then(res => {
-          this.onJfbBack(res);
+          //判断是否有上一页，如果有则返回上一页
+          if(getCurrentPages().length > 1){
+            this.$xdUniHelper.navigateBack();
+          }else{
+            this.$xdUniHelper.redirectTo({
+              url: this.foodProductListPath + `?resource_shop_id=${this.baseInfo.resource_shop_id}`,
+            })
+          }
         })
       },
       animationfinish(e) {
@@ -298,7 +307,6 @@
       },
       onJfbBack(options) {
         if(this.$configProject["isPreview"]) return;
-        this.$xdUniHelper.navigateBack();
       },
       onJfbUpdate(...data) {
         console.log('event.onJfbUpdate', data)

package/src/components/JfbFoodProductList/JfbFoodProductList.vue

@@ -19,7 +19,7 @@
       <view class="shop_info" :style="{top: layoutInfo.top+'rpx'}" @click="handleSwitchShop">
         <view class="flex-center">
           <xd-font-icon icon="icona-Buy2"  size="36" style="margin-right: 8rpx;"></xd-font-icon>
-          {{ shopInfo.shop_name }} <text style="margin:0 20rpx;">|</text> <text class="_distance">{{ shopInfo.distance }}</text>
+          <view class="shop_name">{{ shopInfo.shop_name }}</view><text style="margin:0 20rpx;">|</text> <text class="_distance">{{ shopInfo.distance }}</text>
         </view>
         <view>
           <xd-font-icon icon="iconxiangyou_xian" color="#666666" size="28"></xd-font-icon>
@@ -91,7 +91,7 @@
           <xd-unit :price="cartPrice" :isOld="false"></xd-unit>
         </view>
         <view>
-          <xd-button width="200rpx" size="small" type="primary" @click="handleSubmitCart">选好了</xd-button>
+          <xd-button width="200rpx" size="small" type="primary" :disabled="!cartProductList.length" @click="handleSubmitCart">选好了</xd-button>
         </view>
       </view>
       <view class="cart_product_modal" v-if="cartProductShow">
@@ -197,7 +197,7 @@
         //商品列表
         column_num: 1,
         skeNumber:10,
-        rowSpacing:20,
+        rowSpacing: 16,
         columnSpacing:20,
         listPadding:{},
         productConfig:{},
@@ -226,7 +226,7 @@
         return {
           backgroundColor: this.itemBgcColor,
           marginBottom: this.rowSpacing + 'rpx',
-          padding: '20rpx',
+          padding: '16rpx',
           borderRadius: '16rpx',
         }
       },
@@ -272,7 +272,8 @@
         this.foodDetailPath = getContainerPropsValue(container, 'content.foodDetailPath', {value: "/Smallline/food/pinfo"}).value;
         this.confirmPath = getContainerPropsValue(container, 'content.confirmPath', {value: "/Smallline/food/confirmv2"}).value;
         this.switchStorePath = getContainerPropsValue(container, 'content.switchStorePath', { value: ''}).value;
-        this.productConfig = this.getProductConfig(container);
+        // this.productConfig = this.getProductConfig(container);
+        this.productConfig = this.getProductConfig(container,{cartStyle:'iconaddcart'});
       },
       handleCartNumChange(val, prod){
         console.log("handleCartNumChange", val, prod)
@@ -304,7 +305,7 @@
       },
       handleSwitchShop(){
         this.$xdUniHelper.navigateTo({
-          url: this.switchStorePath,
+          url: this.switchStorePath + "?brand_id=" + this.shopInfo.brand_id,
         })
       },
       p_getFoodShopDetail(){
@@ -578,6 +579,7 @@
         })
       },
       handleSubmitCart(){
+        if(this.cartProductList.length === 0) return;
         jfbRootExec("submitFoodCart", {
           vm: this,
           data: {
@@ -649,17 +651,24 @@
           font-size: 24rpx;
           color: #666666;
         }
+        .shop_name{
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          max-width: 460rpx;
+          flex: 1;
+        }
       }
       .section_main{
         display: flex;
-        padding-top: 20rpx;
+        padding-top: 16rpx;
         box-sizing: border-box;
         .left_nav{
           width: 160rpx;
           background-color: #FFFFFF;
           font-size: 24rpx;
           border-radius: 16rpx;
-          margin-left: 20rpx;
+          margin-left: 16rpx;
           .nav_item{
             padding: 24rpx;
             text-align: center;
@@ -693,13 +702,13 @@
         }
         .right_product{
           flex: 1;
-          margin: 0 20rpx;
+          margin: 0 16rpx;
 
           .product_group{
             .group_title{
               font-size: 24rpx;
               background-color: #FFFFFF;
-              margin-bottom: 20rpx;
+              margin-bottom: 16rpx;
               height: 64rpx;
               line-height: 64rpx;
               text-align: center;

package/src/components/JfbFoodProductList/cusAttr/content.js

@@ -7,8 +7,16 @@ import {
   cusDisabled ,
   getCustomAttr,
 } from "@/utils/AttrTools";
+import ProductAttr from "@/utils/Attr/ProductAttr";
 
 export default function (data, gValue,gColor,oldData){
+  //类型
+  let titleFooterStyle = 'line-6-8-s';
+  if(data['titleFooterStyle'] &&
+    ['line-6-8-l','line-6-8-s', 'triangle', 'center', 'desc', 'none'].includes(data['titleFooterStyle'])
+  ){
+    titleFooterStyle = data['titleFooterStyle'];
+  }
 
   return [
     {
@@ -36,5 +44,96 @@ export default function (data, gValue,gColor,oldData){
           .catch();
       }
     },
+
+    {
+      ele: 'title',
+      label: '组件样式',
+      size: 'small',
+      groupKey:'content',
+    },
+    {
+      label: "列表布局",
+      ele: "xd-style-image",
+      groupKey: 'content',
+      valueKey: "row_num",
+      value: dataVal({data, key:'row_num', dValue:2, gValue}),
+      labelInline:true,
+      className: 'input100',
+      handleCustom(cusRes) {
+        XdBus.getParentApi('getCompStylesOptions')({
+          layout_ids: 'FzCwxOH7MQpT5ISYs8Xm6',
+          key: Date.now()
+        })
+          .then(res => {
+            res.list.map(item=>{
+              item.value = Number(item.value)
+              return item;
+            })
+            cusRes.data.cb(res)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
+    {
+      label: "商品样式",
+      ele: "xd-style-image",
+      groupKey: 'content',
+      valueKey: "productStyle",
+      cusStyle:{marginBottom: '5px'},
+      value: customVal({
+        data,
+        key: 'productStyle',
+        fields: { 'itemBgcColorStatus':['itemBgcColor'],'bgBorder':['contBorder','bs']},
+        gValue,
+        sValue:"{\"border\":0,\"backgroundColor\":\"#fff\"}",
+      }),
+      labelInline:true,
+      className: 'input100',
+      isTplRef:true,
+      handleCustom(cusRes) {
+        XdBus.getParentApi('getCompStylesOptions')({
+          layout_ids: 'Y4oxNuIUOgVMaTD1LeWxp',
+          key: Date.now()
+        })
+          .then(res => {
+            cusRes.data.cb(res)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
+    {
+      label: "分类样式",
+      ele: "xd-style-image",
+      groupKey: 'content',
+      valueKey: "titleFooterStyle",
+      value: titleFooterStyle,
+      labelInline:true,
+      hidden: !(dataVal({data, key:'navStatus', dValue:'Y', gValue}) === 'Y'),
+      cusStyle:{marginBottom: '0'},
+      className: 'input100',
+      handleCustom(cusRes) {
+        XdBus.getParentApi('getCompStylesOptions')({
+          layout_ids: 'GRiS78vhPtfNXlac1WA63',
+          filter: false,
+        })
+          .then(res => {
+            cusRes.data.cb(res)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
+    {
+      ele: 'title',
+      label: '展示内容',
+      size: 'small',
+      groupKey:'content',
+    },
+    ...ProductAttr(data,gValue,gColor,oldData),
   ].filter(i=>i)
 }

package/src/components/JfbFoodProductList/cusAttr/style.js

@@ -11,8 +11,176 @@ import {
   cRaBorShadow,
   isDefStatus
 } from "@/utils/AttrTools";
+import productStyle from "@/utils/Attr/productStyle";
 const Color = require('color');
 
 export default function (data={},gValue={},gColor={},oldData) {
-  return []
+  //导航投影设置
+  let titleTabShadowExt = {dValue:'N'};
+  if(gValue.isAdd === true && gValue.isFirst)   titleTabShadowExt =  {dValue:'D'};
+  let titleTabShadow = cRaBorShadow(data , 'titleTabShadow',titleTabShadowExt, gValue);
+
+  return [
+    {
+      ele: 'title',
+      label: '常规',
+      size: 'small',
+      groupKey:'style',
+    },
+    {
+      label: '外边距',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'bodyPaddingStatus',
+      value: statusDataVal({data, key:'bodyPaddingStatus', fields:['bodyPadding'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-margin-padding',
+      groupKey:'style',
+      valueKey: 'bodyPadding',
+      hidden:!statusShow({data, key: 'bodyPaddingStatus', fields:['bodyPadding'], gValue}),
+      value: dataVal({
+        data,
+        key:'bodyPadding',
+        dValue:[0],
+        gValue,
+        isPM: true,
+        isCPM: true,
+      }),
+      setting: {
+        type: 'margin',
+      },
+    },
+    {ele: 'group_end'},
+    ...productStyle(data, gValue, gColor, oldData),
+
+    {
+      ele: 'title',
+      label: '分类导航样式',
+      size: 'small',
+      groupKey:'style',
+    },
+    {
+      label: '导航背景',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'titleBgcColorStatus',
+      value: statusDataVal({data, key: 'titleBgcColorStatus', fields:['titleBgcColor'], gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-color',
+      labelInline: true,
+      valueKey: 'titleBgcColor',
+      value: dataVal({
+        data,
+        key:'titleBgcColor',
+        dValue:'#fff',
+        gValue
+      }),
+      hidden: !statusShow({data, key: 'titleBgcColorStatus', fields:['titleBgcColor'], gValue}),
+      placeholder: '请选择背景颜色',
+      classNmae: 'input80',
+      groupKey:'style',
+      setting: {
+        showAlpha: true
+      },
+    },
+    {ele: 'group_end'},
+    {
+      label: '导航名称',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'titleStyleStatus',
+      value: statusDataVal({data, key:'titleStyleStatus', fields:['titleStyle','titleColor'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-text-and-bgc',
+      groupKey:'style',
+      valueKey: 'titleStyle',
+      value: dataVal({data, key:'titleStyle', dValue:null, gValue}),
+      hidden: !statusShow({data, key: 'titleStyleStatus', fields:['titleStyle','titleColor'], gValue}),
+      labelInline:true,
+      isRefresh: true,
+      setting: {
+        fontSize: true,
+        weight:true,
+        bgColor:(dataVal({data, key:'titleFooterStyle', dValue:'', gValue}) === 'desc'),
+        selected:true,
+        default:{
+          color: data['titleColor'] || '#333',
+          actColor: gColor.mainColor,
+          fontSize: '30',
+          actFontSize: '30', //'', 20 , 26 ,28,30, 36 默认值：''=>24
+          fontWeight: '500',
+          actFontWeight: '500',
+          actBgColor: "",
+          bgColor: ""
+        }
+      },
+      handleCustom({action, data}) {
+        XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
+          .then(res => {
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+            data.cb([])
+          });
+      },
+    },
+    {ele: 'group_end'},
+    {
+      label: '导航投影',
+      ele: 'xd-shadow',
+      labelInline: true,
+      groupKey:'style',
+      valueKey: 'titleTabShadow',
+      value: titleTabShadow,
+      className: 'input100',
+      setting: {
+        selected: titleTabShadow.type,//设置默认选中项
+        isRadio:true,//启用editx默认
+        isDef: true,//启动默认选项
+        //设置默认值
+        default: {
+          color: 'rgba(0,0,0,.05)',
+          width: '10',
+        }
+      },
+      handleCustom({action, data}) {
+        XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+          .then(res => {
+            res.list = res.list.filter(item=>{
+              return item.label !== '无';
+            });
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+            data.cb([])
+          });
+      },
+    },
+  ].filter(i=>i)
 }