调价支付

@@ -11,7 +11,7 @@
           <div class="pro-info">
           <div class="pro-info">
             <p class="pro-name">{{productInfo.productName}}</p>
             <p class="pro-name">{{productInfo.productName}}</p>
             <p class="stock-info">
             <p class="stock-info">
-              <Logo :text="`有货UFO`" class="logo-wrapper"></Logo>
+<!--              <Logo :text="`有货UFO`" class="logo-wrapper"></Logo>-->
               <p class="stock-text">{{productInfo.colorName}}, {{productInfo.sizeNum}}个尺码, {{productInfo.storageNum}}个商品库存<p>
               <p class="stock-text">{{productInfo.colorName}}, {{productInfo.sizeNum}}个尺码, {{productInfo.storageNum}}个商品库存<p>
             </p>
             </p>
           </div>
           </div>
@@ -255,7 +255,7 @@ export default {
         }
         }
 
 
         .stock-text {
         .stock-text {
-          text-indent: 128px;
+          /*text-indent: 128px;*/
           font-size: 28px;
           font-size: 28px;
           font-weight: 600;
           font-weight: 600;
           line-height: 44px;
           line-height: 44px;

@@ -2,10 +2,10 @@
   <LayoutApp :title="title">
   <LayoutApp :title="title">
     <div class="order-page">
     <div class="order-page">
       <div class="product">
       <div class="product">
-        <ImgSize class="pro-img" :src="noEntryOrderInfo.goodsInfo.goodImg || ''" :width="200" :height="200"></ImgSize>
+        <ImgSize class="pro-img" :src="goodsInfo.goodImg || ''" :width="200" :height="200"></ImgSize>
         <div class="pro-info">
         <div class="pro-info">
-          <p class="pro-name">{{noEntryOrderInfo.goodsInfo.colorName}}, {{noEntryOrderInfo.goodsInfo.sizeName}}码</p>
-          <p class="stock-info ufo-font">最低售价： ¥{{noEntryOrderInfo.goodsInfo.leastPrice || noEntryOrderInfo.goodsInfo.price}}</p>
+          <p class="pro-name">{{goodsInfo.colorName}}, {{goodsInfo.sizeName}}码</p>
+          <p class="stock-info ufo-font">最低售价： ¥{{goodsInfo.leastPrice || '-'}}</p>
         </div>
         </div>
       </div>
       </div>
       <div class="input-container">
       <div class="input-container">
@@ -37,12 +37,12 @@
           <i class="iconfont iconaddress"></i>
           <i class="iconfont iconaddress"></i>
         </div>
         </div>
         <div class="address-info">
         <div class="address-info">
-          <p class="user-name">{{noEntryOrderInfo.userAddress.consignee}}</p>
+          <p class="user-name">{{userAddress.consignee}}</p>
           <p class="user-address">
           <p class="user-address">
-            {{noEntryOrderInfo.userAddress.area}} {{noEntryOrderInfo.userAddress.address}}
+            {{userAddress.area}} {{userAddress.address}}
           </p>
           </p>
           <p class="user-phone">
           <p class="user-phone">
-            {{noEntryOrderInfo.userAddress.mobile}}
+            {{userAddress.mobile}}
           </p>
           </p>
         </div>
         </div>
       </div>
       </div>
@@ -95,7 +95,7 @@ import Modal from './components/modal';
 import OrderCheck from '../components/confirm/agree';
 import OrderCheck from '../components/confirm/agree';
 
 
 const {mapState, mapActions} = createNamespacedHelpers('order/priceChange');
 const {mapState, mapActions} = createNamespacedHelpers('order/priceChange');
-
+// orderCode = 1233499619151
 export default {
 export default {
   name: 'noEntryDetail',
   name: 'noEntryDetail',
   components: {OrderCheck, Modal, InputUfo, ScrollView, LayoutApp, ImgSize, Checkbox},
   components: {OrderCheck, Modal, InputUfo, ScrollView, LayoutApp, ImgSize, Checkbox},
@@ -132,7 +132,13 @@ export default {
     // this.inputChange = debounce(this.onChange.bind(this), 500);
     // this.inputChange = debounce(this.onChange.bind(this), 500);
   },
   },
   computed: {
   computed: {
-    ...mapState(['noEntryOrderInfo'])
+    ...mapState(['noEntryOrderInfo']),
+    goodsInfo() {
+      return this.noEntryOrderInfo.goodsInfo || {};
+    },
+    userAddress() {
+      return this.noEntryOrderInfo.userAddress || {};
+    }
   },
   },
   watch: {
   watch: {
     chgPrice() {
     chgPrice() {
@@ -188,7 +194,7 @@ export default {
           onCancel: () => {
           onCancel: () => {
             this.onPriceChangeConfirm({
             this.onPriceChangeConfirm({
               price: this.chgPrice,
               price: this.chgPrice,
-              skup: this.noEntryOrderInfo.goodsInfo.skup
+              skup: this.goodsInfo.skup
             });
             });
           }
           }
 
 
@@ -198,7 +204,7 @@ export default {
     async calcPrice(price) {
     async calcPrice(price) {
       const result = await this.postNoEntryCalcPrice({
       const result = await this.postNoEntryCalcPrice({
         price: price,
         price: price,
-        skup: this.noEntryOrderInfo.goodsInfo.skup
+        skup: this.goodsInfo.skup
       });
       });
 
 
       console.log(result);
       console.log(result);
@@ -259,6 +265,18 @@ export default {
           orderCode: result.data.orderCode,
           orderCode: result.data.orderCode,
           price: price,
           price: price,
           desc: '保证金',
           desc: '保证金',
+          extra: JSON.stringify({
+            type: 'sell',
+            back: {
+              name: 'InSaleOrderList'
+            },
+            forward: {
+              name: 'SellPayOk',
+              query: {
+                orderCode: result.data.orderCode
+              }
+            }
+          }),
           onCloseAction() {
           onCloseAction() {
             that.clearData();
             that.clearData();
             that.$router.replace({
             that.$router.replace({
@@ -279,6 +297,7 @@ export default {
       // console.log(result);
       // console.log(result);
     },
     },
     clearData() { // 清空数据状态
     clearData() { // 清空数据状态
+      console.log(this.$router);
       this.platformFeeModalVisible = false;
       this.platformFeeModalVisible = false;
       this.platformFee = {
       this.platformFee = {
         amount: '-¥0',
         amount: '-¥0',

@@ -71,88 +71,11 @@ export default {
         order: result
         order: result
       });
       });
     } else {
     } else {
-      result = {
-        "alg": "SALT_MD5",
-        "code": 200,
-        "data": {
-          "attributes": 1,
-          "bankTransferFee": "-￥0.19",
-          "bidType": 0,
-          "buttons": [{
-            "code": "not_sold",
-            "confirmTips": "您确定不卖此商品么？取消后保证金将原路退还至您的账户",
-            "name": "NOT_SOLD",
-            "text": "不卖了"
-          }, {
-            "code": "not_entry_change_price",
-            "name": "NOT_ENTRY_CHANGE_PRICE",
-            "text": "调价"
-          }],
-          "createTime": "2019-10-09 18:01:23",
-          "earnestMoney": 0.76,
-          "earnestMoneyStr": "￥0.76",
-          "goodsInfo": {
-            "batchNo": 1233499619151,
-            "bidType": 0,
-            "colorName": "黑色",
-            "entryFlag": false,
-            "goodImg": "http://img11.static.yhbimg.com/goodsimg/2019/02/25/10/018b0d26a7e4bc0b39a93c329dd8c13d8e.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80",
-            "goodPrice": "19.00",
-            "leastPrice": 19.00,
-            "leastPriceOfSkuTips": "最低现货价￥19",
-            "price": 19.00,
-            "productId": 10001266,
-            "productName": "Air Jordan 1 复刻黑绿脚趾  范闲",
-            "sizeName": "37",
-            "skup": 19466,
-            "storageId": 10090816
-          },
-          "income": "￥18.79",
-          "isAdvance": "N",
-          "isPaid": 1,
-          "orderCode": 1233499619151,
-          "payStartTime": 1570615283,
-          "payment": 9,
-          "paymentStr": "手机网站支付宝",
-          "platformFee": {
-            "amount": "-￥0.02",
-            "appraiseFee": "￥0.01",
-            "goodsPaymentRatePercent": "0.00%",
-            "packageFee": "￥0.01",
-            "payChannelPercentage": "1.00%",
-            "serviceFee": "￥0.00"
-          },
-          "secendLevelCreateTime": 1570615283,
-          "statusDetail": {
-            "detailDesc": "商品出售中，待买家购买",
-            "expressShow": false,
-            "paymentTips": "交易成功后自动退还",
-            "statuStr": "出售中",
-            "status": 1
-          },
-          "submitOrderTimeStr": "2019-10-09 18:01:23",
-          "uid": 349709,
-          "userAddress": {
-            "address": "嘉陵江东街18号南京国家广告产****17楼",
-            "address_id": 2396242,
-            "area": "江苏省 南京市 建邺区 建邺区新城科技园",
-            "areaCode": "320105400",
-            "consignee": "*骏",
-            "isUpdate": "N",
-            "mobile": "138****0257",
-            "phone": "",
-            "zipCode": ""
-          }
-        },
-        "md5": "ab14db14196b6213d05d288179ecf9e2",
-        "message": "订单详情"
-      };
-
-      commit(Types.FETCH_NOENTRY_ORDER_PRODUCT_SUCCESS, {
+      /*commit(Types.FETCH_NOENTRY_ORDER_PRODUCT_SUCCESS, {
         order: result
         order: result
-      });
+      });*/
 
 
-      // commit(Types.FETCH_NOENTRY_ORDER_PRODUCT_FAILED);
+      commit(Types.FETCH_NOENTRY_ORDER_PRODUCT_FAILED);
     }
     }
   },
   },
 
 

@@ -13,7 +13,9 @@ export default function() {
       productInfo: {}, // 商品详情
       productInfo: {}, // 商品详情
       skcs: [], // 商品下包含的出售尺码相关信息
       skcs: [], // 商品下包含的出售尺码相关信息
       noEntryOrderInfo: {
       noEntryOrderInfo: {
-        goodsInfo: {}
+        goodsInfo: {
+          goodImg: ''
+        }
       },
       },
     },
     },
     actions,
     actions,