chenrui 4 년 전
부모
커밋
7c190710a0
5개의 변경된 파일33개의 추가작업 그리고 39개의 파일을 삭제
  1. 0 7
      api/taskItem.js
  2. 1 1
      libs/axios.js
  3. 1 1
      pages/login/login.vue
  4. 2 2
      pages/shopTourDetails/shopTourDetails.vue
  5. 29 28
      pages/shopTourOver/shopTourOver.vue

+ 0 - 7
api/taskItem.js

@@ -12,11 +12,4 @@ export const delTaskItem = params => {
     url: `taskItem/del/${params.id}`,
     method: 'get'
   })
-}
-// 巡店考评项目明细
-export const detailsTaskItem = params => {
-  return axios.request({
-    url: `taskItem/details/${params.id}`,
-    method: 'get'
-  })
 }

+ 1 - 1
libs/axios.js

@@ -6,7 +6,7 @@ const request = (opts, hasToken) => {
 	//  hasToken是否传入token,为true则不传token
 	const header = {
 			'USER-TERM-TYPE': 'ipad', // 支付时需要用到 与pad一致
-			'App-Type': 2
+			'App-Type': 3
 		}
 	if(!hasToken){
 		header.authorization = authorization

+ 1 - 1
pages/login/login.vue

@@ -125,7 +125,7 @@ export default {
 		},
 		//  表单提交
 		formSubmit() {
-			this.toMain();
+			// this.toMain();
 			const _this = this;
 			//  表单校验
 			if (_this.form.username == '') {

+ 2 - 2
pages/shopTourDetails/shopTourDetails.vue

@@ -27,7 +27,7 @@
 
 <script>
 	import CommentPopup from './commentPopup.vue'
-	import { detailsTaskItem } from '@/api/taskItem.js'
+	import { getTaskItem } from '@/api/taskItem.js'
 	export default{
 		components: { CommentPopup },
 		data(){
@@ -48,7 +48,7 @@
 		},
 		methods: {
 			getTaskItem(){
-				detailsTaskItem({ id: this.taskId }).then(res => {
+				getTaskItem({ id: this.taskId }).then(res => {
 					if(res.status == 200){
 						this.itemList = res.data
 						this.nowInd = 0

+ 29 - 28
pages/shopTourOver/shopTourOver.vue

@@ -43,34 +43,35 @@
 		methods: {
 			// 提交本次任务
 			submitFun(){
-				const _this = this;
-				clzConfirm({
-					title: '提示',
-					content: '确定提交本次巡店?',
-					success: function(res) {
-						if (res.confirm || res.index == 0) {
-							submitTask({
-								id: _this.taskId,
-								inspectorSign: _this.inspectorSign,
-								storeManagerSign: _this.storeManagerSign
-							}).then(ret=>{
-								console.log(ret)
-								if(ret.status == 200){
-									// 关闭上页
-									uni.$emit("closeTour",1)
-									// 打开完成页面
-									uni.redirectTo({
-										url:"/pages/shopTourCompleted/shopTourCompleted?taskId="+_this.taskId
-									})
-								}
-								uni.showToast({
-									icon:'none',
-									title: ret.message
-								})
-							})
-						}
-					}
-				});
+				const _this = this
+				console.log({inspectorSign: _this.inspectorSign, storeManagerSign: _this.storeManagerSign})
+				// clzConfirm({
+				// 	title: '提示',
+				// 	content: '确定提交本次巡店?',
+				// 	success: function(res) {
+				// 		if (res.confirm || res.index == 0) {
+				// 			submitTask({
+				// 				id: _this.taskId,
+				// 				inspectorSign: _this.inspectorSign,
+				// 				storeManagerSign: _this.storeManagerSign
+				// 			}).then(ret=>{
+				// 				console.log(ret)
+				// 				if(ret.status == 200){
+				// 					// 关闭上页
+				// 					uni.$emit("closeTour",1)
+				// 					// 打开完成页面
+				// 					uni.redirectTo({
+				// 						url:"/pages/shopTourCompleted/shopTourCompleted?taskId="+_this.taskId
+				// 					})
+				// 				}
+				// 				uni.showToast({
+				// 					icon:'none',
+				// 					title: ret.message
+				// 				})
+				// 			})
+				// 		}
+				// 	}
+				// });
 			},
 		}
 	}