jufubao-mall 2.0.46-beta2 → 2.0.46-beta4

package/package.json

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

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -87,7 +87,7 @@
                 <xd-list-item v-if="shop.sub_show_delivery_price==='Y'" label="配送费用" showBottom :paddingLR="isCardLayout ? '32rpx' : '48rpx'" paddingTB="24rpx" class="xd-my-list-item">
                   <xd-unit :price="shop.user_logistics_amount_origin" :fontSize="28" :isOld="false"></xd-unit>
                 </xd-list-item>
-                <xd-list-item v-if="shop.deliveryPickValue === 'samecity' && shop.sub_show_delivery_time !== 'N'" class="xd-my-list-item"
+                <xd-list-item v-if="shop.deliveryPickValue === 'samecity'" class="xd-my-list-item"
                   :label="shop.time_label" showRight :paddingLR="isCardLayout ? '32rpx' : '48rpx'" paddingTB="24rpx" showBottom
                   @click="toSetSelectTime(shopIndex,shop)">
                   {{shop.selectTime ? shop.selectTime.dateTime : "请选择"}}
@@ -1196,6 +1196,7 @@
         }
         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'){
@@ -1212,9 +1213,7 @@
             }
           }else if(item.deliveryPickValue === 'samecity'){
             if(!item.selectTime){
-              if(item.sub_show_delivery_time !== 'N'){
-                err_text = `请选择${item.time_label}`;
-              }
+              err_text = `请选择${item.time_label}`;
             }else{
               result['date'] = item.selectTime.dateItem.date;
               result['hourSpan'] = item.selectTime.dateTimeItem.name;

package/src/components/JfbMallMarketNew/Api.js

@@ -0,0 +1,58 @@
+'use strict';
+/**
+ * @description  接口配置，
+ * 在设置方法名字当时候，别忘记加上【模块名字】：Market
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    //设置方法名字当别忘记加上【模块名字】：Market
+    mapFnName: 'getMarketByIdFilmSquate',
+    title: '获取电影广场列表',
+    path: '/api/account/film/list-film-square',
+    isRule: false,
+    params: {
+      last_key: ['当前页', 'Number', '必选'],
+      page_size: ['每页数量', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    //设置方法名字当别忘记加上【模块名字】：Market
+    mapFnName: 'updateMarketFilmPaiqiDate',
+    title: '更新排期',
+    path: '/api/account/film/paiqi-date',
+    isRule: false,
+    params: {
+      film_id: ['电影id', 'Number', '必选'],
+      cinema_id: ['影院id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    //设置方法名字当别忘记加上【模块名字】：Market
+    mapFnName: 'removeMarketFilmAddress',
+    title: '删除我的配送地址',
+    path: '/api/account/film/paiqi-date',
+    isRule: false,
+    params: {
+      film_id: ['电影id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    //设置方法名字当别忘记加上【模块名字】：Market
+    mapFnName: 'addMarketFilmcart',
+    title: '添加购物车',
+    path: '/api/account/film/paiqi-date',
+    isRule: false,
+    params: {
+      film_id: ['电影id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+];

package/src/components/JfbMallMarketNew/Attr.js

@@ -0,0 +1,48 @@
+'use strict';
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style: [],
+  content: (data) => {
+    return [
+      {
+        label: '背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'bgColor',
+        value: data.bgColor || '',
+        placeholder: '请输入占位框背景颜色',
+        groupKey:'content',
+      },
+      {
+        label: '选中路径:',
+        groupKey:'advanced',
+        className: 'input100',
+        ele: 'xd-select-pages-path',
+        valueKey: 'select-pages-path',
+        value: data['select-pages-path'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
+      },
+      data.bgColor && {
+        label: '高度:',
+        ele: 'el-input',
+        groupKey:'style',
+        type: 'number',
+        valueKey: 'height',
+        value: data.height || 100,
+        placeholder: '请输入占位框高度，单位像素，默认：10px',
+        className: 'input60',
+      },
+      {
+        label: '', //label
+        groupKey:'advanced',
+        ele: 'slot', //package 名称
+        slot: 'is_reference',
+      },
+    ].filter(i=>i)
+  },
+  advanced: [],
+};

package/src/components/JfbMallMarketNew/JfbMallMarketNew.vue

@@ -0,0 +1,113 @@
+<template>
+  <view
+    class="jfb-mall-market-new"
+    @click="handleEditxSelect"
+    :class="{ editx : isEditx && active }"
+  >
+    <!--#ifdef H5-->
+    <view
+      class="jfb-mall-market-new__edit"
+      :class="{ editx : isEditx && active }"
+      v-if="isEditx && active"
+    >
+      <view class="jfb-mall-market-new__edit-icon" @click.stop="delEdit">
+        <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
+      </view>
+    </view>
+    <!-- #endif -->
+    <view class="jfb-mall-market-new__body">
+      <view>营销组件（综合）</view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import { jfbRootExec } from "@/utils/xd.event";
+  import JfbMallMarketNewMixin from "./JfbMallMarketNewMixin";
+  import { getContainerPropsValue } from "@/utils/xd.base";
+  import componentsMixins from "@/mixins/componentsMixins";
+  import extsMixins from "@/mixins/extsMixins";
+  export default {
+    name: "JfbMallMarketNew",
+    components: {
+      XdFontIcon
+    },
+    mixins: [
+      componentsMixins, extsMixins, JfbMallMarketNewMixin
+    ],
+    data() {
+      return {
+
+        //todo
+      }
+    },
+    watch: {
+      container(value, oldValue) {
+        if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
+      },
+    },
+    created() {
+      this.init(this.container);
+
+      //todo
+    },
+    methods: {
+      onJfbLoad(options) {
+
+        // jfbRootExec('baiduUserLogin', {
+
+        //   vm: this,//   data: {
+
+        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
+
+        //   }
+
+        // }).then().catch()
+      },
+      /**
+       * @description 监听事件变化
+       * @param container {object} 业务组件对象自己
+       */
+      init(container) {
+
+        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
+
+        //this.height = getContainerPropsValue(container, 'content.height', 10);
+      },
+      onJfbScroll(options) {
+        console.log('event.onJfbScroll', options)
+      },
+      onJfbReachBottom(options) {
+        console.log('event.onJfbReachBottom', options)
+      },
+      onJfbShow(options) {
+        console.log('event.onJfbShow', options)
+      },
+      onJfbHide(options) {
+        console.log('event.onJfbHide', options)
+      },
+      onJfbBack(options) {
+        console.log('event.onJfbBack', options)
+      },
+      onJfbUpdate(...data) {
+        console.log('event.onJfbUpdate', data)
+      },
+      onJfbCustomEvent(options) {
+        console.log('event.onJfbReachBottom', options)
+      },
+    }
+  }
+
+</script>
+
+<style scoped lang="less">
+  @import "./JfbMallMarketNewLess.less";
+
+  .jfb-mall-market-new {
+    &__body{
+
+    }
+  }
+</style>

package/src/components/JfbMallMarketNew/JfbMallMarketNewLess.less

@@ -0,0 +1,80 @@
+/**
+* @desc 获取绝对路径完整地址
+* @param @path
+**/
+//例如：https://image.jufubao.cn/20220501010108/image/bg/default_gonghui_bg.png
+@basePath: 'business/';
+@doMain: '//sandbox-img.jufubao.cn/';
+
+.getBusinessImageUrl(@path, @size: 'size8') {
+  @url: "@{doMain}@{basePath}@{path}?x-oss-process=style/@{size}";
+  background-image: url(@url);
+}
+
+//start
+.jfb-mall-market-new {
+  box-sizing: border-box;
+
+  &__body{
+      position: relative;
+      overflow: hidden;
+      z-index: 2
+  }
+
+  &.editx,&.editx:hover {
+    position: relative;
+    min-height: unit(100, rpx);
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: var(--preview-z-index);
+      cursor: pointer;
+    }
+
+  }
+
+
+  &__edit {
+    cursor: pointer;
+    position: absolute;
+    right: unit(0, rpx);
+    top: unit(0, rpx);
+    height: unit(50, rpx);
+    z-index: 100;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: rgba(0, 0, 0, .4);
+    border-radius: 0 0 0 20rpx;
+    box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
+    color: #fff;
+    font-size: unit(22, rpx);
+    padding: 0 6rpx 0 6px;
+
+    &-icon{
+      padding: 0 unit(20, rpx);
+    }
+
+    &.editx {
+      box-sizing: border-box;
+
+    }
+  }
+}
+//end
+
+
+/**notPreview**/
+.jfb-mall-market-new {
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
+}
+/**endNotPreview**/

package/src/components/JfbMallMarketNew/JfbMallMarketNewMixin.js

@@ -0,0 +1,30 @@
+'use strict';
+
+
+//@AttrImport
+import Attr from "./Attr";
+//@EndAttrImport
+
+
+export default {
+  data() {
+    return {
+      //#ifdef H5
+      
+      //@AttrData
+      Attr:{}, //对外开发编辑属性
+      //@EndAttrData
+      
+      // #endif
+      cssRoot: 'jfb-mall-market-new'
+    }
+  },
+  created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
+  },
+}

package/src/components/JfbMallMarketNew/Mock.js

@@ -0,0 +1,13 @@
+'use strict';
+
+module.exports = {
+  
+  getMarketByIdFilmSquate:{},
+  
+  updateMarketFilmPaiqiDate:{},
+  
+  removeMarketFilmAddress:{},
+  
+  addMarketFilmcart:{},
+  
+}

package/src/components/JfbMallProductInfo/XdSku.vue

@@ -499,7 +499,7 @@ export default {
         .map((item) => ({ name: item.name, value: item.values[item.checked] }));
       // console.log(JSON.stringify(otherChecked), 'otherChecked')
       //没有选中任何其它sku，所有都可以选，直接返回true
-      // if (otherChecked.length === 0) return true;
+      if (otherChecked.length === 0) return curSku.enabled;
 
       /**
        * skuArr （当前 + 已选中）sku列表