jufubao-admin-library 1.1.173 → 1.1.175

package/library/pageComponents/modules/JfbProductSearch.vue

@@ -130,7 +130,7 @@ export default {
       server: this.channelServer || 'supplier-partner',
       fn: 'supplier-channel',
       path: 'p1',
-      params: this.channelParams
+      params: {...this.channelParams,from:1}
     })
     let all = [];
     this.isMain = channelTabList.data.list.length > 0;

package/library/pageComponents/modules/JfbRuleCreate.vue

@@ -428,7 +428,9 @@
 						&& policySettingObj.data.formula.options
 						&& policySettingObj.data.formula.options.length > 0
 					) {
-            commonConfig['sale_price_base'] = policySettingObj.data.formula;
+            if(this.channelParams.scene === 'modifyprice'||this.channelParams.scene === 'select'){
+              commonConfig['sale_price_base'] = policySettingObj.data.formula;
+            }
           }
 
           this.policySettingObj = Object.assign({},commonConfig,policySettingObj.data.conditions) ;

package/library/pageComponents/modules/lib/JfbRuleCreate.js

@@ -515,6 +515,18 @@ export default {
           ],
           inline: false,
         },
+        this.channelParams.scene === "select" && this.checkConfig('delivery_logistics_company') && {
+          label: "配送公司:", //label
+          ele: "xd-select-list", //package 名称
+          valueKey: "delivery_logistics_company", //form[valueKey]
+          value: params.delivery_logistics_company || '', //v-model
+          placeholder: "请选择配送公司",
+          multiple: false, //多选
+          list: [{
+            value: 'jd',
+            label: '京东物流',
+          }],
+        },
         this.checkConfig('sale_price_base')&&(this.is_has_formula||this.adjust_price_type==='new') && {
           label: '售价调整',
           ele: 'title',
@@ -684,18 +696,6 @@ export default {
         //   multiple: false,
         //   list: this.modifypriceList,
         // },
-        this.channelParams.scene === "select" && this.checkConfig('delivery_logistics_company') && {
-          label: "配送公司:", //label
-          ele: "xd-select-list", //package 名称
-          valueKey: "delivery_logistics_company", //form[valueKey]
-          value: params.delivery_logistics_company || '', //v-model
-          placeholder: "请选择配送公司",
-          multiple: false, //多选
-          list: [{
-            value: 'jd',
-            label: '京东物流',
-          }],
-        },
 
       ].filter(i => i)
     },

package/library/viewModules/viewStore/viewStore/market/list.vue

@@ -271,7 +271,8 @@ export default {
       path: "p3",
       params:{
         type:'market',
-        consume_mode:this.storeType
+        consume_mode:this.storeType,
+        from:1,
       }
     }).then((res) => {
       this.channelTabList = res.data.channel_data

package/library/viewModules/viewStore/viewStore/rule/create.vue

@@ -130,7 +130,8 @@ export default {
         fn: "select-shop-channel",
         path: "p3",
         params:{
-          type:'market'
+          type:'market',
+          from:1,
         }
       }).then((res) => {
         this.channelTabList = res.data.channel_data

package/library/viewModules/viewStore/viewStore/selected/list.vue

@@ -384,7 +384,8 @@ export default {
       fn: "select-shop-channel",
       path: "p3",
       params:{
-        type:'select'
+        type:'select',
+        from:1,
       }
     }).then((res) => {
       this.channelTabList = res.data.channel_data

package/library/viewModules/viewsFinance/viewsFinance/balance/components/listPartner.vue

@@ -149,6 +149,7 @@ export default {
             wallet_type: row.wallet_type,
             wallet_nnid: row.wallet_nnid,
             partner_name: row.partner_name,
+            is_from_home:'N'
           }
         })
       }

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

@@ -422,6 +422,9 @@ export default {
     partner_name() {
       return this.$route.query.partner_name;
     },
+    is_from_home(){
+      return this.$route.query.is_from_home;
+    },
   },
   watch: {
     channel_code(val) {
@@ -563,6 +566,7 @@ export default {
       const other = this.getParams();
       let params = {
         ...other,
+        is_from_home:this.is_from_home,
         export: true,
         file_ext: "xlsx",
         file_name: this.exportName,
@@ -594,6 +598,7 @@ export default {
       const other = this.getParams();
       let params = {
         ...other,
+        is_from_home:this.is_from_home,
         page_token: this.page_token,
         page_size: this.page_size,
       };

package/library/viewModules/viewsFinance/viewsFinance/index.vue

@@ -267,7 +267,8 @@ export default {
           query: {
             wallet_type: row.wallet_type,
             wallet_nnid: row.wallet_nnid,
-            partner_name: row.partner_name
+            partner_name: row.partner_name,
+            is_from_home:'Y'
           }
         })
       }

package/library/viewModules/viewsFlashSale/schemas/product.js

@@ -59,5 +59,17 @@ module.exports = {
     disabled: true,
     role: '',
   },
+  {
+    mapFn: 'getPolicyListSetting',
+    isRule: false,
+    title: '超管获取规则配置表',
+    isPublic: true,
+    path: '/product-partner/v1/:xspace/agg-channel-filters',
+    params: {
+      agg_channel_code: ['聚合渠道', 'String', '必填'],
+      xspace: ['xspace', 'String', '必填']
+    },
+    disabled: true,
+  },
   ],
 }

package/library/viewModules/viewsFlashSale/viewsFlashSale/product.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <el-card class="app-container__list" style="margin-bottom: 20px;">
     <div class="main-tab">
       <el-tabs
         type="card"
@@ -36,6 +37,7 @@
         </template>
       </xd-search>
     </div>
+    </el-card>
     <el-card class="app-container__list">
       <div class="app-container__list-pagination">
         <div style="display: flex; justify-content: space-between; width: 100%">
@@ -370,16 +372,20 @@ export default {
         xnamespace: this.business_code,
         scene: "selected",
         type: "MALL",
+        from:1,
       },
     }).then((res) => {
       this.channelTabList = res.data.list;
       this.channelTabList.unshift({
         label: "全部",
-        value: "",
+        value: 'all'
       });
       this.channelActiveName = this.channelTabList[0].value;
-      this.initSearchForm();
     });
+    console.log(this.channelActiveName,'this.channelActiveName')
+    let setting = await this.getPolicyListSetting({agg_channel_code: this.channelActiveName,xspace: this.business_code});
+    console.log(setting,'ssss')
+    this.initSearchForm();
     await this.getList();
   },
 
@@ -389,6 +395,7 @@ export default {
       "sessionAddProduct",
       "batchSessionAddProduct",
       "getActivityCodeCount",
+      "getPolicyListSetting"
     ]),
 
     /**
@@ -590,8 +597,12 @@ export default {
       ].filter((i) => i);
       this.searchFormKey = Date.now();
     },
-    handleTabClick(value) {
+    async handleTabClick(value) {
       console.log(value, "apapaapp");
+      let setting = await this.getPolicyListSetting({agg_channel_code: this.channelActiveName,xspace: this.business_code});
+      console.log(setting,'ssss')
+      this.initSearchForm();
+      await this.getList();
     },
 
     /**
@@ -723,7 +734,7 @@ export default {
         ...params,
         site_id: this.site_id,
         business_code: this.business_code,
-        channel_code: this.channelActiveName != 0 ? this.channelActiveName : "",
+        channel_code: this.channelActiveName,
         session_id: this.session_id,
         activity_id: this.activity_id,
         page_token: this.currentPage,
@@ -828,5 +839,23 @@ export default {
     line-height: 40px;
   }
 }
+::v-deep {
+  .el-tabs--card > .el-tabs__header .el-tabs__item {
+    background: #f8f8f8;
+    border-bottom: 1px solid #dfe4ed !important;
+    &.is-top.is-active {
+      &:first-child {
+        border-radius: 2px 0 0 0;
+      }
+
+      &:last-child {
+        border-radius: 0 2px 0 0;
+      }
+      background: $blue;
+      border-bottom: 1px solid $blue !important;
+      color: #fff !important;
+    }
+  }
+}
 </style>
 

package/package.json

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