Explorar el Código

增加订单轨迹功能

@dongkboy hace 10 meses
padre
commit
b678ce12f0
Se han modificado 4 ficheros con 94 adiciones y 15 borrados
  1. 2 2
      config/baseUrl.js
  2. 2 3
      manifest.json
  3. 1 9
      pages/orders/orders.vue
  4. 89 1
      pages/orders/subOrders.vue

+ 2 - 2
config/baseUrl.js

@@ -4,12 +4,12 @@ let socketUrl = "";
 if (process.env.NODE_ENV === 'development') {
 	// 开发环境
 	// baseUrl = "http://192.168.0.106:8080"; //屈晨
-	// baseUrl = "http://192.168.0.55:8080"; //蔡雅茹
+	baseUrl = "http://192.168.0.253:8080"; //蔡雅茹
 	// baseUrl = "https://test.baoxianzhanggui.com/web-api"; //测试
 	// h5BaseUrl = "https://test.baoxianzhanggui.com/h5";
 	// baseUrl = "https://pre.baoxianzhanggui.com/web-api"; //预生产
 	// h5BaseUrl = "https://pre.baoxianzhanggui.com/h5";
-	baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //生产
+	// baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //生产
 	h5BaseUrl = "https://sxzgkj.baoxianzhanggui.com/h5";
 	socketUrl = "";
 } else if (process.env.NODE_ENV === 'production') {

+ 2 - 3
manifest.json

@@ -7,8 +7,8 @@
 		"sizes": "分辨率,192x192",
 		"src": "图片路径"
 	}],
-	"versionName": "2.4.8",
-	"versionCode": 248,
+	"versionName": "2.5.1",
+	"versionCode": 251,
 	"app-plus": {
 		"error": {
 			"url": "hybrid/html/error.html"
@@ -48,7 +48,6 @@
 					"prompt": "应用保存运行状态等信息,需要获取读写手机存储(系统提示为访问设备上的照片、媒体内容和文件)权限,请允许。"
 				},
 				"permissions": [
-					
 					"<uses-feature android:name=\"android.hardware.camera\"/>",
 					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
 					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",

+ 1 - 9
pages/orders/orders.vue

@@ -108,8 +108,6 @@
 					</view>
 				</view>
 				<view class="orderItemPane-below dis a-c  j-end ">
-					<u-button v-if="item.orderstatus!='3'" type="error" size="mini" :hair-line="false"
-						:custom-style="{fontSize:'15px'}" :plain="true" @click="openSteps(item)">订单轨迹</u-button>
 					<u-button v-if="item.orderstatus!='3'" type="primary" size="mini" :hair-line="false"
 						:custom-style="{fontSize:'15px'}" :plain="true" @click="quotehistory(item)">报价历史</u-button>
 					<u-button v-if="item.orderstatus!='3'" :custom-style="{fontSize:'15px'}" type="warning" size="mini"
@@ -484,13 +482,7 @@
 					url: `/pages/orders/quoteHistory?orderno=${JSON.stringify(params)}`
 				})
 			},
-			//打开步骤条弹框
-			async openSteps(val) {
-				console.log(val)
-				// this.stepShow=true
-				// let stepList = this.$http.get("/insurance/track/queryBySuborder?suborder="+val.orderno)
-				// console.log(stepList)
-			},
+
 			//编辑
 			CloseEdit(val) {
 				uni.navigateTo({

+ 89 - 1
pages/orders/subOrders.vue

@@ -58,6 +58,8 @@
 							v-if="item.orderstatus==1  && ['中煤财险','永诚财险','国任财险','大家财险','渤海财险','恒邦财险','安盛天平','中国人寿','众安财险','太平财险','华农财险','泰康财险'].includes(item.inscompany)"
 							size="mini" type="error" :plain="true" :custom-style="{fontSize:'14px'}"
 							@click="underwriting(item.id,item.inscompany)">更新订单</u-button>
+						<u-button type="error" size="mini" :custom-style="{fontSize:'14px'}"
+							@click="openSteps(item.id)">订单轨迹</u-button>
 						<u-button size="mini" type="primary" :custom-style="{fontSize:'14px',background:'#FF5600'}"
 							@click="bjdpreview(item.id)">报价单</u-button>
 						<u-button size="mini" type="primary" :custom-style="{fontSize:'14px'}"
@@ -83,6 +85,30 @@
 		<!-- <u-popup v-model="trajectoryShow" mode="center" border-radius="8" width="80%">
 			<u-steps mode="number" :list="numList" :current="2" direction="column" style="padding: 20px;"></u-steps>
 		</u-popup> -->
+		<u-modal v-model="OrderTrackShow" title="订单轨迹"
+			:title-style="{fontWeight: 'bold',borderBottom:'1px solid #f2f2f2',padding:'10px'}"
+			:show-cancel-button="false"
+			:confirm-style="{background:'#E6EEFF',color:'#0052FF',height:'40px',lineHeight:'40px'}"
+			@confirm="OrderTrackShow=false" confirm-text="关闭">
+			<view class="slot-content dis  a-c  p-2">
+				<view class="dis a-c j-c f-c">
+					<view class="TrackRecord   dis f-c a-start" v-for="(item,index) in TrackRecordList" :key="index">
+						<view class="dis a-c">
+							<view class="circle dis j-c a-c">{{index+1}}</view>
+							<text class="title">{{item.orderStatus}}</text>
+						</view>
+						<view class="dis f-c  content  mt-2">
+							<view class="">
+								<text>保险公司:{{item.insCompany}}</text>
+								<text style="margin-left: 10px;">提交人:{{item.operator}}</text>
+							</view>
+							<text>创建时间:{{item.createTime}}</text>
+						</view>
+					</view>
+				</view>
+
+			</view>
+		</u-modal>
 	</view>
 </template>
 <script>
@@ -94,6 +120,8 @@
 	export default {
 		data() {
 			return {
+				TrackRecordList: [],
+				OrderTrackShow: false,
 				show: true,
 				modeClass: 'fade',
 				// trajectoryShow: false,
@@ -166,6 +194,23 @@
 			this.querylist();
 		},
 		methods: {
+			//打开步骤条弹框
+			async openSteps(orderno) {
+				let res = await this.$http.get("/insurance/track/queryBySuborder?suborder=" + orderno)
+				if (res.code == '200') {
+					this.statusList.map(valA => {
+						res.data.map(valB => {
+							if (valA.value == valB.orderStatus) {
+								valB.orderStatus = valA.label;
+							}
+							return valB
+						})
+					})
+					this.TrackRecordList = res.data;
+					this.OrderTrackShow = true;
+				}
+			},
+
 			handle(type) {
 				this.show = !this.show
 				this.modeClass = type
@@ -203,7 +248,7 @@
 			//付款码
 			Payment(id, type) {
 				let pro = this.quotationType.themeCode;
-				if (pro !== "QD") {
+				if (pro == "QD") {
 					uni.navigateTo({
 						url: "/pages/orders/paymentCode?companyId=" + id + '&apiType=' + type,
 					})
@@ -704,4 +749,47 @@
 
 		}
 	}
+
+	.TrackRecord {
+		width: 100%;
+		padding: 10px 20px;
+
+		.circle {
+			width: 18px;
+			height: 18px;
+			background: #F0F0F0;
+			border-radius: 50%;
+			font-size: 22rpx;
+			font-weight: bold;
+		}
+
+		.title {
+			color: #333333;
+			font-size: 12px;
+			margin-left: 12px;
+			font-weight: bold;
+		}
+
+		.content {
+			border-left: 1px solid #E2E5EB;
+			padding-left: 20px;
+			margin-left: 7px;
+
+			text {
+				font-size: 22rpx;
+				color: rgba(51, 51, 51, 0.85);
+			}
+		}
+
+		&:last-child {
+			.circle {
+				background-color: #E6EEFF;
+				color: #0052FF;
+			}
+
+			.title {
+				color: #0052FF;
+			}
+		}
+	}
 </style>