diff --git a/common/css/common.css b/common/css/common.css index 3f14716..ab4d191 100644 --- a/common/css/common.css +++ b/common/css/common.css @@ -2104,6 +2104,10 @@ input:disabled { width: 100%; } +.w-1200 { + width: 1200px +} + .empty-bg-plain-btn { background: none !important; } @@ -2386,6 +2390,10 @@ input:disabled { padding: 30rpx; } +.p-40 { + padding: 40rpx; +} + .px-20 { padding: 0 20rpx; } @@ -2647,6 +2655,11 @@ input:disabled { line-height: 40rpx; } +.text-50 { + font-size: 50rpx; + line-height: 50rpx; +} + .rounded { border-radius: 10rpx; } @@ -2664,23 +2677,31 @@ input:disabled { } .border { - border: 1rpx solid #bbb; + border: 1rpx solid #F1F5F9; } .border-top { - border-top: 1rpx solid #bbb; + border-top: 1rpx solid #F1F5F9; } .border-bottom { - border-bottom: 1rpx solid #bbb; + border-bottom: 1rpx solid #F1F5F9; } .border-left { - border-left: 1rpx solid #bbb; + border-left: 1rpx solid #F1F5F9; } .border-right { - border-right: 1rpx solid #bbb; + border-right: 1rpx solid #F1F5F9; +} + +.bg-gray{ + background-color: #DDD; +} + +.bg-gray-light{ + background-color: #F9F9F9; } .footer { diff --git a/components/category-bar/category-bar.vue b/components/category-bar/category-bar.vue index de33579..eacf036 100644 --- a/components/category-bar/category-bar.vue +++ b/components/category-bar/category-bar.vue @@ -81,7 +81,8 @@
  • 旧货交易
    • -
  • +
  • 金久信黄页
  • @@ -28,7 +28,14 @@ return { }; - } + }, + methods:{ + jump(url){ + vk.navigateTo({ + url + }) + } + } } diff --git a/components/top-bar/top-bar.vue b/components/top-bar/top-bar.vue index cadd134..0708380 100644 --- a/components/top-bar/top-bar.vue +++ b/components/top-bar/top-bar.vue @@ -25,7 +25,9 @@ 买家中心 卖家中心 我的加工 - 金久信学堂 + + 金久信学堂 + 合同管理 订单管理 退出登录 diff --git a/pages.json b/pages.json index 29f2581..7891d5d 100644 --- a/pages.json +++ b/pages.json @@ -1,190 +1,193 @@ { - "pages": [ - { - "path": "pages/index/index", - "style": { - "navigationBarTitleText": "金久信钢城" - } - }, - { - "path": "pages/error/404/404", - "style": { - "navigationBarTitleText": "404" - } - } - ,{ - "path" : "pages/auth/register/register", - "style" : - { + "pages": [ + { + "path": "pages/index/index", + "style": { + "navigationBarTitleText": "金久信钢城" + } + }, + { + "path": "pages/error/404/404", + "style": { + "navigationBarTitleText": "404" + } + }, + { + "path": "pages/auth/register/register", + "style": { "navigationBarTitleText": "注册", "enablePullDownRefresh": false } - - } - ,{ - "path" : "pages/auth/login/login", - "style" : - { + }, + { + "path": "pages/auth/login/login", + "style": { "navigationBarTitleText": "登录", "enablePullDownRefresh": false } - - } - ,{ - "path" : "pages/spot/release/release", - "style" : - { + }, + { + "path": "pages/spot/release/release", + "style": { "navigationBarTitleText": "发布现货", "enablePullDownRefresh": false } - - } - ,{ - "path" : "pages/spot/goods/goods", - "style" : - { + }, + { + "path": "pages/spot/goods/goods", + "style": { "navigationBarTitleText": "现货市场", "enablePullDownRefresh": false } - - } - ,{ - "path" : "pages/user/user", - "style" : - { + }, + { + "path": "pages/spot/goods/my", + "style": { + "navigationBarTitleText": "我发布的现货", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/user/user", + "style": { "navigationBarTitleText": "个人中心", "enablePullDownRefresh": false } - }, { - "path" : "pages/spot/goods/detail", - "style" : - { - "navigationBarTitleText" : "", - "enablePullDownRefresh" : false - } - }, - { - "path" : "pages/company/company", - "style" : - { - "navigationBarTitleText" : "黄页", - "enablePullDownRefresh" : false - } - }, - { - "path" : "pages/enquiry/release", - "style" : - { - "navigationBarTitleText" : "发布询价", - "enablePullDownRefresh" : false - } - }, - { - "path" : "pages/enquiry/list", - "style" : - { - "navigationBarTitleText" : "询价", - "enablePullDownRefresh" : false - } - }, - { - "path" : "pages/enquiry/my", - "style" : - { - "navigationBarTitleText" : "我发布的询价单", - "enablePullDownRefresh" : false - } - }, - { - "path" : "pages/enquiry/detail", - "style" : - { - "navigationBarTitleText" : "报价单详情", - "enablePullDownRefresh" : false - } - }, - { - "path" : "pages/enquiry/quote", - "style" : - { - "navigationBarTitleText" : "填写报价单", - "enablePullDownRefresh" : false - } - }, - { - "path" : "pages/contract/index", - "style" : - { - "navigationBarTitleText" : "合同管理", - "enablePullDownRefresh" : false - } - }, - { - "path" : "pages/process/list", - "style" : - { - "navigationBarTitleText" : "找加工", - "enablePullDownRefresh" : false - } - }, - { - "path" : "pages/process/release", - "style" : - { - "navigationBarTitleText" : "发布找加工", - "enablePullDownRefresh" : false - } - }, - { - "path" : "pages/process/quote", - "style" : - { - "navigationBarTitleText" : "加工报价", - "enablePullDownRefresh" : false - } - }, - { - "path" : "pages/process/detail", - "style" : - { - "navigationBarTitleText" : "加工单详情", - "enablePullDownRefresh" : false - } - }, - { - "path" : "pages/process/my", - "style" : - { - "navigationBarTitleText" : "我的加工单", - "enablePullDownRefresh" : false + "path": "pages/spot/goods/detail", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false } }, { - "path" : "pages/checkout/checkout", - "style" : - { - "navigationBarTitleText" : "", - "enablePullDownRefresh" : false - } + "path": "pages/company/company", + "style": { + "navigationBarTitleText": "黄页", + "enablePullDownRefresh": false + } }, { - "path" : "pages/article/list", - "style" : - { - "navigationBarTitleText" : "金久信学堂", - "enablePullDownRefresh" : false + "path": "pages/enquiry/release", + "style": { + "navigationBarTitleText": "发布询价", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/enquiry/list", + "style": { + "navigationBarTitleText": "询价", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/enquiry/my", + "style": { + "navigationBarTitleText": "我发布的询价单", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/enquiry/detail", + "style": { + "navigationBarTitleText": "报价单详情", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/enquiry/quote", + "style": { + "navigationBarTitleText": "填写报价单", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/contract/index", + "style": { + "navigationBarTitleText": "合同管理", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/process/list", + "style": { + "navigationBarTitleText": "找加工", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/process/release", + "style": { + "navigationBarTitleText": "发布找加工", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/process/quote", + "style": { + "navigationBarTitleText": "加工报价", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/process/detail", + "style": { + "navigationBarTitleText": "加工单详情", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/process/my", + "style": { + "navigationBarTitleText": "我的加工单", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/checkout/checkout", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/article/list", + "style": { + "navigationBarTitleText": "金久信学堂", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/user/school", + "style": { + "navigationBarTitleText": "金久信学堂", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/yellowPage/list", + "style": { + "navigationBarTitleText": "金久信黄页", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/yellowPage/info", + "style": { + "navigationBarTitleText": "详情", + "enablePullDownRefresh": false } } ], - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "金久信钢城", - "navigationStyle": "custom", - // #ifndef MP-ALIPAY - "navigationBarBackgroundColor": "#F8F8F8", - // #endif - "backgroundColor": "#F8F8F8" - } + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "金久信钢城", + "navigationStyle": "custom", + // #ifndef MP-ALIPAY + "navigationBarBackgroundColor": "#F8F8F8", + // #endif + "backgroundColor": "#F8F8F8" + } } diff --git a/pages/article/list.vue b/pages/article/list.vue index 4c280c6..873dbaa 100644 --- a/pages/article/list.vue +++ b/pages/article/list.vue @@ -7,7 +7,7 @@ @@ -107,6 +107,11 @@ export default { }) this.list = rows }, + toMySchool(){ + vk.navigateTo({ + url: '/pages/user/school' + }) + } }, onLoad() { this.getCateList() diff --git a/pages/contract/index.vue b/pages/contract/index.vue index 24a1b25..475f2cd 100644 --- a/pages/contract/index.vue +++ b/pages/contract/index.vue @@ -5,7 +5,7 @@ - + 待创建 @@ -91,7 +91,7 @@ {{item._add_time_str}}到期，到期将无法签署合同 --> - 修改合同内容 @@ -129,6 +129,7 @@ export default { data() { return { pageIndex: 1, + menuIndex: '0', formData: { status: 0, tradeMethod: null @@ -138,12 +139,18 @@ export default { form1: { // 表单请求数据，此处可以设置默认值 data: { - contractId: '' + contractId: '', + signEndDate: '', + title: '', + contractFile: '', + buyerSignKeyword: '', + sellerSignKeyword: '', + otherFile: '', }, // 表单属性 props: { // 表单请求地址 - action: "client/contract/kh/launch", + action: 'client/contract/kh/launch', // 表单字段显示规则 columns: [{ key: "title", @@ -232,11 +239,12 @@ export default { }, methods: { menuSelect(e) { + this.menuIndex = String(e) this.formData.status = Number(e) this.query(1) }, async query(pageIndex) { - const tableData = await vk.callFunction({ + this.tableData = await vk.callFunction({ url: 'client/contract/kh/getList', title: '请求中...', data: { @@ -246,24 +254,38 @@ export default { }, }); - - // tableData.rows.forEach(item => { - - // }) - - this.tableData = tableData }, /** - * @param {Object} item * 创建合同 + * @param contract */ createContract(contract) { this.form1.data.contractId = contract._id + this.form1.props.action = 'client/contract/kh/launch' + this.form1.props.show = true + }, + async changeContract(contract){ + this.form1.data.contractId = contract._id + const res = await vk.callFunction({ + url: 'client/contract/kh/getDetail', + title: '请求中...', + data: { + contractId: contract._id + }, + }); + this.form1.data.signEndDate = res.signEndDate + this.form1.data.title = res.docTitle + this.form1.data.contractFile = res.contractBase + this.form1.data.buyerSignKeyword = res.buyerSignKeyword + this.form1.data.sellerSignKeyword = res.sellerSignKeyword + this.form1.data.otherFile = res.otherFile this.form1.props.show = true }, onFormSuccess() { this.form1.props.show = false this.form1.data.contractId = null + this.formData.status = 1 + this.menuIndex = '1' this.query(1) }, /** diff --git a/pages/enquiry/components/template.vue b/pages/enquiry/components/template.vue index 18ea685..badcd85 100644 --- a/pages/enquiry/components/template.vue +++ b/pages/enquiry/components/template.vue @@ -176,7 +176,7 @@ - diff --git a/pages/enquiry/detail.vue b/pages/enquiry/detail.vue index 9e1b799..a5925ae 100644 --- a/pages/enquiry/detail.vue +++ b/pages/enquiry/detail.vue @@ -26,7 +26,7 @@ {{ - (sheet.quoteList && sheet.quoteList.rows && sheet.quoteList.rows.length > 0) ? sheet.quoteList.rows.length : 0 + (sheet.quoteList && sheet.quoteList.length > 0) ? sheet.quoteList.length : 0 }} 家已报价 @@ -57,10 +57,10 @@ 我要申请加工 + v-if="vk.getVuex('$user.userInfo._id') !== sheet.userId && sheet.status === 0">我要报价 查看收到的申请加工 + v-else-if="vk.getVuex('$user.userInfo._id') === sheet.userId">查看收到的申请报价 @@ -190,13 +190,13 @@ 报价 操作 - + {{ item.subjectName }} {{ item._add_time_str }} {{ item.subjectMobile }} {{ item.totalPrice }}元 - 选择 + 选择 @@ -312,7 +312,7 @@ export default { url: 'client/enquiry/quote/kh/confirmQuote', title: '请求中...', data: { - quoteId: item._id + quoteId: item._id, }, success: (data) => { vk.navigateTo('/pages/contract/index'); @@ -328,7 +328,7 @@ export default { return vk.getVuex('$user.userInfo._id') != this.sheet.userId }, onClick: (item) => { - vk.toast(`${item._id}-按钮1`); + this.showDialog = true } }, ] diff --git a/pages/enquiry/list.vue b/pages/enquiry/list.vue index 42bfa63..40f28e8 100644 --- a/pages/enquiry/list.vue +++ b/pages/enquiry/list.vue @@ -15,7 +15,7 @@ @@ -88,7 +88,7 @@ - + 全部 @@ -115,7 +115,7 @@ @@ -147,11 +147,13 @@ export default { checkCompanyList: [], attributes: [], keyword: '', + queryParam: {}, // 表格相关开始 ----------------------------------------------------------- table1: { // 表格数据请求地址 action: (obj = {}) => { let {data, success, fail, complete} = obj; + console.log(data) vk.callFunction({ url: `client/enquiry/sheet/pub/getList`, data: data, @@ -265,7 +267,7 @@ export default { // 表格相关结束 ----------------------------------------------------------- }; }, - onLoad() { + onShow() { // this.search(1) vk.callFunction({ url: 'client/spot/category/pub/getTree', @@ -318,13 +320,13 @@ export default { const {userInfo} = await vk.callFunction({ url: 'user/kh/getMyUserInfo' }) - if (!userInfo.fadadaConfirm && userInfo.authStatus === 1) { + if (!userInfo.fadadaConfirm || [-1, 2].includes(userInfo.authStatus)) { this.$confirm('您尚未认证, 是否前往认证?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { - this.getCertUrl() + vk.navigateTo({url: '/pages/user/user?menu=fadada'}); }) } else if (vk.pubfn.isNull(userInfo.businessCard)) { this.$confirm('请完善名片信息', '提示', { @@ -332,7 +334,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - vk.navigateTo('/pages/user/user?menu=business-card'); + vk.navigateTo({url: '/pages/user/user?menu=business-card'}); }) } else { vk.navigateTo({ @@ -345,30 +347,18 @@ export default { search(pageIndex) { const categoryIds = [] this.checkCategoryList.forEach(item => { - item.forEach(sitem => { - categoryIds.push(sitem._id) - }) + // console.log(item) + // item.forEach(sitem => { + // categoryIds.push(sitem._id) + // }) + categoryIds.push(item) }) - - let provinceCodes = this.checkProvinceList.map(item => item.code) - - if (provinceCodes.includes(9999)) { - provinceCodes = [] + this.queryParam.formData = { + keyword: this.keyword, + companyList: this.checkCompanyList, + categoryIds } - - vk.callFunction({ - url: 'client/enquiry/sheet/pub/getList', - data: { - pageIndex: pageIndex, - pageSize: 20, - keyword: this.keyword, - }, - success: (data) => { - console.log('data: ', data); - - this.goodsData = data - } - }); + this.$refs.table1.search() }, getAttributes() { vk.callFunction({ diff --git a/pages/enquiry/my.vue b/pages/enquiry/my.vue index b45c2f9..e7e1f3d 100644 --- a/pages/enquiry/my.vue +++ b/pages/enquiry/my.vue @@ -15,7 +15,7 @@ diff --git a/pages/enquiry/quote.vue b/pages/enquiry/quote.vue index 43b3fe3..ca8ab38 100644 --- a/pages/enquiry/quote.vue +++ b/pages/enquiry/quote.vue @@ -51,7 +51,7 @@ export default { action: "client/enquiry/quote/kh/addQuote", // 表单字段显示规则 columns: [ - {key: "totalPrice", title: "货款总价", type: "money"}, + {key: "totalPrice", title: "货款总价", type: "number"}, {key: "totalPriceStr", title: "人民币大写", type: "text"}, {key: "remark", title: "报价单详情", type: "editor"}, ], @@ -97,7 +97,7 @@ export default { }, methods: { onFormSuccess() { - + vk.navigateBack() }, // 提交报价单 async submit() { diff --git a/pages/index/index.vue b/pages/index/index.vue index 1b0c95c..bc96e38 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -9,7 +9,7 @@ @@ -66,8 +66,9 @@