jufubao-base 1.0.63-beta5 → 1.0.63

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -533,6 +533,38 @@
             >地址： {{ info.shop.shop_address }}
           </view>
         </view>
+        <view
+          :style="{
+            background: backgroundColor,
+            border: borderBox,
+            borderRadius: radius + 'rpx',
+            boxShadow: shadowBox,
+            marginBottom: padding + 'rpx',
+          }"
+          v-if="info.detail"
+          class="jfb-base-order-detail__body-card"
+        >
+          <view
+            v-for="(item, index) in info.detail"
+            :key="index"
+            class="jfb-base-order-detail__body-order"
+          >
+            <view :style="{ fontWeight: item.style }">
+              <view
+              ><text v-html="item.label"></text
+              ><text v-if="item.label">：</text></view
+              >
+              <view v-html="item.value"></view>
+            </view>
+            <view
+              :style="{ marginLeft: '30rpx' }"
+              v-if="item.type === 'copy'"
+              class="jfb-base-order-detail__body-order-copy"
+              @click="copy(item.value)"
+            >复制</view
+            >
+          </view>
+        </view>
         <view
           v-if="info.pay_info && biz_code !== 'gift'"
           class="jfb-base-order-detail__body-card"
@@ -625,35 +657,6 @@
           </view>
         </view>
         </view>
-        <view
-          :style="{
-            background: backgroundColor,
-            border: borderBox,
-            borderRadius: radius + 'rpx',
-            boxShadow: shadowBox,
-            marginBottom: padding + 'rpx',
-          }"
-          v-if="info.detail"
-          class="jfb-base-order-detail__body-card"
-        >
-          <view
-            v-for="(item, index) in info.detail"
-            :key="index"
-            class="jfb-base-order-detail__body-order"
-          >
-            <view :style="{ fontWeight: item.style }">
-              <view><text v-html="item.label"></text><text v-if="item.label">：</text></view>
-              <view v-html="item.value"></view>
-            </view>
-            <view
-              :style="{'marginLeft': '30rpx'}"
-              v-if="item.type === 'copy'"
-              class="jfb-base-order-detail__body-order-copy"
-              @click="copy(item.value)"
-              >复制</view
-            >
-          </view>
-        </view>
         <view
           v-if="info.productDetail"
           class="jfb-base-order-detail__body-card jfb-base-order-detail__body-shop"
@@ -830,6 +833,11 @@ export default {
         this.getOrderDetail();
       }
     },
+    is_hot(n, o) {
+      if (this.isPreview) {
+        this.getOrderDetail();
+      }
+    },
   },
   computed: {
     prod_bottom() {
@@ -943,6 +951,14 @@ export default {
                 );
                 return Sitem;
               });
+              if (this.is_hot === "Y") {
+                item.info.push({
+                  label: "客服电话",
+                  style: "normal",
+                  type: "text",
+                  value: this.isPreview ? '010-66666' :this.siteInfo.mapping.customer_phone,
+                });
+              }
               return item;
             });
           res.pay_info.cards =

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetailLess.less

@@ -15,7 +15,7 @@
 .jfb-base-order-detail {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseOrderList/JfbBaseOrderListLess.less

@@ -15,7 +15,7 @@
 .jfb-base-order-list {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBasePay/JfbBasePayLess.less

@@ -15,7 +15,7 @@
 .jfb-base-pay {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollectLess.less

@@ -15,7 +15,7 @@
 .jfb-base-phone-collect {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLoginLess.less

@@ -15,7 +15,7 @@
 .jfb-base-phone-login {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBasePoster/JfbBasePosterLess.less

@@ -15,7 +15,7 @@
 .jfb-base-poster {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBasePosterEntry/JfbBasePosterEntryLess.less

@@ -15,7 +15,7 @@
 .jfb-base-poster-entry {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBasePosterType/Attr.js

@@ -285,7 +285,7 @@ export default {
         list: [
           {"label": "一行", "value": 1},
           {"label": "两行", "value": 2},
-          {"label": "两行", "value": 3},
+          {"label": "三行", "value": 3},
         ]
       },
       {

package/src/components/JfbBasePosterType/JfbBasePosterTypeLess.less

@@ -15,7 +15,7 @@
 .jfb-base-poster-type {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseRecharge/JfbBaseRechargeLess.less

@@ -15,7 +15,7 @@
 .jfb-base-recharge {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseRechargeOrder/JfbBaseRechargeOrderLess.less

@@ -15,7 +15,7 @@
 .jfb-base-recharge-order {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseRechargeOrderDetail/JfbBaseRechargeOrderDetailLess.less

@@ -15,7 +15,7 @@
 .jfb-base-recharge-order-detail {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseRechargeSuccess/JfbBaseRechargeSuccessLess.less

@@ -15,7 +15,7 @@
 .jfb-base-recharge-success {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseSearch/JfbBaseSearchLess.less

@@ -15,7 +15,7 @@
 .jfb-base-search {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseSetPwd/JfbBaseSetPwdLess.less

@@ -15,7 +15,7 @@
 .jfb-base-set-pwd {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseSuccess/JfbBaseSuccessLess.less

@@ -15,7 +15,7 @@
 .jfb-base-success {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseTestApi/JfbBaseTestApiLess.less

@@ -15,7 +15,7 @@
 .jfb-base-test-api {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseTestBody/JfbBaseTestBodyLess.less

@@ -15,7 +15,7 @@
 .jfb-base-test-body {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseTestBottom/JfbBaseTestBottomLess.less

@@ -15,7 +15,7 @@
 .jfb-base-test-bottom {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseTestNotice/JfbBaseTestNoticeLess.less

@@ -15,7 +15,7 @@
 .jfb-base-test-notice {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseTestTop/JfbBaseTestTopLess.less

@@ -15,7 +15,7 @@
 .jfb-base-test-top {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseUserCenter/JfbBaseUserCenterLess.less

@@ -15,7 +15,7 @@
 .jfb-base-user-center {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseUserInfo/JfbBaseUserInfoLess.less

@@ -15,7 +15,7 @@
 .jfb-base-user-info {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseUserOrder/JfbBaseUserOrderLess.less

@@ -15,7 +15,7 @@
 .jfb-base-user-order {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseVideo/Api.js

@@ -0,0 +1,19 @@
+'use strict';
+
+module.exports = [
+  {
+    mapFnName: 'getListVideoContent', //自定义方法名字（必选）
+    title: '获取内容',
+    path: '/cms/v1/ad-content',
+    isRule: false,
+    params: {
+      scene: ['使用场景', 'String', '选填'],
+      container_id: ['插件ID', 'String', '必填'],
+      page_id: ['页面ID', 'String', '必填'],
+      page_size: ['记录条数', 'Number', '必填'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+
+];

package/src/components/JfbBaseVideo/Attr.js

@@ -0,0 +1,259 @@
+'use strict';
+
+import console from "@dcloudio/uni-h5/src/core/helpers/console";
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style:[],
+  content:(params)=>{
+    return [
+      {
+        label: '视频位置配置:', //label
+        ele: 'xd-site-poster', //package 名称
+        valueKey: 'video', //form[valueKey]
+        className: 'input80',
+        value: params.video || {},
+        setting: {
+          count: 1,
+          scene: {label: '视频', value: 'video'}
+        },
+        handleCustom({action, data}) {
+          //设置场景参数
+          if(data) {
+            data.params = Object.assign({}, {scene: 'video'}, data.params || {})
+          }
+
+          //获取显示内容
+          if (action === 'screenList') {
+            XdBus.getParentApi('getOptionsSettingList')({setting_id: 'editx_base_ad_split_screen'})
+              .then(res => {
+                data.cb(res['list'])
+              })
+              .catch(error => {
+                console.error(error);
+              });
+            return
+          }
+
+          //获取返回参数(广告位高度必选项)
+          if (action === 'getPosterInfo') {
+            XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
+              .then(res => {
+                data.cb({list: res.list, selectId: res.selected})
+              })
+              .catch(error => {
+                console.error(error);
+              });
+            return
+          }
+
+          //使用内容分类
+          if (action === 'cmsPublishEditxContent') {
+            XdBus.getParentApi('cmsPublishEditxContent')(data.params)
+              .then(res => {
+                data.cb(res)
+              })
+              .catch(error => {
+                console.error(error);
+              });
+            return
+          }
+
+          let loading = XdBus.getParentApi('loading')({});
+          //位置列表
+          if (action === 'getListPostion') {
+            XdBus.getParentApi('getListPosterPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
+          //位置创建
+          if (action === 'addPostion') {
+            XdBus.getParentApi('addPosterPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //位置编辑
+          if (action === 'editPostion') {
+            XdBus.getParentApi('updatePosterPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //位置删除
+          if (action === 'deleltePostion') {
+            XdBus.getParentApi('deletePosterPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //获取广告位内容列表
+          if (action === 'getListContent') {
+            XdBus.getParentApi('getListPosterContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
+          //广告内容创建
+          if (action === 'addContent') {
+            XdBus.getParentApi('addPosterContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //广告内容编辑
+          if (action === 'editContent') {
+            XdBus.getParentApi('updatePosterContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //广告内容删除
+          if (action === 'deleteContent') {
+            XdBus.getParentApi('deletePosterContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //获取广告内容跳转地址类型
+          if (action === 'jumpPosterContentType') {
+            XdBus.getParentApi('getOptionsSettingList')({setting_id: "cms_setting"})
+              .then(res => {
+                loading.close();
+                data.cb(res['redirect_type'])
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
+          //发布
+          if (action === 'publish') {
+            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 === 'router') {
+            loading.close()
+            return XdBus.getParentApi('getPagesTree');
+
+          }
+
+          //通知页面进行刷新
+          if(action === 'update') {
+            XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
+            loading.close()
+          }
+        },
+        inline: false,
+        notice: '',
+        rules: [
+          {required: true, message: '请选择视频位置', trigger: 'change'},
+        ],
+      },
+      {
+        label: '视频位边距设置:',
+        ele: 'xd-margin-padding',
+        valueKey: 'margin',
+        value: params.margin || null,
+        disabled: false,
+        setting: {
+          type: 'margin',
+        },
+        placeholder: '请设置视频位边距设置',
+
+      },
+      {
+        label: '内容圆角设置:',
+        ele: 'xd-site-select-list',
+        valueKey: 'radius',
+        value: params['radius'] || '0',
+        placeholder: '请选择内容圆角设置',
+        multiple: false,
+        className: 'input80',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({
+            setting_id: 'edtix_style_radius',
+            key: Date.now()
+          })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
+    ].filter(i=>i)
+  },
+  advanced: [
+
+  ],
+};