Merge branch '02/23reviewBUG' into jenkins

src/assets/icon/iconfont.json

@@ -630,7 +630,7 @@
     },
     {
       "icon_id": "27144138",
-      "name": "优惠卷管理",
+      "name": "优惠券管理",
       "font_class": "youhuijuanguanli",
       "unicode": "e675",
       "unicode_decimal": 58997

src/views/couponManager/couponUpdate.vue

@@ -32,12 +32,12 @@
             <el-form-item
               label="优惠券名称"
               prop="name"
-              :rules="[{ required: true, message: '请输入优惠卷名称' }]"
+              :rules="[{ required: true, message: '请输入优惠券名称' }]"
             >
               <el-input
                 :disabled="isDisabled"
                 v-model="form.name"
-                placeholder="请输入优惠卷名称"
+                placeholder="请输入优惠券名称"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -72,7 +72,7 @@
             <el-form-item
               label="描述"
               prop="description"
-              :rules="[{ required: true, message: '请输入优惠卷描述' }]"
+              :rules="[{ required: true, message: '请输入优惠券描述' }]"
             >
               <el-input
                 :disabled="isDisabled"
@@ -136,7 +136,7 @@
             <el-form-item
               label="优惠券类型"
               prop="type"
-              :rules="[{ required: true, message: '请选择优惠卷类型' }]"
+              :rules="[{ required: true, message: '请选择优惠券类型' }]"
             >
               <el-select
                 :disabled="isDisabled"

src/views/teamDetail/teamListComponent/endTeamList.vue

@@ -6,12 +6,15 @@
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
           :data="tableList"
         >
+        <el-table-column label="快递单号" align="center" prop="expressBillNo">
+      </el-table-column>
+        <el-table-column label="快递公司" align="center" prop="expressCompany">
+          </el-table-column>
           <el-table-column label="发货时间" prop="createTime" align="center">
           </el-table-column>
-          <el-table-column label="快递公司" align="center" prop="expressCompany">
+          <el-table-column label="收货人" align="center" prop="consigneeName">
           </el-table-column>
-          <el-table-column label="快递单号" align="center" prop="expressBillNo">
-
+          <el-table-column label="手机号" align="center" prop="mobile">
           </el-table-column>
           <el-table-column label="详细地址" align="center" prop="musicGroupShippingAddress">
           </el-table-column>