jufubao-admin-library 1.1.199 → 1.1.201

package/library/pageComponents/modules/JfbRuleCreate.vue

@@ -348,6 +348,18 @@
             }else {
               this.is_has_formula = true;
             }
+            //类目
+            // if(this.channelActiveName === 'jufubao'){
+            //   console.log(options.category_ids,'options.category_ids')
+            //   if(options.category_ids.length){
+            //     options.category_ids.map(item =>{
+            //       if(item.profit_rate||item.profit_rate==0){
+            //         item.label = item.label+'（'+item.profit_rate/100+'%）'
+            //       }
+            //     })
+            //   }
+              
+            // }
             console.log(this.channelParams.scene,this.is_has_formula,'this.is_has_formula')
             formData = {...other, ...conditions, ...options, city_codes: conditions.city_codes, ...formulaData};
             console.log('conditions', formData)

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

@@ -1322,11 +1322,18 @@ export default {
     handleRemoteCategorySearch ({ node, resolve }) {
       let value = 0
       if (node.level !== 0) value = node.value
-      getOptions({ server: "product-partner", fn: "categories", path: "p4", params: { value } })
-        .then(res => {
-          resolve(res.data.list)
-        })
-        .catch((err) => { console.error(err) })
+      this.getChildrenAndProfitRate({
+        value,
+        agg_channel_code: this.channelActiveName
+      }).then(res => {
+        console.log(res,'res')
+        if(this.channelActiveName === 'jufubao') {
+          res.data.list.map(item=>{
+            item.profit_rate_string = '（'+item.profit_rate/100+'%）'
+          })
+        }
+        resolve(res.data.list)
+      }) .catch((err) => { console.error(err) })
     },
 
     /**

package/library/viewModules/viewsMaterial/viewsMaterial/dialog/component/detail.vue

@@ -499,13 +499,17 @@ export default {
       return checkPermission(["PARTNER_MATERIAL_COMPANY_EDIT"]);
       // #endif
     },
-    compQrcodeSrc(){
+    compQrcodeSrc(){ 
       let url = this.info.file_url;
       if(this.$xdHelper.checkVarType(url) === 'array') {
-        return this.getImageFullPath(url[0].url + '?ver=' + Date.now(), 'size5')
+        let cdnUrl = this.$setting.cdnBaseUrl.replace(/@index@(-[a-z])?/, '1');
+        let fullUrl = cdnUrl+url[0].url+'?x-oss-process=style/size5&ver='+ Date.now();
+        return fullUrl
       }
       if(this.$xdHelper.checkVarType(url) === 'object')  url = url.url;
-      return this.getImageFullPath(url + '?ver=' + Date.now(), 'size5');
+        let cdnUrl = this.$setting.cdnBaseUrl.replace(/@index@(-[a-z])?/, '1');
+        let fullUrl = cdnUrl+url+'?x-oss-process=style/size5&ver='+ Date.now();
+      return fullUrl;
     },
     compImgSrc(){
       let cdn = 'https://img-raw.jufubao.cn';

package/library/viewModules/viewsMaterial/viewsMaterial/material.vue

@@ -281,13 +281,15 @@ export default {
       });
     },
     viewQrCode(form) {
+      let cdnUrl = this.$setting.cdnBaseUrl.replace(/@index@(-[a-z])?/, '1');
+      let url = cdnUrl+form.file_url[0].url+'?x-oss-process=style/size8';
       //调用二维码
       axios({
         url: this.$setting.apiBaseUrl + "/common-public/v1/image/qrcode",
         method: "GET",
         responseType: "blob", // 重要：设置响应类型为blob
         params: {
-          code_content: this.getImageFullPath(form.file_url[0].url).replace(
+          code_content: url.replace(
             /^\/\//,
             "https://"
           ),
@@ -313,7 +315,9 @@ export default {
     handleCopy() {
       console.log(this.info, "this.form");
       const input = document.createElement("input");
-      input.value = this.getImageFullPath(this.info.file_url).replace(
+      let cdnUrl = this.$setting.cdnBaseUrl.replace(/@index@(-[a-z])?/, '1');
+      let url = cdnUrl+this.info.file_url+'?x-oss-process=style/size8';
+      input.value = url.replace(
         /^\/\//,
         "https://"
       );

package/package.json

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