报价中
@@ -101,18 +102,20 @@
-
+
{{ item.name }}
库存：{{ item.stock }}吨
供货地：{{ item.addressStr }}
-
-
-
+
+
+
{{ item.user.person.personName }}
{{ item.user.company.companyName }}
- 立即查看
@@ -274,18 +277,17 @@ export default {
}
.goods-list {
-
display: flex;
-
+ flex-wrap: wrap;
}
.goods {
- width: 217px;
+ width: 200px;
//height: 280px;
background-color: #FFFFFF;
box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.05);
text-align: center;
- margin-right: 20px;
+ //margin-right: 25px;
margin-bottom: 25px;
padding: 10px 20px;
@@ -295,6 +297,9 @@ export default {
height: 62px;
padding-top: 20px;
font-weight: bold;
+ text-overflow: ellipsis;
+ -o-text-overflow: ellipsis;
+ -webkit-line-clamp: 2;
}
&-stock {
@@ -308,7 +313,7 @@ export default {
}
&-image {
- width: 200px;
+ width: 100%;
height: 70px;
margin: 0 auto;
@@ -338,9 +343,6 @@ export default {
cursor: pointer;
}
- .goods-image {
- width: 100%;
- }
.goods-address {
color: gray;
diff --git a/pages/process/detail.vue b/pages/process/detail.vue
index 8589b3a..97f7eea 100644
--- a/pages/process/detail.vue
+++ b/pages/process/detail.vue
@@ -20,15 +20,15 @@
+ v-if="info.answerEndTime && dayjs().diff(dayjs(info.answerEndTime), 'second') < 0">
距离加工结束还有：
{{
- dayjs().diff(dayjs(info.answerEndTime), 'day')
+ dayjs(info.answerEndTime).diff(dayjs(), 'day')
}}
天
- {{ (dayjs().diff(dayjs(info.answerEndTime), 'hour')) % 24 }}
+ {{ (dayjs(info.answerEndTime).diff(dayjs(), 'hour')) % 24 }}
时
@@ -41,10 +41,10 @@
我要申请加工
+ v-if="vk.getVuex('$user.userInfo._id') !== info.userId && info.status === 0">我要申请加工
查看收到的申请加工
+ v-else-if="vk.getVuex('$user.userInfo._id') === info.userId">查看收到的申请加工
@@ -170,7 +170,7 @@
收到的加工申请
关闭
-
+
@@ -225,14 +225,15 @@ export default {
toQuote() {
vk.navigateTo(`/pages/process/quote?sheetId=${this.id}`)
},
- createContract({totalPrice, uid}) {
+ createContract({totalPrice, uid, _id}) {
vk.callFunction({
url: 'client/contract/kh/add',
data: {
type: 'process',
productTitle: this.info.title,
transactionId: vk.pubfn.createOrderNo("P", 20),
- quoteId: this.id,
+ sheetId: this.id,
+ quoteId: _id,
buyer: vk.getVuex('$user.userInfo._id'),
seller: uid,
amount: totalPrice,
diff --git a/pages/process/list.vue b/pages/process/list.vue
index df1f57b..f2b9bfe 100644
--- a/pages/process/list.vue
+++ b/pages/process/list.vue
@@ -15,7 +15,7 @@
@@ -70,7 +70,7 @@
-
+
全部
@@ -97,8 +97,12 @@
+ :customRightBtns="table1.customRightBtns" :query-form-param="queryParam"
+ :pagination="true">
+
+ {{ vk.getVuex('$user.userInfo._id') === row.userId ? '查看' : '申请加工' }}
+
+
@@ -126,6 +130,7 @@ export default {
checkCategoryList: [],
showAllCompany: false,
keyword: '',
+ queryParam: {},
// 表格相关开始 -----------------------------------------------------------
table1: {
// 表格数据请求地址
@@ -150,16 +155,16 @@ export default {
}
})
},
- customRightBtns: [{
- title: '申请加工',
- // icon: 'el-icon-search',
- type: 'primary',
- plain: true,
- onClick: ({_id}) => {
- this.toDetail(_id)
- // vk.navigateTo('/pages/process/detail?id=' + item._id);
- }
- },],
+ // customRightBtns: [{
+ // title: vk.getVuex('$user.userInfo._id') '申请加工',
+ // // icon: 'el-icon-search',
+ // type: 'primary',
+ // plain: true,
+ // onClick: ({_id}) => {
+ // this.toDetail(_id)
+ // // vk.navigateTo('/pages/process/detail?id=' + item._id);
+ // }
+ // },],
// 表格字段显示规则
columns: [
{
@@ -178,23 +183,23 @@ export default {
// return val.map(item=>item.procureNumber + item.procureUnit).join("/")
// }
},
- {
- key: "productList",
- title: "收货地",
- type: "text",
- formatter: (val, row, column, index) => {
- let str = ""
- try {
- str = val.map(item => {
- const addressStr = item.address.region.province.name + "-" + item.address.region.city.name + "-" + item.address.region.area.name
- return addressStr
- }).join("/")
- } catch (err) {
- str = ""
- }
- return str
- }
- },
+ // {
+ // key: "productList",
+ // title: "收货地",
+ // type: "text",
+ // formatter: (val, row, column, index) => {
+ // let str = ""
+ // try {
+ // str = val.map(item => {
+ // const addressStr = item.address.region.province.name + "-" + item.address.region.city.name + "-" + item.address.region.area.name
+ // return addressStr
+ // }).join("/")
+ // } catch (err) {
+ // str = ""
+ // }
+ // return str
+ // }
+ // },
{
key: "user",
title: "采购企业",
@@ -220,7 +225,9 @@ export default {
title: "发布时间",
type: "time",
},
-
+ {
+ key: "action", title: "操作", type: "html"
+ },
],
// 多选框选中的值
multipleSelection: [],
@@ -296,13 +303,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('请完善名片信息', '提示', {
@@ -310,7 +317,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({
@@ -328,7 +335,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
- this.getCertUrl()
+ vk.navigateTo({url: '/pages/user/user?menu=fadada'});
})
} else if (vk.pubfn.isNull(userInfo.businessCard)) {
this.$confirm('请完善名片信息', '提示', {
@@ -352,25 +359,26 @@ export default {
})
})
- let provinceCodes = this.checkProvinceList.map(item => item.code)
-
- if (provinceCodes.includes(9999)) {
- provinceCodes = []
+ this.queryParam.formData = {
+ keyword: this.keyword,
+ companyList: this.checkCompanyList,
+ categoryIds
}
+ this.$refs.table1.search()
- vk.callFunction({
- url: 'client/process/sheet/pub/getList',
- data: {
- pageIndex: pageIndex,
- pageSize: 20,
- keyword: this.keyword,
- },
- success: (data) => {
- console.log('data: ', data);
-
- this.goodsData = data
- }
- });
+ // vk.callFunction({
+ // url: 'client/process/sheet/pub/getList',
+ // data: {
+ // pageIndex: pageIndex,
+ // pageSize: 20,
+ // keyword: this.keyword,
+ // },
+ // success: (data) => {
+ // console.log('data: ', data);
+ //
+ // this.goodsData = data
+ // }
+ // });
},
getCertUrl() {
vk.callFunction({
diff --git a/pages/process/my.vue b/pages/process/my.vue
index 95d3213..ce9364b 100644
--- a/pages/process/my.vue
+++ b/pages/process/my.vue
@@ -15,7 +15,7 @@
diff --git a/pages/process/quote.vue b/pages/process/quote.vue
index 7431d41..cc90699 100644
--- a/pages/process/quote.vue
+++ b/pages/process/quote.vue
@@ -51,7 +51,7 @@ export default {
action: "client/process/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/process/release.vue b/pages/process/release.vue
index 6f3a42a..d284ae1 100644
--- a/pages/process/release.vue
+++ b/pages/process/release.vue
@@ -59,15 +59,11 @@
-
-
-
-
-
-
-
-
+
+
+
+
@@ -114,13 +110,17 @@
开票时间：
- {{ item }}
+ {{ item }}
+
发票种类：
- {{ item }}
+ {{
+ item
+ }}
+
其他要求：
diff --git a/pages/spot/goods/detail.vue b/pages/spot/goods/detail.vue
index 44556dc..f626c38 100644
--- a/pages/spot/goods/detail.vue
+++ b/pages/spot/goods/detail.vue
@@ -1,497 +1,593 @@
-
-
-
-
+
+
+
+
-
-
- 首页
-
- 现货市场
-
- {{product.name}}
-
-
+
+
+ 首页
+
+ 现货市场
+
+ {{ product.name }}
+
+
-
-
-
-
-
-
现货详情
-
- {{product.user.person.personName}}
-
- {{product.user.company.companyName}}
-
- 库存：{{product.stock}}吨
-
- 供货地：{{product.address.province.name + "-" + product.address.city.name + "-" + product.address.area.name}}
-
-
+
+
+
现货详情
+
+ {{ product.user.person.personName }}
+
+ {{ product.user.company.companyName }}
+
+ 库存：{{ product.stock }}吨
+
+ 供货地：{{ product.address.province.name + "-" + product.address.city.name + "-" + product.address.area.name }}
+
+
-
-
-
附件
-
-
-
+
+
+
附件
+
+
+
-
-
-
已收到的合作申请
-
-
-
-
+
+
+
已收到的合作申请
+
+
+
+
-
-
-
-
+
+
+ 收到的申请合作列表
+ 关闭
+
+
+
+
+ {{
+ item.user.accountType === 1 ? item.user.person.personName : item.user.company.companyName
+ }}
+
+ {{ item._add_time_str }}
+
+ {{ item.user.accountType === 1 ? item.user.person.mobile : item.user.company.mobile }}
+
+
+ 查看申请详情
+
+
+
+
-
+
+
+
+
+
+
+
+ 关闭
+
+
+
+
\ No newline at end of file
diff --git a/pages/spot/goods/goods.vue b/pages/spot/goods/goods.vue
index 6808333..c067c69 100644
--- a/pages/spot/goods/goods.vue
+++ b/pages/spot/goods/goods.vue
@@ -22,7 +22,8 @@
发布现货
- 我发布的现货
+ 我发布的现货
+
@@ -94,13 +95,14 @@
-
+
{{ item.name }}
现货库存：{{ item.stock }}吨
供货地：{{ item.addressStr }}
-
-
-
+
+
+
{{ item.user.person.personName }}
{{ item.user.company.companyName }}
-
+
@@ -142,7 +144,7 @@ export default {
showAllProvince: false
};
},
- onLoad() {
+ onShow() {
this.search(1)
vk.callFunction({
url: 'client/spot/category/pub/getTree',
@@ -179,13 +181,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('请完善名片信息', '提示', {
@@ -315,6 +317,7 @@ export default {
width: 1200px;
margin: 20px auto;
display: flex;
+ flex-wrap: wrap;
}
diff --git a/pages/spot/goods/my.vue b/pages/spot/goods/my.vue
new file mode 100644
index 0000000..17f1d70
--- /dev/null
+++ b/pages/spot/goods/my.vue
@@ -0,0 +1,219 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 发布现货
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/spot/release/release.vue b/pages/spot/release/release.vue
index 43865e0..cf01bcb 100644
--- a/pages/spot/release/release.vue
+++ b/pages/spot/release/release.vue
@@ -160,7 +160,9 @@
});
},
methods: {
- onFormSuccess() {}
+ onFormSuccess() {
+ vk.navigateBack()
+ }
}
}
diff --git a/pages/user/components/business-card.vue b/pages/user/components/business-card.vue
index f970aff..c744c78 100644
--- a/pages/user/components/business-card.vue
+++ b/pages/user/components/business-card.vue
@@ -56,6 +56,16 @@
title: "职位",
type: "text"
},
+ {
+ key: "phone",
+ title: "联系电话",
+ type: "text"
+ },
+ {
+ key: "mobile",
+ title: "联系电话",
+ type: "text"
+ },
{
key: "address",
title: "地区",
@@ -165,7 +175,8 @@
// 是否显示表单1 的弹窗
show: false,
beforeAction: (formData) => {
- vk.userCenter.updateUser({
+ vk.callFunction({
+ url: 'client/user/kh/addAuth',
data: {
businessCard: formData
},
diff --git a/pages/user/components/personal.vue b/pages/user/components/personal.vue
index f3e8bdd..4a0038e 100644
--- a/pages/user/components/personal.vue
+++ b/pages/user/components/personal.vue
@@ -8,12 +8,25 @@
个人认证
企业认证
-
- 您还未提交您的个人资料
- 您还未提交您的企业资料
+
+
+ 您还未提交您的个人资料
+ 您还未提交您的企业资料
+
+
+ 审核中
+
+
+ 审核不通过:{{ form1.data.refuseReason }}
+