jufubao-base 1.0.232-beta3 → 1.0.232-beta4

package/src/components/JfbBaseCodeOpenVip/Attr.js

@@ -8,39 +8,241 @@ export default {
   content: (data) => {
     return [
       {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'bgColor',
-        value: data.bgColor || '',
-        placeholder: '请输入占位框背景颜色',
+        label: '共享PLUS会员用户协议:',
+        ele: 'xd-site-news',
+        valueKey: 'notices',
         groupKey:'content',
-      },
-      {
-        label: '选中路径:',
-        groupKey:'advanced',
-        className: 'input100',
-        ele: 'xd-select-pages-path',
-        valueKey: 'select-pages-path',
-        value: data['select-pages-path'] || null,
+        value: data.notices || {type: 'privacy'},
+        className: 'input70',
         setting: {
-          router: XdBus.getParentApi('getPagesTree')
+          config: {
+            sort: true,
+            maxlen: 100,
+            action: 'aliyun',
+            size: 5,
+            tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
+            uploadType: 'aliyun',
+            type: ['jpg', 'png', 'jpeg']
+          },
         },
-      },
-      data.bgColor && {
-        label: '高度:',
-        ele: 'el-input',
-        groupKey:'style',
-        type: 'number',
-        valueKey: 'height',
-        value: data.height || 100,
-        placeholder: '请输入占位框高度，单位像素，默认：10px',
-        className: 'input60',
+        handleCustom({action, data}) {
+          if (data && data.params) {
+            //当一个插件中出现多个内容分类时候需要设置code值，在页面引用时候（容器id + code）进行拼接获取数据列表
+            data.params = Object.assign({}, data.params, {code: 'privacy_service'});
+          }
+
+          //获取返回参数(场景类型名称为必填)
+          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()
+          }
+        },
+        inline: false,
+        notice: '',
       },
       {
-        label: '', //label
+        label: 'PLUS会员开通成功跳转路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'vipSuccessPath',
         groupKey:'advanced',
-        ele: 'slot', //package 名称
-        slot: 'is_reference',
+        placeholder: '请选择PLUS会员开通成功跳转路径',
+        value: data['vipSuccessPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
       },
     ].filter(i=>i)
   },

package/src/components/JfbBaseCodeOpenVip/JfbBaseCodeOpenVip.vue

@@ -13,14 +13,42 @@
       <view class="jfb-base-code-open-vip__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-code-open-vip__body">
-      <view>测试插件( {{containerId}} )</view>
+    <view class="jfb-base-code-open-vip__body" :style="[bodyStyle]">
+      <view v-if="0" class="vip_panel">
+        <view class="combo_section">
+          <view class="code_input_wrap">
+            <input class="code_input" placeholder="请输入兑换码"></input>
+          </view>
+        </view>
+        <view class="combo_section">
+          <view class="desc_tit">文案描述</view>
+          <view class="desc_cont">文案内容</view>
+        </view>
+        <view class="fixed_bottom" :style="[fixed_bottom]">
+          <xd-button type="primary" width="600rpx">查询</xd-button>
+          <view class="plus_privacy">开通视为同意 <text @click.stop="handlePrivacy('privacy_service')"></text>《共享PLUS会员用户协议》</view>
+        </view>
+      </view>
+      <view v-else class="vip_panel">
+        <view class="combo_section">
+          <view class="combo_section-title">兑换码：12312983719283711</view>
+          <xd-list-item label="套餐名称" paddingLR="40rpx">¥125.00</xd-list-item>
+          <xd-list-item label="套餐期限" paddingLR="40rpx">30天</xd-list-item>
+          <xd-list-item label="套餐金额" paddingLR="40rpx">¥125.00</xd-list-item>
+        </view>
+        <view class="fixed_bottom" :style="[fixed_bottom]">
+          <xd-button type="primary" width="600rpx">立即兑换</xd-button>
+          <view class="plus_privacy">开通视为同意 <text @click.stop="handlePrivacy('privacy_service')"></text>《共享PLUS会员用户协议》</view>
+        </view>
+      </view>
     </view>
   </view>
 </template>
 
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import XdListItem from "@/components/XdListItem/XdListItem"
+  import XdButton from "@/components/XdButton/XdButton";
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseCodeOpenVipMixin from "./JfbBaseCodeOpenVipMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
@@ -29,17 +57,31 @@
   export default {
     name: "JfbBaseCodeOpenVip",
     components: {
-      XdFontIcon
+      XdFontIcon,
+      XdListItem,
+      XdButton
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseCodeOpenVipMixin
     ],
     data() {
       return {
-
+        //hideMask: true,
         //todo
+        vipSuccessPath: "",
       }
     },
+    computed: {
+      bodyStyle(){
+        return {
+          minHeight: this.layoutInfo.bodyMinHeightRpx + 'rpx',
+          '--main-color': this.mainColor,
+        }
+      },
+      fixed_bottom() {
+        return this.fixedStyle({paddingBottom: 36, zIndex: 111})
+      },
+    },
     watch: {
       container(value, oldValue) {
         if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
@@ -69,10 +111,14 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-
-        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
-
-        //this.height = getContainerPropsValue(container, 'content.height', 10);
+        this.vipSuccessPath = getContainerPropsValue(container, 'content.vipSuccessPath', {value: ""}).value;
+      },
+      handlePrivacy(code){
+        let params = `page_id=${this.pageAttr["page_id"]}`;
+        params = `${params}&container_id=${this.containerId}${code}`;
+        this.$xdUniHelper.navigateTo({
+          url: `/pages/content/content?${params}`
+        })
       },
       onJfbScroll(options) {
         console.log('event.onJfbScroll', options)
@@ -105,7 +151,63 @@
 
   .jfb-base-code-open-vip {
     &__body{
-
+      .combo_section{
+        border-radius: 24rpx;
+        overflow: hidden;
+        margin: 20rpx;
+        background-color: #FFFFFF;
+        &-title{
+          height: 72rpx;
+          line-height: 72rpx;
+          text-align: center;
+          background: linear-gradient(90deg, #FCD083 0%, #FFDEAD 100%);
+          font-size: 28rpx;
+          color: #915714;
+          font-weight: 500;
+        }
+        ::v-deep .my-list_value{
+          color: #999999;
+        }
+        .desc_tit{
+          height: 72rpx;
+          line-height: 72rpx;
+          text-align: center;
+        }
+        .desc_cont{
+          height: 100rpx;
+          padding: 24rpx;
+        }
+        .code_input_wrap{
+          width: 100%;
+          padding: 36rpx;
+          box-sizing: border-box;
+        }
+        .code_input{
+          width: 100%;
+          height: 90rpx;
+          background-color: #FAFAFA;
+          box-sizing: border-box;
+          padding: 0 36rpx;
+          border-radius: 16rpx;
+        }
+      }
+      .fixed_bottom{
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        padding: 36rpx;
+        box-sizing: border-box;
+        background-color: #FFFFFF;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        .plus_privacy{
+          font-size: 22rpx;
+          color: #999;
+          margin-top: 16rpx;
+        }
+      }
     }
   }
 </style>

package/src/components/JfbBaseConsumpCode/Attr.js

@@ -8,39 +8,39 @@ export default {
   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: 'openPath',
+        value: data['openPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
       },
       {
-        label: '选中路径:',
+        label: '切换门店路径:',
         groupKey:'advanced',
         className: 'input100',
         ele: 'xd-select-pages-path',
-        valueKey: 'select-pages-path',
-        value: data['select-pages-path'] || null,
+        valueKey: 'shopPath',
+        value: data['shopPath'] || 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
+        label: '支付成功跳转路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'successPath',
+        value: data.successPath || null,
+        placeholder: '请选择支付成功跳转路径',
+        className: 'input100',
         groupKey:'advanced',
-        ele: 'slot', //package 名称
-        slot: 'is_reference',
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
+        inline: false,
       },
     ].filter(i=>i)
   },