Browse Source

Merge branch 'deploy' of http://git.chelingzhu.com/chelingzhu-web/storeCheck-app into deploy

lilei 4 years ago
parent
commit
c2b1411583

+ 4 - 4
api/user.js

@@ -58,7 +58,7 @@ export const logout = () => {
 // 修改密码
 // 修改密码
 export const changePwd = params => {
 export const changePwd = params => {
   return axios.request({
   return axios.request({
-    url: 'employee/changePWD',
+    url: 'dduser/changePWD',
     method: 'post',
     method: 'post',
     data: {
     data: {
       oldPassword: params.oldPassword,
       oldPassword: params.oldPassword,
@@ -132,17 +132,17 @@ export const getMessage = params => {
   })
   })
 }
 }
 // 获取当前登录用户信息
 // 获取当前登录用户信息
-export const findUserInfo = param => {
+export const findUserInfo = params => {
   return axios.request({
   return axios.request({
     url: `dduser/findUserInfo`,
     url: `dduser/findUserInfo`,
     method: 'get'
     method: 'get'
   })
   })
 }
 }
 // 获取用户列表
 // 获取用户列表
-export const findUserList = param => {
+export const findUserList = params => {
   return axios.request({
   return axios.request({
     url: `dduser/query`,
     url: `dduser/query`,
-	data: param,
+	data: params,
 	method: 'post'
 	method: 'post'
   })
   })
 }
 }

+ 9 - 3
pages/myShopTour/myShopTour.vue

@@ -188,9 +188,15 @@
 			},
 			},
 			//  查看详情
 			//  查看详情
 			getDetails(item){
 			getDetails(item){
-				uni.navigateTo({
-					url: '/pages/shopTourDetails/shopTourDetails?taskId=' + item.id
-				})
+				if(item.type == 'POINT_INSPECTION'){  //  点检任务
+					uni.navigateTo({
+						url: '/pages/spotCheckDetails/spotCheckDetails?taskId=' + item.id
+					})
+				}else{  //  现场巡店、视频巡店
+					uni.navigateTo({
+						url: '/pages/shopTourDetails/shopTourDetails?taskId=' + item.id
+					})
+				}
 			},
 			},
 			// tabs通知swiper切换
 			// tabs通知swiper切换
 			tabsChange(index) {
 			tabsChange(index) {

+ 2 - 3
pages/spotCheckDetails/spotCheckDetails.vue

@@ -13,7 +13,7 @@
 			<view class="comment-con">
 			<view class="comment-con">
 				<u-row gutter="16" class="pic-con">
 				<u-row gutter="16" class="pic-con">
 					<u-col span="3" v-for="(pic, ind) in item.taskTargetPhotoList" :key="ind">
 					<u-col span="3" v-for="(pic, ind) in item.taskTargetPhotoList" :key="ind">
-						<u-image class="pic" width="100%" height="150upx" :src="pic.image" @click="clickPic(index, ind)"></u-image>
+						<u-image class="pic" width="100%" height="150upx" :src="pic.photoPath" @click="clickPic(index, ind)"></u-image>
 					</u-col>
 					</u-col>
 				</u-row>
 				</u-row>
 				<view class="comment-main">{{item.comments}}</view>
 				<view class="comment-main">{{item.comments}}</view>
@@ -52,8 +52,7 @@
 							if(item.taskTargetPhotoList){
 							if(item.taskTargetPhotoList){
 								item.photoList = []
 								item.photoList = []
 								item.taskTargetPhotoList.map(subItem => {
 								item.taskTargetPhotoList.map(subItem => {
-									subItem.image = subItem.photoBasePath + subItem.photoPath
-									item.photoList.push(subItem.image)
+									item.photoList.push(subItem.photoPath)
 								})
 								})
 							}
 							}
 						})
 						})

+ 1 - 1
pages/toDoList/backlogDetail.vue

@@ -4,7 +4,7 @@
 		<swiper v-if="infoData.backlogPhotoList && infoData.backlogPhotoList.length" class="top-ad-swiper" :indicator-dots="false" :autoplay="true" :interval="5000" :duration="600" :circular="true">
 		<swiper v-if="infoData.backlogPhotoList && infoData.backlogPhotoList.length" class="top-ad-swiper" :indicator-dots="false" :autoplay="true" :interval="5000" :duration="600" :circular="true">
 			<swiper-item v-for="(item,index) in infoData.backlogPhotoList" :key="index">
 			<swiper-item v-for="(item,index) in infoData.backlogPhotoList" :key="index">
 				<div class="swiper-item uni-bg-red">
 				<div class="swiper-item uni-bg-red">
-					<u-image mode="scaleToFill" width="750upx" height="400upx" :src="item.photoPath+'?x-oss-process=image/resize,h_200,w_375,m_lfit'"></u-image>
+					<u-image mode="aspectFit" width="750upx" height="400upx" :src="item.photoPath"></u-image>
 				</div>
 				</div>
 			</swiper-item>
 			</swiper-item>
 		</swiper>
 		</swiper>