jufubao-admin-library 1.1.102 → 1.1.104

package/library/pageComponents/modules/JfbProductSearch.vue

@@ -109,6 +109,7 @@ export default {
       },
       cookieKey: '',
       cityData:[],
+      marketTagsList:[],
     }
   },
   computed: {
@@ -162,6 +163,10 @@ 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: {
@@ -368,6 +373,24 @@ export default {
           placeholder: "请选择品牌",
           multiple: false,
         },
+        this.channelParams&&this.channelParams.scene === 'selected'&&this.$setting.system!=='partner-gift'&&{
+          label: "营销标签:", //label
+          ele: "xd-select-list", //package 名称
+          valueKey: "market_tags", //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,6 +23,10 @@
 			<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>
@@ -166,7 +170,7 @@
     },
     created(){
       if(this.productSkuList && this.productSkuList.length && this.productSkuList.length > 0) {
-        this.isShowPurchasePrice = this.productSkuList[0].specs.purchase_price > 0;
+        this.isShowPurchasePrice = (this.productSkuList[0].specs.purchase_price > 0 || this.productSkuList[0].specs.dist_price > 0)?true:false;
         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/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,6 +331,25 @@ 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/library/viewModules/viewsThird/viewsThird/list.vue

@@ -342,6 +342,7 @@ export default {
                       : this.openInfoData
                       ? this.openInfoData.pay_url_data
                       : "",
+                      phone_collect_url_data: copyValue.phone_collect_url_data?phone_collect_url_data:this.openInfoData?this.openInfoData.phone_collect_url_data:"",
                   })
                 );
               });
@@ -757,6 +758,19 @@ export default {
             if (res.data.pay_error_url_data) {
               res.data.pay_error_url_data = JSON.parse(res.data.pay_error_url_data);
             }
+            let keys = Object.keys(res.data);
+            this.openDialogForm.map(item=>{
+              if(keys.includes(item.valueKey)) {
+                if(item.ele==='xd-select-site-path') {
+                  if(res.data[item.valueKey]) {
+                    res.data[item.valueKey]= JSON.parse(
+                      res.data[item.valueKey]
+                    );
+                  }
+                  
+                }
+              }
+            })
             this.initForm(res.data);
           })
           .catch((err) => {});
@@ -1248,6 +1262,89 @@ export default {
             // ]
             // },
           ].filter((i) => i);
+               this.openDialogForm = this.openDialogForm.map(item=>{
+            if(item.ele === "xd-select-site-path"){
+              item = {
+              label: item.label,
+              ele: "xd-select-site-path",
+              className: "input100",
+              valueKey: item.valueKey,
+              value: params[item.valueKey] || null,
+              setting: {
+                site_id: this.site_id,
+              },
+              handleCustom: ({ action, data }) => {
+                if (action === "siteList") {
+                  this.getEditxSiteListm()
+                    .then((res) => {
+                      data.cb(
+                        res.data.list.map((item) => {
+                          return {
+                            ...item,
+                            label: item["site_name"],
+                            value: item["site_id"],
+                          };
+                        })
+                      );
+                    })
+                    .catch((res) => {
+                      console.error(res);
+                      data.cb([]);
+                    });
+                }
+
+                //获取应用列表
+                if (action === "appList") {
+                  if (data.params && data.params.value) {
+                    this.getSaasSiteAppListm({ site_id: data.params.value })
+                      .then((res) => {
+                        if (!res.data.items) {
+                          this.$message({
+                            message:
+                              "您选择的站点无应用数据，请发布应用之后在进行配置！",
+                            type: "error",
+                          });
+                          data.cb([]);
+                          return;
+                        }
+
+                        //有数据
+                        let routerData = [];
+                        res.data.items.map((item) => {
+                          if (item["children"]) {
+                            routerData = routerData.concat(
+                              getEditPagesTreeToPathArr(
+                                item["children"],
+                                item["label"],
+                                item["value"],
+                                item["route"],
+                                item["aopen_app_code"]
+                              )
+                            );
+                          }
+                        });
+                        data.cb(routerData);
+                      })
+                      .catch((res) => {
+                        console.error(res);
+                        data.cb([]);
+                      });
+                  } else {
+                    data.cb([]);
+                  }
+                }
+              },
+              rules: [
+                {
+                  required: true,
+                  message: "请选择网站地址",
+                  trigger: "change",
+                },
+              ],
+            }
+            }
+            return item;
+          })
           listForm = this.insertArrayAt(listForm, 3, this.openDialogForm);
           listForm.map((item) => {
             if (item.ele === "xd-check") {
@@ -1411,6 +1508,16 @@ export default {
           this.listValue.pay_error_url_data
         );
       }
+      let keys = Object.keys(this.listValue);
+      this.openDialogForm.map(item=>{
+        if(keys.includes(item.valueKey)) {
+          if(item.ele==='xd-select-site-path') {
+            copyListValue[item.valueKey]= JSON.stringify(
+              this.listValue[item.valueKey]
+            );
+          }
+        }
+      })
       return copyListValue;
     },
     handleConfirmSave() {
@@ -1431,7 +1538,7 @@ export default {
                   }
                 )
                   .then(() => {
-                    this.funOpenAppEdit(copyListValue);
+                    this.funOpenAppEdit();
                   })
                   .catch(() => {
                     //todo

package/package.json

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