info

.hbuilderx/launch.json

@@ -0,0 +1,16 @@
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
+    ]
+}

config.js

@@ -1,7 +1,7 @@
 // 应用全局配置
 module.exports = {
 	baseUrl: 'https://www.nuoyunr.com/admin-api',
-	//baseUrl: 'http://192.168.2.3:48080/admin-api',
+	//baseUrl: 'http://127.0.0.1:48080/admin-api',
 	imagesUrl: 'http://www.nuoyunr.com/lananRsc',
     baseImageUrl: 'https://www.nuoyunr.com/minio',
 	// 应用信息

pages/Login/launcherPage.vue

@@ -33,27 +33,31 @@
 			}
 		},
 		onLoad() {
+			console.log(getToken(),36);
 			if(getToken()){
 			   let info = uni.getStorageSync('userinfo')
-			   if(info&&info.roles[0]&&info.roles[0].roleKey&&uni.getStorageSync('roleSelect')=='shop'){
+			let chooseIdx =    uni.getStorageSync("chooseIdx")
-				   uni.navigateTo({
+			console.log(chooseIdx,chooseIdx&&chooseIdx == 0,40);
-				   	url:'/pages/index/synthesis'
+			if(chooseIdx==null){
-				   })
-			   }else if(info&&uni.getStorageSync('roleSelect')=='worker'){
-				   uni.navigateTo({
-				   	url:'/pages/staff/staff'
-				   })
-			   }
-			   else if(info&&uni.getStorageSync('roleSelect')=='jcgf'){
-			   				   uni.navigateTo({
-			   				   	url:'/pages/authority/authority'
-			   				   })
-			   }
-			   else{
 			   uni.navigateTo({
 				url:'/pages/Login/login'
 			   })
 			}
+			  else if(chooseIdx == 0){
+				   uni.navigateTo({
+				   	url:'/pages/index/synthesis'
+				   })
+			   }else if(chooseIdx == 2){
+				   uni.navigateTo({
+				   	url:'/pages/staff/staff'
+				   })
+			   }
+			   else if(chooseIdx == 1){
+			   				   uni.navigateTo({
+			   				   	url:'/pages/authority/authority'
+			   				   })
+			   }
+			
 			   
 			}else{
 				uni.navigateTo({

pages/Login/login.vue

@@ -111,19 +111,7 @@
 		  })
 		},
 		onLoad() {
-			if(getToken()){
-			   let info = uni.getStorageSync('userinfo')
-			   if(info.roles[0].roleKey == "jcyh"){
-				   uni.navigateTo({
-				   	url:'/pages/index/index'
-				   })
-			   }else if(info){
-				   uni.navigateTo({
-				   	url:'/pages/staff/staff'
-				   })
-			   }
 
-			}
 		},
 		computed: {
 		   buttonText() {
@@ -192,6 +180,7 @@
 				}
 			},
 			userinfo(){
+				uni.setStorageSync("chooseIdx",this.shopinfo)
 				if(this.shopinfo == 0){
 					uni.showLoading({
 						title: '加载中'

pages/index/Neworder.vue

@@ -129,6 +129,7 @@
 	import config from '@/config';
 	import request from '../../utils/request';
 	import upload from '@/utils/upload.js'
+	import { getToken, getTenantId } from '@/utils/auth'
 	export default {
 		data() {
 			return {
@@ -393,14 +394,18 @@
 								url: this.$baseUrl+'/common/uploadImg', // 仅为示例，非真实的接口地址
 								filePath: url,
 								name: 'file',
+								header: {
+									'Tenant-Id': getTenantId(),
+									'Authorization': 'Bearer ' + getToken()
+								},
 								formData: {
 									user: 'test'
 								},
 								success: (res) => {
 									try {
-										console.log(res,"1212")
 									let img = JSON.parse(res.data);
-									this.imagePath = this.imgs +  img.fileName
+									this.imagePath =  img.data.url
+									
 									setTimeout(() => {
 										this.vehicleLicenseOCR()												
 									}, 1000)
@@ -417,9 +422,10 @@
 						},	
 			async vehicleLicenseOCR(){
 				let data = {
-					 imagePath :this.baseUrl + this.imagePath
+					 imagePath :this.baseUrl +'/'+ this.imagePath
 					 //imagePath :'http://www.nuoyunr.com/lananRsc/detection/jsz.jpg'
 				}
+				console.log(this.baseUrl + this.imagePath,"1212")
 				let  res = await request({
 					url:'/partnerOwn/partner/vehicleLicenseOCR',
 					method: 'post',

pages/index/ordermanage.vue

@@ -146,7 +146,7 @@
 				});
 			},
 			async getList(){
-				this.infoDatas = []
+			
 				let res = await request({
 					url:'/partnerOwn/partner/inspectionList',
 					method: 'get',
@@ -158,6 +158,7 @@
 						pageNum:this.pageNum,
 					}
 				})	
+				console.log(res,161);
 				if(res.code == 200 ){
 					
 					if (this.pageNum != 1) {

pages/my/shoporder.vue

@@ -165,6 +165,7 @@
 				city:'',
 				area:'',
 				four:'',
+				baseImageUrl:this.$baseImageUrl
 				
 		
 			}
@@ -209,7 +210,7 @@
 				
 				this.fileList6.push(
 				{
-					url: res.data.partnerLogo
+					url: this.baseImageUrl+res.data.partnerLogo
 				}
 				) 	
 				console.log(this.fileList6);
@@ -218,7 +219,7 @@
 						if(it){
 							this.fileList4.push(
 							{
-								url: it
+								url: this.baseImageUrl+it
 							}) 
 						}
 					

pages/order/reservationlist.vue

@@ -127,7 +127,7 @@
 					params: data
 				})	
 				if(res.code == 200){
-						this.goodsList = res.rows
+					this.goodsList = this.goodsList.concat(res.rows)
 					let total =  res.total
 					this.totalPages = Math.ceil(total / this.pageSize);
 				}

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://app.liuyingyong.cn/build/download/db2ec950-7e06-11ef-aaf6-b32a2be96ade
+https://app.liuyingyong.cn/build/download/fdc856c0-90e5-11ef-aac0-018a70970415