From aa1df73a53223a7f106c7adf0c06c13faafe9b98 Mon Sep 17 00:00:00 2001 From: b2894lxlx <517289602@qq.com> Date: Mon, 4 Dec 2023 19:25:58 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E7=AD=BE=E7=BA=A6?= =?UTF-8?q?=E5=AE=9D=202=E3=80=81=E8=B0=83=E6=95=B4=E8=87=AA=E8=90=A5=203?= =?UTF-8?q?=E3=80=81=E6=96=B0=E5=A2=9E=E8=B4=AD=E7=89=A9=E8=BD=A6(?= =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E5=96=84)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/right-bar/right-bar.vue | 322 +++++++++--------- pages.json | 16 + pages/article/list.vue | 6 +- pages/contract/index.vue | 166 ++++++++- pages/enquiry/list.vue | 2 +- pages/index/index.vue | 1 + pages/index/self-support/companyQuote.vue | 69 ++-- pages/index/self-support/productQuote.vue | 60 ++-- pages/index/self-support/self-support.vue | 1 + pages/index/shop/cart.vue | 52 +++ pages/index/shop/detail.vue | 18 +- pages/index/shop/shop.vue | 1 + pages/process/list.vue | 2 +- pages/spot/goods/goods.vue | 1 + pages/user/school.vue | 22 +- pages/user/user.vue | 146 ++++---- pages/yellowPage/list.vue | 57 +++- .../router/service/client/cart/kh/add.js | 47 +++ .../service/client/cart/kh/changeNum.js | 42 +++ .../router/service/client/cart/kh/delete.js | 28 ++ .../router/service/client/cart/kh/getList.js | 38 +++ .../service/client/contract/kh/addSign.js | 76 +++++ .../service/client/user/pub/getCompany.js | 7 + 23 files changed, 857 insertions(+), 323 deletions(-) create mode 100644 pages/index/shop/cart.vue create mode 100644 uniCloud-aliyun/cloudfunctions/router/service/client/cart/kh/add.js create mode 100644 uniCloud-aliyun/cloudfunctions/router/service/client/cart/kh/changeNum.js create mode 100644 uniCloud-aliyun/cloudfunctions/router/service/client/cart/kh/delete.js create mode 100644 uniCloud-aliyun/cloudfunctions/router/service/client/cart/kh/getList.js create mode 100644 uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/addSign.js diff --git a/components/right-bar/right-bar.vue b/components/right-bar/right-bar.vue index 3a104e7..70b7606 100644 --- a/components/right-bar/right-bar.vue +++ b/components/right-bar/right-bar.vue @@ -1,180 +1,186 @@ \ No newline at end of file diff --git a/pages.json b/pages.json index 51cd7fd..9b70a43 100644 --- a/pages.json +++ b/pages.json @@ -233,6 +233,14 @@ "enablePullDownRefresh" : false } }, + { + "path" : "pages/index/shop/cart", + "style" : + { + "navigationBarTitleText" : "购物车", + "enablePullDownRefresh" : false + } + }, { "path" : "pages/yellowPage/list", "style" : @@ -248,6 +256,14 @@ "navigationBarTitleText" : "", "enablePullDownRefresh" : false } + }, + { + "path" : "pages/user/school", + "style" : + { + "navigationBarTitleText" : "金久信学堂", + "enablePullDownRefresh" : false + } } ], "globalStyle": { diff --git a/pages/article/list.vue b/pages/article/list.vue index 873dbaa..1828829 100644 --- a/pages/article/list.vue +++ b/pages/article/list.vue @@ -51,7 +51,7 @@ - + {{ item.name }} @@ -67,6 +67,7 @@ + @@ -111,6 +112,9 @@ export default { vk.navigateTo({ url: '/pages/user/school' }) + }, + openDownload(url){ + window.open(url) } }, onLoad() { diff --git a/pages/contract/index.vue b/pages/contract/index.vue index 475f2cd..062e036 100644 --- a/pages/contract/index.vue +++ b/pages/contract/index.vue @@ -23,9 +23,15 @@ 已作废 + + + + + 签约宝 + - + 自主交易 @@ -43,6 +49,9 @@ 加工单 + 签约宝 + {{ item.contract.productTitle }} @@ -92,8 +101,8 @@ --> 修改合同内容 + v-if="item.contract.status == 1 && item.contract.userId == vk.getVuex('$user.userInfo._id')" + size="mini" type="primary">修改合同内容 @@ -105,14 +114,19 @@ :total="tableData.total"> - + + + - \ No newline at end of file diff --git a/pages/index/shop/detail.vue b/pages/index/shop/detail.vue index c6c5d30..29a3bd3 100644 --- a/pages/index/shop/detail.vue +++ b/pages/index/shop/detail.vue @@ -31,7 +31,7 @@ ￥{{ info.amount }} - 加入购物车 + 加入购物车 立即购买 @@ -55,6 +55,7 @@ export default { components: {UGap}, data() { return { + id: null, info: { name: '' } @@ -62,6 +63,7 @@ export default { }, onLoad(options) { if (options && options.id) { + this.id = options.id; this.getInfo(options.id) } }, @@ -74,6 +76,20 @@ export default { url: 'client/goods/list/pub/getDetail', data: {id} }) + }, + addToCart(){ + vk.callFunction({ + url: 'client/cart/kh/add', + data: { + goodsId: this.id, + }, + success: (res) => { + this.$message({ + type:'success', + message: '添加成功' + }) + } + }) } } } diff --git a/pages/index/shop/shop.vue b/pages/index/shop/shop.vue index df030ca..b8ebc69 100644 --- a/pages/index/shop/shop.vue +++ b/pages/index/shop/shop.vue @@ -46,6 +46,7 @@ + diff --git a/pages/process/list.vue b/pages/process/list.vue index f2b9bfe..33f72f9 100644 --- a/pages/process/list.vue +++ b/pages/process/list.vue @@ -105,8 +105,8 @@ + - diff --git a/pages/spot/goods/goods.vue b/pages/spot/goods/goods.vue index c067c69..593a88d 100644 --- a/pages/spot/goods/goods.vue +++ b/pages/spot/goods/goods.vue @@ -120,6 +120,7 @@ :total="goodsData.total"> + diff --git a/pages/user/school.vue b/pages/user/school.vue index a517373..e2a45d8 100644 --- a/pages/user/school.vue +++ b/pages/user/school.vue @@ -55,7 +55,10 @@ {{ item._add_time_str }} {{ item.viewNum }}人浏览 {{ item.downloadNum }}次下载 - {{ item.amount === 0 ? '免费下载' : `${item.amount}元下载` }} + {{ + item.amount === 0 ? '免费下载' : `${item.amount}元下载` + }} + @@ -65,7 +68,16 @@ diff --git a/pages/yellowPage/list.vue b/pages/yellowPage/list.vue index f082283..861857f 100644 --- a/pages/yellowPage/list.vue +++ b/pages/yellowPage/list.vue @@ -17,9 +17,9 @@ - - - 搜索 + + + 搜索 @@ -87,43 +87,60 @@ + - + + - 地址:{{ item.manager.address }} + + 地址: + {{ item.manager.address }} + - 电话:{{ item.businessCard.phone }} + + 电话: + {{ item.businessCard.phone }} + - 手机:{{ item.businessCard.mobile }} + + 手机: + {{ item.businessCard.mobile }} + - 邮箱:{{ item.businessCard.email }} + + 邮箱: + {{ item.businessCard.email }} + - 网址:{{ item.businessCard.website }} + + 网址: + {{ item.businessCard.website }} + 主营业务: - {{ item.businessCard.mainBusiness }} + {{ item.businessCard.mainBusiness }} 查看详情 @@ -132,15 +149,18 @@ +