会员管理头像修改大小/订单管理-订单/订单详情状态修改

src/crud/user/user.js

@@ -25,7 +25,7 @@ export const tableOption = {
     label: '用户头像',
     prop: 'pic',
     type: 'upload',
-    imgWidth: 150,
+    imgWidth: 60,
     listType: 'picture-img'
   }, {
     label: '状态',

src/views/modules/order/order.vue

@@ -101,11 +101,22 @@
               <el-col :span="3"
                       style="height: 100%;">
                 <div class="item">
-                  <div>
-                    <span>{{order.payTypeName}}</span>
-                  </div>
+<!--                  1.微信支付 2.支付宝支付 3.余额支付-->
+                  <span v-if="order.payType === 1"
+                        size="small"
+                        type="danger">微信支付</span>
+                  <span v-else-if="order.payType === 2"
+                        size="small"
+                        type="danger">支付宝支付</span>
+                  <span v-else-if="order.payType === 3"
+                        size="small"
+                        type="danger">余额支付</span>
+                  <span v-else
+                        size="small"
+                        type="danger"></span>
                 </div>
               </el-col>
+              <!-- 订单状态 -1已取消 1:待付款 2:待发货 3:待收货 4:待评价 5:成功 6:失败 7收益中 8挂单中 9已退单 10完成 11挂单待付款 -->
               <el-col :span="3"
                       style="height: 100%;">
                 <div class="item">
@@ -124,8 +135,30 @@
                   <span v-else-if="order.status === 5"
                         size="small"
                         type="danger">成功</span>
+                  <span v-else-if="order.status === 6"
+                        size="small"
+                        type="danger">失败</span>
+                  <span v-else-if="order.status === 7"
+                        size="small"
+                        type="danger">收益中</span>
+                  <span v-else-if="order.status === 8"
+                        size="small"
+                        type="danger">挂单中</span>
+                  <span v-else-if="order.status === 9"
+                        size="small"
+                        type="danger">已退单</span>
+                  <span v-else-if="order.status === 10"
+                        size="small"
+                        type="danger">已完成</span>
+                  <span v-else-if="order.status === 11"
+                        size="small"
+                        type="danger">挂单待付款</span>
+                  <span v-else-if="order.status === -1"
+                        size="small"
+                        type="danger">已取消</span>
                   <span v-else
-                        size="small">失败</span>
+                        size="small"
+                        type="danger"></span>
                 </div>
               </el-col>
               <el-col :span="3"
@@ -199,7 +232,29 @@ export default {
       {
         value: 6,
         label: '失败'
+      },
+        {
+          value: 7,
+          label: '收益中'
+        }, {
+          value: 8,
+          label: '挂单中'
+        }, {
+          value: 9,
+          label: '已退单'
+        },
+        {
+          value: 10,
+          label: '已完成'
+        },
+        {
+          value: 11,
+          label: '挂单待付款'
+        }, {
+          value: -1,
+          label: '已取消'
         }],
+      // 订单状态 -1已取消 1:待付款 2:待发货 3:待收货 4:待评价 5:成功 6:失败 7收益中 8挂单中 9已退单 10完成 11挂单待付款
       resourcesUrl: window.SITE_CONFIG.resourcesUrl,
       dataList: [],
       page: {

src/views/modules/order/orderInfo.vue

@@ -22,6 +22,7 @@
             <div class="state-cont">
               <div class="state-title">
                 <el-form-item label="订单状态:">
+<!--                   订单状态 -1已取消 1:待付款 2:待发货 3:待收货 4:待评价 5:成功 6:失败 7收益中 8挂单中 9已退单 10完成 11挂单待付款-->
                   <template slot-scope="scope">
                     <el-tag v-if="dataForm.status === 1" size="small" type="warning">待付款</el-tag>
                     <el-tag v-if="dataForm.status === 2 && dataForm.orderType !== 1" size="small" type="warning">待发货</el-tag>
@@ -29,6 +30,11 @@
                     <el-tag v-if="dataForm.status === 4 && dataForm.orderType !== 1" size="small" type="warning">待评价</el-tag>
                     <el-tag v-if="dataForm.status === 5" size="small" type="success">成功</el-tag>
                     <el-tag v-if="dataForm.status === 6" size="small" type="danger">失败</el-tag>
+                    <el-tag v-if="dataForm.status === 7" size="small" type="warning">收益中</el-tag>
+                    <el-tag v-if="dataForm.status === 8" size="small" type="warning">挂单中</el-tag>
+                    <el-tag v-if="dataForm.status === 9" size="small" type="warning">已退单</el-tag>
+                    <el-tag v-if="dataForm.status === 10" size="small" type="warning">已完成</el-tag>
+                    <el-tag v-if="dataForm.status === 11" size="small" type="warning">挂单待付款</el-tag>
                   </template>
                 </el-form-item>
                 <el-form-item>
@@ -47,7 +53,7 @@
                   <div class="detail-cont">
                     <div class="detail01">
                       <img src="~@/assets/img/address.png" alt="">
-                      <div class="text-width">
+                      <div class="text-width" v-if="dataForm.userAddrOrder">
                         <!-- <span class="revise-addr" @click="changeAddr(dataForm.addrOrderId)">
                           <img src="~@/assets/img/revise.png" alt=""/>修改地址
                         </span> -->
@@ -248,6 +254,7 @@
             method: 'get',
             params: this.$http.adornParams()
           }).then(({data}) => {
+            console.log('data',data)
             this.dataForm = data
           })
         }