Browse Source

Merge remote-tracking branch 'origin/master'

shenjj 7 years ago
parent
commit
b988dc1862

+ 4 - 4
components/common/upload/upload.vue

@@ -21,7 +21,7 @@
 </template>
 <script>
   export default {
-    props: ['typeData', 'url', 'NopassThree', 'noReview'],
+    props: ['typeData', 'url', 'NopassThree', 'noReview', 'maxSize'],
     data () {
       return {
         qualifications: {
@@ -49,11 +49,11 @@
         let file = e.target.files[0]
         if (!this.NopassThree) {
 //          console.log(file.size)
-          if (file.size > 3 * 1024 * 1024) {
+          if (file.size > (this.maxSize || 3) * 1024 * 1024) {
             if (this.isMobile) {
-              this.$emit('remindAction', '上传文件不得超过3M')
+              this.$emit('remindAction', `上传文件不得超过${this.maxSize || 3}M`)
             } else {
-              this.$message.error('上传文件不得超过3M')
+              this.$message.error(`上传文件不得超过${this.maxSize || 3}M`)
             }
 //            this.baseUtils.setMessage(this, '上传文件不得超过3M', this.isMobile, false)
             return false

+ 1 - 1
pages/mobile/center/user/doPay/_ids.vue

@@ -17,7 +17,7 @@
         <div class="fl">上传付款凭证:</div>
         <div class="fr">
           <div class="img inline-block">
-            <upload @uploadAction="onUpload" @remindAction="setRemindText" :noReview="false"></upload>
+            <upload @uploadAction="onUpload" :maxSize="20" @remindAction="setRemindText" :noReview="false"></upload>
           </div>
           <div class="inline-block text">仅支持jpg、gif、pdf格式的文件,大小不超过3M</div>
         </div>

+ 1 - 2
pages/mobile/center/user/pay/_orderId.vue

@@ -90,8 +90,7 @@
         </div>-->
         <div class="ps-operate-line ps-fare">
           <div class="text-ellipse">
-            <span class="pay-price-title inline-block">运费:</span><span class="ol-price" v-if="item.fare"><span v-if="item.fare.fare > 0">{{payData.currency | currencyFilter}}</span>{{item.fare.fare}}</span>
-            <span class="ol-price" v-else>0</span>
+            <span class="pay-price-title inline-block">运费:</span><span class="ol-price"><span>{{payData.currency | currencyFilter}}</span>{{item.fare ? item.fare.fare : 0}}</span>
           </div>
           <div class="text-ellipse">
              <span class="pay-price-title inline-block">手续费:</span><span class="ol-price"><span>{{payData.currency | currencyFilter}}</span>0</span>

+ 2 - 2
pages/mobile/center/vendor/payCenter.vue

@@ -46,7 +46,7 @@
     <!-- 交易记录start -->
     <div class="mp-record" v-if="switchType == 'record'">
       <div class="search-content">
-        <input type="text" placeholder="家名称/订单号" v-model="filterParams.keyword" @keyup.13="filterRecord">
+        <input type="text" placeholder="家名称/订单号" v-model="filterParams.keyword" @keyup.13="filterRecord">
         <span @click="filterRecord"><i class="iconfont icon-sousuo"></i></span>
       </div>
       <div class="filters-wrap">
@@ -91,7 +91,7 @@
             <span class="inline-block content text-ellipse">{{record.orderid}}</span>
           </div>
           <div class="content-line">
-            <span class="inline-block title">家名称:</span>
+            <span class="inline-block title">家名称:</span>
             <span class="inline-block content text-ellipse">{{record.buyerentername || record.buyername}}</span>
           </div>
           <div class="content-line">