From 12f15fbc623b03be32aa1b48cb4de58b02827f55 Mon Sep 17 00:00:00 2001
From: Gao xiaosong <704041637@qq.com>
Date: Mon, 10 Aug 2020 07:12:36 +0800
Subject: [PATCH] a

---
 libs/order.js                         |   2 +
 manifest.json                         |  12 +-
 pages/order/OrderDetails/index.vue    | 316 +++++++++++++-------------
 pages/order/OrderSubmission/index.vue | 131 ++++++-----
 utils/request.js                      |   4 +
 5 files changed, 237 insertions(+), 228 deletions(-)

diff --git a/libs/order.js b/libs/order.js
index 57db3e9..3082833 100644
--- a/libs/order.js
+++ b/libs/order.js
@@ -76,6 +76,8 @@ export function payOrderHandle(orderId, type, from) {
     uni.showLoading({ title: '加载中' })
     payOrder(orderId, type, from)
       .then(res => {
+		  console.log(res)
+		  console.log('微信支付参数')
         const data = res.data;
         uni.hideLoading()
         switch (data.status) {
diff --git a/manifest.json b/manifest.json
index f1a422f..599c5b4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -11,7 +11,7 @@
         "nvueCompiler" : "uni-app",
         "compilerVersion" : 3,
         "splashscreen" : {
-            "alwaysShowBeforeRender" : false,
+            "alwaysShowBeforeRender" : true,
             "waiting" : false,
             "autoclose" : true,
             "delay" : 0
@@ -59,22 +59,24 @@
                     "weixin" : {
                         "appid" : "wx7c84ede33062d1e4",
                         "appsecret" : "c47ef66d3311194da44e60387d5c1abd",
-                        "UniversalLinks" : ""
+                        "UniversalLinks" : "https://yixiang.co/app/"
                     }
                 },
                 "payment" : {
                     "weixin" : {
                         "appid" : "wx7c84ede33062d1e4",
-                        "UniversalLinks" : ""
+                        "UniversalLinks" : "https://yixiang.co/app/"
                     }
                 },
                 "share" : {
                     "weixin" : {
                         "appid" : "wx7c84ede33062d1e4",
-                        "UniversalLinks" : ""
+                        "UniversalLinks" : "https://yixiang.co/app/"
                     }
                 },
-                "ad" : {}
+                "ad" : {
+                    "csj" : {}
+                }
             },
             "splashscreen" : {
                 "ios" : {
diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index 37dc9d0..eb38893 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -4,9 +4,7 @@
     <view class="header bg-color-red acea-row row-middle" :class="refundOrder ? 'on' : ''">
       <view class="data" :class="refundOrder ? 'on' : ''">
         <view class="state">{{ orderInfo._status._msg }}</view>
-        <view>
-          {{ orderInfo.createTime }}
-        </view>
+        <view>{{ orderInfo.createTime }}</view>
       </view>
     </view>
     <template v-if="!refundOrder">
@@ -41,20 +39,12 @@
           ></view>
           <view
             class="line"
-            :class="{
-              'bg-color-red':
-                status.type > 1 && status.type != 6 && status.type != 9
-            }"
+            :class="{'bg-color-red':status.type > 1 && status.type != 6 && status.type != 9}"
             v-if="orderInfo.shippingType === 1"
           ></view>
           <view
             class="iconfont"
-            :class="[
-              status.type === 2 ? 'icon-webicon318' : 'icon-yuandianxiao',
-              status.type >= 2 && status.type != 6 && status.type != 9
-                ? 'font-color-red'
-                : ''
-            ]"
+            :class="[status.type === 2 ? 'icon-webicon318' : 'icon-yuandianxiao',status.type >= 2 && status.type != 6 && status.type != 9? 'font-color-red': '']"
             v-if="orderInfo.shippingType === 1"
           ></view>
           <view
@@ -125,7 +115,10 @@
         v-if="orderInfo.shippingType === 2 && orderInfo.paid === 1"
       >
         <div>自提地址信息</div>
-        <div class="place cart-color acea-row row-center-wrapper" @click="showChang(orderInfo.systemStore)">
+        <div
+          class="place cart-color acea-row row-center-wrapper"
+          @click="showChang(orderInfo.systemStore)"
+        >
           <span class="iconfont icon-weizhi"></span>查看位置
         </div>
       </div>
@@ -160,9 +153,7 @@
       </view>
       <view class="item acea-row row-between">
         <view>下单时间：</view>
-        <view class="conter">
-          {{ orderInfo.createTime }}
-        </view>
+        <view class="conter">{{ orderInfo.createTime }}</view>
       </view>
       <view class="item acea-row row-between">
         <view>订单类型：</view>
@@ -262,22 +253,21 @@
       <template v-if="status.type == 1">
         <view class="bnt cancel" @click="goGoodsReturn(orderInfo)">申请退款</view>
       </template>
-      <template v-if="status.type == 2">
+      <!--  -->
+      <template v-if="orderInfo.shippingType == 1 && status.type == 2">
         <view
           class="bnt default"
           @click="$yrouter.push({ path: '/pages/order/Logistics/index' ,query:{id:orderInfo.orderId }})"
         >查看物流</view>
         <view class="bnt bg-color-red" @click="takeOrder">确认收货</view>
       </template>
-      <template v-if="status.type == 3 && orderInfo.deliveryType == 'express'">
+      <template v-if="orderInfo.shippingType == 1 && status.type == 3 && orderInfo.deliveryType == 'express'">
         <view
           class="bnt default"
-          @click="
-            $yrouter.push({ path: '/pages/order/Logistics/index' ,query:{id:orderInfo.orderId }})
-          "
+          @click="$yrouter.push({ path: '/pages/order/Logistics/index' ,query:{id:orderInfo.orderId }})"
         >查看物流</view>
       </template>
-      <template v-if="status.type == 4">
+      <template v-if="orderInfo.shippingType == 1 && status.type == 4">
         <view class="bnt cancel" @click="delOrder">删除订单</view>
         <view
           class="bnt default"
@@ -302,133 +292,18 @@
     </view>
   </view>
 </template>
-<style scoped lang="less">
-.geoPage {
-  position: fixed;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  z-index: 10000;
-}
-.order-details .writeOff {
-  background-color: #fff;
-  margin-top: 0.13 * 100rpx;
-  padding-bottom: 0.3 * 100rpx;
-}
-.order-details .writeOff .title {
-  font-size: 0.3 * 100rpx;
-  color: #282828;
-  height: 0.87 * 100rpx;
-  border-bottom: 1px solid #f0f0f0;
-  padding: 0 0.3 * 100rpx;
-  line-height: 0.87 * 100rpx;
-}
-.order-details .writeOff .grayBg {
-  background-color: #f2f5f7;
-  width: 5.9 * 100rpx;
-  height: 3.84 * 100rpx;
-  border-radius: 0.2 * 100rpx 0.2 * 100rpx 0 0;
-  margin: 0.5 * 100rpx auto 0 auto;
-  padding-top: 0.55 * 100rpx;
-}
-.order-details .writeOff .grayBg .pictrue {
-  width: 2.9 * 100rpx;
-  height: 2.9 * 100rpx;
-  margin: 0 auto;
-}
-.order-details .writeOff .grayBg .pictrue img {
-  width: 100%;
-  height: 100%;
-  display: block;
-}
-.order-details .writeOff .gear {
-  width: 5.9 * 100rpx;
-  height: 0.3 * 100rpx;
-  margin: 0 auto;
-}
-.order-details .writeOff .gear img {
-  width: 100%;
-  height: 100%;
-  display: block;
-}
-.order-details .writeOff .num {
-  background-color: #f0c34c;
-  width: 5.9 * 100rpx;
-  height: 0.84 * 100rpx;
-  color: #282828;
-  font-size: 0.48 * 100rpx;
-  margin: 0 auto;
-  border-radius: 0 0 0.2 * 100rpx 0.2 * 100rpx;
-  text-align: center;
-  padding-top: 0.04 * 100rpx;
-}
-.order-details .writeOff .rules {
-  margin: 0.46 * 100rpx 0.3 * 100rpx 0 0.3 * 100rpx;
-  border-top: 0.01 * 100rpx solid #f0f0f0;
-  padding-top: 0.1 * 100rpx;
-}
-.order-details .writeOff .rules .item {
-  margin-top: 0.15 * 100rpx;
-}
-.order-details .writeOff .rules .item .rulesTitle {
-  font-size: 0.28 * 100rpx;
-  color: #282828;
-}
-.order-details .writeOff .rules .item .rulesTitle .iconfont {
-  font-size: 0.3 * 100rpx;
-  color: #333;
-  margin-right: 0.08 * 100rpx;
-  margin-top: 0.05 * 100rpx;
-}
-.order-details .writeOff .rules .item .info {
-  font-size: 0.28 * 100rpx;
-  color: #999;
-  margin-top: 0.05 * 100rpx;
-}
-.order-details .writeOff .rules .item .info .time {
-  margin-left: 0.2 * 100rpx;
-}
-.order-details .map {
-  height: 0.86 * 100rpx;
-  font-size: 0.3 * 100rpx;
-  color: #282828;
-  line-height: 0.86 * 100rpx;
-  border-bottom: 0.01 * 100rpx solid #f0f0f0;
-  margin-top: 0.13 * 100rpx;
-  background-color: #fff;
-  padding: 0 0.3 * 100rpx;
-}
-.order-details .map .place {
-  font-size: 0.26 * 100rpx;
-  width: 1.76 * 100rpx;
-  height: 0.5 * 100rpx;
-  border-radius: 0.25 * 100rpx;
-  line-height: 0.5 * 100rpx;
-  text-align: center;
-}
-.order-details .map .place .iconfont {
-  font-size: 0.27 * 100rpx;
-  height: 0.27 * 100rpx;
-  line-height: 0.27 * 100rpx;
-  margin: 0.02 * 100rpx 0.03 * 100rpx 0 0;
-}
-.order-details .address .name .iconfont {
-  font-size: 0.34 * 100rpx;
-  margin-left: 0.1 * 100rpx;
-}
-</style>
+
 <script>
 import OrderGoods from "@/components/OrderGoods";
 import { orderDetail } from "@/api/order";
 import Payment from "@/components/Payment";
-import DataFormat from "@/components/DataFormat";
 import { isWeixin, copyClipboard } from "@/utils";
 import { mapGetters } from "vuex";
 import {
   cancelOrderHandle,
   takeOrderHandle,
   delOrderHandle,
-  payOrderHandle
+  payOrderHandle,
 } from "@/libs/order";
 // import { wechatEvevt } from "@/libs/wechat";
 
@@ -439,10 +314,8 @@ export default {
   components: {
     OrderGoods,
     Payment,
-    DataFormat
   },
-  props: {},
-  data: function() {
+  data: function () {
     return {
       offlinePayStatus: 2,
       orderTypeName: "普通订单",
@@ -450,7 +323,7 @@ export default {
       offlineStatus: true,
       id: "",
       orderInfo: {
-        _status: {}
+        _status: {},
       },
       status: {},
       pay: false,
@@ -458,21 +331,20 @@ export default {
       from: this.$deviceType,
       system_store: {},
       mapKay: "",
-      mapShow: false
+      mapShow: false,
     };
   },
   computed: {
     refundOrder() {
       return this.orderInfo.refund_status > 0;
     },
-    ...mapGetters(["userInfo"])
+    ...mapGetters(["userInfo"]),
   },
   onShow() {
     this.id = this.$yroute.query.id;
     this.getDetail();
   },
-  inject: ["app"],
-  mounted: function() {
+  mounted: function () {
     this.id = this.$yroute.query.id;
     // this.getDetail();
   },
@@ -482,23 +354,23 @@ export default {
       this.$yrouter.push({
         path: "/pages/order/GoodsReturn/index",
         query: {
-          id: orderInfo.orderId
-        }
+          id: orderInfo.orderId,
+        },
       });
     },
     goGroupRule(orderInfo) {
       this.$yrouter.push({
         path: "/pages/activity/GroupRule/index",
         query: {
-          id: orderInfo.pinkId
-        }
+          id: orderInfo.pinkId,
+        },
       });
     },
-    showChang: function(data) {
+    showChang: function (data) {
       // 这里判断是不是微信小程序
       this.$yrouter.push({
         path: "/pages/map/index",
-        query: data
+        query: data,
       });
       // if (isWeixin()) {
       //   let config = {
@@ -525,7 +397,7 @@ export default {
       } else {
         console.log(this);
         this.$yrouter.replace({
-          path: "/pages/order/MyOrder/index"
+          path: "/pages/order/MyOrder/index",
         });
         return;
       }
@@ -549,14 +421,14 @@ export default {
         setTimeout(() => this.goBack(), 300);
       });
     },
-    setOfflinePayStatus: function(status) {
+    setOfflinePayStatus: function (status) {
       var that = this;
       that.offlinePayStatus = status;
       if (status === 1 && that.orderTypeNameStatus === true) {
         that.payType.push("offline");
       }
     },
-    getOrderStatus: function() {
+    getOrderStatus: function () {
       let orderInfo = this.orderInfo || {},
         _status = orderInfo._status || { _type: 0 },
         status = {};
@@ -569,7 +441,7 @@ export default {
           : 0;
       status = {
         type: type,
-        class_status: 0
+        class_status: 0,
       };
       if (type == 1 && combination_id > 0) {
         status.type = 6;
@@ -598,12 +470,12 @@ export default {
         uni.showToast({
           title: "订单不存在",
           icon: "none",
-          duration: 2000
+          duration: 2000,
         });
         return;
       }
       orderDetail(id)
-        .then(res => {
+        .then((res) => {
           this.orderInfo = res.data;
           this.getOrderStatus();
           if (this.orderInfo.combinationId > 0) {
@@ -620,11 +492,11 @@ export default {
           this.mapKey = res.data.mapKay;
           this.setOfflinePayStatus(this.orderInfo.offlinePayStatus);
         })
-        .catch(err => {
+        .catch((err) => {
           uni.showToast({
             title: err.response.data.msg,
             icon: "none",
-            duration: 2000
+            duration: 2000,
           });
         });
     },
@@ -633,7 +505,123 @@ export default {
       console.log(type, "支付方式");
       await payOrderHandle(this.orderInfo.orderId, type, that.from);
       that.getDetail();
-    }
-  }
+    },
+  },
 };
 </script>
+
+<style scoped lang="less">
+.geoPage {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  z-index: 10000;
+}
+.order-details .writeOff {
+  background-color: #fff;
+  margin-top: 0.13 * 100rpx;
+  padding-bottom: 0.3 * 100rpx;
+}
+.order-details .writeOff .title {
+  font-size: 0.3 * 100rpx;
+  color: #282828;
+  height: 0.87 * 100rpx;
+  border-bottom: 1px solid #f0f0f0;
+  padding: 0 0.3 * 100rpx;
+  line-height: 0.87 * 100rpx;
+}
+.order-details .writeOff .grayBg {
+  background-color: #f2f5f7;
+  width: 5.9 * 100rpx;
+  height: 3.84 * 100rpx;
+  border-radius: 0.2 * 100rpx 0.2 * 100rpx 0 0;
+  margin: 0.5 * 100rpx auto 0 auto;
+  padding-top: 0.55 * 100rpx;
+}
+.order-details .writeOff .grayBg .pictrue {
+  width: 2.9 * 100rpx;
+  height: 2.9 * 100rpx;
+  margin: 0 auto;
+}
+.order-details .writeOff .grayBg .pictrue img {
+  width: 100%;
+  height: 100%;
+  display: block;
+}
+.order-details .writeOff .gear {
+  width: 5.9 * 100rpx;
+  height: 0.3 * 100rpx;
+  margin: 0 auto;
+}
+.order-details .writeOff .gear img {
+  width: 100%;
+  height: 100%;
+  display: block;
+}
+.order-details .writeOff .num {
+  background-color: #f0c34c;
+  width: 5.9 * 100rpx;
+  height: 0.84 * 100rpx;
+  color: #282828;
+  font-size: 0.48 * 100rpx;
+  margin: 0 auto;
+  border-radius: 0 0 0.2 * 100rpx 0.2 * 100rpx;
+  text-align: center;
+  padding-top: 0.04 * 100rpx;
+}
+.order-details .writeOff .rules {
+  margin: 0.46 * 100rpx 0.3 * 100rpx 0 0.3 * 100rpx;
+  border-top: 0.01 * 100rpx solid #f0f0f0;
+  padding-top: 0.1 * 100rpx;
+}
+.order-details .writeOff .rules .item {
+  margin-top: 0.15 * 100rpx;
+}
+.order-details .writeOff .rules .item .rulesTitle {
+  font-size: 0.28 * 100rpx;
+  color: #282828;
+}
+.order-details .writeOff .rules .item .rulesTitle .iconfont {
+  font-size: 0.3 * 100rpx;
+  color: #333;
+  margin-right: 0.08 * 100rpx;
+  margin-top: 0.05 * 100rpx;
+}
+.order-details .writeOff .rules .item .info {
+  font-size: 0.28 * 100rpx;
+  color: #999;
+  margin-top: 0.05 * 100rpx;
+}
+.order-details .writeOff .rules .item .info .time {
+  margin-left: 0.2 * 100rpx;
+}
+.order-details .map {
+  height: 0.86 * 100rpx;
+  font-size: 0.3 * 100rpx;
+  color: #282828;
+  line-height: 0.86 * 100rpx;
+  border-bottom: 0.01 * 100rpx solid #f0f0f0;
+  margin-top: 0.13 * 100rpx;
+  background-color: #fff;
+  padding: 0 0.3 * 100rpx;
+}
+.order-details .map .place {
+  font-size: 0.26 * 100rpx;
+  width: 1.76 * 100rpx;
+  height: 0.5 * 100rpx;
+  border-radius: 0.25 * 100rpx;
+  line-height: 0.5 * 100rpx;
+  text-align: center;
+}
+.order-details .map .place .iconfont {
+  font-size: 0.27 * 100rpx;
+  height: 0.27 * 100rpx;
+  line-height: 0.27 * 100rpx;
+  margin: 0.02 * 100rpx 0.03 * 100rpx 0 0;
+}
+.order-details .address .name .iconfont {
+  font-size: 0.34 * 100rpx;
+  margin-left: 0.1 * 100rpx;
+}
+</style>
diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue
index 9585dda..0c78d32 100644
--- a/pages/order/OrderSubmission/index.vue
+++ b/pages/order/OrderSubmission/index.vue
@@ -35,15 +35,24 @@
         </view>
         <view class="iconfont icon-jiantou"></view>
       </view>
-      <div class="address acea-row row-between-wrapper" v-else @click="showStoreList">
-        <div class="addressCon">
+      <div
+        class="address acea-row row-between-wrapper"
+        v-if="shipping_type === 1"
+        @click="showStoreList"
+      >
+        <div class="addressCon" v-if="storeItems">
+          <div class="name">
+            {{ storeItems.name }}
+            <span class="phone">{{storeItems.phone }}</span>
+          </div>
+          <div>{{ storeItems.address}}</div>
+        </div>
+        <div class="addressCon" v-else>
           <div class="name">
-            {{ storeItems.name || systemStore.name }}
-            <span
-              class="phone"
-            >{{storeItems.phone || systemStore.phone}}</span>
+            {{ systemStore.name }}
+            <span class="phone">{{systemStore.phone}}</span>
           </div>
-          <div>{{ storeItems.address || systemStore.address }}</div>
+          <div>{{ systemStore.address }}</div>
         </div>
         <div class="iconfont icon-jiantou"></div>
       </div>
@@ -92,7 +101,7 @@
           }}
         </view>
       </view>
-      <view v-else>
+      <view v-if="shipping_type === 1">
         <view class="item acea-row row-between-wrapper">
           <view>联系人</view>
           <view class="discount">
@@ -311,10 +320,10 @@ export default {
   components: {
     OrderGoods,
     CouponListWindow,
-    AddressWindow
+    AddressWindow,
   },
   props: {},
-  data: function() {
+  data: function () {
     return {
       offlinePayStatus: 2,
       from: this.$deviceType,
@@ -329,13 +338,13 @@ export default {
       addressInfo: {},
       couponId: 0,
       orderGroupInfo: {
-        priceGroup: {}
+        priceGroup: {},
       },
       usableCoupon: {},
       addressLoaded: false,
       useIntegral: false,
       orderPrice: {
-        payPrice: "计算中"
+        payPrice: "计算中",
       },
       mark: "",
       systemStore: {},
@@ -343,7 +352,7 @@ export default {
       contacts: "",
       contactsTel: "",
       storeSelfMention: 0,
-      cartid: ""
+      cartid: "",
     };
   },
   computed: mapGetters(["userInfo", "storeItems"]),
@@ -356,9 +365,9 @@ export default {
     },
     shipping_type() {
       this.computedPrice();
-    }
+    },
   },
-  mounted: function() {
+  mounted: function () {
     let that = this;
     this.$store.dispatch("getUser", true);
     that.getCartInfo();
@@ -368,28 +377,29 @@ export default {
     }
     if (that.$yroute.query.id !== undefined) {
       that.cartid = that.$yroute.query.id;
-      console.log(that.cartid)
+      console.log(that.cartid);
     }
   },
   methods: {
     showStoreList() {
       this.$store.commit("get_to", "orders");
       this.$yrouter.push({
-        path: "/pages/shop/StoreList/index"
+        path: "/pages/shop/StoreList/index",
       });
     },
-    addressType: function(index) {
+    addressType: function (index) {
       if (index && !this.systemStore.id) {
         uni.showToast({
           title: "暂无门店信息，您无法选择到店自提！",
           icon: "none",
-          duration: 2000
+          duration: 2000,
         });
         return;
       }
+      console.log(this);
       this.shipping_type = index;
     },
-    changeUseIntegral: function(e) {
+    changeUseIntegral: function (e) {
       // this.computedPrice();
       this.useIntegral = e.mp.detail.value[0];
     },
@@ -399,15 +409,15 @@ export default {
         addressId: this.addressInfo.id,
         useIntegral: this.useIntegral ? 1 : 0,
         couponId: this.usableCoupon.id || 0,
-        shipping_type: parseInt(shipping_type) + 1
-      }).then(res => {
+        shipping_type: parseInt(shipping_type) + 1,
+      }).then((res) => {
         const data = res.data;
         if (data.status === "EXTEND_ORDER") {
           this.$yrouter.replace({
             path: "/pages/order/OrderDetails/index",
             query: {
-              id: data.result.orderId
-            }
+              id: data.result.orderId,
+            },
           });
         } else {
           this.orderPrice = data.result;
@@ -420,17 +430,20 @@ export default {
         uni.showToast({
           title: "参数有误",
           icon: "none",
-          duration: 2000
+          duration: 2000,
         });
         return this.$yrouter.back();
       }
       postOrderConfirm(cartIds)
-        .then(res => {
+        .then((res) => {
+          console.log(res, 999999);
+          console.log(res.data.systemStore || {}, 999999);
           this.offlinePayStatus = res.data.offline_pay_status;
           this.orderGroupInfo = res.data;
           this.deduction = res.data.deduction;
           this.usableCoupon = res.data.usableCoupon || {};
           this.addressInfo = res.data.addressInfo || {};
+          // 用来显示到店自提的店铺地址
           this.systemStore = res.data.systemStore || {};
           this.storeSelfMention = res.data.storeSelfMention;
           this.computedPrice();
@@ -439,11 +452,11 @@ export default {
           uni.showToast({
             title: "加载订单数据失败",
             icon: "none",
-            duration: 2000
+            duration: 2000,
           });
         });
     },
-    addressTap: function() {
+    addressTap: function () {
       this.showAddress = true;
       if (!this.addressLoaded) {
         this.addressLoaded = true;
@@ -454,21 +467,21 @@ export default {
       this.addressLoaded = false;
       this.showAddress = false;
     },
-    couponTap: function() {
+    couponTap: function () {
       this.showCoupon = true;
     },
-    changeCoupon: function(coupon) {
+    changeCoupon: function (coupon) {
       if (!coupon) {
         this.usableCoupon = {
           couponTitle: "不使用优惠券",
-          id: 0
+          id: 0,
         };
       } else {
         this.usableCoupon = coupon;
       }
       this.computedPrice();
     },
-    payItem: function(index) {
+    payItem: function (index) {
       this.active = index;
     },
     changeAddress(addressInfo) {
@@ -480,7 +493,7 @@ export default {
         uni.showToast({
           title: "请选择支付方式",
           icon: "none",
-          duration: 2000
+          duration: 2000,
         });
         return;
       }
@@ -488,7 +501,7 @@ export default {
         uni.showToast({
           title: "请选择收货地址",
           icon: "none",
-          duration: 2000
+          duration: 2000,
         });
         return;
       }
@@ -501,7 +514,7 @@ export default {
           uni.showToast({
             title: "请填写联系人或联系人电话",
             icon: "none",
-            duration: 2000
+            duration: 2000,
           });
           return;
         }
@@ -510,7 +523,7 @@ export default {
           uni.showToast({
             title: "请填写正确的手机号",
             icon: "none",
-            duration: 2000
+            duration: 2000,
           });
           return;
         }
@@ -518,14 +531,14 @@ export default {
           uni.showToast({
             title: "请填写您的真实姓名",
             icon: "none",
-            duration: 2000
+            duration: 2000,
           });
           return;
         }
       }
 
       uni.showLoading({
-        title: "生成订单中"
+        title: "生成订单中",
       });
       let from = {};
       if (this.$deviceType == "app") {
@@ -547,9 +560,9 @@ export default {
         mark: this.mark || "",
         shippingType: parseInt(shipping_type) + 1,
         storeId: this.storeItems ? this.storeItems.id : this.systemStore.id,
-        ...from
+        ...from,
       })
-        .then(res => {
+        .then((res) => {
           uni.hideLoading();
           const data = res.data;
           switch (data.status) {
@@ -558,13 +571,13 @@ export default {
               uni.showToast({
                 title: res.msg,
                 icon: "none",
-                duration: 2000
+                duration: 2000,
               });
               this.$yrouter.replace({
                 path: "/pages/order/OrderDetails/index",
                 query: {
-                  id: data.result.orderId
-                }
+                  id: data.result.orderId,
+                },
               });
               break;
             case "PAY_DEFICIENCY":
@@ -574,26 +587,26 @@ export default {
               uni.showToast({
                 title: res.msg,
                 icon: "none",
-                duration: 2000
+                duration: 2000,
               });
               this.$yrouter.replace({
                 path: "/pages/order/OrderDetails/index",
                 query: {
-                  id: data.result.orderId
-                }
+                  id: data.result.orderId,
+                },
               });
               break;
             case "SUCCESS":
               uni.showToast({
                 title: res.msg,
                 icon: "none",
-                duration: 2000
+                duration: 2000,
               });
               this.$yrouter.replace({
                 path: "/pages/order/OrderDetails/index",
                 query: {
-                  id: data.result.orderId
-                }
+                  id: data.result.orderId,
+                },
               });
               break;
             case "WECHAT_H5_PAY":
@@ -601,8 +614,8 @@ export default {
               this.$yrouter.replace({
                 path: "/pages/order/OrderDetails/index",
                 query: {
-                  id: data.result.orderId
-                }
+                  id: data.result.orderId,
+                },
               });
               setTimeout(() => {
                 // location.href = data.result.jsConfig.mweb_url;
@@ -614,8 +627,8 @@ export default {
                 this.$yrouter.replace({
                   path: "/pages/order/OrderDetails/index",
                   query: {
-                    id: data.result.orderId
-                  }
+                    id: data.result.orderId,
+                  },
                 });
               });
               break;
@@ -626,8 +639,8 @@ export default {
                 this.$yrouter.replace({
                   path: "/pages/order/OrderDetails/index",
                   query: {
-                    id: data.result.orderId
-                  }
+                    id: data.result.orderId,
+                  },
                 });
               });
               break;
@@ -639,7 +652,7 @@ export default {
             // });
           }
         })
-        .catch(err => {
+        .catch((err) => {
           uni.hideLoading();
           uni.showToast({
             title:
@@ -648,10 +661,10 @@ export default {
               err.response.data.message ||
               "创建订单失败",
             icon: "none",
-            duration: 2000
+            duration: 2000,
           });
         });
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/utils/request.js b/utils/request.js
index ad5ca05..1dd7d2c 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -61,6 +61,10 @@ function baseRequest(options) {
   return fly.request(url, params || data, {
     ...option
   }).then(res => {
+    console.log("——————————— "+url+" —————————————")
+    console.log(params || data)
+    console.log(res.data)
+    console.log("—————————————— end ——————————")
     const data = res.data || {};
     if (res.status !== 200) {
       return Promise.reject({ msg: "请求失败", res, data });