日历

src/pages/activity/activityApply/activityApply.scss

@@ -359,6 +359,7 @@ page-activityApply {
     .label-ios + ion-input .text-input, .label-ios + ion-textarea .text-input, .label-ios + .input + .cloned-input{
             padding: 10px;
             height: 100px;
+
             border: 1px solid #ddd;
     }
 

src/pages/mySurvey/survey-preview/survey-preview.html

@@ -13,25 +13,30 @@
         <ion-label class="padding-left-16">{{survey?.title}}</ion-label>
       </ion-item>
       <div class="question-list">
-        <ion-item *ngFor="let item of contentList;let i = index" (click)="itemEdit(i)">
+        <ion-item *ngFor="let item of contentList;let i = index">
           <div class="item-content">
-            <p>{{i +1}}.{{item.title}}</p>
+            <p>{{i +1}}、
+              <span *ngIf="item.quesType == 1">(判断)</span>
+              <span *ngIf="item.quesType == 2">(单选)</span>
+              <span *ngIf="item.quesType == 3">(多选)</span>
+              <span *ngIf="item.quesType == 4">(问答)</span>
+              {{item.title}}</p>
             <ng-container *ngIf="item.quesType == 1">
               <p><span class="input-radio {{item.option.answerdesc == '0'?'select-raio':''}} "></span>是</p>
               <p><span class="input-radio {{item.option.answerdesc == '1'?'select-raio':''}}"></span>否</p>
             </ng-container>
             <ng-container *ngIf="item.quesType == 2">
-              <ng-container *ngFor=" let option1 of item.quesDesc">
-                <p><span class="input-radio"></span>{{option1.option_title}}</p>
+              <ng-container *ngFor=" let option1 of item.quesDesc;let i1 = index;">
+                <p><span class="input-radio {{item.option.answerdesc == i1?'select-raio':''}}"></span>{{option1.option_title}}</p>
               </ng-container>
             </ng-container>
             <ng-container *ngIf="item.quesType == 3">
-              <ng-container *ngFor=" let option2 of item.quesDesc">
-                <p><span class="input-check"></span>{{option2.option_title}}</p>
+              <ng-container *ngFor=" let option2 of item.quesDesc;let i2 = index;">
+                <p><span class="input-check {{item.option.answerdesc[i2] == i2?'select-check':''}}"></span>{{option2.option_title}}</p>
               </ng-container>
             </ng-container>
             <ng-container *ngIf="item.quesType == 4">
-              <div class="textarea-div"></div>
+              <div class="textarea-div">{{item.option.answerdesc}}</div>
             </ng-container>
           </div>
         </ion-item>

src/pages/mySurvey/survey-preview/survey-preview.scss

@@ -89,9 +89,22 @@ page-survey-preview {
     vertical-align: text-top;
     border-radius: 2px;
   }
+  .select-check{
+    position: relative;
+  }
+  .select-check::after{
+    content: '\2713';
+    position: absolute;
+    width: 0.7rem;
+    top: -4px;
+    height: 0.7rem;
+    font-size: 1.5rem;
+    font-weight: bold;
+  }
   .textarea-div{
-    height: 5rem;
+    min-height: 5rem;
     border-radius: 2px;
     border: 1px solid #ddd;
+    padding: 5px;
   }
 }

src/pages/mySurvey/survey-preview/survey-preview.ts

@@ -27,7 +27,6 @@ export class SurveyPreviewPage {
 
     getInfo() {
         this.storage.get('user').then((res) => {
-            console.log(res);
             this.userId = res.id;
             const data = {
                 userId: this.userId,
@@ -38,6 +37,10 @@ export class SurveyPreviewPage {
                     this.survey = res.json().data;
                     this.contentList = res.json().data.ques.datalist;
                     for( let i = 0;i<this.contentList.length;i++ ){
+                        if(this.contentList[i].quesType == 3){
+                            this.contentList[i].option.answerdesc = this.contentList[i].option.answerdesc.split(',');
+                            console.log(this.contentList[i].option.answerdesc);
+                        }
                         this.contentList[i].quesDesc = JSON.parse(this.contentList[i].quesDesc);
                     }
                 })

src/pages/mySurvey/survey-write/survey-write.html

@@ -17,29 +17,38 @@
       <ion-item *ngFor="let item of ansArr;let i = index">
         <div class="item-content">
           <!--判断题-->
-          <p><span class="color-red" *ngIf="item.isAns == 1">*</span>{{i +1}}.{{item.title}}</p>
-          <ng-container *ngIf="item.quesType == 1">
+          <p><span class="color-red" *ngIf="item.isAns == 1">*</span>
+            {{i +1}}、
+            <span *ngIf="item.quesType == 1">(判断)</span>
+            <span *ngIf="item.quesType == 2">(单选)</span>
+            <span *ngIf="item.quesType == 3">(多选)</span>
+            <span *ngIf="item.quesType == 4">(问答)</span>
+            {{item.title}}
+          </p>
+          <div class="padding-0-16">
+            <ng-container *ngIf="item.quesType == 1">
               <!--<p class="input-radio"><label for="{{item.id}}0"><input name="{{item.id}}" id="{{item.id}}0" value="0" type="radio">是</label></p>-->
               <p class="input-radio"><input [(ngModel)]="item.answerdesc" name="{{item.questionQueId}}" value="0" type="radio">是</p>
               <p class="input-radio"><input [(ngModel)]="item.answerdesc" name="{{item.questionQueId}}" value="1" type="radio">否</p>
               <!--<p class="input-radio"><label for="{{item.id}}1"><input name="{{item.id}}" id="{{item.id}}1" value="1" type="radio">否</label></p>-->
-          </ng-container>
-          <!--单选题-->
-          <ng-container *ngIf="item.quesType == 2">
-            <ng-container *ngFor=" let option1 of item.quesDesc;let optIndex = index;">
-              <p><input  [(ngModel)]="item.answerdesc" type="radio" value="{{optIndex}}" name="{{item.questionQueId}}">{{option1.option_title}}</p>
             </ng-container>
-          </ng-container>
-          <!--多选题-->
-          <ng-container *ngIf="item.quesType == 3">
-            <ng-container *ngFor=" let option2 of item.quesDesc;let quesIndex = index;">
-              <p><input type="checkbox" (change)="mutiSelect(i,quesIndex)"  value="{{quesIndex}}">{{option2.option_title}}</p>
+            <!--单选题-->
+            <ng-container *ngIf="item.quesType == 2">
+              <ng-container *ngFor=" let option1 of item.quesDesc;let optIndex = index;">
+                <p><input  [(ngModel)]="item.answerdesc" type="radio" value="{{optIndex}}" name="{{item.questionQueId}}">{{option1.option_title}}</p>
+              </ng-container>
             </ng-container>
-          </ng-container>
-          <!--问答题-->
-          <ng-container *ngIf="item.quesType == 4">
-            <textarea [(ngModel)]="item.answerdesc"></textarea>
-          </ng-container>
+            <!--多选题-->
+            <ng-container *ngIf="item.quesType == 3">
+              <ng-container *ngFor=" let option2 of item.quesDesc;let quesIndex = index;">
+                <p><input type="checkbox" (change)="mutiSelect(i,quesIndex)"  value="{{quesIndex}}">{{option2.option_title}}</p>
+              </ng-container>
+            </ng-container>
+            <!--问答题-->
+            <ng-container *ngIf="item.quesType == 4">
+              <textarea [(ngModel)]="item.answerdesc" class="content-textarea"></textarea>
+            </ng-container>
+          </div>
         </div>
       </ion-item>
     </div>

src/pages/mySurvey/survey-write/survey-write.scss

@@ -19,4 +19,15 @@ page-survey-write {
   //  border-radius: 50%;
   //  border: 1px solid #ddd;
   //}
+  .content-textarea{
+    padding: 10px;
+    min-height: 100px;
+    width: 100%;
+    border: 1px solid #ddd;
+  }
+  .submit{
+    margin-top: 20px;
+    border: 1px solid #34b4fc;
+    background-color: #34b4fc;
+  }
 }

src/pages/surveyManage/item/desicr/desicr.ts

@@ -16,7 +16,7 @@ export class DesicrPage {
   desrc = {
       title:'',   //问卷标题
       explai:'',   //问卷说明
-      usergroup:'',  //用户组id
+      usergroup:null,  //用户组id
       isopen:0,  //是否公开
       isans:1,   //是否匿名
       state:1   //状态
@@ -34,6 +34,9 @@ export class DesicrPage {
 
     submitOrder(){
         const toast = this.toastCtrl.create(message);
+        if(this.desrc.usergroup == null){
+            this.desrc.usergroup = 'all';
+        }
         this.appService.ObserverHttpPost('/wisdomgroup/modules/question/create',this.desrc)
             .subscribe(
                 (res)=>{

src/pages/surveyManage/list/list.html

@@ -47,7 +47,8 @@
 
 <ion-footer *ngIf="showOp">
   <div class="footter-opr">
-    <div *ngIf="swiperIndex == 0" (click)="look()"><span>查看</span></div>
+    <div *ngIf="swiperIndex == 0" (click)="look()"><span>编辑</span></div>
+    <div *ngIf="swiperIndex == 1" (click)="look()"><span>查看</span></div>
     <div *ngIf="swiperIndex == 1" (click)="overDue()"><span>设为过期</span></div>
     <div *ngIf="swiperIndex == 0" (click)="release()"><span>发布</span></div>
     <div *ngIf="swiperIndex == 1 || swiperIndex == 2" (click)="result()"><span>结果</span></div>