From afd240b11738b018ec8dbc93dd1d0f4e2af11274 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sun, 24 May 2020 23:43:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=81=94=E7=B3=BB=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test_client/src/api/crm.js             |  6 +++++
 test_client/src/api/user.js            |  2 ++
 test_client/src/views/crm/consumer.vue | 25 ++++++++++++++++++--
 test_client/src/views/news/news.vue    |  2 +-
 test_mini/pages/article/detail.wxml    |  2 +-
 test_mini/pages/lianxi/main.wxml       |  2 +-
 test_mini/pages/main/main.js           | 32 ++++++++++++++++++--------
 test_mini/pages/my/index.wxml          |  2 +-
 8 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/test_client/src/api/crm.js b/test_client/src/api/crm.js
index 8ce4497..dd1a3f5 100644
--- a/test_client/src/api/crm.js
+++ b/test_client/src/api/crm.js
@@ -77,4 +77,10 @@ export function exportConsumer(query) {
     method: 'get',
     params: query
   })
+}
+export function unbindConsumer(id) {
+  return request({
+    url: `/crm/consumer/${id}/unbind`,
+    method: 'get',
+  })
 }
\ No newline at end of file
diff --git a/test_client/src/api/user.js b/test_client/src/api/user.js
index 294797f..a72fe94 100644
--- a/test_client/src/api/user.js
+++ b/test_client/src/api/user.js
@@ -63,3 +63,5 @@ export function deleteUser(id, data) {
     data
   })
 }
+
+
diff --git a/test_client/src/views/crm/consumer.vue b/test_client/src/views/crm/consumer.vue
index 1968abd..42505ec 100644
--- a/test_client/src/views/crm/consumer.vue
+++ b/test_client/src/views/crm/consumer.vue
@@ -132,7 +132,7 @@
           <span>{{ scope.row.create_time }}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="操作" fixed="right">
+      <el-table-column align="center" label="操作" >
         <template slot-scope="scope">
           <el-button
             type="primary"
@@ -150,6 +150,13 @@
             :disabled="!checkPermission(['consumer_delete'])"
             v-if="!scope.row.is_superconsumer"
           ></el-button>
+          <el-button
+            type="primary"
+            size="small"
+            @click="handleUnbind(scope)"
+            :disabled="!checkPermission(['consumer_unbind'])"
+            v-if="scope.row.username&&scope.row.openid"
+          >解绑微信</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -231,7 +238,8 @@ import {
   updateConsumer,
   importConsumer,
   exportConsumer,
-  deleteConsumers
+  deleteConsumers,
+  unbindConsumer
 } from "@/api/crm";
 import { getSubjectAll } from "@/api/question";
 import { getWorkScopeAll } from "@/api/examtest";
@@ -399,6 +407,19 @@ export default {
         this.$refs["consumerForm"].clearValidate();
       });
     },
+    handleUnbind(scope) {
+      unbindConsumer(scope.row.id).then(res => {
+        if(res.code>=200){
+      this.$message({
+        type: "success",
+        message: "解绑成功!"
+      });
+      this.getList()
+      }
+      }).catch(err => {
+          console.error(err)
+        }) 
+    },
     handleDelete(scope) {
       this.$confirm("确认删除该用户吗?将丢失数据!", "警告", {
         confirmButtonText: "确认",
diff --git a/test_client/src/views/news/news.vue b/test_client/src/views/news/news.vue
index c9df686..1e3fa62 100644
--- a/test_client/src/views/news/news.vue
+++ b/test_client/src/views/news/news.vue
@@ -48,7 +48,7 @@
       <el-table-column align="left" label="更新时间">
         <template slot-scope="scope">{{ scope.row.update_time }}</template>
       </el-table-column>
-      <el-table-column align="center" label="操作">
+      <el-table-column align="center" label="操作" >
         <template slot-scope="scope">
           <el-button
           v-show="scope.row.is_top"
diff --git a/test_mini/pages/article/detail.wxml b/test_mini/pages/article/detail.wxml
index c66c296..c1c8a63 100644
--- a/test_mini/pages/article/detail.wxml
+++ b/test_mini/pages/article/detail.wxml
@@ -10,7 +10,7 @@
     </view>
     <view class="page__bd">
         <view class="weui-article">
-          <parser html="{{content}}" domain="{{domain}}"/>
+          <parser html="{{content}}" domain="{{domain}}" selectable/>
         </view>
     </view>
 </view>
diff --git a/test_mini/pages/lianxi/main.wxml b/test_mini/pages/lianxi/main.wxml
index afad9f3..cf1dfda 100644
--- a/test_mini/pages/lianxi/main.wxml
+++ b/test_mini/pages/lianxi/main.wxml
@@ -1,5 +1,5 @@
 <view class="head">
-  <!-- 题量: {{tm_index+1}}/{{tmtotal}} -->
+  题量: {{tm_index+1}}/{{tmtotal}}
 </view>
 <scroll-view scroll-y="true" style="height: {{scrollHeight}}px;">
   <view class="weui-article">
diff --git a/test_mini/pages/main/main.js b/test_mini/pages/main/main.js
index dbd79a7..6a8d940 100644
--- a/test_mini/pages/main/main.js
+++ b/test_mini/pages/main/main.js
@@ -17,7 +17,7 @@ Page({
     nowWork:null,
     msgList: [
       { title: "欢迎使用中科辐射学堂!" },
-      { title: "如有疑问,请致电课程顾问师老师:18355135390" },]
+      { title: "如有疑问,请致电课程顾问" },]
   },
   imgH: function (e) {
     let winWid = wx.getSystemInfoSync().windowWidth;        //获取当前屏幕的宽度
@@ -107,10 +107,17 @@ Page({
         url: '/pages/lianxi/index',
       })
     }else{
-      wx.showToast({
-        title: '未开通权限\r\n请致电18355135390',
-        icon: 'none',
-        duration: 2000
+      wx.showModal({
+        title: '暂未开通权限!',
+        content: '查看各地区课程顾问联系方式。',
+        confirmText: '查看',
+        success(res) {
+          if (res.confirm) {
+            wx.navigateTo({
+              url: '/pages/article/detail?id=6',
+            })
+          }
+        }
       })
     }
   },
@@ -166,10 +173,17 @@ Page({
         url: '/pages/yati/index',
       })
     } else {
-      wx.showToast({
-        title: '未开通权限\r\n请联系课程顾问',
-        icon: 'none',
-        duration: 2000
+      wx.showModal({
+        title: '暂未开通权限!',
+        content: '查看各地区课程顾问联系方式。',
+        confirmText: '查看',
+        success(res) {
+          if (res.confirm) {
+            wx.navigateTo({
+              url: '/pages/article/detail?id=6',
+            })
+          }
+        }
       })
     }
   },
diff --git a/test_mini/pages/my/index.wxml b/test_mini/pages/my/index.wxml
index 69f8b41..f00aeb4 100644
--- a/test_mini/pages/my/index.wxml
+++ b/test_mini/pages/my/index.wxml
@@ -50,7 +50,7 @@
     </view>
   <view class="weui-footer weui-footer_fixed-bottom">
   <!-- <view class="weui-footer__text" bindtap="intro">点击下载系统/小程序文档介绍</view> -->
-  <view class="weui-footer__text">更多服务请联系课程顾问师老师:18355135390</view>
+  <view class="weui-footer__text">更多服务请联系课程顾问</view>
 </view>