diff --git a/dist.zip b/dist.zip
deleted file mode 100644
index 666970a..0000000
Binary files a/dist.zip and /dev/null differ
diff --git a/src/views/modules/shop/curriculum.vue b/src/views/modules/shop/curriculum.vue
index 82f7070..55f40fa 100644
--- a/src/views/modules/shop/curriculum.vue
+++ b/src/views/modules/shop/curriculum.vue
@@ -168,7 +168,7 @@
否
-
+
是
否
@@ -281,6 +281,7 @@ export default {
pubDate: "",
// format: '', // 开本
isFreeMail: 1, // 是否包邮
+ isVipPrice: 1, //是否vip
// pageNum: '',
// quality: '', // 内文用纸
isNew: 0,
diff --git a/src/views/modules/shop/shopproduct-add-or-update.vue b/src/views/modules/shop/shopproduct-add-or-update.vue
index ecb7304..69cf23f 100644
--- a/src/views/modules/shop/shopproduct-add-or-update.vue
+++ b/src/views/modules/shop/shopproduct-add-or-update.vue
@@ -218,8 +218,8 @@
否
-
-
+
+
是
否
@@ -325,6 +325,7 @@ export default {
pubDate: "",
// format: '', // 开本
isFreeMail: 1, // 是否包邮
+ isVipPrice: 0, //是否vip
// pageNum: '',
// quality: '', // 内文用纸
isNew: 0,
@@ -630,6 +631,7 @@ export default {
shoproudLabels: this.dataForm.tags,
// 'format': this.dataForm.format, // 开本
isFreeMail: this.dataForm.isFreeMail,
+ isVipPrice: this.dataForm.isVipPrice,
isNew: this.dataForm.isNew,
// 'pageNum': this.dataForm.pageNum,
// 'quality': this.dataForm.quality, // 内文用纸
diff --git a/src/views/modules/talents/talents-list.vue b/src/views/modules/talents/talents-list.vue
index e027355..170d5f4 100644
--- a/src/views/modules/talents/talents-list.vue
+++ b/src/views/modules/talents/talents-list.vue
@@ -97,7 +97,7 @@
:current-page="pageIndex"
:page-sizes="[10, 20, 50, 100]"
:page-size="pageSize"
- :total="totalPage"
+ :total="total"
layout="total, sizes, prev, pager, next, jumper"
>
@@ -238,13 +238,16 @@ export default {
dataList: [],
pageIndex: 1,
pageSize: 10,
- totalPage: 0,
+ total: 0,
fileList: [],
statusType: 0,
dialogVisible: false,
dataListLoading: false,
addOrUpdateVisible: false,
titlesub: '',
+
+ current: 1,
+ limit: 10
};
},
activated(){
@@ -258,13 +261,15 @@ export default {
url: this.$http.adornUrl("/master/taihuTalent/getTaihuTalents"),
method: "post",
data: this.$http.adornData({
+ current: this.current,
+ limit: this.limit,
name: this.dataForm.name,
region: this.dataForm.region
}),
}).then(({ data }) => {
if (data && data.code === 0) {
- this.dataList = data.list;
- this.totalPage = this.dataList.length;
+ this.dataList = data.pageRes.records;
+ this.total = data.pageRes.total;
}
this.dataListLoading = false;
});
diff --git a/static/config/index-prod.js b/static/config/index-prod.js
index 1c0c2ef..f03d811 100644
--- a/static/config/index-prod.js
+++ b/static/config/index-prod.js
@@ -5,8 +5,8 @@
window.SITE_CONFIG = {};
// api接口请求地址
- //window.SITE_CONFIG['baseUrl'] = 'https://api.nuttyreading.com';
- window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.100:9200/pb';
+ window.SITE_CONFIG['baseUrl'] = 'https://api.nuttyreading.com';
+ //window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.100:9200/pb';
// cdn地址 = 域名 + 版本号
window.SITE_CONFIG['domain'] = './'; // 域名
diff --git a/static/config/index.js b/static/config/index.js
index d4e1723..a75c81e 100644
--- a/static/config/index.js
+++ b/static/config/index.js
@@ -5,8 +5,8 @@
window.SITE_CONFIG = {};
// api接口请求地址
- //window.SITE_CONFIG['baseUrl'] = 'https://api.nuttyreading.com'; // 线上正式环境
- window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.100:9200/pb'; //川
+ window.SITE_CONFIG['baseUrl'] = 'https://api.nuttyreading.com'; // 线上正式环境
+ //window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.100:9200/pb'; //川
// cdn地址 = 域名 + 版本号
window.SITE_CONFIG['domain'] = './'; // 域名