jufubao-third 1.0.22-beta4 → 1.0.22-beta6

package/.claude/settings.local.json

@@ -0,0 +1,12 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(node -e ' *)",
+      "Bash(npx esbuild *)",
+      "Bash(npx vue-template-compiler *)",
+      "Bash(node -e \"const fs=require\\('fs'\\);const compiler=require\\('/Users/zxd/Workspaces/jufubao-third/node_modules/@vue/compiler-sfc'\\);const {parse,compileTemplate}=compiler;const r=parse\\(fs.readFileSync\\('/Users/zxd/Workspaces/jufubao-third/src/components/JfbThirdRideLand/JfbThirdRideLand.vue','utf8'\\)\\);const t=compileTemplate\\({source:r.descriptor.template.content,filename:'x.vue'}\\);console.log\\(t.errors.length===0?'Vue template OK':'ERR '+JSON.stringify\\(t.errors\\)\\)\")",
+      "Bash(node *)",
+      "Bash(grep -i \"^vue$\")"
+    ]
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-third",
-  "version": "1.0.22-beta4",
+  "version": "1.0.22-beta6",
   "private": false,
   "description": "聚福宝业务组件第三方购物平台包",
   "main": "index.js",

package/src/components/JfbThirdRideLand/Api.js

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

package/src/components/JfbThirdRideLand/Attr.js

@@ -0,0 +1,17 @@
+'use strict';
+
+import style from "./cusAttr/style";
+import advanced from "./cusAttr/advanced";
+import content from "./cusAttr/content";
+
+export default {
+  style: [],
+  advanced: [],
+  content: (data, gValue, gColor, oldData = {}) => {
+    return [
+      ...content(data, gValue, gColor, oldData),
+      ...style(data, gValue, gColor, oldData),
+      ...advanced(data, gValue, gColor, oldData),
+    ].filter(i => i)
+  },
+}

package/src/components/JfbThirdRideLand/JfbThirdRideLand.vue

@@ -0,0 +1,257 @@
+<template>
+  <view
+    class="jfb-third-ride-land"
+    :style="bgStyle"
+    @click="handleEditxSelect"
+    :class="{ editx : isEditx && active }"
+  >
+    <!--#ifdef H5-->
+    <view
+      class="jfb-third-ride-land__edit"
+      :class="{ editx : isEditx && active }"
+      v-if="isEditx && active"
+    >
+      <view class="jfb-third-ride-land__edit-icon" @click.stop="delEdit">
+        <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
+      </view>
+    </view>
+    <!-- #endif -->
+    <view class="jfb-third-ride-land__body" :style="bodyStyle">
+      <!-- 内容卡片 -->
+      <view class="jfb-third-ride-land__card" :style="cardStyle">
+        <xd-content-xss
+          v-if="contentHtml"
+          :html="contentHtml"
+        ></xd-content-xss>
+        <!-- 编辑预览态的占位提示 -->
+        <view v-else-if="isEditx && active" class="jfb-third-ride-land__card-placeholder">
+          服务须知内容为空，请在右侧属性面板编辑富文本内容
+        </view>
+      </view>
+
+      <!-- 底部按钮 -->
+      <view
+        class="jfb-third-ride-land__btn"
+        :class="{ 'jfb-third-ride-land__btn--disabled': btnDisabled }"
+        @click="handleBtnClick"
+      >
+        <text class="jfb-third-ride-land__btn-text">{{ btnText }}{{ countdownText }}</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import XdContentXss from "@/components/XdContentXss/XdContentXss";
+  import { gCPVal } from "@/utils/xd.base";
+  import componentsMixins from "@/mixins/componentsMixins";
+  import extsMixins from "@/mixins/extsMixins";
+  import getServiceUrl from "@/common/getServiceUrl";
+  export default {
+    name: "JfbThirdRideLand",
+    components: {
+      XdFontIcon,
+      XdContentXss
+    },
+    mixins: [
+      componentsMixins, extsMixins
+    ],
+    data() {
+      return {
+        xnamespace: '',
+        //内容
+        contentHtml: '',
+        btnText: '我已知晓',
+        btnLink: null,
+        countdown: 0,
+        countdownLeft: 0,
+        countdownTimer: null,
+        //样式
+        bgColor: '',
+        bgImage: '',
+        margin: {},
+        padding: {},
+        radius: 24,
+      }
+    },
+    computed: {
+      //页面背景（背景图 + 背景色）
+      bgStyle(){
+        let style = {};
+        if(this.bgColor) style.backgroundColor = this.bgColor;
+        if(this.bgImage) {
+          style.backgroundImage = `url(${getServiceUrl(this.bgImage)})`;
+          style.backgroundSize = '100% 100%';
+          style.backgroundPosition = 'center';
+          style.backgroundRepeat = 'no-repeat';
+        }
+        return style;
+      },
+      //外边距
+      bodyStyle(){
+        return {
+          padding: this.getMarginAndPadding(this.margin, 32)
+        }
+      },
+      //内容卡片
+      cardStyle(){
+        return {
+          padding: this.getMarginAndPadding(this.padding, 32),
+          borderRadius: this.radius + 'rpx'
+        }
+      },
+      //按钮是否处于倒计时禁用状态
+      btnDisabled(){
+        return this.countdownLeft > 0;
+      },
+      //倒计时文案
+      countdownText(){
+        return this.btnDisabled ? ` (${this.countdownLeft}s)` : '';
+      }
+    },
+    watch: {
+      container(value, oldValue) {
+        if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
+      },
+    },
+    created() {
+      this.init(this.container);
+    },
+    beforeDestroy() {
+      this.clearCountdown();
+    },
+    methods: {
+      /**
+       * @description 监听事件变化
+       * @param container {object} 业务组件对象自己
+       */
+      init(container) {
+        //内容
+        this.xnamespace = gCPVal(container, 'xnamespace', '');
+        this.contentHtml = gCPVal(container, 'contentHtml', '');
+        this.btnText = gCPVal(container, 'btnText', '我已知晓');
+        this.btnLink = gCPVal(container, 'btnLink', {value: ''});
+        this.countdown = gCPVal(container, 'countdown', 0);
+        //样式
+        this.bgColor = gCPVal(container, 'bgColor', '');
+        let bgImageVal = gCPVal(container, 'bgImage', {});
+        this.bgImage = bgImageVal && bgImageVal.url ? bgImageVal.url : '';
+        this.margin = gCPVal(container, 'margin', 32, {sKey: 'marginStatus', fields: ['margin'], isPM: true});
+        this.padding = gCPVal(container, 'padding', 32, {sKey: 'paddingStatus', fields: ['padding'], isPM: true});
+        this.radius = gCPVal(container, 'radius', 24, {sKey: 'radiusStatus', fields: ['radius']});
+        //启动倒计时
+        this.startCountdown();
+      },
+      /**
+       * @description 开始倒计时
+       */
+      startCountdown(){
+        this.clearCountdown();
+        let count = Number(this.countdown) || 0;
+        if(count <= 0) return;
+        this.countdownLeft = count;
+        this.countdownTimer = setInterval(() => {
+          this.countdownLeft--;
+          if(this.countdownLeft <= 0) this.clearCountdown();
+        }, 1000);
+      },
+      /**
+       * @description 清除倒计时
+       */
+      clearCountdown(){
+        if(this.countdownTimer) {
+          clearInterval(this.countdownTimer);
+          this.countdownTimer = null;
+        }
+        this.countdownLeft = 0;
+      },
+      /**
+       * @description 点击按钮，倒计时结束后跳转配置的链接
+       */
+      handleBtnClick(){
+        if (this.$configProject['isPreview']) return;
+        if(this.btnDisabled) return;
+        let url = this.btnLink && this.btnLink.value ? this.btnLink.value : '';
+        if(!url) return;
+        this.$xdUniHelper.navigateTo({ url });
+      },
+      onJfbLoad() {
+        // 倒计时依赖配置属性，已在 init 中启动
+      },
+      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 "./JfbThirdRideLandLess.less";
+
+  .jfb-third-ride-land {
+    min-height: 100vh;
+
+    &__body {
+      box-sizing: border-box;
+    }
+
+    //内容卡片
+    &__card {
+      position: relative;
+      box-sizing: border-box;
+      background: #FFFFFF;
+      border-radius: 24rpx;
+
+      &-placeholder {
+        font-size: 26rpx;
+        color: #CCCCCC;
+      }
+    }
+
+    //底部按钮
+    &__btn {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 448rpx;
+      margin: 48rpx auto 0;
+      padding: 26rpx 0;
+      background: #3A7BFB;
+      border-radius: 60rpx;
+
+      &--disabled {
+        background: #E6E6E9;
+
+        .jfb-third-ride-land__btn-text {
+          color: #999999;
+        }
+      }
+    }
+
+    &__btn-text {
+      color: #FFFFFF;
+      font-size: 28rpx;
+      letter-spacing: 2rpx;
+    }
+  }
+</style>

package/src/components/JfbThirdRideLand/JfbThirdRideLandLess.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-third-ride-land {
+  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-third-ride-land {
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
+}
+/**endNotPreview**/

package/src/components/JfbThirdRideLand/JfbThirdRideLandMixin.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-third-ride-land'
+    }
+  },
+  created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
+  },
+}

package/src/components/JfbThirdRideLand/Mock.js

@@ -0,0 +1,13 @@
+'use strict';
+
+module.exports = {
+  
+  getRideByIdFilmSquate:{},
+  
+  updateRideFilmPaiqiDate:{},
+  
+  removeRideFilmAddress:{},
+  
+  addRideFilmcart:{},
+  
+}

package/src/components/JfbThirdRideLand/cusAttr/advanced.js

@@ -0,0 +1,22 @@
+'use strict';
+
+export default (data, gValue, gColor, oldData) => {
+  return [
+    //高级
+    {
+      label: '按钮跳转链接',
+      groupKey:'advanced',
+      className: 'input100',
+      ele: 'xd-select-pages-path',
+      valueKey: 'btnLink',
+      placeholder: '请选择按钮跳转页面路径',
+      labelInline: true,
+      inline: false,
+      value: data['btnLink'] || null,
+      setting: {
+        mode:'new',
+        router: XdBus.getParentApi('getPagesTree')
+      },
+    },
+  ].filter(i=>i)
+}

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

@@ -0,0 +1,70 @@
+'use strict';
+import { dataVal } from "@/utils/AttrTools";
+
+export default (data, gValue, gColor, oldData) => {
+  let imageConfig = {
+    sort: true,
+    maxlen: 100,
+    action: "aliyun",
+    qiniuCdn: "aliyun",
+    size: 2,
+    tipsformet: "上传文件格式：@imageType@，不超过@size@MB。该上传图会在用户端显示，不建议上传超过1920*1080图片。",
+    uploadType: "aliyun",
+    type: ["jpg", "png", "jpeg", "gif"],
+  };
+  return [
+    //内容
+    {
+      label: "业务线",
+      ele: "xd-choose-namespace",
+      valueKey: "xnamespace",
+      value: dataVal({data, key:'xnamespace', dValue:"", gValue}),
+      groupKey:'content',
+      className: 'input80',
+      labelInline:true,
+      placeholder: '请选择业务线',
+      notice: '空继承上级业务线',
+      inline: false,
+      handleCustom: (cb) => {
+        XdBus.getParentApi('getOptionsNamespaces')()
+          .then(res => {
+            cb(res.list)
+          })
+          .catch();
+      }
+    },
+    //富文本内容
+    {
+      label: "须知内容:",
+      ele: "xd-tinymce",
+      valueKey: "contentHtml",
+      value: data.contentHtml || "",
+      imageConfig,
+      inline: false,
+      groupKey: "content",
+    },
+    //按钮文案
+    {
+      label: '按钮文案',
+      ele: 'el-input',
+      groupKey: 'content',
+      valueKey: 'btnText',
+      value: dataVal({data, key: 'btnText', dValue: '我已知晓', gValue}),
+      placeholder: '请输入按钮文案',
+      labelInline: true,
+      className: 'input100',
+    },
+    //倒计时秒数
+    {
+      label: '倒计时秒数:',
+      ele: 'el-input',
+      groupKey: 'content',
+      valueKey: 'countdown',
+      type: 'number',
+      value: dataVal({data, key: 'countdown', dValue: 5, gValue}),
+      placeholder: '请输入倒计时秒数，0为不显示倒计时',
+      className: 'input60',
+      labelInline: true,
+    },
+  ].filter(i=>i)
+}

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

@@ -0,0 +1,123 @@
+'use strict';
+import {dataVal, statusShow, statusDataVal} from "@/utils/AttrTools";
+
+export default (data, gValue, gColor, oldData) => {
+  return [
+    //风格
+    //背景图（含头部banner背景）
+    {
+      label: '背景图',
+      ele: 'xd-upload',
+      groupKey: 'style',
+      valueKey: 'bgImage',
+      value: data.bgImage || {},
+      defaultValue: data.bgImage || null,
+      slot: true,
+      oneWidth: 355,
+      oneHeight: 355,
+      elinputClassName: 'input40',
+      tipsformet: '上传文件格式：@imageType@，不超过@size@MB.建议宽度为<span style="color:red">750px</span>',
+      type: ['jpg', 'png', 'jpeg'],
+      styleType: 'one',
+      uploadType: 'aliyun',
+      size: 2,
+      action: 'action',
+      sort: true,
+      maxlen: 1,
+      labelInline: true,
+    },
+    //背景色
+    {
+      label: '背景色:',
+      ele: 'xd-color',
+      groupKey: 'style',
+      valueKey: 'bgColor',
+      value: dataVal({data, key:'bgColor', dValue:'#E4F3FF', gValue}),
+      placeholder: '请选择页面背景色',
+      className: 'input80',
+      labelInline: true,
+      setting: {
+        showAlpha: true
+      },
+    },
+    //外边距
+    {
+      label: '外边距',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'marginStatus',
+      value: statusDataVal({data, key:'marginStatus', fields:['margin'], gValue}),
+      labelInline: true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-margin-padding',
+      groupKey: 'style',
+      valueKey: 'margin',
+      value: dataVal({data, key:'margin', dValue: 32, gValue, isPM: true}),
+      hidden: !statusShow({data, key:'marginStatus', fields:['margin'], gValue}),
+      setting: {
+        type: 'margin',
+      },
+    },
+    {ele: 'group_end'},
+    //卡片内边距
+    {
+      label: '卡片内边距',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'paddingStatus',
+      value: statusDataVal({data, key:'paddingStatus', fields:['padding'], gValue}),
+      labelInline: true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-margin-padding',
+      groupKey: 'style',
+      valueKey: 'padding',
+      value: dataVal({data, key:'padding', dValue: 32, gValue, isPM: true}),
+      hidden: !statusShow({data, key:'paddingStatus', fields:['padding'], gValue}),
+      setting: {
+        type: 'margin',
+      },
+    },
+    {ele: 'group_end'},
+    //卡片圆角
+    {
+      label: '卡片圆角',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'radiusStatus',
+      value: statusDataVal({data, key:'radiusStatus', fields:['radius'], gValue}),
+      labelInline: true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'el-input',
+      type: 'number',
+      groupKey: 'style',
+      valueKey: 'radius',
+      value: dataVal({data, key:'radius', dValue: 24, gValue}),
+      placeholder: '请输入卡片圆角，单位rpx',
+      className: 'input60',
+      labelInline: true,
+      hidden: !statusShow({data, key:'radiusStatus', fields:['radius'], gValue}),
+    },
+    {ele: 'group_end'},
+  ].filter(i=>i)
+}

package/src/components/JfbThirdRideStartEnd/JfbThirdRideStartEnd.vue

@@ -158,34 +158,20 @@
        * @description 根据关键词搜索地点(预览模式下底层自动使用Mock.js数据，无需keyword与定位)
        */
       getList(){
-        //预览模式：加载默认mock数据，不校验keyword、不校验定位
-        if (this.$configProject['isPreview']) {
-          jfbRootExec("searchRidePlaces", {
-            vm: this,
-            data: {
-              channel_code: "amapcar",
-              keyword: '',
-              lng: '',
-              lat: '',
-            }
-          }).then(res => {
-            this.placeList = (res && res.list) || [];
-            this.locateFailed = false;
-          }).catch(err => {
-            console.warn('searchRidePlaces error', err);
-          });
-          return;
-        }
-        if (!this.keyword) return;
-        //定位失败时禁止请求搜索接口
-        if (this.locateFailed) {
-          console.warn('定位失败，禁止搜索');
-          return;
+        const isPreview = this.$configProject['isPreview'];
+        //预览模式无需keyword；非预览模式必须有关键词，且定位失败时禁止搜索
+        if (!isPreview) {
+          if (!this.keyword) return;
+          if (this.locateFailed) {
+            console.warn('定位失败，禁止搜索');
+            return;
+          }
         }
         //坐标兼容：mixin返回longitude/latitude，此处映射为接口所需的lng/lat
         const coords = this.currentCoords || {};
         const lng = coords.lng !== undefined ? coords.lng : coords.longitude;
         const lat = coords.lat !== undefined ? coords.lat : coords.latitude;
+        //统一调用jfbRootExec：预览模式底层自动命中Mock.js数据
         jfbRootExec("searchRidePlaces", {
           vm: this,
           data: {
@@ -196,6 +182,7 @@
           }
         }).then(res => {
           this.placeList = (res && res.list) || [];
+          this.locateFailed = false;
         }).catch(err => {
           console.warn('searchRidePlaces error', err);
         });