jufubao-admin-library 1.1.97-beta2 → 1.1.98

package/library/pageComponents/modules/JfbProductSearch.vue

@@ -109,7 +109,6 @@ export default {
       },
       cookieKey: '',
       cityData:[],
-      marketTagsList:[],
     }
   },
   computed: {
@@ -163,10 +162,6 @@ export default {
     if (this.JfbParent.market_tag) this.JfbParent.market_tag = market_tag
     this.productTypeList = product_type
     this.channelStatus = true
-    let tagsOptions = await getOptions({
-      server: "product-public", fn: "product", path: "p1", params: { market_tag: 1 },
-    })
-    this.marketTagsList = tagsOptions.data.market_tag
     this.initSearchForm()
   },
   methods: {
@@ -223,12 +218,6 @@ export default {
       if (this.custom_category_id && this.$xdHelper.checkVarType(this.custom_category_id) === 'array') {
         filters['custom_category_id'] = this.custom_category_id[this.custom_category_id.length - 1]
       }
-      if(filters['partner_product_tags_list']&&filters['partner_product_tags_list'].length){
-        filters['partner_product_tags'] = {
-          includes:filters['partner_product_tags_list']
-        }
-        delete filters['partner_product_tags_list']
-      }
       return { tab: this.channelActiveName, filters: filters }
     },
 
@@ -379,24 +368,6 @@ export default {
           placeholder: "请选择品牌",
           multiple: false,
         },
-        this.channelParams&&this.channelParams.scene === 'selected'&&{
-          label: "营销标签:", //label
-          ele: "xd-select-list", //package 名称
-          valueKey: "partner_product_tags_list", //form[valueKey]
-          value: [], //v-model
-          placeholder: "请选择",
-          multiple: true, //多选
-          list: this.marketTagsList,
-        },
-        this.pagesType === 'special'&&{
-          label: "状态:", //label
-          ele: "xd-select-list", //package 名称
-          valueKey: "site_product_status", //form[valueKey]
-          value: [], //v-model
-          placeholder: "请选择",
-          multiple: false, //多选
-          list: [{label:'已上架',value:'Y'},{label:'已下架',value:'N'}],
-        },
         (showSupplierIds && this.channelActiveName !== 'all') && {
           label: "按供应商:", //label
           ele: "xd-select-remote", //package 名称

package/library/pageComponents/modules/JfbProductSku.vue

@@ -23,10 +23,6 @@
 			<template slot="volume" slot-scope="inScope">
 				{{$xdHelper.divisionFloatNumber(inScope.row.volume, 100)}}m³
 			</template>
-      <template slot="purchase_price" slot-scope="inScope">
-        <div v-if="inScope.row.purchase_price!==-1">货源：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.purchase_price, 100)}}</span>元</div>
-        <div v-if="inScope.row.dist_price!==-1">平台：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.dist_price, 100)}}</span>元</div>
-      </template>
       <template slot="jfb_price_ratio" slot-scope="inScope">
         <div v-if="inScope.row.purchase_div_jfb_discount_ratio">货源：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.purchase_div_jfb_discount_ratio, 1000)}}</span>折</div>
         <div v-if="inScope.row.dist_div_jfb_discount_ratio">平台：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.dist_div_jfb_discount_ratio, 1000)}}</span>折</div>
@@ -170,7 +166,7 @@
     },
     created(){
       if(this.productSkuList && this.productSkuList.length && this.productSkuList.length > 0) {
-        this.isShowPurchasePrice = (this.productSkuList[0].specs.purchase_price > 0 || this.productSkuList[0].specs.dist_price > 0)?true:false;
+        this.isShowPurchasePrice = this.productSkuList[0].specs.purchase_price > 0;
         this.isShowJfbPriceRatio = (this.productSkuList[0].specs.purchase_div_jfb_discount_ratio || this.productSkuList[0].specs.dist_div_jfb_discount_ratio)?true:false;
         this.isShowMarketPriceRatio = (this.productSkuList[0].specs.purchase_div_market_discount_ratio || this.productSkuList[0].specs.dist_div_market_discount_ratio)?true:false;
       }

package/library/viewModules/viewsFinance/schemas/trade.record.js

@@ -148,6 +148,19 @@ module.exports = {
       },
       disabled: true,
       "role": "FINANCE-PARTNER.WALLET_LIST_PARTNER_CHANNEL_SUPPLIERS"
-    }
-  ]
+    },
+    {
+      title: "加盟商明细-服务费返点结算明细",
+      mapFn: "getByCardFeeInfo",
+      path: "/finance-partner/v1/trade-record/get-card-service-fee-rule",
+      isRule: false,
+      params: {
+        trade_nnid: ["交易号", "String", "必填"],
+        partner_id: ["加盟商ID", "String", "必填"],
+        wallet_type: ["钱包类型", "String", "必填"],
+      },
+      disabled: true,
+    },
+  ],
+
 }

package/library/viewModules/viewsFinance/viewsFinance/balance/detail_partner.vue

@@ -152,6 +152,12 @@
               </div>
             </div>
           </template>
+          <template slot="amount" slot-scope="scope">
+            <xd-table-price :price="scope.row.amount" :key="rePriceKey"></xd-table-price>
+            <div v-if="isShowDeductDetail(scope.row)" style="display:flex; justify-content: center; align-items: center">
+              <el-button type="primary" size="mini" @click="handleShowDetail(scope.row)">查看明细</el-button>
+            </div>
+          </template>
         </xd-table>
       </div>
       <div class="app-container__list-pagination">

package/library/viewModules/viewsThird/viewsThird/create.vue

@@ -323,7 +323,7 @@ export default {
           size: "mini", //default/mini/small
         },
         {
-          label: "限制条件:", //label
+          label: "按号段:", //label
           ele: "xd-radio",
           valueKey: "card_number_type", //form[valueKey]
           value: params.card_number_type || "ALL", //v-model
@@ -331,25 +331,6 @@ export default {
           list: [
             { label: "全部号段", value: "ALL" },
             { label: "自定义号段", value: "CUSTOMIZE" },
-            { label: "卡类型", value: "TYPE" },
-          ],
-          rules: [
-            {
-              required: true,
-              message: "请选择",
-              trigger: ["blur", "change"],
-            },
-          ],
-        },
-        params.card_number_type==='TYPE'&&{
-          label: "", //label
-          ele: "xd-radio",
-          valueKey: "card_model", //form[valueKey]
-          value: params.card_model || "d", //v-model
-          placeholder: "请选择",
-          list: [
-            { label: "点卡", value: "d" },
-            { label: "次卡", value: "c" },
           ],
           rules: [
             {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-admin-library",
-  "version": "1.1.97-beta2",
+  "version": "1.1.98",
   "description": "聚福宝福利后台管理系统公共模块",
   "author": "goashiyong <gaoshiyong1272@vip.163.com>",
   "scripts": {