云仓-订单-bug修复；我的资产1-3

src/api/module/newasset.js

+import request from '@/utils/request'
+
+/** 我的资产 */
+// 获取 银行卡 信息
+export function getBankcardListData(query) {
+  return request({
+    url: '/system/asset/list11',
+    method: 'get',
+    params: query
+  })
+}

src/views/system/order/components/orderDetail.vue

@@ -32,8 +32,8 @@
             <el-table-column label="规格/数量/单价" align="center">
               <template slot-scope="scope">
                 {{ scope.row.goods_option_title }}<br/>
-                {{scope.row.total}}<br/>
-                {{scope.row.goods_price / 100}}
+                {{scope.row.goods_price / 100}} 元<br/>
+                x {{scope.row.total }}
               </template>
             </el-table-column>
             <el-table-column label="商品订单状态" align="center">
@@ -56,7 +56,7 @@
                 {{ scope.row.send_time ? formatter(scope.row.send_time) : '—' }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" class-name="small-padding fixed-width" align="center">
+            <el-table-column label="操作" class-name="small-padding fixed-width" align="center" width="180">
               <template slot-scope="scope">
                 <span style="font-size:12px;padding: 0 15px 0 0;" v-if="deliveryTypeText(scope.row.goods_status,scope.row.is_reissue) == '已补单'">已补单</span>
                 <el-button size="mini" type="text" v-if="deliveryTypeText(scope.row.goods_status,scope.row.is_reissue) == '去补单'" @click="goShipping(4,scope.row.id)">去补单</el-button>
@@ -205,7 +205,7 @@
       <div style="margin: 0 10%">
         <el-form ref="form" label-width="100px">
           <el-form-item label="快递公司：">
-            <el-select size="mini" v-model="expressNum" placeholder="请选择快递公司" style="width: 100%;">
+            <el-select size="mini" v-model="expressNum" filterable placeholder="请选择快递公司" style="width: 100%;">
               <el-option
                 v-for="item in expressLists"
                 :key="item.value"
@@ -260,7 +260,7 @@
             :type="activity.type"
             color="#0bbd87"
             :size="activity.size"
-            :timestamp="formatter(activity.msgTime)">
+            :timestamp="activity.msg_time">
             {{activity.content}}
           </el-timeline-item>
         </el-timeline>