jufubao-base 1.0.237-beta2 → 1.0.237-beta5

package/src/components/JfbBaseTfkSearch/JfbBaseTfkSearch.vue

@@ -73,6 +73,7 @@
   import listMixins from "./listMixins";
   import CustomList from "./CustomList.vue";
   import AllList from "./AllList.vue";
+  import { mapState } from 'vuex';
 
   class EmitParent {
     constructor(options) {
@@ -131,6 +132,9 @@
       }
     },
     computed: {
+      ...mapState({
+        siteInfo: state => state.siteInfo,
+      }),
       showMenuList(){
         return [{label: "全部", value: "all"}, ...this.menuList]
       },

package/src/components/JfbBaseTfkSearch/listMixins.js

@@ -24,7 +24,8 @@ export default {
       let differ = getContainerPropsValue(container, 'content.differ', 1);
       let showActivityPrice = getContainerPropsValue(container, 'content.showActivityPrice', 'N');
       let isShowExchange = getContainerPropsValue(container, 'content.isShowExchange', 'N');
-      this.productConfig = {is_show_brand, isPrice, isShowTag, isShowDiscount, isAddCart, differ, showActivityPrice, isShowExchange,is_plus_site: this.is_plus_site};
+      let isShowIcon = this.siteInfo.mapping.is_show_coin_icon==='Y'
+      this.productConfig = {is_show_brand, isPrice, isShowTag, isShowDiscount, isAddCart, differ, showActivityPrice, isShowExchange,is_plus_site: this.is_plus_site,isShowIcon};
 
       //内容
       let brandColor = getContainerPropsValue(container, 'content.brandColor', '#aaa');

package/src/components/JfbBaseUserInfo/Attr.js

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

package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue

@@ -24,14 +24,14 @@
               </view>
               <view class="jfb-base-user-info__body-plus-header-top-left-info">
                 <view class="jfb-base-user-info__body-plus-header-top-left-info-name" v-if="logined">
-                  <view>{{userInfo|getName}} </view>
+                  <view :style="[nickNameStyle]">{{userInfo|getName}} </view>
                   <view v-if="is_vip==='Y'"><text>PLUS</text>会员</view>
                   <view v-else>普通用户</view>
                 </view>
                 <view>{{userInfo.phone_number}}</view>
               </view>
             </view>
-            <view class="jfb-base-user-info__body-plus-header-right">
+            <view @click="handleToCode" class="jfb-base-user-info__body-plus-header-right">
               <xd-font-icon size="40" icon="iconerweima"></xd-font-icon>
             </view>
           </view>
@@ -270,6 +270,7 @@
         plusBottomBackgroundColor: '',
         normalTopBackgroundColor: '',
         normalBottomBackgroundColor: '',
+        codePath: ''
       }
     },
     watch: {
@@ -397,6 +398,7 @@
         this.normalBottomBackgroundColor = getContainerPropsValue(container, 'content.normalBottomBackgroundColor', 'linear-gradient(90deg, #FCF2DC 0%, #FAE7C4 100%)');
         this.openVipPath = getContainerPropsValue(container, 'content.openVipPath', { value: "" }).value;
         this.viewPath = getContainerPropsValue(container, 'content.viewPath', { value: "" }).value;
+        this.codePath = getContainerPropsValue(container, 'content.codePath', { value: "" }).value;
       },
       handleAddress() {
         this.$xdUniHelper.navigateTo({
@@ -412,6 +414,11 @@
         this.$xdUniHelper.navigateTo({
           url: this.viewPath
         })
+      },
+      handleToCode() {
+        this.$xdUniHelper.navigateTo({
+          url: this.codePath
+        })
       }
     }
   }

package/src/components/JfbBaseUserOrder/Attr.js

@@ -21,6 +21,21 @@ export default {
         groupKey:'advanced',
       },
       {
+        label: '是否展示我的订单:',
+        ele: 'xd-radio',
+        valueKey: 'isShowMyOrder',
+        value: data['isShowMyOrder'] || 'Y',
+        placeholder: '请选择是否展示我的订单',
+        groupKey:'content',
+        multiple: false,
+        labelInline:true,
+        className: 'input80',
+        list: [
+          {label: '展示', value: 'Y'},
+          {label: '隐藏', value: 'N'},
+        ]
+      },
+      data['isShowMyOrder']==='Y'&&{
         label: '我的订单自定义名称:',
         ele: 'el-input',
         type: 'text',
@@ -101,6 +116,7 @@ export default {
               {"label": "待收货", "value": 'unreceived'},
               {"label": "已取消", "value": 'cancel'},
               {"label": "已完成", "value": 'com'},
+              {"label": "售后", "value": 'afterSale'},
             ])
           }
         },

package/src/components/JfbBaseUserOrder/JfbBaseUserOrder.vue

@@ -16,8 +16,9 @@
     <view class="jfb-base-user-order__body">
       <view class="x-line"></view>
       <view :style="[bodyStyleComp]" v-if="list.length > 0">
-        <view class="my-order__add" :style="[titleMarginComp]">
-          <view :style="[titleStyleComp]">{{myOrderName}}</view>
+        <view v-if="isShowMyOrder==='Y'||isShowBtn === 'Y'" class="my-order__add" :style="[titleMarginComp]">
+          <view v-if="isShowMyOrder==='Y'" :style="[titleStyleComp]">{{myOrderName}}</view>
+          <view v-else></view>
           <view
             v-if="isShowBtn === 'Y'"
             @click="handleToLink(afterUrl)"
@@ -179,6 +180,7 @@
         cardNameColor: '#333',
         titleStyle: {},
         titleMargin:{},
+        isShowMyOrder: '',
 
         //售后订单
         isShowBtn:'Y',
@@ -274,6 +276,7 @@
 
 
         //标题
+        this.isShowMyOrder = getContainerPropsValue(container, 'content.isShowMyOrder', 'Y');
         this.myOrderName = getContainerPropsValue(container, 'content.myOrderName', '我的订单')
         this.titleStyle = getContainerPropsValue(container, 'content.titleStyle', {});
         this.titleMargin = getContainerPropsValue(container,'content.titleMargin', {})
@@ -333,6 +336,12 @@
 
       handleToLink(path, type) {
         if (this.$configProject['isPreview']) return;
+        if(type==='afterSale'){
+          this.$xdUniHelper.navigateTo({
+            url: this.afterUrl
+          })
+          return
+        }
         this.$xdUniHelper.navigateTo({
           url: type ? `${path}?type=${type}` : path
         })

package/src/components/JfbBaseWithdraw/JfbBaseWithdraw.vue

@@ -11,14 +11,14 @@
           <view>提现金额</view>
           <view @click="handleAllWithDraw">全部提现</view>
         </view>
-        <input class="jfb-base-withdraw__body-amount" v-model="amount"></input>
+        <input @input="handleAmountChange" class="jfb-base-withdraw__body-amount" v-model="amount"></input>
         <view class="jfb-base-withdraw__body-balance">可提现余额￥{{getAmout(balance)}}</view>
       </view>
       <view v-if="notice" :style="[bodyStyleComp]">
         <XdContentXss v-html="notice"></XdContentXss>
       </view>
       <view class="fixe_bottom" :style="prod_bottom">
-        <XdButton v-if="amount>0" fontSize="32" type="primary" @click="handleWithDraw">提现</XdButton>
+        <XdButton v-if="amount>0&&amount<=getAmout(balance)" fontSize="32" type="primary" @click="handleWithDraw">提现</XdButton>
         <XdButton v-else disabled fontSize="32" type="primary">提现</XdButton>
         <view @click="handleToWithDrawRecord">提现记录</view>
       </view>
@@ -56,7 +56,7 @@
         withDrawRecordPath: '',
         withDrawPath: '',
         balance: 0,
-        amount: 0,
+        amount: '',
         showSuccess: false,
         method: '',
         wallet_type: ''
@@ -165,6 +165,18 @@
       handleWithDrawSuccess() {
         this.showSuccess = false;
       },
+      handleAmountChange(e) {
+        this.$nextTick(() => {
+          if(e.detail.value>this.getAmout(this.balance)) {
+            uni.showToast(
+              {
+                title: '输入金额超过可提现余额',
+                icon: 'none'
+              }
+            )
+          }
+        })
+      },
       onJfbScroll(options) {
         console.log('event.onJfbScroll', options)
       },