Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev
							
								
								
									
										
											BIN
										
									
								
								sub-operation-service/src/assets/images/comfig.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 7.5 KiB | 
							
								
								
									
										
											BIN
										
									
								
								sub-operation-service/src/assets/images/nj1.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 483 KiB | 
							
								
								
									
										
											BIN
										
									
								
								sub-operation-service/src/assets/images/nj2.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 511 KiB | 
							
								
								
									
										
											BIN
										
									
								
								sub-operation-service/src/assets/images/nj3.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 502 KiB | 
							
								
								
									
										
											BIN
										
									
								
								sub-operation-service/src/assets/images/nx.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 6.8 KiB | 
							
								
								
									
										
											BIN
										
									
								
								sub-operation-service/src/assets/images/or.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 6.8 KiB | 
							
								
								
									
										
											BIN
										
									
								
								sub-operation-service/src/assets/images/pf.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 7.1 KiB | 
							
								
								
									
										
											BIN
										
									
								
								sub-operation-service/src/assets/images/us.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 9.6 KiB | 
| @ -20,7 +20,7 @@ | |||||||
|           <div style="display: flex"> |           <div style="display: flex"> | ||||||
|             <div style="display: flex"> |             <div style="display: flex"> | ||||||
|               <div> |               <div> | ||||||
|                 <img style="width: 40px; border-radius: 100%" src="../../../assets/images/carton.png" alt="" /> |                 <img style="width: 40px; border-radius: 100%" src="../../../assets/images/nx.png" alt="" /> | ||||||
|               </div> |               </div> | ||||||
|               <div style="margin-left: 10px; text-align: left"> |               <div style="margin-left: 10px; text-align: left"> | ||||||
|                 <div style="color: #aaa">服务年限</div> |                 <div style="color: #aaa">服务年限</div> | ||||||
| @ -29,7 +29,7 @@ | |||||||
|             </div> |             </div> | ||||||
|             <div style="display: flex; margin-left: 200px"> |             <div style="display: flex; margin-left: 200px"> | ||||||
|               <div> |               <div> | ||||||
|                 <img style="width: 40px; border-radius: 100%" src="../../../assets/images/carton.png" alt="" /> |                 <img style="width: 40px; border-radius: 100%" src="../../../assets/images/or.png" alt="" /> | ||||||
|               </div> |               </div> | ||||||
|               <div style="margin-left: 10px; text-align: left"> |               <div style="margin-left: 10px; text-align: left"> | ||||||
|                 <div style="color: #aaa">完成订单</div> |                 <div style="color: #aaa">完成订单</div> | ||||||
| @ -38,7 +38,7 @@ | |||||||
|             </div> |             </div> | ||||||
|             <div style="display: flex; margin-left: 200px"> |             <div style="display: flex; margin-left: 200px"> | ||||||
|               <div> |               <div> | ||||||
|                 <img style="width: 40px; border-radius: 100%" src="../../../assets/images/carton.png" alt="" /> |                 <img style="width: 40px; border-radius: 100%" src="../../../assets/images/pf.png" alt="" /> | ||||||
|               </div> |               </div> | ||||||
|               <div style="margin-left: 10px; text-align: left"> |               <div style="margin-left: 10px; text-align: left"> | ||||||
|                 <div style="color: #aaa">平均评分</div> |                 <div style="color: #aaa">平均评分</div> | ||||||
| @ -57,15 +57,24 @@ | |||||||
|           <div style="width: 100%; text-align: left; margin-top: 20px"> |           <div style="width: 100%; text-align: left; margin-top: 20px"> | ||||||
|             <div style="font-size: 15px; font-weight: bold">服务内容</div> |             <div style="font-size: 15px; font-weight: bold">服务内容</div> | ||||||
|             <div class="top_info"> |             <div class="top_info"> | ||||||
|               <div>水稻品种选择与推荐</div> |               <div style="display: flex; align-items: center"> | ||||||
|  |                 <img style="width: 15px; border-radius: 100%" src="../../../assets/images/comfig.png" alt="" /> | ||||||
|  |                 <div style="margin-left: 5px">水稻品种选择与推荐</div> | ||||||
|  |               </div> | ||||||
|               <div style="margin-left: 300px">指导</div> |               <div style="margin-left: 300px">指导</div> | ||||||
|             </div> |             </div> | ||||||
|             <div class="top_info"> |             <div class="top_info"> | ||||||
|               <div>稻田管理与施肥</div> |               <div style="display: flex; align-items: center"> | ||||||
|  |                 <img style="width: 15px; border-radius: 100%" src="../../../assets/images/comfig.png" alt="" /> | ||||||
|  |                 <div style="margin-left: 5px">稻田管理与施肥</div> | ||||||
|  |               </div> | ||||||
|               <div style="margin-left: 325px">防治</div> |               <div style="margin-left: 325px">防治</div> | ||||||
|             </div> |             </div> | ||||||
|             <div class="top_info"> |             <div class="top_info"> | ||||||
|               <div>收割与储存建议</div> |               <div style="display: flex; align-items: center"> | ||||||
|  |                 <img style="width: 15px; border-radius: 100%" src="../../../assets/images/comfig.png" alt="" /> | ||||||
|  |                 <div style="margin-left: 5px">收割与储存建议</div> | ||||||
|  |               </div> | ||||||
|               <div style="margin-left: 295px">植物技术指导</div> |               <div style="margin-left: 295px">植物技术指导</div> | ||||||
|             </div> |             </div> | ||||||
|           </div> |           </div> | ||||||
| @ -80,45 +89,125 @@ | |||||||
|           <div style="width: 100%; text-align: left; margin-top: 20px; display: flex"> |           <div style="width: 100%; text-align: left; margin-top: 20px; display: flex"> | ||||||
|             <div style="width: 50%"> |             <div style="width: 50%"> | ||||||
|               <div style="font-size: 15px; font-weight: bold">服务流程</div> |               <div style="font-size: 15px; font-weight: bold">服务流程</div> | ||||||
|               <div style="display: flex; margin-top: 20px"> |               <div style="display: flex; align-items: center; margin-top: 20px"> | ||||||
|                 <div> |                 <div> | ||||||
|                   <img style="width: 40px; border-radius: 100%" src="../../../assets/images/carton.png" alt="" /> |                   <div | ||||||
|  |                     style=" | ||||||
|  |                       width: 30px; | ||||||
|  |                       height: 30px; | ||||||
|  |                       border-radius: 100%; | ||||||
|  |                       background-color: #25bf82; | ||||||
|  |                       color: #fff; | ||||||
|  |                       font-size: 15px; | ||||||
|  |                       display: flex; | ||||||
|  |                       align-items: center; | ||||||
|  |                       justify-content: center; | ||||||
|  |                       font-weight: bold; | ||||||
|  |                     " | ||||||
|  |                   > | ||||||
|  |                     1 | ||||||
|  |                   </div> | ||||||
|  |                   <!-- <img style="width: 30px; border-radius: 100%" src="../../../assets/images/comfig.png" alt="" /> --> | ||||||
|                 </div> |                 </div> | ||||||
|                 <div style="margin-left: 10px; text-align: left"> |                 <div style="margin-left: 10px; text-align: left"> | ||||||
|                   <div style="color: #000000">需求沟通</div> |                   <div style="color: #000000">需求沟通</div> | ||||||
|                   <div>详细了解您的种植需求和田间情况</div> |                   <div>详细了解您的种植需求和田间情况</div> | ||||||
|                 </div> |                 </div> | ||||||
|               </div> |               </div> | ||||||
|               <div style="display: flex; margin-top: 20px"> |               <div style="display: flex; align-items: center; margin-top: 20px"> | ||||||
|                 <div> |                 <div> | ||||||
|                   <img style="width: 40px; border-radius: 100%" src="../../../assets/images/carton.png" alt="" /> |                   <div | ||||||
|  |                     style=" | ||||||
|  |                       width: 30px; | ||||||
|  |                       height: 30px; | ||||||
|  |                       border-radius: 100%; | ||||||
|  |                       background-color: #25bf82; | ||||||
|  |                       color: #fff; | ||||||
|  |                       font-size: 15px; | ||||||
|  |                       display: flex; | ||||||
|  |                       align-items: center; | ||||||
|  |                       justify-content: center; | ||||||
|  |                       font-weight: bold; | ||||||
|  |                     " | ||||||
|  |                   > | ||||||
|  |                     2 | ||||||
|  |                   </div> | ||||||
|  |                   <!-- <img style="width: 30px; border-radius: 100%" src="../../../assets/images/comfig.png" alt="" /> --> | ||||||
|                 </div> |                 </div> | ||||||
|                 <div style="margin-left: 10px; text-align: left"> |                 <div style="margin-left: 10px; text-align: left"> | ||||||
|                   <div style="color: #000000">方案制定</div> |                   <div style="color: #000000">方案制定</div> | ||||||
|                   <div>根据您的需求和实际情况,制定详细的服务方案</div> |                   <div>根据您的需求和实际情况,制定详细的服务方案</div> | ||||||
|                 </div> |                 </div> | ||||||
|               </div> |               </div> | ||||||
|               <div style="display: flex; margin-top: 20px"> |               <div style="display: flex; align-items: center; margin-top: 20px"> | ||||||
|                 <div> |                 <div> | ||||||
|                   <img style="width: 40px; border-radius: 100%" src="../../../assets/images/carton.png" alt="" /> |                   <div | ||||||
|  |                     style=" | ||||||
|  |                       width: 30px; | ||||||
|  |                       height: 30px; | ||||||
|  |                       border-radius: 100%; | ||||||
|  |                       background-color: #25bf82; | ||||||
|  |                       color: #fff; | ||||||
|  |                       font-size: 15px; | ||||||
|  |                       display: flex; | ||||||
|  |                       align-items: center; | ||||||
|  |                       justify-content: center; | ||||||
|  |                       font-weight: bold; | ||||||
|  |                     " | ||||||
|  |                   > | ||||||
|  |                     3 | ||||||
|  |                   </div> | ||||||
|  |                   <!-- <img style="width: 30px; border-radius: 100%" src="../../../assets/images/comfig.png" alt="" /> --> | ||||||
|                 </div> |                 </div> | ||||||
|                 <div style="margin-left: 10px; text-align: left"> |                 <div style="margin-left: 10px; text-align: left"> | ||||||
|                   <div style="color: #000000">签订协议</div> |                   <div style="color: #000000">签订协议</div> | ||||||
|                   <div>双方确认服务方案,签订服务协议</div> |                   <div>双方确认服务方案,签订服务协议</div> | ||||||
|                 </div> |                 </div> | ||||||
|               </div> |               </div> | ||||||
|               <div style="display: flex; margin-top: 20px"> |               <div style="display: flex; align-items: center; margin-top: 20px"> | ||||||
|                 <div> |                 <div> | ||||||
|                   <img style="width: 40px; border-radius: 100%" src="../../../assets/images/carton.png" alt="" /> |                   <div | ||||||
|  |                     style=" | ||||||
|  |                       width: 30px; | ||||||
|  |                       height: 30px; | ||||||
|  |                       border-radius: 100%; | ||||||
|  |                       background-color: #25bf82; | ||||||
|  |                       color: #fff; | ||||||
|  |                       font-size: 15px; | ||||||
|  |                       display: flex; | ||||||
|  |                       align-items: center; | ||||||
|  |                       justify-content: center; | ||||||
|  |                       font-weight: bold; | ||||||
|  |                     " | ||||||
|  |                   > | ||||||
|  |                     4 | ||||||
|  |                   </div> | ||||||
|  |                   <!-- <img style="width: 30px; border-radius: 100%" src="../../../assets/images/comfig.png" alt="" /> --> | ||||||
|                 </div> |                 </div> | ||||||
|                 <div style="margin-left: 10px; text-align: left"> |                 <div style="margin-left: 10px; text-align: left"> | ||||||
|                   <div style="color: #000000">服务实施</div> |                   <div style="color: #000000">服务实施</div> | ||||||
|                   <div>按照协议约定的时间和内容,提供专业的种植服务</div> |                   <div>按照协议约定的时间和内容,提供专业的种植服务</div> | ||||||
|                 </div> |                 </div> | ||||||
|               </div> |               </div> | ||||||
|               <div style="display: flex; margin-top: 20px"> |               <div style="display: flex; align-items: center; margin-top: 20px"> | ||||||
|                 <div> |                 <div> | ||||||
|                   <img style="width: 40px; border-radius: 100%" src="../../../assets/images/carton.png" alt="" /> |                   <div | ||||||
|  |                     style=" | ||||||
|  |                       width: 30px; | ||||||
|  |                       height: 30px; | ||||||
|  |                       border-radius: 100%; | ||||||
|  |                       background-color: #25bf82; | ||||||
|  |                       color: #fff; | ||||||
|  |                       font-size: 15px; | ||||||
|  |                       display: flex; | ||||||
|  |                       align-items: center; | ||||||
|  |                       justify-content: center; | ||||||
|  |                       font-weight: bold; | ||||||
|  |                     " | ||||||
|  |                   > | ||||||
|  |                     5 | ||||||
|  |                   </div> | ||||||
|  |                   <!-- <img style="width: 30px; border-radius: 100%" src="../../../assets/images/comfig.png" alt="" /> --> | ||||||
|                 </div> |                 </div> | ||||||
|                 <div style="margin-left: 10px; text-align: left"> |                 <div style="margin-left: 10px; text-align: left"> | ||||||
|                   <div style="color: #000000">验收评价</div> |                   <div style="color: #000000">验收评价</div> | ||||||
| @ -174,7 +263,7 @@ | |||||||
|             <div style="font-size: 15px; font-weight: bold">服务案例</div> |             <div style="font-size: 15px; font-weight: bold">服务案例</div> | ||||||
|             <div style="margin-top: 20px; display: flex; justify-content: space-evenly"> |             <div style="margin-top: 20px; display: flex; justify-content: space-evenly"> | ||||||
|               <div style="display: flex; flex-direction: column"> |               <div style="display: flex; flex-direction: column"> | ||||||
|                 <img style="width: 270px; height: 150px" src="../../../assets/images/carton.png" alt="" /> |                 <img style="width: 270px; height: 150px" src="../../../assets/images/nj1.png" alt="" /> | ||||||
|                 <div style="border: 1px solid #eee; border-top: none; width: 280px; padding: 10px"> |                 <div style="border: 1px solid #eee; border-top: none; width: 280px; padding: 10px"> | ||||||
|                   <div style="font-size: 15px; font-weight: bold">岳池县稻田增产案例</div> |                   <div style="font-size: 15px; font-weight: bold">岳池县稻田增产案例</div> | ||||||
|                   <el-rate v-model="value1" /> |                   <el-rate v-model="value1" /> | ||||||
| @ -182,7 +271,7 @@ | |||||||
|                 </div> |                 </div> | ||||||
|               </div> |               </div> | ||||||
|               <div style="display: flex; flex-direction: column"> |               <div style="display: flex; flex-direction: column"> | ||||||
|                 <img style="width: 270px; height: 150px" src="../../../assets/images/carton.png" alt="" /> |                 <img style="width: 270px; height: 150px" src="../../../assets/images/nj2.png" alt="" /> | ||||||
|                 <div style="border: 1px solid #eee; border-top: none; width: 280px; padding: 10px"> |                 <div style="border: 1px solid #eee; border-top: none; width: 280px; padding: 10px"> | ||||||
|                   <div style="font-size: 15px; font-weight: bold">邻水县病虫害防治案例</div> |                   <div style="font-size: 15px; font-weight: bold">邻水县病虫害防治案例</div> | ||||||
|                   <el-rate v-model="value1" /> |                   <el-rate v-model="value1" /> | ||||||
| @ -190,7 +279,7 @@ | |||||||
|                 </div> |                 </div> | ||||||
|               </div> |               </div> | ||||||
|               <div style="display: flex; flex-direction: column"> |               <div style="display: flex; flex-direction: column"> | ||||||
|                 <img style="width: 270px; height: 150px" src="../../../assets/images/carton.png" alt="" /> |                 <img style="width: 270px; height: 150px" src="../../../assets/images/nj3.png" alt="" /> | ||||||
|                 <div style="border: 1px solid #eee; border-top: none; width: 280px; padding: 10px"> |                 <div style="border: 1px solid #eee; border-top: none; width: 280px; padding: 10px"> | ||||||
|                   <div style="font-size: 15px; font-weight: bold">邻水县稻田增产案例</div> |                   <div style="font-size: 15px; font-weight: bold">邻水县稻田增产案例</div> | ||||||
|                   <el-rate v-model="value1" /> |                   <el-rate v-model="value1" /> | ||||||
| @ -204,7 +293,7 @@ | |||||||
|             <div style="width: 100%; color: #9ea4a7; margin-top: 20px; border: 1px solid #eee; padding: 10px; border-radius: 10px"> |             <div style="width: 100%; color: #9ea4a7; margin-top: 20px; border: 1px solid #eee; padding: 10px; border-radius: 10px"> | ||||||
|               <div style="display: flex; align-items: center"> |               <div style="display: flex; align-items: center"> | ||||||
|                 <div> |                 <div> | ||||||
|                   <img style="width: 50px; border-radius: 100%" src="../../../assets/images/carton.png" alt="" /> |                   <img style="width: 50px; border-radius: 100%" src="../../../assets/images/us.png" alt="" /> | ||||||
|                 </div> |                 </div> | ||||||
|                 <div style="margin-left: 10px; text-align: left"> |                 <div style="margin-left: 10px; text-align: left"> | ||||||
|                   <div style="color: #000000">刘老板</div> |                   <div style="color: #000000">刘老板</div> | ||||||
| @ -219,7 +308,7 @@ | |||||||
|             <div style="width: 100%; color: #9ea4a7; margin-top: 20px; border: 1px solid #eee; padding: 10px; border-radius: 10px"> |             <div style="width: 100%; color: #9ea4a7; margin-top: 20px; border: 1px solid #eee; padding: 10px; border-radius: 10px"> | ||||||
|               <div style="display: flex; align-items: center"> |               <div style="display: flex; align-items: center"> | ||||||
|                 <div> |                 <div> | ||||||
|                   <img style="width: 50px; border-radius: 100%" src="../../../assets/images/carton.png" alt="" /> |                   <img style="width: 50px; border-radius: 100%" src="../../../assets/images/us.png" alt="" /> | ||||||
|                 </div> |                 </div> | ||||||
|                 <div style="margin-left: 10px; text-align: left"> |                 <div style="margin-left: 10px; text-align: left"> | ||||||
|                   <div style="color: #000000">王老板</div> |                   <div style="color: #000000">王老板</div> | ||||||
|  | |||||||