Merge remote-tracking branch 'origin/build' into union

project/pidu/app/AppGoods/components/List.vue

@@ -48,11 +48,11 @@
         :current.sync="search.current"
         :size.sync="search.size"
         @getList="getList">
-        <el-table-column slot="goods" width="240px" label="商品" align="left">
+        <el-table-column slot="goods" width="280px" label="商品" align="left">
           <template slot-scope="{ row }">
             <div class="goods">
               <img :src="row.imageUrl">
-              <span>{{ row.merchandiseName }}</span>
+              <span :title="row.merchandiseName">{{ row.merchandiseName }}</span>
             </div>
           </template>
         </el-table-column>
@@ -92,12 +92,13 @@
         info: {},
         colConfigs: [
           { slot: 'goods', label: '商品' },
-          { prop: 'merchandiseIntegral', align: 'center', label: '单价' },
+          { prop: 'merchandiseIntegral', align: 'center', label: '单价', sortable: true },
-          { prop: 'merchandiseNumber', align: 'center', label: '数量' },
+          { prop: 'merchandiseNumber', align: 'center', label: '数量', sortable: true },
           {
             prop: 'arriveTime',
             align: 'center',
-            label: '兑换量'
+            label: '兑换量',
+            sortable: true
           },
           {
             prop: 'visibleRange',
@@ -105,6 +106,11 @@
             label: '可见范围',
             formart: v => v === '0' ? '不限' : '指定网格'
           },
+          {
+            prop: 'arriveTime',
+            align: 'center',
+            label: '上架时间'
+          },
           {
             prop: 'status',
             align: 'center',
@@ -177,7 +183,7 @@
       },
 
       remove (id) {
-        this.$confirm('确定删除该数据？').then(() => {
+        this.$confirm('删除后，商品将不可恢复，是否继续？').then(() => {
           this.instance.post(`/app/appintegralmerchandise/delete?ids=${id}`).then(res => {
             if (res.code == 0) {
               this.$message.success('删除成功！')
@@ -201,6 +207,14 @@
         height: 80px;
         margin-right: 20px;
       }
+
+      span {
+        flex: 1;
+        display: -webkit-box;
+        overflow: hidden;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+      }
     }
 
     .userSelcet {

project/pidu/app/AppGridMemberScore/components/ApplyList.vue

@@ -103,13 +103,15 @@
               this.getList()
             }
           })
-        }).catch(() => {
+        }).catch(action => {
+          if (action === 'cancel') {
             this.instance.post(`/app/appintegralmemberapply/auditApply?id=${id}&opType=2`).then(res => {
               if (res.code == 0) {
                 this.$message.success('审核拒绝成功')
                 this.getList()
               }
             })
+          }
         })
       }
     }