Merge branch 'master' of http://git.scdxtc.com/chen/flying-monkey
						commit
						aedb30e744
					
				|  | @ -1,6 +1,8 @@ | |||
| <template> | ||||
|     <view class="content"> | ||||
|         <statusNav navBarTitle="增值服务"></statusNav> | ||||
|         <container-subgroup-two> | ||||
|             <view slot="content" style="margin: 0 -30rpx;"> | ||||
|                 <view class="select-type"> | ||||
|                     <view class="text">选择类型</view> | ||||
|                     <view class="type"> | ||||
|  | @ -67,8 +69,8 @@ | |||
|                     <view class="scene-img"> | ||||
|                         <view class="title">现场图片</view> | ||||
|                         <view class="img-content"> | ||||
|                   <image class="img" src="../../static/del/img001.png" mode=""></image>  | ||||
|                       <image class="img" src="../../static/del/img001.png" mode=""></image> | ||||
|                             <image class="img" src="../../static/del/img003.png" mode=""></image> | ||||
|                             <image class="img" src="../../static/del/img003.png" mode=""></image> | ||||
|                         </view> | ||||
|                         <view class="iocn-content"> | ||||
|                             <image class="icon" src="../../static/iocn/jia.png" mode=""></image> | ||||
|  | @ -76,14 +78,22 @@ | |||
|                     </view> | ||||
|                 </view> | ||||
|                 <button class="submit-button" type="default">确认提交</button> | ||||
| 
 | ||||
|             </view> | ||||
|           </container-subgroup-two> | ||||
|             | ||||
|     </view> | ||||
|     </view> | ||||
|   | ||||
| </template> | ||||
| 
 | ||||
| <script> | ||||
|     import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue'; | ||||
|     import statusNav from '../../components/status-nav.vue'; | ||||
|     export default { | ||||
|         components: { | ||||
|             statusNav, | ||||
|             containerSubgroupTwo, | ||||
| 
 | ||||
|         }, | ||||
|         data() { | ||||
|  | @ -109,7 +119,7 @@ | |||
|             } | ||||
|         }, | ||||
|         onLoad(op) { | ||||
| 			if(op.index!=undefined) this.typeIndex = op.index; | ||||
|             if (op.index != undefined) this.typeIndex = op.index; | ||||
|         }, | ||||
|         methods: { | ||||
|             typeIndexFun(index) { | ||||
|  | @ -120,13 +130,12 @@ | |||
| </script> | ||||
| 
 | ||||
| <style> | ||||
|     .content { | ||||
|         padding-top: 80rpx; | ||||
|         padding-bottom: 80rpx; | ||||
|     } | ||||
|    .cor{ | ||||
|     .content {} | ||||
| 
 | ||||
|     .cor { | ||||
|         color: #FF0000; | ||||
|     } | ||||
| 
 | ||||
|     .select-type { | ||||
|         display: flex; | ||||
|         margin-top: 10rpx; | ||||
|  | @ -135,6 +144,7 @@ | |||
|         align-items: center; | ||||
|         padding: 0rpx 28rpx; | ||||
|     } | ||||
| 
 | ||||
|     .submit-button { | ||||
|         width: 686rpx; | ||||
|         border-radius: 50rpx; | ||||
|  | @ -146,6 +156,7 @@ | |||
|         text-align: center; | ||||
|         font-size: 30rpx; | ||||
|     } | ||||
| 
 | ||||
|     .select-type .text { | ||||
|         font-size: 28rpx; | ||||
|         color: #333333; | ||||
|  | @ -227,10 +238,12 @@ | |||
|         justify-content: space-between; | ||||
|         color: #333333; | ||||
|     } | ||||
|     .supplement-from .li .input{ | ||||
| 
 | ||||
|     .supplement-from .li .input { | ||||
|         text-align: right; | ||||
|         font-size: 24rpx | ||||
|     } | ||||
| 
 | ||||
|     .supplement-from .li-textarea { | ||||
|         font-size: 27rpx; | ||||
|         line-height: 27rpx; | ||||
|  | @ -239,11 +252,12 @@ | |||
|         padding-bottom: 13rpx; | ||||
|     } | ||||
| 
 | ||||
|     .supplement-from .li-textarea .title{ | ||||
|     .supplement-from .li-textarea .title { | ||||
|         padding-top: 26rpx; | ||||
|         padding-bottom: 17rpx; | ||||
|     } | ||||
|      .supplement-from .li-textarea .textarea{ | ||||
| 
 | ||||
|     .supplement-from .li-textarea .textarea { | ||||
|         width: 100%; | ||||
|         height: 127rpx; | ||||
|         background-color: #F5F5F5; | ||||
|  | @ -251,33 +265,38 @@ | |||
|         padding: 20rpx; | ||||
|         font-size: 24rpx | ||||
|     } | ||||
|      .scene-img{ | ||||
| 
 | ||||
|     .scene-img { | ||||
|         display: flex; | ||||
|         margin-top: 27rpx; | ||||
|         padding-bottom: 30rpx; | ||||
|     } | ||||
|       .scene-img .title{ | ||||
| 
 | ||||
|     .scene-img .title { | ||||
|         margin-right: 28rpx; | ||||
|         font-size: 26rpx; | ||||
|         color: #333333; | ||||
|     } | ||||
|      .scene-img .img-content .img{ | ||||
| 
 | ||||
|     .scene-img .img-content .img { | ||||
|         width: 170rpx; | ||||
|         height: 130rpx; | ||||
|         margin-right: 10rpx; | ||||
|     } | ||||
|      .scene-img .iocn-content{ | ||||
| 
 | ||||
|     .scene-img .iocn-content { | ||||
|         width: 135rpx; | ||||
|         height: 135rpx; | ||||
|         background-color: #DCDCDC; | ||||
|          display: flex;align-items: center; | ||||
| justify-content: center; | ||||
|         display: flex; | ||||
|         align-items: center; | ||||
|         justify-content: center; | ||||
|     } | ||||
|      .scene-img .iocn-content .icon{ | ||||
| 
 | ||||
|     .scene-img .iocn-content .icon { | ||||
| 
 | ||||
|         width: 62rpx; | ||||
|         height: 62rpx; | ||||
| 
 | ||||
|     } | ||||
| </style> | ||||
| 
 | ||||
|  |  | |||
|  | @ -2,7 +2,8 @@ | |||
|     <view class="content"> | ||||
|      <statusNav navBarTitle="客户(查询结果列表)"></statusNav> | ||||
|       | ||||
|      <view class="client-content"> | ||||
|       <container-subgroup-two > | ||||
|      <view class="client-content" slot="content" style="margin: 0 -30rpx;"> | ||||
|          <view class="li"> | ||||
|           <view class="li-content"> | ||||
|               <view class=""> | ||||
|  | @ -36,15 +37,19 @@ | |||
|           </view> | ||||
|          </view> | ||||
|      </view> | ||||
|            </container-subgroup-two > | ||||
|       | ||||
|       | ||||
|     </view> | ||||
| </template> | ||||
| 
 | ||||
| <script> | ||||
|      | ||||
|          import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue'; | ||||
|  import statusNav from '../../components/status-nav.vue'; | ||||
|  export default { | ||||
|      components: { | ||||
|          statusNav | ||||
|          statusNav, | ||||
|          containerSubgroupTwo | ||||
|      }, | ||||
|         data() { | ||||
|             return { | ||||
|  | @ -59,9 +64,7 @@ | |||
| 
 | ||||
|      | ||||
| <style> | ||||
|     .content{ | ||||
|         padding-top: 80rpx; | ||||
|     } | ||||
|     | ||||
| .client-content .li{ | ||||
|     background-color: #FFFFFF; | ||||
|     margin-top: 20rpx; | ||||
|  |  | |||
|  | @ -1,9 +1,10 @@ | |||
| <template> | ||||
|     <view class="content"> | ||||
|         <statusNav navBarTitle="(备品)查询结果"></statusNav> | ||||
|         <view class="dataQuery-content"> | ||||
|             <view class="li"> | ||||
|          | ||||
|         <container-subgroup-two > | ||||
|         <view class="dataQuery-content"  slot="content" style="margin: 0 -30rpx;"> | ||||
|             <view class="li"> | ||||
|                 <view class="title"> | ||||
|                     项目名称:湖南工业大学生化学院三楼会议室 | ||||
|                 </view> | ||||
|  | @ -112,14 +113,17 @@ | |||
|                 </view> | ||||
|             </view> | ||||
|         </view> | ||||
|        </container-subgroup-two > | ||||
|    </view> | ||||
| </template> | ||||
| 
 | ||||
| <script> | ||||
|          import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue'; | ||||
|     import statusNav from '../../components/status-nav.vue'; | ||||
|     export default { | ||||
|         components: { | ||||
|             statusNav | ||||
|             statusNav, | ||||
|             containerSubgroupTwo | ||||
|         }, | ||||
|         data() { | ||||
|             return { | ||||
|  | @ -133,15 +137,15 @@ | |||
| </script> | ||||
| 
 | ||||
| <style> | ||||
|     .content{ | ||||
|         padding-top: 80rpx; | ||||
|     } | ||||
| 
 | ||||
| 
 | ||||
|     .dataQuery-content { | ||||
|         font-size: 24rpx; | ||||
|         color: #333333; | ||||
|         margin-top: 15rpx; | ||||
|     } | ||||
|     .dataQuery-content .li{ | ||||
| 
 | ||||
|     .dataQuery-content .li { | ||||
|         background-color: #FFFFFF; | ||||
|         padding: 26rpx 28rpx; | ||||
| 
 | ||||
|  | @ -152,25 +156,31 @@ | |||
|     .dataQuery-content .li { | ||||
|         position: relative; | ||||
|     } | ||||
| .dataQuery-content .li .text-content{ | ||||
| 
 | ||||
|     .dataQuery-content .li .text-content { | ||||
|         display: flex; | ||||
|         border-bottom: 2rpx solid #EEEEEE; | ||||
|         padding-bottom: 10rpx; | ||||
| 
 | ||||
| } | ||||
| .dataQuery-content .li .text-content .left{ | ||||
|     } | ||||
| 
 | ||||
|     .dataQuery-content .li .text-content .left { | ||||
|         width: 48%; | ||||
| } | ||||
| .dataQuery-content .li .text-content  .text{ | ||||
|     } | ||||
| 
 | ||||
|     .dataQuery-content .li .text-content .text { | ||||
|         margin-top: 20rpx; | ||||
| } | ||||
| .cor{ | ||||
|     } | ||||
| 
 | ||||
|     .cor { | ||||
|         color: #ff9000; | ||||
| } | ||||
| .cor1{ | ||||
|     } | ||||
| 
 | ||||
|     .cor1 { | ||||
|         color: #999999; | ||||
| } | ||||
| .dataQuery-content .li .icon{ | ||||
|     } | ||||
| 
 | ||||
|     .dataQuery-content .li .icon { | ||||
|         background-image: url(../../static/iocn/zc.png); | ||||
|         width: 125rpx; | ||||
|         height: 91rpx; | ||||
|  | @ -178,18 +188,19 @@ | |||
|         align-items: center; | ||||
|         box-sizing: border-box; | ||||
|         background-size: 100%; | ||||
|     padding-left:30rpx; | ||||
|         padding-left: 30rpx; | ||||
|         right: 20rpx; | ||||
|         top: 20rpx; | ||||
|         position: absolute; | ||||
| } | ||||
| .dataQuery-content .li .icon .icon-text{ | ||||
|     } | ||||
| 
 | ||||
|     .dataQuery-content .li .icon .icon-text { | ||||
|         transform: rotateZ(20deg); | ||||
|         color: #53e5d0; | ||||
| 
 | ||||
| } | ||||
|     } | ||||
| 
 | ||||
| .dataQuery-content .li .icon1{ | ||||
|     .dataQuery-content .li .icon1 { | ||||
|         background-image: url(../../static/iocn/dwx.png); | ||||
|         width: 125rpx; | ||||
|         height: 91rpx; | ||||
|  | @ -197,14 +208,15 @@ | |||
|         align-items: center; | ||||
|         box-sizing: border-box; | ||||
|         background-size: 100%; | ||||
|     padding-left:30rpx; | ||||
|         padding-left: 30rpx; | ||||
|         right: 20rpx; | ||||
|         top: 20rpx; | ||||
|         position: absolute; | ||||
| } | ||||
| .dataQuery-content .li .icon1 .icon-text{ | ||||
|     } | ||||
| 
 | ||||
|     .dataQuery-content .li .icon1 .icon-text { | ||||
|         transform: rotateZ(20deg); | ||||
|         color: #ff0006; | ||||
| 
 | ||||
| } | ||||
|     } | ||||
| </style> | ||||
|  |  | |||
|  | @ -1,7 +1,8 @@ | |||
| <template> | ||||
|     <view class="content"> | ||||
|         <statusNav navBarTitle="客户详情"></statusNav> | ||||
|       | ||||
|           <container-subgroup-two> | ||||
|         <view  slot="content" style="margin: 0 -30rpx;"> | ||||
|             <view class="details-nav"> | ||||
|                 <view class="li"> | ||||
|                     <image class="icon" src="../../static/iocn/ty.png" mode=""></image> | ||||
|  | @ -22,7 +23,6 @@ | |||
|                     </view> | ||||
|                 </view> | ||||
|             </view> | ||||
| 
 | ||||
|             <view class="details-content"> | ||||
|                 <view class="title"> | ||||
|                     <image class="img" src="../../static/iocn/dn.png" mode=""></image> | ||||
|  | @ -158,14 +158,20 @@ | |||
|                 </view> | ||||
|                 <image class="icon1" src="../../static/iocn/dh.png" mode=""></image> | ||||
|             </view> | ||||
|                  | ||||
|         </view> | ||||
|  </container-subgroup-two> | ||||
| 
 | ||||
|     </view> | ||||
| </template> | ||||
| 
 | ||||
| <script> | ||||
|      import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue'; | ||||
|     import statusNav from '../../components/status-nav.vue'; | ||||
|     export default { | ||||
|         components: { | ||||
|           statusNav | ||||
|             statusNav, | ||||
|             containerSubgroupTwo | ||||
|         }, | ||||
|         data() { | ||||
|             return { | ||||
|  | @ -182,7 +188,6 @@ | |||
| 
 | ||||
| <style> | ||||
|     .content { | ||||
|         padding-top: 100rpx; | ||||
|         padding-right: 27rpx; | ||||
|         padding-left: 27rpx; | ||||
|     } | ||||
|  | @ -213,7 +218,7 @@ | |||
|         background-color: #FFFFFF; | ||||
|         padding: 20rpx 18rpx; | ||||
|         border-bottom: 2rpx solid #DFDFDF; | ||||
|         border-radius:0rpx 0rpx 10rpx 10rpx; | ||||
|         border-radius: 0rpx 0rpx 10rpx 10rpx; | ||||
|     } | ||||
| 
 | ||||
|     .details-content .title { | ||||
|  | @ -254,12 +259,14 @@ | |||
|     .cor1 { | ||||
|         color: #FF4C4C; | ||||
|     } | ||||
|     .project-list{ | ||||
| 
 | ||||
|     .project-list { | ||||
|         background-color: #FFFFFF; | ||||
|         padding: 22rpx 18rpx; | ||||
|         margin-top: 20rpx; | ||||
|     } | ||||
|     .project-list .title-content{ | ||||
| 
 | ||||
|     .project-list .title-content { | ||||
|         display: flex; | ||||
|         justify-content: space-between; | ||||
|         padding-bottom: 16rpx; | ||||
|  | @ -267,17 +274,19 @@ | |||
|         border-bottom: 2rpx solid #E5E5E5; | ||||
|         color: #999999; | ||||
|     } | ||||
|     .project-list .title-content .title{ | ||||
| 
 | ||||
|     .project-list .title-content .title { | ||||
|         display: flex; | ||||
|         align-items: center; | ||||
|     } | ||||
| 
 | ||||
|     .project-list .title-content .title .icon{ | ||||
|     .project-list .title-content .title .icon { | ||||
|         width: 23rpx; | ||||
|         height: 25rpx; | ||||
|         margin-right: 10rpx; | ||||
|     } | ||||
|     .project-list .title-content .date{ | ||||
| 
 | ||||
|     .project-list .title-content .date { | ||||
|         width: 120rpx; | ||||
|         height: 40rpx; | ||||
|         display: flex; | ||||
|  | @ -289,28 +298,32 @@ | |||
|         display: flex; | ||||
|         align-items: center; | ||||
|     } | ||||
|     .project-list .title-content .date .icon{ | ||||
| 
 | ||||
|     .project-list .title-content .date .icon { | ||||
|         width: 12rpx; | ||||
|         height: 18rpx; | ||||
|         margin-left: 5rpx; | ||||
|     } | ||||
|     .project-list-content .li{ | ||||
| 
 | ||||
|     .project-list-content .li { | ||||
|         display: flex; | ||||
|         justify-content: space-between; | ||||
|         border-bottom: 2rpx solid #E5E5E5; | ||||
|         padding: 18rpx; | ||||
|     } | ||||
|     .project-list-content .li .text{ | ||||
| 
 | ||||
|     .project-list-content .li .text { | ||||
|         font-weight: bold; | ||||
|         color: #4ca5ff; | ||||
|         font-size: 24rpx | ||||
|     } | ||||
|     .project-list-content .li .date{ | ||||
| 
 | ||||
|     .project-list-content .li .date { | ||||
|         color: #888888; | ||||
|         font-size: 24rpx | ||||
|     } | ||||
| 
 | ||||
|     .contact-way{ | ||||
|     .contact-way { | ||||
|         display: flex; | ||||
|         align-items: center; | ||||
|         padding: 40rpx 20rpx 34rpx; | ||||
|  | @ -320,11 +333,12 @@ | |||
|         border-bottom: 2rpx solid #E5E5E5; | ||||
|     } | ||||
| 
 | ||||
|     .contact-way .icon{ | ||||
|     .contact-way .icon { | ||||
|         width: 41rpx; | ||||
|         height: 32rpx; | ||||
|     } | ||||
|     .contact-way .icon1{ | ||||
| 
 | ||||
|     .contact-way .icon1 { | ||||
|         width: 35rpx; | ||||
|         height: 39rpx; | ||||
|     } | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue