jufubao-third 1.0.22-beta8 → 1.0.22

package/package.json

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

package/src/components/JfbThirdRideGenOrder/Api.js

@@ -8,7 +8,7 @@ module.exports = [
   {
     mapFnName: 'rideOrderDetail',
     title: "打车 - 订单详情（轮询用）",
-    path: "/thirdmall-pb/v1/:channel_code/ride/order-result",
+    path: "/thirdmall/v1/:channel_code/ride/order-result",
     isRule: false,
     data: {
       channel_code: ['渠道编码', 'String', '必选','amapcar'],

package/src/components/JfbThirdRideLand/JfbThirdRideLand.vue

@@ -15,7 +15,7 @@
       </view>
     </view>
     <!-- #endif -->
-    <view class="jfb-third-ride-land__body" :style="[bodyStyle, bgStyle]">
+    <view class="jfb-third-ride-land__body" :style="bodyStyle">
       <view class="land_box" :style="cardStyle" v-html="contentHtml"></view>
       <view
         class="land_btn"
@@ -33,16 +33,16 @@
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbThirdRideLandMixin from "./JfbThirdRideLandMixin";
   import { gCPVal } from "@/utils/xd.base";
+  import posterMixins from "@/mixins/posterMixins";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
-  import getServiceUrl from "@/common/getServiceUrl";
   export default {
     name: "JfbThirdRideLand",
     components: {
       XdFontIcon
     },
     mixins: [
-      componentsMixins, extsMixins, JfbThirdRideLandMixin
+      componentsMixins, extsMixins, JfbThirdRideLandMixin, posterMixins
     ],
     data() {
       return {
@@ -54,24 +54,12 @@
         countdownLeft: 0,
         countdownTimer: null,
         //样式
-        bgImage: '',
         margin: {},
         padding: {},
         radius: 24,
       }
     },
     computed: {
-      //页面背景（背景图）
-      bgStyle(){
-        let style = {};
-        if(this.bgImage) {
-          style.backgroundImage = `url(${getServiceUrl(this.bgImage)})`;
-          style.backgroundSize = '100% 100%';
-          style.backgroundPosition = 'center';
-          style.backgroundRepeat = 'no-repeat';
-        }
-        return style;
-      },
       //外边距
       bodyStyle(){
         let style = {
@@ -134,11 +122,9 @@
         //内容
         this.contentHtml = gCPVal(container, 'contentHtml', '');
         this.btnText = gCPVal(container, 'btnText', '我已知晓');
-        this.btnLink = gCPVal(container, 'btnLink', {value: ''}).value;
+        this.btnLink = gCPVal(container, 'btnLink', "");
         this.countdown = gCPVal(container, 'countdown', 0);
         //样式
-        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']});
@@ -168,15 +154,25 @@
         }
         this.countdownLeft = 0;
       },
+      createUrlPosterItem(url=''){
+        return {
+          redirect_type: 'URL',               
+          redirect_data: JSON.stringify({url}),
+          app_type: 'h5',
+          redirect_params: '',
+          deploy_dir: ''
+        };
+      },
       /**
        * @description 点击按钮，倒计时结束后跳转配置的链接
        */
       handleBtnClick(){
         if (this.$configProject['isPreview']) return;
         if(this.btnDisabled) return;
-        this.$xdUniHelper.navigateTo({
-          url: this.btnLink
-         });
+        this.handlePosterClick(this.createUrlPosterItem(this.btnLink))
+        // this.$xdUniHelper.navigateTo({
+        //   url: this.btnLink
+        //  });
       },
       onJfbScroll(options) {
         console.log('event.onJfbScroll', options)

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

@@ -1,5 +1,5 @@
 'use strict';
-
+import { dataVal } from "@/utils/AttrTools";
 export default (data, gValue, gColor, oldData) => {
   return [
     //高级
@@ -18,5 +18,15 @@ export default (data, gValue, gColor, oldData) => {
     //     router: XdBus.getParentApi('getPagesTree')
     //   },
     // },
+    {
+      label: "按钮链接",
+      ele: "el-input",
+      groupKey: 'advanced',
+      valueKey: "btnLink",
+      value: dataVal({data, key: 'btnLink', dValue: '', gValue}),
+      placeholder: '请输入按钮跳转链接',
+      labelInline: true,
+      className: 'input100',
+    },
   ].filter(i=>i)
 }

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

@@ -15,17 +15,30 @@ export default (data, gValue, gColor, oldData) => {
   return [
     //富文本内容
     {
-      label: "须知内容:",
+      ele: 'title',
+      label: '基础',
+      size: 'small',
+      groupKey:'content',
+    },
+    {
+      label: "提示内容",
       ele: "xd-tinymce",
       valueKey: "contentHtml",
       value: data.contentHtml || "",
       imageConfig,
       inline: false,
       groupKey: "content",
+      labelInline: true,
+    },
+    {
+      ele: 'title',
+      label: '组件样式',
+      size: 'small',
+      groupKey:'content',
     },
     //按钮文案
     {
-      label: '按钮文案',
+      label: '按钮名称',
       ele: 'el-input',
       groupKey: 'content',
       valueKey: 'btnText',
@@ -34,19 +47,9 @@ export default (data, gValue, gColor, oldData) => {
       labelInline: true,
       className: 'input100',
     },
-    {
-      label: "按钮跳转链接",
-      ele: "el-input",
-      groupKey: 'content',
-      valueKey: "btnLink",
-      value: dataVal({data, key: 'btnLink', dValue: '', gValue}),
-      placeholder: '请输入按钮跳转链接',
-      labelInline: true,
-      className: 'input100',
-    },
     //倒计时秒数
     {
-      label: '倒计时秒数:',
+      label: '按钮倒秒',
       ele: 'el-input',
       groupKey: 'content',
       valueKey: 'countdown',

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

@@ -4,27 +4,11 @@ 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: 750/4,
-      oneHeight: 1000/4,
-      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,
+      ele: 'title',
+      label: '常规',
+      size: 'small',
+      groupKey:'style',
     },
     //外边距
     {

package/.claude/settings.local.json

@@ -1,12 +0,0 @@
-{
-  "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$\")"
-    ]
-  }
-}