ccj 2 éve
szülő
commit
893d878d7a

+ 57 - 0
common/helper.js

@@ -49,6 +49,62 @@ const getUserAllRoles = (item) => {
 	}
 	return rolesList;
 }
+const contactCustomerService = (phone) => {
+	console.log(phone)
+	//客服
+	if (!phone) {
+		phone = '18241771147'
+	}
+	const res = uni.getSystemInfoSync();
+	// ios系统默认有个模态框
+	if(res.platform=='ios'){
+		uni.makePhoneCall({
+		phoneNumber:phone,
+		success(){
+			console.log('拨打成功了');
+		},
+		fail() {
+			console.log('拨打失败了');
+		}
+	})
+	}else{
+	//安卓手机手动设置一个showActionSheet
+		uni.showActionSheet({
+			itemList: [phone,'呼叫'],
+			success:function(res){
+				console.log(res);
+			   if(res.tapIndex==1){
+				uni.makePhoneCall({
+				  phoneNumber: phone,
+				success: (res) => {
+					console.log('调用成功!')
+					
+				},
+			  
+				// 失败回调
+				fail: (res) => {
+					console.log('调用失败!')
+					// contactCustomerService(item)
+				}
+				})
+			  }
+			}
+		  })
+	}
+	// console.log("联系客服")
+	// uni.makePhoneCall({
+	// 	phoneNumber: item,
+	// 	success: (res) => {
+	// 		console.log('调用成功!')
+	// 	},
+
+	// 	// 失败回调
+	// 	fail: (res) => {
+	// 		console.log('调用失败!')
+	// 		contactCustomerService(item)
+	// 	}
+	// });
+}
 const setAudit = (item) => {
 	let _list = uni.getStorageSync("copyTaskInfo")
 	let _isShowbtn = true
@@ -262,6 +318,7 @@ const fUN_AmapLocation = uni.requireNativePlugin('FUN-AmapLocation');
 export default {
 	detailData,
 	selectContractNo,
+	contactCustomerService,
 	now,
 	isArray,
 	erpWarehouse,

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "2.1.121",
-    "versionCode" : 21121,
+    "versionName" : "2.1.124",
+    "versionCode" : 21124,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

+ 2 - 2
pageA/product/detail.vue

@@ -120,7 +120,7 @@
 						<text>{{goods.buyer}}</text>
 					</view>
 				</view>
-				<view class="c-row" @click="contactUs">
+				<view class="c-row" @click="$helper.contactCustomerService(goods.buyerPhone)">>
 					<text class="tit">买方电话</text>
 					<view class="con-list">
 						<view>{{goods.buyerPhone}}
@@ -216,7 +216,7 @@
 		<!-- 底部操作菜单 -->
 		<view class="page-bottom1">
 			<view class="Regular">
-				<u-button class="talk-online" @click="contactUs">立即沟通</u-button>
+				<u-button class="talk-online"@click="$helper.contactCustomerService(goods.buyerPhone)">立即沟通</u-button>
 				<u-button @click="salegrain" v-if="goods.pcFlag == 1" type="primary"
 					class="action-btn no-border add-cart-btn">立即卖粮</u-button>
 				<u-button v-else type="primary" class="action-btn no-border add-cart-btn" @click="tradeNow">立即发车

+ 2 - 2
pages/task/audit/Issueandreceipt_task_approval.vue

@@ -661,7 +661,7 @@
 						that.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(
 							res => {
 								if (res.data.code == 200) {
-									that.$api.doRequest('post', '/workflow/api/handle', {
+									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId: list.taskId,
 										approved: true,
 										auditMind: that.auditMind,
@@ -739,7 +739,7 @@
 				// list.publisher = this.userInfo.userName
 				this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(res => {
 					if (res.data.code == 200) {
-						this.$api.doRequest('post', '/workflow/api/handle', {
+						this.$api.doRequest('post', '/newWorkflow/api/handle', {
 							taskId: list.taskId,
 							approved: false,
 							auditMind: this.auditMind,

+ 3 - 3
pages/task/audit/acquisition_settlement_approval.vue

@@ -366,7 +366,7 @@
 									})
 									var count = 0
 									for (let num = 0; num < that.List.length; num++) {
-										that.$api.doRequest('post', '/workflow/api/handle', {
+										that.$api.doRequest('post', '/newWorkflow/api/handle', {
 											taskId: that.List[num].taskId,
 											approved: false,
 											auditMind: that.auditMind ? that.auditMind : "",
@@ -401,7 +401,7 @@
 								})
 								for (let num = 0; num < that.List.length; num++) {
 									var tmp = 0
-									that.$api.doRequest('post', '/workflow/api/handle', {
+									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId: that.List[num].taskId,
 										approved: true,
 										auditMind: that.auditMind ? that.auditMind : "",
@@ -438,7 +438,7 @@
 			// 			})
 			// 		} else {
 			// 			for (var i = 0; i < this.List.length; i++) {
-			// 				this.$api.doRequest('post', '/workflow/api/handle', {
+			// 				this.$api.doRequest('post', '/newWorkflow/api/handle', {
 			// 					taskId: this.List[i].taskId,
 			// 					approved: status,
 			// 					auditMind: this.auditMind ? this.auditMind : "",

+ 3 - 3
pages/task/audit/acquisition_settlement_details.vue

@@ -367,7 +367,7 @@
 									})
 									var count = 0
 									for (let num = 0; num < that.List.length; num++) {
-										that.$api.doRequest('post', '/workflow/api/handle', {
+										that.$api.doRequest('post', '/newWorkflow/api/handle', {
 											taskId: that.List[num].taskId,
 											approved: false,
 											auditMind: that.auditMind ? that.auditMind : "",
@@ -402,7 +402,7 @@
 								})
 								for (let num = 0; num < that.List.length; num++) {
 									var tmp = 0
-									that.$api.doRequest('post', '/workflow/api/handle', {
+									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId: that.List[num].taskId,
 										approved: true,
 										auditMind: that.auditMind ? that.auditMind : "",
@@ -439,7 +439,7 @@
 			// 			})
 			// 		} else {
 			// 			for (var i = 0; i < this.List.length; i++) {
-			// 				this.$api.doRequest('post', '/workflow/api/handle', {
+			// 				this.$api.doRequest('post', '/newWorkflow/api/handle', {
 			// 					taskId: this.List[i].taskId,
 			// 					approved: status,
 			// 					auditMind: this.auditMind ? this.auditMind : "",

+ 3 - 3
pages/task/audit/acquisitioncontract.vue

@@ -580,7 +580,7 @@
 					mask: true
 				});
 				var that = this
-				that.$api.doRequest('post', '/workflow/api/handle', {
+				that.$api.doRequest('post', '/newWorkflow/api/handle', {
 					taskId: that.list.taskId,
 					approved: false,
 					auditMind: this.auditMind,
@@ -619,7 +619,7 @@
 						title: '加载中',
 						mask: true
 					});
-					that.$api.doRequest('post', '/workflow/api/handle', {
+					that.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: that.list.taskId,
 						approved: true,
 						auditMind: this.auditMind,
@@ -643,7 +643,7 @@
 			audit(item, index, status, status2, reason) {
 
 				if (index < this.list.length) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: item.taskId,
 						approved: status,
 						auditMind: reason != undefined ? '已驳回' : '34',

+ 3 - 3
pages/task/audit/charge_against_revenue.vue

@@ -644,7 +644,7 @@
 									})
 									var count = 0
 									// for (let num = 0; num < that.List.length; num++) {
-									that.$api.doRequest('post', '/workflow/api/handle', {
+									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId: that.auditInfo.taskId,
 										approved: false,
 										auditMind: that.auditMind ? that.auditMind : "",
@@ -680,7 +680,7 @@
 								})
 								// for (let num = 0; num < that.List.length; num++) {
 								// var tmp = 0
-								that.$api.doRequest('post', '/workflow/api/handle', {
+								that.$api.doRequest('post', '/newWorkflow/api/handle', {
 									taskId: that.auditInfo.taskId,
 									approved: true,
 									auditMind: that.auditMind ? that.auditMind : "",
@@ -718,7 +718,7 @@
 			// 			})
 			// 		} else {
 			// 			for (var i = 0; i < this.List.length; i++) {
-			// 				this.$api.doRequest('post', '/workflow/api/handle', {
+			// 				this.$api.doRequest('post', '/newWorkflow/api/handle', {
 			// 					taskId: this.List[i].taskId,
 			// 					approved: status,
 			// 					auditMind: this.auditMind ? this.auditMind : "",

+ 1 - 1
pages/task/audit/charge_against_revenue_detail.vue

@@ -584,7 +584,7 @@
 			// 			})
 			// 		} else {
 			// 			for (var i = 0; i < this.List.length; i++) {
-			// 				this.$api.doRequest('post', '/workflow/api/handle', {
+			// 				this.$api.doRequest('post', '/newWorkflow/api/handle', {
 			// 					taskId: this.List[i].taskId,
 			// 					approved: status,
 			// 					auditMind: this.auditMind ? this.auditMind : "",

+ 2 - 2
pages/task/audit/collection_business_approval.vue

@@ -212,7 +212,7 @@
 						that.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(
 							res => {
 								if (res.data.code == 200) {
-									that.$api.doRequest('post', '/workflow/api/handle', {
+									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId: list.taskId,
 										approved: true,
 										auditMind: that.auditMind,
@@ -290,7 +290,7 @@
 				// list.publisher = this.userInfo.userName
 				this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(res => {
 					if (res.data.code == 200) {
-						this.$api.doRequest('post', '/workflow/api/handle', {
+						this.$api.doRequest('post', '/newWorkflow/api/handle', {
 							taskId: list.taskId,
 							approved: false,
 							auditMind: this.auditMind,

+ 3 - 3
pages/task/audit/daichu_details.vue

@@ -269,7 +269,7 @@
 					mask: true
 				});
 				var that = this
-				that.$api.doRequest('post', '/workflow/api/handle', {
+				that.$api.doRequest('post', '/newWorkflow/api/handle', {
 					taskId: that.list.taskId,
 					approved: false,
 					auditMind: this.auditMind,
@@ -308,7 +308,7 @@
 						title: '加载中',
 						mask: true
 					});
-					that.$api.doRequest('post', '/workflow/api/handle', {
+					that.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: that.list.taskId,
 						approved: true,
 						auditMind: this.auditMind,
@@ -332,7 +332,7 @@
 			audit(item, index, status, status2, reason) {
 
 				if (index < this.list.length) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: item.taskId,
 						approved: status,
 						auditMind: reason != undefined ? '已驳回' : '34',

+ 3 - 3
pages/task/audit/daishou_details.vue

@@ -246,7 +246,7 @@
 					mask: true
 				});
 				var that = this
-				that.$api.doRequest('post', '/workflow/api/handle', {
+				that.$api.doRequest('post', '/newWorkflow/api/handle', {
 					taskId: that.list.taskId,
 					approved: false,
 					auditMind: this.auditMind,
@@ -285,7 +285,7 @@
 						title: '加载中',
 						mask: true
 					});
-					that.$api.doRequest('post', '/workflow/api/handle', {
+					that.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: that.list.taskId,
 						approved: true,
 						auditMind: this.auditMind,
@@ -309,7 +309,7 @@
 			audit(item, index, status, status2, reason) {
 
 				if (index < this.list.length) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: item.taskId,
 						approved: status,
 						auditMind: reason != undefined ? '已驳回' : '34',

+ 3 - 3
pages/task/audit/expense_allocation.vue

@@ -388,7 +388,7 @@
 									})
 									var count = 0
 									for (let num = 0; num < that.List.length; num++) {
-										that.$api.doRequest('post', '/workflow/api/handle', {
+										that.$api.doRequest('post', '/newWorkflow/api/handle', {
 											taskId: that.List[num].taskId,
 											approved: false,
 											auditMind: that.auditMind ? that.auditMind : "",
@@ -423,7 +423,7 @@
 								})
 								for (let num = 0; num < that.List.length; num++) {
 									var tmp = 0
-									that.$api.doRequest('post', '/workflow/api/handle', {
+									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId: that.List[num].taskId,
 										approved: true,
 										auditMind: that.auditMind ? that.auditMind : "",
@@ -460,7 +460,7 @@
 			// 			})
 			// 		} else {
 			// 			for (var i = 0; i < this.List.length; i++) {
-			// 				this.$api.doRequest('post', '/workflow/api/handle', {
+			// 				this.$api.doRequest('post', '/newWorkflow/api/handle', {
 			// 					taskId: this.List[i].taskId,
 			// 					approved: status,
 			// 					auditMind: this.auditMind ? this.auditMind : "",

+ 1 - 1
pages/task/audit/freight_settlement_approval.vue

@@ -433,7 +433,7 @@
 				})
 				let that = this
 				if (this.list) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: list.taskId,
 						approved: status,
 						auditMind: this.auditMind ,

+ 2 - 2
pages/task/audit/leave_approve.vue

@@ -153,7 +153,7 @@
 						showCancel: true,
 						confirmText: '确定',
 						success: function(res) {
-							that.$api.doRequest('post', '/workflow/api/handle', {
+							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								approved: true,
 								taskId: that.dataList.taskId,
 								auditMind: that.auditMind,
@@ -200,7 +200,7 @@
 						showCancel: true,
 						confirmText: '确定',
 						success: function(res) {
-							that.$api.doRequest('post', '/workflow/api/handle', {
+							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								approved: false,
 								taskId: that.dataList.taskId,
 								auditMind: that.auditMind,

+ 1 - 1
pages/task/audit/purchase_settlement_approval.vue

@@ -203,7 +203,7 @@
 					title: "审核中"
 				})
 				if (index < this.list.length) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: item.taskId,
 						approved: status,
 						auditMind: reason != undefined ? this.rejectInfo : this.rejectInfo1,

+ 3 - 3
pages/task/audit/purchasecontract.vue

@@ -560,7 +560,7 @@
 					mask: true
 				});
 				var that = this
-				that.$api.doRequest('post', '/workflow/api/handle', {
+				that.$api.doRequest('post', '/newWorkflow/api/handle', {
 					taskId: that.list.taskId,
 					approved: false,
 					auditMind: this.auditMind,
@@ -599,7 +599,7 @@
 						title: '加载中',
 						mask: true
 					});
-					that.$api.doRequest('post', '/workflow/api/handle', {
+					that.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: that.list.taskId,
 						approved: true,
 						auditMind: this.auditMind,
@@ -623,7 +623,7 @@
 			audit(item, index, status, status2, reason) {
 
 				if (index < this.list.length) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: item.taskId,
 						approved: status,
 						auditMind: reason != undefined ? '已驳回' : '34',

+ 3 - 3
pages/task/audit/salecontract.vue

@@ -623,7 +623,7 @@
 					title: '加载中',
 					mask: true
 				});
-				that.$api.doRequest('post', '/workflow/api/handle', {
+				that.$api.doRequest('post', '/newWorkflow/api/handle', {
 					taskId: that.list.taskId,
 					approved: false,
 					auditMind: this.auditMind,
@@ -660,7 +660,7 @@
 						title: '加载中',
 						mask: true
 					});
-					that.$api.doRequest('post', '/workflow/api/handle', {
+					that.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: that.list.taskId,
 						approved: true,
 						auditMind: this.auditMind,
@@ -685,7 +685,7 @@
 			//审核方法
 			audit(item, index, status, status2, reason) {
 				if (index < this.list.length) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: item.taskId,
 						approved: status,
 						auditMind: reason != undefined ? '已驳回' : '34',

+ 2 - 2
pages/task/audit/supp_clock_approve.vue

@@ -137,7 +137,7 @@
 						showCancel: true,
 						confirmText: '确定',
 						success: function(res) {
-							that.$api.doRequest('post', '/workflow/api/handle', {
+							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								approved: true,
 								taskId: that.dataList.taskId,
 								auditMind: that.auditMind,
@@ -184,7 +184,7 @@
 						showCancel: true,
 						confirmText: '确定',
 						success: function(res) {
-							that.$api.doRequest('post', '/workflow/api/handle', {
+							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								approved: false,
 								taskId: that.dataList.taskId,
 								auditMind: that.auditMind,

+ 3 - 3
pages/task/audit/tradeServices_audit.vue

@@ -283,7 +283,7 @@
 						this.$api.msg('驳回意见不能为空')
 						return
 					}
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: this.tradeList.taskId,
 						approved: false,
 						auditMind: this.auditMind,
@@ -312,7 +312,7 @@
 					   this.$api.doRequest('post', '/tradeWarehouseReceiptAppl/api/editTradeWarehouseReceiptAppl', this.tradeList)
 					   .then(res => {
 						   if(res.data.code == 200){
-							   this.$api.doRequest('post', '/workflow/api/handle', {
+							   this.$api.doRequest('post', '/newWorkflow/api/handle', {
 							   	taskId: this.tradeList.taskId,
 							   	approved: true,
 							   	auditMind: this.auditMind ? this.auditMind : "审核通过",
@@ -338,7 +338,7 @@
 						   }
 					   })  
 				   }else{
-					   this.$api.doRequest('post', '/workflow/api/handle', {
+					   this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: this.tradeList.taskId,
 						approved: true,
 						auditMind: this.auditMind ? this.auditMind : "审核通过",

+ 2 - 2
pages/task/audit/warehouse_approval.vue

@@ -370,7 +370,7 @@
 							// that.$api.doRequest('post', '/purchasePrice/purchasePriceEdit', that.list)
 							// 	.then(res => {
 							// 		if (res.data.code == 200) {
-										that.$api.doRequest('post', '/workflow/api/handle', {
+										that.$api.doRequest('post', '/newWorkflow/api/handle', {
 											approved: true,
 											auditMind: that.rejectInfo1,
 											needReapply: true,
@@ -411,7 +411,7 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-								that.$api.doRequest('post', '/workflow/api/handle', {
+								that.$api.doRequest('post', '/newWorkflow/api/handle', {
 									taskId: that.list.taskId,
 									approved: false,
 									auditMind: that.rejectInfo,

+ 3 - 3
pages/task/audit/warehouse_warrant.vue

@@ -503,7 +503,7 @@
 									})
 									var count = 0
 									// for (let num = 0; num < that.List.length; num++) {
-									that.$api.doRequest('post', '/workflow/api/handle', {
+									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId: that.auditInfo.taskId,
 										approved: false,
 										auditMind: that.auditMind ? that.auditMind : "",
@@ -538,7 +538,7 @@
 								})
 								// for (let num = 0; num < that.List.length; num++) {
 								// 	var tmp = 0
-								that.$api.doRequest('post', '/workflow/api/handle', {
+								that.$api.doRequest('post', '/newWorkflow/api/handle', {
 									taskId: that.auditInfo.taskId,
 									approved: true,
 									auditMind: that.auditMind ? that.auditMind : "",
@@ -575,7 +575,7 @@
 			// 			})
 			// 		} else {
 			// 			for (var i = 0; i < this.List.length; i++) {
-			// 				this.$api.doRequest('post', '/workflow/api/handle', {
+			// 				this.$api.doRequest('post', '/newWorkflow/api/handle', {
 			// 					taskId: this.List[i].taskId,
 			// 					approved: status,
 			// 					auditMind: this.auditMind ? this.auditMind : "",

+ 1 - 1
pages/task/audit/warehouse_warrant_detail.vue

@@ -501,7 +501,7 @@
 			// 			})
 			// 		} else {
 			// 			for (var i = 0; i < this.List.length; i++) {
-			// 				this.$api.doRequest('post', '/workflow/api/handle', {
+			// 				this.$api.doRequest('post', '/newWorkflow/api/handle', {
 			// 					taskId: this.List[i].taskId,
 			// 					approved: status,
 			// 					auditMind: this.auditMind ? this.auditMind : "",

+ 2 - 2
pages/task/procurement_close_details.vue

@@ -121,7 +121,7 @@
 								confirmText: '提交',
 								success: function(res) {
 									if (res.confirm) {
-										that.$api.doRequest('post', '/workflow/api/handle', {
+										that.$api.doRequest('post', '/newWorkflow/api/handle', {
 											taskId:that.list.taskId,
 											approved: true,
 											auditMind: '34',
@@ -148,7 +148,7 @@
 								confirmText: '提交',
 								success: function(res) {
 									if (res.confirm) {
-										that.$api.doRequest('post', '/workflow/api/handle', {
+										that.$api.doRequest('post', '/newWorkflow/api/handle', {
 											taskId:that.list.taskId,
 											approved: false,
 											auditMind: '已驳回',

+ 1 - 1
pages/task/procurement_details.vue

@@ -136,7 +136,7 @@
 						if (res.confirm) {
 							that.$api.doRequest('post', '/purchaseOrder/api/editPurchaseOrder', that.list).then(res1 => {
 								if (res1.data.code == 200) {
-									that.$api.doRequest('post', '/workflow/api/handle', {
+									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId:that.list.taskId,
 										approved: true,
 										auditMind: '34',

+ 2 - 2
pages/task/procurement_report_details.vue

@@ -154,7 +154,7 @@
 					confirmText: '提交',
 					success: function(res) {
 						if (res.confirm) {
-							that.$api.doRequest('post', '/workflow/api/handle', {
+							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								taskId:that.list.taskId,
 								approved: true,
 								auditMind: '34',
@@ -181,7 +181,7 @@
 					confirmText: '提交',
 					success: function(res) {
 						if (res.confirm) {
-							that.$api.doRequest('post', '/workflow/api/handle', {
+							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								taskId:that.list.taskId,
 								approved: false,
 								auditMind: '已驳回',

+ 2 - 2
pages/task/sale_close_details.vue

@@ -121,7 +121,7 @@
 								confirmText: '提交',
 								success: function(res) {
 									if (res.confirm) {
-										that.$api.doRequest('post', '/workflow/api/handle', {
+										that.$api.doRequest('post', '/newWorkflow/api/handle', {
 											taskId:that.list.taskId,
 											approved: true,
 											auditMind: '34',
@@ -148,7 +148,7 @@
 								confirmText: '提交',
 								success: function(res) {
 									if (res.confirm) {
-										that.$api.doRequest('post', '/workflow/api/handle', {
+										that.$api.doRequest('post', '/newWorkflow/api/handle', {
 											taskId:that.list.taskId,
 											approved: false,
 											auditMind: '已驳回',

+ 1 - 1
pages/task/sale_details.vue

@@ -133,7 +133,7 @@
 						if (res.confirm) {
 							that.$api.doRequest('post', '/saleOrder/api/editSaleOrder', that.list).then(res => {
 								if (res.data.code == 200) {
-									that.$api.doRequest('post', '/workflow/api/handle', {
+									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId:that.list.taskId,
 										approved: true,
 										auditMind: '34',

+ 2 - 2
pages/task/sale_report_details.vue

@@ -154,7 +154,7 @@
 					confirmText: '提交',
 					success: function(res) {
 						if (res.confirm) {
-							that.$api.doRequest('post', '/workflow/api/handle', {
+							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								taskId:that.list.taskId,
 								approved: true,
 								auditMind: '34',
@@ -181,7 +181,7 @@
 					confirmText: '提交',
 					success: function(res) {
 						if (res.confirm) {
-							that.$api.doRequest('post', '/workflow/api/handle', {
+							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								taskId:that.list.taskId,
 								approved: false,
 								auditMind: '已驳回',

+ 1 - 1
pages/user/user.vue

@@ -34,7 +34,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="cover-container">
+		<view v-if="hasLogin && compName" class="cover-container">
 			<view class='cover-container-item'>
 				<view style='font-size:16px;padding-left:14px;'>我的功能</view>
 				<view class="cu-list grid" :class="['col-' + gridCol,gridBorder?'':'no-border']">