From 48c66b69ff6ee9a2aef30a60f93693df6324645d Mon Sep 17 00:00:00 2001
From: tangyi <275503107@qq.com>
Date: Fri, 25 Mar 2022 17:12:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                                 |  27 +--
 pages/appreciationServe/appreciationServe.vue | 158 ++++++------
 pages/dataQuery/client.vue                    |  15 +-
 pages/dataQuery/dataQuery.vue                 | 226 +++++++++---------
 pages/dataQuery/details.vue                   | 172 ++++++-------
 5 files changed, 313 insertions(+), 285 deletions(-)

diff --git a/manifest.json b/manifest.json
index 8e3e06c..d5d3dd3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -85,20 +85,19 @@
         "sdkConfigs" : {
             "maps" : {}
         },
-		"devServer" : {
-			"https" : false,
-			"proxy": {  
-				"/web": {  
-					"target": "http://maintain.7and5.cn",
-					"changeOrigin": true,   
-					"secure": false,
-					"pathRewrite": {
-						"^/web": ""  
-					}
-				}  
-			}  
-		}
-
+        "devServer" : {
+            "https" : false,
+            "proxy" : {
+                "/web" : {
+                    "target" : "http://maintain.7and5.cn",
+                    "changeOrigin" : true,
+                    "secure" : false,
+                    "pathRewrite" : {
+                        "^/web" : ""
+                    }
+                }
+            }
+        }
     },
     "mp-baidu" : {
         "appid" : "24346353"
diff --git a/pages/appreciationServe/appreciationServe.vue b/pages/appreciationServe/appreciationServe.vue
index a0c97ef..937a45e 100644
--- a/pages/appreciationServe/appreciationServe.vue
+++ b/pages/appreciationServe/appreciationServe.vue
@@ -1,89 +1,97 @@
 <template>
     <view class="content">
         <statusNav navBarTitle="增值服务"></statusNav>
-        <view class="select-type">
-            <view class="text">选择类型</view>
-            <view class="type">
-                <view class="li" @click="typeIndexFun(index)" :class="index==typeIndex?'on':''"
-                    v-for="(item,index) in typeData">
-                    {{item.title}}
+            <container-subgroup-two >
+                <view slot="content" style="margin: 0 -30rpx;">
+                  <view class="select-type">
+                      <view class="text">选择类型</view>
+                      <view class="type">
+                          <view class="li" @click="typeIndexFun(index)" :class="index==typeIndex?'on':''"
+                              v-for="(item,index) in typeData">
+                              {{item.title}}
+                          </view>
+                      </view>
+                  </view>
+                  <view class="appreciationServe-from">
+                      <view class="li">
+                          <view class="title">
+                              <text class="cor">*</text>产品名称
+                          </view>
+                          <input class="input" type="text" value="全彩LED显示屏" />
+                      </view>
+                      <view class="li">
+                          <view class="title">
+                              <text class="cor">*</text>规格型号
+                          </view>
+                                        <input class="input" type="text" value="P2.5" />
+                      </view>
+                   
+                      <view class="li">
+                          <view class="title">产品品牌</view>
+                          <input class="input" type="text" value="" placeholder="请输入品牌" />
+                      </view>
+                      <view class="li">
+                          <view class="title">
+                              <text class="cor">*</text>产品尺寸
+                          </view>
+                          
+                          <input class="input" type="text" value="宽:38.5m x 高14.5m" />
+                      </view>
+                  </view>
+                  <view class="supplementTitle">补充信息</view>
+                  <view class="supplement-from">
+                      <view class="li">
+                          <view class="title">
+                              <text class="cor">*</text>联系人
+                          </view>
+                          <input type="text" class="input" value="王富贵" />
+                      </view>
+                      <view class="li">
+                          <view class="">
+                              <text class="cor">*</text>联系电话
+                          </view>
+                          <input type="text" class="input" value="18256666666" />
+                      </view>
+                      <view class="li">
+                          <view class="">
+                              <text class="cor">*</text>预约时间
+                          </view>
+                          <input type="text" class="input" value="2022-02-16" />
+                      </view>
+                        
+                   
+                        
+                      <view class="li-textarea">
+                          <view class="title">*详细地址</view>
+                          <textarea class="textarea" value="湖南省株洲市荷塘区红旗中路456号五矿二十三冶综合楼" placeholder="" />
+                      </view>
+                      
+                      <view class="scene-img">
+                          <view class="title">现场图片</view>
+                          <view class="img-content">
+                            <image class="img" src="../../static/del/微信图片_20220113152400.png" mode=""></image> 
+                                <image class="img" src="../../static/del/微信图片_20220113152400.png" mode=""></image>
+                          </view>
+                          <view class="iocn-content">
+                              <image class="icon" src="../../static/iocn/jia.png" mode=""></image>
+                          </view>
+                      </view>
+                  </view>
+                  <button class="submit-button" type="default">确认提交</button>
+                     
                 </view>
-            </view>
-        </view>
-        <view class="appreciationServe-from">
-            <view class="li">
-                <view class="title">
-                    <text class="cor">*</text>产品名称
-                </view>
-                <input class="input" type="text" value="全彩LED显示屏" />
-            </view>
-            <view class="li">
-                <view class="title">
-                    <text class="cor">*</text>规格型号
-                </view>
-                              <input class="input" type="text" value="P2.5" />
-            </view>
-         
-            <view class="li">
-                <view class="title">产品品牌</view>
-                <input class="input" type="text" value="" placeholder="请输入品牌" />
-            </view>
-            <view class="li">
-                <view class="title">
-                    <text class="cor">*</text>产品尺寸
-                </view>
-                
-                <input class="input" type="text" value="宽:38.5m x 高14.5m" />
-            </view>
-        </view>
-        <view class="supplementTitle">补充信息</view>
-        <view class="supplement-from">
-            <view class="li">
-                <view class="title">
-                    <text class="cor">*</text>联系人
-                </view>
-                <input type="text" class="input" value="王富贵" />
-            </view>
-            <view class="li">
-                <view class="">
-                    <text class="cor">*</text>联系电话
-                </view>
-                <input type="text" class="input" value="18256666666" />
-            </view>
-            <view class="li">
-                <view class="">
-                    <text class="cor">*</text>预约时间
-                </view>
-                <input type="text" class="input" value="2022-02-16" />
-            </view>
-      
-         
-      
-            <view class="li-textarea">
-                <view class="title">*详细地址</view>
-                <textarea class="textarea" value="湖南省株洲市荷塘区红旗中路456号五矿二十三冶综合楼" placeholder="" />
-            </view>
-            
-            <view class="scene-img">
-                <view class="title">现场图片</view>
-                <view class="img-content">
-                  <image class="img" src="../../static/del/微信图片_20220113152400.png" mode=""></image> 
-                      <image class="img" src="../../static/del/微信图片_20220113152400.png" mode=""></image>
-                </view>
-                <view class="iocn-content">
-                    <image class="icon" src="../../static/iocn/jia.png" mode=""></image>
-                </view>
-            </view>
-        </view>
-		<button class="submit-button" type="default">确认提交</button>
+  
+     </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,
+            containerSubgroupTwo,
 
         },
         data() {
@@ -121,8 +129,6 @@
 
 <style>
     .content {
-        padding-top: 80rpx;
-        padding-bottom: 80rpx;
     }
    .cor{
        color: #FF0000;
diff --git a/pages/dataQuery/client.vue b/pages/dataQuery/client.vue
index 8f307ba..fdfe7af 100644
--- a/pages/dataQuery/client.vue
+++ b/pages/dataQuery/client.vue
@@ -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;
diff --git a/pages/dataQuery/dataQuery.vue b/pages/dataQuery/dataQuery.vue
index 0ef4e00..655b120 100644
--- a/pages/dataQuery/dataQuery.vue
+++ b/pages/dataQuery/dataQuery.vue
@@ -1,27 +1,28 @@
 <template>
-    <view  class="content">
-           <statusNav navBarTitle="(备品)查询结果"></statusNav>
-        <view class="dataQuery-content">
+    <view class="content">
+        <statusNav navBarTitle="(备品)查询结果"></statusNav>
+        
+        <container-subgroup-two >
+        <view class="dataQuery-content"  slot="content" style="margin: 0 -30rpx;">
             <view class="li">
-     
                 <view class="title">
-                    项目名称：湖南工业大学生化学院三楼会议室    
+                    项目名称：湖南工业大学生化学院三楼会议室
                 </view>
                 <view class="text-content">
                     <view class="left">
-                       <view class="text">
-                          核心品牌：海康威视  
-                       </view>
-                       <view class="text">
-                           规格型号：DS-CK18FI-H 
-                       </view>
-                       <view class="text">
-                           批  次  号：2210122
-                       </view>
+                        <view class="text">
+                            核心品牌：海康威视
+                        </view>
+                        <view class="text">
+                            规格型号：DS-CK18FI-H
+                        </view>
+                        <view class="text">
+                            批 次 号：2210122
+                        </view>
                     </view>
                     <view class="rigth">
                         <view class="text">
-                        备品数量：<text class="cor">3张</text>
+                            备品数量：<text class="cor">3张</text>
                         </view>
                         <view class="text cor1">
                             备品尺寸：320*160
@@ -31,33 +32,33 @@
                         </view>
                     </view>
                 </view>
-                
+
                 <view class="icon" v-if="true">
                     <text class="icon-text">正常</text>
                 </view>
                 <view class="icon1" v-else>
-                     <text class="icon-text">待维修</text>
+                    <text class="icon-text">待维修</text>
                 </view>
             </view>
             <view class="li">
                 <view class="title">
-                    项目名称：湖南工业大学生化学院三楼会议室    
+                    项目名称：湖南工业大学生化学院三楼会议室
                 </view>
                 <view class="text-content">
                     <view class="left">
-                       <view class="text">
-                          核心品牌：海康威视  
-                       </view>
-                       <view class="text">
-                           规格型号：DS-CK18FI-H 
-                       </view>
-                       <view class="text">
-                           批  次  号：2210122
-                       </view>
+                        <view class="text">
+                            核心品牌：海康威视
+                        </view>
+                        <view class="text">
+                            规格型号：DS-CK18FI-H
+                        </view>
+                        <view class="text">
+                            批 次 号：2210122
+                        </view>
                     </view>
                     <view class="rigth">
                         <view class="text">
-                        备品数量：<text class="cor">3张</text>
+                            备品数量：<text class="cor">3张</text>
                         </view>
                         <view class="text cor1">
                             备品尺寸：320*160
@@ -67,33 +68,33 @@
                         </view>
                     </view>
                 </view>
-                
+
                 <view class="icon" v-if="true">
                     <text class="icon-text">正常</text>
                 </view>
                 <view class="icon1" v-else>
-                     <text class="icon-text">待维修</text>
+                    <text class="icon-text">待维修</text>
                 </view>
             </view>
             <view class="li">
                 <view class="title">
-                    项目名称：湖南工业大学生化学院三楼会议室    
+                    项目名称：湖南工业大学生化学院三楼会议室
                 </view>
                 <view class="text-content">
                     <view class="left">
-                       <view class="text">
-                          核心品牌：海康威视  
-                       </view>
-                       <view class="text">
-                           规格型号：DS-CK18FI-H 
-                       </view>
-                       <view class="text">
-                           批  次  号：2210122
-                       </view>
+                        <view class="text">
+                            核心品牌：海康威视
+                        </view>
+                        <view class="text">
+                            规格型号：DS-CK18FI-H
+                        </view>
+                        <view class="text">
+                            批 次 号：2210122
+                        </view>
                     </view>
                     <view class="rigth">
                         <view class="text">
-                        备品数量：<text class="cor">3张</text>
+                            备品数量：<text class="cor">3张</text>
                         </view>
                         <view class="text cor1">
                             备品尺寸：320*160
@@ -103,23 +104,26 @@
                         </view>
                     </view>
                 </view>
-                
+
                 <view class="icon" v-if="false">
                     <text class="icon-text">正常</text>
                 </view>
                 <view class="icon1" v-else>
-                     <text class="icon-text">待维修</text>
+                    <text class="icon-text">待维修</text>
                 </view>
             </view>
         </view>
-    </view>
+       </container-subgroup-two >
+   </view>
 </template>
 
 <script>
-     import statusNav from '../../components/status-nav.vue';
+         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,78 +137,86 @@
 </script>
 
 <style>
-    .content{
-        padding-top: 80rpx;
-    }
+
+
     .dataQuery-content {
-           font-size: 24rpx;
-           color: #333333;
-           margin-top: 15rpx;
+        font-size: 24rpx;
+        color: #333333;
+        margin-top: 15rpx;
     }
-    .dataQuery-content .li{
+
+    .dataQuery-content .li {
         background-color: #FFFFFF;
         padding: 26rpx 28rpx;
-        
-    
+
+
         margin-bottom: 14rpx;
     }
-        
+
     .dataQuery-content .li {
         position: relative;
     }
-.dataQuery-content .li .text-content{
- display: flex;
- border-bottom: 2rpx solid #EEEEEE;
- padding-bottom: 10rpx;
 
-}
-.dataQuery-content .li .text-content .left{
-    width: 48%;
-}
-.dataQuery-content .li .text-content  .text{
-    margin-top: 20rpx;
-}
-.cor{
-    color: #ff9000;
-}
-.cor1{
-    color: #999999;
-}
-.dataQuery-content .li .icon{
-    background-image: url(../../static/iocn/zc.png);
-    width: 125rpx;
-    height: 91rpx;
-  display: flex;
-  align-items: center;
-  box-sizing: border-box;
-    background-size: 100%;
-    padding-left:30rpx;
-    right: 20rpx;
-    top: 20rpx;
-    position: absolute;
-}
-.dataQuery-content .li .icon .icon-text{
-    transform: rotateZ(20deg);
-    color: #53e5d0;
+    .dataQuery-content .li .text-content {
+        display: flex;
+        border-bottom: 2rpx solid #EEEEEE;
+        padding-bottom: 10rpx;
 
-}
+    }
 
-.dataQuery-content .li .icon1{
-    background-image: url(../../static/iocn/dwx.png);
-    width: 125rpx;
-    height: 91rpx;
-  display: flex;
-  align-items: center;
-  box-sizing: border-box;
-    background-size: 100%;
-    padding-left:30rpx;
-    right: 20rpx;
-    top: 20rpx;
-    position: absolute;
-}
-.dataQuery-content .li .icon1 .icon-text{
-    transform: rotateZ(20deg);
-    color: #ff0006;
+    .dataQuery-content .li .text-content .left {
+        width: 48%;
+    }
 
-}
+    .dataQuery-content .li .text-content .text {
+        margin-top: 20rpx;
+    }
+
+    .cor {
+        color: #ff9000;
+    }
+
+    .cor1 {
+        color: #999999;
+    }
+
+    .dataQuery-content .li .icon {
+        background-image: url(../../static/iocn/zc.png);
+        width: 125rpx;
+        height: 91rpx;
+        display: flex;
+        align-items: center;
+        box-sizing: border-box;
+        background-size: 100%;
+        padding-left: 30rpx;
+        right: 20rpx;
+        top: 20rpx;
+        position: absolute;
+    }
+
+    .dataQuery-content .li .icon .icon-text {
+        transform: rotateZ(20deg);
+        color: #53e5d0;
+
+    }
+
+    .dataQuery-content .li .icon1 {
+        background-image: url(../../static/iocn/dwx.png);
+        width: 125rpx;
+        height: 91rpx;
+        display: flex;
+        align-items: center;
+        box-sizing: border-box;
+        background-size: 100%;
+        padding-left: 30rpx;
+        right: 20rpx;
+        top: 20rpx;
+        position: absolute;
+    }
+
+    .dataQuery-content .li .icon1 .icon-text {
+        transform: rotateZ(20deg);
+        color: #ff0006;
+
+    }
 </style>
diff --git a/pages/dataQuery/details.vue b/pages/dataQuery/details.vue
index c713970..848da5c 100644
--- a/pages/dataQuery/details.vue
+++ b/pages/dataQuery/details.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="content">
-   <statusNav navBarTitle="客户详情"></statusNav>
-     
+        <statusNav navBarTitle="客户详情"></statusNav>
+
         <view class="details-nav">
             <view class="li">
                 <image class="icon" src="../../static/iocn/ty.png" mode=""></image>
@@ -22,7 +22,6 @@
                 </view>
             </view>
         </view>
-
         <view class="details-content">
             <view class="title">
                 <image class="img" src="../../static/iocn/dn.png" mode=""></image>
@@ -105,68 +104,68 @@
                 </view>
                 <picker mode="date" :value="time" @change="bindTimeChange">
                     <view class="date">
-                         选择年份 <image class="icon" src="../../static/iocn/sjx.png" mode=""></image>
-                        </view>
+                        选择年份 <image class="icon" src="../../static/iocn/sjx.png" mode=""></image>
+                    </view>
                 </picker>
 
             </view>
-            
+
             <view class="project-list-content">
-                 <view class="li">
-                   <view class="text">
-                       南城校区液晶显示屏
-                   </view>  
-                   <view class="date">
-                       2022/3/1
-                   </view>
-                 </view>
-                 <view class="li">
-                   <view class="text">
-                       南城校区液晶显示屏
-                   </view>  
-                   <view class="date">
-                       2022/3/1
-                   </view>
-                 </view>
-                 <view class="li">
-                   <view class="text">
-                       南城校区液晶显示屏
-                   </view>  
-                   <view class="date">
-                       2022/3/1
-                   </view>
-                 </view>
-                 <view class="li">
-                   <view class="text">
-                       南城校区液晶显示屏
-                   </view>  
-                   <view class="date">
-                       2022/3/1
-                   </view>
-                 </view>
+                <view class="li">
+                    <view class="text">
+                        南城校区液晶显示屏
+                    </view>
+                    <view class="date">
+                        2022/3/1
+                    </view>
+                </view>
+                <view class="li">
+                    <view class="text">
+                        南城校区液晶显示屏
+                    </view>
+                    <view class="date">
+                        2022/3/1
+                    </view>
+                </view>
+                <view class="li">
+                    <view class="text">
+                        南城校区液晶显示屏
+                    </view>
+                    <view class="date">
+                        2022/3/1
+                    </view>
+                </view>
+                <view class="li">
+                    <view class="text">
+                        南城校区液晶显示屏
+                    </view>
+                    <view class="date">
+                        2022/3/1
+                    </view>
+                </view>
             </view>
         </view>
-     <view class="contact-way">
-         <view class="title">
-            客户微信
-         </view>
-       <image class="icon" src="../../static/iocn/wx.png" mode=""></image>
-     </view>
-     <view class="contact-way">
-         <view class="title">
-             客户电话
-         </view>
-         <image class="icon1" src="../../static/iocn/dh.png" mode=""></image>
-     </view>
+        <view class="contact-way">
+            <view class="title">
+                客户微信
+            </view>
+            <image class="icon" src="../../static/iocn/wx.png" mode=""></image>
+        </view>
+        <view class="contact-way">
+            <view class="title">
+                客户电话
+            </view>
+            <image class="icon1" src="../../static/iocn/dh.png" mode=""></image>
+        </view>
     </view>
 </template>
 
 <script>
-  import statusNav from '../../components/status-nav.vue';
-  export default {
-      components: {
-          statusNav
-      },
+    import statusNav from '../../components/status-nav.vue';
+    export default {
+        components: {
+            statusNav
+        },
         data() {
             return {
                 time: '12:01'
@@ -213,7 +212,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,77 +253,86 @@
     .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;
         font-size: 24rpx;
-                border-bottom: 2rpx solid #E5E5E5;
+        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{
-         width: 120rpx;
-         height: 40rpx;
-         display: flex;
-         justify-content: center;
-         align-items: center;
-         border-radius: 10rpx;
-         border: 2rpx solid #999999;
-         font-size: 24rpx;
-       display: flex;
+
+    .project-list .title-content .date {
+        width: 120rpx;
+        height: 40rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        border-radius: 10rpx;
+        border: 2rpx solid #999999;
+        font-size: 24rpx;
+        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;
         color: #696666;
         justify-content: space-between;
         font-size: 28rpx;
-               border-bottom: 2rpx solid #E5E5E5;
+        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;
     }