-
-
- +
-
- 螺纹钢、高线 + {{item.name}}
+
-
+
+
-
+
-
+
卖家中心
我的加工
金久信学堂
- 合同管理
+ 合同管理
订单管理
退出登录
@@ -104,6 +104,8 @@
handleCommand(e) {
if (e == 'logout') {
this.logout()
+ }else if(e == 'contract') {
+ vk.navigateTo('/pages/contract/index');
}
},
logout() {
diff --git a/main.js b/main.js
index f379376..7015558 100644
--- a/main.js
+++ b/main.js
@@ -1,7 +1,4 @@
-
-
-
import Vue from 'vue'
import App from './App'
import store from './store'
diff --git a/pages.json b/pages.json
index 6d60585..0569899 100644
--- a/pages.json
+++ b/pages.json
@@ -88,7 +88,39 @@
"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
+ }
+ }
],
"globalStyle": {
"navigationBarTextStyle": "black",
diff --git a/pages/auth/login/login.vue b/pages/auth/login/login.vue
index a9ab763..50844c0 100644
--- a/pages/auth/login/login.vue
+++ b/pages/auth/login/login.vue
@@ -171,9 +171,9 @@
timeS = 60
timer = setInterval(() => {
timeS--
- if (timeS == 0) {
- this.stopTimer()
+ if (timeS <= 0) {
this.smsTips = "重新发送"
+ this.stopTimer()
} else {
this.smsTips = timeS + "秒"
}
@@ -196,7 +196,10 @@
}
},
onUnload() {
- this.stopTimer()
+ if (timer != null) {
+ clearInterval(timer)
+ timer = null
+ }
}
}
diff --git a/pages/auth/register/register.vue b/pages/auth/register/register.vue
index d906166..7d0e5e9 100644
--- a/pages/auth/register/register.vue
+++ b/pages/auth/register/register.vue
@@ -54,7 +54,20 @@
-
+
+ 
+ src="/static/images/lg1.png">
+ src="/static/images/lg13.png">
+ src="/static/images/lg2.png">
+ src="/static/images/lg3.png">
+ src="/static/images/lg14.png">
+ src="/static/images/lg6.png">
+ src="/static/images/lg15.png">
+ src="/static/images/lg5.png">
+ src="/static/images/lg4.png">
+ src="/static/images/lg7.png">
+ src="/static/images/lg8.png">
+ src="/static/images/lg9.png">
+ src="/static/images/lg12.png">
+ src="/static/images/lg11.png">
+ src="/static/images/lg10.png">
- 
@@ -299,12 +299,29 @@
+
+
\ No newline at end of file
diff --git a/components/top-bar/top-bar.vue b/components/top-bar/top-bar.vue
index 642dc70..ce4bd46 100644
--- a/components/top-bar/top-bar.vue
+++ b/components/top-bar/top-bar.vue
@@ -26,7 +26,7 @@
金久信
微信公众号
- 
+
+
+
+
+
+
+
+
+
+
+
@@ -103,6 +116,12 @@
password: '',
repassword: '',
inviteCode: '',
+ person: {
+ personName: ''
+ },
+ company: {
+ companyName: ''
+ }
}
};
},
@@ -125,9 +144,9 @@
timeS = 60
timer = setInterval(() => {
timeS--
- if (timeS == 0) {
- this.stopTimer()
+ if (timeS <= 0) {
this.smsTips = "重新发送"
+ this.stopTimer()
} else {
this.smsTips = timeS + "秒"
}
@@ -146,7 +165,9 @@
password, // 密码 6-20位
repassword, // 重复输入密码
inviteCode, // 邀请码
- accountType
+ accountType,
+ company,
+ person
} = this.form1
vk.userCenter.loginBySms({
@@ -156,7 +177,10 @@
code: smsCode,
password,
inviteCode,
- accountType
+ accountType,
+ company,
+ person
+
},
success: (data) => {
uni.reLaunch({
@@ -175,6 +199,9 @@
password, // 密码 6-20位
repassword, // 重复输入密码
inviteCode, // 邀请码
+ accountType,
+ company,
+ person
} = this.form1;
// 手机号验证
@@ -218,14 +245,39 @@
return false
// 处理错误逻辑
}
+
+ if(accountType == 1 && !person.personName) {
+ this.$message({
+ message: '请输入姓名',
+ type: 'error'
+ })
+ return false
+ }
+
+ if(accountType == 2 && !company.companyName) {
+ this.$message({
+ message: '请输入公司名称',
+ type: 'error'
+ })
+ return false
+ }
+
return true
- }
+ },
+ stopTimer() {
+ if (timer != null) {
+ clearInterval(timer)
+ timer = null
+ }
+
+ },
},
onUnload() {
if (timer != null) {
clearInterval(timer)
+ timer = null
}
}
}
diff --git a/pages/company/company.vue b/pages/company/company.vue
index c4b48f5..ddd6326 100644
--- a/pages/company/company.vue
+++ b/pages/company/company.vue
@@ -13,6 +13,21 @@
{{product.name}}
+
+
+
+
+
+ 地址：
+ 电话：
+ 邮箱
+ 网址
+
+
+
+
+
+
+
+
+
+
+ 待创建
+
+
+
+ 待签署
+
+
+
+ 已完成
+
+
+
+ 已作废
+
+
+
+
+
+
+ 自主交易
+ 金久信公正
+
+
+
+
+ 询价单
+
+ {{item.contract.productTitle}}
+
+
+ 待创建
+
+
+ 待交易方签署
+ 待我签署
+
+
+ 已作废
+
+
+
+ 交易编码：{{item.contract.transactionId}} 创建时间：{{item.contract._add_time_str}}
+
+
+ 查看交易方
+ 创建合同
+ 签署合同
+ 查看合同
+
+
+
+
+
+ 修改合同内容
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/enquiry/components/template.vue b/pages/enquiry/components/template.vue
index 4e4c576..21dd475 100644
--- a/pages/enquiry/components/template.vue
+++ b/pages/enquiry/components/template.vue
@@ -1,7 +1,7 @@
-
@@ -33,6 +33,8 @@
data() {
return {
title: '商品',
+ attributesLoaded: false,
+ attributes: [],
// 表单相关开始-----------------------------------------------------------
form1: {
// 表单请求数据，此处可以设置默认值
@@ -58,26 +60,34 @@
},
props: {
list: "rows",
- value: "_id",
+ value: "name",
label: "name"
},
watch: (res) => {
const {
option
} = res
- this.form1.props.columns[2].columns = option.extraAttributes.map((item, index) => {
- return {
- key: index,
- title: item.lable,
- type: "select",
- data: item.values.map(citem => {
- return {
- value: JSON.stringify({keyName: item.lable,keyValue: citem}),
- label: citem
- }
- })
- }
- })
+ console.log(option);
+ if(option.extraAttributes) {
+ this.form1.props.columns[2].columns = option.extraAttributes.map((item, index) => {
+ return {
+ key: index,
+ title: item.label,
+ type: "select",
+ allowCreate: true,
+ filterable: true,
+ data: item.values.map(citem => {
+ return {
+ value: JSON.stringify({keyName: item.lable,keyValue: citem}),
+ label: citem
+ }
+ })
+ }
+ })
+ }else {
+ this.form1.props.columns[2].columns = []
+ }
+
}
@@ -93,15 +103,159 @@
],
},
{
- key: "attributes",
- title: "固定属性",
- type: "object",
- // justify: "start",
+ key: "",
+ title: "",
+ type: "group",
+ justify: "start",
+ showLabel: false,
+ columns: [
+ {
+ key: "brand",
+ title: "品牌厂家",
+ type: "select",
+ showAll: true,
+ allowCreate: true,
+ filterable: true,
+ data: () => {
+ const row = this.attributes.find(item => item.label == '品牌厂家')
+ if(row) {
+ return row.options
+ }
+ return [];
+ }
+
+ },
+
+ {
+ key: "materialQuality",
+ title: "材质",
+ type: "select",
+ showAll: true,
+ allowCreate: true,
+ filterable: true,
+ data: () => {
+ const row = this.attributes.find(item => item.label == '材质')
+ if(row) {
+ return row.options
+ }
+ return [];
+ }
+
+ },
+ ],
+ },
+ {
+ key: "",
+ title: "",
+ type: "group",
+ justify: "start",
+ showLabel: false,
+ columns: [
+ {
+ key: "singleLength",
+ title: "单件长度",
+ type: "select",
+ showAll: true,
+ allowCreate: true,
+ filterable: true,
+ data: () => {
+ const row = this.attributes.find(item => item.label == '单件长度')
+ if(row) {
+ return row.options
+ }
+ return [];
+ }
+
+ },
+ {
+ key: "productStandard",
+ title: "产品标准",
+ type: "select",
+ showAll: true,
+ allowCreate: true,
+ filterable: true,
+ data: () => {
+ const row = this.attributes.find(item => item.label == '产品标准')
+ if(row) {
+ return row.options
+ }
+ return [];
+ }
+
+ },
+ ],
+ },
+ {
+ key: "",
+ title: "",
+ type: "group",
+ justify: "start",
showLabel: false,
columns: [
+ {
+ key: "pricingForm",
+ title: "计价形式",
+ type: "select",
+ showAll: true,
+ allowCreate: true,
+ filterable: true,
+ data: () => {
+ const row = this.attributes.find(item => item.label == '计价形式')
+ if(row) {
+ return row.options
+ }
+ return [];
+ }
+
+ },
+ {
+ key: "processStandard",
+ title: "加工标准",
+ type: "select",
+ showAll: true,
+ allowCreate: true,
+ filterable: true,
+ data: () => {
+ const row = this.attributes.find(item => item.label == '加工标准')
+ if(row) {
+ return row.options
+ }
+ return [];
+ }
+
+ },
],
},
+ {
+ key: "",
+ title: "",
+ type: "group",
+ justify: "start",
+ showLabel: false,
+ columns: [
+ {
+ key: "deliveryService",
+ title: "交货服务",
+ type: "select",
+ showAll: true,
+ allowCreate: true,
+ filterable: true,
+ data: () => {
+ const row = this.attributes.find(item => item.label == '交货服务')
+ if(row) {
+ return row.options
+ }
+ return [];
+ }
+
+ },
+ {key: "deliveryTime", title: "交货时限", type: "date",},
+ ]
+
+ },
+
+
{
key: "",title: "",type: 'group',showLabel: false, justify: "start",columns:
[
@@ -109,18 +263,24 @@
{
key: "procureUnit",
title: "单位",
- type: "remote-select",
+ type: "select",
showAll: true,
- action: "client/enquiry/attributes/pub/getOne",
- actionData: {
- label: '单位',
- },
+ allowCreate: true,
+ filterable: true,
+ data: () => {
+ const row = this.attributes.find(item => item.label == '单位')
+ if(row) {
+ return row.options
+ }
+ return [];
+ }
+
},
]
},
- {key: "deliveryTime", title: "交货时限", type: "date",},
+
{
key: "address",
title: "交货地点",
@@ -157,6 +317,18 @@
},
created() {
this.form1.props.columns[0].title = '商品' + (this.productIndex + 1)
+
+ vk.callFunction({
+ url: 'client/enquiry/attributes/pub/getList',
+ title: '请求中...',
+ data: {
+
+ },
+ success: (data) => {
+ this.attributes = data.rows
+ this.attributesLoaded = true
+ }
+ });
},
methods: {
diff --git a/pages/enquiry/detail.vue b/pages/enquiry/detail.vue
new file mode 100644
index 0000000..a55b3d5
--- /dev/null
+++ b/pages/enquiry/detail.vue
@@ -0,0 +1,350 @@
+
+
+
+
+ 首页
+
+ 询价单
+
+ 询价单详情
+
+
+
+
+
+
+ 采购商信息 (已有{{sheet.answerCount || 0}}家报价)
+
+
+ 距离报价结束还剩{{vk.pubfn.dateDiff2(sheet.answerTime)}}
+ 我要报价
+
+
+ {{sheet.user.person.personName}}
+ {{sheet.user.company.companyName}}
+
+
+ {{sheet.user.person.mobile}}
+ {{sheet.user.company.companyName}}
+
+
+ {{sheet._add_time_str}}
+
+
+
+
+
+
+ {{item.name}}
+
+
+ {{attr.keyValue}}
+
+
+ {{item.brand}}
+
+
+
+ {{item.materialQuality}}
+
+
+ {{item.singleLength}}
+
+
+ {{item.productStandard}}
+
+
+ {{item.pricingForm}}
+
+
+ {{item.processStandard}}
+
+
+ {{item.deliveryService}}
+
+
+ {{item.deliveryTime}}
+
+
+ {{item.procureNumber}}{{item.procureUnit}}
+
+
+ {{item.address.region.province.name + "-" + item.address.region.city.name + "-" + item.address.region.area.name}}
+
+
+
+
+
+ {{sheet.remark || '无'}}
+
+
+
+
+
+ {{sheet.invoice? '含税': '不含税'}}
+
+
+ {{sheet.nvoiceType}}
+
+
+ {{sheet.writeInvoiceTime}}
+
+
+
+
+
+ {{sheet.transportDocuments.join("、")}}
+
+
+ {{sheet.otherTransportDocuments}}
+
+
+ {{sheet.transportLimit}}
+
+
+
+
+
+ 自主交易
+ 金久信公正
+
+
+
+ 预付{{sheet.advancePayRate}}%货到付全款
+ 货到验收后付款
+ 提货付全款
+ 信誉采购
+ {{item.otherPayMethod}}
+
+
+
+ {{vk.pubfn.timeFormat(sheet.answerTime,"yyyy-MM-dd hh:mm:ss")}}
+
+
+ {{sheet.earnestMoney}}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/enquiry/list.vue b/pages/enquiry/list.vue
index caff475..86ddccf 100644
--- a/pages/enquiry/list.vue
+++ b/pages/enquiry/list.vue
@@ -22,61 +22,19 @@
发布询价单
- 我发布的询价单
+ 我发布的询价单
-
-
-
-
-
-
-
-
-
-
-
-
- {{citem.name}}
-
-
-
-
-
-
-
-
- {{citem.name}}
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -89,37 +47,101 @@
export default {
data() {
return {
- categoryTreeData: [],
- provinceData: provinces,
- checkCategoryList: [],
- checkProvinceList: [],
keyword: '',
- goodsData: {
- total: 0,
- rows: []
- }
+ // 表格相关开始 -----------------------------------------------------------
+ table1: {
+ // 表格数据请求地址
+ action: "client/enquiry/sheet/pub/getList",
+ customRightBtns: [{
+ title: '详情',
+ icon: 'el-icon-search',
+ type: 'primary',
+ onClick: (item) => {
+ vk.navigateTo('/pages/enquiry/detail?id=' + item._id);
+ }
+ }, ],
+ // 表格字段显示规则
+ columns: [
+ {
+ key: "productList",
+ title: "品名/材质",
+ type: "text",
+ width: 280,
+ formatter: (val, row, column, index) => {
+ return val.map(item=>item.name).join("/")
+ }
+ },
+ {
+ key: "productList",
+ title: "采购量",
+ type: "text",
+ width: 280,
+ formatter: (val, row, column, index) => {
+ return val.map(item=>item.procureNumber + item.procureUnit).join("/")
+ }
+ },
+ {
+ key: "productList",
+ title: "收货地",
+ type: "text",
+ minWidth: 200,
+ 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: "采购单位",
+ type: "text",
+ width: 280,
+ formatter: (val, row, column, index) => {
+ if(val.accountType == 1) {
+ return val.person.personName
+ }else {
+ return val.company.companyName
+ }
+ }
+
+ },
+ // {
+ // key: "_add_time",
+ // title: "添加时间",
+ // type: "time",
+ // width: 160
+ // },
+
+ ],
+ // 多选框选中的值
+ multipleSelection: [],
+ // 当前高亮的记录
+ selectItem: "",
+ },
+ // 表格相关结束 -----------------------------------------------------------
};
},
onLoad() {
- this.search(1)
- vk.callFunction({
- url: 'client/spot/category/pub/getTree',
- title: '请求中...',
- data: {
+ // this.search(1)
- },
- success: (data) => {
- this.categoryTreeData = data.rows
- for (var i = 0; i < data.rows.length; i++) {
- this.checkCategoryList.push([])
- }
- }
- });
},
methods: {
+ toMyEnquiry() {
+ vk.navigateTo({
+ url: '/pages/enquiry/my'
+ })
+ },
toRelease() {
-
+
if (!vk.getVuex('$user.userInfo.fadadaConfirm')) {
this.$confirm('您尚未认证, 是否前往认证?', '提示', {
confirmButtonText: '确定',
@@ -128,7 +150,7 @@
}).then(() => {
this.getCertUrl()
})
- }else if(vk.pubfn.isNull(vk.getVuex('$user.userInfo.businessCard'))) {
+ } else if (vk.pubfn.isNull(vk.getVuex('$user.userInfo.businessCard'))) {
this.$confirm('请完善名片信息', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -136,15 +158,15 @@
}).then(() => {
vk.navigateTo('/pages/user/user?menu=business-card');
})
- }else {
- uni.navigateTo({
+ } else {
+ vk.navigateTo({
url: '/pages/enquiry/release'
})
}
-
-
-
-
+
+
+
+
},
search(pageIndex) {
const categoryIds = []
@@ -161,24 +183,15 @@
}
vk.callFunction({
- url: 'client/spot/goods/pub/getList',
+ url: 'client/enquiry/sheet/pub/getList',
data: {
pageIndex: pageIndex,
pageSize: 20,
keyword: this.keyword,
- categoryIds: categoryIds,
- provinceCodes: provinceCodes
-
},
success: (data) => {
- console.log('data: ',data);
- data.rows.forEach(item => {
- try {
- item.addressStr = item.address.province.name + "-" + item.address.city.name + "-" + item.address.area.name
- } catch(err){
- item.addressStr = ""
- }
- })
+ console.log('data: ', data);
+
this.goodsData = data
}
});
@@ -187,6 +200,7 @@
computed: {
checkCategoryArr() {
let arr = []
+
this.checkCategoryList.forEach(item => {
arr.push(...item)
})
@@ -196,6 +210,7 @@
...item
})
})
+
return arr
}
@@ -233,22 +248,22 @@
margin-right: 10px;
}
}
-
-
- .goods-list {
+
+
+ .sheet-list {
width: 1200px;
margin: 20px auto;
- display: flex;
-
+ // display: flex;
+
}
-
-
-
- .paginatio{
+
+
+
+ .paginatio {
float: none;
width: 1200px;
margin: 20px auto;
display: flex;
justify-content: center;
}
-
+
\ No newline at end of file
diff --git a/pages/enquiry/my.vue b/pages/enquiry/my.vue
new file mode 100644
index 0000000..720da36
--- /dev/null
+++ b/pages/enquiry/my.vue
@@ -0,0 +1,241 @@
+
+
+
+
+
+
+
+
+
+ 发布询价单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/enquiry/quote.vue b/pages/enquiry/quote.vue
new file mode 100644
index 0000000..28c1dbc
--- /dev/null
+++ b/pages/enquiry/quote.vue
@@ -0,0 +1,228 @@
+
+
+
+
+ 首页
+
+ 询价单
+
+ 填写报价信息
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+ {{attr.keyValue}}
+
+
+ {{item.brand}}
+
+
+
+ {{item.materialQuality}}
+
+
+ {{item.singleLength}}
+
+
+ {{item.productStandard}}
+
+
+ {{item.pricingForm}}
+
+
+ {{item.processStandard}}
+
+
+ {{item.deliveryService}}
+
+
+ {{item.deliveryTime}}
+
+
+ {{item.procureNumber}}{{item.procureUnit}}
+
+
+ {{item.address.region.province.name + "-" + item.address.region.city.name + "-" + item.address.region.area.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提交报价单
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/enquiry/release.vue b/pages/enquiry/release.vue
index 9c62d68..bceacab 100644
--- a/pages/enquiry/release.vue
+++ b/pages/enquiry/release.vue
@@ -30,9 +30,13 @@
+ @success="onFormSuccess" :footer-show="false">
+
+ 保存草稿
+ 提交询价单
+
@@ -110,16 +114,16 @@
title: "运输限制",
type: "text",
},
- {key: "", title: "交易模式", type: "bar-title", component: 'custom-form-section'},
+ {key: "", title: "交易说明", type: "bar-title", component: 'custom-form-section'},
{key: "tradeMethod",
title: "交易模式",
type: "radio",
data: [
- { value: '自主交易', label: "自主交易" },
- { value: '金久信公证', label: "金久信公证" },
+ { value: 1, label: "自主交易" },
+ { value: 0, label: "金久信公证" },
],
},
- {key: "", title: "交易说明", type: "bar-title"},
+ // {key: "", title: "交易说明", type: "bar-title"},
{
key: "payMethod",
title: "付款方式",
@@ -199,6 +203,13 @@
},
addProduct() {
this.productList.push({})
+ },
+ onFormSuccess() {
+ vk.navigateTo('/pages/enquiry/list');
+ },
+ submit() {
+
+ this.$refs.form1.submitForm()
}
}
@@ -231,4 +242,12 @@
padding-left: 140px;
margin: 0 0 20px 0;
}
+ .form-footer {
+ height: 40px;
+ line-height: 40px;
+ background: #fff;
+ padding-top: 0;
+ text-align: center;
+ display: block;
+ }
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index efccd04..19dd059 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,8 +2,124 @@
+
+
+
+
+
+
+
+
+ 最新询价信息
+
+
+
+
+
+
+
+ 现货市场
+
+
+
+ {{item.name}}
+ 库存：{{item.stock}}吨
+ 供货地：{{item.addressStr}}
+
+
+ {{item.user.person.personName}}
+ {{item.user.company.companyName}}
+
+ 立即查看
+
+
+
+ 查看更多
+
+
+
+
+
@@ -15,14 +131,16 @@
// 页面数据变量
return {
// init请求返回的数据
- data:{
-
+ spotGoodsData: [],
+ enquirySheetData: [],
+ data: {
+
},
// 表单请求数据
- form1:{
-
+ form1: {
+
},
- scrollTop:0,
+ scrollTop: 0,
}
},
onPageScroll(e) {
@@ -35,42 +153,178 @@
this.init(options);
},
// 监听 - 页面【首次渲染完成时】执行。注意如果渲染速度快，会在页面进入动画完成前触发
- onReady(){
-
+ onReady() {
+
},
// 监听 - 页面每次【显示时】执行(如：前进和返回) (页面每次出现在屏幕上都触发，包括从下级页面点返回露出当前页面)
onShow() {
-
+
},
// 监听 - 页面每次【隐藏时】执行(如：返回)
onHide() {
-
+
},
// 监听 - 点击右上角转发时
onShareAppMessage(options) {
-
+
},
// 函数
methods: {
- // 页面数据初始化函数
- init(options){
-
+ getSpotGoods() {
+ vk.callFunction({
+ url: 'client/spot/goods/pub/getList',
+ loading: false,
+ data: {
+ pageIndex: 1,
+ pageSize: 10,
+ },
+ success: (data) => {
+ console.log('data: ', data);
+ data.rows.forEach(item => {
+ try {
+ item.addressStr = item.address.province.name + "-" + item.address.city
+ .name + "-" + item.address.area.name
+ } catch (err) {
+ item.addressStr = ""
+ }
+ })
+ this.spotGoodsData = data.rows
+ }
+ });
},
- pageTo(path){
+ getEnquirySheetList() {
+ vk.callFunction({
+ url: 'client/enquiry/sheet/pub/getList',
+ loading: false,
+ data: {
+ pageIndex: 1,
+ pageSize: 10,
+ },
+ success: (data) => {
+ this.enquirySheetData = data.rows
+ }
+ });
+ },
+ // 页面数据初始化函数
+ init(options) {
+ this.getSpotGoods()
+ this.getEnquirySheetList()
+ },
+ pageTo(path) {
vk.navigateTo(path);
}
},
// 监听器
- watch:{
-
+ watch: {
+
},
// 计算属性
- computed:{
-
+ computed: {
+
}
}
\ No newline at end of file
diff --git a/pages/user/components/business-card.vue b/pages/user/components/business-card.vue
index 3924895..f970aff 100644
--- a/pages/user/components/business-card.vue
+++ b/pages/user/components/business-card.vue
@@ -16,6 +16,8 @@
label-width="140px"
input-width="400px"
:before-action="form1.props.beforeAction"
+ :show-cancel="false"
+ submit-text="保存名片"
@success="onFormSuccess"
>
@@ -49,11 +51,6 @@
type: "image",
limit: 1
},
- {
- key: "personName",
- title: "姓名",
- type: "text"
- },
{
key: "position",
title: "职位",
diff --git a/pages/user/components/personal.vue b/pages/user/components/personal.vue
index 3b85330..508cb82 100644
--- a/pages/user/components/personal.vue
+++ b/pages/user/components/personal.vue
@@ -59,7 +59,7 @@
type: "object",
showLabel: false,
showRule: (formData) => {
- return formData.person.personName != null
+ return vk.getVuex('$user.userInfo.accountType') === 1
},
columns: [{
key: "personName",
@@ -75,9 +75,16 @@
readonly: true,
disabled: true
},
+ {
+ key: "bankCardNo",
+ title: "银行卡号",
+ type: "text",
+ readonly: true,
+ disabled: true
+ },
{
key: "mobile",
- title: "电话",
+ title: "手机号",
type: "text",
readonly: true,
disabled: true
@@ -91,7 +98,7 @@
type: "object",
showLabel: false,
showRule: (formData) => {
- return formData.company.companyName != null
+ return vk.getVuex('$user.userInfo.accountType') === 2
},
columns: [{
key: "companyName",
@@ -283,8 +290,16 @@
'fadadaConfirm', 'person', 'company', 'manager', 'contactWechat',
'contactEmail', 'contactWechatImage', 'contactQq', 'mailAddress'
])
- // 成功后的逻辑
- console.log('data: ', data);
+
+ if(data.userInfo.fadadaConfirm && data.userInfo.businessCard == null) {
+ this.$confirm('请完善名片信息', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ vk.navigateTo('/pages/user/user?menu=business-card');
+ })
+ }
}
});
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 58d81a0..e51271f 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -7,7 +7,7 @@
-
+
实名认证
@@ -35,7 +35,7 @@
components: {Personal, BusinessCard},
data() {
return {
- currMenu: 'business-card',
+ currMenu: 'fadada',
// currMenu: 'fadada',
};
},
diff --git a/static/images/home9.png b/static/images/home9.png
new file mode 100644
index 0000000..0872181
Binary files /dev/null and b/static/images/home9.png differ
diff --git a/static/images/lg14.png b/static/images/lg14.png
new file mode 100644
index 0000000..b473a4a
Binary files /dev/null and b/static/images/lg14.png differ
diff --git a/store/modules/$app.js b/store/modules/$app.js
index fe98b6d..b5ecea8 100644
--- a/store/modules/$app.js
+++ b/store/modules/$app.js
@@ -34,6 +34,10 @@ export default {
* vk.setVuex('$app.originalPage', originalPage);
*/
originalPage: $app.originalPage || null, // 跳登录前的页面
+
+ siteData: {
+ categoryData: []
+ },
},
/**
* 从基本数据(state)派生的数据，相当于state的计算属性
diff --git a/uniCloud-aliyun/cloudfunctions/fadada_contract_notify/index.js b/uniCloud-aliyun/cloudfunctions/fadada_contract_notify/index.js
new file mode 100644
index 0000000..068e796
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/fadada_contract_notify/index.js
@@ -0,0 +1,23 @@
+'use strict';
+const querystring = require('querystring');
+exports.main = async (event, context) => {
+ //event为客户端上传的参数
+ console.log('event : ', event)
+ const {
+ body
+ } = event
+
+ let obj = querystring.parse(body);
+ // 验证签名
+ // Base64(SHA1(app_id +MD5(timestamp)+SHA1(app_secret+authenticationType+certStatus+customerId+serialNo+status+statusDesc)))
+
+ let callFunctionRes = await uniCloud.callFunction({
+ name: "router",
+ data: {
+ $url: "client/fadada.pub_contractNotify",
+ data: obj
+ }
+ });
+
+ return callFunctionRes
+};
diff --git a/uniCloud-aliyun/cloudfunctions/fadada_contract_notify/package.json b/uniCloud-aliyun/cloudfunctions/fadada_contract_notify/package.json
new file mode 100644
index 0000000..6aa6125
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/fadada_contract_notify/package.json
@@ -0,0 +1,7 @@
+{
+ "name": "fadada_contract_notify",
+ "dependencies": {},
+ "extensions": {
+ "uni-cloud-jql": {}
+ }
+}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/dao/config.js b/uniCloud-aliyun/cloudfunctions/router/dao/config.js
index 81ed98d..8ff5da9 100644
--- a/uniCloud-aliyun/cloudfunctions/router/dao/config.js
+++ b/uniCloud-aliyun/cloudfunctions/router/dao/config.js
@@ -1,7 +1,14 @@
'use strict';
// 涉及的表名
const dbName = {
- productCategory: "jjx-product-category", //商品-分类表
- product: "jjx-product", //商品-现货表
+ spotCategory: "jjx-spot-category", //商品-分类表
+ spotGoods: "jjx-spot-goods", //商品-现货表
+ contract: "jjx-contract", //商品-现货表
+ userContract: "jjx-user-contract", //商品-现货表
+ enquirySheet: "jjx-enquiry-sheet", //商品-现货表
+ enquiryQuote: "jjx-enquiry-quotre", //商品-现货表
+ enquiryTemplate: "jjx-enquiry-template", //商品-现货表
+ enquiryAttributes: "jjx-enquiry-attributes", //商品-现货表
+ user: "uni-id-users", //商品-现货表
};
module.exports = dbName;
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/router/dao/modules/contractDao.js b/uniCloud-aliyun/cloudfunctions/router/dao/modules/contractDao.js
new file mode 100644
index 0000000..37c4bb3
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/dao/modules/contractDao.js
@@ -0,0 +1,463 @@
+/**
+ *
+ */
+// 涉及的表名
+const dbName = {
+ contractDao: "jjx-contract", // 请在此处填写表中文含义
+};
+
+var dao = {};
+var util = {};
+// 初始化
+dao.init = function(obj) {
+ util = obj;
+}
+/**
+ * 查 - 根据id获取单条记录
+ * @param {String} _id
+ * @param {Object} fieldJson 字段显示规则
+ * 调用示例
+ * let contractDaoInfo = await vk.daoCenter.contractDaoDao.findById(_id);
+ * 或
+ let contractDaoInfo = await vk.daoCenter.contractDaoDao.findById({
+ db: transaction,
+ id: _id
+ });
+ */
+dao.findById = async (_id, fieldJson) => {
+ let { vk, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ if (typeof _id === "object") {
+ // 支持事务
+ res = await vk.baseDao.findById({
+ ..._id,
+ dbName: dbName.contractDao,
+ });
+ } else {
+ // 不支持事务
+ res = await vk.baseDao.findById({
+ dbName: dbName.contractDao,
+ id: _id,
+ fieldJson
+ });
+ }
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+/**
+ * 查 - 根据whereJson获取单条记录
+ * @param {Object} whereJson 条件
+ * @param {Object} fieldJson 字段显示规则
+ * 调用示例
+let contractDaoInfo = await vk.daoCenter.contractDaoDao.findByWhereJson({
+
+});
+ */
+dao.findByWhereJson = async (whereJson, fieldJson) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.findByWhereJson({
+ dbName: dbName.contractDao,
+ whereJson,
+ fieldJson
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 增 - 添加一条记录
+ * @param {Object} dataJson 添加的数据
+ * 调用示例
+await vk.daoCenter.contractDaoDao.add({
+
+});
+或
+ * 调用示例
+await vk.daoCenter.contractDaoDao.add({
+ db: transaction,
+ dataJson: {
+
+ }
+});
+ */
+dao.add = async (obj) => {
+ let { vk, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ if (obj.db && obj.dataJson) {
+ // 支持事务
+ res = await vk.baseDao.add({
+ ...obj,
+ dbName: dbName.contractDao,
+ });
+ } else {
+ // 不支持事务
+ res = await vk.baseDao.add({
+ dbName: dbName.contractDao,
+ dataJson: obj
+ });
+ }
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 增 - 添加多条记录
+ * @param {Object} dataJson 添加的数据
+ * 调用示例
+await vk.daoCenter.contractDaoDao.adds(dataArr);
+ */
+dao.adds = async (dataArr) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.adds({
+ dbName: dbName.contractDao,
+ dataJson: dataArr
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 删 - 删除多条记录
+ * @param {Object} whereJson 条件
+ * 调用示例
+await vk.daoCenter.contractDaoDao.del({
+
+});
+ */
+dao.del = async (whereJson) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.del({
+ dbName: dbName.contractDao,
+ whereJson
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 删 - 据ID删除单条数据
+ * @param {String} _id
+ * 调用示例
+await vk.daoCenter.contractDaoDao.deleteById(_id);
+或
+await vk.daoCenter.contractDaoDao.deleteById(_id, transaction);
+ */
+dao.deleteById = async (_id, db) => {
+ let { vk, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.deleteById({
+ db,
+ dbName: dbName.contractDao,
+ id: _id
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 改 - 批量修改
+ * @param {Object} whereJson 条件
+ * @param {Object} dataJson 修改的数据
+ * 调用示例
+await vk.daoCenter.contractDaoDao.update({
+ whereJson:{
+
+ },
+ dataJson:{
+
+ }
+});
+ */
+dao.update = async (obj = {}) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.update({
+ ...obj,
+ dbName: dbName.contractDao,
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+
+/**
+ * 改 - 根据ID修改数据
+ * @param {String} _id
+ * @param {Object} dataJson 修改的数据
+ * 调用示例
+await vk.daoCenter.contractDaoDao.updateById({
+ id: _id,
+ dataJson: {
+
+ }
+});
+ */
+dao.updateById = async (obj = {}) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.updateById({
+ ...obj,
+ dbName: dbName.contractDao
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 改 - 更新并返回更新后的数据（无论条件匹配到多少条记录，只会修改第一条记录，同时返回修改后的数据）
+ * @param {Object} whereJson 条件
+ * @param {Object} dataJson 修改的数据
+ * 调用示例
+await vk.daoCenter.contractDaoDao.updateAndReturn({
+ whereJson:{
+
+ },
+ dataJson:{
+
+ }
+});
+ */
+dao.updateAndReturn = async (obj = {}) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.updateAndReturn({
+ ...obj,
+ dbName: dbName.contractDao
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 根据ID判断存在则修改，不存在则添加
+ * @param {String} id 如果传了id参数，则会与dataJson中的_id判断是否一致，不一致会报错
+ * @param {Object} dataJson 修改的数据
+ * 调用示例
+await vk.daoCenter.contractDaoDao.setById({
+ dataJson: {
+
+ }
+});
+ */
+dao.setById = async (obj = {}) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.setById({
+ ...obj,
+ dbName: dbName.contractDao
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 查 - 获取记录总条数
+ * @param {Object} whereJson 条件
+ * 调用示例
+await vk.daoCenter.contractDaoDao.count(whereJson);
+ */
+dao.count = async (whereJson) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.count({
+ dbName: dbName.contractDao,
+ whereJson
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 查 - 求和
+ * @param {String} fieldName 需要求和的字段名
+ * @param {Object} whereJson 筛选条件
+ * 调用示例
+let contractDaoSum = await vk.daoCenter.contractDaoDao.sum({
+ fieldName: "",
+ whereJson: {
+
+ }
+});
+ */
+dao.sum = async (obj) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.sum({
+ ...obj,
+ dbName: dbName.contractDao,
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 查 - 求最大值
+ * @param {String} fieldName 需要求最大值的字段名
+ * @param {Object} whereJson 筛选条件
+ * 调用示例
+let contractDaoMax = await vk.daoCenter.contractDaoDao.max({
+ fieldName: "",
+ whereJson: {
+
+ }
+});
+ */
+dao.max = async (obj) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.max({
+ ...obj,
+ dbName: dbName.contractDao,
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 查 - 求最小值
+ * @param {String} fieldName 需要求最小值的字段名
+ * @param {Object} whereJson 筛选条件
+ * 调用示例
+let contractDaoMin = await vk.daoCenter.contractDaoDao.min({
+ fieldName: "",
+ whereJson: {
+
+ }
+});
+ */
+dao.min = async (obj) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.min({
+ ...obj,
+ dbName: dbName.contractDao,
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 查 - 求最平均值
+ * @param {String} fieldName 需要求最平均值的字段名
+ * @param {Object} whereJson 筛选条件
+ * 调用示例
+let contractDaoAvg = await vk.daoCenter.contractDaoDao.avg({
+ fieldName: "",
+ whereJson: {
+
+ }
+});
+ */
+dao.avg = async (obj) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.avg({
+ ...obj,
+ dbName: dbName.contractDao,
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+
+/**
+ * 查 - 获取数据列表
+ * 调用示例
+let contractDaoList = await vk.daoCenter.contractDaoDao.select({
+ pageIndex:1,
+ pageSize:20,
+ getMain:false,
+ whereJson:{
+
+ },
+ fieldJson:{},
+ sortArr:[{ "name":"_id", "type":"desc" }],
+});
+ */
+dao.select = async (obj = {}) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.select({
+ ...obj,
+ dbName: dbName.contractDao
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 查 - 获取数据列表
+ * 调用示例
+let contractDaoList = await vk.daoCenter.contractDaoDao.selects({
+ pageIndex:1,
+ pageSize:20,
+ getMain:false,
+ whereJson:{
+
+ },
+ fieldJson:{},
+ sortArr:[{ "name":"_id", "type":"desc" }],
+ // 副表列表
+ foreignDB:[
+ {
+ dbName:"副表表名",
+ localKey:"主表外键名",
+ foreignKey:"副表外键名",
+ as:"副表as字段",
+ limit:1
+ }
+ ]
+});
+ */
+dao.selects = async (obj = {}) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.selects({
+ ...obj,
+ dbName: dbName.contractDao
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 查 - 获取数据列表
+ * 调用示例
+res = await vk.daoCenter.contractDaoDao.getTableData({
+ data
+});
+ */
+dao.getTableData = async (obj = {}) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.getTableData({
+ ...obj,
+ dbName: dbName.contractDao
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+
+module.exports = dao;
diff --git a/uniCloud-aliyun/cloudfunctions/router/dao/modules/userContractDao.js b/uniCloud-aliyun/cloudfunctions/router/dao/modules/userContractDao.js
new file mode 100644
index 0000000..9913515
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/dao/modules/userContractDao.js
@@ -0,0 +1,461 @@
+/**
+ *
+ */
+// 涉及的表名
+const dbName = {
+ userContract: "jjx-user-contract", // 用户合同关联表
+};
+
+var dao = {};
+var util = {};
+// 初始化
+dao.init = function(obj) {
+ util = obj;
+}
+/**
+ * 查 - 根据id获取单条记录
+ * @param {String} _id
+ * @param {Object} fieldJson 字段显示规则
+ * 调用示例
+ * let userContractInfo = await vk.daoCenter.userContractDao.findById(_id);
+ * 或
+ let userContractInfo = await vk.daoCenter.userContractDao.findById({
+ db: transaction,
+ id: _id
+ });
+ */
+dao.findById = async (_id, fieldJson) => {
+ let { vk, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ if (typeof _id === "object") {
+ // 支持事务
+ res = await vk.baseDao.findById({
+ ..._id,
+ dbName: dbName.userContract,
+ });
+ } else {
+ // 不支持事务
+ res = await vk.baseDao.findById({
+ dbName: dbName.userContract,
+ id: _id,
+ fieldJson
+ });
+ }
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+/**
+ * 查 - 根据whereJson获取单条记录
+ * @param {Object} whereJson 条件
+ * @param {Object} fieldJson 字段显示规则
+ * 调用示例
+let userContractInfo = await vk.daoCenter.userContractDao.findByWhereJson({
+
+});
+ */
+dao.findByWhereJson = async (whereJson, fieldJson) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.findByWhereJson({
+ dbName: dbName.userContract,
+ whereJson,
+ fieldJson
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 增 - 添加一条记录
+ * @param {Object} dataJson 添加的数据
+ * 调用示例
+await vk.daoCenter.userContractDao.add({
+
+});
+或
+ * 调用示例
+await vk.daoCenter.userContractDao.add({
+ db: transaction,
+ dataJson: {
+
+ }
+});
+ */
+dao.add = async (obj) => {
+ let { vk, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ if (obj.db && obj.dataJson) {
+ // 支持事务
+ res = await vk.baseDao.add({
+ ...obj,
+ dbName: dbName.userContract,
+ });
+ } else {
+ // 不支持事务
+ res = await vk.baseDao.add({
+ dbName: dbName.userContract,
+ dataJson: obj
+ });
+ }
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 增 - 添加多条记录
+ * @param {Object} dataJson 添加的数据
+ * 调用示例
+await vk.daoCenter.userContractDao.adds(dataArr);
+ */
+dao.adds = async (dataArr) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.adds({
+ dbName: dbName.userContract,
+ dataJson: dataArr
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 删 - 删除多条记录
+ * @param {Object} whereJson 条件
+ * 调用示例
+await vk.daoCenter.userContractDao.del({
+
+});
+ */
+dao.del = async (whereJson) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.del({
+ dbName: dbName.userContract,
+ whereJson
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 删 - 据ID删除单条数据
+ * @param {String} _id
+ * 调用示例
+await vk.daoCenter.userContractDao.deleteById(_id);
+或
+await vk.daoCenter.userContractDao.deleteById(_id, transaction);
+ */
+dao.deleteById = async (_id, db) => {
+ let { vk, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.deleteById({
+ db,
+ dbName: dbName.userContract,
+ id: _id
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 改 - 批量修改
+ * @param {Object} whereJson 条件
+ * @param {Object} dataJson 修改的数据
+ * 调用示例
+await vk.daoCenter.userContractDao.update({
+ whereJson:{
+
+ },
+ dataJson:{
+
+ }
+});
+ */
+dao.update = async (obj = {}) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.update({
+ ...obj,
+ dbName: dbName.userContract,
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+
+/**
+ * 改 - 根据ID修改数据
+ * @param {String} _id
+ * @param {Object} dataJson 修改的数据
+ * 调用示例
+await vk.daoCenter.userContractDao.updateById({
+ id: _id,
+ dataJson: {
+
+ }
+});
+ */
+dao.updateById = async (obj = {}) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.updateById({
+ ...obj,
+ dbName: dbName.userContract
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 改 - 更新并返回更新后的数据（无论条件匹配到多少条记录，只会修改第一条记录，同时返回修改后的数据）
+ * @param {Object} whereJson 条件
+ * @param {Object} dataJson 修改的数据
+ * 调用示例
+await vk.daoCenter.userContractDao.updateAndReturn({
+ whereJson:{
+
+ },
+ dataJson:{
+
+ }
+});
+ */
+dao.updateAndReturn = async (obj = {}) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.updateAndReturn({
+ ...obj,
+ dbName: dbName.userContract
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 根据ID判断存在则修改，不存在则添加
+ * @param {String} id 如果传了id参数，则会与dataJson中的_id判断是否一致，不一致会报错
+ * @param {Object} dataJson 修改的数据
+ * 调用示例
+await vk.daoCenter.userContractDao.setById({
+ dataJson: {
+
+ }
+});
+ */
+dao.setById = async (obj = {}) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.setById({
+ ...obj,
+ dbName: dbName.userContract
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 查 - 获取记录总条数
+ * @param {Object} whereJson 条件
+ * 调用示例
+await vk.daoCenter.userContractDao.count(whereJson);
+ */
+dao.count = async (whereJson) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.count({
+ dbName: dbName.userContract,
+ whereJson
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 查 - 求和
+ * @param {String} fieldName 需要求和的字段名
+ * @param {Object} whereJson 筛选条件
+ * 调用示例
+let userContractSum = await vk.daoCenter.userContractDao.sum({
+ fieldName: "",
+ whereJson: {
+
+ }
+});
+ */
+dao.sum = async (obj) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.sum({
+ ...obj,
+ dbName: dbName.userContract,
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 查 - 求最大值
+ * @param {String} fieldName 需要求最大值的字段名
+ * @param {Object} whereJson 筛选条件
+ * 调用示例
+let userContractMax = await vk.daoCenter.userContractDao.max({
+ fieldName: "",
+ whereJson: {
+
+ }
+});
+ */
+dao.max = async (obj) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.max({
+ ...obj,
+ dbName: dbName.userContract,
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 查 - 求最小值
+ * @param {String} fieldName 需要求最小值的字段名
+ * @param {Object} whereJson 筛选条件
+ * 调用示例
+let userContractMin = await vk.daoCenter.userContractDao.min({
+ fieldName: "",
+ whereJson: {
+
+ }
+});
+ */
+dao.min = async (obj) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.min({
+ ...obj,
+ dbName: dbName.userContract,
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 查 - 求最平均值
+ * @param {String} fieldName 需要求最平均值的字段名
+ * @param {Object} whereJson 筛选条件
+ * 调用示例
+let userContractAvg = await vk.daoCenter.userContractDao.avg({
+ fieldName: "",
+ whereJson: {
+
+ }
+});
+ */
+dao.avg = async (obj) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.avg({
+ ...obj,
+ dbName: dbName.userContract,
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+
+/**
+ * 查 - 获取数据列表
+ * 调用示例
+let userContractList = await vk.daoCenter.userContractDao.select({
+ pageIndex:1,
+ pageSize:20,
+ getMain:false,
+ whereJson:{
+
+ },
+ fieldJson:{},
+ sortArr:[{ "name":"_id", "type":"desc" }],
+});
+ */
+dao.select = async (obj = {}) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.select({
+ ...obj,
+ dbName: dbName.userContract
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 查 - 获取数据列表
+ * 调用示例
+let userContractList = await vk.daoCenter.userContractDao.selects({
+ pageIndex:1,
+ pageSize:20,
+ getMain:false,
+ whereJson:{
+
+ },
+ fieldJson:{},
+ sortArr:[{ "name":"_id", "type":"desc" }],
+ // 副表列表
+ foreignDB:[
+ {
+ dbName:"副表表名",
+ localKey:"主表外键名",
+ foreignKey:"副表外键名",
+ as:"副表as字段",
+ limit:1
+ }
+ ]
+});
+ */
+dao.selects = async (obj = {}) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.selects({
+ ...obj,
+ dbName: dbName.userContract
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+
+/**
+ * 查 - 获取数据列表
+ * 调用示例
+res = await vk.daoCenter.userContractDao.getTableData({
+ data
+});
+ */
+dao.getTableData = async (obj = {}) => {
+ let { vk, db, _ } = util;
+ let res = {};
+ // 数据库操作开始-----------------------------------------------------------
+ res = await vk.baseDao.getTableData({
+ ...obj,
+ dbName: dbName.userContract
+ });
+ // 数据库操作结束-----------------------------------------------------------
+ return res;
+};
+module.exports = dao;
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/contract/template/sys/add.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/contract/template/sys/add.js
new file mode 100644
index 0000000..82806ab
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/admin/contract/template/sys/add.js
@@ -0,0 +1,34 @@
+module.exports = {
+ /**
+ * 添加单条数据
+ * @url admin/kong/sys/add 前端调用的url参数地址
+ * data 请求参数 说明
+ * res 返回参数说明
+ * @param {Number} code 错误码，0表示成功
+ * @param {String} msg 详细信息
+ */
+ main: async (event) => {
+ let { data = {}, userInfo, util, filterResponse, originalParam } = event;
+ let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
+ let { uid } = data;
+ let res = { code : 0, msg : 'ok' };
+ // 业务逻辑开始-----------------------------------------------------------
+ let {
+ params1,
+ params2,
+ params3
+ } = data;
+ // 这里需要把 params1 params2 params3 改成你数据库里允许用户添加的字段
+ let dbName = "jjx-contract-template";
+ res.id = await vk.baseDao.add({
+ dbName,
+ dataJson:{
+ params1,
+ params2,
+ params3
+ }
+ });
+ // 业务逻辑结束-----------------------------------------------------------
+ return res;
+ }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/contract/template/sys/delete.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/contract/template/sys/delete.js
new file mode 100644
index 0000000..3fdaf4b
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/admin/contract/template/sys/delete.js
@@ -0,0 +1,29 @@
+module.exports = {
+ /**
+ * 数据删除
+ * @url admin/kong/sys/delete 前端调用的url参数地址
+ * data 请求参数 说明
+ * res 返回参数说明
+ * @param {Number} code 错误码，0表示成功
+ * @param {String} msg 详细信息
+ */
+ main: async (event) => {
+ let { data = {}, userInfo, util, filterResponse, originalParam } = event;
+ let { customUtil, uniID, config, pubFun, vk , db, _ } = util;
+ let { uid } = data;
+ let res = { code : 0, msg : 'ok' };
+ // 业务逻辑开始-----------------------------------------------------------
+ let { _id } = data;
+ if(vk.pubfn.isNull(_id)){
+ return { code : -1, msg : 'id不能为空' };
+ }
+ let dbName = "jjx-contract-template";
+ await vk.baseDao.deleteById({
+ dbName,
+ id:_id
+ });
+ // 业务逻辑结束-----------------------------------------------------------
+ return res;
+ }
+
+}
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/contract/template/sys/getList.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/contract/template/sys/getList.js
new file mode 100644
index 0000000..21e7f9c
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/admin/contract/template/sys/getList.js
@@ -0,0 +1,29 @@
+module.exports = {
+ /**
+ * 查询多条记录 分页
+ * @url admin/kong/sys/getList 前端调用的url参数地址
+ * data 请求参数 说明
+ * @param {Number} pageIndex 当前页码
+ * @param {Number} pageSize 每页显示数量
+ * @param {Array
+
+
+
+
+
+
+
+
+
+
+ 
+ 
+ 
+