diff --git a/pages/order/index.vue b/pages/order/index.vue
index 2371fa6..969730a 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -27,10 +27,15 @@
{{ goods.goods_name }}
+
+
-
- {{ props.value.name }}
-
+
+ {{goods.goods_entrust=="1"?'转让':'授权'}}
+
+ {{goods.entrust_name}}
@@ -40,11 +45,16 @@
{{goods.price }}
- ×{{ goods.transaction_count }}
+ ×{{ goods.transaction_count }}年
+
+
+
共{{ item.total_num }}件商品,总金额
@@ -226,11 +236,11 @@
// 初始化当前选中的标签
initCurTab(options) {
- // const app = this
- // if (options.dataType) {
- // const index = app.tabs.findIndex(item => item.value == options.dataType)
- // app.curTab = index > -1 ? index : 0
- // }
+ const app = this
+ if (options.dataType) {
+ const index = app.tabs.findIndex(item => item.value == options.dataType)
+ app.curTab = index > -1 ? index : 0
+ }
},
/**
@@ -258,11 +268,11 @@
OrderApi.ordquery(data)
//OrderApi.list({ dataType: app.getTabValue(), page: pageNo }, { load: false })
.then(result => {
- // 按格式封装
- let nlist = {data:result.data,total:result.count,current_page:pageNo}
-
+ // 按格式封装
+ let nlist = {data:result.data,total:result.count,current_page:pageNo}
// 合并新数据
const newList = app.initList(nlist)
+ console.log(newList,"newlist")
app.list.data = getMoreListData(newList, app.list, pageNo)
resolve(newList)
})