jufubao-base 1.0.187-beta2 → 1.0.187-beta3

package/package.json

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

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -391,8 +391,11 @@ export default {
       //外站配置地址
       if(entry.redirect_type === 'URL') {
         if(regHttp.test(entry.redirect_data['path']) || regSp.test(entry.redirect_data['path'])) {
+          let urlPath = entry.redirect_data['path'];
+          if(urlPath.indexOf('?') === -1) urlPath = `${urlPath}?x-common=${nsp}&vs=${new Date().getTime()}`;
+          else urlPath = `${urlPath}&x-common=${nsp}&vs=${new Date().getTime()}`;
           this.$xdUniHelper.redirectTo({
-            url:`${entry.redirect_data['path']}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`
+            url:urlPath
           }, false)
         }
         else {

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -706,7 +706,7 @@ export default {
      */
     handleBindLogin(item , entry) {
       //卡券登录
-      if (this.tabIndex === 1||this.tabIndex === 2) {
+      if (this.tabIndex === 1 || this.tabIndex === 2) {
         if (item["is_valid"] !== "Y") {
           return;
         }
@@ -719,6 +719,7 @@ export default {
           }, false);
           return
         }
+
         jfbRootExec("loginEntryCardBind", {
           vm: this,
           data: { card_number: item["card_number"] },
@@ -736,7 +737,6 @@ export default {
             if (this.$configProject.isPreview) {
               console.log("handleBindLogin", "预览模式不跳转", this.inCallback);
             }
-
             else {
               this.handleClick(entry);
             }
@@ -775,7 +775,15 @@ export default {
     },
 
     handleClick(entry){
-      if (this.$configProject['isPreview']) return
+      if (this.$configProject['isPreview']) return;
+
+      //登陆成功，有回调地址返回回调地址
+      if(this.inCallbackUrlOrg) {
+        this.$xdUniHelper.redirectTo({
+          url:this.inCallback
+        }, false);
+        return;
+      }
 
       const {dir, path, host, appType} = entry['redirect_data'];
       let regHttp = /^(\/\/|http:\/\/|https:\/\/).+$/;
@@ -787,8 +795,11 @@ export default {
       //外站配置地址
       if(entry.redirect_type === 'URL') {
         if(regHttp.test(entry.redirect_data['path']) || regSp.test(entry.redirect_data['path'])) {
+          let urlPath = entry.redirect_data['path'];
+          if(urlPath.indexOf('?') === -1) urlPath = `${urlPath}?x-common=${nsp}&vs=${new Date().getTime()}`;
+          else urlPath = `${urlPath}&x-common=${nsp}&vs=${new Date().getTime()}`;
           this.$xdUniHelper.redirectTo({
-            url:`${entry.redirect_data['path']}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`
+            url:urlPath
           }, false)
         }
         else {
@@ -845,7 +856,7 @@ export default {
       if(options['x-test'] === 'jfb-console') this.showIndex = true;
       this.options = options;
       let { inCallback } = options;
-      this.force = inCallback?true:false;
+      this.force = !!inCallback;
       if(!inCallback) this.$storage.remove("inCallback"); //作为入口
       else {
         this.$storage.set("inCallback", inCallback);
@@ -947,6 +958,7 @@ export default {
           this.handleCardInit(this.ajaxCardList, type);
           this.cardPageNum = 1;
           this.$xdHideLoading();
+
         })
         .catch(() => this.$xdHideLoading());
     },

package/src/components/JfbBaseFastLink/XdFastNav.vue

@@ -30,7 +30,7 @@
           <view v-show="index !== 0" :style="{background: lineColor}"></view>
         </view>
       </view>
-      <view class="xd-fast-nave__body-mask" v-if="!close" @click="close=true"></view>
+      <view class="xd-fast-nave__body-mask" v-if="0&&!close" @click="close=true"></view>
     </view>
   </view>
 </template>
@@ -112,7 +112,6 @@
           console.warn(item.path);
           return;
         }
-        this.close = true;
         this.$xdUniHelper.navigateTo({
           url: item.path
         },false);

package/src/components/JfbBaseFooter/JfbBaseFooter.vue

@@ -93,12 +93,12 @@
     created() {
       this.view = this.$configProject.isPreview;
 
-      //生产模式 + 非预览模式
-      if (this.$configProject.UNI_PLATFORM === 'h5'
-        && this.$configProject.NODE_ENV === 'production'
-      ){
+      //非预览模式
+      //#ifdef H5
+      if (!this.$configProject.isPreview){
         this.baseUrl = this.projectAttr['deploy_dir']
       }
+      //#endif
 
       //设置高度
       if(this.$configProject.isPreview) {

package/src/components/JfbBaseOrderDetail/Api.js

@@ -12,6 +12,7 @@ module.exports = [
     isRule: false,
     params: {
       main_order_id: ['id', 'Number', '必选'],
+      is_show_product: ['是否显示商品 1=显示,0=隐藏 仅电子码商品', 'Number', '非必选'],
     },
     isConsole: true,
     disabled: true,

package/src/components/JfbBaseOrderDetail/Attr.js

@@ -485,6 +485,146 @@ export default {
         },
         inline: false,
       },
+
+      // 废弃 - 隐藏
+      {
+        label: '是否有投影:',
+        ele: 'xd-radio',
+        groupKey:'style',
+        valueKey: 'is_shadow',
+        value: data['is_shadow'] || 'N',
+        placeholder: '请选择是否投影',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '是', value: 'Y' },
+          { label: '否', value: 'N' },
+        ],
+        hidden: true,
+      },
+      data['is_shadow'] === 'Y' && {
+        label: '投影颜色:',
+        ele: 'xd-color',
+        groupKey:'style',
+        valueKey: 'is_shadow_bg',
+        value: data['is_shadow_bg'] || '',
+        placeholder: '请选择投影颜色',
+        classNmae: 'input80',
+        hidden: true,
+      },
+      data['is_shadow'] === 'Y' && {
+        label: '投影范围:',
+        ele: 'xd-site-select-list',
+        valueKey: 'is_shadow_w',
+        groupKey:'style',
+        value: data['is_shadow_w'] || '10',
+        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);
+            });
+        },
+        hidden: true,
+      },
+      {
+        label: '是否有边框:',
+        ele: 'xd-radio',
+        valueKey: 'is_border',
+        value: data['is_border'] || 'N',
+        groupKey:'style',
+        placeholder: '请选择是否有边框',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '是', value: 'Y' },
+          { label: '否', value: 'N' },
+        ],
+        hidden: true,
+      },
+      data['is_border'] === 'Y' && {
+        label: '边框颜色:',
+        ele: 'xd-color',
+        groupKey:'style',
+        valueKey: 'is_border_c',
+        value: data['is_border_c'] || '',
+        placeholder: '请选择边框颜色',
+        className: 'input80',
+        hidden: true,
+      },
+      data['is_border'] === 'Y' && {
+        label: '边框大小:',
+        groupKey:'style',
+        ele: 'el-input',
+        type: 'number',
+        valueKey: 'is_border_w',
+        value: data['is_border_w'] || '',
+        placeholder: '请输入边框颜色',
+        className: 'input80',
+        hidden: true,
+      },
+       {
+        label: '是否展开票券信息:',
+        ele: 'xd-radio',
+        valueKey: 'is_open',
+        value: data['is_open'] || 'N',
+        groupKey:'content',
+        placeholder: '请选择是否展开票券信息',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '展开', value: 'Y' },
+          { label: '收起', value: 'N' },
+        ]
+      },
+      {
+        label: '是否显示商品信息:',
+        ele: 'xd-radio',
+        valueKey: 'is_show_product',
+        groupKey:'content',
+        value:data['is_show_product'] || 'Y',
+        placeholder: '请选择',
+        list: [
+          {"label": "是", "value": "Y"},
+          {"label": "否", "value": "N"},
+        ],
+      },
+      {
+        label: '是否展开商品详情:',
+        ele: 'xd-radio',
+        valueKey: 'is_show_all_detail',
+        value: data['is_show_all_detail'] || 'N',
+        groupKey:'content',
+        placeholder: '请选择是否展开商品详情',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '展开', value: 'Y' },
+          { label: '收起', value: 'N' },
+        ]
+      },
+      {
+        label: '提货码展示/隐藏:',
+        ele: 'xd-radio',
+        valueKey: 'is_show',
+        value: data['is_show'] || '1',
+        groupKey:'content',
+        placeholder: '请选择提货码展示/隐藏',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '显示', value: '1' },
+          { label: '隐藏', value: '0' },
+        ]
+      },
     ].filter(i=>i)
   },
 }

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -265,7 +265,7 @@
             class="jfb-base-order-detail__body-card jfb-base-order-detail__body-cashier"
           >
             <view class="jfb-base-order-detail__body-cashier-text">{{info.codes[0].show_type === "qrcode" ? "二维码" : "条形码" }}</view>
-            <view style="position: relative">
+            <view v-if="showPreviewCode" style="position: relative">
               <image
                 :style="{
                   height: info.codes[0].show_type === 'qrcode' ? '50vw' : '25vw',
@@ -568,20 +568,18 @@
             ></view>
           </view>
           <view v-if="info.pay_info.cards && info.pay_info.cards.length > 0">
-            <view class="jfb-base-order-detail__body-show" v-if="!showPayCard">
+            <view @click="showPayCard = true" class="jfb-base-order-detail__body-show" v-if="!showPayCard">
               <text>使用 {{ info.pay_info.cards.length }} 张票券 展开</text>
               <xd-font-icon
                 style="margin-left: 8rpx"
-                @click="showPayCard = true"
                 size="28"
                 icon="iconxia_down"
               ></xd-font-icon>
             </view>
-            <view class="jfb-base-order-detail__body-show" v-else>
+            <view @click="showPayCard = false" class="jfb-base-order-detail__body-show" v-else>
               <text>使用{{ info.pay_info.cards.length }}张票券 收起</text>
               <xd-font-icon
                 style="margin-left: 8rpx"
-                @click="showPayCard = false"
                 size="28"
                 icon="iconshang_up"
               ></xd-font-icon>
@@ -665,8 +663,26 @@
           <view class="jfb-base-order-detail__body-shop-title">
             <view :style="{ background: mainColor }"></view>
             <view>商品详情</view>
+            <view @click="showAllProductDetail=!showAllProductDetail" v-if="!showAllProductDetail" class="jfb-base-order-detail__body-product-show">
+              <text> 展开</text>
+              <xd-font-icon
+                style="margin-left: 8rpx"
+                size="28"
+                icon="iconxia_down"
+              ></xd-font-icon>
+            </view>
+            <view @click="showAllProductDetail=!showAllProductDetail" v-if="showAllProductDetail" class="jfb-base-order-detail__body-product-show">
+              <text> 收起</text>
+              <xd-font-icon
+                style="margin-left: 8rpx"
+                size="28"
+                icon="iconxia_down"
+              ></xd-font-icon>
+            </view>         
+          </view>
+          <view class="jfb-base-order-detail__body-html" v-if="showAllProductDetail">
+            <view v-html="info.productDetail"></view>
           </view>
-          <view v-html="info.productDetail"></view>
         </view>
         <view
           v-if="info.custom_content"
@@ -695,7 +711,7 @@
         :style="prod_bottom"
         v-if="info.buttons && info.buttons.length > 0"
       >
-        <view :style="[bottomBoxStyle]">
+        <view :style="[bottomBoxStyle]" class="btn_wrap">
           <view v-for="(item, index) in info.buttons" :key="index">
             <view
               style="display: flex; align-items: center"
@@ -836,14 +852,19 @@ export default {
       backgroundColor: "",
       padding: 0,
 
+      //投影
+      is_shadow: "Y",
+      is_shadow_bg: 0,
+      is_shadow_w: 0,
+
+      //边框
+      is_border: "Y",
+      is_border_w: 0,
+      is_border_c: "",
+
 
       //其他
-      margin: {
-        top: 0,
-        left: 0,
-        right: 0,
-        bottom: 0,
-      },
+      margin: {},
       is_hot: "Y",
       logo: "",
       lineHeight: 20,
@@ -855,6 +876,12 @@ export default {
       bottomPadding: "",
       bottomBgColor: "",
       bottomBtnHeight: "",
+      is_open: '',
+      is_show: '',
+      showAllProductDetail: false,
+      is_show_all_detail: '',
+      showPreviewCode: true,
+      is_show_product: "",
     };
   },
   watch: {
@@ -940,13 +967,15 @@ export default {
         this.getCountDown();
       }
     },
-    getOrderDetail() {
+    getOrderDetail() {      
       jfbRootExec("getBaseOrderDetail", {
         vm: this,
         data: {
           main_order_id: this.main_order_id,
           custom_content_page_id: this.pageAttr.page_id,
           custom_content_container_id: this.cid,
+          is_show_jhd_code: Number(this.is_show),
+          is_show_product: this.is_show_product === "Y" ? 1 : 0,
         },
       })
         .then((res) => {
@@ -1073,7 +1102,7 @@ export default {
           }
 
           //增加删除订单按钮
-          if(this.is_show_delete_order  === 'Y') {
+          if(this.is_show_delete_order === 'Y') {
             let pay = (res.buttons||[]).filter(item => item.action === 'pay');
             let del = [{action:'delete', text:'删除订单', type: 'info'}];
             if(pay.length === 1) del = []
@@ -1086,11 +1115,12 @@ export default {
           }
 
           if (res.product) {
-            jfbRootExec("getBaseProductDetail", {
+            try {
+              jfbRootExec("getBaseProductDetail", {
               vm: this,
               data: {
-                xnamespace: info.product.business_code,
-                product_id: info.product.product_id,
+                xnamespace: res.product.business_code,
+                product_id: res.product.product_id,
               },
             })
               .then((result) => {
@@ -1103,6 +1133,11 @@ export default {
               .catch((err) => {
                 console.log(err, "err");
               });
+            } catch (error) {
+              console.log(error,'apapapa');
+              
+            }
+            
           }
           else {
             this.info = res;
@@ -1134,23 +1169,48 @@ export default {
       this.brandTextColor = getContainerPropsValue(container, "content.brandTextColor", this.mainColor);
       this.padding = getContainerPropsValue(container, "content.padding", 20);
 
+      this.is_shadow = getContainerPropsValue(container, "content.is_shadow", "N");
+      this.is_shadow_bg = getContainerPropsValue(container, "content.is_shadow_bg", "#fff");
+      this.is_shadow_w = getContainerPropsValue(container, "content.is_shadow_w", "10");
+
+      this.is_border = getContainerPropsValue(container, "content.is_border", "N");
+      this.is_border_c = getContainerPropsValue(container, "content.is_border_c", "#fff");
+      this.is_border_w = getContainerPropsValue(container, "content.is_border_w", 2);
+
       this.is_hot = getContainerPropsValue(container, "content.is_hot", "Y");
       this.viewStatus = getContainerPropsValue(container, "content.viewStatus", "mall");
       this.is_show_support_shop = getContainerPropsValue(container, "content.is_show_support_shop", "N");
       this.is_show_delete_order = getContainerPropsValue(container, "content.is_show_delete_order", "N");
       this.lineHeight = getContainerPropsValue(container, "content.lineHeight", 20);
       let sectionShadow = getContainerPropsValue(container, "content.sectionShadow", "");
-      if(sectionShadow.type === 'Y' && sectionShadow.value){
-        this.sectionShadow = `0 0 ${sectionShadow.value.width}rpx ${sectionShadow.value.color}`;
-      }else this.sectionShadow = '';
+      this.sectionShadow = this.getShadowCompatibleOldStyle(sectionShadow, {
+        type: this.is_shadow,
+        width: this.is_shadow_w,
+        color: this.is_shadow_bg,
+      })
       let sectionBorder = getContainerPropsValue(container, "content.sectionBorder", "");
-      if(sectionBorder.type === 'Y' && sectionBorder.value){
-        this.sectionBorder = `${sectionBorder.value.width}rpx solid ${sectionBorder.value.color}`;
-      }else this.sectionBorder = '';
+      this.sectionBorder = this.getBorderCompatibleOldStyle(sectionBorder, {
+        type: this.is_border,
+        width: this.is_border_w,
+        color: this.is_border_c,
+      })
       this.bottomBtnRadius = getContainerPropsValue(container, "content.bottomBtnRadius", 0);
       this.bottomPadding = getContainerPropsValue(container, "content.bottomPadding", {});
       this.bottomBgColor = getContainerPropsValue(container, "content.bottomBgColor", "#ffffff");
       this.bottomBtnHeight = getContainerPropsValue(container, "content.bottomBtnHeight", 60);
+      this.is_open = getContainerPropsValue(container, "content.is_open", "N");
+      this.is_show = getContainerPropsValue(container, "content.is_show", '1');
+      this.showPayCard = this.is_open==='Y'
+      this.is_show_all_detail = getContainerPropsValue(container, "content.is_show_all_detail", "N");
+      this.is_show_product = getContainerPropsValue(container, "content.is_show_product", "Y");
+      this.showAllProductDetail = this.is_show_all_detail==='Y'
+      if(this.isPreview) {
+        if(this.is_show==='0') {
+          this.showPreviewCode = false;
+        } else {
+          this.showPreviewCode = true;
+        }
+      }
     },
     getCountDown() {
       this.timer = setInterval(() => {
@@ -1797,12 +1857,33 @@ export default {
       justify-content: flex-end;
       align-items: center;
 
-      & > view {
-        margin-left: unit(20, rpx);
-        font-size: @xd-font-size-lg;
+      .btn_wrap{
+        display: flex;
+        & > view {
+          margin-left: unit(20, rpx);
+          font-size: @xd-font-size-lg;
+        }
       }
     }
 
+    &-product {
+      &-show {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        padding: unit(16, rpx);
+        border-radius: unit(4, rpx);
+        color: #999999;
+        font-size: unit(24, rpx);
+        margin-left:10px
+      }
+    }
+
+    &-html {
+      padding: unit(20, rpx) 0;
+      color: #999;
+    }
+
   }
   .dialog_password{
     text-align: center;

package/src/components/JfbBaseOrderList/Attr.js

@@ -96,11 +96,38 @@ export default {
         inline: false,
         notice: '间距设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
+      {
+        label: "投影设置:",
+        ele: "xd-shadow",
+        valueKey: "sectionShadow",
+        value: data.sectionShadow || {},
+        groupKey:'style',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+              data.cb([])
+            });
+        },
+      },
+      {
+        label: '边框设置：',
+        ele: 'xd-border',
+        valueKey: 'sectionBorder',
+        groupKey:'style',
+        value: data.sectionBorder || {},
+        placeholder: '请选择边框设置',
+        inline: false,
+      },
       {
         ele: 'title',
         label: '投影设置',
         size: 'small',
         groupKey:'style',
+        hidden: true,
       },
       {
         label: '是否有投影:',
@@ -114,7 +141,8 @@ export default {
         list: [
           {label: '是', value: 'Y'},
           {label: '否', value: 'N'},
-        ]
+        ],
+        hidden: true,
       },
       data['is_shadow'] === 'Y' && {
         label: '投影颜色:',
@@ -124,6 +152,7 @@ export default {
         value: data['is_shadow_bg'] || '',
         placeholder: '请选择投影颜色',
         classNmae: 'input80',
+        hidden: true,
       },
       data['is_shadow'] === 'Y' && {
         label: '投影范围:',
@@ -146,12 +175,14 @@ export default {
               console.error(error);
             });
         },
+        hidden: true,
       },
       {
         ele: 'title',
         label: '边框设置',
         size: 'small',
         groupKey:'style',
+        hidden: true,
       },
       {
         label: '是否有边框:',
@@ -165,7 +196,8 @@ export default {
         list: [
           {label: '是', value: 'Y'},
           {label: '否', value: 'N'},
-        ]
+        ],
+        hidden: true,
       },
       data['is_border'] === 'Y' && {
         label: '边框颜色:',
@@ -175,6 +207,7 @@ export default {
         value: data['is_border_c'] || '',
         placeholder: '请选择边框颜色',
         classNmae: 'input80',
+        hidden: true,
       },
       data['is_border'] === 'Y' && {
         label: '边框大小:',
@@ -185,6 +218,7 @@ export default {
         value: data['is_border_w'] || '',
         placeholder: '请输入边框大小',
         className: 'input80',
+        hidden: true,
       },
       {
         label: '内容圆角设置:',