jufubao-base 1.0.181-beta9 → 1.0.182-beta1

package/src/components/JfbBaseCardDelay/Attr.js

@@ -8,251 +8,49 @@ export default {
   content: (data) => {
     return [
       {
-        label: '提示内容:',
-        ele: 'xd-site-news',
-        valueKey: 'notice',
-        groupKey:'content',
-        value: data.notice || null,
-        className: 'input70',
-        setting: {
-          config: {
-            sort: true,
-            maxlen: 100,
-            action: 'aliyun',
-            size: 5,
-            tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
-            uploadType: 'aliyun',
-            type: ['jpg', 'png', 'jpeg']
+        label: '背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'bgcolor',
+        value: data.bgcolor || '',
+        placeholder: '请输入占位框背景颜色',
+        classNmae: 'input80',
+        rules: [
+          {
+            required: true,
+            message: '请输入占位框背景颜色',
+            trigger: 'blur'
           },
-        },
-        handleCustom({action, data}) {
-          if (data && data.params) {
-            //当一个插件中出现使用内容分类时候需要设置code值，在页面引用时候容器id + code进行拼接
-            //data.params = Object.assign({}, data.params, {code: 'g_test_id'});
-          }
-
-          //获取返回参数(场景类型名称为必填)
-          let loading = { close(){}}
-
-          //获取显示内容
-          if (action === 'screen') {
-            XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_bucket_content_tip'})
-              .then(res => {
-                loading.close();
-                data.cb(res['list'])
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-              });
-
-          }
-
-          //获取返回参数(广告位高度必选项)
-          if (action === 'getNewsInfo') {
-            XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
-              .then(res => {
-                loading.close()
-                data.cb({list: res.list, selectId: res.selected})
-              })
-              .catch(error => {
-                loading.close()
-                console.error(error);
-              });
-          }
-
-          //获取产品业务线列表
-          if (action === 'namespace') {
-            XdBus.getParentApi('getOptionsNamespaces')({})
-              .then(res => {
-                loading.close()
-                data.cb(res['list'])
-              })
-              .catch(error => {
-                loading.close()
-                console.error(error);
-              });
-          }
-
-          //使用内容分类
-          if (action === 'cmsPublishEditxContent') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('cmsPublishEditxContent')(data.params)
-              .then(res => {
-                console.log('cmsPublishEditxContent', res)
-                loading.close();
-                data.cb(res)
-              })
-              .catch(error => {
-                loading.close();
-                console.error(error);
-              });
-          }
-
-          //位置列表
-          if (action === 'getListPostion') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('getListNewsPosition')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(res)
-              })
-              .catch(error => {
-                loading.close();
-                console.error(error);
-              });
-          }
-
-          //位置创建
-          if (action === 'addPostion') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('addNewsPosition')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //位置编辑
-          if (action === 'editPostion') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('updateNewsPosition')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //位置删除
-          if (action === 'deleltePostion') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('deleteNewsPosition')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //获取广告位内容列表
-          if (action === 'getListContent') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('getListNewsContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(res)
-              })
-              .catch(error => {
-                loading.close();
-                console.error(error);
-              });
-          }
-
-          //广告内容创建
-          if (action === 'addContent') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('addNewsContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //广告内容编辑
-          if (action === 'editContent') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('updateNewsContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //广告内容删除
-          if (action === 'deleteContent') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('deleteNewsContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //内容发布
-          if (action === 'publish') {
-            loading = XdBus.getParentApi('loading')({});
-            console.log('publish', data.params)
-            XdBus.getParentApi('cmsPublishContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(res)
-              })
-              .catch(error => {
-                loading.close();
-                console.error(error);
-              });
-          }
-
-          //通知页面进行刷新
-          if (action === 'update') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
-            loading.close()
-          }
-        },
+        ]
       },
       {
-        label: '票券支付路径:',
+        label: '选中路径:',
         ele: 'xd-select-pages-path',
-        valueKey: 'payPath',
-        groupKey:'advanced',
-        placeholder: '请选择票券支付路径',
-        value: data['payPath'] || {},
+        valueKey: 'select-pages-path',
+        value: data['select-pages-path'] || null,
         setting: {
-          router: XdBus.getParentApi('getPagesTree'),
+          router: XdBus.getParentApi('getPagesTree')
         },
-        inline: false,
+      },
+      data.bgcolor && {
+        label: '高度:',
+        ele: 'el-input',
+        type: 'number',
+        valueKey: 'height',
+        value: data.height || 100,
+        placeholder: '请输入占位框高度，单位像素，默认：10px',
+        className: 'input80',
+        rules: [
+          {
+            required: true,
+            message: '请输入占位框高度',
+            trigger: 'blur'
+          },
+        ]
       },
       {
-        label: '0元支付成功路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'successPath',
-        groupKey:'advanced',
-        placeholder: '请选择0元支付成功路径',
-        value: data['successPath'] || {},
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        inline: false,
+        label: '', //label
+        ele: 'slot', //package 名称
+        slot: 'is_reference',
       },
     ].filter(i=>i)
   },

package/src/components/JfbBaseCardDelay/JfbBaseCardDelay.vue

@@ -2,311 +2,110 @@
   <view
     class="jfb-base-card-delay"
     @click="handleEditxSelect"
-    :class="{ editx: isEditx && active }"
+    :class="{ editx : isEditx && active }"
   >
     <!--#ifdef H5-->
     <view
       class="jfb-base-card-delay__edit"
-      :class="{ editx: isEditx && active }"
+      :class="{ editx : isEditx && active }"
       v-if="isEditx && active"
     >
       <view class="jfb-base-card-delay__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-card-delay__body">
-      <view>
-        <view class="wrap">
-          <input
-            placeholder="输入券号"
-            v-model.trim="card_number"
-            type="text"
-          />
-        </view>
-        <view v-if="packageList !== null">
-          <view v-if="packageList.length > 0" class="package">
-            <view
-              v-for="(item, index) in packageList"
-              :key="index"
-              @click="activeIndex = index"
-              :style="{
-                background: activeIndex === index ? backgroundColor : '#fff',
-                color: activeIndex === index ? mainColor : '#333',
-                marginRight: (index + 1) % 3 == 0 ? '0' : '36rpx',
-              }"
-              class="package-item"
-            >
-              <view>{{ item.package_name }}</view>
-              <view>
-                <text>{{ item.pay_amount }}</text
-                >元宝</view
-              >
-            </view>
-          </view>
-          <xd-no-data height="20vh" v-else :iconType="empty">
-            当前票券无套餐
-          </xd-no-data>
-        </view>
-        <view class="wrap" style="margin-top: 28rpx" v-if="notice&&packageList !== null&&packageList.length > 0">
-          <view
-            style="
-              text-align: center;
-              padding-bottom: 36rpx;
-              color: #333;
-              font-weight: 500;
-              font-size: 28rpx;
-            "
-            >延期规则</view
-          >
-          <xd-content-xss :html="notice"></xd-content-xss>
-        </view>
-        <view
-          v-if="!package_id"
-          class="jfb-base-card-delay__body-footer"
-          :style="prod_bottom"
-        >
-          <xd-button
-            width="560rpx"
-            v-if="card_number"
-            type="primary"
-            @click="getList"
-            >下一步</xd-button
-          >
-          <xd-button
-            width="560rpx"
-            v-else
-            disabled="true"
-            type="primary"
-            @click="getList"
-            >下一步</xd-button
-          >
-        </view>
-        <view
-          v-else
-          class="jfb-base-card-delay__body-footer"
-          :style="prod_bottom"
-        >
-          <xd-button width="560rpx" type="primary" @click="handleBuy"
-            >{{ pay_amount }}元延期</xd-button
-          >
-        </view>
-      </view>
+      <view>测试插件( {{containerId}} )</view>
     </view>
   </view>
 </template>
 
 <script>
-import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-import XdButton from "@/components/XdButton/XdButton";
-import { jfbRootExec } from "@/utils/xd.event";
-import JfbBaseCardDelayMixin from "./JfbBaseCardDelayMixin";
-import { getContainerPropsValue } from "@/utils/xd.base";
-import componentsMixins from "@/mixins/componentsMixins";
-import XdContentXss from "@/components/XdContentXss/XdContentXss";
-import extsMixins from "@/mixins/extsMixins";
-import colorCardMixins from "@/mixins/colorCardMixins";
-import XdNoData from "@/components/XdNoData/XdNoData";
-const Color = require("color");
-
-export default {
-  name: "JfbBaseCardDelay",
-  components: {
-    XdFontIcon,
-    XdContentXss,
-    XdButton,
-    XdNoData,
-  },
-  mixins: [
-    componentsMixins,
-    extsMixins,
-    JfbBaseCardDelayMixin,
-    colorCardMixins,
-  ],
-  data() {
-    return {
-      notice: "",
-      card_number: "",
-      backgroundColor: "",
-      packageList: null,
-      activeIndex: 0,
-      package_id: null,
-      payPath: "",
-      pay_amount: 0,
-      successPath: "",
-    };
-  },
-  computed: {
-    prod_bottom() {
-      return this.fixedStyle({ height: 0, zIndex: 111 });
-    },
-  },
-  watch: {
-    container(value, oldValue) {
-      if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
-      if (this.$configProject["isPreview"]) this.init(value);
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import { jfbRootExec } from "@/utils/xd.event";
+  import JfbBaseCardDelayMixin from "./JfbBaseCardDelayMixin";
+  import { getContainerPropsValue } from "@/utils/xd.base";
+  import componentsMixins from "@/mixins/componentsMixins";
+  import extsMixins from "@/mixins/extsMixins";
+  export default {
+    name: "JfbBaseCardDelay",
+    components: {
+      XdFontIcon
     },
-    activeIndex(n, o) {
-      if (n !== o) {
-        this.package_id = this.packageList[n].id;
-        this.pay_amount = this.packageList[n].pay_amount;
+    mixins: [
+      componentsMixins, extsMixins, JfbBaseCardDelayMixin
+    ],
+    data() {
+      return {
+
+        //todo
       }
     },
-    card_number(n, o) {
-      if (n === "") {
-        this.packageList = null;
-        this.package_id = null;
-      }
+    watch: {
+      container(value, oldValue) {
+        if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
+      },
     },
-  },
-  created() {
-    this.backgroundColor = Color(this.mainColor).alpha(0.2).toString();
-    this.init(this.container);
+    created() {
+      this.init(this.container);
 
-    //todo
-  },
-  methods: {
-    onJfbLoad(options) {
-      this.getContent();
-    },
-    getContent() {
-      jfbRootExec("getCardDelayContent", {
-        vm: this,
-        data: {
-          page_id: this.pageAttr["page_id"], //页面ID
-          container_id: this.containerId, //组件ID
-          limit: 1,
-        },
-      })
-        .then((res) => {
-          if (res.list && res.list.length > 0) {
-            this.notice = res.list[0].content;
-          }
-          this.statusNotice = true;
-        })
-        .catch((error) => {
-          console.error(error);
-        });
-    },
-    getList() {
-      jfbRootExec("getCardDelayPackageList", {
-        vm: this,
-        data: {
-          card_number: this.card_number,
-        },
-      })
-        .then((res) => {
-          if (res.list && res.list.length > 0) {
-            res.list = res.list.map((item) => {
-              return {
-                ...item,
-                pay_amount: this.$xdUniHelper.divisionFloatNumber(
-                  item.pay_amount,
-                  100
-                ),
-              };
-            });
-            this.packageList = res.list;
-            this.package_id = this.packageList[0].id;
-            this.pay_amount = this.packageList[0].pay_amount;
-          } else {
-            this.packageList = [];
-          }
-        })
-        .catch((error) => {
-          console.error(error);
-        });
+      //todo
     },
-    handleBuy() {
-      jfbRootExec("confirmDelayOrder", {
-        vm: this,
-        data: {
-          card_number: this.card_number, //页面ID
-          total_amount: this.pay_amount * 100, //组件ID
-          package_id: this.package_id,
-        },
-      })
-        .then((res) => {
-          this.$xdHideLoading();
-          if (res.is_need_pay === "Y") {
-            this.$xdUniHelper.navigateTo({
-              url: `${this.payPath}?order_id=${res.pay_order_id}&main_order_id=${res.order_id}&type=delay`,
-            });
-          } else {
-            this.$xdUniHelper.navigateTo({
-              url: `${this.successPath}?order_id=${res.order_id}&type=delay`,
-            });
-          }
-        })
-        .catch((err) => {
-          this.$xdHideLoading();
-          console.log(err, "err");
-        });
-    },
-    /**
-     * @description 监听事件变化
-     * @param container {object} 业务组件对象自己
-     */
-    init(container) {
-      this.payPath = getContainerPropsValue(container, "content.payPath", {
-        value: "",
-      }).value;
-      this.successPath = getContainerPropsValue(container, "content.successPath", {
-        value: "",
-      }).value;
-    },
-  },
-};
+    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 "./JfbBaseCardDelayLess.less";
+  @import "./JfbBaseCardDelayLess.less";
 
-.jfb-base-card-delay {
-  &__body {
-    padding: 26rpx;
-    .wrap {
-      border-radius: 20rpx;
-      border: 1rpx solid #eeeeee;
-      padding: 36rpx;
-      background: #fff;
-      input {
-        height: 30rpx;
-        border-radius: 16rpx;
-        background: #fafafa;
-        border: 1px solid #eeeeee;
-        padding: 30rpx 40rpx;
-      }
-    }
-    &-footer {
-      position: fixed;
-      left: 0;
-      right: 0;
-      height: unit(100, rpx);
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      background:#fff
-    }
-    .package {
-      display: flex;
-      align-items: center;
-      flex-wrap: wrap;
-      margin-top: 30rpx;
-      &-item {
-        padding: 40rpx 20rpx;
-        font-size: 28rpx;
-        text-align: center;
-        border-radius: 16rpx;
-        margin-right: 36rpx;
-        margin-bottom: 36rpx;
-        width: 24%;
+  .jfb-base-card-delay {
+    &__body{
 
-        & > view:nth-child(2) {
-          & > text {
-            font-size: 48rpx;
-          }
-        }
-      }
     }
   }
-}
 </style>

package/src/components/JfbBaseCardDetailEntry/Attr.js

@@ -50,17 +50,5 @@ export default {
       },
       inline: false,
     },
-    {
-      label: '票券转赠地址:',
-      ele: 'xd-select-pages-path',
-      valueKey: 'give_url',
-      groupKey:'advanced',
-      placeholder: '请选择票券转赠地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
   ],
 };