diff --git a/api/model/index.js b/api/model/index.js index a7ec71e..d8afffc 100644 --- a/api/model/index.js +++ b/api/model/index.js @@ -1,6 +1,12 @@ // 首页相关接口 const api = { + submitPersonalSharing: { + url: '/index_common/updateCartNum', + method: 'POST', + auth: true, + debounce: 300, + }, } export default api \ No newline at end of file diff --git a/common.scss b/common.scss index 5fd3072..5b84d4d 100644 --- a/common.scss +++ b/common.scss @@ -37,4 +37,14 @@ margin: 0; width: 0; height: 0; +} + +.flex { + display: flex; + align-items: center; + justify-content: center; +} + +.flex-column { + flex-direction: column; } \ No newline at end of file diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue index e86c4b1..644b19f 100644 --- a/components/base/tabbar.vue +++ b/components/base/tabbar.vue @@ -6,7 +6,7 @@ + item.iconPath" class="tabbar-icon-image" mode="aspectFit"> {{ item.title }} @@ -35,27 +35,13 @@ "title": "首页", key: 'home', }, - { - "selectedIconPath": "/static/image/tabbar/category-a.png", - "iconPath": "/static/image/tabbar/category.png", - "pagePath": "/pages/index/category", - "title": "商品列表", - key: 'category', - }, { "selectedIconPath": "/static/image/tabbar/order-a.png", "iconPath": "/static/image/tabbar/order.png", - "pagePath": "/pages/index/order", - "title": "订单", + "pagePath": "/pages/index/record", + "title": "分享记录", key: 'order', }, - { - "selectedIconPath": "/static/image/tabbar/cart-a.png", - "iconPath": "/static/image/tabbar/cart.png", - "pagePath": "/pages/index/cart", - "title": "购物车", - key: 'cart', - }, { "selectedIconPath": "/static/image/tabbar/center-a.png", "iconPath": "/static/image/tabbar/center.png", @@ -97,7 +83,7 @@ z-index: 999999; bottom: 0; left: 0; - color: #BCBCBC; + color: #CCCCCC; .tabbar-item { flex: 1; @@ -127,7 +113,7 @@ } .tabbar-active { - color: $uni-color !important; + color: #262626 !important; } } } diff --git a/manifest.json b/manifest.json index ea42a21..dbd2350 100644 --- a/manifest.json +++ b/manifest.json @@ -52,9 +52,10 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wxe7ae8cbe1673834c", + "appid" : "wx77ba4c7131677a74", "setting" : { - "urlCheck" : false + "urlCheck" : false, + "minified" : true }, "usingComponents" : true, "permission" : { diff --git a/pages.json b/pages.json index 11693b1..16f667d 100644 --- a/pages.json +++ b/pages.json @@ -6,13 +6,7 @@ } }, { - "path": "pages/index/order", - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/index/category", + "path": "pages/index/record", "style": { "navigationBarTitleText": "" } @@ -22,12 +16,6 @@ "style": { "navigationBarTitleText": "" } - }, - { - "path": "pages/index/cart", - "style": { - "navigationBarTitleText": "" - } } ], "preloadRule": { @@ -38,8 +26,23 @@ }, "subPackages": [{ "root": "pages_order", - "pages": [{ - "path": "order/orderDetail" + "pages": [ + { + "path": "record/personalSharing" + }, + { + "path": "record/videoSharing" + }, + { + "path": "record/groupSharing" + }, + { + "path": "record/articleSharing" + }, + + + { + "path": "record/orderDetail" }, { "path": "mine/purse" @@ -54,7 +57,7 @@ "path": "product/productDetail" }, { - "path": "order/refundsOrExchange" + "path": "record/refundsOrExchange" }, { "path": "auth/wxLogin" diff --git a/pages/index/cart.vue b/pages/index/cart.vue deleted file mode 100644 index 381c5b0..0000000 --- a/pages/index/cart.vue +++ /dev/null @@ -1,260 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/index/category.vue b/pages/index/category.vue deleted file mode 100644 index a4a64b0..0000000 --- a/pages/index/category.vue +++ /dev/null @@ -1,191 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/index/center.vue b/pages/index/center.vue index 4d30c46..aa60aeb 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -82,12 +82,12 @@ 订单管理 - + 换货 - + 退货 diff --git a/pages/index/index.vue b/pages/index/index.vue index 65effe5..02d67df 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,411 +1,86 @@ \ No newline at end of file diff --git a/pages_order/components/formTextarea.vue b/pages_order/components/formTextarea.vue new file mode 100644 index 0000000..ae7396d --- /dev/null +++ b/pages_order/components/formTextarea.vue @@ -0,0 +1,56 @@ + + + + + + \ No newline at end of file diff --git a/pages_order/components/formUpload.vue b/pages_order/components/formUpload.vue new file mode 100644 index 0000000..15c4af1 --- /dev/null +++ b/pages_order/components/formUpload.vue @@ -0,0 +1,66 @@ + + + + + + \ No newline at end of file diff --git a/pages_order/record/articleSharing.vue b/pages_order/record/articleSharing.vue new file mode 100644 index 0000000..5d18aba --- /dev/null +++ b/pages_order/record/articleSharing.vue @@ -0,0 +1,186 @@ + + + + + \ No newline at end of file diff --git a/pages_order/record/groupSharing.vue b/pages_order/record/groupSharing.vue new file mode 100644 index 0000000..1105688 --- /dev/null +++ b/pages_order/record/groupSharing.vue @@ -0,0 +1,160 @@ + + + + + \ No newline at end of file diff --git a/pages_order/order/orderDetail.vue b/pages_order/record/orderDetail.vue similarity index 100% rename from pages_order/order/orderDetail.vue rename to pages_order/record/orderDetail.vue diff --git a/pages_order/record/personalSharing.vue b/pages_order/record/personalSharing.vue new file mode 100644 index 0000000..88dc8da --- /dev/null +++ b/pages_order/record/personalSharing.vue @@ -0,0 +1,153 @@ + + + + + \ No newline at end of file diff --git a/pages_order/order/refundsOrExchange.vue b/pages_order/record/refundsOrExchange.vue similarity index 100% rename from pages_order/order/refundsOrExchange.vue rename to pages_order/record/refundsOrExchange.vue diff --git a/pages_order/record/videoSharing.vue b/pages_order/record/videoSharing.vue new file mode 100644 index 0000000..84f3aaf --- /dev/null +++ b/pages_order/record/videoSharing.vue @@ -0,0 +1,190 @@ + + + + + \ No newline at end of file diff --git a/pages_order/styles/pageForm.scss b/pages_order/styles/pageForm.scss new file mode 100644 index 0000000..f94163e --- /dev/null +++ b/pages_order/styles/pageForm.scss @@ -0,0 +1,38 @@ +.page { + background-color: $uni-bg-color; +} + +.content { + padding: 20rpx; +} + +.form { + &-item { + background-color: #FFFFFF !important; + border-radius: 14rpx; + padding: 0 20rpx; + + & + & { + margin-top: 20rpx; + } + + &-content { + min-height: 62rpx; + display: flex; + align-items: center; + justify-content: flex-end; + font-size: 28rpx;; + color: #999999; + } + } +} + +.button-submit { + width: calc(100% - 40rpx); + height: 90rpx; + margin: 20rpx; + background-color: $uni-bg-color-highlight; + color: $uni-text-color-highlight; + font-size: 36rpx; + border-radius: 45rpx; +} \ No newline at end of file diff --git a/static/image/tabbar/cart-a.png b/static/image/tabbar/cart-a.png deleted file mode 100644 index b48261c..0000000 Binary files a/static/image/tabbar/cart-a.png and /dev/null differ diff --git a/static/image/tabbar/cart.png b/static/image/tabbar/cart.png deleted file mode 100644 index d211ea1..0000000 Binary files a/static/image/tabbar/cart.png and /dev/null differ diff --git a/static/image/tabbar/category-a.png b/static/image/tabbar/category-a.png deleted file mode 100644 index 6dd7bc6..0000000 Binary files a/static/image/tabbar/category-a.png and /dev/null differ diff --git a/static/image/tabbar/category.png b/static/image/tabbar/category.png deleted file mode 100644 index f667e88..0000000 Binary files a/static/image/tabbar/category.png and /dev/null differ diff --git a/static/image/tabbar/center-a.png b/static/image/tabbar/center-a.png index 61df5ef..dae8139 100644 Binary files a/static/image/tabbar/center-a.png and b/static/image/tabbar/center-a.png differ diff --git a/static/image/tabbar/center.png b/static/image/tabbar/center.png index 74f685c..32d8703 100644 Binary files a/static/image/tabbar/center.png and b/static/image/tabbar/center.png differ diff --git a/static/image/tabbar/home-a.png b/static/image/tabbar/home-a.png index 5388253..0d4a89d 100644 Binary files a/static/image/tabbar/home-a.png and b/static/image/tabbar/home-a.png differ diff --git a/static/image/tabbar/home.png b/static/image/tabbar/home.png index 6f7accb..5faf751 100644 Binary files a/static/image/tabbar/home.png and b/static/image/tabbar/home.png differ diff --git a/uni.scss b/uni.scss index 5dcc31f..0c6593f 100644 --- a/uni.scss +++ b/uni.scss @@ -26,12 +26,15 @@ $uni-text-color-inverse:#fff;//反色 $uni-text-color-grey:#999;//辅助灰色,如加载更多的提示信息 $uni-text-color-placeholder: #808080; $uni-text-color-disable:#c0c0c0; +$uni-text-color-highlight:#05D9A2; /* 背景颜色 */ -$uni-bg-color:#ffffff; +$uni-fg-color:#ffffff; +$uni-bg-color:#F4F6F8; $uni-bg-color-grey:#f8f8f8; $uni-bg-color-hover:#f1f1f1;//点击状态颜色 $uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色 +$uni-bg-color-highlight:#001137; /* 边框颜色 */ $uni-border-color:#c8c7cc;