问需调查

src/app/app.module.ts

@@ -61,6 +61,7 @@ import {PaymentPageModule} from "../pages/discover-pages/payment/payment.module"
 import {RepairPageModule} from "../pages/serve-pages/repair/repair.module";
 import {TimeFormatService} from "../provide/timeFormat.service";
 import {InterceptorProvider} from "../core/auth.interceptor";
+import {RequirementPageModule} from "../pages/serve-pages/requirement/requirement.module";
 
 
 @NgModule({
@@ -102,7 +103,8 @@ import {InterceptorProvider} from "../core/auth.interceptor";
         BusinessUnitPageModule,
         FoodPageModule,
         PaymentPageModule,
-        RepairPageModule
+        RepairPageModule,
+        RequirementPageModule,
     ],
     bootstrap: [IonicApp],
     entryComponents: [

src/components/education/education.html

@@ -2,7 +2,7 @@
 <div *ngIf="isEdu" class="signMask" (click)="closeEdu()">
     <div class="mask-content-edu" (click)="stop($event)">
         <div class="bgc_edu">
-            <img src="./assets/imgs/home/edu_mask.png" alt="">
+            <img src="./assets/imgs/home/edu_mask.png?t=123" alt="">
         </div>
         <ion-icon class="close" name="close"></ion-icon>
     </div>

src/components/spces/spces.html

 <div class="main">
     <div class="content" (click)="close()">
         <div class="comment" (click)="stop($event)">
-            <div class="name">
-                {{goods?.model}}
-            </div>
-            <ng-container *ngIf="goods?.specs1List">
-                <p class="p-name">规格1</p>
-                <div class="detail-item">
+            <div class="spces-content">
+                <div class="name">
+                    {{goods?.model}}
+                </div>
+                <ng-container *ngIf="goods?.specs1List">
+                    <p class="p-name">规格1</p>
+                    <div class="detail-item">
                     <span [ngClass]="choose.specs1 == item1?'select':''" *ngFor="let item1 of goods.specs1List"
                           (click)="getSpecs(1,item1)">
                         {{item1}}
                     </span>
-                </div>
-            </ng-container>
-            <ng-container *ngIf="goods?.specs2List">
-                <p class="p-name">规格2</p>
-                <div class="detail-item">
+                    </div>
+                </ng-container>
+                <ng-container *ngIf="goods?.specs2List">
+                    <p class="p-name">规格2</p>
+                    <div class="detail-item">
                     <span [ngClass]="choose.specs2 == item2?'select':''" (click)="getSpecs(2,item2)"
                           *ngFor="let item2 of goods.specs2List">
                         {{item2}}
                     </span>
-                </div>
-            </ng-container>
-            <ng-container *ngIf="goods?.specs3List">
-                <p class="p-name">规格3</p>
-                <div class="detail-item">
+                    </div>
+                </ng-container>
+                <ng-container *ngIf="goods?.specs3List">
+                    <p class="p-name">规格3</p>
+                    <div class="detail-item">
                     <span *ngFor="let item3 of goods.specs3List" [ngClass]="choose.specs3 == item3?'select':''"
                           (click)="getSpecs(3,item3)">
                         {{item3}}
                     </span>
-                </div>
-            </ng-container>
-            <ng-container *ngIf="goods?.specs4List">
-                <p class="p-name">规格4</p>
-                <div class="detail-item">
+                    </div>
+                </ng-container>
+                <ng-container *ngIf="goods?.specs4List">
+                    <p class="p-name">规格4</p>
+                    <div class="detail-item">
                     <span *ngFor="let item4 of goods.specs4List" [ngClass]="choose.specs4 == item4?'select':''"
                           (click)="getSpecs(4,item4)">
                         {{item4}}
                     </span>
-                </div>
-            </ng-container>
-            <ng-container *ngIf="goods?.specs5List">
-                <p class="p-name">规格5</p>
-                <div class="detail-item">
+                    </div>
+                </ng-container>
+                <ng-container *ngIf="goods?.specs5List">
+                    <p class="p-name">规格5</p>
+                    <div class="detail-item">
                     <span *ngFor="let item5 of goods.specs5List" [ngClass]="choose.specs5 == item5?'select':''"
                           (click)="getSpecs(5,item5)">
                         {{item5}}
                     </span>
+                    </div>
+                </ng-container>
+                <div class="choose-num">
+                    <div>申请数量({{goods?.unit}})</div>
+                    <div class="num">
+                        <span class="reduce" (click)="reduce()">-</span>
+                        <input type="number" value="1" [(ngModel)]="choose.amount">
+                        <span class="add" (click)="add()">+</span>
+                    </div>
                 </div>
-            </ng-container>
-
-            <div class="choose-num">
-                <div>申请数量({{goods?.unit}})</div>
-                <div class="num">
-                    <span class="reduce" (click)="reduce()">-</span>
-                    <input type="number" value="1" [(ngModel)]="choose.amount">
-                    <span class="add" (click)="add()">+</span>
-                </div>
             </div>
-            <button class="submit-btn submit" (click)="submit()">确定</button>
+            <div class="footer">
+                <button class="submit-btn submit" (click)="submit()">确定</button>
+            </div>
         </div>
     </div>
 </div>

src/components/spces/spces.scss

@@ -96,11 +96,17 @@ spces {
       }
     }
 
-    .submit-btn{
+    .footer{
       position: absolute;
-      bottom: 20px;
-      margin-left: 8%;
+      bottom: 0;
+      width: 100%;
+      background-color: #fff;
     }
   }
+  .spces-content{
+    padding-bottom: 80px;
+    overflow: scroll;
+    height: 100%;
+  }
 
 }

src/index.html

@@ -48,35 +48,6 @@
 <!-- The main bundle js is generated during the build process -->
 <script src="build/main.js"></script>
 <script>
-    //Cache Buster
-    (function () {
-        let rep = /.*\?.*/,
-            links = document.getElementsByTagName('link'),
-            scripts = document.getElementsByTagName('script'),
-            process_scripts = true;
-        for (let i = 0; i < links.length; i++) {
-            let link = links[i],
-                href = link.href;
-            if (rep.test(href)) {
-                link.href = href + '&' + Date.now();
-            } else {
-                link.href = href + '?' + Date.now();
-            }
-
-        }
-        if (process_scripts) {
-            for (let i = 0; i < scripts.length; i++) {
-                let script = scripts[i],
-                    src = script.src;
-                if (rep.test(src)) {
-                    script.src = src + '&' + Date.now();
-                } else {
-                    script.src = src + '?' + Date.now();
-                }
-
-            }
-        }
-    })();
 </script>
 </body>
 

src/pages/tabs/key/key.html

@@ -55,14 +55,20 @@
                     <img src="./assets/imgs/home/icon-yjbx.png">
                     <label class="label2-2 more2-2">一键报修</label>
                 </div>
-
             </div>
-            <div (click)="goTo('BusinessUnitPage')">
+            <div (click)="goTo('RequirementPage')">
                 <div class="card">
-                    <img src="./assets/imgs/home/icon-ywzd.png">
-                    <label class="label2-2 more2-2">业务制度</label>
+                    <img src="./assets/imgs/home/icon-wxdc.png">
+                    <label class="label2-2 more2-2">问需调查</label>
                 </div>
+
             </div>
+            <!--            <div (click)="goTo('BusinessUnitPage')">-->
+            <!--                <div class="card">-->
+            <!--                    <img src="./assets/imgs/home/icon-ywzd.png">-->
+            <!--                    <label class="label2-2 more2-2">业务制度</label>-->
+            <!--                </div>-->
+            <!--            </div>-->
         </div>
     </div>
 </ion-content>

src/service/http.service.ts

@@ -15,11 +15,11 @@ export class AppGlobal {
     //接口基地址
     // static domain = "http://192.168.2.106:8080";     //正式环境
     // static domain = "http://61.129.91.113";   //政务云
-    static domain = "http://47.103.33.196:8080";   //阿里云正式地址
+    // static domain = "http://47.103.33.196:8080";   //阿里云正式地址
     // static domain = "http://47.103.35.216:8080";   //阿里云测试地址
     // static domain = "http://218.78.19.169:8081";   //天翼云地址
     // static domain = "http://218.78.19.169:8082/";   //天翼测试云地址
-    // static domain = "";   //本地环境
+    static domain = "";   //本地环境
 
     //图片地址
     static picture = AppGlobal.domain + "/wisdomgroup/manager/getIcon/";
@@ -28,8 +28,8 @@ export class AppGlobal {
     static pictureNotice = AppGlobal.domain;
 
     //默认版本
-    // static defaultVersion = "4.6.0";  //dev
-    static defaultVersion;  //prod
+    static defaultVersion = "4.6.0";  //dev
+    // static defaultVersion;  //prod
 
     //接口地址
     static API: any = {

src/theme/variables.scss

@@ -84,10 +84,6 @@ $main-color:#e42417;
 // Fonts
 // --------------------------------------------------
 @font-face {
-  font-family: "SourceHanSans-Normal";
-  src: url("../assets/font/SourceHanSansCN-Normal.ttf");
-}
-@font-face {
   font-family: "SourceHanSans-Bold";
   src: url("../assets/font/SourceHanSerifCN-Bold.ttf");
 }