1、2.3.1.驾驶员运单时取消上传卸车照片2、2.3.2.处理场所扫码-取消拍照上传3、2.3.3.身份选择修改-直接进入页面

2c2c2c
1 parent cdceeb8b
Showing 5 changed files with 71 additions and 18 deletions
garbage-removal/dist.zip
garbage-removal/src/main.js
garbage-removal/src/pages/login/code.vue
garbage-removal/src/pages/order-info/order-disposal/scan-detail/index.vue
garbage-removal/src/pages/order-info/order-driver/detail/index.vue
@@ -4,7 +4,9 @@ import * as Pinia from &#39;pinia&#39;;
 import piniaPersistUni from "pinia-plugin-persist-uni";
 import { createSSRApp } from "vue";
 import mixin from './common/mixin';
-import Vconsole from 'vconsole'
+
+// app调试组件
+// import Vconsole from 'vconsole'
  
 // 引入uView对小程序分享的mixin封装
 import mpShare from '@/uview-plus/libs/mixin/mpShare.js';
@@ -50,10 +52,12 @@ export function createApp() {
 	const app = createSSRApp(App);
 	const pinia = Pinia.createPinia()
 	app.use(uviewPlus)
+	// app调试组件
+	// new Vconsole();
+	
 	// 配置uView
 	// 调用setConfig方法，方法内部会进行对象属性深度合并，可以放心嵌套配置
 	// 需要在app.use(uview-plus)之后执行
-	new Vconsole();
 	uni.$u.setConfig({
 		// 修改$u.config对象的属性
 		config: {
@@ -16,6 +16,7 @@
  
 <script setup>
 import { sendCode, userLogin } from "@/apis/user.js";
+import { setRequestToken } from '@/utils/request/request.js';
 import { useMainStore } from '@/stores/index.js';
 import { onLoad } from "@dcloudio/uni-app";
 import { getCurrentInstance, ref } from "vue";
@@ -70,17 +71,61 @@ const noCaptcha = () =&gt; {
 // 校验验证码
 const checkVerifyNum = (code) => {
 	userLogin({ loginType: 0, tel: iphoneNumber.value, code: code }).then(res => {	
-		console.log(res);
+		// console.log(res);
 		// 登录成功
 		if (res.data.code===200) {
 			verifyFlag.value = false;
 			store.tempToken = res.data.data.token
+			if (res.data.data.token) {
+			  setRequestToken(res.data.data.token)
+			}
 			store.userName = res.data.data.name;
+			store.userInfo.userName = res.data.data.name;
 			store.userPhone = res.data.data.loginPhone;
 			if(res.data.data.testUser){
-				uni.navigateTo({
-					url: `/pages/wode-info/wode-info-choose/index?ruleVos= ${encodeURIComponent(JSON.stringify(res.data.data.ruleVos))}&userName=${encodeURIComponent(res.data.data.name)}`
-				});
+				// uni.navigateTo({
+				// 	url: `/pages/wode-info/wode-info-choose/index?ruleVos= ${encodeURIComponent(JSON.stringify(res.data.data.ruleVos))}&userName=${encodeURIComponent(res.data.data.name)}`""
+				// });
+				if (store.tempToken) {
+				  store.token = store.tempToken
+				  store.tempToken = "";
+				}
+				const ruleVos = res.data.data.ruleVos;
+				if(ruleVos!=null && ruleVos.length>0){
+					// console.log(store.userInfo);
+					//默认用户
+					store.userType = ruleVos[0].userType;
+					store.userInfo.userType = ruleVos[0].userType;
+					store.userInfo.ruleVos = ruleVos;
+					//判断是哪种角色
+					for(let rule of ruleVos){
+						store.userInfo.transportCompanyName = null;
+						// console.log(rule)
+						if(rule.userType==="处置场所负责人"){
+							store.userType = rule.userType;
+							store.userInfo.userType = rule.userType;
+							store.userInfo.transportCompanyName = rule.transportCompanyName;
+							uni.$u.route({
+							    type: "switchTab",
+							    url: `pages/order/index`,
+							})
+						}
+						if(rule.userType==="运输企业负责人"){
+							store.userType = rule.userType;
+							store.userInfo.userType = rule.userType;
+							store.userInfo.transportCompanyName = rule.transportCompanyName;
+						}
+						if(rule.userType==="清运车辆驾驶员"){
+							store.userType = rule.userType;
+							store.userInfo.userType = rule.userType;
+							store.userInfo.transportCompanyName = rule.transportCompanyName;
+						}
+					}
+				}
+				uni.$u.route({
+				    type: "switchTab",
+				    url: `/pages/home/index`,
+				})
 			}else{
 				uni.$u.toast("该手机无法登录，不是投放点管理员");
 			}
@@ -56,7 +56,7 @@
 						v-model="details.garCarryingWeight" @change="handlerInputChange"></up-input>
 				</view>
 			</view>
-			<view class="scan-upload-fill-image-box">
+			<!-- <view class="scan-upload-fill-image-box">
 				<view class="scan-upload-fill-image-label">
 					<view>
 						全景照片
@@ -70,7 +70,7 @@
 						@afterRead="afterRead" @delete="deletePic" name="3" multiple :maxCount="maxCount"
 						:previewFullImage="true"></u-upload>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="scan-submit-button-box" v-if="isNew">
 			<view class="scan-submit-button-btn">
@@ -96,10 +96,12 @@
 		ref,
 		onMounted
 	} from 'vue';
+	
 	const details = ref({});
 	const fileList = ref([]);
 	const isDeletable = ref(false);
 	const maxCount = computed(() => isDeletable.value ? 3 : fileList.value.length);
+	
 	// 删除图片
 	const deletePic = (event) => {
 		fileList.value.splice(event.index, 1);
@@ -123,6 +125,11 @@
 		window.takeLocationCallBack = takeLocalCallBack
 	})
  
+	onLoad((options) => {
+		// 获取定位信息
+		takeLocation();
+	});
+
 	const takeLocation = () => {
 		console.log("获取定位信息");
 		// 获取定位信息
@@ -133,8 +140,6 @@
 	const isNew = ref(false)
 	// 新增图片
 	const afterRead = async (event) => {
-		// 获取定位信息
-		takeLocation();
 		// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
 		let lists = [].concat(event.file);
 		let fileListLen = fileList.value.length;
@@ -179,6 +184,7 @@
 		console.log(val);
 	}
 	const handlerSubmit = async () => {
+		
 		// 校验参数
 		let params = {
 			...details.value,
@@ -223,9 +229,9 @@
 			uni.$u.toast("请输入车辆载重");
 			return false;
 		}
-		if (!validateImage(params.fillImageList)) {
-			return false;
-		}
+		// if (!validateImage(params.fillImageList)) {
+		// 	return false;
+		// }
  
 		if (typeof(location.value.latitude) === 'undefined') {
 			console.log('定位获取失败', );
@@ -147,13 +147,13 @@
                 :previewFullImage="true" :isReadOnly="true"></u-upload>
             </view>
           </view>
-          <view class="order-detail-container-header-item">
+<!--          <view class="order-detail-container-header-item">
             <text class=" order-detail-container-header-title">卸车照片：</text>
             <view class="order-detail-container-header-content">
               <u-upload width="180" height="130" :fileList="putDownImages" name="3" multiple :maxCount="20"
                 :previewFullImage="true" :isReadOnly="true"></u-upload>
             </view>
-          </view>
+          </view> -->
         </view>
         <view v-else class="empty-image"
           style="width: 100%; display: flex; justify-content: center; align-items: center;">
@@ -386,13 +386,11 @@ const createQrCodeValid = (val) =&gt; {
 const handleUploadImage = (orderId, putType) => {
 	const data = dataGram.value;
   uni.showActionSheet({
-    itemList: ['上传装车图片', '上传卸车图片'],
+    itemList: ['上传装车图片'],
     success: function (res) {
       console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
       if(res.tapIndex === 0){
         uni.$u.route(`pages/order-info/order-driver/upload/index?orderId=${orderId}&carPlate=${data.garHandlerCarCode}&driver=${store.userInfo.userName}&putType=putOnImages`)
-      }else{
-        uni.$u.route(`pages/order-info/order-driver/upload/index?orderId=${orderId}&carPlate=${data.garHandlerCarCode}&driver=${store.userInfo.userName}&putType=putDownImages`)
       }
     },
     fail: function (res) {