合并develop，解冲突

.idea/dictionaries

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectDictionaryState">
+    <dictionary name="yanka" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/playlet.iml" filepath="$PROJECT_DIR$/.idea/playlet.iml" />
+    </modules>
+  </component>
+</project>

.idea/playlet.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/workspace.xml

@@ -1,170 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="326b77ef-a0bc-4d8a-bd1c-34c4541ee400" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/createFriendsCircle.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/createFriendsCircle.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/friendsCircle/QWfc.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/friendsCircle/QWfc.vue" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Vue Single File Component" />
-      </list>
-    </option>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="GitSEFilterConfiguration">
-    <file-type-list>
-      <filtered-out-file-type name="LOCAL_BRANCH" />
-      <filtered-out-file-type name="REMOTE_BRANCH" />
-      <filtered-out-file-type name="TAG" />
-      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
-    </file-type-list>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-67" />
-    <option name="y" value="5" />
-    <option name="width" value="1940" />
-    <option name="height" value="1042" />
-  </component>
-  <component name="ProjectId" id="28Q2iXOGC8uIIgXdokLl2xoSuGY" />
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-      <manualOrder />
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="Scope" />
-      <pane id="Scratches" />
-      <pane id="ProjectPane" />
-    </panes>
-  </component>
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showExcludedFiles" value="false" />
     <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
-    <property name="HbShouldOpenHtmlAsHb" value="" />
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/project/src/components/assembly/screen" />
-    <property name="nodejs_package_manager_path" value="npm" />
-    <property name="ts.external.directory.path" value="C:\Program Files (x86)\webstorm\WebStorm 2021.2.1\plugins\JavaScriptLanguage\jsLanguageServicesImpl\external" />
-    <property name="vue.rearranger.settings.migration" value="true" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="C:\projectCode\playlet\project\src\components\assembly\screen" />
-      <recent name="C:\projectCode\playlet\project\src\components\dataBoard" />
-      <recent name="C:\projectCode\playlet\project\src\components\customOperate\friendsCircle" />
-      <recent name="C:\projectCode\playlet\project\src\components\detials" />
-    </key>
-  </component>
-  <component name="RunManager">
-    <configuration name="dev" type="js.build_tools.npm" nameIsGenerated="true">
-      <package-json value="$PROJECT_DIR$/project/package.json" />
-      <command value="run" />
-      <scripts>
-        <script value="dev" />
-      </scripts>
-      <node-interpreter value="project" />
-      <envs />
-      <method v="2" />
-    </configuration>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="326b77ef-a0bc-4d8a-bd1c-34c4541ee400" name="Changes" comment="" />
-      <created>1651134619686</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1651134619686</updated>
-      <workItem from="1651134622442" duration="12757000" />
-      <workItem from="1651197530707" duration="20257000" />
-      <workItem from="1651715435371" duration="498000" />
-      <workItem from="1651720937846" duration="3607000" />
-      <workItem from="1651801746039" duration="13012000" />
-      <workItem from="1651888568336" duration="927000" />
-      <workItem from="1651894000029" duration="4978000" />
-      <workItem from="1652061471731" duration="10722000" />
-      <workItem from="1652166348383" duration="10980000" />
-      <workItem from="1652234936568" duration="14227000" />
-      <workItem from="1652406821567" duration="19587000" />
-      <workItem from="1652617577799" duration="43000" />
-      <workItem from="1652617650540" duration="272000" />
-      <workItem from="1653271650799" duration="18349000" />
-      <workItem from="1653444395016" duration="24196000" />
-      <workItem from="1653616597711" duration="29019000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="315000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="-11" y="-11" width="1942" height="1042" extended-state="6" />
-    <layout>
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2497349" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2497349" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="oldMeFiltersMigrated" value="true" />
+    <property name="settings.editor.selected.configurable" value="editor.reader.mode" />
   </component>
 </project>

index.html

@@ -1,10 +0,0 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" type=image/x-icon href=./favicon.ico><title>企微助手</title><script>document.documentElement.style.fontSize = 100 * (document.documentElement.clientWidth/1920) + "px";
-      window.onresize = function(){
-        document.documentElement.style.fontSize = 100 * (document.documentElement.clientWidth/1920) + "px";
-      }</script><script>var _hmt = _hmt || [];
-      (function() {
-        var hm = document.createElement("script");
-        hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
-        var s = document.getElementsByTagName("script")[0];
-        s.parentNode.insertBefore(hm, s);
-      })();</script><link href=./static/css/app.0a590cb30daf9ed5b004a49c6fd19e13.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3210419f869b34f44ea6.js></script><script type=text/javascript src=./static/js/app.d0fbb2aad7bea05b668e.js></script></body></html>

project/src/components/assembly/editCon.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="container">
     <div class="editCon" :style="disabled?'padding:0':''">
-      <!-- <div class="insert" v-if="source=='welcom'">
+      <div class="insert" v-if="source=='welcom'">
         <span @click="insertAtCursor">「插入客户昵称」</span>
-      </div> -->
+      </div>
       <textarea class="textarea self-scrollbar-3" ref="textarea" v-if="!disabled" autocomplete="off" :placeholder="source=='welcom'?'请输入欢迎语':'请输入群发内容'" v-model="content" @input="contentChange"></textarea>
       <!-- <div contentEditable='true' id="textarea" class="textarea self-scrollbar-3" v-if="!disabled" autocomplete="off" maxlength="1000" v-html="content" :placeholder="source=='welcom'?'请输入欢迎语':'请输入群发内容'" @input="contentChange">
         {{content}}
@@ -109,15 +109,7 @@
       </div> -->
       <div class="lineItem">
         <label><em>*</em>图片：</label>
-        <el-upload class="avatar-uploader"
-                   :action="URL.BASEURL + URL.material_upload"
-                   name="material_file"
-                   :show-file-list="false"
-                   :data="fileData2"
-                   :on-success="uploadSuccess"
-                   :on-progress='beforeUploadUpload'
-                   :on-error='uploadFail'
-                   accept=".jpg,.jpeg,.png">
+        <el-upload class="avatar-uploader" :action="URL.BASEURL + URL.material_upload" name="material_file" :show-file-list="false" :data="fileData2" :on-success="uploadSuccess" :on-progress='beforeUploadUpload' :on-error='uploadFail' accept=".jpg,.jpeg,.png">
           <img v-if="image.pic_url" :src="image.pic_url" class="fm_img">
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>

project/src/components/customOperate/createMassMsg.vue

@@ -47,14 +47,19 @@
           <div class="screeningCustomers" v-if="customer_filter==1">
             <div class="screeningItem">
               <label>性别：</label>
-              <el-radio v-model="gender" :disabled="!editFlag" :label="3" @change="changeEvent">全部性别</el-radio>
+              <el-checkbox-group class="checkboxGroup" v-model="gender" :disabled="!editFlag" @change="changeEvent">
+                <el-checkbox label="1">男性</el-checkbox>
+                <el-checkbox label="2">女性</el-checkbox>
+                <el-checkbox label="0">未知性别</el-checkbox>
+              </el-checkbox-group>
+              <!-- <el-radio v-model="gender" :disabled="!editFlag" :label="3" @change="changeEvent">全部性别</el-radio>
               <el-radio v-model="gender" :disabled="!editFlag" :label="1" @change="changeEvent">仅男性粉丝</el-radio>
               <el-radio v-model="gender" :disabled="!editFlag" :label="2" @change="changeEvent">仅女性粉丝</el-radio>
-              <el-radio v-model="gender" :disabled="!editFlag" :label="0" @change="changeEvent">未知性别</el-radio>
+              <el-radio v-model="gender" :disabled="!editFlag" :label="0" @change="changeEvent">未知性别</el-radio> -->
             </div>
             <div class="screeningItem">
               <label>付费情况：</label>
-              <screen-pay title="" width="355px" :reset='resetFlag' @payChange="payChange" :afferent_obj='payInfo'></screen-pay>
+              <screen-pay title="" width="355px" :reset='resetFlag' @payChange="payChange" :afferent_obj='payInfo' style="margin:0"></screen-pay>
             </div>
             <div class="screeningItem">
               <label>添加时间：</label>
@@ -155,7 +160,7 @@ export default {
       },
       loading: true,
       customer_filter: 0,
-      gender: 3,
+      gender: [],
       resetFlag: false,
       afferent_time: [],
       send_type: 1,
@@ -229,7 +234,7 @@ export default {
           }
           this.customer_filter = res.rst.customer_filter
           this.isLookCount = false;
-          this.gender = res.rst.gender
+          this.gender = res.rst.gender.split(',');
           this.afferent_time = res.rst.add_time_start && res.rst.add_time_end ? [res.rst.add_time_start, res.rst.add_time_end] : []
           this.afferent_tag_obj = {
             tag_id_list: res.rst.tag_list ? res.rst.tag_list.split(',') : [],
@@ -328,7 +333,7 @@ export default {
         send_time: send_time,
         chat_type: 1,//群发任务的类型，1:single，表示发送给客户 2:group表示发送给客户群.默认为1
         customer_filter: this.customer_filter,
-        gender: this.gender,
+        gender: this.gender.join(','),
         add_time_start: this.afferent_time && this.afferent_time.length > 1 ? this.afferent_time[0] : '',
         add_time_end: this.afferent_time && this.afferent_time.length > 1 ? this.afferent_time[1] : '',
         tag_screen_type: this.tag_info && this.tag_info.tag_type ? this.tag_info.tag_type : 0,
@@ -413,7 +418,7 @@ export default {
         customer_filter: this.customer_filter
       }
       if (this.customer_filter == 1) {//筛选客户
-        params.gender = this.gender;
+        params.gender = this.gender.join(',');
         params.add_time_start = this.afferent_time && this.afferent_time.length > 1 ? this.afferent_time[0] : '';
         params.add_time_end = this.afferent_time && this.afferent_time.length > 1 ? this.afferent_time[1] : '';
         params.tag_screen_type = this.tag_info && this.tag_info.tag_type ? this.tag_info.tag_type : 0;
@@ -505,6 +510,12 @@ export default {
       text-align: right;
       line-height: 30px;
     }
+    .checkboxGroup {
+      label {
+        text-align: left;
+        width: 60px;
+      }
+    }
     .screening-hint {
       color: #777777;
       font-size: 14px;

project/src/components/customOperate/welcom_message.vue

@@ -132,7 +132,7 @@ export default {
           this.name = res.rst.name;
           let msg_list = res.rst.msg_list;
           msg_list.forEach((item) => {
-            // item.content = item.content ? item.content.replace('%NICKNAME%', '「客户昵称」') : '';
+            item.content = item.content ? item.content.replace('%NICKNAME%', '「客户昵称」') : '';
             item.attachments = item.attachments && item.attachments != '' ? JSON.parse(item.attachments) : [];
             item.weeks = item.weeks ? item.weeks.split(',') : []
           })
@@ -272,7 +272,7 @@ export default {
       msg_data.push(this.main_msg_data)
       msg_data.forEach((item) => {
         item.weeks = item.weeks.join(',');
-        // item.content = item.content.replace('「客户昵称」', '%NICKNAME%')
+        item.content = item.content.replace('「客户昵称」', '%NICKNAME%')
         item.attachments = item.attachments == '' || item.attachments.length == 0 ? '' : JSON.stringify(item.attachments)
       })
 

project/src/components/dataBoard/playletData.vue

@@ -148,15 +148,17 @@ export default {
         { prop: 'cost_cover_rate', label: "回本率(%)" },
         { prop: 'fans_increase', label: "新增粉丝数" },
         { prop: 'new_user_cost', label: "新增粉丝成本" },
-        { prop: 'new_user_charge_uv', label: "充值人数" },
-        { prop: 'new_user_charge_pv', label: "充值次数" },
-        { prop: 'charge_user_cost', label: "充值用户成本", notes: '充值用户成本=当天消耗/充值人数' },
+        { prop: 'new_user_charge_uv_count', label: "充值总人数", },
+        { prop: 'new_user_charge_uv', label: "当日首充人数", },
+        { prop: 'new_user_charge_pv_count', label: "总充值次数", },
+        { prop: 'new_user_charge_pv', label: "新用户首日充值次数", },
+        { prop: 'charge_user_cost', label: "充值用户成本", notes: '充值用户成本=当天消耗/充值人数', min_width: "160" },
       ],
       extra: [],
     }
   },
   created () {
-    this.height = document.documentElement.clientHeight - 400 > 400 ? document.documentElement.clientHeight - 400 : 400
+    this.height = document.documentElement.clientHeight - 300 > 400 ? document.documentElement.clientHeight - 400 : 400
     this.time = this.default_time
     this.init(1)
   },

project/src/components/dataBoard/throwPerson/throwPersonPuton.vue

@@ -8,41 +8,19 @@
       </div>
       <el-button type="primary" size="mini" @click="init(1,'export')">导出Excel</el-button>
     </div>
-    <div class="dataInfoBox">
-      <div class="dataInfoItem">
+    <div class="dataInfoBox" v-loading="dataLoading">
+      <div class="dataInfoItem" v-for="(item,index) in dataInfoArrs" :key="index">
         <div class="dataItemTitle">
-          <img src="@/assets/img/icon/累计消耗@2x.png" style="height:14px" class="titleIcon" alt="">
-          <span>累计消耗</span>
+          <img src="@/assets/img/icon/累计消耗@2x.png" v-if="item.prop == 'cost'" style="height:14px" class="titleIcon" alt="">
+          <img src="@/assets/img/icon/累计充值@2x.png" v-if="item.prop == 'pay_money'" style="height:17px" class="titleIcon" alt="">
+          <img src="@/assets/img/icon/roi@2x.png" v-if="item.prop == 'first_day_roi'" style="height:14px" class="titleIcon" alt="">
+          <img src="@/assets/img/icon/总毛利润额@2x.png" v-if="item.prop == 'profile'" style="height:14px" class="titleIcon" alt="">
+          <img src="@/assets/img/icon/回本率@2x.png" v-if="item.prop == 'recall_rate'" style="height:16px" class="titleIcon" alt="">
+          <img src="@/assets/img/iconNew/企微成本@2x.png" v-if="item.prop == 'qw_cost'" style="height:12px" class="titleIcon" alt="">
+          <img src="@/assets/img/iconNew/充值用户成本@2x.png" v-if="item.prop == 'new_cost'" style="height:15px" class="titleIcon" alt="">
+          <span>{{item.label}}</span>
         </div>
-        <div class="dataItem-data">{{dataInfo&&(dataInfo.cost||dataInfo.cost==0)?$formatNum(dataInfo.cost):'-'}}</div>
-      </div>
-      <div class="dataInfoItem">
-        <div class="dataItemTitle">
-          <img src="@/assets/img/icon/累计充值@2x.png" style="height:18px" class="titleIcon" alt="">
-          <span>累计充值</span>
-        </div>
-        <div class="dataItem-data">{{dataInfo&&(dataInfo.pay_money||dataInfo.pay_money==0)?$formatNum(dataInfo.pay_money):'-'}}</div>
-      </div>
-      <div class="dataInfoItem">
-        <div class="dataItemTitle">
-          <img src="@/assets/img/icon/roi@2x.png" class="titleIcon" alt="">
-          <span>首日ROI</span>
-        </div>
-        <div class="dataItem-data">{{dataInfo&&(dataInfo.first_day_roi||dataInfo.first_day_roi==0)?dataInfo.first_day_roi:'-'}}</div>
-      </div>
-      <div class="dataInfoItem">
-        <div class="dataItemTitle">
-          <img src="@/assets/img/icon/总毛利润额@2x.png" style="height:14px" class="titleIcon" alt="">
-          <span>总毛利润额</span>
-        </div>
-        <div class="dataItem-data">{{dataInfo&&(dataInfo.profile||dataInfo.profile==0)?$formatNum(dataInfo.profile):'-'}}</div>
-      </div>
-      <div class="dataInfoItem">
-        <div class="dataItemTitle">
-          <img src="@/assets/img/icon/回本率@2x.png" class="titleIcon" alt="">
-          <span>回本率</span>
-        </div>
-        <div class="dataItem-data">{{dataInfo&&(dataInfo.recall_rate||dataInfo.recall_rate==0)?dataInfo.recall_rate+'%':'-'}}</div>
+        <div class="dataItem-data">{{dataInfo&&(dataInfo[item.prop]||dataInfo[item.prop]==0)?$formatNum(dataInfo[item.prop]):'-'}}</div>
       </div>
     </div>
     <ux-grid class="uxGridBox" ref="plxTable" :border="false" @row-click="()=>{return}" :header-cell-style="headerColor" :height="height" show-footer-overflow="tooltip" show-overflow="tooltip" size="mini">
@@ -73,6 +51,37 @@ export default {
   components: { datePicker, selfChannel },
   data () {
     return {
+      dataLoading:false,
+      dataInfoArrs:[
+        {
+          prop:'cost',
+          label:'累计消耗',
+        },
+        {
+          prop:'pay_money',
+          label:'累计充值',
+        },
+        {
+          prop:'first_day_roi',
+          label:'首日ROI',
+        },
+        {
+          prop:'profile',
+          label:'总毛利润额',
+        },
+        {
+          prop:'recall_rate',
+          label:'回本率',
+        },
+        {
+          prop:'qw_cost',
+          label:'企微成本',
+        },
+        {
+          prop:'new_cost',
+          label:'用户首日下单成本',
+        },
+      ],
       loading: false,
       page: 1,
       pages: 0,
@@ -93,6 +102,8 @@ export default {
         { prop: "end_date", label: "截止日期", min_width: 160 },
         { prop: "cost", label: "累计消耗" },
         { prop: "pay_money", label: "累计充值" },
+        { prop: "qw_cost", label: "企微成本" },
+        { prop: "new_cost", label: "用户首日下单成本" , min_width: 160},
         { prop: "first_day_roi", label: "首日ROI", notes: '首日ROI=当日新用户充值之和/累计消耗' },
         { prop: "profile", label: "总毛利额", notes: '总毛利额=累计充值-累计消耗' },
         { prop: "recall_rate", label: "回本率%", notes: '回本率=累计充值/累计消耗' },

project/src/components/dataBoard/throwPerson/throwPersonSon.vue

@@ -7,41 +7,19 @@
       </div>
       <el-button type="primary" size="mini" @click="init(1,'export')">导出Excel</el-button>
     </div>
-    <div class="dataInfoBox">
-      <div class="dataInfoItem">
+    <div class="dataInfoBox" v-loading="dataLoading">
+      <div class="dataInfoItem" v-for="(item,index) in dataInfoArrs" :key="index">
         <div class="dataItemTitle">
-          <img src="@/assets/img/icon/累计消耗@2x.png" style="height:14px" class="titleIcon" alt="">
-          <span>累计消耗</span>
+          <img src="@/assets/img/icon/累计消耗@2x.png" v-if="item.prop == 'sum_paid'" style="height:14px" class="titleIcon" alt="">
+          <img src="@/assets/img/icon/累计充值@2x.png" v-if="item.prop == 'sum_charge'" style="height:17px" class="titleIcon" alt="">
+          <img src="@/assets/img/icon/roi@2x.png" v-if="item.prop == 'sum_roi'" style="height:14px" class="titleIcon" alt="">
+          <img src="@/assets/img/icon/总毛利润额@2x.png" v-if="item.prop == 'sum_profit'" style="height:14px" class="titleIcon" alt="">
+          <img src="@/assets/img/icon/回本率@2x.png" v-if="item.prop == 'sum_recover_rate'" style="height:14px" class="titleIcon" alt="">
+          <img src="@/assets/img/iconNew/企微成本@2x.png" v-if="item.prop == 'qw_cost'" style="height:12px" class="titleIcon" alt="">
+          <img src="@/assets/img/iconNew/充值用户成本@2x.png" v-if="item.prop == 'new_cost'" style="height:15px" class="titleIcon" alt="">
+          <span>{{item.label}}</span>
         </div>
-        <div class="dataItem-data">{{dataInfo&&(dataInfo.sum_paid||dataInfo.sum_paid==0)?$formatNum(dataInfo.sum_paid):'-'}}</div>
-      </div>
-      <div class="dataInfoItem">
-        <div class="dataItemTitle">
-          <img src="@/assets/img/icon/累计充值@2x.png" style="height:18px" class="titleIcon" alt="">
-          <span>累计充值</span>
-        </div>
-        <div class="dataItem-data">{{dataInfo&&(dataInfo.sum_charge||dataInfo.sum_charge==0)?$formatNum(dataInfo.sum_charge):'-'}}</div>
-      </div>
-      <div class="dataInfoItem">
-        <div class="dataItemTitle">
-          <img src="@/assets/img/icon/roi@2x.png" class="titleIcon" alt="">
-          <span>首日ROI</span>
-        </div>
-        <div class="dataItem-data">{{dataInfo&&(dataInfo.sum_roi||dataInfo.sum_roi==0)?dataInfo.sum_roi:'-'}}</div>
-      </div>
-      <div class="dataInfoItem">
-        <div class="dataItemTitle">
-          <img src="@/assets/img/icon/总毛利润额@2x.png" style="height:14px" class="titleIcon" alt="">
-          <span>总毛利润额</span>
-        </div>
-        <div class="dataItem-data">{{dataInfo&&(dataInfo.sum_profit||dataInfo.sum_profit==0)?$formatNum(dataInfo.sum_profit):'-'}}</div>
-      </div>
-      <div class="dataInfoItem">
-        <div class="dataItemTitle">
-          <img src="@/assets/img/icon/回本率@2x.png" class="titleIcon" alt="">
-          <span>回本率</span>
-        </div>
-        <div class="dataItem-data">{{dataInfo&&(dataInfo.sum_recover_rate||dataInfo.sum_recover_rate==0)?dataInfo.sum_recover_rate:'-'}}</div>
+        <div class="dataItem-data">{{dataInfo&&(dataInfo[item.prop]||dataInfo[item.prop]==0)?$formatNum(dataInfo[item.prop]):'-'}}</div>
       </div>
     </div>
     <ux-grid class="uxGridBox" ref="plxTable" :border="false" @row-click="()=>{return}" :header-cell-style="headerColor" :height="height" show-footer-overflow="tooltip" show-overflow="tooltip" size="mini">
@@ -90,12 +68,45 @@ export default {
       user_id: '',
       drama_id: '',
       gl_loading: false,
+      dataLoading:false,
+      dataInfoArrs:[
+        {
+          prop:'sum_paid',
+          label:'累计消耗',
+        },
+        {
+          prop:'sum_charge',
+          label:'累计充值',
+        },
+        {
+          prop:'qw_cost',
+          label:'企微成本',
+        },
+        {
+          prop:'new_cost',
+          label:'用户首日下单成本',
+        },
+        {
+          prop:'sum_roi',
+          label:'首日ROI',
+        },
+        {
+          prop:'sum_profit',
+          label:'总毛利润额',
+        },
+        {
+          prop:'sum_recover_rate',
+          label:'回本率',
+        },
+      ],
       desCol: [
         { prop: "user_name", label: "投手", min_width: 160, fixed: 'left'  },
         { prop: "date_num", label: "投放天数", min_width: 160, sort: true},
         { prop: "app_num", label: "投放公众号数", min_width: 160, sort: true },
         { prop: "day_paid", label: "累计消耗",sort: true },
         { prop: "charge_total", label: "累计充值",sort: true },
+        { prop: "qw_cost", label: "企微成本",sort: true },
+        { prop: "new_cost", label: "用户首日下单成本",sort: true, min_width: 160 },
         { prop: "roi", label: "首日ROI", notes: '首日ROI=当日新用户充值之和/累计消耗',sort: true },
         { prop: "profit", label: "总毛利额", notes: '总毛利额=累计充值-累计消耗',sort: true },
         { prop: "recover_rate", label: "回本率%", notes: '回本率=累计充值/累计消耗',sort: true },

project/src/components/warningManage/customerWarning.vue

@@ -99,7 +99,9 @@ export default {
           rule_id: item.rule_id,
           set_val: item.setval,
           group_id: item.group_id,
-          enable: item.enable == 1 ? 0 : 1
+          enable: item.enable == 1 ? 0 : 1,
+          is_system_admin: this.$cookie.getCookie('isSuperManage') == 1 ? 1 : '',
+          sys_group_id: this.$cookie.getCookie('isSuperManage') == 1 ? sessionStorage.getItem('company_session_defaultCorp_level_1').toString() : ''
         }).then((res) => {
           var res = res.data;
           this.$loading(this.$loadingConfig).close();
@@ -149,7 +151,9 @@ export default {
         rule_id: this.rule_id,
         set_val: this.warningNum,
         group_id: this.warninggroup_val,
-        enable: this.enable ? 1 : 0
+        enable: this.enable ? 1 : 0,
+        is_system_admin: this.$cookie.getCookie('isSuperManage') == 1 ? 1 : '',
+        sys_group_id: this.$cookie.getCookie('isSuperManage') == 1 ? sessionStorage.getItem('company_session_defaultCorp_level_1').toString() : ''
       }).then((res) => {
         var res = res.data
         if (res && res.errno == 0) {
@@ -169,6 +173,10 @@ export default {
     get_warninggroupList () {
       this.loading = true
       this.$axios.get(this.URL.BASEURL + this.URL.warn_groupList, {
+        params: {
+          is_system_admin: this.$cookie.getCookie('isSuperManage') == 1 ? 1 : '',
+          sys_group_id: this.$cookie.getCookie('isSuperManage') == 1 ? sessionStorage.getItem('company_session_defaultCorp_level_1').toString() : ''
+        }
       }).then((res) => {
         var res = res.data
         if (res && res.errno == 0) {
@@ -188,6 +196,10 @@ export default {
       this.page = page ? page : this.page;
       this.loading = true
       this.$axios.get(this.URL.BASEURL + this.URL.warn_ruleConfList, {
+        params: {
+          is_system_admin: this.$cookie.getCookie('isSuperManage') == 1 ? 1 : '',
+          sys_group_id: this.$cookie.getCookie('isSuperManage') == 1 ? sessionStorage.getItem('company_session_defaultCorp_level_1').toString() : ''
+        }
       }).then((res) => {
         var res = res.data
         this.loading = false

project/src/components/warningManage/warningListInstall.vue

@@ -128,7 +128,8 @@ export default {
       this.loading = true
       this.$axios.get(this.URL.BASEURL + this.URL.warn_groupList, {
         params: {
-          keyword: this.input_keyword
+          keyword: this.input_keyword,
+          sys_group_id: this.$cookie.getCookie('isSuperManage') == 1 ? sessionStorage.getItem('company_session_defaultCorp_level_1').toString() : ''
         }
       }).then((res) => {
         var res = res.data
@@ -149,7 +150,8 @@ export default {
       this.loading = true
       this.$axios.get(this.URL.BASEURL + this.URL.warn_groupDetail, {
         params: {
-          group_id: id
+          group_id: id,
+          sys_group_id: this.$cookie.getCookie('isSuperManage') == 1 ? sessionStorage.getItem('company_session_defaultCorp_level_1').toString() : ''
         }
       }).then((res) => {
         var res = res.data
@@ -205,6 +207,7 @@ export default {
 
       let axios_api = this.URL.warn_groupEdit;
       let params = {
+        sys_group_id: this.$cookie.getCookie('isSuperManage') == 1 ? sessionStorage.getItem('company_session_defaultCorp_level_1').toString() : '',
         group_name: this.groupName,
         user_list: JSON.stringify(this.warningArrs)
       };