jufubao-base 1.0.116-beta5 → 1.0.116-beta7

package/package.json

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

package/src/components/JfbBaseConList/JfbBaseConList.vue

@@ -153,6 +153,7 @@ export default {
       done: false,
       message: "",
       options: {},
+      next_url: "",
 
       collectedPath: "",
     };
@@ -197,6 +198,7 @@ export default {
           this.used_up_url = res.used_up_url && getServiceUrl(res.used_up_url);
           this.can_take = res.can_take;
           this.has_times = res.has_times;
+          this.next_url = res.next_url;
           
           this.couponList =
             res.list &&
@@ -267,7 +269,7 @@ export default {
     },
     toCoupon(){
       this.$xdUniHelper.navigateTo({
-        url: this.collectedPath,
+        url: this.next_url || this.collectedPath,
       });
     },
     getCoupont(item) {

package/src/components/JfbBaseConPhone/Api.js

@@ -12,49 +12,59 @@
  */
 module.exports = [
   {
-    mapFnName: 'getByIdFilmSquate', //自定义方法名字（必选）
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'sendMsgConPhone',
+    title: '发送验证码',
+    path: '/common/v1/valid_code/sms/send',
     isRule: false,
-    params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
+    data: {
+      phone_number: ['手机号', 'String', '必选'],
+      biz_name: ['业务名称', 'String', '必选']
     },
     isConsole: true,
     disabled: true,
   },
   {
-    mapFnName: 'updateFilmPaiqiDate', //自定义方法名字（必选）
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'getCouponPhoneList', //自定义方法名字（必选）
+    title: '获取优惠券列表',
+    path: '/sms-coupon/v1/activity-prizes-user/list',
     isRule: false,
     params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
+      distribution_method: ['发放方式 entry=主动发放, homed=首页发放,paid=消费后发放,card_binded=绑定卡后发放', 'String', '选填'],
+      namespace: ['业务线', 'String', '必填'],
     },
     isConsole: true,
     disabled: true,
   },
   {
-    mapFnName: 'removeFilmAddress', //自定义方法名字（必选）
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'getAllCouponPhone', //自定义方法名字（必选）
+    title: '领取优惠券',
+    path: '/sms-coupon/v1/activity-prizes-user/set',
     isRule: false,
     params: {
-      film_id: ['电影id', 'Number', '必选'],
+      distribution_method: ['发放方式 entry=主动发放, homed=首页发放,paid=消费后发放,card_binded=绑定卡后发放', 'String', '选填'],
+      namespace: ['业务线', 'String', '必填'],
     },
     isConsole: true,
     disabled: true,
   },
   {
-    mapFnName: 'addFilmcart',  //自定义方法名字（必选）
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'getCouponPhoneResult', //自定义方法名字（必选）
+    title: '轮询查询活动结果',
+    path: '/sms-coupon/v1/activity-prizes-user/get',
     isRule: false,
     params: {
-      film_id: ['电影id', 'Number', '必选'],
+      tmp_order_number: ['tmp_order_number', 'String', '选填'],
     },
     isConsole: true,
     disabled: true,
   },
+  {
+    mapFnName: 'getUserPhone',
+    title: '获取用户信息',
+    path: '/passport/v1/user/get',
+    isRule: false,
+    params: {},
+    isConsole: true,
+    disabled: true,
+  },
 ];

package/src/components/JfbBaseConPhone/Attr.js

@@ -0,0 +1,10 @@
+'use strict';
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style: [],
+  content: [],
+  advanced: [],
+};

package/src/components/JfbBaseConPhone/JfbBaseConPhone.vue

@@ -2,109 +2,485 @@
   <view
     class="jfb-base-con-phone"
     @click="handleEditxSelect"
-    :class="{ editx : isEditx && active }"
+    :class="{ editx: isEditx && active }"
   >
     <!--#ifdef H5-->
     <view
       class="jfb-base-con-phone__edit"
-      :class="{ editx : isEditx && active }"
+      :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
       <view class="jfb-base-con-phone__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-con-phone__body">
-      <view>测试插件( {{containerId}} )</view>
+    <view class="jfb-base-con-phone__body" v-if="done">
+      <view
+        v-if="couponList && couponList.length > 0"
+        class="jfb-base-con-phone__body-wrap"
+        :style="{
+          height: layoutInfo.bodyMinHeightRpx + 'rpx',
+          backgroundImage: `url(${background})`,
+          backgroundSize: '100% 100%',
+        }"
+      >
+        <view v-if="showCode" class="jfb-base-con-phone__body-wrap-input">
+          <view>
+            <input
+              v-model="phoneNumber"
+              placeholder="请输入手机号"
+              type="text"
+            />
+          </view>
+          <view
+            class="jfb-base-con-phone__body-wrap-input-code"
+            style="margin-bottom: 54rpx"
+          >
+            <input
+              v-model="valid_code"
+              placeholder="请输入验证码"
+              type="text"
+            />
+            <XdButton
+              :disabled="disabled"
+              class="jfb-base-con-phone__body-wrap-input-code-btn"
+              type="primary"
+              :bg-color="mainColor"
+              size="small"
+              @click="handleSendCode"
+              >{{ message }}</XdButton
+            >
+          </view>
+          <XdButton
+            type="primary"
+            :bg-color="mainColor"
+            width="360rpx"
+            radius="20rpx"
+            size="small"
+            :disabled="!phoneNumber || !valid_code"
+            @click="handleConfirm"
+            >确认领取</XdButton
+          >
+        </view>
+        <view v-else class="jfb-base-con-phone__body-wrap-input">
+          <view class="jfb-base-con-phone__body-wrap-input-phone">
+            <view class="jfb-base-con-phone__body-wrap-input-phone-change">
+              <view>当前登录手机号</view>
+              <XdButton
+                style="margin: 0"
+                type="primary"
+                :bg-color="mainColor"
+                size="small"
+                @click="showCode = true"
+                >切换手机号</XdButton
+              >
+            </view>
+            <view>{{ showOhoneNumber }}</view>
+          </view>
+          <XdButton
+            type="primary"
+            :bg-color="mainColor"
+            width="360rpx"
+            radius="20rpx"
+            size="small"
+            @click="handleConfirm"
+            >直接领取</XdButton
+          >
+        </view>
+        <view v-if="showBtn === 'Y'" class="jfb-base-con-phone__body-wrap-btn">
+          <XdButton
+            size="small"
+            type="primary"
+            :bg-color="mainColor"
+            radius="20rpx"
+            @click="handleTo(btnOneUrl)"
+            >{{ btnOneName }}</XdButton
+          >
+          <XdButton
+            size="small"
+            type="primary"
+            :bg-color="mainColor"
+            radius="20rpx"
+            @click="handleTo(btnTwoUrl)"
+            >{{ btnTwoName }}</XdButton
+          >
+        </view>
+      </view>
+      <view
+        :style="{
+          height: layoutInfo.bodyMinHeightRpx + 'rpx',
+        }"
+        v-else
+        class="empty_data"
+      >
+        <image :src="emptyBg"></image>
+        {{ errmessage }}
+      </view>
     </view>
   </view>
 </template>
 
 <script>
-  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-  import { jfbRootExec } from "@/utils/xd.event";
-  import JfbBaseConPhoneMixin from "./JfbBaseConPhoneMixin";
-  import { getContainerPropsValue } from "@/utils/xd.base";
-  import componentsMixins from "@/mixins/componentsMixins";
-  import extsMixins from "@/mixins/extsMixins";
-  export default {
-    name: "JfbBaseConPhone",
-    components: {
-      XdFontIcon
-    },
-    mixins: [
-      componentsMixins, extsMixins, JfbBaseConPhoneMixin
-    ],
-    data() {
-      return {
+import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+import XdButton from "@/components/XdButton/XdButton";
+import { jfbRootExec } from "@/utils/xd.event";
+import JfbBaseConPhoneMixin from "./JfbBaseConPhoneMixin";
+import { getContainerPropsValue } from "@/utils/xd.base";
+import componentsMixins from "@/mixins/componentsMixins";
+import extsMixins from "@/mixins/extsMixins";
+import { mapState } from "vuex";
+import colorCardMixins from "@/mixins/colorCardMixins";
+import getServiceUrl from "@/common/getServiceUrl";
 
-        //todo
-      }
+export default {
+  name: "JfbBaseConPhone",
+  components: {
+    XdFontIcon,
+    XdButton,
+  },
+  computed: {
+    ...mapState(["pageBusinessCode"]),
+    emptyBg() {
+      return this.getNoData();
+    },
+  },
+  mixins: [componentsMixins, extsMixins, JfbBaseConPhoneMixin, colorCardMixins],
+  data() {
+    return {
+      showCode: true,
+      phoneNumber: "", //手机号
+      valid_code: "", //验证码
+      btnOneName: "",
+      btnOneUrl: "",
+      btnTwoName: "",
+      btnTwoUrl: "",
+      message: "发送验证码",
+      countdownTimer: null,
+      timeRemaining: 60,
+      disabled: false,
+      background:"",
+      method: "entry",
+      options: {},
+      activity_id: "",
+      done: false,
+      couponList: [],
+      errmessage: "",
+      showOhoneNumber: "", //仅用于展示
+      order_num: null,
+      maxTime: 5, //最长轮询2的N次方（秒）
+      date: 2, //时间底数
+      time: 0, //时间幂指数
+      timeer: null,
+    };
+  },
+  watch: {
+    container(value) {
+      this.init(value);
+    },
+  },
+  created() {
+    console.log(this.layoutInfo, "layoutInfo");
+    this.init(this.container);
+  },
+  destroyed() {
+    if (this.timeer) {
+      clearTimeout(this.timeer);
+    }
+  },
+  methods: {
+    async onJfbLoad(options) {
+      await jfbRootExec("getUserPhone", {
+        vm: this,
+        data: {},
+      }).then((res) => {
+        this.showOhoneNumber = res.phone_number;
+        if (this.showOhoneNumber) {
+          this.showCode = false;
+        }
+      });
+      this.options = options;
+      this.activity_id = options.activity_id;
+      this.method = options.distribution_method
+        ? options.distribution_method
+        : "phone";
+      await this.getList();
+    },
+    getList() {
+      jfbRootExec("getCouponPhoneList", {
+        vm: this,
+        data: {
+          ...this.options,
+          distribution_method: this.method,
+          namespace: this.pageBusinessCode,
+          activity_id: this.activity_id,
+        },
+      })
+        .then((res) => {
+          console.log(res, "res");
+          this.couponList = [{}] || res.list;
+          this.showBtn = res.phone_button;
+          this.btnOneName = res.button_name_one;
+          this.btnTwoName = res.button_name_two;
+          this.btnOneUrl = res.button_url_one;
+          this.btnTwoUrl = res.button_url_two;
+          this.background = getServiceUrl(res.background);
+          this.errmessage = res.message;
+          this.done = true;
+        })
+        .catch((err) => {
+          console.log(err, "err");
+        });
+    },
+    /**
+     * @description 监听事件变化
+     * @param container {object} 业务组件对象自己
+     */
+    init(container) {},
+    handleTo(url) {
+      this.$xdUniHelper.navigateTo({
+        url: url,
+      });
     },
-    watch: {
-      container(value) {
-        this.init(value)
+    handleSendCode() {
+      if (this.phoneNumber.length < 11) {
+        uni.showToast({
+          title: "请输入11位手机号",
+          icon: "none",
+        });
+        return;
       }
+      // 发送验证码的异步操作
+      uni.showToast({
+        title: "发送中",
+        icon: "loading",
+      });
+      jfbRootExec("sendMsgConPhone", {
+        vm: this,
+        data: {
+          phone_number: this.phoneNumber,
+          biz_name: "login",
+        },
+      }).then((res) => {
+        this.startCountdown();
+      });
     },
-    created() {
-      this.init(this.container);
-
-      //todo
+    startCountdown() {
+      // 设置剩余时间
+      this.timeRemaining = 60;
+      // 设置定时器，每秒执行一次
+      this.countdownTimer = setInterval(() => {
+        // 每秒减少1
+        this.timeRemaining--;
+        // 更新显示
+        this.message = `${this.timeRemaining}s`;
+        // 禁用按钮
+        this.disabled = true;
+        // 如果时间小于等于0，则重新开始
+        if (this.timeRemaining <= 0) {
+          this.message = "重新发送";
+          this.disabled = false;
+          // 清除定时器
+          clearInterval(this.countdownTimer);
+          // 重新设置时间
+          this.timeRemaining = 60;
+        }
+      }, 1000);
     },
-    methods: {
-      onJfbLoad(options) {
-
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
-      },
-      /**
-       * @description 监听事件变化
-       * @param container {object} 业务组件对象自己
-       */
-      init(container) {
+    handleConfirm() {
+      this.$xdShowLoading({});
+      jfbRootExec("getAllCouponPhone", {
+        vm: this,
+        data: {
+          ...this.options,
+          distribution_method: this.method,
+          namespace: this.pageBusinessCode,
+          activity_id: this.activity_id,
+          phone: this.showCode ? this.phoneNumber : null,
+          valid_code: this.showCode ? this.valid_code : null,
+          biz_name: "login",
+        },
+      })
+        .then((res) => {
+          if (res.code == 400) {
+            this.$xdHideLoading();
+            this.$xdAlert({
+              content: res.message,
+              zIndex: 3200,
+              time: 2000,
+              isClose: false,
+            });
+            this.getList();
+            return;
+          }
+          this.order_num = res.tmp_order_number;
+          setTimeout(() => {
+            this.getResult();
+          }, 1000);
+        })
+        .catch((err) => {
+          console.log(err, "err");
+        });
+    },
+    getResult() {
+      jfbRootExec("getCouponPhoneResult", {
+        vm: this,
+        data: {
+          ...this.options,
+          tmp_order_number: this.order_num,
+        },
+      })
+        .then((res) => {
+          if (res.status_type === "success") {
+            this.order_num = null;
+            this.$xdHideLoading();
+            this.$xdAlert({
+              content: "领取成功",
+              zIndex: 3200,
+              time: 2000,
+              isClose: false,
+            });
+            this.getList();
+            if (this.timeer) {
+              this.time = 0;
+              clearTimeout(this.timeer);
+            }
+            return;
+          }
+          if (res.status_type === "error") {
+            this.$xdHideLoading();
+            this.$xdAlert({
+              content: res.message,
+              zIndex: 3200,
+              time: 2000,
+              isClose: false,
+            });
+            if (res.code == 400) {
+              this.getList();
+            }
+            if (this.timeer) {
+              this.time = 0;
+              clearTimeout(this.timeer);
+            }
+            return;
+          }
 
-        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
+          this.timeer = setTimeout(() => {
+            this.getResult();
+            if (this.time > 5) {
+              this.$xdLog.setARMSInfo(
+                { message: "领取中" },
+                `pay_${res.status_type}`
+              );
+            }
+            this.time++;
+          }, Math.pow(this.date, this.time > this.maxTime ? this.maxTime : this.time) * 1000);
+        })
+        .catch((err) => {
+          this.$xdHideLoading();
+          console.log(err, "err");
+        });
+    },
+    onJfbShow() {
+      if (this.timeer) {
+        clearTimeout(this.timeer);
+      }
+      this.time = 0;
+      if (this.order_num) this.getResult();
+    },
 
-        //this.height = getContainerPropsValue(container, 'content.height', 10);
-      },
-      onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
-      },
-      onJfbReachBottom(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
-      onJfbShow(options) {
-        console.log('event.onJfbShow', options)
-      },
-      onJfbHide(options) {
-        console.log('event.onJfbHide', options)
-      },
-      onJfbBack(options) {
-        console.log('event.onJfbBack', options)
-      },
-      onJfbUpdate(...data) {
-        console.log('event.onJfbUpdate', data)
-      },
-      onJfbCustomEvent(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
-    }
-  }
+    onJfbUnload() {
+      if (this.timeer) {
+        clearTimeout(this.timeer);
+      }
+    },
 
+    onJfbBack(options) {
+      if (this.timeer) {
+        clearTimeout(this.timeer);
+      }
+      if (this.$configProject.isPreview) return;
+      this.$xdUniHelper.navigateBack();
+    },
+  },
+};
 </script>
 
 <style scoped lang="less">
-  @import "./JfbBaseConPhoneLess.less";
-
-  .jfb-base-con-phone {
-    &__body{
+@import "./JfbBaseConPhoneLess.less";
 
+.jfb-base-con-phone {
+  &__body {
+    .empty_data {
+      text-align: center;
+      color: #999999;
+      font-size: 28rpx;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      & > image {
+        width: unit(400, rpx);
+        height: unit(400, rpx);
+      }
+    }
+    &-wrap {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      flex-direction: column;
+      &-input {
+        border-radius: 40rpx;
+        background: rgba(255, 255, 255, 0.5);
+        padding: 70rpx 60rpx;
+        input {
+          margin-bottom: 26rpx;
+          font-size: 28rpx;
+          background: #fff;
+          border-radius: 16rpx;
+          padding: 30rpx;
+          width: 540rpx;
+        }
+        &-code {
+          position: relative;
+          &-btn {
+            position: absolute;
+            right: 10rpx;
+            top: 20rpx;
+          }
+        }
+        &-phone {
+          padding: 30rpx;
+          width: 540rpx;
+          background: #fff;
+          border-radius: 16rpx;
+          margin-bottom: 32rpx;
+          & > view:nth-child(2) {
+            border-radius: 40rpx;
+            background: #f2f2f2;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            padding: 16rpx 120rpx 16rpx 120rpx;
+            margin-top: 30rpx;
+          }
+          &-change {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            & > view:first-child {
+              color: #999999;
+              font-size: 28rpx;
+            }
+          }
+        }
+      }
+      &-btn {
+        display: flex;
+        justify-content: space-around;
+        align-items: center;
+        width: 100%;
+        margin-top: 64rpx;
+      }
     }
   }
+}
 </style>

package/src/components/JfbBaseConPhone/JfbBaseConPhoneMixin.js

@@ -1,18 +1,30 @@
 'use strict';
 
 
+//@AttrImport
+import Attr from "./Attr";
+//@EndAttrImport
+
 
 export default {
   data() {
     return {
       //#ifdef H5
       
+      //@AttrData
+      Attr:{}, //对外开发编辑属性
+      //@EndAttrData
+      
       // #endif
       cssRoot: 'jfb-base-con-phone'
     }
   },
   created() {
     
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
 
   },
 }