Merge remote-tracking branch 'origin/develop' into develop

@@ -26,7 +26,7 @@
 <script>
 
 import { Button, Scroll, Input } from 'cube-ui';
-import { mapActions, mapState } from 'vuex';
+import { mapActions, mapState, mapMutations } from 'vuex';
 
 export default {
   name: 'ThirdBind',
@@ -62,6 +62,7 @@ export default {
   },
   methods: {
     ...mapActions(['sendBindSms', 'submitThirdBind']),
+    ...mapMutations(['SET_LOGIN_INFO']),
     open() {
       this.bindCode = this.$route.query.bind_code;
       this.phone = '';
@@ -126,6 +127,7 @@ export default {
           if (res.code === 200) {
             this.binded = true;
             this.close();
+            this.SET_LOGIN_INFO({ uid: 999999999999 }); // 设置登录状态
           } else {
             this.toast(res.message);
           }

@@ -7,7 +7,7 @@
     <meta name="description" content="" />
     <meta
       name="viewport"
-      content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no"
+      content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, viewport-fit=cover"
     />
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
     <meta content="yes" name="apple-mobile-web-app-capable" />

@@ -136,6 +136,6 @@ export default {
 .cubeic-arrow {
   color: #999;
   margin-left: 10px;
-  font-size: 32px;
+  font-size: 20px;
 }
 </style>

@@ -13,6 +13,7 @@
   font-size: 36px;
   color: #000;
   padding: 15px;
+  font-weight: bold;
   border-bottom: solid 1px #eee;
 }
 .no-data {

@@ -55,7 +55,6 @@
   height: 48px;
 }
 .assets-record-code-txt {
-  font-family: PingFang-SC-Regular;
   font-size: 28px;
   color: #000000;
   display: -webkit-box;
@@ -68,19 +67,16 @@
   display: inline-block;
 }
 .assets-record-time-txt {
-  font-family: SFProText-Regular;
   font-size: 22px;
   color: #999999;
   margin-top: 12px;
 }
 .assets-record-income-txt {
-  font-family: SFProText-Medium;
   font-weight: bold;
   font-size: 28px;
-  color: #65AB85;
+  color: #000;
 }
 .assets-record-income-tip-txt {
-  font-family: PingFang-SC-Regular;
   font-size: 20px;
   color: #D0021B;
   display: inline-block;

@@ -340,7 +340,7 @@ export default {
           }
         }),
         onCloseAction() {
-          // vm.onClose(orderResult.data.orderCode);
+          vm.onClose(get(vm.publishresult, 'orderCode', ''));
         }
       }).show();
     },
@@ -361,6 +361,18 @@ export default {
       }).show();
     },
 
+    onClose(orderCode) {
+      if (orderCode) {
+        this.$router.replace({
+          name: 'buyOrderDetail',
+          params: {
+            owner: 'buy',
+            code: orderCode
+          }
+        });
+      }
+    }
+
   }
 };
 </script>
@@ -619,4 +631,13 @@ export default {
     padding: 0 40px 40px;
     background-color: white;
   }
+
+  .cube-picker-panel {
+    height: 273px;
+    text-align: center;
+    font-size: 14px;
+    background: #fff;
+    border-top-left-radius: 15px !important;
+    border-top-right-radius: 15px !important;
+  }
 </style>

@@ -43,7 +43,6 @@ export default {
               const isOk = await this.deleteOrder({
                 orderCode,
                 owner,
-                status
               });
 
               if (isOk) {
@@ -53,7 +52,7 @@ export default {
                   this.filterOrderList({
                     orderCode,
                     owner,
-                    status
+                    status,
                   });
                 }
               }
@@ -124,8 +123,8 @@ export default {
           }
           this.$createOrderPayType({
             orderCode,
-            price: parseFloat(price || ''),
-            desc: '',
+            price: parseFloat(price || '').toFixed(2),
+            desc: '金额',
             extra: JSON.stringify({
               back: {
                 name: pageBackName,
@@ -142,7 +141,7 @@ export default {
         case orderActionsMap.PAY_DEPOSIT.name: {
           this.$createOrderPayType({
             orderCode,
-            price: parseFloat(bidDepositInfo.depositAmount),
+            price: parseFloat(bidDepositInfo.depositAmount).toFixed(2),
             desc: '支付定金',
             extra: JSON.stringify({
               forward: {

@@ -63,7 +63,7 @@ export default {
 
           this.$createOrderPayType({
             orderCode,
-            price: earnestMoney,
+            price: parseFloat(`${earnestMoney}`).toFixed(2),
             desc: '保证金',
 
             // 支付成功会跳route

@@ -183,7 +183,7 @@ export default {
 
     },
     payOrder() {
-
+      let vm = this;
       this.$createOrderPayType({
         price: get(this.computeTip, 'earnestMoney', 0),
         desc: '保证金',
@@ -204,7 +204,7 @@ export default {
           }
         }),
         onCloseAction() {
-          // vm.onClose(orderResult.data.orderCode);
+          vm.onClose(get(this.publishinfo, 'orderCode', ''));
         }
       }).show();
     },
@@ -216,6 +216,19 @@ export default {
         type: 'txt',
         txt: this.toastMessage
       }).show();
+    },
+
+    onClose(orderCode) {
+      if (orderCode) {
+        this.$router.replace({
+          name: 'sellOrderDetail',
+          params: {
+            owner: 'sell',
+            code: orderCode
+          }
+        });
+      }
+
     }
   }
 

@@ -92,6 +92,13 @@ export default {
   },
   methods: {
     ...mapActions(['userRealCertification']),
+    toast(msg) {
+      this.$createToast && this.$createToast({
+        txt: msg,
+        type: 'txt',
+        time: 1000
+      }).show();
+    },
     clearInfo(arr) {
       if (arr && arr.length) {
         arr.forEach(val => {
@@ -122,25 +129,29 @@ export default {
     },
     addedHandler() {
       this.uploading = true;
+      this.uploadToast = this.$createToast({
+        txt: '上传中',
+        mask: true
+      }).show();
     },
     successHandler(file) {
+      this.uploading = false;
+      this.uploadToast.hide();
+
       if (get(file, 'response.code') === 200) {
         this.uploadCallback && this.uploadCallback(get(file, 'response.data.imagesList[0]'), file.url);
       } else {
-        this.$createToast && this.$createToast({
-          txt: res.message || '上传失败',
-          type: 'txt',
-          time: 1000
-        }).show();
+        this.toast(res.message || '上传失败');
       }
 
-      this.uploading = false;
       setTimeout(() => {
         this.$refs.upload.removeFile(file);
       }, 1000);
     },
     errorHandler() {
       this.uploading = false;
+      this.uploadToast.hide();
+      this.toast('上传失败');
     },
     submitCert() {
       this.userRealCertification({

@@ -84,7 +84,7 @@ export default function() {
     actions: {
       async fetchEntryOrderList({ dispatch, commit, state: { entryOrder } }) {
         const { page } = entryOrder;
-        const res = await this.$api.get('/api/ufo/seller/entryPrdList', {
+        const res = await this.$api.post('/api/ufo/seller/entryPrdList', {
           page,
 
           // TODO 注释type含义
@@ -104,7 +104,7 @@ export default function() {
       },
       async fetchNotEntryOrderList({ commit, state: { notEntryOrder } }) {
         const { page } = notEntryOrder;
-        const res = await this.$api.get('/api/ufo/seller/notEntryPrdList', {
+        const res = await this.$api.post('/api/ufo/seller/notEntryPrdList', {
           page,
           type: 1,
         });

@@ -30,7 +30,7 @@ export default function() {
        * }
        */
       async fetchOrderDetail({ commit }, { owner, code } = {}) {
-        const res = await this.$api.get('/api/order/detail', {
+        const res = await this.$api.post('/api/order/detail', {
           tabType: owner,
           orderCode: +code,
         });

@@ -18,7 +18,7 @@ export default function() {
        * @returns ts ILogisticsInfo
        */
       async fetchLogisticInfo({ commit }, { owner, code } = {}) {
-        const res = await this.$api.get('/api/order/express', {
+        const res = await this.$api.post('/api/order/express', {
           tabType: owner,
           orderCode: +code,
         });
@@ -27,17 +27,17 @@ export default function() {
           commit('initData', res.data);
         }
       },
-      async flawReject({commit}, {orderCode} = {}) {
-        return  this.$api.get('/api/order/flawreject', {
-          orderCode
-        })
+      async flawReject(_, { orderCode } = {}) {
+        return this.$api.get('/api/order/flawreject', {
+          orderCode,
+        });
       },
 
-      async flawAccept({commit}, {orderCode} = {}) {
+      async flawAccept(_, { orderCode } = {}) {
         return this.$api.get('/api/order/flawaccept', {
-          orderCode
-        })
-      }
+          orderCode,
+        });
+      },
     },
   };
 }

@@ -258,8 +258,8 @@ const bind = {
             req.ctx(passportModel).sendTaobaoBindCode(mobile, req.yoho.isAliApp ? 'xianyu' : '').then(res.json).catch(next);
         } else {
             res.json({
-                code: 200,
-                message: '绑定信息异常'
+                code: 403,
+                message: '关联信息异常'
             });
         }
     },