Merge remote-tracking branch 'origin/release-201817-yc' into release-201817-yc

components/default/MessageBoard.vue

@@ -77,7 +77,7 @@
               <div class="msg-content">
                 <label>手机：</label>
                 <input type="text" name="userTel" v-model="messageBoard.userTel"  autocomplete="off" @keyup="checkMobile"/>
-                <span v-if="!isMobile"><i class="glyphicon glyphicon-info-sign x-icon-left"></i>请输入正确的号码</span>
+                <span v-if="!isMobileValid"><i class="glyphicon glyphicon-info-sign x-icon-left"></i>请输入正确的号码</span>
               </div>
             </div>
             <div class="msg-message" v-if="!user.userUU">
@@ -140,7 +140,7 @@
         isOpen: true,
         isLogin: false,
         txtVal: 0,
-        isMobile: true,
+        isMobileValid: true,
         isEmail: true,
         messageBoard: {},
         dialogImageUrl: ['', '', '', '', '']
@@ -196,7 +196,7 @@
       },
       // 判断手机号
       checkMobile () {
-        this.isMobile = (/^[\d]{8,11}$/).test(this.messageBoard.userTel)
+        this.isMobileValid = (/^[\d]{8,11}$/).test(this.messageBoard.userTel)
       },
       // 判断邮箱
       checkEmail () {
@@ -213,7 +213,7 @@
           } else if (!this.messageBoard.userTel && !this.messageBoard.email) {
             this.$message.info('请填写任意一种联系方式')
           } else {
-            if (this.isMobile === false) {
+            if (this.isMobileValid === false) {
               this.$message.info('请输入正确的手机号码')
             } else if (this.isEmail === false) {
               this.$message.info('请输入正确的邮箱')

components/default/RightBar.vue

@@ -72,6 +72,7 @@
       </ul>
     </div>
     <el-dialog class="dialog"
+               v-if="dialogVisible"
       :visible.sync="dialogVisible"
       size="tiny">
       <message-board @pageEvent="listenPage" @openBoardEvent="listenOpen"/>

components/mobile/base/SelectAddress.vue

@@ -47,6 +47,20 @@
         }
       })
     },
+    watch: {
+      isShow: function (val) {
+        if (val) {
+          this.activeObj = {
+            // 省
+            province: -1,
+            // 市
+            city: -1,
+            // 区
+            area: -1
+          }
+        }
+      }
+    },
     computed: {
       currentType () {
         if (this.activeObj.area > -1) {

components/mobile/base/addressEdit.vue

@@ -110,7 +110,7 @@
     },
     methods: {
       editClick (data) {
-        this.$emit('isEditEvent', data || [], false)
+        this.$emit('isEditEvent', data || {}, false)
       },
       addressData (type) {
         this.addressShow = false

components/mobile/base/addressView.vue

@@ -112,13 +112,14 @@
         this.showLogout = true
       },
       goNext() {
-        if (this.saveId.active === 0) {
-          this.setActiveClick(this.addressList[1].id)
-        }
         this.$http.put(`/trade/address/delete/${this.saveId.id}`)
           .then(() => {
-            this.initList()
             this.showLogout = false
+            if (this.saveId.active === 0) {
+              this.setActiveClick(this.addressList[1].id)
+            } else {
+              this.initList()
+            }
           })
       },
       // 编辑事件

pages/mobile/center/user/pay/_orderId.vue

@@ -514,7 +514,7 @@
         this.getTakeSelfInfo()
       },
       getDeliveryRule () {
-        return !this.selectedAddress.id ? {} : this.$http.post(`/trade/distributionRule/usable/rule?area=${this.selectedAddress.area}`, this.ruleParamsArr)
+        return this.$http.post(`/trade/distributionRule/usable/rule?area=${this.selectedAddress.area}`, this.ruleParamsArr)
           .then(res => {
 //            this.fareRule = res.data || {}
             this.orderData.forEach(item => {

pages/mobile/center/user/payCenter.vue

@@ -347,7 +347,11 @@
         // 00:00:00
         this.filterParams[type] = new Date(this.filterParams[type]).getTime() - 8 * 60 * 60 * 1000
         if (this.filterParams.fromDate && this.filterParams.toDate && this.filterParams.fromDate > this.filterParams.toDate) {
-          this.setRemindText('起始时间不能大于结束时间')
+          if (type === 'fromDate') {
+            this.setRemindText('起始时间不能大于结束时间')
+          } else {
+            this.setRemindText('结束时间不能小于起始时间')
+          }
           this.filterParams[type] = null
         } else {
           if (this.filterParams.fromDate && this.filterParams.toDate && this.filterParams.fromDate === this.filterParams.toDate) {

pages/mobile/center/vendor/payCenter.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="mobile-pay-center vendor-pay mobile-fix-content mobile-centerfix-content" id="mobileFixContent" @click="setShowSelect('all', false)">
+  <div class="mobile-pay-center vendor-pay mobile-fix-content mobile-centerfix-content" :class="{'vendor-pay-record': switchType === 'record'}" id="mobileFixContent" @click="setShowSelect('all', false)">
     <div class="mp-head">
       <span class="inline-block" :class="{'active': switchType === 'record'}" @click="setSwitchType('record')">交易记录</span>
       <span class="inline-block" :class="{'active': switchType === 'account'}" @click="setSwitchType('account')">收款账户</span>
@@ -406,7 +406,11 @@
       setDate (type) {
         this.filterParams[type] = new Date(this.filterParams[type]).getTime() - 8 * 60 * 60 * 1000
         if (this.filterParams.fromDate && this.filterParams.toDate && this.filterParams.fromDate > this.filterParams.toDate) {
-          this.setRemindText('起始时间不能大于结束时间')
+          if (type === 'fromDate') {
+            this.setRemindText('起始时间不能大于结束时间')
+          } else {
+            this.setRemindText('结束时间不能小于起始时间')
+          }
           this.filterParams[type] = null
         } else {
           if (this.filterParams.fromDate && this.filterParams.toDate && this.filterParams.fromDate === this.filterParams.toDate) {
@@ -708,10 +712,12 @@
     }
   }
   .vendor-pay {
-    bottom: 2.23rem !important;
     .mobile-modal .mobile-modal-wrapper {
       left: .2rem !important;
       right: .2rem !important;
     }
   }
+  .vendor-pay-record {
+    bottom: 2.23rem !important;
+  }
 </style>

pages/mobile/product/_batchCode.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="mobile-content commodity-detail">
-    <div class="logo-wrap">
+   <!-- <div class="logo-wrap">
       <div class="wrap-title"><span class="line"></span>图片信息</div>
       <img :src="commodity.img || '/images/store/common/default.png'" alt="" v-if="commodity.img">
       <div class="commodity-infom" v-else>暂无图片，请<span @click="showStoreInfo = true">联系卖家</span>了解具体详情</div>
-    </div>
+    </div>-->
     <div class="product-info">
       <div class="wrap-title"><span class="line"></span>产品信息</div>
       <div class="focus-wrap inline-block" :class="{'active': isFocus}">
@@ -48,8 +48,8 @@
 
         <div class="list">
           <div class="name">交期(天)：</div>
-          <div class="text red" v-if="commodity.b2cMaxDelivery && (commodity.b2cMaxDelivery != commodity.b2cMinDelivery)" v-text="commodity.b2cMinDelivery + '-'+ commodity.b2cMaxDelivery + '(天)'"></div>
-          <div class="text red" v-if="commodity.b2cMaxDelivery && (commodity.b2cMaxDelivery == commodity.b2cMinDelivery)" v-text="commodity.b2cMinDelivery  + '(天)'"></div>
+          <div class="text" v-if="commodity.b2cMaxDelivery && (commodity.b2cMaxDelivery != commodity.b2cMinDelivery)" v-text="commodity.b2cMinDelivery + '-'+ commodity.b2cMaxDelivery"></div>
+          <div class="text" v-if="commodity.b2cMaxDelivery && (commodity.b2cMaxDelivery == commodity.b2cMinDelivery)" v-text="commodity.b2cMinDelivery"></div>
         </div>
 
         <!--<div class="list">-->
@@ -63,7 +63,7 @@
         <!--</div>-->
 
         <div class="list">
-          <div class="name left">价格梯度：</div>
+          <div class="name left">价格梯度：<br/>(PCS)</div>
           <div class="table left">
             <ul>
               <li class="title">