jufubao-base 1.0.279-beta101 → 1.0.279-beta103

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

@@ -0,0 +1,327 @@
+'use strict';
+import {
+  dataVal,
+  statusDataVal,
+  statusShow,
+  cRaBorShadow
+} from "@/utils/AttrTools";
+
+export default (data, gValue, gColor, oldData) => {
+  let defListBorder = cRaBorShadow(data, 'listBorder', {}, gValue);
+  let defListShadow = cRaBorShadow(data, 'listShadow', { old: ['is_shadow', 'is_shadow_w', 'is_shadow_bg'] }, gValue);
+  return [
+    {
+      ele: 'title',
+      label: '内容区',
+      size: 'small',
+      groupKey: 'style',
+    },
+    {
+      label: '内边距',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'contentPaddingStatus',
+      value: statusDataVal({ data, key: 'contentPaddingStatus', fields: ['contentPadding'], gValue }),
+      labelInline: true,
+      list: [
+        { label: '默认', value: 'D' },
+        { label: '自定义', value: 'C' },
+      ]
+    },
+    { ele: 'group_start' },
+    {
+      label: '',
+      groupKey: 'style',
+      ele: 'xd-margin-padding',
+      valueKey: 'contentPadding',
+      value: dataVal({
+        data,
+        key: 'contentPadding',
+        dValue: { top: 36, bottom: 0, left: 20, right: 20 },
+        gValue,
+        isPM: true,
+      }),
+      setting: {
+        type: 'padding',
+      },
+      placeholder: '请填充设置',
+      hidden: !statusShow({ data, key: 'contentPaddingStatus', fields: ['contentPadding'], gValue }),
+    },
+    { ele: 'group_end' },
+    {
+      ele: 'title',
+      label: '企业列表样式',
+      size: 'small',
+      groupKey: 'style',
+    },
+    {
+      label: '内边距',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'listPaddingStatus',
+      value: statusDataVal({ data, key: 'listPaddingStatus', fields: ['listPadding'], gValue }),
+      labelInline: true,
+      list: [
+        { label: '默认', value: 'D' },
+        { label: '自定义', value: 'C' },
+      ]
+    },
+    { ele: 'group_start' },
+    {
+      label: '',
+      groupKey: 'style',
+      ele: 'xd-margin-padding',
+      valueKey: 'listPadding',
+      value: dataVal({
+        data,
+        key: 'listPadding',
+        dValue: { top: 40, bottom: 40, left: 32, right: 32 },
+        gValue,
+        isPM: true,
+      }),
+      setting: {
+        type: 'padding',
+      },
+      placeholder: '请填充设置',
+      hidden: !statusShow({ data, key: 'listPaddingStatus', fields: ['listPadding'], gValue }),
+    },
+    { ele: 'group_end' },
+    {
+      label: '行间距',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'listSpacingStatus',
+      value: statusDataVal({ data, key: 'listSpacingStatus', fields: ['listSpacing'], gValue }),
+      labelInline: true,
+      list: [
+        { label: '默认', value: 'D' },
+        { label: '自定义', value: 'C' },
+      ]
+    },
+    { ele: 'group_start' },
+    {
+      label: "间距",
+      groupKey: 'style',
+      ele: 'xd-slider',
+      valueKey: "listSpacing",
+      value: dataVal({ data, key: 'listSpacing', dValue: '24', gValue }),
+      hidden: !statusShow({ data, key: 'listSpacingStatus', fields: ['listSpacing'], gValue }),
+      className: "input100",
+      labelInline: true,
+      setting: {
+        min: 0,
+        max: 100,
+        step: 1,
+        showStops: false,
+        showInput: false,
+      }
+    },
+    { ele: 'group_end' },
+    {
+      label: '圆角',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'listRadiusStatus',
+      value: statusDataVal({ data, key: 'listRadiusStatus', fields: ['listRadius'], gValue }),
+      labelInline: true,
+      list: [
+        { label: '默认', value: 'D' },
+        { label: '无圆角', value: 'N' },
+        { label: '自定义', value: 'C' },
+      ]
+    },
+    { ele: 'group_start' },
+    {
+      label: "",
+      ele: 'xd-site-select-list',
+      valueKey: 'listRadius',
+      groupKey: 'style',
+      value: dataVal({
+        data,
+        key: 'listRadius',
+        dValue: '8',
+        gValue,
+      }),
+      placeholder: '请选择内容圆角设置',
+      multiple: false,
+      hidden: !statusShow({ data, key: 'listRadiusStatus', fields: ['listRadius'], gValue }),
+      className: 'input80',
+      handleCustom({ action, data }) {
+        XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
+          .then(res => {
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
+    { ele: 'group_end' },
+    {
+      label: '描边',
+      ele: 'xd-border',
+      labelInline: true,
+      groupKey: 'style',
+      valueKey: 'listBorder',
+      value: defListBorder,
+      setting: {
+        selected: defListBorder.type,
+        isRadio: true,//启用editx默认
+        isDef: true, //启动默认选项
+        //==设置默认值==
+        color: '#e5e5e5',
+        width: '0',
+        style: 'solid'
+        //==设置默认值==
+      },
+    },
+    {
+      label: '商品投影',
+      ele: 'xd-shadow',
+      labelInline: true,
+      groupKey: 'style',
+      valueKey: 'listShadow',
+      value: defListShadow,
+      className: 'input100',
+      setting: {
+        selected: defListShadow.type,
+        isRadio: true,
+        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([])
+          });
+      },
+    },
+    {
+      label: '文字',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'listFontStyleStatus',
+      value: statusDataVal({ data, key: 'listFontStyleStatus', fields: ['listFontStyle'], gValue }),
+      labelInline: true,
+      list: [
+        { label: '默认', value: 'D' },
+        { label: '自定义', value: 'C' },
+      ]
+    },
+    { ele: 'group_start' },
+    {
+      label: '',
+      ele: 'xd-text-and-bgc',
+      groupKey: 'style',
+      valueKey: 'listFontStyle',
+      value: dataVal({ data, key: 'listFontStyle', dValue: null, gValue }),
+      hidden: !statusShow({ data, key: 'listFontStyleStatus', fields: ['listFontStyle'], gValue }),
+      setting: {
+        fontSize: false,
+        weight: false,
+        selected: false,
+        bgColor: false,
+        default: {
+          color: '#333',
+        }
+      },
+      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' },
+    {
+      ele: 'title',
+      label: '添加企业样式',
+      size: 'small',
+      groupKey: 'style',
+    },
+    {
+      label: '背景',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'addBackgroundStatus',
+      value: statusDataVal({ data, key: 'addBackgroundStatus', fields: ['addBackground'], gValue }),
+      labelInline: true,
+      list: [
+        { label: '默认', value: 'D' },
+        { label: '自定义', value: 'C' },
+      ]
+    },
+    { ele: 'group_start' },
+    {
+      label: '背景颜色',
+      ele: 'xd-color',
+      labelInline: true,
+      valueKey: 'addBackground',
+      value: dataVal({ data, key: 'addBackground', dValue: '#F8F8F8', gValue }),
+      hidden: !statusShow({ data, key: 'addBackgroundStatus', fields: ['addBackground'], gValue }),
+      placeholder: '请选择背景颜色',
+      className: 'input80',
+      groupKey: 'style',
+      setting: {
+        showAlpha: true
+      },
+    },
+    { ele: 'group_end' },
+    {
+      label: '文字颜色',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'addFontStyleStatus',
+      value: statusDataVal({ data, key: 'addFontStyleStatus', fields: ['addFontStyle'], gValue }),
+      labelInline: true,
+      list: [
+        { label: '默认', value: 'D' },
+        { label: '自定义', value: 'C' },
+      ]
+    },
+    { ele: 'group_start' },
+    {
+      label: '',
+      ele: 'xd-text-and-bgc',
+      groupKey: 'style',
+      valueKey: 'addFontStyle',
+      value: dataVal({ data, key: 'addFontStyle', dValue: {}, gValue }),
+      hidden: !statusShow({ data, key: 'addFontStyleStatus', fields: ['addFontStyle'], gValue }),
+      setting: {
+        fontSize: false,
+        weight: false,
+        bgColor: false,
+        selected: false,
+        default: {
+          color: '#999999',
+        },
+        isBorder: false,
+      },
+      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' },
+  ]
+}

package/src/components/JfbBaseHeader/JfbBaseHeader.vue

@@ -502,6 +502,7 @@
             text-align: left;
             font-size: unit(28, rpx);
             padding-left: 20rpx;
+            .uni-cut(1,40);
           }
           .search_btn_in{
             height: 48rpx;

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -182,7 +182,6 @@
   import getServiceUrl from "@/common/getServiceUrl";
   import storage from "@/common/storage";
   import Color from "color";
-  const color = require('color');
   export default {
     name: "JfbBaseNotice",
     components: {
@@ -346,13 +345,13 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-        let colorBg = color(this.warningColor).alpha(0.1).array();
+        let colorBg = Color(this.warningColor).alpha(0.1).array();
         this.style = getContainerPropsValue(container, 'content.style', '1');
         this.time = Number(getContainerPropsValue(container, 'content.time', 3));
         this.textColor = getContainerPropsValue(container, 'content.textColor', this.warningColor);
         this.textAlign = getContainerPropsValue(container, 'content.textAlign', 'left');
         this.bgc = getContainerPropsValue(container, 'content.bgc', `rgba(${colorBg.join(',')})`);
-        this.borderTitleColor = color(this.bgc).lighten(.15).hex();
+        this.borderTitleColor = Color(this.bgc).lighten(.15).hex();
         this.margin = getContainerPropsValue(container, 'content.margin', {top: 0, left: 0, bottom: 0, right: 0});
         this.padding = getContainerPropsValue(container, 'content.padding', {top: 8, left: 10, bottom: 8, right: 10});
         this.scrollMargin =  getContainerPropsValue(container, 'content.scrollMargin', {});

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -160,7 +160,8 @@
           <view>{{ Ditem.value }}</view>
         </view>
       </view>
-        <view v-if="info.sub_orders && info.sub_orders.length > 0">
+        <!--mall code sub orders info-->
+        <view v-if="['none'].includes(code_location) && info.sub_orders && info.sub_orders.length > 0">
           <view
             :style="{
               background: backgroundColor,
@@ -249,6 +250,7 @@
             </view>
           </view>
         </view>
+        <!--mall code orders info-->
         <view
           v-if="info.settle_tag_info"
           class="jfb-base-order-detail__body-card jfb-base-order-detail__body-settle"
@@ -494,6 +496,7 @@
             </view>
           </view>
         </view>
+        <!--shop-->
         <view v-if="info.support_shops && is_show_support_shop === 'Y'">
           <view
             class="jfb-base-order-detail__body-card jfb-base-order-detail__body-jump"
@@ -528,13 +531,114 @@
             marginBottom: padding + 'rpx',
           }"
         >
-          <view class="jfb-base-order-detail__body-shop-title">
+          <view class="jfb-base-order-detail__body-shop-title" v-if="['none'].includes(code_location)">
             <view :style="{ background: mainColor }"></view>
             <view>{{ info.shop.layer_name }}</view>
           </view>
-          <view class="jfb-base-order-detail__body-shop-name">{{ info.shop.shop_name }}</view>
-          <view class="jfb-base-order-detail__body-shop-address">地址： {{ info.shop.shop_address }}</view>
+          <view class="order-shop">
+            <view>
+              <view :class="{top: ['top'].includes(code_location)}" class="jfb-base-order-detail__body-shop-name">{{ info.shop.shop_name }}</view>
+              <view class="jfb-base-order-detail__body-shop-address">地址： {{ info.shop.shop_address }}</view>
+            </view>
+            <view
+              @click="handleLocation(info.shop)"
+              v-if="['top'].includes(code_location)"
+            ><xd-font-icon icon="iconfabu" :color="mainColor" size="30"></xd-font-icon></view>
+          </view>
+
+        </view>
+        <!--shop-->
+        <!--food sub orders info-->
+        <view v-if="['top'].includes(code_location) &&  info.sub_orders && info.sub_orders.length > 0">
+          <view
+            :style="{
+              background: backgroundColor,
+              border: borderBox,
+              borderRadius: radius + 'rpx',
+              boxShadow: shadowBox,
+              marginBottom: padding + 'rpx',
+            }"
+            v-for="(item, index) in info.sub_orders"
+            :key="index"
+            class="jfb-base-order-detail__body-card jfb-base-order-detail__body-delivery"
+          >
+            <view class="jfb-base-order-detail__body-delivery-title">
+              <view>子订单号：{{ item.sub_order_id }}</view>
+              <view :style="{ color: mainColor }">{{item.status.status_name}}</view>
+            </view>
+            <view
+              style="border-bottom: 1px solid #eeeeee"
+              v-for="(Sitem, Sindex) in item.products"
+              :key="Sindex"
+            >
+              <view class="jfb-base-order-detail__body-delivery-content">
+                <xd-jfb-image
+                  width="200"
+                  height="200"
+                  bgc="#f8f8f8"
+                  radius="10"
+                  shadow="10"
+                  mode="scaleToFill"
+                  :src="Sitem.product_thumb"
+                ></xd-jfb-image>
+                <view class="jfb-base-order-detail__body-delivery-content-info">
+                  <view class="jfb-base-order-detail__body-delivery-content-info-name">{{ Sitem.product_name }}</view>
+                  <view v-if="Sitem.brand_name" class="brand-name" :style="{color:brandTextColor}">{{ Sitem.brand_name }}</view>
+                  <view
+                    v-if="Sitem.product_sku_name"
+                    class="jfb-base-order-detail__body-delivery-content-info-sku"
+                  >规格：{{ Sitem.product_sku_name }}</view>
+                  <view class="jfb-base-order-detail__body-delivery-content-info-price">
+                    <view :style="{ fontSize: '32rpx', color: mainColor }">
+                      <xd-unit
+                        :price="Sitem.sale_price"
+                        :color="mainColor"
+                        :fontSize="32"
+                        v-if="biz_code !== 'gift' || info.is_show_gift_price"
+                      ></xd-unit>
+                    </view>
+                    <view style="
+                        font-size: 28rpx;
+                        color: #999999;
+                        display: flex;
+                        align-items: center;
+                      ">x {{ Sitem.product_num }}</view>
+                  </view>
+                </view>
+              </view>
+              <view
+                class="jfb-base-order-detail__body-delivery-content-info-form"
+                v-for="(Fitem, Findex) in Sitem.product_form_data"
+                :key="Findex"
+                :style="{backgroundColor:noticeBgc,color: warningColor,borderRadius: radius + 'rpx',}"
+              >
+                <view> {{ Fitem.label }}： </view>
+                <view> {{ Fitem.value }} </view>
+              </view>
+            </view>
+            <view
+              class="jfb-base-order-detail__body-delivery-bottom"
+              v-if="item.info && item.info.length > 0"
+            >
+              <view class="jfb-base-order-detail__body-delivery-bottom-title">{{item.service_name}}</view>
+              <view
+                v-for="(Ditem, Dindex) in item.info"
+                :key="Dindex"
+                class="jfb-base-order-detail__body-delivery-bottom-item"
+                :style="{
+                  marginBottom: lineHeight + 'rpx'
+                }"
+              >
+                <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>
+        <!--food sub orders info-->
         <view
           :style="{
             background: backgroundColor,
@@ -962,6 +1066,8 @@ export default {
       showSupplement: false,
       supplementList: [],
       supplementTitle: "",
+
+      code_location:'none',
     };
   },
   watch: {
@@ -1033,6 +1139,15 @@ export default {
       this.getOrderDetail();
     },
 
+    handleLocation({shop_address,shop_name,shop_latitude,shop_longitude,...shop}){
+      this.handleOpenLocation({
+        address: shop_address,
+        name: shop_name,
+        latitude: shop_latitude,
+        longitude: shop_longitude
+      },()=>{})
+    },
+
     getAmount(price) {
       return this.$xdUniHelper.divisionFloatNumber(price,100)
     },
@@ -1075,6 +1190,9 @@ export default {
             return;
           }
 
+          //餐饮电子码
+          if(res['code_location']) this.code_location = res['code_location']
+
           this.biz_code = res.biz_code;
           this.is_not_show_price = res.is_not_show_price;
 
@@ -1558,6 +1676,32 @@ export default {
       line-height: 32rpx;
     }
 
+    .order-shop {
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+
+      & .top {
+        margin-top: 0!important;
+        margin-bottom: 10rpx!important;
+      }
+
+      & > view {
+        &:nth-child(1) {
+          flex: 1;
+        }
+        &:nth-child(2) {
+          flex-shrink: 0;
+          width: 80rpx;
+          height: 80rpx;
+          display: flex;
+          justify-content: flex-end;
+          align-items: center;
+        }
+      }
+    }
+
+
     color: #333;
     .logo-icon {
       width: unit(80, rpx) !important;
@@ -1831,7 +1975,7 @@ export default {
           }
         }
       }
-      
+
     }
 
 
@@ -1885,6 +2029,8 @@ export default {
     }
 
     &-shop {
+      padding-top: 20rpx;
+      padding-bottom: 20rpx;
       &-title {
         display: flex;
         align-items: center;
@@ -1906,7 +2052,7 @@ export default {
 
       &-name {
         color: #333333;
-        font-size: unit(36, rpx);
+        font-size: unit(32, rpx);
         margin-top: unit(24, rpx);
         margin-bottom: unit(24, rpx);
       }
@@ -1957,7 +2103,7 @@ export default {
         color: #737373;
       }
     }
- 
+
     &-order {
       display: flex;
       align-items: center;

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -130,14 +130,15 @@
             v-for="item in payChannels"
             :key="item.channel_provider_id"
             class="pay_item"
+            @click="handlerPayCheck(item.channel_provider_id)"
           >
             <view class="icon">
               <image mode="scaleToFill" :src="item['channel_logo']" style="height:64rpx; width: 64rpx" />
             </view>
             <view class="pay_name">{{ item.channel_provider_name }}</view>
             <xd-radio
-              @change="(flat) => handlerPayCheck(item.channel_provider_id, flat)"
               :value="channel_provider_id === item.channel_provider_id"
+              :isClickEvent="false"
               size="mini"
             ></xd-radio>
           </view>
@@ -358,6 +359,9 @@ export default {
       }).then((res) => {
         console.log("p_getListUserPayChannel", res);
         this.payChannels = res.list;
+        if(res.list.length > 0){
+          this.channel_provider_id = res.list[0].channel_provider_id
+        }
       });
     },
     p_getH5WxAuthorize() {
@@ -520,9 +524,8 @@ export default {
       });
       // #endif
     },
-    handlerPayCheck(channel_provider_id, flat) {
-      if (flat) this.channel_provider_id = channel_provider_id;
-      else this.channel_provider_id = "";
+    handlerPayCheck(channel_provider_id) {
+      this.channel_provider_id = channel_provider_id;
     },
 
     onJfbBack(options) {

package/src/components/JfbBaseWalletIndex/JfbBaseWalletIndex.vue

@@ -65,7 +65,7 @@
             @click="handleToWalletDetail(item)"
           >
             <view>{{ dividePrice(item.amount) }}</view>
-            <view :style="{ color: mainColor }">{{ item.wallet_name }}</view>
+            <view :style="{ color: mainColor }">{{ item.wallet_name }}<text v-if="item.customer_name">({{item.customer_name}})</text></view>
           </view>
         </view>
       </view>