jufubao-base 1.0.290-beta2 → 1.0.290

package/src/components/JfbBaseTfkSearch/XdQuerySort.vue

@@ -0,0 +1,192 @@
+<template>
+  <view class="xd-query-sort" :style="[boxStyleComp]">
+    <view
+      v-for="item in sortList"
+      :key="item.key"
+      class="cell_wrap"
+      :style="[{borderBottom:lineBorder}]"
+    >
+      <view class="cell_label">{{item.label}}</view>
+      <view class="sub_value" v-if="item.children && item.children.length">
+        <view
+          class="sub_tag"
+          :class="{active: (item.checked && sub.value === item.value)}"
+          v-for="sub in item.children" :key="sub.value"
+          @click="handleSubClick(item, sub.value)"
+          :style="[(item.checked && sub.value === item.value)?labelActColor:labelColor]"
+        >{{sub.label}}</view>
+      </view>
+      <view v-else :key="renderRadio">
+        <xd-radio
+          @change="e => handleChange(e, item)"
+          size="mini"
+          :value="item.checked"
+          :color="labelActColor.color"
+        ></xd-radio>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import XdRadio from "@/components/XdRadio/XdRadio"
+import Color from "color"
+
+export default {
+  components: {
+    XdRadio
+  },
+  props: {
+    list: {
+      type: Array,
+      default: () => {
+        return [
+          {
+            label: "综合",
+            key: "default",
+            value: "default"
+          },
+          {
+            label: "销量",
+            key: "sale_num",
+            children: [
+              {label: "由高到低", value: 'sale_num_desc'},
+              {label: "由低到高", value: 'sale_num_asc'}
+            ]
+          },
+          {
+            label: "价格",
+            key: "price",
+            children: [
+              {label: "由高到低", value: 'price_desc'},
+              {label: "由低到高", value: 'price_asc'}
+            ]
+          }
+        ]
+      }
+    },
+    sort: {
+      type: String,
+      default: "default"
+    },
+    filterStyle:{
+      type: Object,
+      default(){
+        return {}
+      }
+    }
+  },
+  watch: {
+    sortList(n){
+      this.renderRadio = Date.now();
+      let cur = this.sortList.find(item => item.checked);
+      if(cur) this.$emit("onConfirm", cur)
+    }
+  },
+  computed:{
+    lineBorder(){
+      if(['rgba(255, 255, 255, 1)','#fff','#ffffff','#FFF', '#FFFFFF'].includes(this.filterStyle.filterListColor)) {
+        return '1px solid #F5F5F5';
+      }
+      return `1px solid ${Color(this.filterStyle.filterListColor).lighten(.2).hex().toString()}`
+    },
+    labelColor(){
+      return {
+        color: this.filterStyle.filterFontStyle.color,
+        borderColor: Color(this.filterStyle.filterFontStyle.color).alpha(0.2).toString(),
+        backgroundColor:  this.filterStyle.filterFontStyle.backgroundColor,
+      }
+    },
+    labelActColor(){
+      return {
+        color: this.filterStyle.filterActFontStyle.color,
+        borderColor: this.filterStyle.filterActFontStyle.color,
+        backgroundColor:  this.filterStyle.filterActFontStyle.backgroundColor,
+      }
+    },
+    boxStyleComp(){
+      return {
+        backgroundColor: this.filterStyle.filterListColor,
+      }
+    },
+  },
+  data(){
+    return {
+      sortList: [],
+      renderRadio: "renderRadio"
+    }
+  },
+  created(){
+    this.sortList = this.list.map(item => {
+      if(this.sort.startsWith(item.key)) {
+        item.checked = true;
+        item.value = this.sort;
+      }else{
+        item.value = "";
+        item.checked = false;
+      }
+      return item;
+    });
+
+  },
+  methods: {
+    handleSubClick(item, value){
+      this.sortList = this.sortList.map(tt => {
+        tt['checked'] = false;
+        if(tt.key == item.key){
+          tt.value = value;
+          tt['checked'] = true;
+        }
+        return tt;
+      })
+    },
+    handleChange(flat, item){
+      if(flat) {
+        this.sortList = this.sortList.map(tt => {
+          tt['checked'] = false;
+          if(tt.key == item.key){
+            tt['checked'] = true;
+            tt['value'] = tt.key;
+          }
+          return tt;
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  .xd-query-sort{
+    box-shadow: 20rpx 20rpx 20rpx 0 rgba(0,0,0, .29);
+  }
+  .cell_wrap{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border-bottom: 1px solid #F5F5F5;
+    padding: 20rpx 48rpx 20rpx 88rpx;
+    .cell_label{
+      font-size: 28rpx;
+      color: #333333;
+    }
+    .sub_value{
+      display: flex;
+      .sub_tag{
+        font-size: 24rpx;
+        color: #AAAAAA;
+        border: 1px solid #F2F2F2;
+        line-height: 60rpx;
+        width: 160rpx;
+        text-align: center;
+        border-radius: 80rpx;
+        margin-left: 24rpx;
+
+        &.active{
+          color: #A5D63F;
+          border-color: #A5D63F;
+        }
+      }
+    }
+  }
+</style>

package/src/components/JfbBaseTfkSearch/listMixins.js

@@ -51,18 +51,20 @@ export default {
         brandColor,imgRradius,contMargin,contRradius,contShadow,contBorder,contBgColor,contObjBorder,contBorderWidth}
     },
 
-    filtersResData(res){
-      let list = res.list.filter(item=>{
+    filtersResData(res) {
+      let list = res.list.filter(item => {
         return item.items.length > 0
       });
-      if(res.list.length  === list.length) return res;
-      let tabs = list.map(item=>{
+      if (res.list.length === list.length) { return res; }
+      let tabs = list.map(item => {
+        let tab = res.tabs.find(Titem => Titem.value === item.tab)
         return {
           label: item.name,
-          value: item.tab
+          value: item.tab,
+          ...tab
         }
       });
-      return {...res, list, tabs}
+      return { ...res, list, tabs }
     },
 
 

package/src/components/JfbBaseUserInfo/Attr.js

@@ -696,6 +696,18 @@ export default {
         },
         inline: false,
       },
+      data['is_plus_site'] === 'Y' && {
+        label: '已省金额路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'savePath',
+        groupKey: 'advanced',
+        placeholder: '请选择已省金额路径',
+        value: data['savePath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
       {
         label: '',
         ele: 'slot',

package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue

@@ -25,7 +25,7 @@
                   <view v-else>普通用户</view>
                 </view>
                 <view>
-                  <view v-if="is_vip==='Y'">
+                  <view @click="handleToSave" v-if="is_vip==='Y'">
                     <text style="color:#D19E6B;">已省</text><text style="color: #FEE9CC;">￥{{ $xdUniHelper.divisionFloatNumber(save_amount, 100) }}</text>
                   </view>
                   <!-- <view v-else>
@@ -316,6 +316,7 @@
         plusPageBgImg: "",
         normalBgImg: "",
         normalPageBgImg: "",
+        savePath: ''
       }
     },
     watch: {
@@ -462,7 +463,7 @@
         this.profilePath = getContainerPropsValue(container, 'content.profilePath', { value: "" }).value;
         this.plusNickStyle = getContainerPropsValue(container, 'content.plusNickStyle', {});
         this.normalNickStyle = getContainerPropsValue(container, 'content.normalNickStyle', {});
-
+        this.savePath = getContainerPropsValue(container, 'content.savePath', { value: "" }).value;
         if(this.is_plus_site === 'Y'){
           let bg = this.is_vip === 'Y' ? this.plusPageBgImg : this.normalPageBgImg;
           if(this.$configProject['isPreview']){
@@ -504,6 +505,11 @@
           url: this.codePath
         })
       },
+      handleToSave() {
+        this.$xdUniHelper.navigateTo({
+          url: this.savePath
+        })
+      },
       onJfbShow(options) {
         this.onJfbLoad(options);
       },