jufubao-base 1.0.119-beta13 → 1.0.119-beta15

package/src/components/JfbBaseCardV2/JfbBaseCardV2.vue

@@ -150,7 +150,9 @@
           bottom: 0,
           right: 0
         },
-        loadingCardList: true
+        loadingCardList: true,
+
+        inCallbackUrlOrg:'',//是否带有回调地址
       }
     },
     watch: {
@@ -177,6 +179,9 @@
           this.$storage.set("inCallback", inCallback);
           try{
             inCallback = Base64.decode(inCallback);
+            if(options.inCallback) {
+              this.inCallbackUrlOrg = options.inCallback;
+            }
           }catch (e){
             inCallback = null;
           }
@@ -242,8 +247,9 @@
           });
       },
       toBindCard(){
+        let path = this.getUrlCallback(this.cardBindPath)
         this.$xdUniHelper.navigateTo({
-          url: this.cardBindPath
+          url:path
         })
       },
       toOrderList(){

package/src/components/JfbBaseCardV3/JfbBaseCardV3.vue

@@ -72,6 +72,8 @@
         detailUrl: "",
         login_name:'',
         loadingCardList: true,
+
+        inCallbackUrlOrg:'',//是否带有回调地址
       }
     },
     watch: {
@@ -86,8 +88,6 @@
     },
     created() {
       this.init(this.container);
-
-      //todo
     },
     methods: {
       onJfbLoad(options) {
@@ -97,6 +97,9 @@
           this.$storage.set("inCallback", inCallback);
           try{
             inCallback = Base64.decode(inCallback);
+            if(options.inCallback) {
+              this.inCallbackUrlOrg = options.inCallback;
+            }
           }catch (e){
             inCallback = null;
           }
@@ -127,12 +130,13 @@
       init(container) {
         this.cardBindPath = getContainerPropsValue(container, "content.cardBindPath", {value: ""}).value;
         this.changeUrl = getContainerPropsValue(container, "content.changeUrl", {value: ""}).value;
-        this.detailUrl = getContainerPropsValue(container, "content.detailUrl", {value: ""}).value;
+        this.detailUrl = getContainerPropsValue(container, "content.detailUrl", {value: ""}).value;
         this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
       },
       toBindCard(){
+        let path = this.getUrlCallback(this.cardBindPath)
         this.$xdUniHelper.navigateTo({
-          url: this.cardBindPath
+          url: path
         })
       },
       toDetail(item) {

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue

@@ -93,6 +93,7 @@
 <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";
@@ -101,7 +102,6 @@ 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",

package/src/components/JfbBaseWallet/Api.js

@@ -9,7 +9,7 @@
  * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
  * 更新列表记录(updateFfffXxxxx)
  * @type {*[]}
- */
+ */ 
 module.exports = [
   {
     mapFnName: 'getByIdFilmSquate', //自定义方法名字（必选）

package/src/components/JfbBaseWallet/Attr.js

@@ -8,99 +8,94 @@ export default {
   content: (data) => {
     return [
       {
-        label: '背景颜色:', //label
-        ele: 'xd-color', //package 名称
-        valueKey: 'bgcolor', //form[valueKey]
-        value: data.bgcolor || '', //v-model
-        placeholder: '请输入占位框背景颜色',
-        classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-        rules: [
+        label: '更改分类label(可排序):',
+        ele: 'xd-set-sort-label',
+        valueKey: 'newLabel',
+        value: data['newLabel'] || null,
+        disabled: false,
+        defaultValue: data['newLabel'],
+        list: [
           {
-            required: true,
-            message: '请输入占位框背景颜色',
-            trigger: 'blur'
+            icon: "iconpiao",
+            label: "票券",
+            value: 'card',
+            sort: 1
+          }, 
+          {
+            icon: "iconyuanbao",
+            label: "元宝",
+            value: 'wallet',
+            sort: 2
+          },
+          {
+            icon: "iconjifenjilu",
+            label: "积分",
+            value: 'score',
+            sort: 3
           },
         ]
       },
       {
-        label: '选中路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'select-pages-path', //form[valueKey]
-        value: data['select-pages-path'] || {},
+        label: '是否展示票券入口:',
+        ele: 'xd-radio',
+        valueKey: 'isCard',
+        value: data['isCard'] || 'Y',
+        list: [
+          { "label": "是", "value": 'Y' },
+          { "label": "否", "value": 'N' },
+        ]
+      },
+      {
+        label: '票券跳转路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'cardPath',
+        value: data['cardPath'] || {},
         setting: {
           router: XdBus.getParentApi('getPagesTree')
         },
         inline: false,
       },
-      data.bgcolor && {
-        label: '高度:', //label
-        ele: 'el-input', //package 名称
-        type: 'number',
-        valueKey: 'height', //form[valueKey]
-        value: data.height || 100, //v-model
-        placeholder: '请输入占位框高度，单位像素，默认：10px',
-        className: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-        rules: [
-          {
-            required: true,
-            message: '请输入占位框高度',
-            trigger: 'blur'
-          },
+      {
+        label: '是否展示元宝入口:',
+        ele: 'xd-radio',
+        valueKey: 'isYuanbao',
+        value: data['isYuanbao'] || 'Y',
+        list: [
+          { "label": "是", "value": 'Y' },
+          { "label": "否", "value": 'N' },
         ]
       },
       {
-        label: '', //label
-        ele: 'slot', //package 名称
-        slot: 'is_reference',
-      },
-    ].filter(i=>i)
-  },
-  advanced: [
-    {
-      label: '背景颜色:', //label
-      ele: 'xd-color', //package 名称
-      valueKey: 'bgcolor', //form[valueKey]
-      value: '', //v-model
-      placeholder: '请输入占位框背景颜色',
-      classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-      rules: [
-        {
-          required: true,
-          message: '请输入占位框背景颜色',
-          trigger: 'blur'
+        label: '元宝跳转路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'yuanbaoPath',
+        value: data['yuanbaoPath'] || {},
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
         },
-      ]
-    },
-    {
-      label: '选中路径:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'select-pages-path', //form[valueKey]
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree')
+        inline: false,
+      },
+      {
+        label: '是否展示积分入口:',
+        ele: 'xd-radio',
+        valueKey: 'isIntegral',
+        value: data['isIntegral'] || 'Y',
+        list: [
+          { "label": "是", "value": 'Y' },
+          { "label": "否", "value": 'N' },
+        ]
       },
-      inline: false,
-    },
-    {
-      label: '高度:', //label
-      ele: 'el-input', //package 名称
-      type: 'number',
-      valueKey: 'height', //form[valueKey]
-      value: null, //v-model
-      placeholder: '请输入占位框高度，单位像素，默认：10px',
-      classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-      rules: [
-        {
-          required: true,
-          message: '请输入占位框高度',
-          trigger: 'blur'
+      {
+        label: '积分跳转路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'integralPath',
+        value: data['integralPath'] || {},
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
         },
-      ]
-    },
-    {
-      label: '', //label
-      ele: 'slot', //package 名称
-      slot: 'is_reference',
-    },
-  ],
+        inline: false,
+      },
+    ].filter(i => i)
+  },
+  advanced: [],
 };

package/src/components/JfbBaseWallet/JfbBaseWallet.vue

@@ -2,109 +2,305 @@
   <view
     class="jfb-base-wallet"
     @click="handleEditxSelect"
-    :class="{ editx : isEditx && active }"
+    :class="{ editx: isEditx && active }"
   >
     <!--#ifdef H5-->
     <view
       class="jfb-base-wallet__edit"
-      :class="{ editx : isEditx && active }"
+      :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
       <view class="jfb-base-wallet__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-wallet__body">
-      <view>测试插件( {{containerId}} )</view>
+      <view class="jfb-base-wallet__body-title">我的账户</view>
+      <view class="jfb-base-wallet__body-type">
+        <view
+          :style="{
+            marginRight: index === showType.length - 1 ? '0' : '36rpx',
+          }"
+          v-for="(item, index) in showType"
+          @click="handleJumpTo(item)"
+          :key="index"
+          class="jfb-base-wallet__body-type-item"
+        >
+          <XdFontIcon :icon="item.icon"></XdFontIcon>
+          <view>{{ item.label }}</view>
+        </view>
+      </view>
     </view>
   </view>
 </template>
 
 <script>
-  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-  import { jfbRootExec } from "@/utils/xd.event";
-  import JfbBaseWalletMixin from "./JfbBaseWalletMixin";
-  import { getContainerPropsValue } from "@/utils/xd.base";
-  import componentsMixins from "@/mixins/componentsMixins";
-  import extsMixins from "@/mixins/extsMixins";
-  export default {
-    name: "JfbBaseWallet",
-    components: {
-      XdFontIcon
-    },
-    mixins: [
-      componentsMixins, extsMixins, JfbBaseWalletMixin
-    ],
-    data() {
-      return {
+import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+import { jfbRootExec } from "@/utils/xd.event";
+import JfbBaseWalletMixin from "./JfbBaseWalletMixin";
+import { getContainerPropsValue } from "@/utils/xd.base";
+import componentsMixins from "@/mixins/componentsMixins";
+import extsMixins from "@/mixins/extsMixins";
+export default {
+  name: "JfbBaseWallet",
+  components: {
+    XdFontIcon,
+  },
+  mixins: [componentsMixins, extsMixins, JfbBaseWalletMixin],
+  data() {
+    return {
+      typeList: [
+        {
+          icon: "iconpiao",
+          label: "票券",
+          value: "card",
+        },
+        {
+          icon: "iconyuanbao", 
+          label: "元宝",
+          value: "wallet",
+        },
+        {
+          icon: "iconjifenjilu",
+          label: "积分",
+          value: "score",
+        },
+      ],
+      newLabel: [],
+      isPreview: false,
+      isCard: "Y",
+      isYuanbao: "Y",
+      isIntegral: "Y",
+      cardPath: "",
+      yuanbaoPath: "",
+      integralPath: "",
+    };
+  },
+  watch: {
+    container(value) {
+      this.init(value);
+    },
+    newLabel: {
+      deep: true,
+      handler(n, o) {
+        if (this.isPreview) {
+          // 遍历tabs，找到newLabel中value与item1.value相同的项，将其赋值给item1.label
+          this.typeList.forEach((item1, index) => {
+            const item2 = this.newLabel.find(
+              (item) => item.value === item1.value
+            );
 
-        //todo
+            if (item2) {
+              item1.label = item2.newLabel || item1.label;
+              item1.sort = item2.sort;
+            }
+          });
+          this.tabs.sort((a, b) => a.sort - b.sort);
+        }
+      },
+    },
+    isCard(n, o) {
+      if (n === "Y") {
+        let flag = this.showType.find((item) => item.value === "card");
+        if (!flag) {
+          this.showType.push({
+            icon: "iconpiao",
+            label: "票券",
+            value: "card",
+          });
+        }
+      } else {
+        let flagIndex = this.showType.findIndex(
+          (item) => item.value === "card"
+        );
+        if (flagIndex !== -1) {
+          this.showType.splice(flagIndex, 1);
+        }
       }
     },
-    watch: {
-      container(value) {
-        this.init(value)
+    isYuanbao(n, o) {
+      if (n === "Y") {
+        let flag = this.showType.find((item) => item.value === "wallet");
+        if (!flag) {
+          this.showType.push({
+            icon: "iconyuanbao_mian",
+            label: "元宝",
+            value: "wallet",
+          });
+        }
+      } else {
+        let flagIndex = this.showType.findIndex(
+          (item) => item.value === "wallet"
+        );
+        if (flagIndex !== -1) {
+          this.showType.splice(flagIndex, 1);
+        }
       }
     },
-    created() {
-      this.init(this.container);
-
-      //todo
+    isIntegral(n, o) {
+      if (n === "Y") {
+        let flag = this.showType.find((item) => item.value === "score");
+        if (!flag) {
+          this.showType.push({
+            icon: "iconyiwancheng1",
+            label: "积分",
+            value: "score",
+          });
+        }
+      } else {
+        let flagIndex = this.showType.findIndex(
+          (item) => item.value === "score"
+        );
+        if (flagIndex !== -1) {
+          this.showType.splice(flagIndex, 1);
+        }
+      }
     },
-    methods: {
-      onJfbLoad(options) {
+  },
+  computed: {
+    showType() {
+      this.typeList.forEach((item1, index) => {
+        const item2 = this.newLabel.find((item) => item.value === item1.value);
 
-        // jfbRootExec('baiduUserLogin', {
+        if (item2) {
+          item1.label = item2.newLabel || item1.label;
+          item1.sort = item2.sort;
+        }
+      });
+      this.typeList.sort((a, b) => a.sort - b.sort);
+      return this.typeList;
+    },
+  },
+  created() {
+    this.init(this.container);
+    this.isPreview = this.$configProject.isPreview;
 
-        //   vm: this,//   data: {
+    //todo
+  },
+  methods: {
+    onJfbLoad(options) {
+      // jfbRootExec('baiduUserLogin', {
+      //   vm: this,//   data: {
+      //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
+      //   }
+      // }).then().catch()
+    },
+    /**
+     * @description 监听事件变化
+     * @param container {object} 业务组件对象自己
+     */
+    init(container) {
+      this.newLabel = getContainerPropsValue(container, "content.newLabel", []);
+      this.isCard = getContainerPropsValue(container, "content.isCard", "Y");
+      this.isYuanbao = getContainerPropsValue(
+        container,
+        "content.isYuanbao",
+        "Y"
+      );
+      this.isIntegral = getContainerPropsValue(
+        container,
+        "content.isIntegral",
+        "Y"
+      );
+      this.cardPath = getContainerPropsValue(container, "content.cardPath", {
+        value: "",
+      }).value;
 
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
+      this.yuanbaoPath = getContainerPropsValue(
+        container,
+        "content.yuanbaoPath",
+        { value: "" }
+      ).value;
 
-        //   }
+      this.integralPath = getContainerPropsValue(
+        container,
+        "content.integralPath",
+        { value: "" }
+      ).value;
+    },
+    handleJumpTo(item) {
+      console.log(item, "ppppp");
+      switch (item.value) {
+        case "card":
+          this.$xdUniHelper.navigateTo({
+            url: this.cardPath,
+          });
+          break;
 
-        // }).then().catch()
-      },
-      /**
-       * @description 监听事件变化
-       * @param container {object} 业务组件对象自己
-       */
-      init(container) {
+        case "wallet":
+          this.$xdUniHelper.navigateTo({
+            url:`${this.yuanbaoPath}?type=wallet`,
+          });
+          break;
 
-        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
-
-        //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)
-      },
-    }
-  }
+        case "score":
+          this.$xdUniHelper.navigateTo({
+            url: `${this.integralPath}?type=score`,
+          });
+          break;
 
+        default:
+          break;
+      }
+    },
+    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 "./JfbBaseWalletLess.less";
+@import "./JfbBaseWalletLess.less";
 
-  .jfb-base-wallet {
-    &__body{
+.jfb-base-wallet {
+  &__body {
+    &-title {
+      padding: 20rpx;
+    }
+    &-type {
+      display: flex;
+      border-radius: 20rpx;
+      background: rgba(255, 255, 255, 1);
+      border: 1rpx solid rgba(238, 238, 238, 1);
+      padding: 32rpx 48rpx 32rpx 48rpx;
+      margin: 0 20rpx 0;
 
+      &-item {
+        color: #999999;
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        font-size: 24rpx;
+        border: 2rpx solid #eeeeee;
+        border-radius: 16rpx;
+        background: #ffffff;
+        padding: 16rpx 0;
+        margin-right: 36rpx;
+        & > view:nth-child(2) {
+          margin-top: 12rpx;
+        }
+      }
     }
   }
+}
 </style>

package/src/components/JfbBaseWallet/Mock.js

@@ -3,3 +3,4 @@
 module.exports = {
   aaaa: {}
 }
+