合并分支 'release' 到 'master'

Release

查看合并请求 !28

src/assets/icon/svg/chat.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="33px" height="31px" viewBox="0 0 33 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 60.1 (88133) - https://sketch.com -->
+    <title>客服</title>
+    <desc>Created with Sketch.</desc>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="可视化数据备份" transform="translate(-1879.000000, -580.000000)" fill-rule="nonzero">
+            <g id="编组-11" transform="translate(1866.000000, 570.000000)">
+                <g id="客服消息" transform="translate(4.000000, 0.000000)">
+                    <g id="客服" transform="translate(8.000000, 8.000000)">
+                        <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="35" height="35"></rect>
+                        <path d="M28.6611111,15.6722222 C27.9552778,15.6722222 27.3777778,15.1313131 27.3777778,14.470202 C27.3777778,9.1813131 22.7577778,4.85404038 17.1111111,4.85404041 C11.4644444,4.85404045 6.84444443,9.18131314 6.84444443,14.470202 C6.84444443,15.1313131 6.26694443,15.6722222 5.56111111,15.6722222 C4.85527779,15.6722222 4.27777779,15.1313131 4.27777779,14.470202 C4.27777779,7.8590909 10.0527778,2.45 17.1111111,2.45 C24.1694445,2.45 29.9444445,7.8590909 29.9444445,14.470202 C29.9444445,15.1313131 29.3669445,15.6722222 28.6611111,15.6722222 Z" id="路径" fill="#3793DF"></path>
+                        <path d="M7,24.9666667 C3.79166666,24.9666667 1.16666666,22.3416667 1.16666666,19.1333333 C1.16666666,15.925 3.79166666,13.3 7,13.3 C7.64166666,13.3 8.16666666,13.825 8.16666666,14.4666667 L8.16666666,23.8 C8.16666666,24.4416667 7.64166666,24.9666667 7,24.9666667 L7,24.9666667 Z" id="形状" fill="#6ED5FF"></path>
+                        <path d="M19.0944444,31.9666667 C18.2388889,31.9666667 17.5388889,31.4416667 17.5388889,30.8 C17.5388889,30.1583333 18.2388889,29.6333333 19.0944444,29.6333333 C23.3722222,29.6333333 26.8722223,27.0083333 26.8722223,23.8 C26.8722223,23.1583333 27.5722223,22.6333333 28.4277778,22.6333333 C29.2833333,22.6333333 29.9833333,23.1583333 29.9833333,23.8 C29.9833333,28.2916667 25.0833333,31.9666667 19.0944444,31.9666667 L19.0944444,31.9666667 Z" id="路径" fill="#3793DF"></path>
+                        <path d="M28,24.9666667 C27.3583333,24.9666667 26.8333333,24.4416667 26.8333333,23.8 L26.8333333,14.4666667 C26.8333333,13.825 27.3583333,13.3 28,13.3 C31.2083333,13.3 33.8333333,15.925 33.8333333,19.1333333 C33.8333333,22.3416667 31.2083333,24.9666667 28,24.9666667 Z" id="形状" fill="#6ED5FF"></path>
+                        <path d="M19.0555556,32.55 L16.7222222,32.55 C16.0805556,32.55 15.5555556,32.025 15.5555556,31.3833333 L15.5555556,30.2166667 C15.5555556,29.575 16.0805556,29.05 16.7222222,29.05 L19.0555556,29.05 C19.6972222,29.05 20.2222222,29.575 20.2222222,30.2166667 L20.2222222,31.3833333 C20.2222222,32.025 19.6972222,32.55 19.0555556,32.55 Z" id="路径" fill="#6ED5FF"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

src/views/components/taskList/taskDetails.vue

@@ -203,11 +203,18 @@
                     <div class="name">{{ item.user.alias }}</div>
                   </div>
                   <el-button
+                  v-if="item.userid == userid "
                     class="right"
                     type="primary"
                     size="small"
                     @click="requestSession(item)"
                   >发起会话</el-button>
+                  <div v-else>
+                    <svg-icon
+                      icon-class="chat"
+                      style="font-size:26px;"
+                    />
+                  </div>
                 </div>
                 <div class="wxUserInfo columnFlex">
                   <p>
@@ -318,7 +325,7 @@
   export default {
     computed: {
       ...mapState('game', ['taskDetails']),
-      ...mapState('user', ['userInfo'])
+      ...mapState('user', ['userInfo','userid'])
     },
     components: {
       layer
@@ -648,6 +655,9 @@
       height: auto;
       margin-top: 22px;
       margin-bottom: 60px;
+      .sessionUserList{
+        margin-right: 10px;
+      }
       .sessionUser{
         width: 100%;
         height: auto;