diff --git a/components/base/centerList.vue b/components/base/centerList.vue
index 78878ef..d69a276 100644
--- a/components/base/centerList.vue
+++ b/components/base/centerList.vue
@@ -35,12 +35,11 @@ export default {
if (item.text === '联系客服') {
console.log("联系客服")
this.$emit('open')
- } else if (item.text === '我的挂单') {
+ } else if (item.text === '我的挂单' || item.text === '系统设置' || item.text === '关于我们' || item.text === '帮助反馈') {
+ console.log("进入"+item.text)
uni.navigateTo({
url: item.toPathUrl
})
- } else if (index === 2) {
- console.log("关于我们")
}
},
diff --git a/pages.json b/pages.json
index a4ebbfb..193d73f 100644
--- a/pages.json
+++ b/pages.json
@@ -75,6 +75,12 @@
{
"path": "tradingPlatform/confirmOrder"
},
+ {
+ "path": "center/systemSet"
+ },
+ {
+ "path": "center/helpFeedback"
+ },
{
"path": "order/pendingOrder"
},
@@ -84,6 +90,9 @@
{
"path": "order/orderDetail2"
},
+ {
+ "path": "order/offerOrBillLading"
+ },
{
"path": "mine/purse"
},
diff --git a/pages/index/center2.vue b/pages/index/center2.vue
index 46677e7..7f6d9f5 100644
--- a/pages/index/center2.vue
+++ b/pages/index/center2.vue
@@ -66,13 +66,15 @@ export default {
// this.$t('pages.index.index.companyProfile')
{text: '我的挂单', value: ">", imgUrl: '/static/image/center/14.svg', toPathUrl: '/pages_order/order/pendingOrder'},
{text: '联系客服', value: ">", imgUrl: '/static/image/center/13.svg'},
- {text: '系统设置', value: ">", imgUrl: '/static/image/center/12.svg'},
+ {text: '系统设置', value: ">", imgUrl: '/static/image/center/12.svg', toPathUrl: '/pages_order/center/systemSet'},
+ {text: '帮助反馈', value: ">", imgUrl: '/static/image/center/12.svg', toPathUrl: '/pages_order/center/helpFeedback'},
{text: '关于我们', value: ">", imgUrl: '/static/image/center/13.svg'},
],
purchaserList: [
// this.$t('pages.index.index.companyProfile')
{text: '联系客服', value: ">", imgUrl: '/static/image/center/13.svg'},
- {text: '系统设置', value: ">", imgUrl: '/static/image/center/12.svg'},
+ {text: '系统设置', value: ">", imgUrl: '/static/image/center/12.svg', toPathUrl: '/pages_order/center/systemSet'},
+ {text: '帮助反馈', value: ">", imgUrl: '/static/image/center/12.svg', toPathUrl: '/pages_order/center/helpFeedback'},
{text: '关于我们', value: ">", imgUrl: '/static/image/center/13.svg'}
]
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ee3b064..56846cc 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -13,7 +13,59 @@
+
+
+
+
+
+
+
+
+
+
+
+ Company Profile
+ {{ $t('pages.index.index.companyProfile') }}
+ {{ $t('pages.index.index.aluminiumProduct') }}
+
+
+ 随着全球经济的快速发展,我们这家领先的企业公司应运而生,致力于为客户提供卓越的服务和优质的产品。我们公司成立于2001年,总部位于深圳市横岗大厦,拥有广泛的业务领域和专业的团队,专注于实现客户的期望和需求。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 随着全球经济的快速发展,我们这家领先的企业公司应运而生,致力于为客户提供卓越的服务和优质的产品。我们公司成立于2001年,总部位于深圳市横岗大厦,拥有广泛的业务领域和专业的团队,专注于实现客户的期望和需求。
+
+
+ Company Profile
+ {{ $t('pages.index.index.companyProfile') }}
+ {{ $t('pages.index.index.aluminiumProduct') }}
+
+
+
+
+
+
+
+ 供应商报价
+
+
+ 供应商提单
+
+
@@ -93,8 +145,9 @@ export default {
...mapGetters(['userShop']),
},
methods: {
-
-
+ goToPage(titleIndex) {
+ uni.navigateTo({url:'/pages_order/order/offerOrBillLading?titleIndex='+titleIndex})
+ },
}
}
@@ -107,15 +160,168 @@ export default {
}
.page {
- & /deep/ .uv-icon__icon {
- font-size: 30rpx !important;
- }
-
+ background-color: #2e394d;
// 供应商
.supplier {
+ display: flex;
+ flex-direction: column;
+ height: calc(100vh - 120rpx - 120rpx);
+ background-color: #2e394d;
+
+
+ .topItem {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 30%;
+ background-image: url('../../static/image/index/1.png');
+ background-size: cover;
+
+ .imageFrame {
+
+ width: 90%;
+ height: 90%;
+ //padding:80rpx;
+ }
+ }
+
+ .threeHeOne {
+ display: flex;
+ padding: 20rpx 40rpx 10rpx;
+ flex-direction: column;
+ height: 60%;
+
+
+
+ .oneItem {
+ display: flex;
+ height: 33%;
+
+ .left {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ gap: 10rpx;
+ width: 33%;
+ background-color: #1e293d;
+ color: white;
+ font-size: 26rpx;
+
+ .subText {
+ background-color: #2e394d;
+ padding: 0 20rpx;
+ }
+ }
+
+ .right {
+ //height: 30%;
+ width: 66%;
+ padding: 20rpx;
+ background-image: url('../../static/image/index/1.png');
+ background-size: cover;
+ font-size: 20rpx;
+ color: white;
+ }
+ }
+
+ .twoItem {
+ display: flex;
+ justify-content: space-between;
+ gap: 20rpx;
+ height: 33%;
+ margin-top: 20rpx;
+ padding: 10rpx;
+
+ .left {
+ width: 60%;
+ padding: 20rpx;
+ background-color: #1e293d;
+ }
+
+ .right {
+ width: 40%;
+ padding: 20rpx;
+ background-color: #1e293d;
+ }
+ }
+
+ .threeItem {
+ display: flex;
+ //width: 100vw;
+ height: 33%;
+
+
+ .left {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ gap: 20rpx;
+ width: 33%;
+ background-color: #1e293d;
+ color: white;
+ font-size: 26rpx;
+
+ .subText {
+ background-color: #2e394d;
+ padding: 0 20rpx;
+ }
+ }
+
+ .right {
+ //height: 200rpx;
+ width: 66%;
+ padding: 20rpx;
+ background-image: url('../../static/image/index/1.png');
+ background-size: cover;
+ font-size: 20rpx;
+ color: white;
+ }
+ }
+ }
+
+ .btns {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ gap: 40rpx;
+
+ .oneBtn {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 30%;
+ height: 70rpx;
+ border-radius: 40rpx;
+ color: #1F1C39;
+
+ font-size: 28rpx;
+ margin: 20rpx 10rpx 0 0;
+ background: #f2f2f2;
+ //margin-top: 20rpx;
+ border-radius: 40rpx;
+ }
+
+ .twoBtn {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 30%;
+ height: 70rpx;
+ border-radius: 40rpx;
+ color: #1F1C39;
+ font-size: 28rpx;
+ margin: 20rpx 10rpx 0 0;
+ background: #f2f2f2;
+ //margin-top: 20rpx;
+ border-radius: 40rpx;
+ }
+
+ }
}
// 采购商
@@ -130,7 +336,7 @@ export default {
display: flex;
justify-content: center;
align-items: center;
- height: 350rpx;
+ height: 280rpx;
background-image: url('../../static/image/index/1.png');
background-size: cover;
@@ -144,20 +350,19 @@ export default {
.threeHeOne {
display: flex;
- padding: 20rpx 40rpx 40rpx;
+ padding: 20rpx 40rpx 10rpx;
flex-direction: column;
.oneItem {
display: flex;
- //width: 100vw;
.left {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
- gap: 20rpx;
+ gap: 10rpx;
width: 33%;
background-color: #1e293d;
color: white;
@@ -170,7 +375,7 @@ export default {
}
.right {
- height: 200rpx;
+ height: 180rpx;
width: 66%;
padding: 20rpx;
background-image: url('../../static/image/index/1.png');
@@ -184,7 +389,7 @@ export default {
display: flex;
justify-content: space-between;
gap: 20rpx;
- height: 300rpx;
+ height: 280rpx;
margin-top: 20rpx;
padding: 10rpx;
diff --git a/pages/index/tradingPlatform.vue b/pages/index/tradingPlatform.vue
index 784dd58..a4030b0 100644
--- a/pages/index/tradingPlatform.vue
+++ b/pages/index/tradingPlatform.vue
@@ -1,9 +1,11 @@
+
+
-
+
@@ -18,8 +20,7 @@
-
-
+
@@ -81,25 +82,31 @@ export default {
\ No newline at end of file
diff --git a/pages_order/center/systemSet.vue b/pages_order/center/systemSet.vue
new file mode 100644
index 0000000..988fd6f
--- /dev/null
+++ b/pages_order/center/systemSet.vue
@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+ {{ item2.text }}
+
+
+
+ {{ item.rightIcon }}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/order/offerOrBillLading.vue b/pages_order/order/offerOrBillLading.vue
new file mode 100644
index 0000000..5ccdfa2
--- /dev/null
+++ b/pages_order/order/offerOrBillLading.vue
@@ -0,0 +1,451 @@
+
+
+
+
+
+
+
+
+ 铝制品
+
+
+
+
+
+
+
+ 供应商名称
+
+ 华南铝业有限公司
+
+
+
+
+
+ 商品规格
+
+ 铝制品(Al>96%)
+
+
+
+
+
+
+
+ 提货地点
+
+
+
+
+
+
+
+
+
+
+
+
+ 详细地址
+
+
+
+
+
+
+
+ 交货日期
+
+
+
+ {{ form.deliveryDate }}
+
+
+
+ >
+
+
+
+
+
+
+
+
+ 暂定数量(吨)
+
+
+
+
+
+
+
+ 单价
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ‘
+
+
+
+ {{titleIndex == 0? '提交报价' : '提交审核'}}
+
+
+ 联系我们
+
+ 如有问题,请联系我们
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/static/center/1.svg b/pages_order/static/center/1.svg
new file mode 100644
index 0000000..2054a7e
--- /dev/null
+++ b/pages_order/static/center/1.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/pages_order/static/center/2.svg b/pages_order/static/center/2.svg
new file mode 100644
index 0000000..5514154
--- /dev/null
+++ b/pages_order/static/center/2.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/pages_order/static/center/3.svg b/pages_order/static/center/3.svg
new file mode 100644
index 0000000..5397f5d
--- /dev/null
+++ b/pages_order/static/center/3.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/pages_order/static/center/4.svg b/pages_order/static/center/4.svg
new file mode 100644
index 0000000..2054a7e
--- /dev/null
+++ b/pages_order/static/center/4.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/pages_order/tradingPlatform/nowOrder.vue b/pages_order/tradingPlatform/nowOrder.vue
index 62c7c7f..eceab53 100644
--- a/pages_order/tradingPlatform/nowOrder.vue
+++ b/pages_order/tradingPlatform/nowOrder.vue
@@ -1,6 +1,6 @@
-
+
@@ -119,6 +119,7 @@ import dayjs from "dayjs";
import customerServicePopup from '@/components/config/customerServicePopup.vue'
export default {
+ name: "nowOrder",
components: {
topbar,customerServicePopup,
},