diff --git a/common/css/common.css b/common/css/common.css
index 2a9bbf1..fad3ac8 100644
--- a/common/css/common.css
+++ b/common/css/common.css
@@ -179,4 +179,11 @@ button:after{
/* input */
.placeholder{
color: #999 !important;
+}
+
+.fix-bottom{
+ position: fixed;
+ bottom: 0rpx;
+ left: 0rpx;
+ right: 0rpx;
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index ffaa934..7de15e9 100644
--- a/pages.json
+++ b/pages.json
@@ -35,7 +35,17 @@
"style" : {
"navigationStyle":"custom",
"navigationBarTitleText": "云商城",
- "disableScroll": true,
+ "disableScroll": false,
+ "app-plus": {
+ "bounce":"none"
+ }
+ }
+ },{
+ "path" : "pages/qHome/achievement",
+ "style" : {
+ "navigationStyle":"custom",
+ "navigationBarTitleText": "打款业绩",
+ "disableScroll": false,
"app-plus": {
"bounce":"none"
}
@@ -45,7 +55,7 @@
"style" : {
"navigationStyle":"custom",
"navigationBarTitleText": "产品详情",
- "disableScroll": true,
+ "disableScroll": false,
"app-plus": {
"bounce":"none"
}
@@ -55,13 +65,22 @@
"style" : {
"navigationStyle":"custom",
"navigationBarTitleText": "云仓备货",
- "disableScroll": true,
+ "disableScroll": false,
"app-plus": {
"bounce":"none"
}
}
- }
- ,{
+ },{
+ "path" : "pages/yunProduct/newDetail",
+ "style" : {
+ "navigationStyle":"custom",
+ "navigationBarTitleText": "资讯详情",
+ "disableScroll": false,
+ "app-plus": {
+ "bounce":"none"
+ }
+ }
+ },{
"path" : "pages/tabbar/cart",
"style" : {
"navigationBarTitleText": "购物车",
diff --git a/pages/.DS_Store b/pages/.DS_Store
index 5008ddf..db4aecf 100644
Binary files a/pages/.DS_Store and b/pages/.DS_Store differ
diff --git a/pages/qHome/achievement.vue b/pages/qHome/achievement.vue
new file mode 100644
index 0000000..94dbd85
--- /dev/null
+++ b/pages/qHome/achievement.vue
@@ -0,0 +1,286 @@
+
+
+
+
+
+
+
+
+
+ 2021年4月
+ 打款业绩:¥99999.00
+
+
+
+ 全部
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/tabbar/home.vue b/pages/tabbar/home.vue
index 75bc352..72f7037 100644
--- a/pages/tabbar/home.vue
+++ b/pages/tabbar/home.vue
@@ -13,15 +13,18 @@
2021年
-
- 100.00
- 万
-
- 服务业绩(元)
-
- 充值业绩:10.00万
- 本月营业额:8000元
+
+
+ 100.00
+ 万
+
+ 服务业绩(元)
+
+ 充值业绩:10.00万
+ 本月营业额:8000元
+
+
@@ -219,7 +222,11 @@
//this.navTo('/pages/address/list')
}, 1000)
},
- methods: {
+ methods: {
+ toAchievement(){
+ this.navTo('/pages/qHome/achievement')
+
+ },
//加载广告 缓存10分钟
async loadAdvert(){
const res = await this.$request('advert', 'getAdvertList', {}, {
diff --git a/pages/tabbar/shop.vue b/pages/tabbar/shop.vue
index 0890569..b3be23e 100644
--- a/pages/tabbar/shop.vue
+++ b/pages/tabbar/shop.vue
@@ -8,17 +8,17 @@
-
+
-
+
-
+
@@ -35,7 +35,7 @@
-
+
通知 | 关于“轻未来超轻维阻燃粉”外包装升级通知
2021年4月23日
@@ -44,7 +44,7 @@
-
+
通知 | 关于“轻未来超轻维阻燃粉”外包装升级通知
2021年4月23日
@@ -53,7 +53,7 @@
-
+
通知 | 关于“轻未来超轻维阻燃粉”外包装升级通知
2021年4月23日
@@ -88,7 +88,8 @@
indicatorDots: true,
autoplay: true,
interval: 2000,
- duration: 500
+ duration: 500,
+ swipeImgs:['/static/shop/677088217d8a00aa.jpg','/static/shop/rem.jpg','/static/shop/b7f2be6053cc88b4.jpg']
}
},
computed: {
@@ -122,6 +123,9 @@
}, 1000)
},
methods: {
+ toNewDetail(){
+ this.navTo(`/pages/yunProduct/newDetail`);
+ },
toYunProduct(){
let keyword=1
this.navTo(`/pages/yunProduct/detail?keyword=${keyword}`);
diff --git a/pages/yunProduct/detail.vue b/pages/yunProduct/detail.vue
index 6f2baa3..71208fc 100644
--- a/pages/yunProduct/detail.vue
+++ b/pages/yunProduct/detail.vue
@@ -4,16 +4,13 @@
-
-
-
-
+
-
+
-
+
@@ -50,6 +47,9 @@
+
+
+