Merge branch 'ldx' into dev

src/App.vue

@@ -19,7 +19,6 @@ export default {
           console.log("--- --- ---");
           console.log(data.data);
           console.log("--- --- ---");
-          
           this.$store.commit("userInfofun", data.data);
         } else {
           console.log(data.errMsg);

src/components/menu.vue

@@ -70,7 +70,7 @@
           <el-button @click="settlement" size="small" class="shop_settlement">去购物车申请结算</el-button>
         </div>
       </div>
-      <div class="shop_sj"></div>
+      <div v-if="userInfo.user_name && userInfo.user_name !=''" class="shop_sj"></div>
     </div>
 
     <div style="float:right">

src/components/order-list/order-list-cell.vue

@@ -7,10 +7,7 @@
     </div>
     <el-row class="cell_row">
       <el-col :span="10" class="cell_msg">
-        <img
-          :src="cellItem.cover"
-          class="cell_msg_img"
-        />
+        <img :src="cellItem.cover" class="cell_msg_img" />
         <div class="cell_msg_right">
           <div class="cell_name">
             <span>{{ cellItem.name }}</span>
@@ -51,12 +48,7 @@
           >
             <p>服务评价：</p>
             <div class="pop_rate">
-              <el-rate
-                v-model="serviceRate"
-                :colors="colors"
-                show-score
-                score-template="{value}"
-              ></el-rate>
+              <el-rate v-model="serviceRate" :colors="colors" show-score score-template="{value}"></el-rate>
             </div>
             <p>填写评价：</p>
             <div class="evaluation_text">
@@ -132,7 +124,7 @@ export default {
   data: () => ({
     visible: false,
     colors: ["#99A9BF", "#F7BA2A", "#FF9900"],
-    serviceRate: 0,
+    serviceRate: null,
     textarea: "",
     showMsgBox: false,
     helper: helper,
@@ -140,50 +132,57 @@ export default {
   }),
   methods: {
     addEvaluation() {
-      if (this.cellItem.order_type == 1) {
-        let query = {
-          service_id: this.cellItem.service_id,
-          content: this.textarea,
-          score: this.serviceRate,
-          apply_id: this.cellItem.apply_id
-        };
-        this.$api.user.addServiceEvaluation(query).then(response => {
-          if (response.data.success == 1) {
-            this.$message({
-              message: "评价订单成功",
-              type: "success"
-            });
-            this.visible = false;
-            this.$emit("updateList");
-          } else {
-            this.$message({
-              message: "评价订单失败",
-              type: "error"
-            });
-          }
-        });
-      } else if (this.cellItem.order_type == 2) {
-        let query = {
-          app: this.cellItem.app_id,
-          content: this.textarea,
-          score: this.serviceRate,
-          apply_id: this.cellItem.apply_id
-        };
-        this.$api.user.addServiceEvaluation(query).then(response => {
-          if (response.data.success == 1) {
-            this.$message({
-              message: "评价订单成功",
-              type: "success"
-            });
-            this.visible = false;
-            this.$emit("updateList");
-          } else {
-            this.$message({
-              message: "评价订单失败",
-              type: "error"
-            });
-          }
+      if (this.textarea == "" && this.serviceRate == null) {
+        this.$message({
+          message: "请先完善评价内容",
+          type: "error"
         });
+      } else {
+        if (this.cellItem.order_type == 1) {
+          let query = {
+            service_id: this.cellItem.service_id,
+            content: this.textarea,
+            score: this.serviceRate,
+            apply_id: this.cellItem.apply_id
+          };
+          this.$api.user.addServiceEvaluation(query).then(response => {
+            if (response.data.success == 1) {
+              this.$message({
+                message: "评价订单成功",
+                type: "success"
+              });
+              this.visible = false;
+              this.$emit("updateList");
+            } else {
+              this.$message({
+                message: "评价订单失败",
+                type: "error"
+              });
+            }
+          });
+        } else if (this.cellItem.order_type == 2) {
+          let query = {
+            app: this.cellItem.app_id,
+            content: this.textarea,
+            score: this.serviceRate,
+            apply_id: this.cellItem.apply_id
+          };
+          this.$api.user.addServiceEvaluation(query).then(response => {
+            if (response.data.success == 1) {
+              this.$message({
+                message: "评价订单成功",
+                type: "success"
+              });
+              this.visible = false;
+              this.$emit("updateList");
+            } else {
+              this.$message({
+                message: "评价订单失败",
+                type: "error"
+              });
+            }
+          });
+        }
       }
     },
     viewDetail(val) {

src/components/order-list/order-list-list.vue

@@ -8,7 +8,7 @@
         <el-col :span="4">操作</el-col>
       </el-row>
     </div>
-    <order-cell v-for="item in datas" :key="item.id" :cellItem="item"></order-cell>
+    <order-cell v-for="item in datas" :key="item.id" :cellItem="item" @updateList="updateList"></order-cell>
   </div>
 </template>
 
@@ -28,7 +28,11 @@ export default {
   },
   data: () => ({}),
   mounted() {},
-  methods: {}
+  methods: {
+    updateList() {
+      this.emit("updateList");
+    }
+  }
 };
 </script>
 <style scoped>

src/components/process-card.vue

 <template>
     <div class="out">
-        <div class="box" v-for="(item,index) in data" :key="index+3000" :style="!(item.arr&&item.arr.length!==0)||item.result==='审批未通过'?{border:'none'}:(type&&type=='approval'&&index==data.length-1)?{borderLeft:'2px dashed #e3e5ef',paddingBottom:'0px',}:{}" :class="data[index+1]&&data[index+1].result==='审批中'?'dashedbd':''">
-            <div class="circle" :style="!(item.arr&&item.arr.length!==0)?{borderColor:'#ffc95c'}:item.result==='审批未通过'?{borderColor:'#de3b4b'}:{}"></div>
-            <div class="card" :style="item.result==='审批未通过'?{backgroundColor:'#fcfafa'}:{}">
-                <p class="card_title" :style="!(item.arr&&item.arr.length!==0)?{backgroundColor:'#fcefd6'}:item.result==='审批未通过'?{backgroundColor:'#f7d5d5'}:{}">
+        <div class="box" v-for="(item,index) in data" :key="index+3000" :style="!(item.arr&&item.arr.length!==0)||item.result==='审批未通过'||item.result==='审批不通过'?{border:'none'}:(type&&type=='approval'&&index==data.length-1)?{borderLeft:'2px dashed #e3e5ef',paddingBottom:'0px',}:{}" :class="data[index+1]&&data[index+1].result==='审批中'?'dashedbd':''">
+            <div class="circle" :style="!(item.arr&&item.arr.length!==0)?{borderColor:'#ffc95c'}:item.result==='审批未通过'||item.result==='审批不通过'?{borderColor:'#de3b4b'}:{}"></div>
+            <div class="card" :style="item.result==='审批未通过'||item.result==='审批不通过'?{backgroundColor:'#fcfafa'}:{}">
+                <p class="card_title" :style="!(item.arr&&item.arr.length!==0)?{backgroundColor:'#fcefd6'}:item.result==='审批未通过'||item.result==='审批不通过'?{backgroundColor:'#f7d5d5'}:{}">
                     <span>{{item.title}}</span>
-                    <span :style="!(item.arr&&item.arr.length!==0)?{color:'#ef9433'}:item.result==='审批未通过'?{color:'#e15260'}:{}">{{item.result}}</span>
+                    <span :style="!(item.arr&&item.arr.length!==0)?{color:'#ef9433'}:item.result==='审批未通过'||item.result==='审批不通过'?{color:'#e15260'}:{}">{{item.result}}</span>
                 </p>
                 <div class="card_contain" v-if="item.arr&&item.arr.length!==0">
                     <info-list :list_arr="item.arr"></info-list>

src/request/api/authority.js

@@ -29,7 +29,7 @@ const authority = {
 
     // User
     setUserInfo(params) {
-        return axios.put(`/apaas/backmgt/user/put`, params);
+        return axios.put(`/apaas/backmgt/user/put?pageType=${params.pageType}`, params);
     },
 }
 

src/request/api/service_shop.js

@@ -32,7 +32,18 @@ Page=${params.Page}&Size=${params.Size}`);
         return axios.get(`/apaas/hubApi/market/list?online_state=${params.online_state}&appTypes=${params.appTypes}&
 businessArea=${params.businessArea}&developable=${params.developable}&orgSource=${params.orgSource}&order=${params.order}&page=${params.page}&limit=${params.limit}&search=${params.search}`);
     },
-    
+
+    // cloud
+    getCloudList() {
+        return axios.get(`/apaas/serviceapp/v3/resource/list`)
+    },
+    applicationCloud(params) {
+        return axios.post(`/apaas/serviceapp/v3/resource/apply/new`, params)
+    },
+    updateCloud(params) {
+        return axios.post(`/apaas/serviceapp/v3/resource/apply/up`, params)
+    },
+
     // shopping cart
     addShoppingCart(params) {
         return axios.post(`/apaas/serviceapp/v3/shopcart/add`, params);

src/request/api/user.js

@@ -28,6 +28,13 @@ const user = {
     getOrderDetail(params) {
         return axios.get(`/apaas/serviceapp/v3/order/orderInfo?order_id=${params.order_id}`);
     },
+    getOrderUser(params) {
+        return axios.get(`/apaas/serviceapp/v3/order/applyInfo?order_id=${params.order_id}`);
+    },
+    getOrderApproval(params) {
+        return axios.get(`/apaas/serviceapp/v3/order/approval?apply_id=${params.apply_id}`);
+    },
+
 
     // user info
     getNowUser() {