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

src/components/AllselloutInfo.vue

@@ -233,9 +233,9 @@ export default {
             });
         },
         Buyers() {
-            console.log(this.all);
+            // console.log(this.all);
             let userId = this.$store.state.userInfo.id;
-            if (userId == this.all.storeUserId) {
+            if (userId == this.all.userId) {
                 console.log('===');
                 this.toast('此商品是你店铺所有');
             } else {

src/pages/Applydetails.vue

@@ -111,6 +111,7 @@ export default {
                 .get('/orderInfo/get/' + this.$mp.query.id)
                 .then(res => {
                     this.hideLoading();
+                    // console.log(res);
                     this.cardCaseInfo = res.cardCase.collection;
                     this.ApplydetailList = res;
                     this.store = res.store;

src/pages/allorder.vue

@@ -25,7 +25,7 @@
             image="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/wechat/kong_png_womaidaode%403x.png"
             description="暂无相关订单哦～"
         >
-            <van-button round type="danger" class="bottom-button" @click="navigateTo('/pages/Home')">
+            <van-button round type="danger" class="bottom-button" @click="Lock">
                 去逛逛
             </van-button>
         </van-empty>
@@ -50,6 +50,11 @@ export default {
             this.active = item;
             this.allFn();
         },
+        Lock() {
+            wx.switchTab({
+                url: '/pages/Home'
+            });
+        },
         allFn() {
             this.allList = [];
             this.showLoading();

src/pages/allselldetails.vue

@@ -423,7 +423,7 @@ export default {
         },
         Buyers() {
             let userId = this.$store.state.userInfo.id;
-            if (userId == this.store.userId) {
+            if (userId == this.status.userId) {
                 this.toast('此商品是你店铺所有');
                 return;
             }

src/pages/store/productEdit.vue

@@ -44,10 +44,10 @@
             </van-field> -->
             <van-field
                 label="邮费"
+                type="digit"
                 :value="form.postage"
                 @input="form.postage = $event.detail"
                 placeholder="请输入邮费"
-                type="digit"
             >
                 <span slot="right-icon">元</span>
             </van-field>
@@ -524,6 +524,7 @@ export default {
     margin-right: 20px;
 }
 /deep/.form {
+    position: relative;
     .van-cell {
         --cell-vertical-padding: 23px;
         --cell-horizontal-padding: 20px;