Merge branch 'master' of https://gitee.com/panxingxin/sgApp

dev.sh

@@ -14,9 +14,9 @@ echo '{
 
 #sed -e "s@1@$cversion_old@g" -i version.json
 
-ionic cordova platform rm android
+#ionic cordova platform rm android
 
-ionic cordova platform add android
+#ionic cordova platform add android
 
 ionic cordova build android
 

dev.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <widget id="com.ionicframework.devSgZongLi" version="1.0.8" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-    <name>SG综礼</name>
+    <name>SG测试</name>
     <description>An awesome Ionic/Cordova app.</description>
     <author email="hi@ionicframework.com" href="http://ionicframework.com/">Ionic Framework Team</author>
     <content src="index.html" />

src/app/contract-table/contract-table.page.html

@@ -15,11 +15,6 @@
   </ion-refresher>
   <ion-card *ngFor="let contract of contractList" (click)="getDetail(contract)">
     <ion-card-content class="contract-content">
-      <div class="contract-title">
-        <ion-icon name="briefcase"></ion-icon>
-        <ion-label>供应商：</ion-label>
-        <ion-label>{{contract.sname}}</ion-label>
-      </div>
       <!--        <div class="contract-column">-->
       <!--          <ion-icon name="contract"></ion-icon>-->
       <!--          <ion-label>采购合同ID： </ion-label>-->
@@ -50,10 +45,15 @@
         <ion-label>下单员： </ion-label>
         <ion-label>{{contract.sscCreator}}</ion-label>
       </div>
+      <div class="contract-title">
+        <ion-icon name="flag"></ion-icon>
+        <ion-label>注备：</ion-label>
+        <ion-label>{{contract.sscCnremark}}</ion-label>
+      </div>
     </ion-card-content>
   </ion-card>
   <ion-infinite-scroll #IonInfiniteScroll threshold="100px" (ionInfinite)="loadData($event)">
     <ion-infinite-scroll-content loadingSpinner="bubbles" loadingText="加载...">
     </ion-infinite-scroll-content>
   </ion-infinite-scroll>
-</ion-content>
+</ion-content>