git change Dockerfile

Dockerfile

@@ -15,8 +15,8 @@ RUN npm i --only=production --registry https://registry.npm.taobao.org
 
 ENV SERVICE_PORT=8082
 ENV PROJECT_LEVEL=production
-ENV MONGO='mongodb://mongo-adpro-ssp-v2-rs-1.localhost:1301/remarketing?replicaSet=adpro_ssp_v2_rs'
-
+# ENV MONGO='mongodb://mongo-adpro-ssp-v2-rs-2.localhost:1301/remarketing?replicaSet=adpro_ssp_v2_rs'
+ENV MONGO='mongodb://mongo-adpro-ssp-v2-rs-1.localhost:1301,mongo-adpro-ssp-v2-rs-2.localhost:1301,mongo-adpro-ssp-v2-rs-3.localhost:1301/remarketingAgent?replicaSet=adpro_ssp_v2_rs&adpro_ssp_v2_rs=SECONDARY'
 ENV MONGO_OEM='mongodb://bjwjh-admin:c9yJ2gBFkp7U6@mongo-bjwjh-rs-1.localhost:1302,mongo-bjwjh-rs-2.localhost:1302,mongo-bjwjh-rs-3.localhost:1302/oem_maitian_remarketingAgent?replicaSet=bjwjh-rs&authSource=admin'
 ENV NODE_ENV='production'
 EXPOSE 8082

src/components/OEM.vue

-<template>
-  <el-container>
-    <el-main>
-      <div style='width: 50%;'>
-        <p style='margin: 5px 0'>邮箱:</p>
-        <el-input
-          placeholder="请输入邮箱名"
-          suffix-icon="el-icon-date"
-          v-model="OEM_email"
-          style='margin: 10px 0'
-        >
-        </el-input>
-        <p style='margin: 5px 0'>用户名:</p>
-        <el-input
-          placeholder="请输入用户名"
-          suffix-icon="el-icon-date"
-          v-model="OEM_account"
-          style='margin: 10px 0'
-        >
-        </el-input>
-        <p style='margin: 5px 0'>密码:</p>
-        <el-input
-          placeholder="请输入密码"
-          style='margin: 10px 0'
-          type='password'
-          prefix-icon="el-icon-search"
-          v-model="OEM_password">
-        </el-input>
-        <p style='margin: 5px 0'>重复密码:</p>
-        <el-input
-          placeholder="请输入再次密码"
-          style='margin: 10px 0'
-          type='password'
-          prefix-icon="el-icon-search"
-          v-model="OEM_password2">
-        </el-input>
-        <p style='margin: 5px 0'>公司名:</p>
-        <el-input
-          placeholder="请输入公司名"
-          style='margin: 10px 0'
-          prefix-icon="el-icon-search"
-          v-model="OEM_company">
-        </el-input>
-      </div>
-      <el-button type='primary' @click='creatOEM'>确定</el-button>
-    </el-main>
-  </el-container>
-</template>
-
-<script>
-  export default {
-    name: 'OEM',
-    data () {
-      return {
-        OEM_email: null,
-        OEM_account: null,
-        OEM_password: null,
-        OEM_password2: null,
-        OEM_company: null
-      }
-    },
-    methods: {
-      creatOEM () {
-        let self = this
-        let OEM_email = self.OEM_email
-        let OEM_account = self.OEM_account
-        let OEM_password = self.OEM_password
-        let OEM_company = self.OEM_company
-        if (self.OEM_password !== self.OEM_password2) {
-          this.$message.error('请确认两次密码输入相同')
-        } else {
-          fetch('/api/creatOEM', {
-            method: 'POST',
-            headers: {'Content-Type': 'application/json;charset=UTF-8'},
-            body: JSON.stringify({OEM_email, OEM_account, OEM_password, OEM_company})
-          }).then(res => { return res.json() }).then(data => {
-            console.log(data)
-            self.OEM_account = null
-            self.OEM_password = null
-            self.OEM_password2 = null
-            self.OEM_company = null
-            self.OEM_email = null
-            if (data.status === 200) {
-              this.$message({
-                message: 'OEM运营账号创建成功',
-                type: 'success'
-              })
-            }
-          })
-        }
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file

src/components/agent.vue

+<template>
+  <el-container>
+    <el-main>
+      <h2>调试阶段，暂不可用</h2>
+      <el-card style='width: 40%;margin: 20px;font-size: 14px'>
+        <el-form :label-position="right" label-width="80px" :model="formLabelAlign">
+          <el-form-item label="邮箱">
+            <el-input v-model="formLabelAlign.email" placeholder="请输入邮箱"></el-input>
+          </el-form-item>
+          <!-- <el-form-item label="用户名">
+            <el-input v-model="formLabelAlign.name" placeholder="请输入用户名"></el-input>
+          </el-form-item> -->
+          <el-form-item label="密码">
+            <el-input v-model="formLabelAlign.password" placeholder="请输入密码"></el-input>
+          </el-form-item>
+          <el-form-item label="确认密码">
+            <el-input v-model="formLabelAlign.passwword2" placeholder="请输入再次密码"></el-input>
+          </el-form-item>
+          <el-form-item label="公司名称">
+            <el-input v-model="formLabelAlign.company" placeholder="请输入公司名"></el-input>
+          </el-form-item>
+          <el-button type='primary' @click='creatAgent'>确定</el-button>
+        </el-form>
+      </el-card>
+    </el-main>
+  </el-container>
+</template>
+
+<script>
+  export default {
+    name: 'OEM',
+    data () {
+      return {
+        formLabelAlign: {
+          email: '',
+          password: '',
+          password2: '',
+          company: ''
+        }
+      }
+    },
+    methods: {
+      creatAgent () {
+        let self = this
+        let form = self.formLabelAlign
+        
+        if (self.formLabelAlign.password !== self.formLabelAlign.password2) {
+          this.$message.error('请确认两次密码输入相同')
+        } else {
+          fetch('/api/creatAgent', {
+            method: 'POST',
+            headers: {'Content-Type': 'application/json;charset=UTF-8'},
+            body: JSON.stringify(form)
+          }).then(res => { return res.json() }).then(data => {
+            console.log(data)
+            self.formLabelAlign.email = null
+            self.formLabelAlign.password = null
+            self.formLabelAlign.password2 = null
+            self.formLabelAlign.company = null
+            if (data.status === 200) {
+              this.$message({
+                message: '代理商运营账号创建成功',
+                type: 'success'
+              })
+            }
+          })
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file

src/components/checkCall.vue

@@ -40,8 +40,10 @@
         <el-table-column label='序号' type='index' width=50></el-table-column>
         <el-table-column label='任务名称' prop='name'></el-table-column>
         <el-table-column label='公司名称' prop='companyName'></el-table-column>
+        <el-table-column label='代理商' prop='agent'></el-table-column>
+        <el-table-column label='代理商账号' prop='agentEmail'></el-table-column>
         <el-table-column label='时间' prop='time' ></el-table-column>
-        <el-table-column label='筛选标签' width=200>
+        <el-table-column label='筛选标签'>
           <template slot-scope="scope">
             <el-popover trigger="hover" placement="left">
               <div>
@@ -55,6 +57,10 @@
                 <p>月出帐: <span style='padding: 4px' v-for='item in scope.row.popover.consumelist'>{{item}}</span></p>
                 <p>平均流量: <span style='padding: 4px' v-for='item in scope.row.popover.flowlist'>{{item}}</span></p>
                 <p>终端品牌: <span style='padding: 4px' v-for='item in scope.row.popover.phonelist'>{{item}}</span></p>
+                <p v-if="scope.row.popover.hobbylist">兴趣爱好: <span style='padding: 4px' v-for='item in scope.row.popover.hobbylist'>{{mapHobby[item]}}({{item}})</span></p>
+                <p v-if="scope.row.popover.interestlist">关键词: <span style='padding: 4px' v-for='item in scope.row.popover.interestlist'>{{item}}</span></p>
+                <p v-if="scope.row.popover.hostlist">域名: <span style='padding: 4px' v-for='item in scope.row.popover.hostlist'>{{item}}</span></p>
+                <p v-if="scope.row.popover.applist">APP: <span style='padding: 4px' v-for='item in scope.row.popover.applist'>{{item}}</span></p>
               </div>
               <!-- <div>
                 <h4>筛选条件：</h4>
@@ -260,8 +266,6 @@
     },
     methods: {
       openForm (data, index) {
-        this.interestlist = []
-        this.hostlist = []
         this.dialogFormVisible = true
         this.interestlist = data.popover.interestlist || []
         this.hostlist = data.popover.hostlist || []

src/components/checkNote.vue

@@ -47,6 +47,8 @@
         <el-table-column label='序号' type='index' width=50></el-table-column>
         <el-table-column label='任务名称' prop='taskName'></el-table-column>
         <el-table-column label='公司名称' prop='companyName'></el-table-column>
+        <el-table-column label='代理商' prop='agent'></el-table-column>
+        <el-table-column label='代理商账号' prop='agentEmail'></el-table-column>
         <el-table-column label='提交时间' prop='createdAt'></el-table-column>
         <el-table-column label='筛选标签'>
           <template slot-scope="scope">
@@ -60,7 +62,10 @@
               <p>平均消费: <span style='padding: 4px' v-for='item in scope.row.popover.consumelist'>{{item}}</span></p>
               <p>平均流量: <span style='padding: 4px' v-for='item in scope.row.popover.flowlist'>{{item}}</span></p>
               <p>所在城市: <span style='padding: 4px' v-for='item in scope.row.popover.citylist'>{{item}}</span></p>
-              <p>兴趣爱好: <span style='padding: 4px' v-for='item in scope.row.popover.hobbylist'>{{mapHobby[item]}}({{item}})</span></p>
+              <p v-if="scope.row.popover.hobbylist">兴趣爱好: <span style='padding: 4px' v-for='item in scope.row.popover.hobbylist'>{{mapHobby[item]}}({{item}})</span></p>
+                <p v-if="scope.row.popover.interestlist">关键词: <span style='padding: 4px' v-for='item in scope.row.popover.interestlist'>{{item}}</span></p>
+                <p v-if="scope.row.popover.hostlist">域名: <span style='padding: 4px' v-for='item in scope.row.popover.hostlist'>{{item}}</span></p>
+                <p v-if="scope.row.popover.applist">APP: <span style='padding: 4px' v-for='item in scope.row.popover.applist'>{{item}}</span></p>
               <p>标签持续时间: <span style='padding: 4px'>30天</span></p>
               <span slot="reference">
               查看详情
@@ -536,7 +541,7 @@
           return res.json()
         }).then(data => {
           console.log(data)
-        slef.currentdata.popover.applist = applist
+        self.currentdata.popover.applist = applist
         this.$set(self.datas, self.currentIndex, self.currentdata)
         this.currentdata = null
         this.currentIndex = null

src/components/home.vue

@@ -116,7 +116,7 @@
               <i class='el-icon-setting'></i>
               <span>代理商运营账号</span>
             </template>
-            <el-menu-item index='/OEM'  @click="routeTo">
+            <el-menu-item index='/agent'  @click="routeTo">
               创建代理商运营账号
             </el-menu-item>
           </el-submenu>

src/router/index.js

@@ -16,7 +16,7 @@ import distributor from '@/components/distributor'
 import userPool from '@/components/userPool'
 import leadPoolTask from '@/components/leadPoolTask'
 import exportPoolTask from '@/components/exportPoolTask'
-import OEM from '@/components/OEM'
+import agent from '@/components/agent'
 import welcome from '@/components/welcome'
 
 Vue.use(Router)
@@ -44,7 +44,7 @@ export default new Router({
         {name: 'leadPoolTask', path: '/leadPoolTask', meta: {requiresId: false}, component: leadPoolTask},
         {name: 'exportPoolTask', path: '/exportPoolTask', meta: {requiresId: false}, component: exportPoolTask},
         {name: 'distributor', path: '/distributor', meta: {requiresId: false}, component: distributor},
-        {name: 'OEM', path: '/OEM', meta: {requiresId: false}, component: OEM}
+        {name: 'agent', path: '/agent', meta: {requiresId: false}, component: agent}
       ]
     },
     {