diff --git a/src/pages/confirmOrder/confirmOrder.vue b/src/pages/confirmOrder/confirmOrder.vue
index 10402b1..2ef17d4 100644
--- a/src/pages/confirmOrder/confirmOrder.vue
+++ b/src/pages/confirmOrder/confirmOrder.vue
@@ -23,25 +23,34 @@
       @tap="toaddAddress"
       class="list order-user"
     >
-      <view class="order-user-head"  v-if="addressInfo != false">
+      <view
+        class="order-user-head"
+        v-if="addressInfo != false"
+      >
         <view class="name">
           <view
             v-if="addressInfo.default === '1'"
             class="default"
-          >
-		  <text>默认</text>
-		  </view>
-		  {{addressInfo.name}}
+          >
+            <text>默认</text>
+          </view>
+          {{addressInfo.name}}
         </view>
         <text class="mobile">{{addressInfo.mobile}}</text>
       </view>
-      <view class="order-user-body"  v-if="addressInfo != false">
+      <view
+        class="order-user-body"
+        v-if="addressInfo != false"
+      >
         <image src="../../static/myorder-paying-location.png"></image>
         <text class="address">{{addressInfo.address}}\n{{addressInfo.add_detail}}</text>
-      </view>
-	  <view class="order-user-body" v-if="addressInfo == false">
-		 <text class="address">点击添加地址</text>
-	  </view>
+      </view>
+      <view
+        class="order-user-body"
+        v-if="addressInfo == false"
+      >
+        <text class="address">点击添加地址</text>
+      </view>
       <image
         class="arrow"
         src="../../static/right.png"
@@ -262,34 +271,34 @@ export default {
       addressInfo: {
         address: '',
       },
-	  isCart: Boolean,
+      isCart: Boolean,
       // isAnonymous:
-	  checkedCartLst: [],
+      checkedCartLst: [],
     }
   },
   onShow(addressId) {
-  	// console.log('+-+-*-*-+-+',addressId)
+    // console.log('+-+-*-*-+-+',addressId)
     if (addressId) {
-	  store
-	    .dispatch('address/details', {
-	      add_id: addressId,
-	    })
-	    .then(({ code, data }) => {
-	      if (code === 1) {
-	        // console.log('code', code, data)
-	        this.showAddress = true
-	        this.addressInfo = data
-	      }
-	    })
+      store
+        .dispatch('address/details', {
+          add_id: addressId,
+        })
+        .then(({ code, data }) => {
+          if (code === 1) {
+          // console.log('code', code, data)
+            this.showAddress = true
+            this.addressInfo = data
+          }
+        })
     }
   },
   onLoad({ pid, addressId, isCart, count, name }) {
-	  if (isCart == 'false') {
+    if (isCart == 'false') {
       this.pid = pid
     //   store.dispatch('read/fetch', {
-		  // pid,
+      // pid,
     //   })
-	  }
+    }
     this.count = count
     this.name = name
     this.isCart = isCart
@@ -307,36 +316,36 @@ export default {
           if (code === 1) {
             // console.log('code', code, data)
             this.showAddress = true
-            this.addressInfo = data
+            this.addressInfo = data
           }
         })
     } else {
       store.dispatch('address/default').then(({ code, data }) => {
-          this.showAddress = true
-          this.addressInfo = data
-		  console.log("this.addressInfo", this.addressInfo)
+        this.showAddress = true
+        this.addressInfo = data
+        console.log('this.addressInfo', this.addressInfo)
       })
     }
   },
   computed: {
-	  totalPrice() {
-		  if (this.isCart == 'true') {
-			  let total = 0
-			  this.$store.state.cart.checkedCartLst.map(item => {
-			  	total += item.nowPrice * item.num
-			  })
-			return total
-		  } else {
-			  return this.buyItem.real_price * this.count
-		  }
-	  },
-	  buyItem() {
-		  return this.$store.state.cart.buyItem
-	  },
-	  // checkedCartLst(){
-		 //  console.log('checkedCartLst',this.$store.state.cart.checkedCartLst)
-		 //  return this.$store.state.cart.checkedCartLst
-	  // },
+    totalPrice() {
+      if (this.isCart == 'true') {
+        let total = 0
+        this.$store.state.cart.checkedCartLst.map(item => {
+          total += item.nowPrice * item.num
+        })
+        return total
+      } else {
+        return this.buyItem.real_price * this.count
+      }
+    },
+    buyItem() {
+      return this.$store.state.cart.buyItem
+    },
+    // checkedCartLst(){
+    //  console.log('checkedCartLst',this.$store.state.cart.checkedCartLst)
+    //  return this.$store.state.cart.checkedCartLst
+    // },
     goodInfo() {
       // console.log('state', this.$store.state.read.goodInfo)
       return this.$store.state.read.goodInfo
@@ -354,17 +363,17 @@ export default {
   methods: {
     counter(isadd, index) {
       if (isadd) {
-		  if (this.isCart == 'true') {
-			  this.checkedCartLst[index].num++
-		  } else {
+        if (this.isCart == 'true') {
+          this.checkedCartLst[index].num++
+        } else {
           this.count++
-		  }
+        }
       } else {
-		  if (this.isCart == 'true') {
-		   this.checkedCartLst[index].num <= 1 ? (this.disabled = true) : this.checkedCartLst[index].num--
-		  } else {
-		  	this.count <= 1 ? (this.disabled = true) : this.count--
-		  }
+        if (this.isCart == 'true') {
+          this.checkedCartLst[index].num <= 1 ? (this.disabled = true) : this.checkedCartLst[index].num--
+        } else {
+          this.count <= 1 ? (this.disabled = true) : this.count--
+        }
       }
     },
     // 跳转添加地址页面
@@ -379,63 +388,63 @@ export default {
       })
     },
     // 下单
-    orderBuild() {
-	  if(!this.addressInfo){
-		  uni.showLoading({
-		    title: '请先添加地址',
-		  })
-		  return
-	  }
+    orderBuild() {
+      if (!this.addressInfo) {
+        uni.showLoading({
+          title: '请先添加地址',
+        })
+        return
+      }
       uni.showLoading({
         title: '支付中',
-      })
-	  if (this.isCart === 'true') {
-		  const checkedGoods = []
-		  const sk_id_arr = []
-		  this.checkedCartLst.map(item => {
-			  checkedGoods.push(item.cart_id)
-			  sk_id_arr.push(item.sk_id)
-		  })
-		  store.dispatch('order/build', {
+      })
+      if (this.isCart === 'true') {
+        const checkedGoods = []
+        const sk_id_arr = []
+        this.checkedCartLst.map(item => {
+          checkedGoods.push(item.cart_id)
+          sk_id_arr.push(item.sk_id)
+        })
+        store.dispatch('order/build', {
           uid: this.$store.state.user.userInfo.uid,
-		    address: JSON.stringify(this.addressInfo),
+          address: JSON.stringify(this.addressInfo),
           checkedGoods: checkedGoods,
-		    sk_id_arr: sk_id_arr,
-		    totalPrice: this.totalPrice,
-		  }).then((res) => {
-		    this.pay(res)
-		  })
-	  }
-	  if (this.isCart === 'false') {
-		  const { sk_id_arr: skId, mp_id: mpId } = this.$store.state.order.param
-		  store.dispatch('order/buyNow', {
-		    pid: skId.pid,
-		    sk_id: skId.sk_id,
-		    number: this.count,
-		    mp_id: mpId,
-		    address: JSON.stringify(this.addressInfo),
-		    totalPrice: this.totalPrice,
-		    liuyan: this.note,
-		    dir: 1,
-		  }).then((res) => {
-		    this.pay(res)
-		  })
-	  }
+          sk_id_arr: sk_id_arr,
+          totalPrice: this.totalPrice * 100,
+        }).then((res) => {
+          this.pay(res)
+        })
+      }
+      if (this.isCart === 'false') {
+        const { sk_id_arr: skId, mp_id: mpId } = this.$store.state.order.param
+        store.dispatch('order/buyNow', {
+          pid: skId.pid,
+          sk_id: skId.sk_id,
+          number: this.count,
+          mp_id: mpId,
+          address: JSON.stringify(this.addressInfo),
+          totalPrice: this.totalPrice * 100,
+          liuyan: this.note,
+          dir: 1,
+        }).then((res) => {
+          this.pay(res)
+        })
+      }
     },
     // 支付
     pay(res) {
       console.log('pay', res)
-      const { data, exKeyName: keyName } = res
+      const { data, exKeyName: keyName } = res
       const uid = uni.getStorageSync('uid')
       const timeStamp = new Date().getTime().toString()
-      const nonceStr = 'asfafasfasfasfasf'
+      const nonceStr = 'asfafasfasfasfasf'
       // 支付参数
       const fieldSet = {
         openid: this.$store.state.user.userInfo.openid,
         uid: this.$store.state.user.userInfo.uid,
         shopid: 0,
         payCate: 2020,
-        payMoney: this.totalPrice,
+        payMoney: this.totalPrice * 100,
         payWoodId: `fcdj-${uid}-${keyName}`,
         payWoodDesc: '在【非常戴镜】的微信付款凭证',
         nonceStr,
@@ -443,13 +452,13 @@ export default {
         app_uid: 2020,
         timeStamp,
         keyname: keyName,
-        billInfo: JSON.stringify({
-		  address:this.addressInfo,
-		  list:data,
-		  keyname: keyName
-		}),
-      }
-	  console.log("fieldSet", fieldSet)
+        billInfo: JSON.stringify({
+          address: this.addressInfo,
+          list: data,
+          keyname: keyName,
+        }),
+      }
+      console.log('fieldSet', fieldSet)
       // 请求后台支付接口
       store.dispatch('order/pay', fieldSet).then(({ data, data2, pay_id: payId }) => {
         if (data.return_code === 'SUCCESS' && data.result_code === 'SUCCESS') {
@@ -601,9 +610,9 @@ export default {
             .price {
               color: #ff6b4a;
               font-size: 28rpx;
-			  text{
-				  margin-left: 10rpx;
-			  }
+              text {
+                margin-left: 10rpx;
+              }
             }
             .originCost {
               text-decoration: line-through;
diff --git a/src/pages/myOrder/components/OrderCard.vue b/src/pages/myOrder/components/OrderCard.vue
index 85684eb..b3de3c3 100644
--- a/src/pages/myOrder/components/OrderCard.vue
+++ b/src/pages/myOrder/components/OrderCard.vue
@@ -41,12 +41,12 @@
           <view class="orderName">{{orderInfo.p_name}}</view>
           <view class="orderDescrib">{{orderInfo.p_name}}</view>
           <view class="infoText-bottom">
-            <view class="markPrice">{{orderInfo.nowPrice}}</view>
+            <view class="markPrice">¥{{orderInfo.nowPrice}}</view>
             <view class="buy-num">X {{orderInfo.num}}</view>
           </view>
         </view>
       </view>
-      <view class="payPrice">实付：<text class="priceNum">{{order.total_fee}}</text> </view>
+      <view class="payPrice">实付：<text class="priceNum">¥{{order.total_fee}}</text> </view>
       <!-- 0待付款 1 已付款 待收货 2 已收货待评价 3 已评价 -->
       <view
         class="btns"
@@ -110,8 +110,8 @@
       <view
         class="orderCardInfo"
         @click="toOrderInfo(status,order.pay_id)"
-        v-for="(orderInfo) in orderInfoList"
-        :key="orderInfo"
+        v-for="(orderInfo, index) in orderInfoList"
+        :key="index"
       >
         <image
           :src="orderInfo.imgUrl"
@@ -121,12 +121,12 @@
           <view class="orderName">{{orderInfo.p_name}}</view>
           <view class="orderDescrib">{{orderInfo.p_name}}</view>
           <view class="infoText-bottom">
-            <view class="markPrice">{{orderInfo.nowPrice}}</view>
+            <view class="markPrice">¥{{orderInfo.nowPrice}}</view>
             <view class="buy-num">X {{orderInfo.num}}</view>
           </view>
         </view>
       </view>
-      <view class="payPrice">实付：<text class="priceNum">{{order.total_fee}}</text> </view>
+      <view class="payPrice">实付：<text class="priceNum">¥{{order.total_fee}}</text> </view>
       <view
         class="btns"
         v-if="status == '0'"
@@ -189,8 +189,7 @@ export default {
       return this.order.status
     },
     orderInfoList() {
-      const orderInfoList = this.order.order_info
-      return Array.isArray(orderInfoList) ? orderInfoList : orderInfoList.data
+      return this.order.order_info.list
     },
   },
   methods: {
@@ -291,42 +290,33 @@ export default {
     },
 
     async cancleOrder(e) {
-      const openid = uni.getStorageSync('openid')
-      const uid = this.order.uid
-      // 先从订单详情中拿到keyname
-      await store.dispatch('orderRead/getOrderInfo', {
-        pay_id: this.order.pay_id,
-        uid: uid,
-        openid: openid,
-      }).then((res) => {
-        const keyname = res.order_info.keyname
-        uni.showModal({
-          title: '提示',
-          content: '现在取消，订单不可恢复哦，确认取消吗？',
-          success: function(res) {
-            if (res.confirm) {
-              store.dispatch('cancelOrder/cancel', {
-                keyname: keyname,
-                uid: uid,
-                openid: openid,
-              }).then((res) => {
-                console.log(res)
-                if (res.code == 1) {
-                  store.dispatch('myOrder/getList', {
-                    way: '',
-                  })
-                } else {
-                  uni.showToast({
-                    title: '取消失败，服务器错误!',
-                    icon: 'none',
-                  })
-                }
-              })
-            } else if (res.cancel) {
-              console.log('用户点击取消')
-            }
-          },
-        })
+      const { keyname } = this.order.order_info
+      console.log('keyname', keyname)
+
+      uni.showModal({
+        title: '提示',
+        content: '现在取消，订单不可恢复哦，确认取消吗？',
+        success: function(res) {
+          if (res.confirm) {
+            store.dispatch('cancelOrder/cancel', {
+              keyname: keyname,
+            }).then((res) => {
+              console.log(res)
+              if (res.code === 1) {
+                store.dispatch('myOrder/getList', {
+                  way: '',
+                })
+              } else {
+                uni.showToast({
+                  title: '取消失败，服务器错误!',
+                  icon: 'none',
+                })
+              }
+            })
+          } else if (res.cancel) {
+            console.log('用户点击取消')
+          }
+        },
       })
     },
     toDetail(pid) {
diff --git a/src/pages/myOrder/myOrder.vue b/src/pages/myOrder/myOrder.vue
index 248eed4..cd08275 100644
--- a/src/pages/myOrder/myOrder.vue
+++ b/src/pages/myOrder/myOrder.vue
@@ -27,7 +27,7 @@
         <OrderCard
           :order="order"
           :current="current"
-		  v-if="order.order_info !== null"
+          v-if="order.order_info !== null"
         ></OrderCard>
       </view>
     </view>
@@ -35,57 +35,57 @@
   </view>
 </template>
 <script>
-import OrderCard from "./components/OrderCard.vue";
-import store from "@/store";
+import OrderCard from './components/OrderCard.vue'
+import store from '@/store'
 
 export default {
   components: {
-    OrderCard: OrderCard
+    OrderCard: OrderCard,
   },
   data() {
     return {
       // 顶部筛选项
       screenItems: [
-        { current: "10", text: "全部" },
-        { current: "0", text: "待付款" },
-        { current: "1", text: "待收货" },
-        { current: "2", text: "已完成" }
+        { current: '10', text: '全部' },
+        { current: '0', text: '待付款' },
+        { current: '1', text: '待收货' },
+        { current: '2', text: '已完成' },
         // {current:"3",text:'已评价'},
         // {current:"4",text:'退款'},
       ],
       // 当前所在item 默认10-->全部
-      current: "10"
-    };
+      current: '10',
+    }
   },
 
-onShow() {
-	store.dispatch("myOrder/getList", {
-	  way: ""
-	});
-},
+  onShow() {
+    store.dispatch('myOrder/getList', {
+	  way: '',
+    })
+  },
   onLoad: function(option) {
     // 获取订单列表
     // store.dispatch("myOrder/getList", {
     //   way: ""
     // });
     // 从user过来传的status，给current，以显示对应item
-    this.current = option.status;
+    this.current = option.status
   },
   computed: {
     orderList() {
-      console.log('orderList', this.$store.state.myOrder.orderList);
-      return this.$store.state.myOrder.orderList;
-    }
+      console.log('orderList', this.$store.state.myOrder.orderList)
+      return this.$store.state.myOrder.orderList
+    },
   },
   methods: {
     // tab点击事件
     onClickItem(e) {
       if (this.current !== e) {
-        this.current = e;
+        this.current = e
       }
-    }
-  }
-};
+    },
+  },
+}
 </script>
 
 <style lang="scss">
diff --git a/src/pages/myOrderPaying/myOrderPaying.vue b/src/pages/myOrderPaying/myOrderPaying.vue
index 60a55c0..244ffc8 100644
--- a/src/pages/myOrderPaying/myOrderPaying.vue
+++ b/src/pages/myOrderPaying/myOrderPaying.vue
@@ -1,34 +1,41 @@
 <!-- 订单待付款  待收货 -->
 <template>
-  <view class="content">
-	  <view
-	    class="headerBanner"
-	    v-if="status == '2'||'3'"
-	  >
-	    <view class="bannerLeft">
-	      <view class="T1">订单已完成</view>
-	    </view>
-	    <image
-	      src="../../static/car.png"
-	      mode="aspectFill"
-	    ></image>
-	  </view>
-		  <!-- 待付款 -->
-		  <view class="order-time" v-if="status == '0'" >
-		    <text>请在</text>
-		    <uni-countdown
-		      color="#EC5D3B"
-		      splitor-color="#EC5D3B"
-		      :show-day="false"
-		      :hour="0"
-		      :second="getLeftTime"
-		      @timeup="timeup" >
-		  	</uni-countdown>
-		  	
-		    <text>内完成付款</text>
-		  </view>
-		  
-    <view class="headerBanner" v-if="status == '1'">
+  <view class="content">
+    <view
+      class="headerBanner"
+      v-if="status == '2'||'3'"
+    >
+      <view class="bannerLeft">
+        <view class="T1">订单已完成</view>
+      </view>
+      <image
+        src="../../static/car.png"
+        mode="aspectFill"
+      ></image>
+    </view>
+    <!-- 待付款 -->
+    <view
+      class="order-time"
+      v-if="status == '0'"
+    >
+      <text>请在</text>
+      <uni-countdown
+        color="#EC5D3B"
+        splitor-color="#EC5D3B"
+        :show-day="false"
+        :hour="0"
+        :second="getLeftTime"
+        @timeup="timeup"
+      >
+      </uni-countdown>
+
+      <text>内完成付款</text>
+    </view>
+
+    <view
+      class="headerBanner"
+      v-if="status == '1'"
+    >
       <view class="bannerLeft">
         <view class="T1">卖家已发货</view>
         <!-- <view class="T2">还剩 确认收货</view> -->
@@ -37,9 +44,8 @@
         src="../../static/car.png"
         mode="aspectFill"
       ></image>
-    </view>
-	
-	
+    </view>
+
     <view class="order">
       <view class="order-user">
         <view class="order-user-head">
@@ -71,7 +77,7 @@
               <!-- <view class="arrow"></view> -->
             </view>
             <view class="infoText-bottom">
-              <view class="markPrice">{{orderInfoListItem.nowPrice}}</view>
+              <view class="markPrice">{{Number(orderInfoListItem.nowPrice)/100}}</view>
               <view class="buy-num">X {{orderInfoListItem.num}}</view>
             </view>
           </view>
@@ -89,14 +95,13 @@
         </text>
         <text class="order-info-price">
           <text class="p1">实付</text>
-          <text class="p2">￥{{orderInfo.order_info.total_fee}}</text>
-
+          <text class="p2">￥{{Number(totalPrice)/100}}</text>
         </text>
         <text class="order-info-num">
           <text>订单号：{{payId}}</text>
         </text>
         <text class="order-info-time">
-          <text>下单时间：{{orderInfo.order_info?orderInfo.order_info.pay_time:'' | timerChange}}</text>
+          <text>下单时间：{{orderInfo.pay_time}}</text>
         </text>
         <view class="order-info-hr"></view>
         <view class="order-info-contact">
@@ -128,42 +133,41 @@
         class="b2"
         @click="confirmOrder"
       >确认收货</button>
-    </view>
-	<view
-	  class="order-confim"
-	  v-if="status == '2'"
-	>
-	  <button
-	    class="b2"
-	    @click="toDetail"
-	  >再次购买</button>
-	</view>
-	
+    </view>
+    <view
+      class="order-confim"
+      v-if="status == '2'"
+    >
+      <button
+        class="b2"
+        @click="toDetail"
+      >再次购买</button>
+    </view>
+
   </view>
 </template>
 
 <script>
-import store from "@/store";
+import store from '@/store'
 import MD5Util from '../../utils/md5'
-import UniCountdown from "../../components/UniCountdown/UniCountdown.vue";
+import UniCountdown from '../../components/UniCountdown/UniCountdown.vue'
 export default {
   components: {
-    UniCountdown
-  },
+    UniCountdown,
+  },
   data() {
     return {
-      payId: "",
-      payTime: "",
-      status: "", // status 0 待付款 1 已发货
-      uid: "",
-      openid: "",
+      payId: '',
+      payTime: '',
+      status: '', // status 0 待付款 1 已发货
+      uid: '',
+      openid: '',
       lefttime: 0,
-      isPay: 0,
-	  orderInfo:{},
-	  totalPrice:0,
-    };
+      isPay: 0,
+      totalPrice: 0,
+    }
   },
-  onLoad:async function ({payId,status,isPay}) {
+  async onLoad ({ payId, status, isPay }) {
     this.payId = payId
     this.status = status
     this.isPay = isPay
@@ -175,216 +179,217 @@ export default {
     await store.dispatch('orderRead/getOrderInfo', {
       pay_id: this.payId,
       uid: uid,
-      openid: openid
-    });
-	// console.log(this.$store.state.orderRead.orderInfo)
-    this.orderInfo = this.$store.state.orderRead.orderInfo
-	this.totalPrice = this.orderInfo.total_fee
+      openid: openid,
+    })
+    this.totalPrice = this.orderInfo.total_fee
   },
   // 若从支付页面跳转过来，返回直接返回到首页
   onBackPress(option) {
-    if (option.from === "backbutton" && this.isPay) {
+    if (option.from === 'backbutton' && this.isPay) {
       uni.switchTab({
-        url: "/pages/index/index"
-      });
-      return true; // 阻止默认返回行为
+        url: '/pages/index/index',
+      })
+      return true // 阻止默认返回行为
     }
   },
   computed: {
-    orderInfoList () {
-		return this.orderInfo.order_info?this.orderInfo.order_info.list:null
+    orderInfo() {
+      return this.$store.state.orderRead.orderInfo
+    },
+    orderInfoList () {
+      return this.orderInfo.order_info ? this.orderInfo.order_info.list : null
     },
     // 获取订单地址信息
-    orderAddressInfo () {
-		return this.orderInfo.order_info?this.orderInfo.order_info.address:null
+    orderAddressInfo () {
+      return this.orderInfo.order_info ? this.orderInfo.order_info.address : null
     },
     // 订单付款时间
-    getLeftTime () {
-		return this.orderInfo.order_info?this.orderInfo.order_info.lefttime:1800
+    getLeftTime () {
+      return this.orderInfo.order_info ? this.orderInfo.order_info.lefttime : 1800
     },
     // 计算总优惠额
     totalDiscount() {
-      const discountInfoList = this.orderInfo.discount_info;
-      let totalDiscount = 0;
+      const discountInfoList = this.orderInfo.discount_info
+      let totalDiscount = 0
       if (discountInfoList) {
         discountInfoList.map((discountItem, index) => {
-          totalDiscount += Number(discountItem.value);
-        });
+          totalDiscount += Number(discountItem.value)
+        })
       }
       // console.log(totalDiscount)
-      return totalDiscount;
-    }
-  },
-  
-  methods: {
-	  //再次购买  暂时只支持跳转第一个商品
-	  toDetail(){
-		  const pid = this.orderInfo.order_info.list[0].pid
-	  	uni.navigateTo({
-	  		url: '../details/details?pid='+pid,
-	  		fail: (res) => {console.log(res)},
-	  	});
-	  },
+      return totalDiscount
+    },
+  },
+
+  methods: {
+    // 再次购买  暂时只支持跳转第一个商品
+    toDetail() {
+      const pid = this.orderInfo.order_info.list[0].pid
+      uni.navigateTo({
+        url: '../details/details?pid=' + pid,
+        fail: (res) => { console.log(res) },
+      })
+    },
     // 取消订单
     timeup() {
-      this.cancleOrder();
+      this.cancleOrder()
     },
     cancleOrder() {
-      const uid = this.uid;
-      const openid = this.openid;
-	  const keyname = this.orderInfo.order_info.keyname
-	  // console.log('keyname',this.orderInfo.keyname)
+      const uid = this.uid
+      const openid = this.openid
+      const keyname = this.orderInfo.order_info.keyname
+      // console.log('keyname',this.orderInfo.keyname)
       uni.showModal({
-        title: "提示",
-        content: "现在取消，订单不可恢复哦，确认取消吗？",
+        title: '提示',
+        content: '现在取消，订单不可恢复哦，确认取消吗？',
         success: function(res) {
           if (res.confirm) {
-            store.dispatch("cancelOrder/cancel", {
+            store.dispatch('cancelOrder/cancel', {
               keyname: keyname,
               uid: uid,
-              openid: openid
-            });
-			uni.navigateBack({
-				delta:1
-			})
+              openid: openid,
+            })
+            uni.navigateBack({
+              delta: 1,
+            })
           } else if (res.cancel) {
-            console.log("用户点击取消");
+            console.log('用户点击取消')
           }
+        },
+      })
+    },
+    paylog() {
+      console.log('pay', this.orderInfo)
+      const { data, exKeyName: keyName } = this.orderInfo
+      const uid = uni.getStorageSync('uid')
+      const timeStamp = new Date().getTime().toString()
+      const nonceStr = 'asfafasfasfasfasf'
+      // 支付参数
+      const fieldSet = {
+        openid: this.$store.state.user.userInfo.openid,
+        uid: this.$store.state.user.userInfo.uid,
+        shopid: 0,
+        payCate: 2020,
+        payMoney: this.totalPrice,
+        payWoodId: `fcdj-${uid}-${keyName}`,
+        payWoodDesc: '在【非常戴镜】的微信付款凭证',
+        nonceStr,
+        signType: 'MD5',
+        app_uid: 2020,
+        timeStamp,
+        keyname: keyName,
+        billInfo: JSON.stringify(data),
+      }
+      // 请求后台支付接口
+      store.dispatch('order/pay', fieldSet).then(({ data, data2, pay_id: payId }) => {
+        if (data.return_code === 'SUCCESS' && data.result_code === 'SUCCESS') {
+          const stringA = `appId=wx115b25aa396d27ac&nonceStr=${nonceStr}&package=prepay_id=${data.prepay_id}&signType=MD5&timeStamp=${timeStamp}`
+          const stringSignTemp = stringA + '&key=NewMoney2017hatemydaddy123456789'
+
+          // 微信支付接口
+          uni.requestPayment({
+            appId: data.appid,
+            timeStamp,
+            nonceStr,
+            total_fee: this.totalPrice,
+            package: `prepay_id=${data.prepay_id}`,
+            signType: 'MD5',
+            paySign: MD5Util.MD5(stringSignTemp).toUpperCase(),
+            success: (res) => {
+              // 支付成功
+              uni.showModal({
+                content: '支付成功',
+                showCancel: false,
+              })
+              // 跳转订单详情页->状态 待收货
+              uni.reLaunch({
+                url: `../myOrderPaying/myOrderPaying?payId=${payId}&status=1&isPay=1`,
+              })
+            },
+            fail: (res) => {
+              // 支付失败
+              uni.showModal({
+                content: '支付失败',
+                showCancel: false,
+              })
+              // 跳转订单详情页->刷新本页面
+              // uni.redirectTo({
+              //   url: `../myOrderPaying/myOrderPaying?payId=${payId}&status=0&isPay=1`,
+              // })
+            },
+            complete: () => {
+              uni.hideLoading()
+            },
+          })
+        } else {
+          uni.showModal({
+            content: '支付失败',
+            showCancel: false,
+          })
+          console.log('支付失败')
+          uni.hideLoading()
+          //  uni.redirectTo({
+        // url: `../myOrderPaying/myOrderPaying?payId=${payId}&status=0&isPay=1`,
+          //  })
         }
-      });
+      })
+
+      // 修改订单状态 待付款==>待收货
+      store.dispatch('statusConfirm/confirm', {
+        uid: this.uid,
+        openid: this.openid,
+        oldway: '0',
+        way: '1',
+        pay_id: this.payId,
+        judgeContent: '',
+        orderInfo: this.orderInfo.order_info,
+      })
+        .then(
+        // setTimeout(() => {
+        //   uni.navigateBack();
+        // }, 1500)
+        )
     },
-    paylog() {
-		console.log('pay',this.orderInfo)
-		  const { data, exKeyName: keyName } = this.orderInfo
-		  const uid = uni.getStorageSync('uid')
-		  const timeStamp = new Date().getTime().toString()
-		  const nonceStr = 'asfafasfasfasfasf'
-		  // 支付参数
-		  const fieldSet = {
-		    openid: this.$store.state.user.userInfo.openid,
-		    uid: this.$store.state.user.userInfo.uid,
-		    shopid: 0,
-		    payCate: 2020,
-		    payMoney: this.totalPrice,
-		    payWoodId: `fcdj-${uid}-${keyName}`,
-		    payWoodDesc: '在【非常戴镜】的微信付款凭证',
-		    nonceStr,
-		    signType: 'MD5',
-		    app_uid: 2020,
-		    timeStamp,
-		    keyname: keyName,
-		    billInfo: JSON.stringify(data),
-		  }
-		  // 请求后台支付接口
-		  store.dispatch('order/pay', fieldSet).then(({ data, data2, pay_id: payId }) => {
-		    if (data.return_code === 'SUCCESS' && data.result_code === 'SUCCESS') {
-		      const stringA = `appId=wx115b25aa396d27ac&nonceStr=${nonceStr}&package=prepay_id=${data.prepay_id}&signType=MD5&timeStamp=${timeStamp}`
-		      const stringSignTemp = stringA + '&key=NewMoney2017hatemydaddy123456789'
-		
-		      // 微信支付接口
-		      uni.requestPayment({
-		        appId: data.appid,
-		        timeStamp,
-		        nonceStr,
-		        total_fee: this.totalPrice,
-		        package: `prepay_id=${data.prepay_id}`,
-		        signType: 'MD5',
-		        paySign: MD5Util.MD5(stringSignTemp).toUpperCase(),
-		        success: (res) => {
-		          // 支付成功
-		          uni.showModal({
-		            content: '支付成功',
-		            showCancel: false,
-		          })
-		          // 跳转订单详情页->状态 待收货
-		          uni.reLaunch({
-		            url: `../myOrderPaying/myOrderPaying?payId=${payId}&status=1&isPay=1`,
-		          })
-		        },
-		        fail: (res) => {
-		          // 支付失败
-		          uni.showModal({
-		            content: '支付失败',
-		            showCancel: false,
-		          })
-		          // 跳转订单详情页->刷新本页面
-				  // uni.redirectTo({
-				  // 	url: `../myOrderPaying/myOrderPaying?payId=${payId}&status=0&isPay=1`,
-				  // })
-		        },
-		        complete: () => {
-		          uni.hideLoading()
-		        },
-		      })
-		    } else {
-		      uni.showModal({
-		        content: '支付失败',
-		        showCancel: false,
-		      })
-		      console.log('支付失败')
-		      uni.hideLoading()
-			 //  uni.redirectTo({
-				// url: `../myOrderPaying/myOrderPaying?payId=${payId}&status=0&isPay=1`,
-			 //  })
-		    }
-		  })
-		
-		//修改订单状态 待付款==>待收货
-		store.dispatch("statusConfirm/confirm", {
-		    uid: this.uid,
-		    openid: this.openid,
-		    oldway: "0",
-		    way: "1",
-		    pay_id: this.payId,
-		    judgeContent: "",
-		    orderInfo: this.orderInfo.order_info
-		  })
-		  .then(
-		    // setTimeout(() => {
-		    //   uni.navigateBack();
-		    // }, 1500)
-		  );
-	},
-    confirmOrder() {
-		//确认收货 way1 ==>way2 
+    confirmOrder() {
+    // 确认收货 way1 ==>way2
       store
-        .dispatch("statusConfirm/confirm", {
+        .dispatch('statusConfirm/confirm', {
           uid: this.uid,
           openid: this.openid,
-          oldway: "1",
-          way: "2",
+          oldway: '1',
+          way: '2',
           pay_id: this.payId,
-          judgeContent: "",
-          orderInfo: this.orderInfo.order_info
+          judgeContent: '',
+          orderInfo: this.orderInfo.order_info,
         })
-        .then((res)=>{
-			if(res.data.code === 1){
-				uni.showToast({
-					title:'已确认',
-					mask:true,
-					duration:1500,
-					icon:'success'
-				})
-			}else{
-				uni-uni.showToast({
-					title: '服务器错误，确认失败!',
-					mask:true
-				});
-			}
-			setTimeout(() => {
-			  uni.navigateBack();
-			}, 1500)
-		});
-    }
+        .then((res) => {
+          if (res.data.code === 1) {
+            uni.showToast({
+              title: '已确认',
+              mask: true,
+              duration: 1500,
+              icon: 'success',
+            })
+          } else {
+            uni.showToast({
+              title: '服务器错误，确认失败!',
+              mask: true,
+            })
+          }
+          setTimeout(() => {
+            uni.navigateBack()
+          }, 1500)
+        })
+    },
   },
-  filters: {
-    timerChange: function(value) {
-      var newDate = new Date();
-      newDate.setTime(value * 1000);
-      return newDate.toLocaleString();
-    }
-  }
-};
+  // filters: {
+  //   timerChange: function(value) {
+  //     var newDate = new Date()
+  //     newDate.setTime(value * 1000)
+  //     return newDate.toLocaleString()
+  //   },
+  // },
+}
 </script>
 
 <style lang="scss" scoped>
@@ -497,6 +502,7 @@ export default {
       font-size: 14px;
       color: #333333;
       letter-spacing: -0.26px;
+      line-height: 70rpx;
     }
   }
 }