diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue index 6533997..0707ef2 100644 --- a/components/base/tabbar.vue +++ b/components/base/tabbar.vue @@ -33,19 +33,19 @@ return { list : [ { - "selectedIconPath": "/static/image/tabbar/home-a.png", + "selectedIconPath": "/static/image/tabbar/index-a.png", "iconPath": "/static/image/tabbar/home.png", "pagePath": "/pages/index/index", "title": "tabbar.title.1" }, { - "selectedIconPath": "/static/image/tabbar/order-a.png", + "selectedIconPath": "/static/image/tabbar/Trading-a.png", "iconPath": "/static/image/tabbar/order.png", - "pagePath": "/pages/index/order", + "pagePath": "/pages/index/tradingPlatform", "title": "tabbar.title.2" }, { - "selectedIconPath": "/static/image/tabbar/cart-a.png", + "selectedIconPath": "/static/image/tabbar/clearanceService-a.png", "iconPath": "/static/image/tabbar/cart.png", "pagePath": "/pages/index/cart", "title": "tabbar.title.3" @@ -80,7 +80,7 @@ .tabbar{ position: fixed; width: 750rpx; - background-color: #fff; + background-color: $uni-color; display: flex; justify-content: center; align-items: center; @@ -90,7 +90,7 @@ z-index: 99999; bottom: 0; left: 0; - color: #BCBCBC; + color: #FFF; .item{ flex: 1; display: flex; @@ -116,6 +116,7 @@ } } .active{ - color: $uni-color !important; + color: #FFF !important; + } \ No newline at end of file diff --git a/components/base/topbar.vue b/components/base/topbar.vue new file mode 100644 index 0000000..3575c8e --- /dev/null +++ b/components/base/topbar.vue @@ -0,0 +1,79 @@ + + + + + \ No newline at end of file diff --git a/components/user/productList.vue b/components/user/productList.vue index ad16f79..3de2ff3 100644 --- a/components/user/productList.vue +++ b/components/user/productList.vue @@ -1,112 +1,143 @@ \ No newline at end of file diff --git a/locale/en.json b/locale/en.json index c02ed5b..0974cb5 100644 --- a/locale/en.json +++ b/locale/en.json @@ -7,7 +7,11 @@ "index" : { "index" : { "agreement" : "Agreement content", - "language" : "Change Language" + "language" : "Change Language", + "purchaser":"purchaser", + "supplier":"supplier", + "companyProfile":"公司简介", + "aluminiumProduct":"铝制品" } } }, diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json index 1a02904..d69f83b 100644 --- a/locale/zh-Hans.json +++ b/locale/zh-Hans.json @@ -10,7 +10,11 @@ "index" : { "index" : { "agreement" : "协议内容", - "language" : "切换语言" + "language" : "切换语言", + "purchaser":"采购商", + "supplier":"供应商", + "companyProfile":"公司简介", + "aluminiumProduct":"铝制品" } } }, diff --git a/pages.json b/pages.json index e8910a4..ed64ac9 100644 --- a/pages.json +++ b/pages.json @@ -5,6 +5,12 @@ "navigationBarTitleText": "" } }, + { + "path": "pages/index/tradingPlatform", + "style": { + "navigationBarTitleText": "" + } + }, { "path": "pages/index/order", "style": { @@ -41,9 +47,17 @@ "pages": [{ "path": "order/orderDetail" }, + { + "path": "auth/selectionIdentity" + }, + { + "path": "auth/registerShop" + }, + { "path": "mine/purse" }, + { "path": "mine/runningWater" }, diff --git a/pages/index/index.vue b/pages/index/index.vue index 2d976a4..ee3b064 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,417 +1,239 @@ diff --git a/pages/index/tradingPlatform.vue b/pages/index/tradingPlatform.vue new file mode 100644 index 0000000..d5458bc --- /dev/null +++ b/pages/index/tradingPlatform.vue @@ -0,0 +1,122 @@ + + + + + \ No newline at end of file diff --git a/pages_order/auth/registerShop.vue b/pages_order/auth/registerShop.vue new file mode 100644 index 0000000..df217c7 --- /dev/null +++ b/pages_order/auth/registerShop.vue @@ -0,0 +1,365 @@ + + + + + diff --git a/pages_order/auth/selectionIdentity.vue b/pages_order/auth/selectionIdentity.vue new file mode 100644 index 0000000..9f32dd9 --- /dev/null +++ b/pages_order/auth/selectionIdentity.vue @@ -0,0 +1,94 @@ + + + + + diff --git a/static/image/index/1.png b/static/image/index/1.png new file mode 100644 index 0000000..a3cf39e Binary files /dev/null and b/static/image/index/1.png differ diff --git a/static/image/index/2.png b/static/image/index/2.png new file mode 100644 index 0000000..ddaa62b Binary files /dev/null and b/static/image/index/2.png differ diff --git a/static/image/index/3.png b/static/image/index/3.png new file mode 100644 index 0000000..eb509b3 Binary files /dev/null and b/static/image/index/3.png differ diff --git a/static/image/index/4.png b/static/image/index/4.png new file mode 100644 index 0000000..35f50a0 Binary files /dev/null and b/static/image/index/4.png differ diff --git a/static/image/index/5.png b/static/image/index/5.png new file mode 100644 index 0000000..6611fd7 Binary files /dev/null and b/static/image/index/5.png differ diff --git a/static/image/index/6.png b/static/image/index/6.png new file mode 100644 index 0000000..2f9bbb0 Binary files /dev/null and b/static/image/index/6.png differ diff --git a/static/image/tabbar/Trading-a.png b/static/image/tabbar/Trading-a.png new file mode 100644 index 0000000..5678097 Binary files /dev/null and b/static/image/tabbar/Trading-a.png differ 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..56f0e86 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 deleted file mode 100644 index 74f685c..0000000 Binary files a/static/image/tabbar/center.png and /dev/null differ diff --git a/static/image/tabbar/clearanceService-a.png b/static/image/tabbar/clearanceService-a.png new file mode 100644 index 0000000..92ce15e Binary files /dev/null and b/static/image/tabbar/clearanceService-a.png differ diff --git a/static/image/tabbar/home-a.png b/static/image/tabbar/home-a.png deleted file mode 100644 index 5388253..0000000 Binary files a/static/image/tabbar/home-a.png and /dev/null differ diff --git a/static/image/tabbar/home.png b/static/image/tabbar/home.png deleted file mode 100644 index 6f7accb..0000000 Binary files a/static/image/tabbar/home.png and /dev/null differ diff --git a/static/image/tabbar/index-a.png b/static/image/tabbar/index-a.png new file mode 100644 index 0000000..2ad175f Binary files /dev/null and b/static/image/tabbar/index-a.png differ diff --git a/static/image/tabbar/order-a.png b/static/image/tabbar/order-a.png deleted file mode 100644 index 6192093..0000000 Binary files a/static/image/tabbar/order-a.png and /dev/null differ diff --git a/static/image/tabbar/order.png b/static/image/tabbar/order.png deleted file mode 100644 index df9eeb8..0000000 Binary files a/static/image/tabbar/order.png and /dev/null differ diff --git a/static/image/tabbar/组 46940_1.png b/static/image/tabbar/组 46940_1.png new file mode 100644 index 0000000..c9f5ab5 Binary files /dev/null and b/static/image/tabbar/组 46940_1.png differ diff --git a/static/image/tradingPlatform/1.png b/static/image/tradingPlatform/1.png new file mode 100644 index 0000000..1adee92 Binary files /dev/null and b/static/image/tradingPlatform/1.png differ diff --git a/uni.scss b/uni.scss index 6e2d4c6..719ad77 100644 --- a/uni.scss +++ b/uni.scss @@ -12,7 +12,7 @@ * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件 */ /* 颜色变量 */ -$uni-color: #FD5100; +$uni-color: #1f1c39; /* 行为相关颜色 */ $uni-color-primary: #007aff;