From 1b848d0aaf01b3d20fb6286dedfd514b709439fc Mon Sep 17 00:00:00 2001
From: liudianxin <liudianxin@bd-apaas.com>
Date: Tue, 21 Jul 2020 12:08:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BA=91=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=AF=84=E4=BB=B7=EF=BC=8C=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E8=B0=83=E6=95=B4=EF=BC=8C=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=AD=97=E7=AC=A6=E9=95=BF=E5=BA=A6=E9=99=90?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/order-list/order-list-cell.vue |   4 +-
 src/pages/user/order/order_detail.vue         |  70 ++++++++-
 src/pages/user/user_info.vue                  | 148 ++++++++++++------
 src/request/api/user.js                       |   4 +-
 4 files changed, 173 insertions(+), 53 deletions(-)

diff --git a/src/components/order-list/order-list-cell.vue b/src/components/order-list/order-list-cell.vue
index 38f1bf1..8985b17 100644
--- a/src/components/order-list/order-list-cell.vue
+++ b/src/components/order-list/order-list-cell.vue
@@ -93,12 +93,12 @@
             <div class="approval_status_btn" slot="reference">服务评价</div>
           </el-popover>
           <div
-            v-else-if="cellItem.approval_second_level == 1 && cellItem.pay_status != -1 && cellItem.is_estimated == 1 && !showMsgBox"
+            v-else-if="cellItem.order_type != 3 && cellItem.approval_second_level == 1 && cellItem.pay_status != -1 && cellItem.is_estimated == 1 && !showMsgBox"
             class="approval_status_btn"
             @click="getMessage"
           >查看评价</div>
           <div
-            v-else-if="cellItem.approval_second_level == 1 && cellItem.pay_status != -1 && cellItem.is_estimated == 1 && showMsgBox"
+            v-else-if="cellItem.order_type != 3 && cellItem.approval_second_level == 1 && cellItem.pay_status != -1 && cellItem.is_estimated == 1 && showMsgBox"
             class="approval_status_btn"
             @click="showMsgBox = false"
           >收起评价</div>
diff --git a/src/pages/user/order/order_detail.vue b/src/pages/user/order/order_detail.vue
index d06314c..96cbf74 100644
--- a/src/pages/user/order/order_detail.vue
+++ b/src/pages/user/order/order_detail.vue
@@ -37,7 +37,7 @@
         </div>
         <div class="btn_group">
           <el-popover
-            v-if="orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1 && orderDetail.is_estimated == 0"
+            v-if="orderDetail.order_type != 3 && orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1 && orderDetail.is_estimated == 0"
             placement="right-start"
             width="300"
             v-model="visible"
@@ -65,12 +65,12 @@
             <el-button class="evaluation" slot="reference">服务评价</el-button>
           </el-popover>
           <el-button
-            v-else-if="orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1 && orderDetail.is_estimated == 1 && !showMsgBox"
+            v-else-if="orderDetail.order_type != 3 && orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1 && orderDetail.is_estimated == 1 && !showMsgBox"
             class="approval_status_btn"
             @click="getMessage"
           >查看评价</el-button>
           <el-button
-            v-else-if="orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1 && orderDetail.is_estimated == 1 && showMsgBox"
+            v-else-if="orderDetail.order_type != 3 && orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1 && orderDetail.is_estimated == 1 && showMsgBox"
             class="approval_status_btn"
             @click="showMsgBox = false"
           >收起评价</el-button>
@@ -86,6 +86,22 @@
           >取消申请</el-button>
         </div>
       </div>
+      <el-collapse-transition>
+        <div v-if="showMsgBox" class="evaluation_msg">
+          <div class="msg_title">服务评分：</div>
+          <div class="msg_rate">
+            <el-rate
+              v-model="message.score"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"
+            ></el-rate>
+          </div>
+          <div class="msg_title">评价详情：</div>
+          <div class="msg_text">{{ message.content }}</div>
+        </div>
+      </el-collapse-transition>
       <div class="detail_title">{{ orderDetail.order_type == 1 ? "服务" : "应用"}}信息</div>
       <div class="detail_service">
         <el-row class="detail_service_row">
@@ -456,6 +472,7 @@ export default {
           duration_unit: this.cellItem.duration_unit
         };
       }
+      window.sessionStorage.setItem("shoppingCart", JSON.stringify(query));
       this.$router.push({
         path: "/shop/shop_car_apply",
         query: query
@@ -478,6 +495,37 @@ export default {
             });
           }
         });
+    },
+    getMessage() {
+      if (this.cellItem.order_type == 1) {
+        this.$api.user
+          .getServiceEvaluation({ apply_id: this.cellItem.apply_id })
+          .then(response => {
+            if (response.data.success == 1) {
+              this.message = response.data.data;
+              this.showMsgBox = true;
+            } else {
+              this.$message({
+                message: "获取评价失败",
+                type: "error"
+              });
+            }
+          });
+      } else if (this.cellItem.order_type == 2) {
+        this.$api.user
+          .getAppEvaluation({ apply_id: this.cellItem.apply_id })
+          .then(response => {
+            if (response.data.success == 1) {
+              this.message = response.data.data;
+              this.showMsgBox = true;
+            } else {
+              this.$message({
+                message: "获取评价失败",
+                type: "error"
+              });
+            }
+          });
+      }
     }
   }
 };
@@ -759,6 +807,22 @@ export default {
   display: block;
   margin-top: 20px;
 }
+.evaluation_msg {
+  height: 100%;
+  border-top: 1px #ededed solid;
+  padding: 20px;
+}
+.msg_title {
+  color: #8890a7;
+  margin: 0 0 10px;
+}
+.msg_rate {
+  margin: 0 0 10px 20px;
+}
+.msg_text {
+  margin-left: 20px;
+  color: #242c43;
+}
 </style>
 <style>
 .pop_rate .el-rate__icon {
diff --git a/src/pages/user/user_info.vue b/src/pages/user/user_info.vue
index b85c215..6826daf 100644
--- a/src/pages/user/user_info.vue
+++ b/src/pages/user/user_info.vue
@@ -9,9 +9,9 @@
         <el-tab-pane label="个人信息详情" name="0"></el-tab-pane>
         <el-tab-pane label="业务系统详情" name="1"></el-tab-pane>
       </el-tabs>
-      <div v-if="activeName == '0'">
-        <el-form ref="form" :model="user_data">
-          <el-form-item class="info_item">
+      <div v-show="activeName == '0'">
+        <el-form ref="form" :model="user_data" :rules="rules_user">
+          <el-form-item class="info_item" prop="accountNo">
             <p>账号：</p>
             <el-input v-model="user_data.accountNo"></el-input>
           </el-form-item>
@@ -20,7 +20,7 @@
             <el-input type="password" v-model="user_data.password" :disabled="true"></el-input>
             <el-button class="option_btn" @click="changePassword">修改密码</el-button>
           </el-form-item>
-          <el-form-item class="info_item">
+          <el-form-item class="info_item" prop="nickname">
             <p>昵称：</p>
             <el-input v-model="user_data.nickname"></el-input>
           </el-form-item>
@@ -35,15 +35,15 @@
               @getNewList="getNewList"
             ></upload-file>
           </el-form-item>
-          <el-form-item class="info_item">
+          <el-form-item class="info_item" prop="contactPerson">
             <p>联系人：</p>
             <el-input v-model="user_data.contactPerson"></el-input>
           </el-form-item>
-          <el-form-item class="info_item">
+          <el-form-item class="info_item" prop="phone">
             <p>手机号：</p>
             <el-input v-model="user_data.phone"></el-input>
           </el-form-item>
-          <el-form-item class="info_item">
+          <el-form-item class="info_item" prop="email">
             <p>邮箱：</p>
             <el-input v-model="user_data.email"></el-input>
           </el-form-item>
@@ -70,9 +70,9 @@
           </el-form-item>
         </el-form>
       </div>
-      <div v-if="activeName == '1'">
-        <el-form ref="formBusiness" :model="formBusiness">
-          <el-form-item class="info_item">
+      <div v-show="activeName == '1'">
+        <el-form ref="formBusiness" :model="formBusiness" :rules="rules_bussiness">
+          <el-form-item class="info_item" prop="businessSystemName">
             <p>业务系统名：</p>
             <el-input v-model="formBusiness.businessSystemName"></el-input>
           </el-form-item>
@@ -118,7 +118,7 @@
             <el-button class="option_btn" @click="copyKey">复制</el-button>
             <el-button class="option_btn_gray" @click="resetKey">重置</el-button>
           </el-form-item>
-          <el-form-item class="info_item">
+          <el-form-item class="info_item" prop="description">
             <p>描述：</p>
             <el-input type="textarea" :rows="2" v-model="formBusiness.description"></el-input>
           </el-form-item>
@@ -263,7 +263,37 @@ export default {
       newIpWhite: "",
       newIpBlack: "",
       diaPassWord: false,
-      upLevelDia: false
+      upLevelDia: false,
+      rules_user: {
+        accountNo: [
+          { required: true, message: "请输入账号", trigger: "blur" },
+          { max: 8, message: "长度请小于8个字符", trigger: "blur" }
+        ],
+        nickname: [
+          { required: true, message: "请输入昵称", trigger: "blur" },
+          { max: 8, message: "长度请小于8个字符", trigger: "blur" }
+        ],
+        contactPerson: [
+          { max: 6, message: "长度请小于6个字符", trigger: "blur" }
+        ],
+        phone: [
+          { pattern: /^1[34578]\d{9}$/, message: "请输入正确的手机号码" }
+        ],
+        email: [
+          {
+            pattern: /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[-|_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/,
+            message: "请输入正确的邮箱"
+          }
+        ]
+      },
+      rules_bussiness: {
+        businessSystemName: [
+          { max: 16, message: "长度请小于16个字符", trigger: "blur" }
+        ],
+        description: [
+          { max: 500, message: "长度请小于500个字符", trigger: "blur" }
+        ]
+      }
     };
   },
   mounted() {
@@ -320,42 +350,68 @@ export default {
     registe() {
       let query = {};
       if (this.activeName == 0) {
-        console.log(this.user_data, this.imgList);
-        query = {
-          pageType: "personalFile", // this page is user info
-          user_id: this.user_data.accountNo,
-          user_name: this.user_data.nickname,
-          phone: this.user_data.phone,
-          email: this.user_data.email,
-          is_admin: this.user_data.userType,
-          link_man: this.user_data.contactPerson,
-          picture_path: this.imgList[0]
-        };
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            query = {
+              pageType: "personalFile", // this page is user info
+              user_id: this.user_data.accountNo,
+              user_name: this.user_data.nickname,
+              phone: this.user_data.phone,
+              email: this.user_data.email,
+              is_admin: this.user_data.userType,
+              link_man: this.user_data.contactPerson,
+              picture_path: this.imgList[0]
+            };
+            this.$api.authority.setUserInfo(query).then(response => {
+              if (response.data.success == 1) {
+                this.$message({
+                  message: "修改个人信息成功",
+                  type: "success"
+                });
+                this.getUserInfo();
+              } else {
+                this.$message({
+                  message: "修改个人信息失败",
+                  type: "error"
+                });
+              }
+            });
+          } else {
+            return false;
+          }
+        });
       } else if (this.activeName == 1) {
-        query = {
-          pageType: "systemFile", // this page is system info
-          user_id: this.user_data.accountNo,
-          system_name: this.formBusiness.businessSystemName,
-          domain_name: this.formBusiness.domainName,
-          ip_whitelist: this.formBusiness.ip_white,
-          ip_blacklist: this.formBusiness.ip_black,
-          description: this.formBusiness.description
-        };
+        this.$refs["formBusiness"].validate(valid => {
+          console.log(valid);
+          if (valid) {
+            query = {
+              pageType: "systemFile", // this page is system info
+              user_id: this.user_data.accountNo,
+              system_name: this.formBusiness.businessSystemName,
+              domain_name: this.formBusiness.domainName,
+              ip_whitelist: this.formBusiness.ip_white,
+              ip_blacklist: this.formBusiness.ip_black,
+              description: this.formBusiness.description
+            };
+            this.$api.authority.setUserInfo(query).then(response => {
+              if (response.data.success == 1) {
+                this.$message({
+                  message: "修改个人信息成功",
+                  type: "success"
+                });
+                this.getUserInfo();
+              } else {
+                this.$message({
+                  message: "修改个人信息失败",
+                  type: "error"
+                });
+              }
+            });
+          } else {
+            return false;
+          }
+        });
       }
-      this.$api.authority.setUserInfo(query).then(response => {
-        if (response.data.success == 1) {
-          this.$message({
-            message: "修改个人信息成功",
-            type: "success"
-          });
-          this.getUserInfo();
-        } else {
-          this.$message({
-            message: "修改个人信息失败",
-            type: "error"
-          });
-        }
-      });
     },
     changePassword() {
       this.diaPassWord = true;
diff --git a/src/request/api/user.js b/src/request/api/user.js
index 56dcb18..160679c 100644
--- a/src/request/api/user.js
+++ b/src/request/api/user.js
@@ -11,7 +11,7 @@ const user = {
         return axios.get(`/apaas/serviceapp/v3/order/domains`);
     },
     delOrder(params) {
-        return axios.delete(`/order/del?order_id=${params.id}`);
+        return axios.delete(`/apaas/serviceapp/v3/order/del?order_id=${params.id}`);
     },
     addServiceEvaluation(params) {
         return axios.post(`/apaas/serviceapp/v3/order/estimate`, params);
@@ -35,7 +35,7 @@ const user = {
         return axios.get(`/apaas/serviceapp/v3/order/approval?apply_id=${params.apply_id}&kind=${params.kind}`);
     },
     cancelOrder(params) {
-        return axios.delete(`/order/cancel?order_id=${params.order_id}`);
+        return axios.delete(`/apaas/serviceapp/v3/order/cancel?order_id=${params.order_id}`);
     },
 
     // user info
-- 
2.26.0