From ce2fa09fc58cf6166050e59ca99bfb6f4923f0c4 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 27 Mar 2020 17:12:53 +0800
Subject: [PATCH] color change

---
 test_client/src/views/crm/consumer.vue |  2 +-
 test_mini/pages/collect/main.wxml      |  3 +--
 test_mini/pages/cuoti/index.wxml       |  6 +++--
 test_mini/pages/lianxi/main.js         | 32 ++++++++------------------
 test_mini/pages/main/main.js           |  4 ++--
 test_mini/pages/main/main.wxml         |  9 ++------
 test_mini/pages/my/index.wxml          |  2 +-
 7 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/test_client/src/views/crm/consumer.vue b/test_client/src/views/crm/consumer.vue
index 3e30c00..d784c71 100644
--- a/test_client/src/views/crm/consumer.vue
+++ b/test_client/src/views/crm/consumer.vue
@@ -118,7 +118,7 @@
           <span>{{ scope.row.create_time }}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="操作">
+      <el-table-column align="center" label="操作" fixed="right">
         <template slot-scope="scope">
           <el-button
             type="primary"
diff --git a/test_mini/pages/collect/main.wxml b/test_mini/pages/collect/main.wxml
index 759708b..2ef65d4 100644
--- a/test_mini/pages/collect/main.wxml
+++ b/test_mini/pages/collect/main.wxml
@@ -7,8 +7,7 @@
       <span class="txlabel">{{tm_current.type}}</span>
     </view>
     <view style="text-align:center">
-    <span style="color:drakblue;font-weight:bold;font-size:14px">{{tm_current.questioncat_name}}(</span>
-    <span style="color:orange;font-weight:bold;font-size:14px">{{tm_current.dtime}})</span>
+    <span style="color:drakblue;font-weight:bold;font-size:14px">{{tm_current.questioncat_name}}</span>
     </view>
     <view class="weui-article__title">{{tm_current.name}}</view>
   </view>
diff --git a/test_mini/pages/cuoti/index.wxml b/test_mini/pages/cuoti/index.wxml
index 890d047..0a53c4a 100644
--- a/test_mini/pages/cuoti/index.wxml
+++ b/test_mini/pages/cuoti/index.wxml
@@ -7,8 +7,10 @@
       <span class="txlabel">{{currentTm.type}}</span>
     </view>
     <view style="text-align:center">
-    <span style="color:drakblue;font-weight:bold;font-size:14px">{{currentTm.questioncat_name}}(</span>
-    <span style="color:orange;font-weight:bold;font-size:14px">{{currentTm.dtime}})</span>
+    <span style="color:drakblue;font-weight:bold;font-size:14px">{{currentTm.questioncat_name}}</span>
+    (
+    <span style="color:orange;font-weight:bold;font-size:14px">{{currentTm.dtime}}</span>
+    )
     </view>
     <view class="weui-article__title">{{currentTm.name}}</view>
   </view>
diff --git a/test_mini/pages/lianxi/main.js b/test_mini/pages/lianxi/main.js
index 8b328ed..8b3ca35 100644
--- a/test_mini/pages/lianxi/main.js
+++ b/test_mini/pages/lianxi/main.js
@@ -10,10 +10,11 @@ Page({
     questioncat: null,
     tms: [],
     ydtms: [],
+    ydtms_old:[],
     ctms: [],
     tm_index: 0,
     answerP: false,
-    isLoad: true,
+    page:1
   },
   radioChange: function(e) {
     var that = this
@@ -42,6 +43,7 @@ Page({
       var value = wx.getStorageSync('cat' + that.data.questioncat.toString())
       if (value) {
         that.data.ydtms = value
+        that.data.ydtms_old = value
       }
     } catch (e) {}
     try {
@@ -62,31 +64,14 @@ Page({
     var that = this
     var query = {
       questioncat: that.data.questioncat,
-      ydtms: that.data.ydtms
+      ydtms: that.data.ydtms_old
     }
-    api.request('question/question/exercise/', 'POST', query).then(res => {
-      if (res.data.results.length == 0) {
-        wx.showModal({
-          title: '提示',
-          content: '无更多新题,返回重新开始',
-          showCancel: false,
-          success: function(res) {
-            if (res.confirm) {
-              wx.navigateBack({})
-            }
-          }
-        })
-      } else {
+    api.request('question/question/exercise/?limit=10&page='+that.data.page, 'POST', query).then(res => {
         that.data.tms = that.data.tms.concat(res.data.results)
         that.showTm(that.data.tm_index) //展示题目和答案
-        if (that.data.isLoad) {
-          that.setData({
-            tmtotal: res.data.total,
-          })
-          that.data.isLoad = false
-        }
-
-      }
+        that.setData({
+          tmtotal: res.data.count,
+        })
     })
   },
   /**
@@ -194,6 +179,7 @@ Page({
       answerP: false
     })
     if (tm_index + 1 > that.data.tms.length) {
+      that.data.page = that.data.page + 1
       that.getTms()
     } else {
       that.showTm(tm_index)
diff --git a/test_mini/pages/main/main.js b/test_mini/pages/main/main.js
index 5f77206..c6e1361 100644
--- a/test_mini/pages/main/main.js
+++ b/test_mini/pages/main/main.js
@@ -124,7 +124,7 @@ Page({
       })
     }else{
       wx.showToast({
-        title: '未开通权限\r\n请联系顾问师圆',
+        title: '未开通权限\r\n请联系课程顾问',
         icon: 'none',
         duration: 2000
       })
@@ -137,7 +137,7 @@ Page({
       })
     } else {
       wx.showToast({
-        title: '未开通权限\r\n请联系顾问师圆',
+        title: '未开通权限\r\n请联系课程顾问',
         icon: 'none',
         duration: 2000
       })
diff --git a/test_mini/pages/main/main.wxml b/test_mini/pages/main/main.wxml
index 1a19ebd..13ed81d 100644
--- a/test_mini/pages/main/main.wxml
+++ b/test_mini/pages/main/main.wxml
@@ -11,12 +11,11 @@
     <view style="color:blue;font-weight:bold;text-align:center">
       欢迎使用中科辐射学堂!
       <view style="color:orange;font-weight:bold">
-      <view >如有疑问请联系顾问师圆</view>
+      <view >开通权限请联系课程顾问师老师</view>
       <view >18355135390(微信同号)</view>
       </view>
     </view>
   </view>
-  <view class="weui-cells__title">练习</view>
   <view class="weui-cells weui-cells_after-title">
   <view class="weui-grids">
     <a class="weui-grid" bindtap="goLianxi">
@@ -37,11 +36,7 @@
       </view>
       <view class="weui-grid__label">收藏集</view>
     </navigator>
-  </view>
-  </view>
-  <view class="weui-cells__title">考试</view>
-  <view class="weui-cells weui-cells_after-title">
-  <view class="weui-grids">
+
     <a class="weui-grid" bindtap="goMoni">
       <view class="weui-grid__icon">
         <image src="/images/moni.svg" alt></image>
diff --git a/test_mini/pages/my/index.wxml b/test_mini/pages/my/index.wxml
index 0c6d644..1eb47b5 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">更多服务请联系课程顾问师老师:18355135390</view>
 </view>