首頁 探索 說明
註冊 登入
xiuli.gao
/
playlet
關註 1
讚好 0
複刻 0
代碼 問題管理 0 合併請求 0 提交歷史 1777 版本發佈 0 Wiki
瀏覽代碼

解决冲突

liuxiaona 2 年之前
父節點
5a5140add1 aceb73e8fc
當前提交
4dace53733
共有 58 個文件被更改，包括 18 次插入 和 529 次删除
分割檢視 顯示文件統計
  1. 16 4
      .idea/workspace.xml
  2. 0 10
      index.html
  3. 1 1
      project/src/components/customOperate/friendsCircle/fcListdetial.vue
  4. 1 1
      project/src/components/dataBoard/throwPerson/throwPersonSon.vue
  5. 0 1
      static/css/app.f2b5a67724ad26262d2d5b8575b0c2c8.css
  6. 二進制
      static/fonts/element-icons.535877f.woff
  7. 二進制
      static/fonts/element-icons.732389d.ttf
  8. 二進制
      static/img/404.ff9db83.png
  9. 二進制
      static/img/dpNoData.28b47ba.png
  10. 二進制
      static/img/exterprise-mass-send.ee20127.png
  11. 二進制
      static/img/friendsCircleSend.289dbc8.png
  12. 二進制
      static/img/homeBigImg.f886d52.png
  13. 二進制
      static/img/kaigongsi.929270e.png
  14. 二進制
      static/img/loginBg.b4c82ec.png
  15. 二進制
      static/img/login_box.039035d.png
  16. 二進制
      static/img/phone.1c130fa.png
  17. 0 8
      static/js/0.c6a15b4e0de45a4eda2f.js
  18. 0 16
      static/js/1.e7a49a517b66e754a35a.js
  19. 0 1
      static/js/10.4f54118dc93d2ac72c2b.js
  20. 0 1
      static/js/11.e0af605347ed976e6523.js
  21. 0 1
      static/js/12.37d102da7078870852d5.js
  22. 0 1
      static/js/13.5342320f91993471f96b.js
  23. 0 1
      static/js/14.86ac02c4140cac5a277f.js
  24. 0 1
      static/js/15.1df40acdd92ad4098dca.js
  25. 0 1
      static/js/16.354ca35224b0eaed3de8.js
  26. 0 42
      static/js/17.de383293a90fcecfc9ec.js
  27. 0 1
      static/js/18.e5c618a4587fac72374d.js
  28. 0 1
      static/js/19.26cd6fbdbc6af3338dcb.js
  29. 0 1
      static/js/2.ffd279c211497b88757d.js
  30. 0 1
      static/js/20.372b0ac8ec28d05628ed.js
  31. 0 1
      static/js/21.4051734d161015b4f1be.js
  32. 0 1
      static/js/22.799f8c7093cd5165c12c.js
  33. 0 1
      static/js/23.f7caa4bf5274c7ecdf06.js
  34. 0 1
      static/js/24.3c9d6aa2ec50b811749d.js
  35. 0 1
      static/js/25.169478eccba755689949.js
  36. 0 1
      static/js/26.07d37e4d74c7d81ae7d7.js
  37. 0 1
      static/js/27.05aec7f1c869e9c96d33.js
  38. 0 1
      static/js/28.a4c7656efd3c809f9429.js
  39. 0 1
      static/js/29.4a7ba97751866a5b307e.js
  40. 0 1
      static/js/3.4744dd224c645802cc45.js
  41. 0 1
      static/js/30.9e377632620c682bf2ab.js
  42. 0 1
      static/js/31.6e3875004e54fa33fde7.js
  43. 0 1
      static/js/32.aa2ca0fffc76b4474893.js
  44. 0 1
      static/js/33.82beedd873752105ec99.js
  45. 0 1
      static/js/34.20fe4195c5e4e7fff042.js
  46. 0 1
      static/js/35.2ad8880aafe385c8f52d.js
  47. 0 1
      static/js/36.9818dd47da4c912206d0.js
  48. 0 1
      static/js/37.011f346b9f4d34e7b650.js
  49. 0 1
      static/js/38.86ab57876d7afd042918.js
  50. 0 2
      static/js/39.cb8efca94b0602745857.js
  51. 0 18
      static/js/4.4dfa8ecc35ce4e1f9b09.js
  52. 0 25
      static/js/5.cc49c9911baa1440fd45.js
  53. 0 1
      static/js/6.11371a63a613cf872d74.js
  54. 0 1
      static/js/7.118adf4af4b005e778a6.js
  55. 0 1
      static/js/8.68f827de8ec71bfc2bbf.js
  56. 0 1
      static/js/9.3647739c7778f42bd127.js
  57. 0 366
      static/js/app.c2e5521d1fbb954e90f5.js
  58. 0 1
      static/js/manifest.1b6815fd7cc51857b5ea.js

+ 16 - 4
.idea/workspace.xml
查看文件 

@@ -2,10 +2,15 @@
2 2 
 <project version="4">
3 3 
   <component name="ChangeListManager">
4 4 
     <list default="true" id="326b77ef-a0bc-4d8a-bd1c-34c4541ee400" name="Changes" comment="">
5 
+      <change afterPath="$PROJECT_DIR$/static/js/15.9b7a8e852d7ad450d18f.js" afterDir="false" />
6 
+      <change afterPath="$PROJECT_DIR$/static/js/19.75fb13f6a8611c557a2b.js" afterDir="false" />
5 7 
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 
-      <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/createFriendsCircle.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/createFriendsCircle.vue" afterDir="false" />
7 
-      <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/employee_bulk_messaging_log.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/employee_bulk_messaging_log.vue" afterDir="false" />
8 
-      <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" />
8 
+      <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
9 
+      <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/friendsCircle/fcListdetial.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/friendsCircle/fcListdetial.vue" afterDir="false" />
10 
+      <change beforePath="$PROJECT_DIR$/project/src/components/dataBoard/throwPerson/throwPersonSon.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/dataBoard/throwPerson/throwPersonSon.vue" afterDir="false" />
11 
+      <change beforePath="$PROJECT_DIR$/static/css/app.0a590cb30daf9ed5b004a49c6fd19e13.css" beforeDir="false" afterPath="$PROJECT_DIR$/static/css/app.0a590cb30daf9ed5b004a49c6fd19e13.css" afterDir="false" />
12 
+      <change beforePath="$PROJECT_DIR$/static/js/19.26cd6fbdbc6af3338dcb.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/19.26cd6fbdbc6af3338dcb.js" afterDir="false" />
13 
+      <change beforePath="$PROJECT_DIR$/static/js/manifest.3210419f869b34f44ea6.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/manifest.3210419f869b34f44ea6.js" afterDir="false" />
9 14 
     </list>
10 15 
     <option name="SHOW_DIALOG" value="false" />
11 16 
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
 
@@ -125,6 +130,7 @@
125 130 
       <workItem from="1653271650799" duration="18349000" />
126 131 
       <workItem from="1653444395016" duration="24196000" />
127 132 
       <workItem from="1653616597711" duration="29019000" />
133 
+      <workItem from="1653961967069" duration="746000" />
128 134 
     </task>
129 135 
     <servers />
130 136 
   </component>
 
@@ -161,7 +167,13 @@
161 167 
       <map>
162 168 
         <entry key="MAIN">
163 169 
           <value>
164 
-            <State />
170 
+            <State>
171 
+              <option name="CUSTOM_BOOLEAN_PROPERTIES">
172 
+                <map>
173 
+                  <entry key="Show.Git.Branches" value="true" />
174 
+                </map>
175 
+              </option>
176 
+            </State>
165 177 
           </value>
166 178 
         </entry>
167 179 
       </map>

+ 0 - 10
index.html
查看文件 

@@ -1,10 +0,0 @@
1 
-<!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";
2 
-      window.onresize = function(){
3 
-        document.documentElement.style.fontSize = 100 * (document.documentElement.clientWidth/1920) + "px";
4 
-      }</script><script>var _hmt = _hmt || [];
5 
-      (function() {
6 
-        var hm = document.createElement("script");
7 
-        hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
8 
-        var s = document.getElementsByTagName("script")[0];
9 
-        s.parentNode.insertBefore(hm, s);
10 
-      })();</script><link href=./static/css/app.f2b5a67724ad26262d2d5b8575b0c2c8.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.1b6815fd7cc51857b5ea.js></script><script type=text/javascript src=./static/js/app.c2e5521d1fbb954e90f5.js></script></body></html>

+ 1 - 1
project/src/components/customOperate/friendsCircle/fcListdetial.vue
查看文件 

@@ -18,7 +18,7 @@
18 18 
         <div class="tMar6 fc_con pyq_img_box" v-if="rowInfo&&rowInfo.attachments&&rowInfo.attachments.length>0">
19 19 
           <template v-for="item in rowInfo.attachments">
20 20 
             <img v-if="item.msgtype == 'image'" :key="item.media_id" :src="item[item.msgtype].pic_url" alt="" :style="rowInfo.attachments&&rowInfo.attachments.length>1?'':'width:200px'">
21 
-            <video v-if="item.msgtype == 'video'" :key="item.media_id" :src="item[item.msgtype].pic_url" controls="controls" style="width: 200px;height: 200px;"></video>
21 
+            <video v-if="item.msgtype == 'video'" :key="item.media_id" :src="item[item.msgtype].pic_url" controls="controls" style="width: 300px;height: 200px;"></video>
22 22 
             <div class="flex-align-center" v-if="item.msgtype == 'link'">
23 23 
               <img :src="item.link.pic_url" alt="" style="width: 30px;margin-right: 6px;margin-top:0">
24 24 
               <span class="f14 line18">

+ 1 - 1
project/src/components/dataBoard/throwPerson/throwPersonSon.vue
查看文件 

@@ -41,7 +41,7 @@
41 41 
           <img src="@/assets/img/icon/回本率@2x.png" class="titleIcon" alt="">
42 42 
           <span>回本率</span>
43 43 
         </div>
44 
-        <div class="dataItem-data">{{dataInfo&&(dataInfo.sum_recover_rate||dataInfo.sum_recover_rate==0)?dataInfo.sum_recover_rate+'%':'-'}}</div>
44 
+        <div class="dataItem-data">{{dataInfo&&(dataInfo.sum_recover_rate||dataInfo.sum_recover_rate==0)?dataInfo.sum_recover_rate:'-'}}</div>
45 45 
       </div>
46 46 
     </div>
47 47 
     <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">

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


二進制
static/fonts/element-icons.535877f.woff
查看文件


二進制
static/fonts/element-icons.732389d.ttf
查看文件


二進制
static/img/404.ff9db83.png
查看文件


二進制
static/img/dpNoData.28b47ba.png
查看文件


二進制
static/img/exterprise-mass-send.ee20127.png
查看文件


二進制
static/img/friendsCircleSend.289dbc8.png
查看文件


二進制
static/img/homeBigImg.f886d52.png
查看文件


二進制
static/img/kaigongsi.929270e.png
查看文件


二進制
static/img/loginBg.b4c82ec.png
查看文件


二進制
static/img/login_box.039035d.png
查看文件


二進制
static/img/phone.1c130fa.png
查看文件


File diff suppressed because it is too large
+ 0 - 8
static/js/0.c6a15b4e0de45a4eda2f.js


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


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


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


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


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


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


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


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


File diff suppressed because it is too large
+ 0 - 42
static/js/17.de383293a90fcecfc9ec.js


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


File diff suppressed because it is too large
+ 0 - 2
static/js/39.cb8efca94b0602745857.js


File diff suppressed because it is too large
+ 0 - 18
static/js/4.4dfa8ecc35ce4e1f9b09.js


File diff suppressed because it is too large
+ 0 - 25
static/js/5.cc49c9911baa1440fd45.js


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


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


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


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


File diff suppressed because it is too large
+ 0 - 366
static/js/app.c2e5521d1fbb954e90f5.js


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