增加微信端，未评价工单数显示

pages/my_list/my_list.vue

@@ -73,9 +73,12 @@
               <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'other'">其他</text>
             </view>
             <view class="page_item_top_R">
-              <view class="num">
+              <view class="num" v-if="infoDATA.gdState.value != 6">
                 {{infoDATA.grade?(infoDATA.grade.gradeTotal>=0?'+'+infoDATA.grade.gradeTotal:'-'+infoDATA.grade.gradeTotal):''}}
               </view>
+              <view class="num" v-if="infoDATA.gdState.value == 6">
+                未评价
+              </view>
             </view>
             <view class="L"> </view>
             <view class="R"> </view>
@@ -116,6 +119,9 @@
     <!-- 弹窗 -->
     <showIntegralModel :disjunctor="models.disjunctor" :operate="models.operate" :timestamp="models.timestamp"
       :orderId="models.orderId" @know="know()"></showIntegralModel>
+    <!-- 未评价弹窗提示 -->
+    <showModel :title="models6.title" :icon="models6.icon" :disjunctor="models6.disjunctor" :content="models6.content"
+      @know="know6" :operate="models6.operate"></showModel>
   </scroll-view>
 </template>
 <script>
@@ -125,9 +131,14 @@
     webHandle
   } from "../../http/http.js";
   import showIntegralModel from "../../components/showIntegralModel/showIntegralModel.vue";
+  import showModel from "../../components/showModel/showModel.vue";
   export default {
     data() {
       return {
+        // 弹窗model
+        models6: {
+          disjunctor: false,
+        },
         //滚动距离
         scroll_t: 0,
         scroll_t_old: 0,
@@ -155,6 +166,7 @@
     },
     components: {
       showIntegralModel,
+      showModel,
     },
     methods: {
       //滚动距离
@@ -166,8 +178,23 @@
         this.scroll_t = this.scroll_t_old;
         this.models.disjunctor = false;
       },
+      //未评价弹窗知道了
+      know6() {
+        this.models6.disjunctor = false;
+      },
       //积分详情
       detailIt(infoDATA) {
+        if (infoDATA.gdState.value == 6) {
+          this.models6 = {
+            disjunctor: true,
+            content: "暂未评价，无法查看积分详情",
+            icon: "warn",
+            operate: {
+              know: "知道了"
+            },
+          };
+          return;
+        }
         this.models.disjunctor = true;
         this.models.orderId = infoDATA.id;
         this.models.timestamp = Date.now();
@@ -588,6 +615,7 @@
                 color: #fff;
                 display: inline-block;
                 font-size: 28rpx;
+                margin-left: 16rpx;
               }
 
               .L_time {
@@ -632,7 +660,6 @@
 
           .page_item_cont {
             min-height: 180rpx;
-            max-height: 424rpx;
             padding: 0 16rpx;
             text-align: left;
             position: relative;
@@ -700,7 +727,6 @@
 
           .page_item_foot {
             border-top: 2rpx dashed #e5e9ed;
-            border-bottom: 2rpx dashed #e5e9ed;
             padding: 28rpx 16rpx;
             text-align: left;
 

pages/mypage/mypage.vue

@@ -10,7 +10,8 @@
       <view class="topText">
         <view class="topTextHeader">
           <text>您好,{{ userData.name }}</text>
-          <button v-show="!userData.online" class="changeHospital" size="mini" type="default" @click="changeHospital">切换院区</button>
+          <button v-show="!userData.online" class="changeHospital" size="mini" type="default"
+            @click="changeHospital">切换院区</button>
         </view>
         <view>当前积分 : {{ tabNum.score }}</view>
       </view>
@@ -36,7 +37,7 @@
               align-items: center;
               justify-content: space-between;
             ">
-            <view class="tbTitle"> {{ types }}已完成{{ tabNums }}单，共计{{tabScores}}分 </view>
+            <view class="tbTitle"> {{ types }}已完成工单{{ tabComplete }}单，未评价工单{{tabEvaluate}}单，共计得分{{tabScores}}分 </view>
             <view class="tbText" @click="my_list(tabType)"> 查看明细>> </view>
           </view>
           <view class="canvasRing_wrap">
@@ -45,7 +46,7 @@
           </view>
         </view>
         <view class="TB1" v-show="tabNums == 0 && !TBLoading">
-          <view class="title"> {{ types }}已完成{{ tabNums }}单，共计{{tabScores}}分 </view>
+          <view class="title"> {{ types }}已完成工单{{ tabComplete }}单，未评价工单{{tabEvaluate}}单，共计得分{{tabScores}}分 </view>
           <view class="cont"> 暂无数据 </view>
         </view>
         <view class="TB_list" v-show="!TBLoading">
@@ -98,7 +99,9 @@
         tabNum: {},
         BtData: [],
         types: "今日",
-        tabNums: "", //数量
+        tabNums: "", //总数量
+        tabComplete: "", //已完成工单数量
+        tabEvaluate: "", //未评价工单数量
         tabScores: "", //积分
         sxbType: false,
         userData: {},
@@ -423,14 +426,20 @@
           this.tabNum = res;
           if (this.tabType == "day") {
             this.tabNums = this.tabNum.day;
+            this.tabComplete = this.tabNum.dayComplete;
+            this.tabEvaluate = this.tabNum.dayEvaluate;
             this.tabScores = this.tabNum.dayTotal;
           }
           if (this.tabType == "week") {
             this.tabNums = this.tabNum.week;
+            this.tabComplete = this.tabNum.weekComplete;
+            this.tabEvaluate = this.tabNum.weekEvaluate;
             this.tabScores = this.tabNum.weekTotal;
           }
           if (this.tabType == "month") {
             this.tabNums = this.tabNum.month;
+            this.tabComplete = this.tabNum.monthComplete;
+            this.tabEvaluate = this.tabNum.monthEvaluate;
             this.tabScores = this.tabNum.monthTotal;
           }
           this.getBtData();
@@ -615,6 +624,7 @@
             margin-top: 26rpx;
 
             .tbTitle {
+              width: 70%;
               font-size: 32rpx;
               color: rgb(72, 113, 127);
               font-weight: 500;