Home Explore Help
Register Sign In
xiuli.gao
/
playlet
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Commits 1777 Releases 0 Wiki
Browse Source

修改部分问题

liuxiaona 2 years ago
parent
0281a0ddc4
commit
f933b2c01f
15 changed files with 36 additions and 25 deletions
Split View Show Diff Stats
  1. 10 1
      .idea/workspace.xml
  2. 1 1
      index.html
  3. 4 1
      project/src/components/marketingGuest/batchAddFriend/addFriend/importCustomer.vue
  4. 1 0
      qwh5/dist/css/app.3effff30.css
  5. 0 1
      qwh5/dist/css/app.ec8ddb10.css
  6. 1 1
      qwh5/dist/index.html
  7. 0 2
      qwh5/dist/js/app.a96480e4.js
  8. 0 1
      qwh5/dist/js/app.a96480e4.js.map
  9. 2 0
      qwh5/dist/js/app.c7dc557e.js
  10. 1 0
      qwh5/dist/js/app.c7dc557e.js.map
  11. 13 14
      qwh5/src/views/HomeView.vue
  12. 1 1
      static/css/app.5186fd78a1f3ec7d3f421b0c2fb5e1f4.css
  13. 0 1
      static/js/7.7ddb71882cfa4c322f0b.js
  14. 1 0
      static/js/7.f2fe236caca406bcfa43.js
  15. 1 1
      static/js/manifest.3a196b4230b9149f39dc.js

+ 10 - 1
.idea/workspace.xml
View File 

@@ -3,7 +3,16 @@
3 3 
   <component name="ChangeListManager">
4 4 
     <list default="true" id="f876064f-ad38-46e7-bf7d-9df623a9178f" name="Changes" comment="">
5 5 
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 
+      <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
7 
+      <change beforePath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/importCustomer.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/importCustomer.vue" afterDir="false" />
8 
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/css/app.ec8ddb10.css" beforeDir="false" />
9 
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/qwh5/dist/index.html" afterDir="false" />
10 
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/app.a96480e4.js" beforeDir="false" />
11 
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/app.a96480e4.js.map" beforeDir="false" />
6 12 
       <change beforePath="$PROJECT_DIR$/qwh5/src/views/HomeView.vue" beforeDir="false" afterPath="$PROJECT_DIR$/qwh5/src/views/HomeView.vue" afterDir="false" />
13 
+      <change beforePath="$PROJECT_DIR$/static/css/app.5186fd78a1f3ec7d3f421b0c2fb5e1f4.css" beforeDir="false" />
14 
+      <change beforePath="$PROJECT_DIR$/static/js/7.7ddb71882cfa4c322f0b.js" beforeDir="false" />
15 
+      <change beforePath="$PROJECT_DIR$/static/js/manifest.3a196b4230b9149f39dc.js" beforeDir="false" />
7 16 
     </list>
8 17 
     <option name="SHOW_DIALOG" value="false" />
9 18 
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
 
@@ -54,7 +63,7 @@
54 63 
       <workItem from="1654573024055" duration="23176000" />
55 64 
       <workItem from="1654653264438" duration="30604000" />
56 65 
       <workItem from="1654739102819" duration="11048000" />
57 
-      <workItem from="1654756255993" duration="2798000" />
66 
+      <workItem from="1654756255993" duration="3821000" />
58 67 
     </task>
59 68 
     <servers />
60 69 
   </component>

+ 1 - 1
index.html
View File 

@@ -7,4 +7,4 @@
7 7 
         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
8 8 
         var s = document.getElementsByTagName("script")[0];
9 9 
         s.parentNode.insertBefore(hm, s);
10 
-      })();</script><link href=./static/css/app.5186fd78a1f3ec7d3f421b0c2fb5e1f4.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3a196b4230b9149f39dc.js></script><script type=text/javascript src=./static/js/app.fb66a0ee18e70da63477.js></script></body></html>
10 
+      })();</script><link href=./static/css/app.5a85bedd2903792b956bd1d77349c8bb.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.a4a32d684bb181647186.js></script><script type=text/javascript src=./static/js/app.fb66a0ee18e70da63477.js></script></body></html>

+ 4 - 1
project/src/components/marketingGuest/batchAddFriend/addFriend/importCustomer.vue
View File 

@@ -74,6 +74,7 @@ export default {
74 74 
       },
75 75 
       repeatNum:0,
76 76 
       fileUpload: null,
77 
+      new_file_name:'',
77 78 
       original_file_name:'',
78 79 
       ext:'',
79 80 
       UPLOADdATA:{
 
@@ -99,7 +100,7 @@ export default {
99 100 
       this.dialogVisible = false
100 101 
     },
101 102 
     save(){
102 
-      if(this.original_file_name == '' || this.ext==''){
103 
+      if(this.original_file_name == '' || this.ext=='' || this.new_file_name == ''){
103 104 
         this.$message({
104 105 
           message: '表格不能为空',
105 106 
           type: "warning"
 
@@ -118,6 +119,7 @@ export default {
118 119 
         user_id_list:this.user_id_list,
119 120 
         customer_tag_list:this.afferent_tag_obj.tag_id_list,
120 121 
         original_file_name:this.original_file_name,
122 
+        new_file_name:this.new_file_name,
121 123 
         ext:this.ext,
122 124 
       }
123 125 
       this.$axios.post(this.URL.BASEURL + this.URL.batchAddCustomerImport, data).then((res) => {
 
@@ -170,6 +172,7 @@ export default {
170 172 
     },
171 173 
     uploadSuccess (res, file, fileList) {
172 174 
       if (res.errno == 0) {
175 
+        this.new_file_name = res.rst.new_file_name
173 176 
         this.original_file_name = res.rst.original_file_name
174 177 
         this.ext = res.rst.ext
175 178 
         this.$loading(this.$loadingConfig).close()

File diff suppressed because it is too large
+ 1 - 0
qwh5/dist/css/app.3effff30.css


File diff suppressed because it is too large
+ 0 - 1
qwh5/dist/css/app.ec8ddb10.css


File diff suppressed because it is too large
+ 1 - 1
qwh5/dist/index.html


File diff suppressed because it is too large
+ 0 - 2
qwh5/dist/js/app.a96480e4.js


File diff suppressed because it is too large
+ 0 - 1
qwh5/dist/js/app.a96480e4.js.map


File diff suppressed because it is too large
+ 2 - 0
qwh5/dist/js/app.c7dc557e.js


File diff suppressed because it is too large
+ 1 - 0
qwh5/dist/js/app.c7dc557e.js.map


+ 13 - 14
qwh5/src/views/HomeView.vue
View File 

@@ -1,9 +1,9 @@
1 1 
 <template>
2 2 
   <div class="home" v-loading="loading">
3 
-    <div class="tipsBox">管理员{{ adminName }}给你分配了{{ customeNum }}个客户还未添加，快去复制电话号码添加客户吧，管理员在微伴后台可查看添加状态哦～</div>
3 
+    <div class="tipsBox">管理员给你分配了{{ tableData&&tableData.length }}个客户还未添加，快去复制电话号码添加客户吧，管理员在微伴后台可查看添加状态哦～</div>
4 4 
     <div class="operateArea">
5 5 
       <div>
6 
-        <el-select v-model="addStatus_val" placeholder="请选择添加状态" @change="statusChange" style="width: 160px">
6 
+        <el-select v-model="addStatus_val" placeholder="请选择添加状态" @change="statusChange">
7 7 
           <el-option
8 8 
               v-for="item in addStatusArrs"
9 9 
               :key="item.value"
 
@@ -65,8 +65,6 @@ export default class HomeView extends Vue {
65 65 
   noMore = false
66 66 
   loading=false
67 67 
   disabled = this.load_loading || this.noMore
68 
-  adminName = '刘晓娜'
69 
-  customeNum = 1
70 68 
   page=1
71 69 
   page_size=20
72 70 
   addStatus_val = ''
 
@@ -92,14 +90,14 @@ export default class HomeView extends Vue {
92 90 
       value: '2',
93 91 
       label: '待通过'
94 92 
     },
95 
-    {
96 
-      value: '3',
97 
-      label: '已添加'
98 
-    },
99 
-    {
100 
-      value: '4',
101 
-      label: '待分配'
102 
-    }
93 
+    // {
94 
+    //   value: '3',
95 
+    //   label: '已添加'
96 
+    // },
97 
+    // {
98 
+    //   value: '4',
99 
+    //   label: '待分配'
100 
+    // }
103 101 
   ]
104 102
105 103 
   created () {
 
@@ -115,6 +113,7 @@ export default class HomeView extends Vue {
115 113 
         duration:5000
116 114 
       })
117 115 
     }else{
116 
+      this.loading = true
118 117 
       this.get_customerList()
119 118 
     }
120 119 
   }
 
@@ -150,7 +149,7 @@ export default class HomeView extends Vue {
150 149 
   }
151 150
152 151 
   getAuthInfo (item) {
153 
-    axios.get('/api/jsapi/auth', {
152 
+    axios.get('/jsapi/auth', {
154 153 
       params: {
155 154 
         corpid: this.$route.query.corpid,
156 155 
         user_id: this.$route.query.user_id,
 
@@ -217,7 +216,7 @@ export default class HomeView extends Vue {
217 216 
   }
218 217
219 218 
   get_dataReporting (item) { // 复制上报
220 
-    axios.get('/api/addCustomer/dataReporting', {
219 
+    axios.get('/addCustomer/dataReporting', {
221 220 
       params: {
222 221 
         corpid: this.$route.query.corpid,
223 222 
         user_id: this.$route.query.user_id,

File diff suppressed because it is too large
+ 1 - 1
static/css/app.5186fd78a1f3ec7d3f421b0c2fb5e1f4.css


File diff suppressed because it is too large
+ 0 - 1
static/js/7.7ddb71882cfa4c322f0b.js


File diff suppressed because it is too large
+ 1 - 0
static/js/7.f2fe236caca406bcfa43.js


File diff suppressed because it is too large
+ 1 - 1
static/js/manifest.3a196b4230b9149f39dc.js