diff --git a/components/category-bar/category-bar.vue b/components/category-bar/category-bar.vue index 3453f80..dac2c69 100644 --- a/components/category-bar/category-bar.vue +++ b/components/category-bar/category-bar.vue @@ -71,7 +71,7 @@
  • - 下询价单 + 找买家
  • - -
    -
    -
    -
    -
    平台服务
    -
    - -
    -
    -
    -
    -
    -
    交易流程
    -
    - -
    -
    -
    -
    -
    -
    关于金久信
    -
    - -
    -
    -
    -
    -
    -
    旧货交易
    -
    - -
    -
    -
    -
    -
    -
    找加工
    -
    - -
    -
    -
    -
    -
    -
    找合作
    -
    - -
    -
    -
    + +
    +
    +
    +
    +
    平台服务
    +
    + +
    +
    +
    +
    +
    +
    交易流程
    +
    + +
    +
    +
    +
    +
    +
    关于金久信
    +
    + +
    +
    +
    +
    +
    +
    旧货交易
    +
    + +
    +
    +
    +
    +
    +
    找加工
    +
    + +
    +
    +
    +
    +
    +
    找合作
    +
    + +
    +
    +
    -
    -
    -
    金久信学堂
    -
    - -
    -
    -
    -
    -
    -
    金久信金融
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    - 亿利通官网 - |亿利通 -

    -
    -

    - Copyright © 2020-2021   jinjiuxinzg.cn   All Rights Reserved   版权所有：  南宁亿利通钢管有限公司 桂ICP备19008827号-1 -

    -
    -
    - -

    公众号

     -     - -

    手机站

     -     -
    -
    -
    -
    -     +
    +
    +
    金久信学堂
    +
    + +
    +
    +
    +
    +
    +
    金久信金融
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +

    + 亿利通官网 + |亿利通 +

    +
    +

    + Copyright © 2020-2021   jinjiuxinzg.cn   All Rights Reserved   版权所有：  南宁亿利通钢管有限公司 + 桂ICP备19008827号-1 +

    +
    +
    + +

    公众号

     +     + +

    手机站

     +     +
    +
    +
    +
    +     \ No newline at end of file diff --git a/components/right-bar/right-bar.vue b/components/right-bar/right-bar.vue index 8f3036e..5845d8a 100644 --- a/components/right-bar/right-bar.vue +++ b/components/right-bar/right-bar.vue @@ -10,7 +10,7 @@
    - 下询价单 + 找买家
  • - - -
    -
    -
    欢迎来到金久信钢城首页！
    -
    • -
  • - 客户服务 -
    -
    -
    - 常见问题 -
    -
    - 买家指南 -
    -
    - 卖家指南 -
    - - - - -
    -
    -
    • -
  • - 我的消息 -
    • -
  • - 客服服务热线：+86 +
  • + 客户服务 +
    +
    +
    + 常见问题 +
    +
    + 买家指南 +
    +
    + 卖家指南 +
    + + + + +
    +
    +
    • +
  • + 我的消息 +
    • +
  • + 客服服务热线：+86 0771-3923001 -
    • - - - - - + + + + + + \ No newline at end of file diff --git a/package.json b/package.json index bb205a5..3d12743 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "uqrcodejs": "^4.0.7", "vk-unicloud-admin-ui": "^1.17.53", "vue": "^2.7.15", + "vue-clipboard2": "^0.3.3", "vue-cropper": "^0.6.4", "vuedraggable": "^2.24.3", "xe-utils": "^3.5.14" diff --git a/pages.json b/pages.json index 97d811f..6ef2ac6 100644 --- a/pages.json +++ b/pages.json @@ -304,8 +304,79 @@ "navigationBarTitleText" : "旧货交易", "enablePullDownRefresh" : false } + }, + { + "path" : "pages/store/store", + "style" : + { + "navigationBarTitleText" : "卖家中心", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/store/buyer", + "style" : + { + "navigationBarTitleText" : "买家中心", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/spot/goods/my", + "style" : + { + "navigationBarTitleText" : "", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/order/order", + "style" : + { + "navigationBarTitleText" : "", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/index/old/detail", + "style" : + { + "navigationBarTitleText" : "", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/otherArticle/list", + "style" : + { + "navigationBarTitleText" : "", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/otherArticle/detail", + "style" : + { + "navigationBarTitleText" : "详情", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/otherArticle/noticeDetail", + "style" : + { + "navigationBarTitleText" : "详情", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/index/old/my", + "style" : + { + "navigationBarTitleText" : "我发布的旧货信息", + "enablePullDownRefresh" : false + } } - ], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/article/list.vue b/pages/article/list.vue index 1828829..1ff01ce 100644 --- a/pages/article/list.vue +++ b/pages/article/list.vue @@ -51,7 +51,8 @@ - + {{ item.name }} @@ -108,12 +109,18 @@ export default { }) this.list = rows }, - toMySchool(){ + toMySchool() { vk.navigateTo({ url: '/pages/user/school' }) }, - openDownload(url){ + async openDownload(id, url) { + await vk.callFunction({ + url: 'client/article/list/pub/addDownload', + data: { + id + } + }) window.open(url) } }, @@ -202,7 +209,7 @@ export default { justify-content: flex-start; flex-direction: column; - .title{ + .title { font-size: 20px; } @@ -219,11 +226,11 @@ export default { border-right: 2px solid #bbb; } - :first-child{ + :first-child { padding-left: 0; } - :last-child{ + :last-child { border-right: none } } diff --git a/pages/auth/register/register.vue b/pages/auth/register/register.vue index 06058c7..6776402 100644 --- a/pages/auth/register/register.vue +++ b/pages/auth/register/register.vue @@ -125,6 +125,9 @@ } }; }, + onLoad(option){ + if (option.code) this.form1.inviteCode = option.code + }, methods: { sendSmsCode() { if (timer != null) { @@ -156,8 +159,6 @@ }); }, handleSubmit() { - - if (this.testForm()) { const { mobile, // 手机号 diff --git a/pages/contract/index.vue b/pages/contract/index.vue index 5c21d99..3d782d9 100644 --- a/pages/contract/index.vue +++ b/pages/contract/index.vue @@ -382,6 +382,11 @@ export default { this.isSign = false this.query(1) } + }else { + this.menuIndex = '0' + this.formData.status = 0 + this.isSign = false + this.query(1) } }, methods: { diff --git a/pages/enquiry/components/template.vue b/pages/enquiry/components/template.vue index e96b270..1e4d149 100644 --- a/pages/enquiry/components/template.vue +++ b/pages/enquiry/components/template.vue @@ -509,7 +509,6 @@ export default { this.goodsList.forEach(({_id, name, extraAttributes}) => { if (_id === val) { this.form1.data.goodsName = name - console.log(extraAttributes) this.goodsAttributes = extraAttributes } }) diff --git a/pages/enquiry/detail.vue b/pages/enquiry/detail.vue index a5925ae..f0f7708 100644 --- a/pages/enquiry/detail.vue +++ b/pages/enquiry/detail.vue @@ -196,7 +196,8 @@ {{ item.subjectMobile }} {{ item.totalPrice }}元 - 选择 + 选择 + @@ -406,6 +407,22 @@ export default { this.sheet = {...res.data, ...{title: title.join()}} } }); + }, + confirm(item) { + vk.callFunction({ + url: 'client/enquiry/quote/kh/confirmQuote', + title: '请求中...', + data: { + quoteId: item._id, + }, + success: (data) => { + vk.navigateTo('/pages/contract/index'); + this.$message({ + type: 'success', + message: '报价确认成功' + }) + } + }); } } } diff --git a/pages/enquiry/list.vue b/pages/enquiry/list.vue index 8a4a441..7791603 100644 --- a/pages/enquiry/list.vue +++ b/pages/enquiry/list.vue @@ -114,9 +114,44 @@ - + + + + + + + + + + + + + + + + + + + +
    + +
    @@ -147,6 +182,11 @@ export default { checkCompanyList: [], attributes: [], keyword: '', + list: { + rows: [], + total: 0 + }, + pageSize: 20, queryParam: {}, // 表格相关开始 ----------------------------------------------------------- table1: { @@ -252,7 +292,7 @@ export default { } }, { - key: "_add_time", + key: "_add_time_srt", title: "发布时间", type: "time", }, @@ -285,6 +325,7 @@ export default { }); this.getAttributes() this.getCompany() + this.search() }, methods: { selectCate(id) { @@ -344,21 +385,47 @@ export default { }, - search(pageIndex) { - const categoryIds = [] - this.checkCategoryList.forEach(item => { - // console.log(item) - // item.forEach(sitem => { - // categoryIds.push(sitem._id) - // }) - categoryIds.push(item) - }) - this.queryParam.formData = { - keyword: this.keyword, - companyList: this.checkCompanyList, - categoryIds - } - this.$refs.table1.search() + search(pageIndex = 1) { + vk.callFunction({ + url: 'client/enquiry/sheet/pub/getList', + data: { + pageIndex, + pageSize: this.pageSize, + keyword: this.keyword, + companyList: this.checkCompanyList, + categoryIds: this.checkCategoryList + }, + success: (data) => { + this.list = data + this.list.rows.forEach((val, index) => { + let fullAddress = '' + if (val.productList !== undefined && val.productList.length > 0 && val.productList[0].addressRegion !== undefined && val.productList[0].addressRegion.length > 0) { + let provinceIndex = 0, cityIndex = 0, areaIndex = 0 + this.provinceData.forEach((item, index) => { + if (val.productList[0].addressRegion !== undefined && parseInt(val.productList[0].addressRegion[0]) === parseInt(item.code)) { + provinceIndex = index + fullAddress = item.name + } + }) + this.cityData[provinceIndex].forEach((item, index) => { + if (val.productList[0].addressRegion !== undefined && parseInt(val.productList[0].addressRegion[1]) === parseInt(item.code)) { + cityIndex = index + fullAddress += item.name + } + }) + this.areaData[provinceIndex][cityIndex].forEach((item, index) => { + if (val.productList[0].addressRegion !== undefined && parseInt(val.productList[0].addressRegion[2]) === parseInt(item.code)) { + areaIndex = index + fullAddress += item.name + } + }) + fullAddress += val.productList[0].addressDetail + } + this.list.rows[index].fullAddress = fullAddress + }) + } + }); + }, getAttributes() { vk.callFunction({ diff --git a/pages/enquiry/my.vue b/pages/enquiry/my.vue index e7e1f3d..5ca20c9 100644 --- a/pages/enquiry/my.vue +++ b/pages/enquiry/my.vue @@ -1,265 +1,281 @@ \ No newline at end of file diff --git a/pages/enquiry/release.vue b/pages/enquiry/release.vue index 63d948e..735e2e3 100644 --- a/pages/enquiry/release.vue +++ b/pages/enquiry/release.vue @@ -30,13 +30,13 @@     - \ No newline at end of file + + + \ No newline at end of file diff --git a/pages/index/shop/pay.vue b/pages/index/shop/pay.vue index a495027..09f87f6 100644 --- a/pages/index/shop/pay.vue +++ b/pages/index/shop/pay.vue @@ -12,14 +12,14 @@ 商品详情 - 封面 + 封面 名称 数量 单价 小计 - + {{ item.goodsName }} @@ -29,50 +29,56 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - 订单金额:￥{{ info.amount }} - + 订单金额:￥{{ info.amount }} + 立即支付 @@ -106,7 +112,9 @@ export default { data() { return { id: null, - info: null, + info: { + type: null + }, provinceData: provinces, cityData: citys, areaData: areas, @@ -128,7 +136,7 @@ export default { }) if (this.info.orderStatus === 1) { this.$message({ - type:'success', + type: 'success', message: '订单已支付成功' }) setTimeout(() => { @@ -138,7 +146,21 @@ export default { }, 1000) } }, - onPay() { + async onPay() { + if (this.info.type === 0) { + if (this.addressIndex.length > 2 && this.addressIndex[2] === null) { + await vk.callFunction({ + url: 'client/order/kh/updateAddress', + data: { + id: this.id, + address: [provinces[this.addressIndex[0]], citys[this.addressIndex[0]][this.addressIndex[1]], areas[this.addressIndex[0]][this.addressIndex[1]][this.addressIndex[2]]], + addressDetail: this.addressDetail, + phone: this.phone, + name: this.name, + } + }) + } + } const requestTimestamp = dayjs().format('YYYY-MM-DD HH:mm:ss') const timestamp = dayjs().format('YYYYMMDDHHmmss') const goods = [] @@ -183,6 +205,9 @@ export default { this.id = options.id this.getInfo() } + }, + onUnload() { + if (this.checkPayInterval) clearInterval(this.checkPayInterval) } } diff --git a/pages/index/shop/shop.vue b/pages/index/shop/shop.vue index ba5d05b..38e1d34 100644 --- a/pages/index/shop/shop.vue +++ b/pages/index/shop/shop.vue @@ -8,7 +8,8 @@ 地区： - + @@ -16,8 +17,11 @@ 分类： - 全部 - {{ item.name }} + 全部 + {{ item.name }} + @@ -42,7 +46,10 @@ + :total="total" + :page-size="pageSize" + @click="getGoodsList" + > @@ -79,7 +86,11 @@ export default { } ], options: [], - address: [] + address: [], + pageIndex: 1, + pageSize: 20, + total: 0, + categoryId: null }; }, onLoad(options) { @@ -112,14 +123,24 @@ export default { this.categoryList = res.rows }) }, - getGoodsList() { + getGoodsList(pageIndex = 1) { vk.callFunction({ - url: 'client/goods/list/pub/getList' + url: 'client/goods/list/pub/getList', + data: { + pageIndex, + pageSize: this.pageSize, + city: this.address.length > 1 ? this.address[1] : null, + parentId: this.categoryId + } }).then(res => { this.goodsList = res.rows }) }, - + selectCate(cateId) { + if (this.categoryId === cateId) this.categoryId = null + else this.categoryId = cateId + this.getGoodsList() + } } } @@ -146,7 +167,7 @@ export default { .tool-bar { display: flex; - justify-content: space-between; + justify-content: flex-start; align-items: center; padding: 20px; font-size: 16px; @@ -155,6 +176,16 @@ export default { display: flex; align-items: center; } + + .item { + margin-right: 10px; + cursor: pointer; + } + + .item:hover, .active { + color: #bf2b28; + } + } } diff --git a/pages/otherArticle/detail.vue b/pages/otherArticle/detail.vue new file mode 100644 index 0000000..cf0d4e4 --- /dev/null +++ b/pages/otherArticle/detail.vue @@ -0,0 +1,40 @@ + + + \ No newline at end of file diff --git a/pages/otherArticle/list.vue b/pages/otherArticle/list.vue new file mode 100644 index 0000000..784486d --- /dev/null +++ b/pages/otherArticle/list.vue @@ -0,0 +1,13 @@ + + + \ No newline at end of file diff --git a/pages/otherArticle/noticeDetail.vue b/pages/otherArticle/noticeDetail.vue new file mode 100644 index 0000000..7a56a69 --- /dev/null +++ b/pages/otherArticle/noticeDetail.vue @@ -0,0 +1,40 @@ + + + \ No newline at end of file diff --git a/pages/process/list.vue b/pages/process/list.vue index 33f72f9..19883ef 100644 --- a/pages/process/list.vue +++ b/pages/process/list.vue @@ -53,13 +53,13 @@ + + \ No newline at end of file diff --git a/pages/store/components/enquiryModal.vue b/pages/store/components/enquiryModal.vue new file mode 100644 index 0000000..25f2232 --- /dev/null +++ b/pages/store/components/enquiryModal.vue @@ -0,0 +1,111 @@ + + + + + \ No newline at end of file diff --git a/pages/store/components/processModal.vue b/pages/store/components/processModal.vue new file mode 100644 index 0000000..5c579e7 --- /dev/null +++ b/pages/store/components/processModal.vue @@ -0,0 +1,120 @@ + + + + + \ No newline at end of file diff --git a/pages/store/components/spotModal.vue b/pages/store/components/spotModal.vue new file mode 100644 index 0000000..878136b --- /dev/null +++ b/pages/store/components/spotModal.vue @@ -0,0 +1,155 @@ + + + + + \ No newline at end of file diff --git a/pages/store/store.vue b/pages/store/store.vue index 65cce25..492843d 100644 --- a/pages/store/store.vue +++ b/pages/store/store.vue @@ -1,821 +1,681 @@ \ No newline at end of file diff --git a/pages/user/components/business-card.vue b/pages/user/components/business-card.vue index c744c78..adfea8a 100644 --- a/pages/user/components/business-card.vue +++ b/pages/user/components/business-card.vue @@ -1,218 +1,223 @@ diff --git a/pages/user/components/notice.vue b/pages/user/components/notice.vue index 28cad0a..875e214 100644 --- a/pages/user/components/notice.vue +++ b/pages/user/components/notice.vue @@ -1,263 +1,162 @@ diff --git a/pages/user/components/payment.vue b/pages/user/components/payment.vue index 1a473ca..56fd3eb 100644 --- a/pages/user/components/payment.vue +++ b/pages/user/components/payment.vue @@ -1,303 +1,320 @@ diff --git a/pages/user/components/personal.vue b/pages/user/components/personal.vue index 4a0038e..e4d8749 100644 --- a/pages/user/components/personal.vue +++ b/pages/user/components/personal.vue @@ -7,68 +7,285 @@ 个人认证 企业认证 -
    +
    -