Merge remote-tracking branch 'origin/release-201821-wangcz' into release-201821-wangcz

assets/scss/mobilePayCenter.scss

@@ -330,8 +330,11 @@ $base-color: #3f84f6;
   }
   .mp-btn-wrap {
     position: fixed;
-    bottom: 1.2rem;
+    bottom: .98rem;
     left: 0;
     right: 0;
+    height: 1.2rem;
+    padding-top: .21rem;
+    background: #f1f3f7;
   }
 }

pages/mobile/center/user/invoice/invoiceRecord.vue

@@ -36,31 +36,37 @@
                   <div class="pull-left overhidden" style="width: 1.85rem">{{inv.invoicetitle}}</div>
                 </div>
                 <div class="clearfix pull-left w50">
-                  <div class="pull-left">金额：</div>
-                  <div class="pull-left overhidden" style="width: 2.4rem">¥{{inv.price || 0}}</div>
+                  <div class="pull-left">开票金额：</div>
+                  <div class="pull-left overhidden" style="width: 1.85rem">¥{{inv.price || 0}}</div>
                 </div>
               </div>
 
-              <div class="list clearfix">
-                <div class="clearfix pull-left w50">
-                  <div class="pull-left">收票人：</div>
-                  <div class="pull-left overhidden" style="width:2.1rem">{{inv.receiverName}}</div>
-                </div>
-                <div class="clearfix pull-left w50">
-                  <div class="pull-left">电话：</div>
-                  <div class="pull-left overhidden">{{inv.recTel}}</div>
+              <div class="list" v-if="inv.invoicetype === 1205">
+                <div class="clearfix">
+                  <div class="pull-left">单位电话：</div>
+                  <div class="pull-left overhidden" style="width: 4.6rem;">
+                    {{inv.billInfo.companyPhone || '-'}}
+                  </div>
                 </div>
               </div>
 
               <div class="list" v-if="inv.invoicetype === 1205">
                 <div class="clearfix">
-                  <div class="pull-left">单位电话：</div>
+                  <div class="pull-left">单位地址：</div>
                   <div class="pull-left overhidden" style="width: 4.6rem;">
-                    {{inv.billInfo.companyPhone || '-'}}
+                    {{inv.billInfo.companyAddress || '-'}}
                   </div>
                 </div>
               </div>
 
+              <div class="list" v-if="inv.invoicetype === 1205">
+                <div class="clearfix">
+                  <div class="pull-left">税务登记号：</div>
+                  <div class="pull-left overhidden" style="width: 4.8rem;">
+                    {{inv.billInfo.companyTaxNumber || '-'}}
+                  </div>
+                </div>
+              </div>
               <div class="list" v-if="inv.invoicetype === 1205">
                 <div class="clearfix">
                   <div class="pull-left">开户银行名称：</div>
@@ -79,12 +85,14 @@
                 </div>
               </div>
 
-              <div class="list" v-if="inv.invoicetype === 1205">
-                <div class="clearfix">
-                  <div class="pull-left">税务登记号：</div>
-                  <div class="pull-left overhidden" style="width: 4.8rem;">
-                    {{inv.billInfo.companyTaxNumber || '-'}}
-                  </div>
+              <div class="list clearfix">
+                <div class="clearfix pull-left w50">
+                  <div class="pull-left">收票人：</div>
+                  <div class="pull-left overhidden" style="width:2.1rem">{{inv.receiverName}}</div>
+                </div>
+                <div class="clearfix pull-left w50">
+                  <div class="pull-left">收票电话：</div>
+                  <div class="pull-left overhidden">{{inv.recTel}}</div>
                 </div>
               </div>
 

pages/mobile/center/vendor/invoice/index.vue

@@ -65,27 +65,34 @@
                 <div class="pull-left overhidden" style="width: 1.85rem">{{inv.invoicetitle}}</div>
               </div>
               <div class="clearfix pull-left w50">
-                <div class="pull-left">金额：</div>
-                <div class="pull-left overhidden" style="width: 2.4rem">¥{{inv.price || 0}}</div>
+                <div class="pull-left">发票金额：</div>
+                <div class="pull-left overhidden" style="width: 1.85rem">¥{{inv.price || 0}}</div>
               </div>
             </div>
 
-            <div class="list clearfix">
-              <div class="clearfix pull-left w50">
-                <div class="pull-left">收票人：</div>
-                <div class="pull-left overhidden" style="width:2.1rem">{{inv.receiverName}}</div>
-              </div>
-              <div class="clearfix pull-left w50">
-                <div class="pull-left">电话：</div>
-                <div class="pull-left overhidden">{{inv.recTel}}</div>
+            <div class="list" v-if="inv.invoicetype === 1205">
+              <div class="clearfix">
+                <div class="pull-left">单位电话：</div>
+                <div class="pull-left overhidden" style="width: 4.6rem;">
+                  {{inv.billInfo.companyPhone || '-'}}
+                </div>
               </div>
             </div>
 
             <div class="list" v-if="inv.invoicetype === 1205">
               <div class="clearfix">
-                <div class="pull-left">单位电话：</div>
+                <div class="pull-left">单位地址：</div>
                 <div class="pull-left overhidden" style="width: 4.6rem;">
-                  {{inv.billInfo.companyPhone || '-'}}
+                  {{inv.billInfo.companyAddress || '-'}}
+                </div>
+              </div>
+            </div>
+
+            <div class="list" v-if="inv.invoicetype === 1205">
+              <div class="clearfix">
+                <div class="pull-left">税务登记号：</div>
+                <div class="pull-left overhidden" style="width: 4.8rem;">
+                  {{inv.billInfo.companyTaxNumber || '-'}}
                 </div>
               </div>
             </div>
@@ -108,12 +115,14 @@
               </div>
             </div>
 
-            <div class="list" v-if="inv.invoicetype === 1205">
-              <div class="clearfix">
-                <div class="pull-left">税务登记号：</div>
-                <div class="pull-left overhidden" style="width: 4.8rem;">
-                  {{inv.billInfo.companyTaxNumber || '-'}}
-                </div>
+            <div class="list clearfix">
+              <div class="clearfix pull-left w50">
+                <div class="pull-left">收票人：</div>
+                <div class="pull-left overhidden" style="width:2.1rem">{{inv.receiverName}}</div>
+              </div>
+              <div class="clearfix pull-left w50">
+                <div class="pull-left">收票电话：</div>
+                <div class="pull-left overhidden">{{inv.recTel}}</div>
               </div>
             </div>
 

pages/mobile/center/vendor/product.vue

@@ -723,7 +723,7 @@
           this.setRemindText('品牌不能为空')
           return
         } else if (this.MaterielItem.kind === '') {
-          this.setRemindText('类目不能为空')
+          this.setRemindText('物料名称不能为空')
           return
         } else if (this.MaterielItem.pcmpcode === '') {
           this.setRemindText('型号不能为空')