diff --git a/common/js/glogalFun.js b/common/js/glogalFun.js
index 834c427..f5a99cf 100644
--- a/common/js/glogalFun.js
+++ b/common/js/glogalFun.js
@@ -5,7 +5,6 @@ export default {
VERTICAL_NAV_SEARCH: 'verticalNavSearch',
CHOOSE_ADDRESS: 'chooseAddress',
HIDE_MODAL: 'hideModal',
- SUBMIT_FAIL_REASON: 'submitFailReason',
NEW_SERV_PRICE: 'newServPrice',
LET_CUSTOMER_PAY: 'letCustomerPay'
}
diff --git a/common/js/request.js b/common/js/request.js
index 0cee0c6..6e303f7 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -15,7 +15,7 @@ export default {
// request 触发前拼接 url
// args.url = 'https://www.opsoul.com' + args.url;
args.url = 'http://127.0.0.1:80' + args.url;
- // args.url = 'http://10.45.110.174:80' + args.url;
+ // args.url = 'http://10.45.137.214:80' + args.url;
if (!args.data) {
args.data = {}
}
@@ -252,6 +252,14 @@ export default {
}
return resObj.url;
},
+ async qrySpecialSkillList(params = {goodsCategoryId : null}) {
+ let res = await uni.request({
+ url: '/special/skill/list',
+ method: 'POST',
+ data: params
+ })
+ return res[1].data;
+ },
async listByStep(params = {goodsCategoryId : null}) {
let res = await uni.request({
url: '/goods/deptcategory/listByStep',
@@ -392,7 +400,7 @@ export default {
},
async qryDetailOrderPage(params = {}) {
let res = await uni.request({
- url: '/order/detail/list',
+ url: '/order/detail/app/list',
method: 'POST',
data: params,
header: {
@@ -401,5 +409,29 @@ export default {
}
})
return res[1].data;
- }
+ },
+ async updateDetailOrder(params = {}) {
+ let res = await uni.request({
+ url: '/order/detail/app/edit',
+ method: 'POST',
+ data: params
+ })
+ return res[1].data;
+ },
+ async getOrderDetail(params = {}) {
+ let res = await uni.request({
+ url: '/order/detail/app/detail',
+ method: 'POST',
+ data: params
+ })
+ return res[1].data;
+ },
+ async workerSettled(params = {}) {
+ let res = await uni.request({
+ url: '/worker/settled',
+ method: 'POST',
+ data: params
+ })
+ return res[1].data;
+ },
}
diff --git a/components/goods-card/horizontal-goods-card.vue b/components/goods-card/horizontal-goods-card.vue
index 574b914..5d3dee0 100644
--- a/components/goods-card/horizontal-goods-card.vue
+++ b/components/goods-card/horizontal-goods-card.vue
@@ -1,18 +1,21 @@
-
+
- {{product.name}}
+ {{product.goodsName}}
{{product.comments}}
-
-
+
+
+ {{product.payMoney}}
+
+
{{product.salePrice}}
¥{{product.price}}
-
+
{{product.type}}
diff --git a/components/goods-card/product-picked.vue b/components/goods-card/product-picked.vue
index 458f426..953335b 100644
--- a/components/goods-card/product-picked.vue
+++ b/components/goods-card/product-picked.vue
@@ -8,25 +8,12 @@
{{title}}
-
-
- {{item.name}}
-
-
-
-
-
-
-
- {{valCol.value}}
-
-
- ×{{item.pickedNum}}
-
- {{item.toServNum == undefined || item.toServNum == null ? item.secondColumnNum : item.toServNum}}
-
+
+
+ {{item[valFieldArr[0]]}}
+
+ {{item[valFieldArr[1]]}}
+ {{item[valFieldArr[2]]}}
@@ -51,14 +38,10 @@
columnTitleArr: {
type: Array,
default: []
- },
- showToServNum: {
- type: Boolean,
- default: false
- },
- numberBox: {
- type: Boolean,
- default: false
+ },
+ valFieldArr: {
+ type: Array,
+ default: []
}
},
components: {
diff --git a/pages/my/master-occupancy.vue b/pages/my/master-occupancy.vue
index acea66c..33a60c8 100644
--- a/pages/my/master-occupancy.vue
+++ b/pages/my/master-occupancy.vue
@@ -92,10 +92,10 @@
{{item0.goodsCategoryName}}
-
+
@@ -123,21 +123,29 @@
删除
-
-
- 特殊技能：
-
-
-
-
+
+
+ 特殊技能：
+
+
+
+
+
+
+
+
+
技能证书：
@@ -149,7 +157,7 @@
-
+
@@ -164,7 +172,7 @@
-
+
@@ -204,7 +212,8 @@
this.loadData();
},
data() {
- return {
+ return {
+ curUserInfo: {},
curStep: 0,
stepList: ['服务范围', '服务技能', '特殊技能'],
provinceList: [],
@@ -232,7 +241,9 @@
specialSubSubTypeList: [],
specialTypeObj: {},
specialSubTypeObj: {},
- specialSubSubTypeObj: {},
+ specialSubSubTypeObj: {},
+ specialSkillList: [],
+ specialSkillObj: {},
skillCert: [],
insurCert: [],
insurStartDate: '',
@@ -241,7 +252,8 @@
}
},
methods: {
- loadData() {
+ loadData() {
+ this.curUserInfo = this.$request.getCurUserInfo();
this.loadProvinceList();
this.loadTypeList();
this.loadSpecialSkill();
@@ -353,8 +365,12 @@
let res = await this.$request.listByStep();
this.specialTypeList = res.data;
},
- async chooseSpecialSkill(e, type, index) {
- let res = await this.$request.listByStep({
+ async chooseSpecialSkill(e, type, index) {
+ let funName = "listByStep";
+ if (type === 2) {
+ funName = "qrySpecialSkillList";
+ }
+ let res = await this.$request[funName]({
goodsCategoryId: e.goodsCategoryId
});
if (res.code == 0) {
@@ -369,6 +385,10 @@
case 1: {
this.specialSkill[index].specialSubSubTypeList = res.data;
this.specialSkill[index].specialSubSubTypeObj = {};
+ }
+ case 2: {
+ this.specialSkill[index].specialSkillList = res.data;
+ this.specialSkill[index].specialSkillObj = {};
}
break;
default:
@@ -398,15 +418,17 @@
},
async chooseImage(e, imgList) {
uni.chooseImage({
- count: 2, //默认9
+ count: 1, //默认9
sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
sourceType: ['album'], //从相册选择
success: (res) => {
// 上传图片
- this.$request.uploadFile(res.tempFilePaths[0]).then((uploadRes) => {
- // 存入缓存
- imgList.push(uploadRes.url);
- });
+ res.tempFilePaths.forEach((tmpPath) => {
+ this.$request.uploadFile(tmpPath).then((url) => {
+ // 存入缓存
+ imgList.push(url);
+ });
+ })
}
});
},
@@ -432,14 +454,65 @@
/* 特殊技能 end */
nextStep() {
this.curStep = this.curStep === this.stepList.length - 1 ? this.curStep : ++this.curStep;
- console.log(this.servSkill)
},
preStep() {
this.curStep = this.curStep === 0 ? 0 : --this.curStep;
- console.log(this.servSkill)
},
- submit() {
- console.log(this.specialSkill)
+ async submit() {
+ let workerId = this.curUserInfo.workerId;
+ let workerAreas = [];
+ let goodsCategories = [];
+ let specialSkills = [];
+ // 区域参数
+ this.servArea.forEach((item) => {
+ item.streetIds.forEach((streetId) => {
+ workerAreas.push({
+ workerId: workerId,
+ provinceId: item.provinceObj.areaId,
+ cityId: item.cityObj.areaId,
+ districtId: item.districtObj.areaId,
+ streetId: streetId
+ })
+ });
+ });
+ // 服务品类参数
+ this.servSkill.forEach((item) => {
+ item.subSubTypeIds.forEach((goodsCategoryId) => {
+ goodsCategories.push({
+ workerId: workerId,
+ goodsCategoryId: goodsCategoryId
+ });
+ });
+ });
+ // 特殊技能参数
+ this.specialSkill.forEach((item) => {
+ specialSkills.push({
+ workerId: workerId,
+ specialSkillId: item.specialSkillObj.specialSkillId,
+ credential: item.skillCert[0],
+ insurance: item.insurCert[0],
+ insuranceStart: item.insurStartDate,
+ insuranceEnd: item.insurEndDate
+ });
+ });
+
+ let params = {
+ workerId: workerId,
+ workerAreas: workerAreas,
+ goodsCategories: goodsCategories,
+ specialSkills: specialSkills
+ }
+ console.log(params)
+ let res = await this.$request.workerSettled(params);
+ if (res.code === 0) {
+ uni.showToast({
+ icon: 'success',
+ title: '提交成功'
+ })
+ uni.navigateBack({
+ delta: -1
+ })
+ }
}
},
}
diff --git a/pages/order-manage/dispatch-order.vue b/pages/order-manage/dispatch-order.vue
index 90a9533..477e3ff 100644
--- a/pages/order-manage/dispatch-order.vue
+++ b/pages/order-manage/dispatch-order.vue
@@ -65,13 +65,13 @@