diff --git a/src/pageA/fan_list/index.vue b/src/pageA/fan_list/index.vue
index 84cd3cb..63dc59e 100644
--- a/src/pageA/fan_list/index.vue
+++ b/src/pageA/fan_list/index.vue
@@ -18,9 +18,15 @@
-
-
- {{user.phone}}
+
+
+
+ {{user.phone}}
+
+
diff --git a/src/pageB/comm_rec/index.vue b/src/pageB/comm_rec/index.vue
new file mode 100644
index 0000000..c2947ae
--- /dev/null
+++ b/src/pageB/comm_rec/index.vue
@@ -0,0 +1,78 @@
+
+
+
+ 时间
+ 金额
+ 信息
+
+
+
+
+ {{item.name}}
+ {{item.price}}
+ {{item.success_time.substring(0,10)}}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages.json b/src/pages.json
index 3ed517c..08402a0 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -585,6 +585,14 @@
"enablePullDownRefresh": false,
"navigationStyle": "default"
}
+ },
+ {
+ "path": "comm_rec/index",
+ "style": {
+ "navigationBarTitleText": "佣金记录",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "default"
+ }
}
]
}
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 550a3e2..2076a4c 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -142,6 +142,136 @@
+
+
+
+
+
+
+ {{ item.name }}
+ ￥{{ item.sell_price }}
+
+ ￥{{ item.vip_price }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+ ￥{{ item.sell_price }}
+
+ ￥{{ item.vip_price }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+ ￥{{ item.sell_price }}
+
+ ￥{{ item.vip_price }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+ ￥{{ item.sell_price }}
+
+ ￥{{ item.vip_price }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+ ￥{{ item.sell_price }}
+
+ ￥{{ item.vip_price }}
+
+
+
+
+
@@ -201,6 +331,11 @@ export default {
},
noMoreSize: 1,
},
+ boutique_books:[],//精品书籍
+ natural_water_feature:[],//自然水景
+ ornamental_creatures:[],//观赏生物
+ coral_aquatic_plants:[],//珊瑚水草
+ equipment_consumables:[]//设备耗材
};
},
computed: {
@@ -227,8 +362,99 @@ export default {
this.$store.dispatch('user/getNewsNum');
},
methods: {
+ //新增开始-精品书籍
+ async getrecGoods(){
+ return new Promise((resolve, reject) => {
+ this.$api
+ .get('/v1/product/part', {
+ params: {
+ part:'boutique_books',
+ },
+ })
+ .then((res) => {
+ this.boutique_books=res.data
+ resolve(res);
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ });
+ },
+ //自然水景
+ async getnatural_water_feature(){
+ return new Promise((resolve, reject) => {
+ this.$api
+ .get('/v1/product/part', {
+ params: {
+ part:'natural_water_feature',
+ },
+ })
+ .then((res) => {
+ this.natural_water_feature=res.data
+ resolve(res);
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ });
+ },
+ //观赏生物
+ async getornamental_creatures(){
+ return new Promise((resolve, reject) => {
+ this.$api
+ .get('/v1/product/part', {
+ params: {
+ part:'ornamental_creatures',
+ },
+ })
+ .then((res) => {
+ this.ornamental_creatures=res.data
+ resolve(res);
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ });
+ },
+ //珊瑚水草
+ async getcoral_aquatic_plants(){
+ return new Promise((resolve, reject) => {
+ this.$api
+ .get('/v1/product/part', {
+ params: {
+ part:'coral_aquatic_plants',
+ },
+ })
+ .then((res) => {
+ this.coral_aquatic_plants=res.data
+ resolve(res);
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ });
+ },
+ //设备耗材
+ async getequipment_consumables(){
+ return new Promise((resolve, reject) => {
+ this.$api
+ .get('/v1/product/part', {
+ params: {
+ part:'equipment_consumables',
+ },
+ })
+ .then((res) => {
+ this.equipment_consumables=res.data
+ resolve(res);
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ });
+ },
+ //新增结束
init() {
- return Promise.all([this.getHot(), this.getBanner(), this.getRecommend()]);
+ return Promise.all([this.getHot(), this.getBanner(), this.getRecommend(),this.getrecGoods(),this.getnatural_water_feature(),this.getornamental_creatures(),this.getcoral_aquatic_plants(),this.getequipment_consumables()]);
},
async downCallback() {
await this.init();
diff --git a/src/pages/me/me.vue b/src/pages/me/me.vue
index 510090b..b321d1d 100644
--- a/src/pages/me/me.vue
+++ b/src/pages/me/me.vue
@@ -138,13 +138,20 @@
-
签到积分
+ -->
+
+
+ 佣金说明
diff --git a/src/pages/sort/index.vue b/src/pages/sort/index.vue
index 49b4945..1b6236d 100644
--- a/src/pages/sort/index.vue
+++ b/src/pages/sort/index.vue
@@ -31,8 +31,8 @@
{{item1.name}}
-
-
+
+
@@ -188,6 +188,11 @@