diff --git a/common/api.js b/common/api.js index d357390..b4140b4 100644 --- a/common/api.js +++ b/common/api.js @@ -48,4 +48,10 @@ export const getUserFansList = (params, config = {custom: { auth: true }}) => ht export const getUserProfitStatistic = (params, config = {custom: { auth: true }}) => http.post('/api/user/getUserProfitStatistic', params, config); //收益列表 export const getUserProfitList = (params, config = {custom: { auth: true }}) => http.post('/api/user/getUserProfitList', params, config); +//抢购预告 +export const getWarehouseList = (params, config = {custom: { auth: true }}) => http.post('/api/order/getWarehouseList', params, config); +//商品列表 +export const getGoodsList = (params, config = {custom: { auth: true }}) => http.post('/api/order/getGoodsList', params, config); +//商品详情 +export const getgoodsDetail = (params, config = {custom: { auth: true }}) => http.post('/api/order/goodsDetail', params, config); diff --git a/components/TabBar/TabBar.vue b/components/TabBar/TabBar.vue index 7671c72..8a78219 100644 --- a/components/TabBar/TabBar.vue +++ b/components/TabBar/TabBar.vue @@ -93,9 +93,9 @@ }) break; case 1: - // uni.switchTab({ - // url:'/pages/classify/classify' - // }) + uni.switchTab({ + url:'/pages/qianggou/qianggou' + }) break; case 2: diff --git a/pages.json b/pages.json index e4796f4..db9b654 100644 --- a/pages.json +++ b/pages.json @@ -163,6 +163,50 @@ "onReachBottomDistance":100 } }, + { + "path" : "pages/qianggou/qianggou", + "style" : { + "navigationBarTitleText": "抢购", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { + "path" : "pages/qianggou/productList", + "style" : { + "navigationBarTitleText": "抢购", + "navigationBarBackgroundColor": "#FFFFFF", + "onReachBottomDistance":100 + } + }, + { + "path" : "pages/qianggou/productDetails", + "style" : { + "navigationBarTitleText": "商品详情", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { + "path" : "pages/GoodsOn/GoodsOn", + "style" : { + "navigationBarTitleText": "商品收藏", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { + "path" : "pages/MyOrderList/MyOrderList", + "style" : { + "navigationStyle":"custom" + } + }, + { + "path" : "pages/warehouse/buy", + "style" : { + "navigationBarTitleText": "买方仓库", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + + @@ -243,13 +287,6 @@ "navigationBarBackgroundColor": "#FFFFFF" } } - ,{ - "path" : "pages/GoodsOn/GoodsOn", - "style" : { - "navigationBarTitleText": "商品关注", - "navigationBarBackgroundColor": "#FFFFFF" - } - } ,{ "path" : "pages/ContentCollection/ContentCollection", "style" : { @@ -264,12 +301,6 @@ "navigationBarBackgroundColor": "#FFFFFF" } } - ,{ - "path" : "pages/MyOrderList/MyOrderList", - "style" : { - "navigationStyle":"custom" - } - } ,{ "path" : "pages/OrderDetails/OrderDetails", "style" : { @@ -509,7 +540,7 @@ { "iconPath": "/static/tabBar/tab_03.png", "selectedIconPath": "/static/tabBar/tab_04.png", - "pagePath": "pages/classify/classify", + "pagePath": "pages/qianggou/qianggou", "text": "" }, diff --git a/pages/GoodsDetails/GoodsDetails.scss b/pages/GoodsDetails/GoodsDetails.scss index 60a3bc3..4429a2b 100644 --- a/pages/GoodsDetails/GoodsDetails.scss +++ b/pages/GoodsDetails/GoodsDetails.scss @@ -687,13 +687,15 @@ } /* 商品介绍 */ .products-introduction{ - padding: 0 4% 100rpx; + // padding: 0 4% 100rpx; .title{ display: flex; justify-content: center; align-items: center; width: 100%; height: 80rpx; + background: #fff; + margin-bottom:20rpx; text{ font-size: 28rpx; color: #212121; diff --git a/pages/GoodsDetails/GoodsDetails.vue b/pages/GoodsDetails/GoodsDetails.vue index 44612b5..c88b1a8 100644 --- a/pages/GoodsDetails/GoodsDetails.vue +++ b/pages/GoodsDetails/GoodsDetails.vue @@ -142,9 +142,11 @@ - 商品介绍 + 图文详情 + + + - diff --git a/pages/GoodsOn/GoodsOn.scss b/pages/GoodsOn/GoodsOn.scss index 8db6eec..c7e357c 100644 --- a/pages/GoodsOn/GoodsOn.scss +++ b/pages/GoodsOn/GoodsOn.scss @@ -6,41 +6,10 @@ height: 100%; background-color: #FFFFFF; } -.goods-tab{ - position: fixed; - left: 0; - top: 0; - /* #ifdef H5 */ - top: 88rpx; - /* #endif */ - z-index: 10; - display: flex; - align-items: center; - width: 100%; - height: 80rpx; - background-color: #FFFFFF; - .tab{ - display: flex; - align-items: center; - justify-content: center; - width: 20%; - height: 100%; - text{ - display: flex; - align-items: center; - height: 100%; - border-bottom: 4rpx solid transparent; - } - .action{ - color: $base; - border-bottom: 4rpx solid $base; - } - } -} + .goods-list{ padding: 0 4%; background-color: #FFFFFF; - margin-top: 100rpx; padding-bottom: 80rpx; .check{ display: flex; @@ -60,10 +29,10 @@ margin-bottom: 10rpx; .thumb{ width: 40%; - height: 240rpx; + height: 200rpx; image{ - width: 240rpx; - height: 240rpx; + width: 200rpx; + height: 200rpx; border-radius: 10rpx; } } diff --git a/pages/GoodsOn/GoodsOn.vue b/pages/GoodsOn/GoodsOn.vue index b0d620d..81b3ebe 100644 --- a/pages/GoodsOn/GoodsOn.vue +++ b/pages/GoodsOn/GoodsOn.vue @@ -1,41 +1,25 @@ diff --git a/pages/fenxiao/fenxiao.vue b/pages/fenxiao/fenxiao.vue index 456d388..a662cb6 100644 --- a/pages/fenxiao/fenxiao.vue +++ b/pages/fenxiao/fenxiao.vue @@ -3,7 +3,7 @@ 佣金 - + 分销说明 @@ -36,12 +36,17 @@ - + + + + + + + diff --git a/pages/qianggou/productList.vue b/pages/qianggou/productList.vue new file mode 100644 index 0000000..92137ed --- /dev/null +++ b/pages/qianggou/productList.vue @@ -0,0 +1,185 @@ + + + + + diff --git a/pages/qianggou/qianggou.vue b/pages/qianggou/qianggou.vue new file mode 100644 index 0000000..b2efd51 --- /dev/null +++ b/pages/qianggou/qianggou.vue @@ -0,0 +1,195 @@ + + + + + \ No newline at end of file diff --git a/pages/shoukuan/shoukuan.vue b/pages/shoukuan/shoukuan.vue index 90d50b8..c7bdcf5 100644 --- a/pages/shoukuan/shoukuan.vue +++ b/pages/shoukuan/shoukuan.vue @@ -104,18 +104,27 @@ {{activeIndex==1?'保存银行卡':activeIndex==2?'保存支付宝二维码':activeIndex==3?'保存微信二维码':''}} + + 请您仔细阅读并理解《委托寄售服务协议》 + - + + + + + + + diff --git a/static/image/banner1.png b/static/image/banner1.png new file mode 100644 index 0000000..1232e8c Binary files /dev/null and b/static/image/banner1.png differ diff --git a/static/image/banner2.png b/static/image/banner2.png new file mode 100644 index 0000000..ff18fff Binary files /dev/null and b/static/image/banner2.png differ diff --git a/static/image/banner3.png b/static/image/banner3.png new file mode 100644 index 0000000..fb9637f Binary files /dev/null and b/static/image/banner3.png differ diff --git a/uni.scss b/uni.scss index 2f7663f..323b453 100644 --- a/uni.scss +++ b/uni.scss @@ -19,7 +19,7 @@ $base: rgb(35, 96, 48); // 基础颜色 $assist-clor: #ff4e17; // 辅助颜色 $change-clor: rgb(35, 96, 48); // 渐变色 $floor-clor : #fafafa; // 底部颜色 -$price-clor : #FF0000; // 价格颜色 +$price-clor : #f0ad4e; // 价格颜色 $rgba-01 : rgba(233,59,61,0.1); // 基础色透明度0.1 $rgba-02 : rgba(233,59,61,0.2); // 基础色透明度0.2 $rgba-03 : rgba(233,59,61,0.3); // 基础色透明度0.3