jufubao-base 1.0.237-beta10 → 1.0.237-beta11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.237-beta10",
+  "version": "1.0.237-beta11",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseBalance/JfbBaseBalance.vue

@@ -42,7 +42,7 @@
       </view>
       <XdNoData v-else></XdNoData>
       <XdDailog :cancel="false" @onBtn="showDialog=false" confirmText="我知道了" title="积分说明" :show.sync="showDialog">
-        <xd-content-xss v-html="notice"></xd-content-xss>
+        <xd-content-xss :html="notice"></xd-content-xss>
       </XdDailog>
     </view>
   </view>

package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue

@@ -5,7 +5,7 @@
       <view class="jfb-base-consump-code__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-consump-code__body" :style="{
+    <view v-if="!showMask" class="jfb-base-consump-code__body" :style="{
       minHeight: layoutInfo.bodyMinHeightRpx + 'rpx',
       background: 'url(https://img.js.design/assets/img/678f560988986af5661c2876.png#a3be067970d2c78a56d08024581a9ca0)',
       backgroundSize: '100% 100%'
@@ -39,9 +39,27 @@
           </view>
           <XdButton v-if="btnDisabled" style="margin-top: 200rpx" width="260rpx" type="primary" disabled>下一步</XdButton>
           <XdButton v-else style="margin-top: 200rpx" width="260rpx" type="primary" @click="toPayOrder">下一步</XdButton>
+          <view v-if="plusDiscount">
+            <view class="vip" v-if="is_vip==='N'">
+              <view class="vip-title">
+                <view class="vip-title-left">PLUS会员专享</view>
+                <view class="vip-title-right">
+                  <text>{{plusDiscount/1000}}</text>折
+                </view>
+              </view>
+              <view class="vip-open" @click="handleToOpen">
+                <xd-font-icon color="#FCBF28" size="20" icon="iconPLUShuiyuan"></xd-font-icon>
+                <text>立即开通</text>
+                <xd-font-icon size="20" icon="iconxiangyou_xian"></xd-font-icon>
+              </view>
+            </view>
+            <view class="is-vip" v-else>
+              <text>PLUS</text>会员消费专享 <text>{{plusDiscount/1000}}</text>折
+            </view>
+          </view>
         </view>
         <view v-else>
-          <view v-if="!showMask">
+          <view>
             <view @click="handleToShop" class="shop">
               <view>{{shopName}}</view>
               <XdFontIcon size="20" icon="iconxiangyou_xian"></XdFontIcon>
@@ -52,34 +70,37 @@
             <image mode="aspectFit" class="qrcode" :src="code_url">
             </image>
             <view class="code-refresh">{{expiration_sec_str}}后自动更新</view>
-            <view class="vip" v-if="plusDiscount">
-              <view class="vip-title">
-                <view class="vip-title-left">PLUS会员专享</view>
-                <view class="vip-title-right">
-                  <text>{{plusDiscount/1000}}</text>折
+            <view v-if="plusDiscount">
+              <view class="vip" v-if="is_vip==='N'">
+                <view class="vip-title">
+                  <view class="vip-title-left">PLUS会员专享</view>
+                  <view class="vip-title-right">
+                    <text>{{plusDiscount/1000}}</text>折
+                  </view>
+                </view>
+                <view class="vip-open" @click="handleToOpen">
+                  <xd-font-icon color="#FCBF28" size="20" icon="iconPLUShuiyuan"></xd-font-icon>
+                  <text>立即开通</text>
+                  <xd-font-icon size="20" icon="iconxiangyou_xian"></xd-font-icon>
                 </view>
               </view>
-              <view v-if="is_vip==='N'" class="vip-open" @click="handleToOpen">
-                <xd-font-icon color="#FCBF28" size="20" icon="iconPLUShuiyuan"></xd-font-icon>
-                <text>立即开通</text>
-                <xd-font-icon size="20" icon="iconxiangyou_xian"></xd-font-icon>
+              <view class="is-vip" v-else>
+                <text>PLUS</text>会员消费专享 <text>{{plusDiscount/1000}}</text>折
               </view>
             </view>
           </view>
-          <view class="mask-box" v-else>
-            <view class="mask">
-              <view class="mask-title">{{tip}}</view>
-              <!-- <view class="mask-open">
-                PLUS会员专享 <span :style="{color:mainColor,marginLeft:'8rpx'}">8</span>折 <span @click="handleToOpen"
-                  :style="{color:mainColor,marginLeft:'15rpx'}">立即开通</span>
-              </view> -->
-            </view>
-          </view>
         </view>
 
       </view>
     </view>
-    <XdDialog :show.sync="showDialog" :showClose="false" :showTitle="true">
+    <view :style="{
+      minHeight: layoutInfo.bodyMinHeightRpx + 'rpx',
+      background: 'url(https://img1-b.jufubao.cn/uploads/20250507/1a97fda8cd8804f9bcf984da10e0a666.png?x-oss-process=style/size8)',
+      backgroundSize: '100% 100%'
+    }" v-else>
+
+    </view>
+    <XdDialog width="80%" :show.sync="showDialog" :showClose="false" :showTitle="true">
       <view class="dialog-title" slot="title">门店确认</view>
       <view class="dialog-content">
         <view>当前门店：<span :style="{color:mainColor}">{{shopName}}</span></view>
@@ -148,6 +169,7 @@
         plusDiscount: 0,
         userInfo: {},
         is_vip: 'N',
+        isPreview: false
       }
     },
     watch: {
@@ -193,8 +215,9 @@
       }
     },
     created() {
-      console.log(this.siteInfo,'configProject');
-      this.is_vip = this.getTokenForKey('user_level')&&this.getTokenForKey('user_level')==='VIP'?'Y':'N'
+      console.log(this.siteInfo, 'configProject');
+      this.isPreview = this.$configProject['isPreview']
+      this.is_vip = this.getTokenForKey('user_level') && this.getTokenForKey('user_level') === 'VIP' ? 'Y' : 'N'
       this.init(this.container);
     },
     methods: {
@@ -301,6 +324,7 @@
             if (res.is_st_flow === 'Y') {
               //水牌
               this.isFlow = true
+              this.showMask = false;
               this.shopName = res.shop_name;
               this.getSettleTagList()
             } else {
@@ -308,8 +332,10 @@
               this.temp_order_id = res.temp_order_id;
               let code_url = this.brandInfo['api_host'] + res.code_url;
               let barcode_url = this.brandInfo['api_host'] + res.barcode_url;
-              if (this.isPreview) code_url = res.code_url;
-              if (this.isPreview) barcode_url = res.barcode_url;
+              if (this.isPreview) {
+                code_url = 'https://sandbox-apis.jufubao.cn/common/v1/image/qrcode?code_content=h.161.v91654768653746&size=240'
+                barcode_url = 'https://sandbox-apis.jufubao.cn/common/v1/image/barcode?code_content=h.161.v91654768653746'
+              }
               this.code_url = code_url;
               this.barcode_url = barcode_url;
               this.barCode = res.payment_code
@@ -800,11 +826,25 @@
       .code-refresh {
         color: #999;
         font-size: 24rpx;
-        margin-bottom: 36rpx;
-        border-bottom: 2rpx dashed #E5E5E5;
         width: 95%;
         text-align: center;
-        padding-bottom: 36rpx;
+      }
+
+      .is-vip {
+        font-size: 28rpx;
+        color: #333333;
+        text-align: center;
+        padding-top: 40rpx;
+        margin-top: 40rpx;
+        border-top: 1px dashed rgba(229, 229, 229, 1);
+
+        &>text:first-child {
+          font-weight: 700;
+        }
+
+        &>text:last-child {
+          color: #D10300;
+        }
       }
 
       .vip {
@@ -812,6 +852,9 @@
         align-items: center;
         justify-content: space-between;
         width: 100%;
+        padding-top: 40rpx;
+        margin-top: 40rpx;
+        border-top: 1px dashed rgba(229, 229, 229, 1);
 
         &-title {
           display: flex;
@@ -869,7 +912,7 @@
           flex-direction: column;
           align-items: center;
           justify-content: center;
-          background: url('https://img-b.jufubao.cn/uploads/20250407/11e6e600ab4395c44d42489bc7b25034.jpg') no-repeat;
+          background: url('https://img1-b.jufubao.cn/uploads/20250507/1a97fda8cd8804f9bcf984da10e0a666.png?x-oss-process=style/size8') no-repeat;
           background-size: 100% 100%;
 
           &-title {

package/src/components/JfbBaseNoticeGroup/Api.js

@@ -6,51 +6,16 @@
  */
 module.exports = [
   {
-    //设置方法名字当别忘记加上【模块名字】：Notice
-    mapFnName: 'getNoticeByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'getNoticeNewsContent', //自定义方法名字（必选）
+    title: '获取内容',
+    path: '/cms/v1/news-content',
     isRule: false,
     params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Notice
-    mapFnName: 'updateNoticeFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Notice
-    mapFnName: 'removeNoticeFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Notice
-    mapFnName: 'addNoticeFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
+      scene: ['使用场景', 'String', '选填'],
+      container_id: ['插件ID', 'String', '必填'],
+      page_id: ['页面ID', 'String', '必填'],
+      page_size: ['记录条数', 'Number', '必填', 1],
+      code: ['业务线id', 'String', '选填'],
     },
     isConsole: true,
     disabled: true,

package/src/components/JfbBaseNoticeGroup/Attr.js

@@ -8,41 +8,230 @@ 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: 'select-pages-path',
-        value: data['select-pages-path'] || null,
+        label: '公告内容:',
+        ele: 'xd-site-news',
+        valueKey: 'notice',
+        groupKey: 'content',
+        value: data.notice || null,
+        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',
-      },
-      {
-        label: '', //label
-        groupKey:'advanced',
-        ele: 'slot', //package 名称
-        slot: 'is_reference',
-      },
-    ].filter(i=>i)
+        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()
+          }
+        },
+      }
+    ].filter(i => i)
   },
   advanced: [],
 };

package/src/components/JfbBaseNoticeGroup/JfbBaseNoticeGroup.vue

@@ -1,20 +1,24 @@
 <template>
-  <view
-    class="jfb-base-notice-group"
-    @click="handleEditxSelect"
-    :class="{ editx : isEditx && active }"
-  >
+  <view class="jfb-base-notice-group" @click="handleEditxSelect" :class="{ editx : isEditx && active }">
     <!--#ifdef H5-->
-    <view
-      class="jfb-base-notice-group__edit"
-      :class="{ editx : isEditx && active }"
-      v-if="isEditx && active"
-    >
+    <view class="jfb-base-notice-group__edit" :class="{ editx : isEditx && active }" v-if="isEditx && active">
       <view class="jfb-base-notice-group__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-notice-group__body">
-      <view>测试插件( {{containerId}} )</view>
+      <view v-if="contentList.length>0">
+        <view @click="handleTo(item)" v-for="(item,index) in contentList" :key="index"
+          class="jfb-base-notice-group__body-item">
+          <view>
+            {{item.title}}
+          </view>
+          <XdFontIcon size="25" color="#2C2C2C" icon="iconxiangyou_xian"></XdFontIcon>
+        </view>
+      </view>
+      <view class="logout-btn">
+        <xd-button type="primary" width="600rpx" @click="handleLogout">退出登录</xd-button>
+      </view>
+      <view class="version">当前版本: {{version}}</view>
     </view>
   </view>
 </template>
@@ -25,54 +29,93 @@
   import JfbBaseNoticeGroupMixin from "./JfbBaseNoticeGroupMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
   import componentsMixins from "@/mixins/componentsMixins";
+  import XdButton from "@/components/XdButton/XdButton";
   import extsMixins from "@/mixins/extsMixins";
+  import { mapState } from 'vuex';
+  import store from "@/store";
   export default {
     name: "JfbBaseNoticeGroup",
     components: {
-      XdFontIcon
+      XdFontIcon,
+      XdButton
+    },
+    computed: {
+      ...mapState(['jfbAuthorize']),
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseNoticeGroupMixin
     ],
     data() {
       return {
-
-        //todo
+        contentList: [],
+        version: ''
       }
     },
     watch: {
       container(value, oldValue) {
         if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
-        if (this.$configProject['isPreview']) this.init(value)
+        if (this.$configProject['isPreview']) {
+          this.init(value);
+          this.onJfbLoad()
+        }
       },
     },
     created() {
       this.init(this.container);
-
-      //todo
     },
     methods: {
       onJfbLoad(options) {
-
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
+        this.version = this.projectAttr.headers['X-Version']
+        if (this.$configProject['isPreview']) {
+          this.version = 'v11.21.12'
+        }
+        this.getContent()
       },
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
-      init(container) {
-
-        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
+      init(container) { },
+      getContent() {
+        jfbRootExec("getNoticeNewsContent", {
+          vm: this,
+          data: {
+            page_id: this.pageAttr["page_id"], //页面ID
+            container_id: this.containerId, //组件ID
+            page_size: 200,
+          },
+        })
+          .then((res) => {
+            console.log(res, 'aiaiaaiia');
+            this.contentList = res.list
+          })
+          .catch((error) => {
+            console.error(error);
+          });
+      },
+      handleTo(item) {
+        let params = `page_id=${this.pageAttr["page_id"]}`;
+        params = `${params}&container_id=${this.containerId}&content_id=${item.content_id}`;
+        this.$xdUniHelper.navigateTo({
+          url: `/pages/content/content?${params}`
+        })
+      },
+      async handleLogout() {
+        // #ifdef H5
+        if (this.$configProject.isPreview) return;
+        // #endif
 
-        //this.height = getContainerPropsValue(container, 'content.height', 10);
+        if (this.jfbAuthorize !== null) {
+          this.$xdShowLoading({});
+          store.dispatch('logout').then(res => {
+            this.$xdHideLoading();
+            this.jfbAuthorize.removeAllToken();
+            this.jfbAuthorize.removeAllCardToken();
+            this.jfbAuthorize.jumpToUserLogin(this, false);
+          }).catch(err => {
+            console.error(err);
+          })
+        }
       },
       onJfbScroll(options) {
         console.log('event.onJfbScroll', options)
@@ -104,8 +147,28 @@
   @import "./JfbBaseNoticeGroupLess.less";
 
   .jfb-base-notice-group {
-    &__body{
+    &__body {
+      &-item {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 32rpx 46rpx;
+        background: #fff;
+        border-radius: 18rpx;
+        font-size: 25rpx;
+        color: #333;
+        margin: 20rpx;
+      }
+    }
+
+    .logout-btn {
+      margin: 60rpx auto;
+    }
 
+    .version {
+      color: #999999;
+      font-size: 24rpx;
+      text-align: center;
     }
   }
-</style>
+</style>

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -120,27 +120,46 @@
                 </view>
               </view>
             </view>
-            <view
-              class="jfb-base-order-detail__body-delivery-bottom"
-              v-if="info.film_show.detail && info.film_show.detail !== null"
-            >
-              <view class="jfb-base-order-detail__body-delivery-bottom-title">{{info.film_show.detail.title }}</view>
-              <view
-                v-for="(Ditem, Dindex) in info.film_show.detail.items"
-                :key="Dindex"
-                class="jfb-base-order-detail__body-delivery-bottom-item"
-                :style="{
-                  marginBottom: lineHeight + 'rpx'
-                }"
-              >
-                <view style="width: 130rpx"
-                  >{{ Ditem.label }} <span v-if="Ditem.label">:</span>
+            <view class="jfb-base-order-detail__body-no-delivery-supplement">
+              <view @click="handleViewSupplement(item)" class="jfb-base-order-detail__body-no-delivery-supplement-item" v-for="(item,index) in info.film_show.part" :key="index">
+                <view class="jfb-base-order-detail__body-no-delivery-supplement-item-info">
+                  <view v-if="item.tag_name" :style="{color: mainColor, borderColor: mainColor}" class="jfb-base-order-detail__body-no-delivery-supplement-item-info-tag">{{item.tag_name}}</view>
+                  <view class="jfb-base-order-detail__body-no-delivery-supplement-item-info-title">{{item.show_title}}</view>
                 </view>
-                <view>{{ Ditem.value }}</view>
+                <xd-font-icon size="24" color="#B1B1B1" icon="iconxiangyou_xian"></xd-font-icon>
               </view>
             </view>
           </view>
         </view>
+        <view
+        class="jfb-base-order-detail__body-card jfb-base-order-detail__body-delivery-info"
+        :style="{
+          background: backgroundColor,
+          border: borderBox,
+          borderRadius: radius + 'rpx',
+          boxShadow: shadowBox,
+          marginBottom: padding + 'rpx',
+        }"
+        v-if="info.film_show.detail && info.film_show.detail !== null"
+      >
+        <view class="jfb-base-order-detail__body-delivery-info-title">
+          <view :style="{background:mainColor}" class="line"></view>
+          {{info.film_show.detail.title }}
+        </view>
+        <view
+          v-for="(Ditem, Dindex) in info.film_show.detail.items"
+          :key="Dindex"
+          class="jfb-base-order-detail__body-delivery-info-item"
+          :style="{
+            marginBottom: lineHeight + 'rpx'
+          }"
+        >
+          <view style="width: 130rpx"
+            >{{ Ditem.label }} <span v-if="Ditem.label">:</span>
+          </view>
+          <view>{{ Ditem.value }}</view>
+        </view>
+      </view>
         <view v-if="info.sub_orders && info.sub_orders.length > 0">
           <view
             :style="{
@@ -804,6 +823,20 @@
       <view v-if="dialogCode && dialogCode.tips" class="dialog_password"> {{ dialogCode.tips}}</view>
       <view v-if="dialogPassword" class="dialog_password">{{ dialogPassword }}</view>
     </xd-dailog>
+    <XdDownDrawer :isClose="false" height="auto" :show.sync="showSupplement">
+      <view class="supplement">
+        <view class="supplement-title">
+          <xd-font-icon @click="showSupplement=false" color="#666" size="30" icon="iconxiangzuo_xian"></xd-font-icon>
+          <view style="margin: 0 auto">{{supplementTitle}}</view>
+        </view>
+        <view style="color: #333333;margin-top: 58rpx;font-size: 28rpx;font-weight: 500">已购</view>
+        <view class="supplement-item" v-for="(item, index) in supplementList" :key="index">
+          <view>{{item.product_name}}</view>
+          <view>{{getAmount(item.sale_price)}}元 x {{item.product_num}}</view>
+        </view>
+        <xd-button type="primary" @click="showSupplement=false">关闭</xd-button>
+      </view>
+    </XdDownDrawer>
   </view>
 </template>
 
@@ -814,6 +847,7 @@ import XdTag from "@/components/XdTag/XdTag";
 import XdUnit from "@/components/XdUnit/XdUnit";
 import XdButton from "@/components/XdButton/XdButton";
 import XdDailog from "@/components/XdDailog/XdDailog";
+import XdDownDrawer from "@/components/XdDownDrawer/XdDownDrawer";
 import { jfbRootExec } from "@/utils/xd.event";
 import JfbBaseOrderDetailMixin from "./JfbBaseOrderDetailMixin";
 import componentsMixins from "@/mixins/componentsMixins";
@@ -834,6 +868,7 @@ export default {
     XdButton,
     XdDailog,
     XdJfbImage,
+    XdDownDrawer
   },
   mixins: [componentsMixins, extsMixins, JfbBaseOrderDetailMixin],
   data() {
@@ -901,6 +936,10 @@ export default {
       showPreviewCode: true,
       is_show_product: "",
       btnTextSize: 20,
+
+      showSupplement: false,
+      supplementList: [],
+      supplementTitle: "",
     };
   },
   watch: {
@@ -969,6 +1008,10 @@ export default {
       this.getOrderDetail();
     },
 
+    getAmount(price) {
+      return this.$xdUniHelper.divisionFloatNumber(price,100)
+    },
+
     timeDown() {
       if (this.info.status.loading_timeout != "-1") {
         this.times = this.info.status.loading_timeout;
@@ -1299,6 +1342,11 @@ export default {
       });
       // #endif
     },
+    handleViewSupplement(item){
+      this.showSupplement=true;
+      this.supplementList = item.items
+      this.supplementTitle = item.show_title
+    },
     handleToLink(id, info) {
       this.$xdUniHelper.navigateTo({
         url: `${this.brandPath}?id=${id}&region_limit_tpl_id=${info.support_shops.region_limit_tpl_id}&xnamespace=${info.biz_code}`,
@@ -1417,6 +1465,12 @@ export default {
 
 <style scoped lang="less">
 @import "./JfbBaseOrderDetailLess.less";
+.line {
+  border-radius: 2px;
+  width: 6rpx;
+  height: 24rpx;
+  margin-right: 20rpx;
+}
 
 .code-url {
   display: flex;
@@ -1555,6 +1609,32 @@ export default {
           }
         }
       }
+      &-supplement {
+        border-top: 1px dashed #CCCCCC;
+        margin-top: 32rpx;
+        &-item {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          margin-top: 32rpx;
+          margin-bottom: 32rpx;
+          &-info {
+            display: flex;
+            align-items: center;
+            &-tag {
+              border: 1px solid;
+              font-size: 20rpx;
+              padding: 8rpx 16rpx;
+              border-radius: 8rpx;
+              margin-right: 20rpx;
+            }
+            &-title {
+              color: #666666;
+              font-size: 24rpx;
+            }
+          }
+        }
+      }
     }
 
     &-delivery {
@@ -1620,26 +1700,33 @@ export default {
         }
       }
 
-      &-bottom {
+      &-info {
         margin-top: unit(32, rpx);
 
         &-title {
           color: #333333;
           font-size: unit(28, rpx);
-          font-weight: 500;
           margin-bottom: unit(20, rpx);
+          display: flex;
+          align-items: center;
         }
 
         &-item {
-          color: #666666;
-          font-size: unit(28, rpx);
+          color: #333333;
+          font-size: unit(24, rpx);
           display: flex;
           margin-bottom: unit(16, rpx);
+          & > view:first-child{
+            color: #999;
+          }
 
           & > view:nth-child(2) {
             width: 80%;
           }
         }
+        &-item:last-child{
+          margin-bottom: 0 !important;
+        }
       }
     }
 
@@ -1961,5 +2048,23 @@ export default {
     }
 
   }
+
+  .supplement {
+    padding: 48rpx;
+    &-title {
+      display: flex;
+      align-items: center;
+      color: #666666;
+      font-size: 28rpx;
+    }
+    &-item {
+      margin: 34rpx 0;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      color: #666;
+      font-size: 28rpx;
+    }
+  }
 }
 </style>

package/src/components/JfbBasePersonalData/Attr.js

@@ -7,29 +7,6 @@ export default {
   style: [],
   content: (data) => {
     return [
-      0&&{
-        label: '公告组:',
-        ele: 'xd-site-news-group',
-        valueKey: 'contentGroup',
-        groupKey: 'content',
-        value: data.contentGroup || {},
-        isKey: true,
-        key: new Date().getTime(),
-        setting: {
-          config: {
-            sort: true,
-            maxlen: 100,
-            action: 'aliyun',
-            size: 5,
-            tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
-            uploadType: 'aliyun',
-            type: ['jpg', 'png', 'jpeg']
-          },
-        },
-        rules: [
-          { required: true, message: '请选择广告位', trigger: 'change' },
-        ],
-      },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbBasePointsDetail/Attr.js

@@ -6,6 +6,7 @@
 export default {
   style: [],
   content: (data) => {
+    log('content', data);
     return [
       {
         label: '外边距:',

package/src/components/JfbBasePosterGroup/JfbBasePosterGroup.vue

@@ -5,7 +5,7 @@
       <view class="jfb-base-poster-group__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-poster-group__body" :style="[bodyStyleComp]">
+    <view class="jfb-base-poster-group__body" :style="[bodyStyleComp]">      
       <view class="jfb-base-poster-group__body-header">
         <view class="jfb-base-poster-group__body-header-title">
           <XdContentXss v-html="title"></XdContentXss>
@@ -150,7 +150,7 @@
         this.morePath = getContainerPropsValue(container, 'content.morePath', { value: "" }).value;
         this.is_show_more = getContainerPropsValue(container, 'content.is_show_more', 'Y');
         this.backgroundImage = getServiceUrl(getContainerPropsValue(container, 'content.backgroundImage', { url: "" }).url);
-        this.bgColor = getContainerPropsValue(value, "content.bgColor", "#FFFFFF");
+        this.bgColor = getContainerPropsValue(container, "content.bgColor", "#FFFFFF");
         this.title = getContainerPropsValue(container, 'content.title', '<p style="font-weight:bold;font-size:16px"><span style="color: #FFF">全球大牌，会员低至</span><span style="color: #F2D894">8折</span></p>');
         this.subtitle = getContainerPropsValue(container, 'content.subtitle', '超300+品牌商品');
         this.radius = getContainerPropsValue(container, 'content.radius', 20);

package/src/components/JfbBaseSavingDetail/JfbBaseSavingDetail.vue

@@ -24,7 +24,8 @@
           <view class="jfb-base-saving-detail__body-month">
             <view @click="handleLastMonth">上一月</view>
             <view>{{monthDateRange}}</view>
-            <view @click="handleNextMonth">下一月</view>
+            <view class="monthDisabled" v-if="disabledMonth">下一月</view>
+            <view v-else @click="handleNextMonth">下一月</view>
           </view>
           <view style="width: 710rpx;height: 480rpx">
             <echarts ref="monthEcharts" :option="option" canvasId="monthEcharts"></echarts>
@@ -52,7 +53,7 @@
       </view>
       <view class="jfb-base-saving-detail__body-product">
         <view class="jfb-base-saving-detail__body-product-title">
-          <view>购物</view>
+          <view> {{tab==='month'? `${getYearAndMonth(monthDateRange).month}月结算明细` :'购物'}}</view>
           <view>已省：{{getAmout(saveAmount)}}</view>
         </view>
         <view v-if="productList.length>0">
@@ -72,6 +73,7 @@
             </view>
           </view> 
         </view>
+        <XdNoData v-else></XdNoData>
       </view>
     </view>
   </view>
@@ -79,6 +81,7 @@
 
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import XdNoData from "@/components/XdNoData/XdNoData";
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseSavingDetailMixin from "./JfbBaseSavingDetailMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
@@ -91,7 +94,8 @@
     name: "JfbBaseSavingDetail",
     components: {
       XdFontIcon,
-      echarts
+      echarts,
+      XdNoData
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseSavingDetailMixin
@@ -127,7 +131,7 @@
         saveAmount: 0, //节省金额
         productList: [],
         hasNext: true,
-        page_token: 1
+        page_token: 1,
       }
     },
     computed: {
@@ -138,6 +142,10 @@
           padding: this.getMarginAndPadding(this.tabPadding, { top: 40, right: 0, bottom: 40, left: 0 }),
         }
       },
+      disabledMonth(){
+        let month = new Date().getMonth() + 1
+        return this.getYearAndMonth(this.monthDateRange).month==month
+      }
     },
     watch: {
       container(value, oldValue) {
@@ -190,7 +198,7 @@
           })
           const textColor = '#999'
           const seriesData = res.record_months.map(item => {
-            return item.value
+            return this.getAmout(item.value)
           })
           const xAxisList = res.record_months.map(item => {
             return item.label
@@ -501,7 +509,7 @@
 
         // 获取年份和月份
         const year = date.getFullYear();
-        const month = String(date.getMonth() + 1).padStart(2);
+        const month = String(date.getMonth() + 1);
 
         return {
           year: year,
@@ -510,7 +518,7 @@
       },
       formatDate(date) {
         const year = date.getFullYear();
-        const month = String(date.getMonth() + 1).padStart(2);
+        const month = String(date.getMonth() + 1);
         return `${year}年${month}月`;
       },
       handleLastMonth() {
@@ -697,6 +705,10 @@
           }
         }
       }
+      .monthDisabled{
+        background: #FCFCFC !important;
+        color: #EEEEEE !important;
+      }
     }
   }
 </style>

package/src/components/JfbBaseWithDrawAgain/JfbBaseWithDrawAgain.vue

@@ -171,7 +171,7 @@
               package: channel_data,
               success: (request) => {
                 console.log('success:', request);
-                that.$xdUniHelper.navigateTo({ url: this.withDrawSuccessPath })
+                that.$xdUniHelper.navigateTo({ url: that.withDrawSuccessPath })
               },
               fail: (request) => {
                 console.log('fail:', request);
@@ -196,8 +196,8 @@
                 },
                   function (request) {
                     if (request.err_msg === 'requestMerchantTransfer:ok') {
-                      console.log(request,'requestrequestrequest');
-                      that.$xdUniHelper.navigateTo({ url: this.withDrawSuccessPath })
+                      console.log(request,that.withDrawSuccessPath,'requestrequestrequest');
+                      that.$xdUniHelper.navigateTo({ url: that.withDrawSuccessPath })
                     }
                   }
                 );

package/src/components/JfbBaseWithdraw/JfbBaseWithdraw.vue

@@ -11,11 +11,11 @@
           <view>提现金额</view>
           <view @click="handleAllWithDraw">全部提现</view>
         </view>
-        <input @input="handleAmountChange" class="jfb-base-withdraw__body-amount" v-model="amount"></input>
+        <input :focus="true" @input="handleAmountChange" class="jfb-base-withdraw__body-amount" v-model="amount"></input>
         <view class="jfb-base-withdraw__body-balance">可提现余额￥{{getAmout(balance)}}</view>
       </view>
       <view v-if="notice" :style="[bodyStyleComp]">
-        <XdContentXss v-html="notice"></XdContentXss>
+        <XdContentXss :html="notice"></XdContentXss>
       </view>
       <view class="fixe_bottom" :style="prod_bottom">
         <XdButton v-if="amount>0&&amount<=getAmout(balance)" fontSize="32" type="primary" @click="handleWithDraw">提现</XdButton>
@@ -133,7 +133,7 @@
           .then((res) => {
             if (res.list.length > 0) {
               if (res.list && res.list.length > 0) {
-                this.notice = this.$xdUniHelper.filterHtml(res.list[0].content);
+                this.notice = res.list[0].content;
               }
               this.noticeStatus = true;
             }