From 92d01cfd5cc56f37382103e58522a8f81fb28c8a Mon Sep 17 00:00:00 2001
From: "Adam.Gong" <admin@xiuyetang.com>
Date: Sat, 30 May 2020 14:39:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=AE=A2=E5=8D=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index/index.vue                  | 142 +++---
 src/pages/myOrder/components/OrderCard.vue | 744 ++++++++++++++++-------------
 src/pages/myOrder/myOrder.vue              |  42 +-
 src/pages/myOrderPaying/myOrderPaying.vue  | 172 +++----
 src/store/modules/myOrder.js               |  18 +-
 5 files changed, 606 insertions(+), 512 deletions(-)

diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 41f9064..6a7e827 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -84,7 +84,7 @@
           data-format="Object"
         ></HMfilterDropdown>
         <!-- 商品列表 -->
-<!-- 		<scroll-view
+        <!-- 		<scroll-view
 		  enable-flex
 		  @scrolltolower="handleScrolltolower"
 		  scroll-y
@@ -97,135 +97,141 @@
               v-for="(goods) in goodsList"
               :key="goods.id"
             >
-              <Card :goods="goods" :scrollTop="scrollTop" :viewHeight="viewHeight"></Card>
+              <Card
+                :goods="goods"
+                :scrollTop="scrollTop"
+                :viewHeight="viewHeight"
+              ></Card>
             </view>
           </view>
           <view class="loading-text">{{loadingText}}</view>
         </view>
-		<!-- </scroll-view> -->
+        <!-- </scroll-view> -->
       </view>
     </view>
   </view>
 </template>
 
 <script>
-import UniDrawer from '@/components/UniDrawer/UniDrawer.vue'
-import Card from '@/components/CommodityCard/CommodityCard.vue'
-import HMfilterDropdown from '@/components/HMFilterDropdown/HMFilterDropdown.vue'
-import store from '@/store'
+import UniDrawer from "@/components/UniDrawer/UniDrawer.vue";
+import Card from "@/components/CommodityCard/CommodityCard.vue";
+import HMfilterDropdown from "@/components/HMFilterDropdown/HMFilterDropdown.vue";
+import store from "@/store";
 
 export default {
   components: {
     UniDrawer: UniDrawer,
     HMfilterDropdown: HMfilterDropdown,
-    Card: Card,
+    Card: Card
   },
-  data () {
+  data() {
     return {
-      indexArr: '',
-      valueArr: '',
-      loadingText: '~~到底了~~',
+      indexArr: "",
+      valueArr: "",
+      isLoading: true, //初始化加载状态
+      loadingText: "~~一开始应该是加载中。。。。等数据传完后，更新为到底了~~",
       filterDropdownValue: [],
       filterData: [],
-      searchText: '',
-	  scrollTop: 0,
-	  viewHeight: uni.getSystemInfoSync().windowHeight,
-    }
+      searchText: "",
+      scrollTop: 0,
+      viewHeight: uni.getSystemInfoSync().windowHeight
+    };
   },
-  onPageScroll({scrollTop}) {
-  	  // 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
-	  
-  	  this.scrollTop = scrollTop;
-	  console.log('pagescroll====>',this.viewHeight)
+  onPageScroll({ scrollTop }) {
+    // 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
+
+    this.scrollTop = scrollTop;
+    console.log("pagescroll====>", this.viewHeight);
   },
   computed: {
-    goodsList () {
+    goodsList() {
       // 也可以从 getters 获取
       // console.log('index-list=====>',this.$store.state.index.list)
-      return this.$store.state.index.list
-    },
-    categoryList () {
-      return this.$store.state.index.categoryList
+      return this.$store.state.index.list;
     },
+    categoryList() {
+      return this.$store.state.index.categoryList;
+    }
   },
   filters: {
-    outData (value) {
-      return JSON.stringify(value)
-    },
+    outData(value) {
+      return JSON.stringify(value);
+    }
   },
-  onLoad () {
-    store.dispatch('index/category')
+  onLoad() {
+    store.dispatch("index/category");
     // this.getList();
-    store.dispatch('index/list')
+    store.dispatch("index/list");
   },
   methods: {
-    showDrawer (e) {
-      this.$refs[e].open()
+    showDrawer(e) {
+      this.$refs[e].open();
     },
-    getList () {
-      store.dispatch('index/list')
+    getList() {
+      store.dispatch("index/list");
     },
     // search(params) {
     //   this.$store.index.
     // },
-    closeDrawer (e) {
-      this.$refs[e].close()
+    closeDrawer(e) {
+      this.$refs[e].close();
     },
-    change (e, type) {
-      this[type] = e
+    change(e, type) {
+      this[type] = e;
     },
-    onClickItem (e) {
+    onClickItem(e) {
       if (this.current !== e) {
-        this.current = e
+        this.current = e;
       }
     },
-    dropDown () {
-      console.log('下拉')
+    dropDown() {
+      console.log("下拉");
     },
-    searchKey (e) {
-      const { value: keyword } = e.detail
-      this.keyWords = keyword
-      store.dispatch('index/search', {
+    searchKey(e) {
+      const { value: keyword } = e.detail;
+      this.keyWords = keyword;
+      store.dispatch("index/search", {
         params: {},
-        keyword,
-      })
+        keyword
+      });
     },
     // 接收菜单结果
-    search (e) {
-      const { on, value, selectedData } = e
-      let params = {}
-      const selectedPayload = {}
+    search(e) {
+      const { on, value, selectedData } = e;
+      let params = {};
+      const selectedPayload = {};
       for (const key in selectedData) {
         if (Object.prototype.hasOwnProperty.call(selectedData, key)) {
-          selectedPayload[key] = selectedData[key].toString()
+          selectedPayload[key] = selectedData[key].toString();
         }
       }
       if (on[0] === 1) {
         // 若点击全部
-        this.searchText = ''
-        store.dispatch('index/list')
+        this.searchText = "";
+        store.dispatch("index/list");
       } else {
-        for (let i = 1; i <= on.length; i++) { // on[0]是全部
-          if (on[i] === 1) { // 若该选项被选中
-            if (this.categoryList[i].value === 'filter') {
+        for (let i = 1; i <= on.length; i++) {
+          // on[0]是全部
+          if (on[i] === 1) {
+            // 若该选项被选中
+            if (this.categoryList[i].value === "filter") {
               params = {
                 ...selectedPayload,
-                ...params,
-              }
+                ...params
+              };
             } else {
-              params[`${this.categoryList[i].value}`] = value[i][0]
+              params[`${this.categoryList[i].value}`] = value[i][0];
             }
           }
         }
-        store.dispatch('index/search', {
+        store.dispatch("index/search", {
           params,
-          keyword: this.keyWords,
-        })
+          keyword: this.keyWords
+        });
       }
     }
   }
-
-}
+};
 </script>
 
 <style lang="scss">
diff --git a/src/pages/myOrder/components/OrderCard.vue b/src/pages/myOrder/components/OrderCard.vue
index e84f522..359d72a 100644
--- a/src/pages/myOrder/components/OrderCard.vue
+++ b/src/pages/myOrder/components/OrderCard.vue
@@ -1,341 +1,427 @@
 <template>
-	<view>
-		<view class="card" v-if="current == status" @click="toOrderInfo(status,order.pay_id)">
-			<view class="cardHeader">
-				<text class="orderId" v-if="status == '0'||status == '1'">订单号：{{order.mch_id}}</text>
-				<text class="orderId" v-if="status == '2'||status == '3'">下单时间：{{order.pay_time}}</text>
-				<text class="orderType" v-if="status=='0'">待付款</text>
-				<text class="orderType" v-if="status=='1'">待收货</text>
-				<text class="orderType" v-if="status == '2'||status == '3'">已完成</text>
-				<!-- <text class="orderType" v-if="status == '3'">已评价</text> -->
-			</view>
-			<view class="orderCardInfo" v-for="(orderInfo, index) in orderInfoList.list" :key="index">
-				<image :src="orderInfo.imgUrl" mode="aspectFill"></image>
-				<view class="infoText">
-					<view class="orderName">{{orderInfo[0].p_name}}</view>
-					<view class="orderDescrib">{{orderInfo.p_name}}</view>
-					<view class="infoText-bottom">
-						<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>
-			<!-- 0待付款 1 已付款 待收货 2 已收货待评价 3 已评价 -->
-			<view class="btns" v-if="status == '0'">
-				<view class="btn-type1" >取消订单</view>
-				<view class="btn-type2">去支付</view>
-			</view>
-			<view class="btns" v-if="status == '1'">
-				<view class="btn-type2">确认收货</view>
-			</view>
-			<view class="btns" v-if="status == '2'">
-				<view class="btn-type2">再次购买</view>
-			</view>
-		<!-- 	<view class="btns" v-if="status == '3'">
+  <view>
+    <view
+      class="card"
+      v-if="current == status"
+      @click="toOrderInfo(status,order.pay_id)"
+    >
+      <view class="cardHeader">
+        <text
+          class="orderId"
+          v-if="status == '0'||status == '1'"
+        >订单号：{{order.pay_id}}</text>
+        <text
+          class="orderId"
+          v-if="status == '2'||status == '3'"
+        >下单时间：{{order.pay_time}}</text>
+        <text
+          class="orderType"
+          v-if="status=='0'"
+        >待付款</text>
+        <text
+          class="orderType"
+          v-if="status=='1'"
+        >待收货</text>
+        <text
+          class="orderType"
+          v-if="status == '2'||status == '3'"
+        >已完成</text>
+        <!-- <text class="orderType" v-if="status == '3'">已评价</text> -->
+      </view>
+      <view
+        class="orderCardInfo"
+        v-for="(orderInfo, index) in order.order_info.list"
+        :key="index"
+      >
+        <image
+          :src="orderInfo.imgUrl"
+          mode="aspectFill"
+        ></image>
+        <view class="infoText">
+          <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="buy-num">X {{orderInfo.num}}</view>
+          </view>
+        </view>
+      </view>
+      <view class="payPrice">实付：<text class="priceNum">{{order.total_fee}}</text> </view>
+      <!-- 0待付款 1 已付款 待收货 2 已收货待评价 3 已评价 -->
+      <view
+        class="btns"
+        v-if="status == '0'"
+      >
+        <view class="btn-type1">取消订单</view>
+        <view class="btn-type2">去支付</view>
+      </view>
+      <view
+        class="btns"
+        v-if="status == '1'"
+      >
+        <view class="btn-type2">确认收货</view>
+      </view>
+      <view
+        class="btns"
+        v-if="status == '2'"
+      >
+        <view class="btn-type2">再次购买</view>
+      </view>
+      <!-- 	<view class="btns" v-if="status == '3'">
 				<view class="btn-type2">再次购买</view>
 			</view> -->
-		</view>
-		<view class="card" v-if="current == '10'" @click="toOrderInfo(status,order.pay_id)">
-			<view class="cardHeader">
-				<text class="orderId" v-if="status == '0'||status == '1'">订单号：{{order.mch_id}}</text>
-				<text class="orderId" v-if="status == '2'||status == '3'">下单时间：{{order.pay_time}}</text>
-				<text class="orderType" v-if="status=='0'">待付款</text>
-				<text class="orderType" v-if="status=='1'">待收货</text>
-				<text class="orderType" v-if="status == '2'||status == '3'">已完成</text>
-				<!-- <text class="orderType" v-if="status == '3'">已评价</text> -->
-			</view>
-			<view class="orderCardInfo" v-if v-for="(orderInfo) in orderInfoList.list" :key="orderInfo">
-				<image :src="orderInfo.imgUrl" mode="aspectFill"></image>
-				<view class="infoText">
-					<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="buy-num">X {{orderInfo.num}}</view>
-					</view>
-				</view>
-			</view>
-			<view class="payPrice">实付：<text class="priceNum">{{order.total_fee}}</text> </view>
-			<view class="btns" v-if="status == '0'">
-				<view class="btn-type1" >取消订单</view>
-				<view class="btn-type2">去支付</view>
-			</view>
-			<view class="btns" v-if="status == '1'">
-				<view class="btn-type2">确认收货</view>
-			</view>
-			<view class="btns" v-if="status == '2'">
-				<view class="btn-type2">再次购买</view>
-			</view>
-			<!-- <view class="btns" v-if="status == '3'">
+    </view>
+    <view
+      class="card"
+      v-if="current == '10'"
+      @click="toOrderInfo(status,order.pay_id)"
+    >
+      <view class="cardHeader">
+        <text
+          class="orderId"
+          v-if="status == '0'||status == '1'"
+        >订单号：{{order.pay_id}}</text>
+        <text
+          class="orderId"
+          v-if="status == '2'||status == '3'"
+        >下单时间：{{order.pay_time}}</text>
+        <text
+          class="orderType"
+          v-if="status=='0'"
+        >待付款</text>
+        <text
+          class="orderType"
+          v-if="status=='1'"
+        >待收货</text>
+        <text
+          class="orderType"
+          v-if="status == '2'||status == '3'"
+        >已完成</text>
+        <!-- <text class="orderType" v-if="status == '3'">已评价</text> -->
+      </view>
+      <view
+        class="orderCardInfo"
+        v-if
+        v-for="(orderInfo) in order.order_info.list"
+        :key="orderInfo"
+      >
+        <image
+          :src="orderInfo.imgUrl"
+          mode="aspectFit"
+        ></image>
+        <view class="infoText">
+          <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="buy-num">X {{orderInfo.num}}</view>
+          </view>
+        </view>
+      </view>
+      <view class="payPrice">实付：<text class="priceNum">{{order.total_fee}}</text> </view>
+      <view
+        class="btns"
+        v-if="status == '0'"
+      >
+        <view class="btn-type1">取消订单</view>
+        <view class="btn-type2">去支付</view>
+      </view>
+      <view
+        class="btns"
+        v-if="status == '1'"
+      >
+        <view class="btn-type2">确认收货</view>
+      </view>
+      <view
+        class="btns"
+        v-if="status == '2'"
+      >
+        <view class="btn-type2">再次购买</view>
+      </view>
+      <!-- <view class="btns" v-if="status == '3'">
 				<view class="btn-type2">再次购买</view>
 			</view> -->
-		</view>
-	</view>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		props: {
-			/**
-			 * 订单数据
-			 */
-			order: {
-				// orderId: Number, 
-				// img: String, 
-				// name: String,
-				// originCost:String,
-				// price: String, 
-				// orderType:Number,
-				// buyNum:Number,
-				finished_time: null,
-				is_refound: String,
-				mch_id: String,
-				money_of_dcw: String,
-				money_of_partner: String,
-				money_of_shop: String,
-				orderJudge: Boolean,
-				order_info: {
-					address:{
-						cityName: String,
-						countyName: String,
-						detailInfo: String,
-						errMsg: String,
-						nationalCode: String,
-						postalCode: String,
-						provinceName: String,
-						telNumber: String,
-						userName: String,
-					},
-					cartinfo: ["127"],
-					keyname: "330_1588911391",
-					lefttime: Number,
-					list:[
-						{
-							cart_id: "127",
-							imgUrl: String,
-							img_index_url: null,
-							memo: String,
-							mp_id: String,
-							nowPrice: String,
-							num: String,
-							oldPrice: Number,
-							p_discount: String,
-							p_name: String,
-							p_root_index: String,
-							p_sale_price: String,
-							peopleName: String,
-							pics: ["79_0_D122D2.jpg","79_1_E0A1ED.jpg","79_2_B00B3D.jpg","79_3_B2CF21.jpg","79_4_33AD1B.jpg"],
-							pid: String,
-							sk_id: String,
-						}
-					],
-					orderDesc: String,
-					total_fee: Number,
-				},
-				partner_uid: String,
-				pay_cate: String,
-				pay_id: String,
-				pay_time: String,
-				pay_wood_desc: String,
-				pay_wood_id: String,
-				prepay_id: String,
-				re_check_staus: String,
-				shopid: String,
-				split_userid: String,
-				status: String,
-				// status0待付款  1已付款 待收货 2 已收货待评价 3 已评价
-				total_fee: String,
-				uid: String,
-			},
-			/**
-			 * 当前选择
-			 */
-			current:Number
-			
-		},
-		created() {
-			console.log(this.order);
-			// console.log(this.order.status );
-			// console.log(this.current);
-		},
-		computed:{
-			status(){
-				return this.order.status
-			},
-			orderInfoList(){
-				console.log('this.order.order_info[0]', this.order)
-				return this.order.order_info[0]
-			}
-		},
-		data() {
-			return {
-			};
-		},
-		methods:{
-			toRefundment(){
-				uni.navigateTo({
-					url: '../refundment/refundment',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			toOrderInfo(status,payId){
-				console.log(status,payId)
-				switch(status){
-					// 0待付款  1待收货  2已收货 3 已评价
-					case '0':
-						uni.navigateTo({
-							url:`../myOrderPaying/myOrderPaying?status=`+status+`&payId=`+payId,
-							fail(errMsg) {
-								console.log(errMsg)
-							}
-						})
-					break;
-					case '1':
-						uni.navigateTo({
-							url:`../myOrderPaying/myOrderPaying?status=`+status+`&payId=`+payId,
-							fail(errMsg) {
-								console.log(errMsg)
-							}
-						})
-					
-					break;
-					case '2 || 3':
-						uni.navigateTo({
-							url:`../myOrderPaying/myOrderPaying?status=`+status+`&payId=`+payId,
-							fail(errMsg) {
-								console.log(errMsg)
-							}
-						})
-					break;
-					default:
-					break;
-					
-				}
-			}
-		}
-	}
+export default {
+  props: {
+    /**
+     * 订单数据
+     */
+    order: {
+      // orderId: Number,
+      // img: String,
+      // name: String,
+      // originCost:String,
+      // price: String,
+      // orderType:Number,
+      // buyNum:Number,
+      finished_time: null,
+      is_refound: String,
+      mch_id: String,
+      money_of_dcw: String,
+      money_of_partner: String,
+      money_of_shop: String,
+      orderJudge: Boolean,
+      order_info: {
+        address: {
+          cityName: String,
+          countyName: String,
+          detailInfo: String,
+          errMsg: String,
+          nationalCode: String,
+          postalCode: String,
+          provinceName: String,
+          telNumber: String,
+          userName: String
+        },
+        cartinfo: ["127"],
+        keyname: "330_1588911391",
+        lefttime: Number,
+        list: [
+          {
+            cart_id: "127",
+            imgUrl: String,
+            img_index_url: null,
+            memo: String,
+            mp_id: String,
+            nowPrice: String,
+            num: String,
+            oldPrice: Number,
+            p_discount: String,
+            p_name: String,
+            p_root_index: String,
+            p_sale_price: String,
+            peopleName: String,
+            pics: [
+              "79_0_D122D2.jpg",
+              "79_1_E0A1ED.jpg",
+              "79_2_B00B3D.jpg",
+              "79_3_B2CF21.jpg",
+              "79_4_33AD1B.jpg"
+            ],
+            pid: String,
+            sk_id: String
+          }
+        ],
+        orderDesc: String,
+        total_fee: Number
+      },
+      partner_uid: String,
+      pay_cate: String,
+      pay_id: String,
+      pay_time: String,
+      pay_wood_desc: String,
+      pay_wood_id: String,
+      prepay_id: String,
+      re_check_staus: String,
+      shopid: String,
+      split_userid: String,
+      status: String,
+      // status0待付款  1已付款 待收货 2 已收货待评价 3 已评价
+      total_fee: String,
+      uid: String
+    },
+    /**
+     * 当前选择
+     */
+    current: Number
+  },
+  created() {
+    console.log("this.order", this.order);
+    // console.log(this.order.status );
+    // console.log(this.current);
+  },
+  computed: {
+    status() {
+      return this.order.status;
+    },
+    orderInfoList() {
+      console.log("this.order.order_info[0]", this.order);
+      return this.order.order_info;
+    }
+  },
+  data() {
+    return {};
+  },
+  methods: {
+    toRefundment() {
+      uni.navigateTo({
+        url: "../refundment/refundment",
+        success: res => {},
+        fail: () => {},
+        complete: () => {}
+      });
+    },
+    toOrderInfo(status, payId) {
+      console.log(status, payId);
+      switch (status) {
+        // 0待付款  1待收货  2已收货 3 已评价
+        case "0":
+          uni.navigateTo({
+            url:
+              `../myOrderPaying/myOrderPaying?status=` +
+              status +
+              `&payId=` +
+              payId,
+            fail(errMsg) {
+              console.log(errMsg);
+            }
+          });
+          break;
+        case "1":
+          uni.navigateTo({
+            url:
+              `../myOrderPaying/myOrderPaying?status=` +
+              status +
+              `&payId=` +
+              payId,
+            fail(errMsg) {
+              console.log(errMsg);
+            }
+          });
+
+          break;
+        case "2 || 3":
+          uni.navigateTo({
+            url:
+              `../myOrderPaying/myOrderPaying?status=` +
+              status +
+              `&payId=` +
+              payId,
+            fail(errMsg) {
+              console.log(errMsg);
+            }
+          });
+          break;
+        default:
+          break;
+      }
+    }
+  }
+};
 </script>
 
 <style lang="scss">
-	.card{
-		width: 670rpx;
-		height: 478rpx;
-		background: #FFFFFF;
-		box-shadow: 0 0 10px 0 rgba(177,128,128,0.06);
-		border-radius: 8px;
-		border-radius: 8px;
-		margin-top: 20rpx;
-		padding: 40rpx;
-		box-sizing: border-box;
-		.cardHeader{
-			width: 100%;
-			height: 40rpx;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			.orderId{
-				font-size: 12px;
-				color: #999999;
-			}
-			.orderType{
-				font-size: 14px;
-				color: #FF6B4A;
-			}
-		}
-		.orderCardInfo{
-			width: 100%;
-			height: 188rpx;
-			display: flex;
-			flex-direction: row;
-			justify-content: space-between;
-			align-items: center;
-			margin-top: 40rpx;
-			image{
-				height: 188rpx;
-				width: 188rpx;
-				margin-right: 24rpx;
-			}
-			.infoText{
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
-				align-items: flex-start;
-				height: 188rpx;
-				width: 368rpx;
-			}
-			.orderName{
-				font-size: 14px;
-				color: #333333;
-				display: -webkit-box;
-				overflow: hidden;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 2;
-			}
-			.orderDescrib{
-				font-size: 12px;
-				color: #999999;
-				display: -webkit-box;
-				overflow: hidden;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 2;
-			}
-			.infoText-bottom{
-				display: flex;
-				flex-direction: row;
-				justify-content: flex-start;
-				align-items: center;
-				width: 100%;
-				.markPrice{
-					font-size: 14px;
-					color: #FF6B4A;
-					margin-right: 20rpx;
-				}
-				.buy-num{
-					font-size: 12px;
-					color: #999999;
-				}
-			}
-		}
-		.payPrice{
-			text-align: right;
-			margin: 20rpx 0;
-			font-size: 14px;
-			color: #333333;
-			.priceNum{
-				font-size: 14px;
-				color: #FF6B4A;
-			}
-		}
-		.btns{
-			display: flex;
-			justify-content: flex-end;
-			align-items: center;
-			.btn-type1{
-				height: 48rpx;
-				width: 156rpx;
-				border: 1px solid #FF6B4A;
-				border-radius: 12px;
-				border-radius: 12px;
-				text-align: center;
-				line-height: 48rpx;
-				font-size: 12px;
-				color: #FF6B4A;
-			}
-			.btn-type2{
-				height: 48rpx;
-				width: 140rpx;
-				background: #FF6B4A;
-				border-radius: 12px;
-				border-radius: 12px;
-				text-align: center;
-				line-height: 48rpx;
-				font-size: 12px;
-				color: #FFFFFF;
-				margin-left: 20rpx;
-			}
-		}
-	}
+.card {
+  width: 670rpx;
+  height: 478rpx;
+  background: #ffffff;
+  box-shadow: 0 0 10px 0 rgba(177, 128, 128, 0.06);
+  border-radius: 8px;
+  border-radius: 8px;
+  margin-top: 20rpx;
+  padding: 40rpx;
+  box-sizing: border-box;
+  .cardHeader {
+    width: 100%;
+    height: 40rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .orderId {
+      font-size: 12px;
+      color: #999999;
+    }
+    .orderType {
+      font-size: 14px;
+      color: #ff6b4a;
+    }
+  }
+  .orderCardInfo {
+    width: 100%;
+    height: 188rpx;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 40rpx;
+    image {
+      height: 188rpx;
+      width: 188rpx;
+      margin-right: 24rpx;
+    }
+    .infoText {
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      align-items: flex-start;
+      height: 188rpx;
+      width: 368rpx;
+    }
+    .orderName {
+      font-size: 14px;
+      color: #333333;
+      display: -webkit-box;
+      overflow: hidden;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 2;
+    }
+    .orderDescrib {
+      font-size: 12px;
+      color: #999999;
+      display: -webkit-box;
+      overflow: hidden;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 2;
+    }
+    .infoText-bottom {
+      display: flex;
+      flex-direction: row;
+      justify-content: flex-start;
+      align-items: center;
+      width: 100%;
+      .markPrice {
+        font-size: 14px;
+        color: #ff6b4a;
+        margin-right: 20rpx;
+      }
+      .buy-num {
+        font-size: 12px;
+        color: #999999;
+      }
+    }
+  }
+  .payPrice {
+    text-align: right;
+    margin: 20rpx 0;
+    font-size: 14px;
+    color: #333333;
+    .priceNum {
+      font-size: 14px;
+      color: #ff6b4a;
+    }
+  }
+  .btns {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    .btn-type1 {
+      height: 48rpx;
+      width: 156rpx;
+      border: 1px solid #ff6b4a;
+      border-radius: 12px;
+      border-radius: 12px;
+      text-align: center;
+      line-height: 48rpx;
+      font-size: 12px;
+      color: #ff6b4a;
+    }
+    .btn-type2 {
+      height: 48rpx;
+      width: 140rpx;
+      background: #ff6b4a;
+      border-radius: 12px;
+      border-radius: 12px;
+      text-align: center;
+      line-height: 48rpx;
+      font-size: 12px;
+      color: #ffffff;
+      margin-left: 20rpx;
+    }
+  }
+}
 </style>
diff --git a/src/pages/myOrder/myOrder.vue b/src/pages/myOrder/myOrder.vue
index 110cf91..f14d133 100644
--- a/src/pages/myOrder/myOrder.vue
+++ b/src/pages/myOrder/myOrder.vue
@@ -22,7 +22,7 @@
     <view class="orderList">
       <view
         v-for="(order) in orderList"
-        :key="order.orderId"
+        :key="order.pay_id"
       >
         <OrderCard
           :order="order"
@@ -34,53 +34,53 @@
   </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"
+    };
   },
 
   onLoad: function(option) {
     // 获取订单列表
-    store.dispatch('myOrder/getList', {
-      way: '',
-    })
+    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
-    },
+      return this.$store.state.myOrder.orderList;
+    }
   },
   methods: {
     // tab点击事件
     onClickItem(e) {
+      console.log("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 5cc99a5..92358d8 100644
--- a/src/pages/myOrderPaying/myOrderPaying.vue
+++ b/src/pages/myOrderPaying/myOrderPaying.vue
@@ -80,13 +80,13 @@
         </text>
         <text class="order-info-price">
           <text class="p1">实付</text>
-          <text class="p2">￥{{orderInfo.order_info[0].total_fee}}</text>
+          <text class="p2">￥{{orderInfo.total_fee}}</text>
         </text>
         <text class="order-info-num">
           <text>订单号：{{payId}}</text>
         </text>
         <text class="order-info-time">
-          <text>下单时间：{{orderInfo.order_info[0].pay_time | timerChange}}</text>
+          <text>下单时间：{{orderInfo.pay_time | timerChange}}</text>
         </text>
         <view class="order-info-hr"></view>
         <view class="order-info-contact">
@@ -123,130 +123,130 @@
 </template>
 
 <script>
-import store from '@/store'
-import UniCountdown from '../../components/UniCountdown/UniCountdown.vue'
+import store from "@/store";
+import UniCountdown from "../../components/UniCountdown/UniCountdown.vue";
 export default {
   components: {
-    UniCountdown,
+    UniCountdown
   },
-  data () {
+  data() {
     return {
-      payId: '',
-      payTime: '',
-      status: '', // status 0 待付款 1 已发货
-      uid: '',
-      openid: '',
+      payId: "",
+      payTime: "",
+      status: "", // status 0 待付款 1 已发货
+      uid: "",
+      openid: "",
       lefttime: 0,
-      isPay: 0,
-    }
+      isPay: 0
+    };
   },
-  onLoad: function (option) {
-    console.log(option)
-    this.payId = option.payId
-    this.status = option.status
-    this.isPay = option.isPay
-    const openid = uni.getStorageSync('openid')
-    const uid = this.$store.state.user.uid
-    this.uid = uid
-    this.openid = openid
-    store.dispatch('orderRead/getOrderInfo', {
+  onLoad: function(option) {
+    console.log(option);
+    this.payId = option.payId;
+    this.status = option.status;
+    this.isPay = option.isPay;
+    const openid = uni.getStorageSync("openid");
+    const uid = this.$store.state.user.uid;
+    this.uid = uid;
+    this.openid = openid;
+    store.dispatch("orderRead/getOrderInfo", {
       pay_id: this.payId,
-      uid: '1',
-      openid: openid,
-    })
+      uid: "1",
+      openid: openid
+    });
     // this.orderInfo = this.$store.state.orderRead.orderInfo
   },
   // 若从支付页面跳转过来，返回直接返回到首页
   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: {
     // 获取订单详细信息
-    orderInfo () {
-      console.log('orderInfo', this.$store.state.orderRead.orderInfo)
-      return this.$store.state.orderRead.orderInfo || {}
+    orderInfo() {
+      console.log("orderInfo", this.$store.state.orderRead.orderInfo);
+      return this.$store.state.orderRead.orderInfo || {};
     },
-    orderInfoList () {
-      const orderInfoList = this.orderInfo.order_info[0].list
-      return orderInfoList
+    orderInfoList() {
+      const orderInfoList = this.orderInfo.order_info.list;
+      return orderInfoList;
     },
     // 获取订单地址信息
-    orderAddressInfo () {
-      return this.orderInfo.order_info[0].address
+    orderAddressInfo() {
+      return this.orderInfo.order_info.address;
     },
     // 订单付款时间
-    getTime () {
-      return this.orderInfo.order_info[0].lefttime
+    getTime() {
+      return this.orderInfo.order_info.lefttime;
     },
     // 计算总优惠额
-    totalDiscount () {
-      const discountInfoList = this.orderInfo.discount_info
-      let totalDiscount = 0
+    totalDiscount() {
+      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
-    },
+      return totalDiscount;
+    }
   },
   methods: {
     // 取消订单
-    timeup () {
-      this.cancleOrder()
+    timeup() {
+      this.cancleOrder();
     },
-    cancleOrder () {
-      const uid = this.uid
-      const openid = this.openid
+    cancleOrder() {
+      const uid = this.uid;
+      const openid = this.openid;
       uni.showModal({
-        title: '提示',
-        content: '现在取消，订单不可恢复哦，确认取消吗？',
-        success: function (res) {
+        title: "提示",
+        content: "现在取消，订单不可恢复哦，确认取消吗？",
+        success: function(res) {
           if (res.confirm) {
-            store.dispatch('cancelOrder/cancel', {
-              keyname: '1',
+            store.dispatch("cancelOrder/cancel", {
+              keyname: "1",
               uid: uid,
-              openid: openid,
-            })
+              openid: openid
+            });
           } else if (res.cancel) {
-            console.log('用户点击取消')
+            console.log("用户点击取消");
           }
-        },
-      })
-    },
-    paylog () {
-
-    },
-    confirmOrder () {
-      store.dispatch('statusConfirm/confirm', {
-        uid: this.uid,
-        openid: this.openid,
-        oldway: '1',
-        way: '2',
-        pay_id: this.payId,
-        judgeContent: '',
-        orderInfo: this.orderInfo.order_info,
-      }).then(
-        setTimeout(() => {
-          uni.navigateBack()
-        }, 1500),
-      )
+        }
+      });
     },
+    paylog() {},
+    confirmOrder() {
+      store
+        .dispatch("statusConfirm/confirm", {
+          uid: this.uid,
+          openid: this.openid,
+          oldway: "1",
+          way: "2",
+          pay_id: this.payId,
+          judgeContent: "",
+          orderInfo: this.orderInfo.order_info
+        })
+        .then(
+          setTimeout(() => {
+            uni.navigateBack();
+          }, 1500)
+        );
+    }
   },
   filters: {
     timerChange: function(value) {
-      var newDate = new Date()
-      newDate.setTime(value * 1000)
-      return newDate.toLocaleString()
-    },
-  },
-}
+      var newDate = new Date();
+      newDate.setTime(value * 1000);
+      return newDate.toLocaleString();
+    }
+  }
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/store/modules/myOrder.js b/src/store/modules/myOrder.js
index 2a93e23..8ebd659 100644
--- a/src/store/modules/myOrder.js
+++ b/src/store/modules/myOrder.js
@@ -83,14 +83,16 @@ const mutations = {
 };
 
 const actions = {
-  getList({ commit }, param) {
-      request({
-        url: myOrderList,
-        data: param,
-        success: (res) => {
-          // console.log(res.data);
-          commit("INIT", res.data.data);
-        },
+  getList({
+    commit
+  }, param) {
+    request({
+      url: myOrderList,
+      data: param,
+      success: (res) => {
+        console.log('myOrderList', res.data);
+        commit("INIT", res.data.data);
+      },
     })
   }
 }
-- 
2.0.0