jufubao-base 1.0.209-beta1 → 1.0.209-beta100

package/package.json

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

package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue

@@ -198,11 +198,11 @@ export default {
   },
   methods: {
     handleLabel(el){
-      // this.card_password_focus = false;
-      // this.card_number_focus = false;
-      // setTimeout(()=>{
-      //   this[`${el}_focus`] = true;
-      // },50)
+      this.card_password_focus = false;
+      this.card_number_focus = false;
+      setTimeout(()=>{
+        this[`${el}_focus`] = true;
+      },50)
     },
     handleIcon(){
       this.isPassword = !this.isPassword

package/src/components/JfbBaseConList/JfbBaseConList.vue

@@ -280,8 +280,7 @@ export default {
       btn_txt: "",
       btn_style: {},
       btnTextSize: '',
-      is_blank_page: 'Y',
-      foreign_id: null
+      is_blank_page: 'Y'
     };
   },
   computed: {
@@ -534,7 +533,6 @@ export default {
           namespace: this.pageBusinessCode,
           activity_id: this.activity_id,
           prize_id: item.prize_id,
-          foreign_id: this.foreign_id
         },
       })
         .then((res) => {
@@ -568,7 +566,6 @@ export default {
           distribution_method: this.method,
           namespace: this.pageBusinessCode,
           activity_id: this.activity_id,
-          foreign_id: this.foreign_id
         },
       })
         .then((res) => {
@@ -663,7 +660,6 @@ export default {
       console.log(this.pageBusinessCode, "pageNamespace");
       this.options = options;
       this.activity_id = options.activity_id;
-      this.foreign_id = options.foreign_id;
       this.method = options.distribution_method
         ? options.distribution_method
         : "entry";

package/src/components/JfbBaseNotice/Attr.js

@@ -291,6 +291,7 @@ export default {
         groupKey:'content',
         value: data['btnConfirmBgColor'] || '',
         placeholder: '请选择按钮背景颜色',
+        groupKey: "content",
       },
       {
         label: "按钮文字颜色:",

package/src/components/JfbBaseRecharge/Api.js

@@ -50,25 +50,4 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
-  {
-    mapFnName: "cardRechargeNew",
-    title: "获取卡券套餐列表",
-    path: "/card/v1/new-card-recharge/create-order",
-    isRule: false,
-    data: {
-      package_id: ['套餐ID', "String", "必填"]
-    },
-    isConsole: true,
-    disabled: true
-  },
-  {
-    mapFnName: "cardRechargeList",
-    title: "卡券充值下单",
-    path: "/card/v1/new-card-recharge/list",
-    isRule: false,
-    params: {},
-    isConsole: true,
-    disabled: true
-  },
-
 ];

package/src/components/JfbBaseRecharge/Attr.js

@@ -27,6 +27,7 @@ export default {
         placeholder: '请输入票券充值点数自定义文案',
         className: 'input80'
       },
+
       {
         label: '注意事项:',
         ele: 'xd-site-news',

package/src/components/JfbBaseRecharge/JfbBaseRecharge.vue

@@ -14,47 +14,43 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-recharge__body">
-      <view class="recharge">
-        <view class="recharge-list">
-          <view class="recharge-item">
-            <view class="jfb-base-recharge__body-card">
-              <view>
-                <view class="jfb-base-recharge__body-form">
-                  <input v-model="cardNumber" :placeholder="card_num_placeholder" />
-                </view>
-                <view class="jfb-base-recharge__body-form">
-                  <input v-model="card_point" :placeholder="point_placeholder" />
-                </view>
-                <view
-                  v-if="amount && card_point"
-                  :style="{
-                    color: mainColor,
-                    fontSize: '24rpx',
-                    paddingBottom: '32rpx',
-                  }"
-                >支付金额：{{ amount }} 元</view>
-                <xd-button
-                  size="medium"
-                  type="primary"
-                  :bgColor="mainColor"
-                  @click="handleToRecharge"
-                  :disabled="!amount || !card_point || !cardNumber"
-                >提交</xd-button>
-              </view>
-            </view>
+      <view class="jfb-base-recharge__body-card">
+        <view>
+          <view class="jfb-base-recharge__body-form">
+            <input v-model="cardNumber" :placeholder="card_num_placeholder" />
           </view>
+          <view class="jfb-base-recharge__body-form">
+            <input v-model="card_point" :placeholder="point_placeholder" />
+          </view>
+          <view
+            v-if="amount&&card_point"
+            :style="{
+              color: mainColor,
+              fontSize: '24rpx',
+              paddingBottom: '32rpx',
+            }"
+          >
+            支付金额：{{ amount }} 元
+          </view>
+          <xd-button
+            size="medium"
+            type="primary"
+            :bgColor="mainColor"
+            @click="handleToRecharge"
+            :disabled="!amount || !card_point || !cardNumber"
+            >提交</xd-button>
         </view>
-        <view class="xd-notice-content" v-if="content">
-          <view>注意事项:</view>
-          <view v-html="content" class="prod_info"></view>
-        </view>
-        <view
-          v-if="isPreview && statusContent === true && content === '' "
-          class="xd-notice"
-          :style="{ color: dangerColor,fontSize: 24 + 'rpx',backgroundColor:noticeBgc }"
-        >注意事项未配置数据，因此改模块在正式环境将不显示</view>
-        <view class="bottom_btn-mask"></view>
       </view>
+      <view class="xd-notice-content" v-if="content">
+        <view>注意事项:</view>
+        <view v-html="content" class="prod_info"></view>
+      </view>
+      <view
+        v-if="isPreview && statusContent === true && content === '' "
+        class="xd-notice"
+        :style="{ color: dangerColor,fontSize: 24 + 'rpx',backgroundColor:noticeBgc }"
+      >注意事项未配置数据，因此改模块在正式环境将不显示</view>
+      <view class="bottom_btn-mask"></view>
     </view>
   </view>
 </template>
@@ -62,27 +58,24 @@
 <script>
 import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
 import XdButton from "@/components/XdButton/XdButton";
-import XdUnit from "@/components/XdUnit/XdUnit.vue";
 import { jfbRootExec } from "@/utils/xd.event";
 import JfbBaseRechargeMixin from "./JfbBaseRechargeMixin";
 import { getContainerPropsValue } from "@/utils/xd.base";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
 import Color from "color";
-import getServiceUrl from "@/common/getServiceUrl";
 export default {
   name: "JfbBaseRecharge",
   components: {
     XdFontIcon,
     XdButton,
-    XdUnit
   },
   mixins: [componentsMixins, extsMixins, JfbBaseRechargeMixin],
   data() {
     return {
-      closeMask: true,
       card_num_placeholder: "",
       point_placeholder: "",
+
       cardNumber: "",
       card_point: "",
       payPath: "",
@@ -124,12 +117,20 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {
-      this.card_num_placeholder = getContainerPropsValue(this.container, "content.card_num_placeholder", "输入券号");
-      this.point_placeholder = getContainerPropsValue(this.container, "content.point_placeholder", "充值点数");
-      this.payPath = getContainerPropsValue(container, "content.payPath", {value: "",}).value;
+      this.card_num_placeholder = getContainerPropsValue(
+        this.container,
+        "content.card_num_placeholder",
+        "输入券号"
+      );
+      this.point_placeholder = getContainerPropsValue(
+        this.container,
+        "content.point_placeholder",
+        "充值点数"
+      );
+      this.payPath = getContainerPropsValue(container, "content.payPath", {
+        value: "",
+      }).value;
     },
-
-
     getContent() {
       jfbRootExec("getListRechargeNewsContent", {
         vm: this,
@@ -148,13 +149,6 @@ export default {
           console.error(error);
         });
     },
-
-    toLink(pay_order_id, order_id){
-      this.$xdUniHelper.redirectTo({
-        url: `${this.payPath}?order_id=${pay_order_id}&main_order_id=${order_id}&type=recharge`,
-      }, false, true);
-    },
-
     handleToRecharge() {
       if (!this.cardNumber) {
         this.$xdAlert({ content: "请输入卡券号" });
@@ -164,12 +158,7 @@ export default {
         this.$xdAlert({ content: "请输入充值点数" });
         return;
       }
-
-      if( this.$configProject.isPreview) {
-        return;
-      }
-
-      this.$xdShowLoading({});
+      // this.$xdShowLoading({})
       jfbRootExec("cardRecharge", {
         vm: this,
         data: {
@@ -179,47 +168,41 @@ export default {
       })
         .then((res) => {
           this.$xdHideLoading();
-          this.toLink(res.pay_order_id, res.order_id)
+          this.$xdUniHelper.navigateTo({
+            url: `${this.payPath}?order_id=${res.pay_order_id}&main_order_id=${res.order_id}&type=recharge`,
+          });
         })
         .catch((err) => {
           this.$xdHideLoading();
           console.log(err, "err");
         });
     },
-
     handleGetPrice(e) {
-      //未填写值
       if (!this.cardNumber || !this.card_point) {
         return;
       }
-
-      //预览模式
-      if( this.$configProject.isPreview) {
-        this.amount = this.card_point;
-        return;
-      }
-
+      this.$xdShowLoading({});
       jfbRootExec("getRechargeAmount", {
         vm: this,
         data: {
           card_number: this.cardNumber, //页面ID
-          card_point: this.$xdUniHelper.multiplyFloatNumber(Number(this.card_point),100), //组件ID
+          card_point: this.card_point * 100, //组件ID
         },
       })
         .then((res) => {
-          this.amount = this.$xdUniHelper.divisionFloatNumber(res.amount ,100);
+          this.$xdHideLoading();
+          this.amount = res.amount / 100;
         })
         .catch((err) => {
+          this.$xdHideLoading();
         });
     },
-
     onJfbUpdate(data) {
-      if( this.$configProject.isPreview) {
-        this.getContent();
-      }
-
+      this.getContent();
+    },
+    onJfbScroll(options) {
+      console.log("event.onJfbScroll", options);
     },
-
     onJfbShow(options) {
       this.onJfbLoad(options);
     },
@@ -236,16 +219,17 @@ export default {
 .jfb-base-recharge {
   &__body {
     &-card {
-      box-shadow: 0 unit(16, rpx) unit(60, rpx) 0 rgba(227, 227, 227, 0.37);
+      box-shadow: 0px unit(16, rpx) unit(60, rpx) 0px rgba(227, 227, 227, 0.37);
+      background: #ffffff;
+      padding: unit(48, rpx);
+      margin: unit(40, rpx);
       border-radius: unit(20, rpx);
-      background: #fff;
-      padding: 30rpx;
     }
     &-form {
       input {
         background: #eeeeee;
         border-radius: unit(16, rpx);
-        padding: unit(30, rpx);
+        padding: unit(30, rpx) unit(40, rpx);
         margin-bottom: unit(30, rpx);
       }
     }
@@ -274,96 +258,10 @@ export default {
       }
     }
     .xd-notice {
-      margin-top: unit(40, rpx);
+      margin-top: unit(20, rpx);
       padding: unit(40, rpx);
       border-radius: unit(15, rpx)
     }
   }
 }
-
-.recharge {
-  padding: 30rpx;
-
-  &-tab {
-    height: 100rpx;
-    margin-bottom: 15rpx;
-    display:flex;
-    justify-content: flex-start;
-    align-items: center;
-    & > view {
-      margin: 0 50rpx 0 0;
-      font-size: 32rpx;
-      position: relative;
-      height: 100%;
-      line-height: 100rpx;
-      cursor: pointer;
-    }
-
-    &-index {
-      height: 6rpx;
-      overflow: hidden;
-      border-radius: 4rpx;
-      position: absolute;
-      left: 0;
-      right: 0;
-      bottom: 16rpx;
-    }
-  }
-
-  .recharge-pack {
-    height: 330rpx;
-    background-position: top left;
-    background-size: 100% 100%;
-    background-repeat: no-repeat;
-    color: #fff;
-    padding: 30rpx;
-    box-sizing: border-box;
-    border-radius: 16rpx;
-    margin-bottom: 30rpx;
-    &:last-child {
-      margin-bottom: 0;
-    }
-
-    & .name {
-      font-size: 32rpx;
-      font-weight: 500;
-    }
-
-    & .price {
-      font-size: 28rpx;
-      font-weight: 400;
-      padding: 20rpx 0 10rpx;
-    }
-
-    & .time {
-      font-size: 28rpx;
-      font-weight: 400;
-    }
-
-    & .line {
-      margin: 20rpx 0;
-      height: 2rpx;
-      background: rgba(255,255,255,.2);
-    }
-
-    & .buy {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-
-      & > view:nth-child(2) {
-        height: 60rpx;
-        min-width: 120rpx;
-        text-align: center;
-        border-radius: 40rpx;
-        line-height: 60rpx;
-        border: 4rpx solid #fff;
-        padding: 0 25rpx;
-        font-size: 28rpx;
-
-      }
-    }
-
-  }
-}
 </style>

package/src/components/JfbBaseSweep/JfbBaseSweep.vue

@@ -17,12 +17,6 @@
       :style="{ height: layoutInfo.bodyMinHeightRpx + 'rpx' }"
       class="jfb-base-sweep__body"
     >
-      <view
-        :style="{ background: backgroundColor, color: warningColor }"
-        class="jfb-base-sweep__body-pop"
-        v-if="isPreview"
-        >设置背景模式方便编辑(占位)，在线上此模块不显</view
-      >
       <view class="jfb-base-sweep__body-other" v-if="other">
         <view>
           <xd-font-icon
@@ -33,19 +27,15 @@
           <view class="jfb-base-sweep__body-other-text">无法识别该界面</view>
         </view>
         <view class="jfb-base-sweep__body-footer" :style="prod_bottom">
-          <XdButton @click="scan" type="primary" radius="50rpx" width="50%"
-            >重试</XdButton
-          >
+          <xd-button @click="scan" type="primary" radius="50rpx" width="50%">重试</xd-button>
         </view>
       </view>
-       <view class="jfb-base-sweep__body-other" v-if="show">
+      <view class="jfb-base-sweep__body-other" v-if="show || isPreview">
         <view>
           <image style="width: 500rpx;height:500rpx" src="https://img0.jufubao.cn/common/qrcode-dome.png?ver=1"></image>
         </view>
         <view class="jfb-base-sweep__body-footer" :style="prod_bottom">
-          <XdButton @click="scan" type="primary" radius="50rpx" width="50%"
-            >扫一扫</XdButton
-          >
+          <xd-button @click="scan" type="primary" radius="50rpx" width="50%">扫一扫</xd-button>
         </view>
       </view>
     </view>
@@ -77,7 +67,8 @@ export default {
       backgroundColor: "",
       other: false,
       show: false,
-      flag: true
+      flag: true,
+      isBack: false, //是否启动返回逻辑
     };
   },
   computed: {
@@ -118,6 +109,7 @@ export default {
   },
   methods: {
     onJfbLoad(options) {
+      this.isBack = options.isBack?options.isBack:false;
       if (!this.isPreview) {
         this.$xdShowLoading({
           isMask: true
@@ -133,6 +125,7 @@ export default {
       const matches = hostname.match(/[^.]+\.[^.]+$/);
       return matches ? matches[0] : hostname;
     },
+    //#ifdef H5
     handleH5() {
       // 判断jwxSDK是否为空
       if (this.jwxSDK !== null) {
@@ -200,7 +193,7 @@ export default {
           },
           // 扫描失败后的回调函数
           fail: (error) => {
-            console.log(44444,'fail');
+            console.log(44444,'fail',error);
             this.other = false;
             this.show = true;
             // 如果error是字符串类型，则将其转换为对象类型
@@ -211,14 +204,22 @@ export default {
             // 调用$xdLog的setARMSError方法，记录错误信息
             this.$xdLog.setARMSError(error);
           },
-          cancel: ()=>{
-            console.log(44444,'fail');
+          cancel: (e)=>{
+            console.log(44444,'fail',e.errMsg);
             this.other = false;
             this.show = true;
+
+            //取消扫描并且需要返回页面时候调用
+            if(this.isBack && e.errMsg.indexOf(':cancel') !== -1) {
+              this.onJfbBack();
+            }
+
           }
         });
       }
     },
+    //#endif
+    //#ifdef MP-WEIXIN
     handleMP() {
       // 调用uni.scanCode方法，扫描二维码
       uni.scanCode({
@@ -244,6 +245,7 @@ export default {
             });
             return;
           }
+          //带pa参数出来
           if (queryobjArr["pa"]) {
             // 如果queryobjArr中有pa属性，则获取pa属性的值，并将其拼接到bind_url后面，然后使用navigateTo方法跳转到该路径
             let qrcode = encodeURIComponent(res.result)
@@ -277,14 +279,24 @@ export default {
           this.flag = false;
         },
         fail: (error) => {
-          // 如果扫描失败，则调用$xdLog.setARMSError方法记录错误信息
-          this.other = false;
-          this.show = true;
-          this.$xdLog.setARMSError(error);
+          //取消扫描并且需要返回页面时候调用
+          if(error.errMsg === 'scanCode:fail cancel') {
+            if(this.isBack) {
+              this.onJfbBack();
+            }
+          }
+          else {
+            this.$xdLog.setARMSError(error);
+            this.other = false;
+            this.show = true;
+          }
+
         }
       });
     },
+    //#endif
     scan() {
+      if(this.$configProject.isPreview) return;
       try {
         //#ifdef H5
         this.handleH5();
@@ -317,6 +329,10 @@ export default {
       }
       console.log("event.onJfbShow", options);
     },
+    onJfbBack(){
+      if(this.$configProject["isPreview"]) return;
+      this.$xdUniHelper.navigateBack();
+    }
   },
 };
 </script>

package/src/components/JfbBaseRechargeNew/Api.js

@@ -1,74 +0,0 @@
-'use strict';
-
-/**
- * @description API模型
- * 建议：Ffff=>模块  Xxxx=>自定义名字
- * 获取单记录(getByIdFfffXxxx)
- * 获取列表记录(getByListFfffXxxx)
- * 添加列表记录(addFfffXxxxx)
- * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
- * 更新列表记录(updateFfffXxxxx)
- * @type {*[]}
- */
-module.exports = [
-  {
-    mapFnName: "cardRecharge",
-    title: "卡券充值下单",
-    path: "/card/v1/card-recharge/create-order",
-    isRule: false,
-    data: {
-      card_number: ['卡券号', "String", "必填"],
-      card_point: ['充值点数 单位是分', "String", '必选']
-    },
-    isConsole: true,
-    disabled: true
-  },
-  {
-    mapFnName: "getRechargeAmount",
-    title: "获得充值点数需要支付的钱",
-    path: "/card/v1/card-recharge/get-amount",
-    isRule: false,
-    params: {
-      card_number: ['卡券号', "String", "必填"],
-      card_point: ['充值点数 单位是分', "String", '必选']
-    },
-    isConsole: true,
-    disabled: true
-  },
-  {
-    mapFnName: 'getListRechargeNewsContent', //自定义方法名字（必选）
-    title: '获取内容',
-    path: '/cms/v1/news-content',
-    isRule: false,
-    params: {
-      scene: ['使用场景', 'String', '选填'],
-      container_id: ['插件ID', 'String', '必填'],
-      page_id: ['页面ID', 'String', '必填'],
-      page_size: ['记录条数', 'Number', '必填', 1],
-      code: ['业务线id', 'String', '选填'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: "cardRechargeNew",
-    title: "获取卡券套餐列表",
-    path: "/card/v1/new-card-recharge/create-order",
-    isRule: false,
-    data: {
-      package_id: ['套餐ID', "String", "必填"]
-    },
-    isConsole: true,
-    disabled: true
-  },
-  {
-    mapFnName: "cardRechargeList",
-    title: "卡券充值下单",
-    path: "/card/v1/new-card-recharge/list",
-    isRule: false,
-    params: {},
-    isConsole: true,
-    disabled: true
-  },
-
-];