zhangdan há 4 anos atrás
pai
commit
4b36992cac
2 ficheiros alterados com 10 adições e 9 exclusões
  1. 9 8
      src/views/userInfo/LdDetails.vue
  2. 1 1
      src/views/userInfo/userDetails.vue

+ 9 - 8
src/views/userInfo/LdDetails.vue

@@ -49,13 +49,8 @@
       :columns="columns"
       :data="loadData"
       bordered>
-      <!-- 类型 -->
-      <span slot="changeType" slot-scope="text, record">{{ $refs.changeType.getNameByCode(record.changeType) }}</span>
-      <!-- 原因 -->
-      <span slot="operateType" slot-scope="text, record">{{ $refs.operateType.getNameByCode(record.operateType) }}</span>
     </s-table>
   </a-card>
-
 </template>
 
 <script>
@@ -84,10 +79,16 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '下单时间', dataIndex: 'createDate', width: 200, align: 'center' },
-        { title: '类型', dataIndex: 'changeType', scopedSlots: { customRender: 'changeType' }, width: 200, align: 'center' },
-        { title: '原因', dataIndex: 'operateType', scopedSlots: { customRender: 'operateType' }, width: 200, align: 'center' },
+        { title: '类型', dataIndex: 'changeTypeDictValue', width: 200, align: 'center' },
+        { title: '原因', dataIndex: 'operateTypeDictValue', width: 200, align: 'center' },
         { title: '乐豆变动', dataIndex: 'changeNum', width: 200, align: 'center' },
-        { title: '详情', dataIndex: 'remarks', width: 200, align: 'center' }
+        { title: '详情',
+          dataIndex: 'remarks',
+          width: 200,
+          align: 'center',
+          customRender: (text) => {
+            return text || '--'
+          } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 1 - 1
src/views/userInfo/userDetails.vue

@@ -12,7 +12,7 @@
       </a-col>
       <a-col :span="24" class="item-cont">
         <p class="item-label">收货地址:</p>
-        <p class="item-main">陕西省西安市未央区阿克苏接电话高科技大厦</p>
+        <p class="item-main">{{page.receiveAddressList ? page.receiveAddressList[0].receiveAddress : '--'}}</p>
       </a-col>
       <a-col :span="24" class="item-cont">
         <p class="item-label">乐豆余额:</p>