Merge branch 'dev' of http://git.izouma.com/panhui/card-wechat into dev

src/components/AllselloutInfo.vue

@@ -42,7 +42,7 @@
             <div class="box-butm">
                 <div v-if="status == 'CREATED'" @click="cancel" class="box-but">取消订单</div>
                 <div v-if="status == 'CREATED'" @click="Buyers" class="box-but2">联系买家</div>
-                <div v-if="status == 'PAYED'" @click="logistics" class="box-but">查看物流</div>
+                <div v-if="status == 'PAYED'" @click="cancel" class="box-but">取消订单</div>
                 <div v-if="status == 'PAYED'" @click="deliver" class="box-but2">立即发货</div>
                 <div v-if="status == 'SEND'" @click="logistics" class="box-but">查看物流</div>
                 <div v-if="status == 'SEND'" @click="Buyers" class="box-but3">联系买家</div>
@@ -239,11 +239,12 @@ export default {
             this.navigateTo('/pages/Applydetails?id=' + this.id);
         },
         deliver() {
-            console.log(this.all);
-            wx.showToast({
-                title: '敬请开放',
-                icon: 'none'
-            });
+            // console.log(this.all);
+            // wx.showToast({
+            //     title: '敬请开放',
+            //     icon: 'none'
+            // });
+            this.$http.post('orderInfo/send', { logisticNo: '' });
         }
     }
 };

src/pages/wallet.vue

@@ -99,6 +99,7 @@ export default {
                     this.hideLoading();
                     // console.log(res);
                     wx.showToast({
+                        icon: 'none',
                         title: '提现审核中，72小时内通过',
                         duration: 4000
                     });