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

components/mobile/base/addressEdit.vue

@@ -100,9 +100,8 @@
     watch: {
       'data': {
         handler: function (newVal) {
-          console.log(newVal)
           if (newVal) {
-            this.isActive = false
+            newVal.num === 1 ? this.isActive = true : this.isActive = false
             this.params = this.baseUtils.deepCopy(newVal)
           }
         },

components/mobile/base/addressView.vue

@@ -13,7 +13,12 @@
         </div>
       </div>
     </div>
-    <ul class="list-unstyled">
+    <div class="com-none-state" v-if="addressList.length === 0">
+      <img src="/images/mobile/@2x/empty-collect.png">
+      <p>抱歉，您还没有添加地址信息</p>
+      <nuxt-link to="/">返回首页</nuxt-link>
+    </div>
+    <ul class="list-unstyled" v-else>
       <li v-for="(item, index) in addressList">
         <div class="wrapper-line clearfix">
           <div class="name pull-left">{{isSend ? '发货地址：' : '收货地址：'}}</div>

components/mobile/store/StoreDetail.vue

@@ -167,8 +167,8 @@
                 <i class="iconfont icon-kefu1"></i>联系卖家
               </div>
               <div class="pull-right clearfix">
-                <div class="pull-left">加入购物车</div>
-                <div class="pull-left">立即购买</div>
+                <div class="pull-left" @click="buy(item, false, $event)">加入购物车</div>
+                <div class="pull-left" @click="buy(item, true, $event)">立即购买</div>
               </div>
             </div>
           </div>
@@ -378,12 +378,19 @@
           this.showLoginBox = true
         }
       },
+      setRemindText: function (str) {
+        this.collectResult = str
+        this.timeoutCount++
+      },
       search: function () {
         this.page = 1
         this.isChange = true
         this.isSearch = true
         this.remindKeyword = this.keyword
         this.pageCommodity({ page: this.page, count: this.count })
+      },
+      buy: function (item, flag, e) {
+        this.baseUtils.buyOrCar(flag, e, this, item, '/mobile/center/user/pay/')
       }
     }
   }

pages/mobile/center/user/payCenter.vue

@@ -62,11 +62,11 @@
             </ul>
           </li>
           <li class="inline-block">
-            <div @click.stop="setShowSelect('currency', !showSelectCurrency)">{{filterParams.currency || '币种'}}</div>
+            <div @click.stop="setShowSelect('currencyName', !showSelectCurrency)">{{filterParams.currencyName || '币种'}}</div>
             <ul class="select-list" v-show="showSelectCurrency">
-              <li @click.stop="setSelect('currency', null)">币种</li>
-              <li @click.stop="setSelect('currency', 'RMB')">RMB</li>
-              <li @click.stop="setSelect('currency', 'USD')">USD</li>
+              <li @click.stop="setSelect('currencyName', null)">币种</li>
+              <li @click.stop="setSelect('currencyName', 'RMB')">RMB</li>
+              <li @click.stop="setSelect('currencyName', 'USD')">USD</li>
             </ul>
           </li>
           <li class="inline-block">
@@ -320,7 +320,7 @@
           this.showSelectMethod = flag
           this.showSelectCurrency = false
           this.showSelectStatus = false
-        } else if (type === 'currency') {
+        } else if (type === 'currencyName') {
           this.showSelectCurrency = flag
           this.showSelectStatus = false
           this.showSelectMethod = false
@@ -334,14 +334,14 @@
         if (type === 'method') {
           this.filterParams.method = val
           this.setShowSelect('method', false)
-        } else if (type === 'currency') {
-          this.filterParams.currency = val
-          this.setShowSelect('currency', false)
+        } else if (type === 'currencyName') {
+          this.filterParams.currencyName = val
+          this.setShowSelect('currencyName', false)
         } else if (type === 'status') {
           this.filterParams.status = val
           this.setShowSelect('status', false)
         }
-        this.filterRecord()
+        this.filterRecord(this.filterParams.currencyName)
       },
       setDate (type) {
         // 00:00:00

pages/mobile/center/vendor/payCenter.vue

@@ -448,6 +448,7 @@
           number: false,
           accountname: false
         }
+        this.file = ''
       },
       openAddAccount () {
         if (!this.bankList || !this.bankList.length) {

pages/mobile/user/index.vue

@@ -172,7 +172,6 @@
           if (this.storeStatus.uuid) {
             this.$router.push(url)
           } else {
-            // this.setRemindText('请前往PC端申请开店')
             if (this.applyStatus === 'PREPARE') {
               this.setRemindText('您的申请已提交，请耐心等待工作人员审核（2-3个工作日）')
             } else {
@@ -184,6 +183,8 @@
               }
             }
           }
+        } else if (url === '/mobile/user/address') {
+          this.$router.push(url)
         } else if (!this.user.data.enterprise.uu || this.user.data.enterprise.isVendor !== 313) {
           this.setRemindText('请点击【开店申请】完善信息')
         } else {