diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue
index 0707ef2..aaee3d2 100644
--- a/components/base/tabbar.vue
+++ b/components/base/tabbar.vue
@@ -46,14 +46,14 @@
},
{
"selectedIconPath": "/static/image/tabbar/clearanceService-a.png",
- "iconPath": "/static/image/tabbar/cart.png",
- "pagePath": "/pages/index/cart",
+ "iconPath": "/static/image/tabbar/clearanceService.png",
+ "pagePath": "/pages/index/clearanceService",
"title": "tabbar.title.3"
},
{
"selectedIconPath": "/static/image/tabbar/center-a.png",
"iconPath": "/static/image/tabbar/center.png",
- "pagePath": "/pages/index/center",
+ "pagePath": "/pages/index/center2",
"title": "tabbar.title.4"
}
]
diff --git a/components/user/productList.vue b/components/user/productList.vue
index 3de2ff3..8ea1d18 100644
--- a/components/user/productList.vue
+++ b/components/user/productList.vue
@@ -2,7 +2,7 @@
-
+
立即采购
@@ -45,7 +45,11 @@ export default {
methods: {
// 立即购买
immediatePurchase(item) {
-
+ console.log("====")
+ var itemStr = encodeURIComponent(JSON.stringify(item));
+ uni.navigateTo({
+ url: `/pages_order/tradingPlatform/nowOrder?params=${itemStr}`,
+ });
}
},
}
@@ -118,7 +122,7 @@ export default {
.btn {
position: absolute;
right: 0rpx;
- bottom:0rpx;
+ bottom: 0rpx;
padding: 10rpx;
border-radius: 50%;
//background-color: $uni-color;
diff --git a/locale/en.json b/locale/en.json
index 0974cb5..949ed4e 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -10,8 +10,8 @@
"language" : "Change Language",
"purchaser":"purchaser",
"supplier":"supplier",
- "companyProfile":"公司简介",
- "aluminiumProduct":"铝制品"
+ "companyProfile":"companyProfile",
+ "aluminiumProduct":"aluminiumProduct"
}
}
},
diff --git a/pages.json b/pages.json
index ed64ac9..0d3aef1 100644
--- a/pages.json
+++ b/pages.json
@@ -11,6 +11,12 @@
"navigationBarTitleText": ""
}
},
+ {
+ "path": "pages/index/clearanceService",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
"path": "pages/index/order",
"style": {
@@ -29,6 +35,12 @@
"navigationBarTitleText": ""
}
},
+ {
+ "path": "pages/index/center2",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
"path": "pages/index/cart",
"style": {
@@ -53,6 +65,15 @@
{
"path": "auth/registerShop"
},
+ {
+ "path": "tradingPlatform/nowOrder"
+ },
+ {
+ "path": "tradingPlatform/confirmOrder"
+ },
+ {
+ "path": "tradingPlatform/confirmOrder"
+ },
{
"path": "mine/purse"
@@ -86,7 +107,7 @@
}],
"globalStyle": {
"navigationBarTextStyle": "black",
- "navigationBarTitleText": "酒店桌布",
+ "navigationBarTitleText": "铝交易",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8",
"navigationStyle": "custom"
diff --git a/pages/index/center2.vue b/pages/index/center2.vue
new file mode 100644
index 0000000..837fe39
--- /dev/null
+++ b/pages/index/center2.vue
@@ -0,0 +1,174 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 倾心.
+
+
+
+ 手机号:13812345678
+
+
+
+ 角色切换
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.text}}
+
+
+
+ {{item.value}}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/clearanceService.vue b/pages/index/clearanceService.vue
new file mode 100644
index 0000000..5c0f71e
--- /dev/null
+++ b/pages/index/clearanceService.vue
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 立即申请 >>
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/tradingPlatform.vue b/pages/index/tradingPlatform.vue
index e199cb9..55a9d36 100644
--- a/pages/index/tradingPlatform.vue
+++ b/pages/index/tradingPlatform.vue
@@ -26,10 +26,7 @@
-
-
-
diff --git a/pages_order/auth/registerShop.vue b/pages_order/auth/registerShop.vue
index df217c7..d51ec1a 100644
--- a/pages_order/auth/registerShop.vue
+++ b/pages_order/auth/registerShop.vue
@@ -158,7 +158,7 @@ export default {
data() {
return {
titleIndex: 0,
- titleList: ['采购商注册', '供应商注册'],
+ titleList: ['采购商注册', '供应商注册','国内清关申请'],
form: {
userName: '',
name: '',
diff --git a/pages_order/static/address/1.svg b/pages_order/static/address/1.svg
new file mode 100644
index 0000000..b9a2b18
--- /dev/null
+++ b/pages_order/static/address/1.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/pages_order/tradingPlatform/confirmOrder.vue b/pages_order/tradingPlatform/confirmOrder.vue
new file mode 100644
index 0000000..723f8e8
--- /dev/null
+++ b/pages_order/tradingPlatform/confirmOrder.vue
@@ -0,0 +1,205 @@
+
+
+
+
+
+
+
+ 支付保证金
+
+
+
+
+
+
+
+ 开户名称
+
+
+
+
+
+
+
+ 开户行
+
+
+
+
+
+
+
+ 银行账号
+
+
+
+
+
+
+
+ 提示:请于下单成功后30分钟内支付。(自动倒计时)
+
+
+
+
+
+
+
+ 确认下单
+
+
+
+ 取消订单
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/tradingPlatform/nowOrder.vue b/pages_order/tradingPlatform/nowOrder.vue
new file mode 100644
index 0000000..ea6f983
--- /dev/null
+++ b/pages_order/tradingPlatform/nowOrder.vue
@@ -0,0 +1,475 @@
+
+
+
+
+
+
+
+ 铝制品
+
+
+
+
+
+ 商品规格
+
+ 铝制品(Al>96%)
+
+
+
+
+
+
+
+ 提货地点
+
+
+
+
+
+
+
+
+
+
+
+
+ 详细地址
+
+
+
+
+
+
+
+ 交货日期
+
+
+
+ {{ form.deliveryDate }}
+
+
+
+ >
+
+
+
+
+
+
+
+
+
+ 暂定数量(吨)
+
+
+
+
+
+
+
+ 单价
+
+
+
+
+
+
+
+ 履约保证金
+
+
+
+
+
+
+ (单价*数量*2%)
+
+ ‘
+
+
+
+ 立即下单
+
+
+ 联系我们
+
+ 如有问题,请联系我们
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/static/image/1.png b/static/image/1.png
new file mode 100644
index 0000000..f84e5d0
Binary files /dev/null and b/static/image/1.png differ
diff --git a/static/image/address/icon.png b/static/image/address/icon.png
new file mode 100644
index 0000000..6395501
Binary files /dev/null and b/static/image/address/icon.png differ
diff --git a/static/image/address/selectIcon.png b/static/image/address/selectIcon.png
new file mode 100644
index 0000000..1251474
Binary files /dev/null and b/static/image/address/selectIcon.png differ
diff --git a/static/image/clearanceService.png b/static/image/clearanceService.png
new file mode 100644
index 0000000..f13c242
Binary files /dev/null and b/static/image/clearanceService.png differ