From 03144765250729b64285b55684cf11c9eec9102b Mon Sep 17 00:00:00 2001 From: chenkun <3289431190@qq.com> Date: Fri, 25 Oct 2024 23:46:41 +0800 Subject: [PATCH] . --- api/api.js | 4 +- components/base/tabbar.vue | 4 +- components/user/productList.vue | 248 ++++++------ locale/en.json | 3 +- locale/zh-Hans.json | 3 +- pages.json | 6 + pages/index/center2.vue | 1 - pages/index/clearanceService.vue | 3 +- pages/index/index.vue | 6 - pages_order/auth/customsClearApply.vue | 388 +++++++++++++++++++ pages_order/auth/registerShop.vue | 48 ++- pages_order/center/addressListManage.vue | 213 ++++++++++ pages_order/center/helpFeedback.vue | 24 +- pages_order/center/systemSet.vue | 289 +++++++------- pages_order/components/address/addressList.vue | 469 +++++++++++------------ pages_order/components/address/redactAddress.vue | 427 +++++++++++---------- pages_order/components/order/orderList.vue | 33 +- pages_order/order/pendingOrder.vue | 6 +- pages_order/static/order/3.svg | 1 + pages_order/tradingPlatform/confirmOrder.vue | 10 +- store/store.js | 2 +- 21 files changed, 1410 insertions(+), 778 deletions(-) create mode 100644 pages_order/auth/customsClearApply.vue create mode 100644 pages_order/center/addressListManage.vue create mode 100644 pages_order/static/order/3.svg diff --git a/api/api.js b/api/api.js index bae2ad4..ef6e2a2 100644 --- a/api/api.js +++ b/api/api.js @@ -88,14 +88,14 @@ const config = { url: '/product/noShow', method: 'GET', }, - // 产品报价分页列表 + // 现货/期货列表 productList: { url: '/product/productList', method: 'GET', }, // 交易平台挂单列表 productlist: { - url: '/product/productList', + url: '/product/productlist', method: 'GET', }, // ========================用户地址=============================== diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue index aaee3d2..6a2ec48 100644 --- a/components/base/tabbar.vue +++ b/components/base/tabbar.vue @@ -6,8 +6,10 @@ :class="{item : true, active : select == index}" v-for="(item, index) in list" :key="index" - v-if="!item.isNotShop || !userShop" + @click="toPath(item, index)"> + + - - - - - {{ $t('other.aluminumProducts') }} - - - ￥{{ item.price }} - {{ $t('components.unitPrice2') }} - - - - - - - - - - - 最多批发*快速下单 - - - - - {{ $t('components.immediatePurchase') }} - - - - + + + + + + {{ $t('other.aluminumProducts') }} + + + {{item.price}} + {{ $t('components.unitPrice2') }} + + + 最多批发*快速下单 + + + + + {{ $t('components.immediatePurchase') }} + + + + \ No newline at end of file diff --git a/locale/en.json b/locale/en.json index 7b62a6f..161fbf1 100644 --- a/locale/en.json +++ b/locale/en.json @@ -35,7 +35,8 @@ "languageSwitch": "Language Switch", "clearCache": "Clear Cache", "switchIdentity": "Switch Identity", - "cancelOrder": "Cancel Order" + "cancelOrder": "Cancel Order", + "addressList": "Address list" }, "components": { "cancel": "Cancel", diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json index 04f9b7a..1e8348b 100644 --- a/locale/zh-Hans.json +++ b/locale/zh-Hans.json @@ -37,7 +37,8 @@ "languageSwitch": "语言切换", "clearCache": "清理缓存", "switchIdentity": "切换身份", - "cancelOrder": "取消订单" + "cancelOrder": "取消订单", + "addressList": "地址列表" }, "components": { "cancel": "取消", diff --git a/pages.json b/pages.json index 15246f5..84bf873 100644 --- a/pages.json +++ b/pages.json @@ -48,6 +48,9 @@ { "path": "auth/registerShop" }, + { + "path": "auth/customsClearApply" + }, { "path": "tradingPlatform/nowOrder" }, @@ -78,6 +81,9 @@ { "path": "mine/purse" }, + { + "path": "center/addressListManage" + }, { "path": "mine/runningWater" }, diff --git a/pages/index/center2.vue b/pages/index/center2.vue index 6ac6dc1..e3e3a95 100644 --- a/pages/index/center2.vue +++ b/pages/index/center2.vue @@ -63,7 +63,6 @@ export default { data() { return { supplierList: [ - // this.$t('pages.index.index.companyProfile') {text: `${this.$t('pageTitle.myOrders')}`,englishText:'myOrders', value: ">", imgUrl: '/static/image/center/14.svg', toPathUrl: '/pages_order/order/pendingOrder'}, {text: `${this.$t('components.contactCustomerService')}`, englishText:'contactCustomerService',value: ">", imgUrl: '/static/image/center/13.svg'}, {text: `${this.$t('components.systemSettings')}`,englishText:'systemSettings', value: ">", imgUrl: '/static/image/center/12.svg', toPathUrl: '/pages_order/center/systemSet'}, diff --git a/pages/index/clearanceService.vue b/pages/index/clearanceService.vue index 0b6e2ca..70dd8b9 100644 --- a/pages/index/clearanceService.vue +++ b/pages/index/clearanceService.vue @@ -40,8 +40,7 @@ export default { methods: { applyClearanceService(){ uni.navigateTo({ - // titleList: ['采购商注册', '供应商注册','国内清关申请'], - url: `/pages_order/auth/registerShop?identity=2` + url: `/pages_order/auth/customsClearApply` }) }, }, diff --git a/pages/index/index.vue b/pages/index/index.vue index dc5c9af..2f088c6 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -4,12 +4,6 @@ - - - - - - diff --git a/pages_order/auth/customsClearApply.vue b/pages_order/auth/customsClearApply.vue new file mode 100644 index 0000000..77588d7 --- /dev/null +++ b/pages_order/auth/customsClearApply.vue @@ -0,0 +1,388 @@ + + + + + + diff --git a/pages_order/auth/registerShop.vue b/pages_order/auth/registerShop.vue index 11ddd1f..7004a5c 100644 --- a/pages_order/auth/registerShop.vue +++ b/pages_order/auth/registerShop.vue @@ -6,41 +6,46 @@ - + {{ $t('components.username')}} - + + {{ $t('components.password')}} - + + {{ $t('other.companyName')}} - + + {{ $t('other.taxCode')}} - + + {{ $t('other.companyAddress')}} + {{ $t('components.lxPhone')}} - + @@ -154,18 +159,25 @@ export default { return { titleIndex: 0, titleList: [ + // 采购商注册 供应商注册 国内清关申请 this.$t('other.buyerRegistration'), this.$t('other.supplierRegistration'), this.$t('other.domesticCustomsClearanceApplication') ], form: { - userName: '', - name: '', - phone: '', - currentRegion: '', - address: '', - latitude: '', - longitude: '', + "address": "", + "bankAccount": "", + "bankInfo": "", + "bankNama": "", + "basicAccount": "", + "businessLicense": "", + "companyName": "", + "id": "", + "password": "", + "phone": "", + "role": 0, + "taxCode": "", + "userName": "" }, yyzzfileList: [], jbhxxfileList: [], @@ -175,7 +187,15 @@ export default { methods: { // 申请审核 applyReview() { - + this.$api('loginLogout', res => { + if (res.code == 200) { + uni.removeStorageSync('token') + this.$store.state.userInfo = {} + uni.redirectTo({ + url: '/pages/index/index' + }) + } + }) }, // 联系我们 contactUs() { diff --git a/pages_order/center/addressListManage.vue b/pages_order/center/addressListManage.vue new file mode 100644 index 0000000..45f276e --- /dev/null +++ b/pages_order/center/addressListManage.vue @@ -0,0 +1,213 @@ + + + + + \ No newline at end of file diff --git a/pages_order/center/helpFeedback.vue b/pages_order/center/helpFeedback.vue index 5a2a7ed..a14286b 100644 --- a/pages_order/center/helpFeedback.vue +++ b/pages_order/center/helpFeedback.vue @@ -1,7 +1,7 @@