jufubao-base 1.0.117 → 1.0.119-beta10

package/src/components/JfbBaseConPhone/Mock.js

@@ -0,0 +1,26 @@
+'use strict';
+
+module.exports = {
+  getCouponPhoneList: {
+    "list":[
+      {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55},
+      {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55},
+      {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55}
+    ],
+    "background":"//sandbox-img.jufubao.cn/uploads/20231204/96b801e0dc27422c183dc90d905dd2ed.jpg",
+    "used_up_url": "",
+    "has_times": "Y",
+    "can_take":"Y",
+    "message":"",
+    "app_coupon_url":"//sandbox-img.jufubao.cn/uploads/20231205/fee9b644b83495c9ba8a4db277600b54.jpg",
+    "app_activity_button":"//sandbox-img.jufubao.cn/uploads/20231207/35f3065b2b2bc3fc2dda73d7b5b9eae8.jpg",
+    "app_coupon_button_bg_url":"//sandbox-img.jufubao.cn/uploads/20231212/026a3ea901f87f51b531d06c24604676.png",
+    "app_coupon_button_see_url": "//sandbox-img.jufubao.cn/uploads/20231212/026a3ea901f87f51b531d06c24604676.png",
+    "app_coupon_invalid_url":"//sandbox-img.jufubao.cn/uploads/20231208/8b153ce4870686a37295c16fbc992235.jpg",
+    "rule":"<p>打发&middot;</p>",
+    "request_id":"a2603f2a480485f4"
+  },
+  getAllCouponPhone: {
+    "request_id": "5987aa28c709d4ef"
+  }
+}

package/src/components/JfbBaseMySetting/Api.js

@@ -0,0 +1,43 @@
+'use strict';
+
+/**
+ * @description API模型
+ * 建议：Ffff=>模块  Xxxx=>自定义名字
+ * 获取单记录(getByIdFfffXxxx)
+ * 获取列表记录(getByListFfffXxxx)
+ * 添加列表记录(addFfffXxxxx)
+ * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
+ * 更新列表记录(updateFfffXxxxx)
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    mapFnName: 'getUserInfo',
+    title: '获取用户信息',
+    path: '/passport/v1/user/get',
+    params: {},
+    isRule: false,
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'getCardUserSetting',
+    title: '获取用户卡券配置',
+    path: '/card/v1/card-bind/get-card-user-setting',
+    params: {},
+    isRule: false,
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'setCardUserSetting',
+    title: '设置用户卡券配置',
+    path: '/card/v1/card-bind/set-card-user-setting',
+    data: {
+      is_entity_card_invalid: ['已绑卡实体卡是否失效', 'String Y N', '必选']
+    },
+    isRule: false,
+    isConsole: true,
+    disabled: true,
+  }
+];

package/src/components/JfbBaseMySetting/Attr.js

@@ -0,0 +1,23 @@
+'use strict';
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style: [],
+  content: (data) => {
+    return [
+      {
+        label: '绑定手机号地址:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'bind_phone_url', //form[valueKey]
+        value: data['bind_phone_url'] || {},
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
+        inline: false,
+      },
+    ].filter(i=>i)
+  },
+  advanced: [],
+};

package/src/components/JfbBaseMySetting/JfbBaseMySetting.vue

@@ -0,0 +1,236 @@
+<template>
+  <view
+    class="jfb-base-my-setting"
+    @click="handleEditxSelect"
+    :class="{ editx : isEditx && active }"
+  >
+    <!--#ifdef H5-->
+    <view
+      class="jfb-base-my-setting__edit"
+      :class="{ editx : isEditx && active }"
+      v-if="isEditx && active"
+    >
+      <view class="jfb-base-my-setting__edit-icon" @click="delEdit">删除</view>
+    </view>
+    <!-- #endif -->
+    <view class="jfb-base-my-setting__body" :style="{
+      minHeight: layoutInfo.bodyMinHeightRpx + 'rpx'
+    }">
+      <view class="setting_list">
+        <xd-list-item label="已绑实体票券是否失效" :showRight="!showSwitch"
+          paddingLR="50rpx" paddingTB="32rpx"
+          style="margin-bottom: 8rpx;"
+          @click="handleToShowSwitch"
+        >
+          <view v-if="!showSwitch">去配置</view>
+          <view v-else class="switch_wrap">
+            <view :style="{
+              color: cardChecked ? mainColor : '#666666'
+            }">{{ cardChecked ? "开启" : "关闭" }}</view>
+            <xd-switch :checked="cardChecked" size="small" @change="handleCardChecked"></xd-switch>
+          </view>
+        </xd-list-item>
+        <view class="switch_tip">
+          <xd-font-icon size="24" icon="iconmingchengtubiao" style="margin-right: 8rpx;"></xd-font-icon>
+          <view>当票券被绑定后，实体票券的密码与二维码都失效</view>
+        </view>
+        <xd-list-item :showRight="!phone_number" label="绑定手机号"
+          paddingLR="50rpx" paddingTB="32rpx"
+          @click="handleToBind"
+        >
+          {{phone_number ? phone_number : "去绑定"}}
+        </xd-list-item>
+      </view>
+      <view class="fixed_bottom">
+        <xd-button type="primary" @click="handleLogout">退出登录</xd-button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import XdListItem from "./XdListItem.vue";
+  import XdButton from "@/components/XdButton/XdButton";
+  import XdSwitch from "@/components/XdSwitch/XdSwitch"
+  import { jfbRootExec } from "@/utils/xd.event";
+  import JfbBaseMySettingMixin from "./JfbBaseMySettingMixin";
+  import { getContainerPropsValue } from "@/utils/xd.base";
+  import componentsMixins from "@/mixins/componentsMixins";
+  import extsMixins from "@/mixins/extsMixins";
+  import {mapState} from 'vuex';
+  import store from "@/store";
+  export default {
+    name: "JfbBaseMySetting",
+    components: {
+      XdFontIcon,
+      XdButton,
+      XdListItem,
+      XdSwitch
+    },
+    mixins: [
+      componentsMixins, extsMixins, JfbBaseMySettingMixin
+    ],
+    computed: {
+      ...mapState(['jfbAuthorize']),
+    },
+    data() {
+      return {
+        cardChecked: false,
+        phone_number: "",
+        showSwitch: true,
+
+        //面板
+        bind_phone_url: "", //绑定手机号跳转地址
+      }
+    },
+    watch: {
+      container(value) {
+        this.init(value)
+      }
+    },
+    created() {
+      this.init(this.container);
+
+      //todo
+    },
+    methods: {
+      onJfbLoad(options) {
+        this.p_getUserInfo();
+        this.getCardConfig();
+      },
+      /**
+       * @description 监听事件变化
+       * @param container {object} 业务组件对象自己
+       */
+      init(container) {
+        this.bind_phone_url = getContainerPropsValue(container, 'content.bind_phone_url', {value: ""}).value;
+      },
+      handleToBind(){
+        if(!this.phone_number){
+          this.$xdUniHelper.navigateTo({
+            url: this.bind_phone_url  + `?callback_url=${encodeURIComponent(location.href)}`,
+          });
+        }
+      },
+      handleToShowSwitch(){
+        if(!this.showSwitch){
+          this.showSwitch = true;
+        }
+      },
+      handleCardChecked(flag){
+        jfbRootExec("setCardUserSetting", {
+          vm: this,
+          data: {
+            is_entity_card_invalid: flag ? "Y" : "N"
+          }
+        }).then(res => {
+          this.cardChecked = flag;
+        }).catch(err => {
+          this.cardChecked = !flag;
+        })
+      },
+      p_getUserInfo(){
+        jfbRootExec("getUserInfo", {
+          vm: this,
+          data: {
+
+          }
+        }).then(res => {
+          let phone_number = res.phone_number;
+          //手机号脱敏
+          if(phone_number){
+            phone_number = phone_number.substr(0, 3) + "****" + phone_number.substr(7, 11);
+          }
+          this.phone_number = phone_number;
+        })
+      },
+      getCardConfig(){
+        jfbRootExec("getCardUserSetting", {
+          vm: this,
+          data: {}
+        }).then(res => {
+          let is_entity_card_invalid = res.is_entity_card_invalid;  //Y失效  N: 有效
+          if(is_entity_card_invalid === ""){
+            this.showSwitch = false;
+          }
+          this.cardChecked = is_entity_card_invalid === "Y";
+        })
+      },
+      async handleLogout(){
+        // #ifdef H5
+        if (this.$configProject.isPreview) return;
+        // #endif
+
+        if (this.jfbAuthorize !== null) {
+          this.$xdShowLoading({});
+          store.dispatch('logout').then(res=>{
+            this.$xdHideLoading();
+            this.jfbAuthorize.removeToken('card');
+            this.jfbAuthorize.jumpToUserLogin(this, false);
+          }).catch(err=>{
+            console.error(err);
+          })
+        }
+      },
+      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)
+      },
+    }
+  }
+
+</script>
+
+<style scoped lang="less">
+  @import "./JfbBaseMySettingLess.less";
+
+  .jfb-base-my-setting {
+    &__body{
+      background: #FAFAFA;
+      .setting_list{
+        padding: 20rpx 0;
+        /deep/ .xd-my-list-item{
+          background: #FFFFFF;
+          margin: 24rpx 20rpx;
+          border-radius: 20rpx;
+        }
+      }
+      .switch_wrap{
+        display: flex;
+        align-items: center;
+      }
+      .switch_tip{
+        display: flex;
+        font-size: 24rpx;
+        color: #BBBBBB;
+        align-items: center;
+        padding-left: 80rpx;
+      }
+      .fixed_bottom{
+        position: absolute;
+        width: 600rpx;
+        bottom: 100rpx;
+        left: 50%;
+        transform: translateX(-50%);
+      }
+    }
+  }
+</style>

package/src/components/JfbBaseMySetting/JfbBaseMySettingLess.less

@@ -0,0 +1,80 @@
+/**
+* @desc 获取绝对路径完整地址
+* @param @path
+**/
+//例如：https://image.jufubao.cn/20220501010108/image/bg/default_gonghui_bg.png
+@basePath: 'business/';
+@doMain: '//sandbox-img.jufubao.cn/';
+
+.getBusinessImageUrl(@path, @size: 'size8') {
+  @url: "@{doMain}@{basePath}@{path}?x-oss-process=style/@{size}";
+  background-image: url(@url);
+}
+
+//start
+.jfb-base-my-setting {
+  border: 1px dashed rgba(0, 0, 0, 0);
+  box-sizing: border-box;
+  min-height: unit(50, rpx);
+
+  &__body{
+      position: relative;
+      overflow: hidden;
+      z-index: 2
+  }
+
+  &.editx {
+    position: relative;
+    border: 1px dashed blue;
+    box-sizing: border-box;
+    z-index: 3
+
+  }
+
+  &:hover {
+    border: 1px dashed blue;
+  }
+
+  &.noBorder {
+    border-color: rgba(0,0,0,0);
+    border-width: 0;
+  }
+
+
+  &__edit {
+    cursor: pointer;
+    position: absolute;
+    right: unit(0, rpx);
+    top: unit(-52, rpx);
+    height: unit(50, rpx);
+    line-height: unit(50, rpx);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: rgba(0, 0, 0, .6);
+    border-radius: unit(10, rpx);
+    box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
+    color: #fff;
+    font-size: unit(22, rpx);
+
+    &-icon{
+      padding: 0 unit(20, rpx);
+    }
+
+    &.editx {
+      box-sizing: border-box;
+
+    }
+  }
+}
+//end
+
+
+/**notPreview**/
+.jfb-base-my-setting {
+  &:before {
+    content: " ";
+    display: table;
+  }
+}
+/**endNotPreview**/

package/src/components/JfbBaseMySetting/JfbBaseMySettingMixin.js

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

package/src/components/JfbBaseMySetting/Mock.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  aaaa: {}
+}

package/src/components/JfbBaseMySetting/XdListItem.vue

@@ -0,0 +1,135 @@
+<template>
+  <view class="xd-my-list-item"
+    :class="'size_'+size"
+    :style="{
+      borderTop: showBottom ? '1px solid #eee':'none',
+      paddingLeft: paddingLR,
+      paddingRight: paddingLR,
+      paddingTop: paddingTB,
+      paddingBottom: paddingTB,
+    }"
+    @click="$emit('click')">
+    <view v-if="listIcon" class="my-list_icon">
+      <!-- <image mode="widthFix" :src="listIcon" /> -->
+      <xd-font-icon :icon="listIcon"></xd-font-icon>
+    </view>
+    <view class="my-list_label" v-html="label"></view>
+    <view class="my-list_value">
+      <slot></slot>
+      <xd-font-icon
+        v-if="showRight"
+        :style="{
+          marginLeft: '10rpx',
+          color: '#B1B1B1'
+        }"
+        size="24"
+        icon="iconxiangyou_xian"
+      ></xd-font-icon>
+    </view>
+
+  </view>
+</template>
+
+<script>
+import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+export default {
+  components: {
+    XdFontIcon
+  },
+  data(){
+    return {
+    
+    }
+  },
+  props: {
+    size: {
+      type: String,
+      default: "default"
+    },
+    paddingTB:{
+      type: String,
+      default: "24rpx"
+    },
+    paddingLR: {
+      type: String,
+      default: "0rpx"
+    },
+    //是否显示border-bottom
+    showBottom: {
+      type: Boolean,
+      default: false
+    },
+    //是否显示右箭头
+    showRight: {
+      type: Boolean,
+      default: false
+    },
+    //是否显示图标
+    listIcon: {
+      type: String,
+      default: ''
+    },
+    //label
+    label: {
+      type: String,
+      default: ''
+    }
+  }
+
+}
+</script>
+
+<style lang="less" scoped>
+.xd-my-list-item{
+  display: flex;
+  align-items: center;
+  padding: 30rpx 0;
+  font-size: 28rpx;
+  background: #FFFFFF;
+  color: #666666;
+
+  &.size_large{
+    .my-list_value,
+    .my-list_label{
+      font-size: 28rpx;
+      font-weight: 400;
+    }
+  }
+  &.size_default{
+    .my-list_value,
+    .my-list_label{
+      font-size: 28rpx;
+      font-weight: 400;
+    }
+  }
+  &.size_small{
+    .my-list_value,
+    .my-list_label{
+      font-size: 24rpx;
+      font-weight: 400;
+    }
+  }
+
+  .my-list_icon{
+    width: 32rpx;
+    margin-right: 24rpx;
+
+    image{
+      width: 32rpx;
+    }
+  }
+
+  .my-list_label{
+    // flex: 1;
+  }
+  .my-list_value{
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+  }
+  .arrow_right{
+    width: 44rpx;
+  }
+}
+</style>

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -284,13 +284,16 @@
             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>
-            <image
-              :style="{
-                height: info.codes[0].show_type === 'qrcode' ? '50vw' : '25vw',
-                width: info.codes[0].show_type === 'qrcode' ? '50vw' : '85vw',
-              }"
-              :src="info.codes[0].code_url"
-            ></image>
+            <view style="position: relative">
+              <image
+                :style="{
+                  height: info.codes[0].show_type === 'qrcode' ? '50vw' : '25vw',
+                  width: info.codes[0].show_type === 'qrcode' ? '50vw' : '85vw',
+                }"
+                :src="info.codes[0].code_url"
+              ></image>
+              <image v-if="info.codes[0].logo&&info.codes[0].show_type === 'qrcode'" class="logo-icon" :src="info.codes[0].logo"></image>
+            </view>
             <view class="jfb-base-order-detail__body-cashier-text">
               {{ info.codes[0].can_read_code }}
             </view>
@@ -751,7 +754,17 @@
           height: showType === 'qrcode' ? '70vw' : '35vw',
         }"
       >
-        <image mode="aspectFit" :src="codeSrc"></image>
+         <view style="position: relative">
+          <image :src="codeSrc" mode="aspectFit"></image>
+          <image v-if="logo&&showType === 'qrcode'" :src="logo" style="
+            width: 100rpx;
+            height: 100rpx;
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50rpx, -50rpx);">
+          </image>
+        </view>
       </view>
     </xd-dailog>
   </view>
@@ -828,6 +841,7 @@ export default {
         bottom: 0,
       },
       is_hot: "Y",
+      logo: ""
     };
   },
   watch: {
@@ -980,6 +994,9 @@ export default {
           res.codes =
             res.codes &&
             res.codes.map((item) => {
+              if(item.logo) {
+                item.logo = getServiceUrl(item.logo)
+              }
               if (item.show_type === "qrcode" || item.show_type === "barcode") {
                 let reg = /^(http:\/\/|https:\/\/|\/\/)+.+$/;
                 item.code_url = reg.test(item.code_url)? item.code_url:`${this.brandInfo['api_host']}${item.code_url}`
@@ -1125,6 +1142,7 @@ export default {
     handleShowCode(item) {
       this.codeSrc = item.code_url;
       this.showType = item.show_type;
+      this.logo = item.logo;
       console.log(this.codeSrc, "this.codeSrc");
       this.showCode = true;
     },
@@ -1257,6 +1275,13 @@ export default {
 .jfb-base-order-detail {
   &__body {
     color: #333;
+    .logo-icon {
+      width: unit(100, rpx) !important;
+      height: unit(100, rpx) !important;
+      position: absolute;
+      top: 50%;
+      transform: translate(-50rpx, -50rpx);
+    }
     &-show {
       display: flex;
       justify-content: center;

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue

@@ -93,7 +93,6 @@
 <script>
 import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
 import { jfbRootExec } from "@/utils/xd.event";
-import JfbBasePhoneCollectMixin from "./JfbBasePhoneCollectMixin";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
 import { getContainerPropsValue } from "@/utils/xd.base";
@@ -102,6 +101,7 @@ import XdForm from "@/components/XdForm/XdForm";
 import XdFormInput from "@/components/XdFormInput/XdFormInput";
 import XdButton from "@/components/XdButton/XdButton";
 import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox";
+import JfbBasePhoneCollectMixin from "./JfbBasePhoneCollectMixin";
 
 export default {
   name: "JfbBasePhoneCollect",