Skip to content

W
wly-APP
Commit d762a457 authored by xiangzj's avatar xiangzj
Browse files
Options

市场秩序和创意酒接口联调

parent d59bde3f
Hide whitespace changes
Inline Side-by-side
Showing with 185 additions and 172 deletions
pages/breakwords-clue/breakwords-clue.vue
View file @ d762a457
......@@ -342,7 +342,6 @@
</button>
</view>
</view>
</view>
</template>
<script>
......@@ -874,4 +873,4 @@
.btn-text-l {
color: $wly-primary-color;
}
</style>
</style>
pages/breakwords-handle-detail/breakwords-handle-detail.nvue
View file @ d762a457
......@@ -56,7 +56,7 @@
</view>
<view class="bottom-area"></view>
<view class="bottom">
<button class="btn" type="default" @tap="submit">
<button class="btn" type="default" @tap="submit" v-if="condition.type==='edit'">
<text class="btn-text">提交</text>
</button>
</view>
......@@ -112,6 +112,7 @@
console.log('breakwords-handle-detail', option)
if (option && option.id) {
this.condition.id = option.id
this.condition.type = option.type
this.getOrderDetail()
}
},
......
pages/breakwords-handle/breakwords-handle.nvue
View file @ d762a457
......@@ -68,8 +68,8 @@
</view>
</view>
<button v-if="item.status==='CONFIRMED'" class="item-btn item-btn-l" type="default"
@click="checkDetal(item)"><text class="item-btn-text">发起申诉</text></button>
<button class="item-btn" type="default" @click="checkDetal(item)"><text
@click="checkDetal(item,'edit')"><text class="item-btn-text">发起申诉</text></button>
<button class="item-btn" type="default" @click="checkDetal(item,'view')"><text
class="item-btn-text">查看</text></button>
</view>
</cell>
......@@ -287,9 +287,9 @@
this.condition.year = e.detail.value
this.getProcessOrder(true)
},
checkDetal(item) {
checkDetal(item,type) {
uni.navigateTo({
url: `/pages/breakwords-handle-detail/breakwords-handle-detail?id=${item.id}`
url: `/pages/breakwords-handle-detail/breakwords-handle-detail?id=${item.id}&type=${type}`
})
}
}
......
pages/breakwords-mission-confirm/breakwords-mission-confirm.nvue
View file @ d762a457
......@@ -273,44 +273,45 @@
setTimeout(function() {
uni.hideLoading();
}, 2000);
// const res = await apiGetContactLetterDetail({
// taskAssignmentId: this.condition.taskAssignmentId
// })
let res = {
"result": "S",
"message": "操作成功",
"data": {
"taskAssignmentId": "T000008HK",
"bankName": "开户行",
"accountName": "户名",
"accountNumber": "账号",
"contact": "联系人",
"contactPhone": "联系电话",
"receiveAddress": "收货地址",
"contactUser": "收获联系人",
"receiveContactPhone": "联系人电话",
"expectInsuredValue": "期望保价",
"expectLogistics": "期望物流公司",
"receiveRecorderName": "录入人",
"receiveRecorderTime": "录入时间",
"remitPaidParty": "打款方",
"remitPaidUrl": "打款凭证照片",
"remitRecorderName": "打款录入人",
"remitRecorderTime": "打款录入时间",
"shipLogistics": "发货物流公司",
"shipLogisticsNo": "发货单号",
"shipTime": "发货时间",
"shipRecorderName": "发货人",
"entryDataList": [{
"contactLetterId": "联络函编号",
"contactLetterName": "联络函名称",
"createUserName": "创建人",
"status": "状态",
"statusName": "状态",
"createTime": "生成时间"
}]
}
}
const res = await apiGetContactLetterDetail({
taskAssignmentId: this.condition.taskAssignmentId
})
// let res = {
// "result": "S",
// "message": "操作成功",
// "data": {
// "taskAssignmentId": "T000008HK",
// "bankName": "开户行",
// "accountName": "户名",
// "accountNumber": "账号",
// "contact": "联系人",
// "contactPhone": "联系电话",
// "receiveAddress": "收货地址",
// "contactUser": "收获联系人",
// "receiveContactPhone": "联系人电话",
// "expectInsuredValue": "期望保价",
// "expectLogistics": "期望物流公司",
// "receiveRecorderName": "录入人",
// "receiveRecorderTime": "录入时间",
// "remitPaidParty": "打款方",
// "remitPaidUrl": "打款凭证照片",
// "remitRecorderName": "打款录入人",
// "remitRecorderTime": "打款录入时间",
// "shipLogistics": "发货物流公司",
// "shipLogisticsNo": "发货单号",
// "shipTime": "发货时间",
// "shipRecorderName": "发货人",
// "entryDataList": [{
// "contactLetterId": "联络函编号",
// "contactLetterName": "联络函名称",
// "createUserName": "创建人",
// "status": "状态",
// "statusName": "状态",
// "createTime": "生成时间"
// }]
// }
// }
uni.hideLoading();
for (let key in res.data) {
this.$set(this.contactLetterDetail, key, res.data[key])
......
pages/breakwords-mission-detail/breakwords-mission-detail.nvue
View file @ d762a457
......@@ -231,44 +231,45 @@
setTimeout(function() {
uni.hideLoading();
}, 2000);
// const res = await apiGetContactLetterDetail({
// taskAssignmentId: this.condition.taskAssignmentId
// })
let res = {
"result": "S",
"message": "操作成功",
"data": {
"taskAssignmentId": "T000008HK",
"bankName": "开户行",
"accountName": "户名",
"accountNumber": "账号",
"contact": "联系人",
"contactPhone": "联系电话",
"receiveAddress": "收货地址",
"contactUser": "收获联系人",
"receiveContactPhone": "联系人电话",
"expectInsuredValue": "期望保价",
"expectLogistics": "期望物流公司",
"receiveRecorderName": "录入人",
"receiveRecorderTime": "录入时间",
"remitPaidParty": "打款方",
"remitPaidUrl": "打款凭证照片",
"remitRecorderName": "打款录入人",
"remitRecorderTime": "打款录入时间",
"shipLogistics": "发货物流公司",
"shipLogisticsNo": "发货单号",
"shipTime": "发货时间",
"shipRecorderName": "发货人",
"entryDataList": [{
"contactLetterId": "联络函编号",
"contactLetterName": "联络函名称",
"createUserName": "创建人",
"status": "状态",
"statusName": "状态",
"createTime": "生成时间"
}]
}
}
const res = await apiGetContactLetterDetail({
taskAssignmentId: this.condition.taskAssignmentId
})
// let res = {
// "result": "S",
// "message": "操作成功",
// "data": {
// "taskAssignmentId": "T000008HK",
// "bankName": "开户行",
// "accountName": "户名",
// "accountNumber": "账号",
// "contact": "联系人",
// "contactPhone": "联系电话",
// "receiveAddress": "收货地址",
// "contactUser": "收获联系人",
// "receiveContactPhone": "联系人电话",
// "expectInsuredValue": "期望保价",
// "expectLogistics": "期望物流公司",
// "receiveRecorderName": "录入人",
// "receiveRecorderTime": "录入时间",
// "remitPaidParty": "打款方",
// "remitPaidUrl": "打款凭证照片",
// "remitRecorderName": "打款录入人",
// "remitRecorderTime": "打款录入时间",
// "shipLogistics": "发货物流公司",
// "shipLogisticsNo": "发货单号",
// "shipTime": "发货时间",
// "shipRecorderName": "发货人",
// "entryDataList": [{
// "contactLetterId": "联络函编号",
// "contactLetterName": "联络函名称",
// "createUserName": "创建人",
// "status": "状态",
// "statusName": "状态",
// "createTime": "生成时间"
// }]
// }
// }
uni.hideLoading();
for (let key in res.data) {
this.$set(this.contactLetterDetail, key, res.data[key])
......
pages/breakwords-mission/breakwords-mission.nvue
View file @ d762a457
......@@ -162,80 +162,81 @@
setTimeout(function() {
uni.hideLoading();
}, 2000);
// const res = await apiGetMissionList(params)
const res = await apiGetMissionList(params)
// const res = await apiGetClueList()
let res = {
"result": "S",
"message": "操作成功",
"data": {
"count": 27,
"page": 1,
"pagesize": 10,
"data": [{
"rno": "1",
"requestname": "测试111",
"pcurl": "",
"departmentname": "",
"sysname": "市场秩序",
"createdate": "2021-07-30",
"workflowtype": "-4001",
"appurl": "string",
"requestid": "-206",
"ticketId": "string",
"entryType": "1",
"status": "已处理"
},
{
"rno": "2",
"requestname": "联络函待填写收货信息",
"pcurl": "",
"departmentname": "",
"sysname": "市场秩序",
"createdate": "2021-07-30",
"workflowtype": "-4001",
"appurl": "T00001STE",
"requestid": "-203",
"ticketId": "T00001STE",
"entryType": "3",
"status": "已处理",
"viloationName": "影响质量",
"childTypeName": "childTypeName",
"terminalName": "terminalName",
"terminalAddress": "terminalAddress",
"productName": "productName",
"productQty": "productQty",
},
{
"rno": "3",
"requestname": "string",
"pcurl": "",
"departmentname": "",
"sysname": "市场秩序",
"createdate": "2021-07-30",
"workflowtype": "-4001",
"appurl": "string",
"requestid": "-200",
"ticketId": "string",
"entryType": "4",
"status": "已处理"
},
{
"rno": "4",
"requestname": "联络函待填写收货信息",
"pcurl": "",
"departmentname": "",
"sysname": "市场秩序",
"createdate": "2021-08-01",
"workflowtype": "-4001",
"appurl": "T00001UD0",
"requestid": "-208",
"ticketId": "T00001UD0",
"entryType": "1",
"status": "已处理"
}
]
}
}
// let res = {
// "result": "S",
// "message": "操作成功",
// "data": {
// "count": 27,
// "page": 1,
// "pagesize": 10,
// "data": [{
// "rno": "1",
// "requestname": "测试111",
// "pcurl": "",
// "departmentname": "",
// "sysname": "市场秩序",
// "createdate": "2021-07-30",
// "workflowtype": "-4001",
// "appurl": "string",
// "requestid": "-206",
// "ticketId": "string",
// "entryType": "1",
// "status": "已处理"
// },
// {
// "rno": "2",
// "requestname": "联络函待填写收货信息",
// "pcurl": "",
// "departmentname": "",
// "sysname": "市场秩序",
// "createdate": "2021-07-30",
// "workflowtype": "-4001",
// "appurl": "T00001STE",
// "requestid": "-203",
// "ticketId": "T00001STE",
// "entryType": "3",
// "status": "已处理",
// "viloationName": "影响质量",
// "childTypeName": "childTypeName",
// "terminalName": "terminalName",
// "terminalAddress": "terminalAddress",
// "productName": "productName",
// "productQty": "productQty",
// },
// {
// "rno": "3",
// "requestname": "string",
// "pcurl": "",
// "departmentname": "",
// "sysname": "市场秩序",
// "createdate": "2021-07-30",
// "workflowtype": "-4001",
// "appurl": "string",
// "requestid": "-200",
// "ticketId": "string",
// "entryType": "4",
// "status": "已处理"
// },
// {
// "rno": "4",
// "requestname": "联络函待填写收货信息",
// "pcurl": "",
// "departmentname": "",
// "sysname": "市场秩序",
// "createdate": "2021-08-01",
// "workflowtype": "-4001",
// "appurl": "T00001UD0",
// "requestid": "-208",
// "ticketId": "T00001UD0",
// "entryType": "1",
// "status": "已处理"
// }
// ]
// }
// }
uni.hideLoading();
const {
......@@ -297,6 +298,7 @@
},
checkTab(i) {
this.activeTabIndex = i
this.lists = []
this.getClueList()
},
handleStatustext(item) {
......
pages/diy-wine/diy-wine.vue
View file @ d762a457
......@@ -74,7 +74,8 @@
apiGetCategoryDetailById,
apiSaveCustom
} from '@/servers/diyWine.js'
import md5 from "@/uview-ui/libs/function/md5.js";
export default {
data() {
return {
......@@ -145,9 +146,10 @@
methods: {
async getCategory() {
const params = {
"OutsideGoodsID": "432608038931800064",
"OutsideGoodsID": this.orderDetail.ITEM[0].ORDERED_PROD,
"Action": "guanying.customcategory.list.get",
...this.signParams
"SecretKey": "8B72E5CB394E3CABB56DC8E04AC4DE7F",
"Sign": md5.hex_md5(`Action=guanying.customcategory.list.get&OutsideGoodsID=${this.orderDetail.ITEM[0].ORDERED_PROD}&SecretKey=8B72E5CB394E3CABB56DC8E04AC4DE7F`)
}
const res2 = await apiGetCategory(params)
// const res2 = {
......@@ -189,11 +191,12 @@
async getCategoryDetail() {
const params = {
"Action": "guanying.customtemplate.list.get",
"OutsideGoodsID": "432608038931800064",
"OutsideGoodsID": this.orderDetail.ITEM[0].ORDERED_PROD,
"TemplateCategoryID": this.activeTabItem.TemplateCategoryID,
"PageID": "1",
"Pagesize": "99",
...this.signParams
"SecretKey": "8B72E5CB394E3CABB56DC8E04AC4DE7F",
"Sign": md5.hex_md5(`Action=guanying.customtemplate.list.get&OutsideGoodsID=${this.orderDetail.ITEM[0].ORDERED_PROD}&PageID=1&Pagesize=99&TemplateCategoryID=${this.activeTabItem.TemplateCategoryID}&SecretKey=8B72E5CB394E3CABB56DC8E04AC4DE7F`)
}
const res2 = await apiGetCategoryDetail(params)
// const res2 = {
......@@ -228,7 +231,8 @@
const params = {
"TemplateID": this.activeTemplateItem.TemplateID,
"Action": "guanying.goodstemplate.detail.query",
...this.signParams
"SecretKey": "8B72E5CB394E3CABB56DC8E04AC4DE7F",
"Sign": md5.hex_md5(`Action=guanying.goodstemplate.detail.query&TemplateID=${this.activeTemplateItem.TemplateID}&SecretKey=8B72E5CB394E3CABB56DC8E04AC4DE7F`)
}
const res2 = await apiGetCategoryDetailById(params)
// const res2 = {
......@@ -248,7 +252,7 @@
// ErrMsg: "",
// Status: "Success"
// }
this.activeTemplateItemDetail = res2.Data.ConfigContent.InitImgList[0]
this.activeTemplateItemDetail = res2.Data.ConfigContent
},
async handleSave() {
if (!this.activeTemplateItem.OriginImagePath) {
......@@ -265,12 +269,13 @@
// "src": imgpathArr[1]
// }
const params = {
"OutsideGoodsID": "432608038931800064",
"TemplateID": this.templateCategoryDetail.TemplateID,
"info": JSON.stringify(this.activeTemplateItemDetail),
"OutsideGoodsID": this.orderDetail.ITEM[0].ORDERED_PROD,
"TemplateID": this.activeTemplateItem.TemplateID,
"Info": JSON.stringify(this.activeTemplateItemDetail),
// "info": JSON.stringify(info),
"Action": "guanying.adapter.works.savecustom",
...this.signParams
"SecretKey": "8B72E5CB394E3CABB56DC8E04AC4DE7F",
"Sign": md5.hex_md5(`Action=guanying.adapter.works.savecustom&Info=${JSON.stringify(this.activeTemplateItemDetail)}&OutsideGoodsID=${this.orderDetail.ITEM[0].ORDERED_PROD}&TemplateID=${this.activeTemplateItem.TemplateID}&SecretKey=8B72E5CB394E3CABB56DC8E04AC4DE7F`)
}
const res = await apiSaveCustom(params)
this.isEdit = false
......@@ -473,4 +478,4 @@
width: 120rpx;
height: 120rpx;
}
</style>
</style>
servers/breakwords.js
View file @ d762a457
......@@ -106,7 +106,7 @@ export async function apiGetMissionList(params) {
* @returns {Promise<AxiosResponse<T>>}
*/
export async function apiGetContactLetterDetail(params) {
const res = await apiHelper.post('/wmdpwebservices/taskassignment/contactletter/detail', params)
const res = await apiHelper.post('/wmdpwebservices/taskassignment/yishang/contactletter/detail', params)
return res
}
......
uview-ui/libs/function/md5.js
View file @ d762a457
......@@ -378,8 +378,12 @@ function bit_rol(num, cnt)
return (num << cnt) | (num >>> (32 - cnt));
}
// module.exports = {
// md5 : function(str){
// return hex_md5(str);
// }
// }
// 在md5.js 的最后加入 暴露的方法
module.exports = {
md5 : function(str){
return hex_md5(str);
}
hex_md5
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment