From 1e79bf35d18b99e013176260d37733710e998988 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Thu, 7 Sep 2023 17:22:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=EF=BC=8C=E8=B4=A2?=
 =?UTF-8?q?=E5=8A=A1=E7=AE=A1=E7=90=86=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                              |    4 +-
 pages/admin/financial_management/index.vue |  674 ++++++++++
 pages/users/order_list/relase.vue          | 1313 ++++++++++++++++++++
 static/images/bubble.png                   |  Bin 0 -> 2425 bytes
 static/images/relase.png                   |  Bin 0 -> 1815 bytes
 5 files changed, 1989 insertions(+), 2 deletions(-)
 create mode 100644 pages/admin/financial_management/index.vue
 create mode 100644 pages/users/order_list/relase.vue
 create mode 100644 static/images/bubble.png
 create mode 100644 static/images/relase.png

diff --git a/manifest.json b/manifest.json
index 43987aa..e07e880 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "1.1.0",
-    "versionCode" : 110,
+    "versionName" : "1.3.0",
+    "versionCode" : 130,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/admin/financial_management/index.vue b/pages/admin/financial_management/index.vue
new file mode 100644
index 0000000..dc31959
--- /dev/null
+++ b/pages/admin/financial_management/index.vue
@@ -0,0 +1,674 @@
+<template>
+  <view class="">
+    <view class="finance_head">
+      <view class="top">
+        <view>
+          <view v-if="user_id == 0" class="accont">
+            <u--image
+              :showLoading="true"
+              :src="userInfo.avatar || '../../static/img/public/man.png'"
+              width="44px"
+              height="44px"
+              shape="circle"
+            ></u--image>
+            <view class="name">{{ userInfo.nickname }}</view>
+            <!-- <u-icon name="setting-fill" color="white" size="20"></u-icon> -->
+          </view>
+          <view v-else class="accont">
+            <u--image
+              :showLoading="true"
+              :src="userInfo.avatar || '../../static/img/public/man.png'"
+              width="44px"
+              height="44px"
+              shape="circle"
+            ></u--image>
+
+            <view class="name">{{ userInfo.nickname }}</view>
+            <!-- <u-icon name="setting-fill" color="white" size="20"></u-icon> -->
+          </view>
+        </view>
+        <!-- <view class="right" @click="navTo('/subpkg/topUp/topUp')">
+          账户充值
+        </view> -->
+      </view>
+      <view class="center">
+        <view class="title">
+          <text style="margin-right: 20rpx">账户总金额(元)</text
+          ><uni-icons
+            @click="updateEye()"
+            :type="eyeType ? 'eye-filled' : 'eye-slash-filled'"
+            color="#fff"
+          ></uni-icons>
+        </view>
+        <view class="price" v-show="eyeType"
+          >{{ all_money }}元</view
+        >
+        <view class="price" v-show="!eyeType">****元</view>
+        <view class="bubble">
+          <!-- <image src="../../static/img/contract/bubble.png"></image> -->
+          <view class="text" v-show="eyeType"
+            >可提现金额{{ userInfo.user_money || 0.0 }}元</view
+          >
+          <view class="text" v-show="!eyeType">可提现金额****元</view>
+        </view>
+      </view>
+      <view class="bottom" @click="navTo('/subpkg/orderDetail/orderDetail')">
+        <view class="item">
+          <view>履约保证金额(元)</view>
+          <view class="num" v-show="eyeType">{{
+            userInfo.deposit || 0.0
+          }}</view>
+          <view class="num" v-show="!eyeType">****</view>
+        </view>
+        <u-line direction="col" length="40%" color="#999999FF"></u-line>
+        <view class="item">
+          <view>个人收益金额(元)</view>
+          <view class="num" v-show="eyeType">{{
+            userInfo.user_money || 0.0
+          }}</view>
+          <view class="num" v-show="!eyeType">****</view>
+        </view>
+      </view>
+    </view>
+    <view class="bill">
+      <view style="width: 100%; height: 90rpx; background-color: #fff"></view>
+      <uni-section
+        titleFontSize="32rpx"
+        type="line"
+        title="账单流水"
+      ></uni-section>
+      <!-- <u-subsection :list="billTypeList" :current="current" mode="subsection"></u-subsection> -->
+      <!-- <view class="type_box">
+        <view class="type">
+          <view :class="current == 0 ? 'active' : ''" @click="changeBillType(0)"
+            >日账单</view
+          >
+          <view :class="current == 1 ? 'active' : ''" @click="changeBillType(1)"
+            >月账单</view
+          >
+        </view>
+      </view> -->
+      <!-- 日账单 -->
+      <view class="bill_list" v-show="current == 0">
+        <!-- <view class="card" v-for="(item, index) in billList" :key="index">
+          <view class="top">
+            <view class="blue">账单详情</view>
+            <view>账单日期：{{item.create_time}}</view>
+          </view>
+          <view class="bottom">
+            <view class="left">
+              <view>收益金额(元)</view>
+              <view class="num">{{item.change_amount}}</view>
+            </view>
+            <view class="right">
+              <view>支出金额:{{item.change_amount_desc<0?item.change_amount:'0.00'}}</view>
+              <view>入账金额:{{item.change_amount_desc>0?item.change_amount:'0.00'}}</view>
+            </view>
+          </view>
+        </view> -->
+        <view class="item" v-for="(item, index) in billList" :key="item.id">
+          <view class="top">
+            账单日期: {{ current ? item.month : item.create_time }}
+          </view>
+          <view class="bottom">
+            <view class="text">
+              <view class="t_item" v-if="current == 0">
+                <view class="t_title">任务名称：</view>
+                <view class="tips">{{ item.remark }}</view>
+              </view>
+     <!--<view class="t_item">
+                <view class="t_title">金额归属：</view>
+                <view class="tips">{{
+                  $store.state.app.userInfo.nickname
+                }}</view>
+              </view> -->
+			  
+              <view class="t_item">
+                <view class="t_title">收益来源：</view>
+                <view class="tips">
+                  <text v-if="item.change_type == 202" style="color: #46be61">{{
+                    item.type_desc
+                  }}</text>
+                  <text
+                    v-else-if="item.change_type == 203"
+                    style="color: #ff7c32"
+                    >{{ item.type_desc }}</text
+                  >
+                  <text v-else="item.change_type == 203">{{
+                    item.type_desc
+                  }}</text>
+                </view>
+              </view>
+            </view>
+            <view class="price">
+              {{
+                current
+                  ? item.expenditure == 0
+                    ? "+" + item.income
+                    : "-" + item.income
+                  : item.change_amount_desc
+              }}
+            </view>
+          </view>
+        </view>
+
+        <!-- <view class="card" v-for="(item, index) in billList" :key="index">
+					<view class="top">
+						<view class="blue">账单详情</view>
+						<view>账单日期：{{current?item.month:item.create_time}}</view>
+					</view>
+					<view class="bottom">
+						<view class="left">
+							<view>收益金额(元)</view>
+							<view class="num">
+								{{current?(item.expenditure==0?item.income:'-'+item.income):item.change_amount_desc}}
+							</view>
+						</view>
+						<view class="right">
+							<view>支出金额:{{item.expenditure>0?item.expenditure:'0.00'}}</view>
+							<view>入账金额:{{item.income>0?item.income:'0.00'}}</view>
+						</view>
+					</view>
+				</view>
+
+				 -->
+        <u-loadmore
+          :status="loadConfig.status"
+          :loading-text="loadConfig.loadingText"
+          :loadmore-text="loadConfig.loadmoreText"
+          :nomore-text="loadConfig.nomoreText"
+        />
+      </view>
+      <!-- 月账单 -->
+      <view class="bill_list" v-show="current == 1">
+        <view class="card" v-for="(item, index) in billListMonth" :key="index">
+          <view class="top">
+            <view class="blue">账单详情</view>
+            <view>账单日期：{{ item.month }}</view>
+          </view>
+          <view class="bottom">
+            <view class="left">
+              <view>个人收益金额(元)</view>
+              <view class="num">{{ item.income }}</view>
+            </view>
+            <view class="right">
+              <view
+                >支出金额:{{
+                  item.expenditure > 0 ? item.expenditure : "0.00"
+                }}</view
+              >
+              <view>入账金额:{{ item.income > 0 ? item.income : "0.00" }}</view>
+            </view>
+          </view>
+        </view>
+        <u-loadmore status="nomore" nomore-text="仅展示一年数据" />
+      </view>
+
+      <!-- <button class="btn" @click="navTo('/subpkg/withdrawDeposit/withdrawDeposit')">提现余额</button> -->
+    </view>
+  </view>
+</template>
+
+<script>
+// import {
+//   accountLogLists,
+//   accountLogListsMonth
+// } from "@/api/pay.js"
+// import {
+//   userInfo
+// } from "@/api/oaUser.js"
+
+// import {
+//   Toast
+// } from '@/libs/uniApi.js'
+	import {
+		
+		getUserInfo,
+		
+	} from '@/api/user.js';
+export default {
+  data () {
+    return {
+      user_id: 0,
+      userInfo: {},
+      otherUserInfo: {},
+      billTypeList: ['日账单', '月账单'],
+      current: 0,
+      billList: [],
+	  eyeType:true,
+      billListMonth: [],
+      loadConfig: {
+        page: 1,
+        limit: 25,
+        loadingText: '努力加载中',
+        loadmoreText: '轻轻上拉',
+        nomoreText: '没有更多账单了~~',
+        status: 'loadmore'
+      },
+    }
+  },
+  onLoad (e) {
+    if (e.id > 0) {
+      this.user_id = e.id
+
+    }
+    // this.loadBill()
+  },
+  onShow () {
+
+    if (this.user_id == 0) {
+      this.userInfo = this.$store.state.app.userInfo;
+      getUserInfo().then((res) => {
+        this.$store.commit('setUserInfo', res.data);
+        this.userInfo = res.data;
+      })
+    } else {
+      this.OtherUserInfo()
+    }
+  },
+  computed: {
+    // eyeType () {
+    //   return this.$store.state.config.eyeType;
+    // },
+    all_money(){
+      let str = 0.00;
+
+      try{
+        this.userInfo.user_money?str=str+parseFloat(this.userInfo.user_money):0.00;
+        this.userInfo.deposit?str=str+parseFloat(this.userInfo.deposit):0.00;
+        str = str.toFixed(2);
+      }catch(e){
+        str = 0.00;
+      }
+      return str;
+    }
+  },
+  onBackPress () {
+    this.loadBill()
+  },
+  methods: {
+    navTo (url) {
+      url ?
+        uni.navigateTo({
+          url: url
+        }) : Toast('暂未开放')
+    },
+    async OtherUserInfo () {
+      // let res = await userInfo({
+      //   id: this.user_id
+      // });
+	  
+	  getUserInfo().then(res => {
+	  	// that.userInfo = res.data;
+	  	// that.userInfo.svip_open = true;
+	  	// that.userInfo.vip_status = 2;
+	  	// that.is_promoter = res.data.is_promoter;
+	  	// that.extension_status = res.data.extension_status;
+	        // this.userInfo = res.data
+			console.log(res.data)
+	  });
+      // this.userInfo = res.data
+    },
+    updateEye () {
+       this.eyeType=!this.eyeType
+    },
+    // 选择日账单月账单
+    changeBillType (type) {
+      this.current = type;
+      if (type == 1) this.loadBillMonth();
+    },
+    async loadBill () {
+      if (this.loadConfig.status == "nomore") return;
+      this.loadConfig.status = "loading"
+      let res = await accountLogLists({
+        type: 'um', //账户余额
+        page_no: this.loadConfig.page,
+        page_size: this.loadConfig.limit,
+        user_id: this.user_id
+      });
+      this.loadConfig.status = "loadmore"
+      if (res.data.lists.length < this.loadConfig.limit) {
+        this.loadConfig.status = "nomore"
+      } else {
+        this.loadConfig.page++;
+      }
+      this.billList = [...this.billList, ...res.data.lists];
+    },
+    async loadBillMonth () {
+      let res = await accountLogListsMonth();
+      let list = [];
+      for (let key in res.data) {
+        list.push(res.data[key])
+      }
+      this.billListMonth = list;
+    }
+  },
+  onPullDownRefresh () {
+    uni.stopPullDownRefresh()
+  }
+}
+</script>
+
+<style lang="scss">
+page {
+  // background-color: #fff;
+}
+
+.finance_head {
+  background-color: #f02828;
+  height: 400rpx;
+  position: relative;
+  // box-shadow: 0 -10px 20px rgba(#fff, 0.9) inset;
+  background-image: linear-gradient(to top, rgba(#fff, 1), transparent);
+  // box-shadow: -10px -10px 40px rgba(#fff, 0.9);
+  background-size: 100% 35%;
+  background-repeat: no-repeat;
+  background-position: center bottom;
+
+  .top {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    flex: 1;
+    color: #fff;
+    padding: 10rpx 28rpx;
+
+    .accont {
+      // background-color: red;
+      display: flex;
+      justify-content: space-between;
+      width: auto;
+      width: auto;
+      line-height: 44px;
+
+      .name {
+        margin-left: 20rpx;
+      }
+
+      .name {
+        margin-left: 20rpx;
+      }
+    }
+
+    .left {
+      display: flex;
+      align-items: center;
+      flex: 1;
+      font-size: 28rpx;
+      font-weight: 500;
+      color: #ffffff;
+
+      // .name {
+      // 	margin: 0 17.5rpx;
+      // }
+
+      image {
+        width: 40rpx;
+        height: 40rpx;
+      }
+    }
+
+    .right {
+      font-size: 24.53rpx;
+      font-weight: 400;
+      color: #ffffff;
+    }
+  }
+
+  .center {
+    color: #fff;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    .title {
+      font-size: 25rpx;
+      font-weight: 400;
+      line-height: 39rpx;
+    }
+
+    .price {
+      font-size: 60rpx;
+      font-weight: bold;
+      line-height: 39rpx;
+      margin-top: 28rpx;
+      margin-bottom: 14rpx;
+    }
+
+    .bubble {
+      padding: 20rpx 28rpx 10rpx 28rpx;
+      background-image: url("@/static/images/bubble.png");
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+
+      .text {
+      }
+    }
+  }
+
+  .bottom {
+    position: absolute;
+    bottom: -78rpx;
+    left: 50%;
+    transform: translateX(-50%);
+    width: 694rpx;
+    height: 140rpx;
+    background: #ffffff;
+    box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(50, 116, 249, 0.1);
+    border-radius: 14rpx 14rpx 14rpx 14rpx;
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+
+    .item {
+      text-align: center;
+      font-size: 25rpx;
+      font-weight: 400;
+      color: #666666;
+      line-height: 39rpx;
+
+      .num {
+        font-size: 39rpx;
+        font-weight: 500;
+        color: #f02828;
+        line-height: 39rpx;
+      }
+    }
+  }
+}
+
+.bill {
+  // padding: 28rpx;
+  // padding-top: 90rpx;
+  padding-bottom: 32rpx;
+  background-color: #f5f5f5;
+
+  .type_box {
+    background-color: #fff;
+    padding: 32rpx 0;
+
+    .type {
+      height: 53rpx;
+      width: 333rpx;
+      display: flex;
+      align-items: center;
+      overflow: hidden;
+      margin: 0 auto;
+
+      view {
+        flex: 1;
+        color: #f02828;
+        height: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border: 1px solid #3274f9;
+
+        &:nth-child(1) {
+          border-radius: 30rpx 0 0 30rpx;
+        }
+
+        &:nth-child(2) {
+          border-radius: 0 30rpx 30rpx 0;
+        }
+      }
+
+      .active {
+        background-color: #f02828;
+        color: #fff;
+      }
+    }
+  }
+
+  .bill_list {
+    // background-color: #f5f5f5;
+    padding-bottom: 100rpx;
+    padding-top: 28rpx;
+
+    .card {
+      padding: 28rpx;
+      background-color: #fff;
+      margin-bottom: 21rpx;
+
+      .top {
+        display: flex;
+        align-items: center;
+        font-size: 25rpx;
+        font-weight: 400;
+        color: #333333ff;
+        line-height: 39rpx;
+
+        .blue {
+          width: 137rpx;
+          height: 49rpx;
+          background: #3274f9;
+          border-radius: 26rpx 26rpx 26rpx 26rpx;
+          font-size: 25rpx;
+          font-weight: 400;
+          color: #ffffff;
+          line-height: 39rpx;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          margin-right: 28rpx;
+        }
+      }
+
+      .bottom {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        height: 160rpx;
+
+        .left {
+          flex: 1;
+          text-align: center;
+          font-size: 25rpx;
+          font-weight: 400;
+          color: #666666;
+          line-height: 39rpx;
+
+          .num {
+            font-size: 39rpx;
+            font-weight: 500;
+            color: #f02828;
+            line-height: 39rpx;
+          }
+        }
+
+        .right {
+          flex: 1;
+          font-size: 25rpx;
+          font-weight: 400;
+          color: #666666;
+          line-height: 39rpx;
+        }
+      }
+    }
+
+    .item {
+      margin: 0 auto;
+      margin-bottom: 28rpx;
+      width: 694rpx;
+      // height: 238rpx;
+      background: #ffffff;
+      border-radius: 14rpx 14rpx 14rpx 14rpx;
+      opacity: 1;
+      padding: 28rpx;
+
+      .top {
+        margin-bottom: 28rpx;
+        font-size: 25rpx;
+        font-family: PingFang SC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #333333;
+
+        &:before {
+          display: inline-block;
+          content: "账单详情";
+          width: 137rpx;
+          height: 49rpx;
+          line-height: 49rpx;
+          text-align: center;
+          background: #3274f9;
+          border-radius: 26rpx 26rpx 26rpx 26rpx;
+          color: #fff;
+          margin-right: 28rpx;
+        }
+      }
+
+      .bottom {
+        display: flex;
+        justify-content: space-between;
+
+        .text {
+          font-size: 25rpx;
+          font-weight: 400;
+          color: #999999;
+          line-height: 39rpx;
+
+          .t_item {
+            display: flex;
+
+            .t_title {
+              margin-bottom: 16rpx;
+              flex-shrink: 0 !important;
+            }
+
+            .tips {
+              font-size: 28rpx;
+              font-weight: 400;
+              color: #333333;
+            }
+          }
+        }
+
+        .price {
+          display: flex;
+          align-items: center;
+          font-size: 32rpx;
+          font-weight: 500;
+          color: #f02828;
+        }
+      }
+    }
+  }
+
+  .btn {
+    color: #fff;
+    border-radius: 100px;
+    text-align: center;
+    line-height: 84.21rpx;
+    margin: 0 auto;
+    margin-top: 84.21rpx;
+    width: 693.93rpx;
+    height: 84.21rpx;
+    background: #f02828;
+    box-shadow: 0px 9px 26px 1px #e9eff5;
+    position: fixed;
+    bottom: 0;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pages/users/order_list/relase.vue b/pages/users/order_list/relase.vue
new file mode 100644
index 0000000..4014b4e
--- /dev/null
+++ b/pages/users/order_list/relase.vue
@@ -0,0 +1,1313 @@
+	<template>
+		<view :style="viewColor">
+			<view class='my-order'>
+				<view class='header'>
+					<view class='picTxt acea-row row-between-wrapper'>
+						<view class='text'>
+							<view class='name'>委托订单信息</view>
+							<view>消费订单：{{orderData.orderCount || 0}} 总消费：￥{{orderData.orderPrice || 0}}</view>
+						</view>
+						<view class='pictrue'>
+							<image :src="`${domain}/static/images/orderTime.png`"></image>
+						</view>
+					</view>
+				</view>
+				<navigator class="search acea-row row-middle" url="/pages/users/order_list/search" hover-class="none">
+					<text class="iconfont icon-sousuo"></text>
+					搜索我的订单
+				</navigator>
+				<view class='nav acea-row row-around'>
+					<view class='item' :class='orderStatus==-1 ? "on": ""' @click="statusClick(-1)">
+						<view>全部</view>
+						<view class='num'>{{orderData.orderCount+len || 0}}</view>
+					</view>
+					<view class='item' :class='orderStatus==1? "on": ""' @click="statusClick(1)">
+						<view>待付款</view>
+						<view class='num'>{{orderData.noPay || 0}}</view>
+					</view>
+					<view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(2)">
+						<view>待发货</view>
+						<view class='num'>{{orderData.noPostage || 0}}</view>
+					</view>
+					<view class='item' :class='orderStatus==3? "on": ""' @click="statusClick(3)">
+						<view>待收货</view>
+						<view class='num '>{{orderData.noDeliver || 0}}</view>
+					</view>
+					<view class='item' :class='orderStatus==4 ? "on": ""' @click="statusClick(4)">
+						<view>待评价</view>
+						<view class='num'>{{orderData.noComment || 0}}</view>
+					</view>
+					<view class='item' :class='orderStatus==5 ? "on": ""' @click="statusClick(5)">
+						<view>售后/退款</view>
+						<view class='num'>{{len || 0}}</view>
+					</view>
+				</view>
+				<!--定金预售订单-->
+				<view v-if="presellProList.length > 0" class="event_container">
+					<navigator class="acea-row row-between" url="/pages/users/presell_order_list/index" hover-class='none'>
+						<view class="info">
+							<view class="title">预售尾款订单转到这里了！</view>
+							<view class="desc">有 <text class="t-color">{{ presellOrderCount }}</text> 笔预售尾款订单待付款，请点击查看
+							</view>
+						</view>
+						<view class="photo acea-row row-between">
+							<view class='picture'>
+								<image
+									:src='(presellProList[0].orderProduct[0].cart_info.productAttr && presellProList[0].orderProduct[0].cart_info.productAttr.image) || presellProList[0].orderProduct[0].cart_info.product.image'>
+								</image>
+							</view>
+							<view class="more_btn"><text class="iconfont icon-gengduo3"></text></view>
+						</view>
+					</navigator>
+				</view>
+				<view class='list'>
+					<!-- 代付款 -->
+					<view v-if="orderList.length > 0">
+						<block v-if="orderStatus == 0">
+							<view class='item' v-for="(item,index) in orderList" :key="index">
+								<view @click='goOrderDetails(item.group_order_id)'>
+									<view class='title acea-row row-between-wrapper'>
+										<view class="acea-row row-middle left-wrapper">
+											{{item.group_order_sn}}
+										</view>
+										<view class='t-color'>
+											{{ item.orderList[0].activity_type === 2 && item.orderList[0].orderProduct[0].cart_info.productPresell.presell_type ==2 ? "待付定金" : "待付款" }}
+										</view>
+									</view>
+									<view v-for="(order,j) in item.orderList" :key="order.order_id+j">
+										<!--预售-->
+										<view v-if="order.activity_type === 2">
+											<block v-for="(goods,g) in order.orderProduct">
+												<view class='item-info acea-row row-between row-top'>
+													<view class='pictrue'>
+														<image
+															:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+														</image>
+													</view>
+													<view class='text acea-row row-between'>
+														<view class='name line1'>
+															<text
+																class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
+															<view class="event_ship event_color">发货时间：
+																<!--全款预售-->
+																<text
+																	v-if="goods.cart_info.productPresell.presell_type === 1">
+																	{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
+																</text>
+																<!--定金预售-->
+																<text
+																	v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+															</view>
+														</view>
+														<view class='money'>
+															<view>￥{{goods.cart_info.productPresellAttr.presell_price}}
+															</view>
+															<view>x{{goods.product_num}}</view>
+														</view>
+													</view>
+													<view v-if="goods.cart_info.productPresell.presell_type === 2"
+														class="event_price">
+														定金待支付 <text class="t-color">￥{{ order.pay_price }}</text>
+														尾款待支付 <text
+															class="t-color">￥{{ order.presellOrder.pay_price }}</text>
+													</view>
+												</view>
+											</block>
+										</view>
+										<view v-else>
+											<block v-for="(goods,g) in order.orderProduct">
+												<view class='item-info acea-row row-between row-top'>
+													<view class='pictrue'>
+														<image
+															:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+														</image>
+													</view>
+													<view class='text acea-row row-between'>
+
+														<view class='name line2'>{{goods.cart_info.product.store_name}}
+														</view>
+
+														<view class='money' v-if="item.orderList[0].activity_type == 4">
+															<view v-if="goods.cart_info.activeSku">
+																￥{{goods.cart_info.activeSku.active_price}}</view>
+															<view>x{{goods.product_num}}</view>
+														</view>
+														<view v-else class='money'>
+															<view>￥{{goods.cart_info.productAttr.price}}</view>
+															<view>x{{goods.product_num}}</view>
+														</view>
+													</view>
+												</view>
+											</block>
+										</view>
+									</view>
+									<view class='totalPrice' v-if="item.orderList[0].activity_type !== 2">
+										共{{item.total_num || 0}}件商品，总金额
+										<text class='money p-color'>￥{{item.pay_price}}</text>
+									</view>
+									<view class='bottom acea-row row-right row-middle'>
+										<view class='bnt b-color'
+											@click.stop='goPay(item.pay_price,item.group_order_id,item.activity_type)'>
+											立即付款</view>
+									</view>
+								</view>
+							</view>
+						</block>
+						<!-- 待发货 待收货 待评价 已完成 -->
+						<block v-else>
+							<view class='item' v-for="(item,index) in orderList" :key="index">
+								<view @click='goOrderDetails(item.order_id)'>
+									<view class='title acea-row row-between-wrapper'>
+										<view class="acea-row row-middle left-wrapper" @click.stop="goMall(item)">
+											<text class="iconfont icon-shangjiadingdan"></text>
+											<view class="store-name">{{item.merchant.mer_name}}</view>
+											<text class="iconfont icon-xiangyou"></text>
+										</view>
+
+										<view v-if="item.order_status ==7" class='t-color'>
+											<text
+												v-if="item.order_type==1">{{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}</text>
+											<!-- <text v-else>待发货</text> -->
+										</view>
+
+
+										<view v-if="item.order_status == 2 " class='t-color'>待发货</view>
+										<view v-if="item.order_status == 1 " class='t-color'>待付款</view>
+										<view v-if="item.order_status == 3" class='t-color'>待收货</view>
+										<view v-if="item.order_status == 4" class='t-color'>待评价
+										</view>
+										<view v-if="item.order_status == 5" class='t-color'>已完成</view>
+										<view v-if="item.order_status == 6" class='t-color'>已退款</view>
+										<view v-if="item.order_status == 8 && item.pay_type == 8" class='t-color'>待结算
+										</view>
+										<view v-if="item.order_status == 9" class='t-color'>待商家确认</view>
+									</view>
+									<view v-if="item.activity_type === 2">
+										<view class='item-info acea-row row-between row-top'
+											v-for="(goods,index) in item.orderProduct" :key="index">
+											<view class='pictrue'>
+												<image
+													:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+												</image>
+											</view>
+											<view class='text acea-row row-between'>
+												<view class='name '>
+													<view class='name' :class="item.status === 0 ? 'line1' : 'line2'">
+														<text
+															class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
+														<view v-if="item.status == 0" class="event_ship event_color">发货时间：
+															<!--全款预售-->
+															<text
+																v-if="goods.cart_info.productPresell.presell_type === 1">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+															<!--定金预售-->
+															<text
+																v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+														</view>
+													</view>
+													<view style="margin-top: 10rpx;" class="t-color">
+														{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
+													</view>
+												</view>
+												<view class='money'>
+													<view>￥{{goods.cart_info.productPresellAttr.presell_price}}</view>
+													<view>x{{goods.product_num}}</view>
+												</view>
+											</view>
+										</view>
+									</view>
+									<view v-else>
+										<view class='item-info acea-row row-between row-top'
+											v-for="(goods,index) in item.orderProduct" :key="index">
+											<view class='pictrue'>
+												<image
+													:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+												</image>
+											</view>
+											<view class='text acea-row row-between'>
+												<view class='name '>
+													<view class='name line2'>
+														<text>{{goods.cart_info.product.store_name}}</text>
+													</view>
+													<view style="margin-top: 10rpx;" class="t-color">
+														{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
+													</view>
+												</view>
+												<view class='money' v-if="item.activity_type == 3">
+													<view v-if="goods.cart_info.productAssistAttr">
+														￥{{goods.cart_info.productAssistAttr.assist_price}}</view>
+													<view>x{{goods.product_num}}</view>
+												</view>
+												<view class='money' v-else-if="item.activity_type == 4">
+													<view v-if="goods.cart_info.activeSku">
+														￥{{goods.cart_info.activeSku.active_price}}</view>
+													<view>x{{goods.product_num}}</view>
+												</view>
+												<view class='money' v-else>
+													<view>￥{{goods.cart_info.productAttr.price}}</view>
+													<view>x{{goods.product_num}}</view>
+												</view>
+											</view>
+										</view>
+									</view>
+									<view class='totalPrice' v-if="item.activity_type == 2">共{{item.orderNum || 0}}件商品，总金额
+										<text class='money p-color'>￥{{item.presell_price}}</text>
+									</view>
+									<view class='totalPrice' v-else>共{{item.orderNum || 0}}件商品，总金额
+										<text class='money p-color'>￥{{item.pay_price}}</text>
+									</view>
+								</view>
+								<view class='bottom acea-row row-right row-middle'>
+									<!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
+										@click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
+									<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
+										<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
+									</block>
+									<block v-if="item.status == 1">
+										<view class='bnt cancelBnt'
+											v-if="item.delivery_type == 1 || item.delivery_type == 2"
+											@click='goOrderDetails(item.order_id)'>查看物流</view>
+										<view class='bnt b-color' @tap='confirmOrder(item,index)'
+											v-if='item.activity_type==98&&item.pay_type==8'>
+											确认收货
+										</view>
+										<view class='bnt b-color' v-else @tap='confirmOrdera(item,index)'>确认收货</view>
+									</block>
+
+									<block v-if="item.order_status == 1 ">
+
+										<view class='bnt b-color' v-if="item.status==12" @click.stop='dePay'>
+											去付款
+										</view>
+										<view class='bnt b-color' v-else
+											@click.stop='goPay(item.pay_price,item.group_order_id,item.activity_type)'>
+											去付款
+										</view>
+									</block>
+									<block v-if="item.order_status == 9 ">
+
+										<view class='bnt b-color' v-if="item.status==12" @click.stop='dePay'>
+											去付款
+										</view>
+										<view class='bnt b-color' v-else
+											@click.stop='goPay(item.pay_price,item.group_order_id,item.activity_type)'>
+											去付款
+										</view>
+									</block>
+									<block v-if="item.status == 2 ">
+										<!-- 	<navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
+										<text class="iconfont icon-fabu"></text>
+										发布种草
+									</navigator> -->
+
+										<view class='bnt b-color' v-if="item.order_status==8"
+											@click.stop='goPay(item.pay_price,item.group_order_id,item.activity_type)'>
+											去结算
+										</view>
+										<view v-else class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>
+											去评价
+										</view>
+									</block>
+									<block v-if="item.status == 3">
+										<view class='bnt b-color' @click='goOrderDetails(item.order_id)'
+											v-if="item.activity_type == 2 || item.activity_type == 3 || item.activity_type == 10">
+											查看详情</view>
+										<!-- <navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
+										<text class="iconfont icon-fabu"></text>
+										发布种草
+									</navigator> -->
+										<view class='bnt b-color' @click='goOrderDetails(item.order_id)' v-else>再次购买</view>
+									</block>
+								</view>
+							</view>
+						</block>
+					</view>
+				</view>
+				<view class='loadingicon acea-row row-center-wrapper' v-if="orderList.length>5">
+					<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+				</view>
+				<view v-if="orderList.length == 0 && page > 1">
+					<emptyPage title="暂无订单~"></emptyPage>
+				</view>
+			</view>
+			<home></home>
+			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+			<payment :payMode='payMode' :pay_close="pay_close" :order_type='order_type' @onChangeFun='onChangeFun'
+				:order_id="pay_order_id" :totalPrice='totalPrice'></payment>
+
+
+			<addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing>
+			<u-popup :show="receivingshow" bgColor='transparent' mode='center'>
+				<view class="warp">
+					<image @click="close" class="guanbi" src="@/static/images/guanbi.png"></image>
+					<image src="@/static/images/shouhuo.png" mode="widthFix"></image>
+				</view>
+				<view class="textp">
+					<h3>确认收到货了吗?</h3>
+					<span>此订单为先货后款订单，确认收货后将开始计算结算周期。为保障售后权益，请检查后再确认收货。</span>
+					<button class="shouhuobtn" @click="queding()">
+
+						确认
+					</button>
+					<view class="cle" @click="close">取消</view>
+				</view>
+			</u-popup>
+		</view>
+	</template>
+	<script>
+		// +----------------------------------------------------------------------
+		// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+		// +----------------------------------------------------------------------
+		// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+		// +----------------------------------------------------------------------
+		// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+		// +----------------------------------------------------------------------
+		// | Author: CRMEB Team <admin@crmeb.com>
+		// +----------------------------------------------------------------------
+		let app = getApp();
+		import {
+			getOrderList,
+			orderData,
+			unOrderCancel,
+			orderDel,
+			orderPay,
+			groupOrderList,
+			orderTake,
+			applyInvoiceApi,
+			refundList
+		} from '@/api/order.js';
+		import {
+			getUserInfo
+		} from '@/api/user.js';
+		import {
+			openOrderSubscribe
+		} from '@/utils/SubscribeMessage.js';
+		import payment from '@/components/payment';
+		import home from '@/components/home/index.vue';
+		import addInvoicing from '@/components/addInvoicing';
+		import {
+			mapGetters
+		} from "vuex";
+		import authorize from '@/components/Authorize';
+		import emptyPage from '@/components/emptyPage.vue';
+		import {
+			configMap
+		} from '@/utils'
+		import {
+			HTTP_REQUEST_URL
+		} from '@/config/app';
+		export default {
+			components: {
+				payment,
+				emptyPage,
+				home,
+				authorize,
+				addInvoicing
+			},
+			data() {
+				return {
+					loading: false, //是否加载中
+					loadend: false, //是否加载完毕
+					loadTitle: '加载更多', //提示语
+					orderList: [], //订单数组
+					presellProList: [], //定金预售订单
+					presellOrderCount: 0,
+					orderData: {}, //订单详细统计
+					orderStatus: 0, //订单状态
+					page: 1,
+					limit: 20,
+					receivingshow: false,
+					domain: HTTP_REQUEST_URL,
+					order_type: 0,
+					payMode: [{
+							name: "微信支付",
+							icon: "icon-weixinzhifu",
+							value: 'wechat',
+							title: '微信快捷支付',
+							payStatus: 1
+						},
+						{
+							name: "支付宝支付",
+							icon: "icon-zhifubao",
+							value: 'alipay',
+							title: '支付宝支付',
+							payStatus: this.$store.getters.globalData.alipay_open
+						},
+						{
+							name: "余额支付",
+							icon: "icon-yuezhifu",
+							value: 'balance',
+							title: '可用余额:',
+							number: 0,
+							payStatus: this.$store.getters.globalData.yue_pay_status
+						}
+					],
+					pay_close: false,
+					pay_order_id: '',
+					invoice_order_id: '',
+					totalPrice: '0',
+					order_id: 0,
+					isAuto: false, //没有授权的不会自动授权
+					isShowAuth: false, //是否隐藏授权
+					isReady: true,
+					invoice: {
+						invoice: false,
+						add: false,
+					},
+					len: 0
+				};
+			},
+			computed: {
+				...mapGetters(['isLogin', 'viewColor']),
+				...configMap(['hide_mer_status', 'community_status', 'alipay_open', 'yue_pay_status']),
+			},
+			watch: {
+				alipay_open(n) {
+					this.payMode[1].payStatus = n
+				},
+				yue_pay_status(n) {
+					this.payMode[2].payStatus = n
+				}
+			},
+			onShow() {
+				if (this.isLogin) {
+					this.page = 1;
+					this.loadend = false;
+					this.loading = false;
+					this.getOrderData();
+					this.getOrderList();
+					this.getUserInfo();
+					// this.getpreSellOrderList();
+				} else {
+					this.isAuto = true;
+					this.isShowAuth = true
+				}
+			},
+			onReady() {},
+			mounted: function() {
+				this.arrlist()
+			},
+			methods: {
+				arrlist() {
+
+					refundList({
+						product_type: 98,
+						type: 0,
+						page: 1,
+						limit: 1500
+
+					}).then(res => {
+						this.len = res.data.list.length
+					})
+				},
+				// 后退
+				returns() {
+					uni.navigateBack()
+				},
+				// 首页
+				goHome() {
+					uni.switchTab({
+						url: '/pages/index/index'
+					});
+				},
+				// 去商铺
+				goMall(item) {
+					if (this.hide_mer_status == 0) {
+						uni.navigateTo({
+							url: '/pages/store/home/index?id=' + item.mer_id
+						})
+					}
+				},
+				onLoadFun() {
+					this.isShowAuth = false;
+					this.getOrderData();
+					this.getOrderList();
+					this.getUserInfo();
+				},
+				// 授权关闭
+				authColse: function(e) {
+					this.isShowAuth = e
+				},
+				/**
+				 * 事件回调
+				 *
+				 */
+				onChangeFun: function(e) {
+					let opt = e;
+					let action = opt.action || null;
+					let value = opt.value != undefined ? opt.value : null;
+					(action && this[action]) && this[action](value);
+				},
+				/**
+				 * 获取用户信息
+				 *
+				 */
+				getUserInfo: function() {
+					let that = this;
+					getUserInfo().then(res => {
+						that.payMode[2].number = res.data.now_money;
+						// that.$set(that, 'payMode', that.payMode);
+					});
+				},
+				/**
+				 * 关闭支付组件
+				 *
+				 */
+				payClose: function() {
+					this.pay_close = false;
+				},
+				/**
+				 * 生命周期函数--监听页面加载
+				 */
+				onLoad: function(options) {
+					if (options.status) this.orderStatus = options.status;
+				},
+				/**
+				 * 获取订单统计数据
+				 *
+				 */
+				getOrderData: function() {
+					let that = this;
+					orderData({
+						product_type: 98
+					}).then(res => {
+						// console.log(res.data)
+						that.$set(that, 'orderData', res.data);
+					})
+				},
+				/**
+				 * 取消订单
+				 *
+				 */
+				cancelOrder: function(index, order_id) {
+					let that = this;
+					if (!order_id) return that.$util.Tips({
+						title: '缺少订单号无法取消订单'
+					});
+					unOrderCancel(order_id).then(res => {
+						return that.$util.Tips({
+							title: res.message,
+							icon: 'success'
+						}, function() {
+							that.orderList.splice(index, 1);
+							that.$set(that, 'orderList', that.orderList);
+							that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1);
+							that.getOrderData();
+						});
+					}).catch(err => {
+						return that.$util.Tips({
+							title: err
+						});
+					});
+				},
+				/**
+				 * 打开支付组件
+				 *
+				 */
+				goPay: function(pay_price, order_id, order_type) {
+					this.$set(this, 'pay_close', true);
+					this.order_id = order_id;
+					this.pay_order_id = order_id.toString()
+					this.$set(this, 'totalPrice', pay_price);
+					this.order_type = order_type
+				},
+				/**
+				 * 支付成功回调
+				 *
+				 */
+				pay_complete: function() {
+					this.loadend = false;
+					this.page = 1;
+					this.$set(this, 'orderList', []);
+					this.pay_close = false;
+					this.pay_order_id = '';
+					this.getOrderData();
+					this.getOrderList();
+				},
+				/**
+				 * 支付失败回调
+				 *
+				 */
+				pay_fail: function() {
+					this.pay_close = false;
+					this.pay_order_id = '';
+				},
+				/**
+				 * 去订单详情
+				 */
+				goOrderDetails: function(order_id) {
+
+
+					let self = this
+					if (!order_id) return that.$util.Tips({
+						title: '缺少订单号无法查看订单详情'
+					});
+					// #ifdef MP
+					uni.showLoading({
+						title: '正在加载',
+					})
+					console.log(self.orderStatus)
+					openOrderSubscribe().then(() => {
+						uni.hideLoading();
+						if (self.orderStatus == 0) {
+							uni.navigateTo({
+								url: '/pages/order_details/stay?order_id=' + order_id
+							})
+						} else {
+							uni.navigateTo({
+								url: '/pages/order_details/index?order_id=' + order_id
+							})
+						}
+					}).catch(() => {
+						uni.hideLoading();
+					})
+					// #endif
+					// #ifndef MP
+					if (self.orderStatus == 0) {
+						uni.navigateTo({
+							url: '/pages/order_details/stay?order_id=' + order_id
+						})
+					} else {
+						uni.navigateTo({
+							url: '/pages/order_details/index?order_id=' + order_id
+						})
+					}
+					// #endif
+				},
+				/**
+				 * 提示
+				 */
+				dePay() {
+					
+					uni.showModal({
+						title: '提示',
+					title: '该订单属于先货后款的订单，等商户确认后才能支付',
+						success: function (res) {
+							if (res.confirm) {
+								console.log('用户点击确定');
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+					
+				},
+				/**
+				 * 点击去评价
+				 */
+				goOrderDetails_Evaluation: function(order_id) {
+					let self = this
+					if (!order_id) return that.$util.Tips({
+						title: '缺少订单号无法查看订单详情和评价'
+					});
+					// #ifdef MP
+					if (self.orderStatus == 0) {
+						uni.navigateTo({
+							url: '/pages/order_details/stay?order_id=' + order_id
+						})
+					} else {
+						uni.navigateTo({
+							url: '/pages/order_details/index?order_id=' + order_id
+						})
+					}
+					// #endif
+					// #ifndef MP
+					if (self.orderStatus == 0) {
+						uni.navigateTo({
+							url: '/pages/order_details/stay?order_id=' + order_id
+						})
+					} else {
+						uni.navigateTo({
+							url: '/pages/order_details/index?order_id=' + order_id
+						})
+					}
+					// #endif
+				},
+				/**
+				 * 切换类型
+				 */
+				statusClick: function(status) {
+
+					if (status == 5) {
+						uni.navigateTo({
+							url: '/pages/users/refund/list?type=0'
+						})
+					} else {
+						if (status == this.orderStatus) return;
+						this.orderStatus = status;
+						this.loadend = false;
+						this.loading = false;
+						this.page = 1;
+						this.$set(this, 'orderList', []);
+						this.getOrderList();
+					}
+				},
+				/**
+				 * 获取订单列表
+				 */
+				getOrderList: function() {
+					let that = this;
+					if (that.loadend) return;
+					if (that.loading) return;
+					that.loading = true;
+					that.loadTitle = "加载更多";
+					if (that.isReady) {
+						that.isReady = false
+						if (that.orderStatus == 0) {
+							groupOrderList({
+								page: that.page,
+								limit: that.limit,
+								product_type: 98
+							}).then(res => {
+								that.isReady = true;
+								let list = res.data.list || [];
+								let loadend = list.length < that.limit;
+								// console.log(that.orderList)
+								that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that
+									.orderList);
+								that.$set(that, 'orderList', that.orderList);
+								// console.log(that.orderList)
+								that.getProductCount();
+								that.loadend = loadend;
+								that.loading = false;
+								that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
+								that.page = that.page + 1
+							})
+						} else {
+							let arr;
+							if (that.orderStatus > -1) {
+								arr = that.orderStatus
+							} else {
+								arr = ''
+							}
+							getOrderList({
+								status: arr,
+								page: that.page,
+								limit: that.limit,
+								product_type: 98
+							}).then(res => {
+								let list = res.data.list || [];
+								let loadend = list.length < that.limit;
+								that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that
+									.orderList);
+								that.$set(that, 'orderList', that.orderList);
+								that.getProductCount();
+								that.loadend = loadend;
+								that.loading = false;
+								that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
+								that.page = that.page + 1;
+								that.isReady = true;
+							}).catch(err => {
+								that.loading = false;
+								that.loadTitle = "加载更多";
+							})
+						}
+					}
+				},
+				/**
+				 * 获取定金预售订单列表
+				 */
+				getpreSellOrderList: function() {
+					let that = this;
+					getOrderList({
+						status: 10,
+						page: 1,
+						limit: 1,
+					}).then(res => {
+						let list = res.data.list || [];
+						that.presellOrderCount = res.data.count;
+						that.$set(that, 'presellProList', list);
+					})
+				},
+				/**
+				 * 获取单个订单商品数量
+				 */
+				getProductCount: function() {
+					if (this.orderStatus !== 0) {
+						this.orderList.forEach((item, i) => {
+							let orderNum = 0
+							if (item.orderProduct) {
+								item.orderProduct.forEach((val) => {
+									orderNum += val.product_num
+								})
+								this.orderList[i]['orderNum'] = orderNum;
+							}
+						})
+					}
+				},
+				/**
+				 * 删除订单
+				 */
+				delOrder: function(order_id, index) {
+					let that = this;
+					orderDel(order_id).then(res => {
+						that.orderList.splice(index, 1);
+						that.$set(that, 'orderList', that.orderList);
+						that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1);
+						that.getOrderData();
+						return that.$util.Tips({
+							title: '删除成功',
+							icon: 'success'
+						});
+					}).catch(err => {
+						return that.$util.Tips({
+							title: err
+						});
+					})
+				},
+				close() {
+					this.receivingshow = false
+				},
+				//收货弹窗
+				confirmOrder: function(item) {
+					console.log(item)
+					this.order_id = item.order_id
+					this.receivingshow = true
+
+				},
+				queding() {
+
+					let that = this;
+					orderTake(that.order_id).then(res => {
+						this.receivingshow = false
+						return that.$util.Tips({
+							title: '成功收货',
+							icon: 'success'
+						}, function() {
+
+							that.getOrderInfo();
+						});
+					}).catch(err => {
+						this.receivingshow = false
+						return that.$util.Tips({
+							title: err
+						});
+					})
+
+
+
+				},
+
+				// 确认收货
+				confirmOrdera: function(item, index) {
+					let that = this;
+					uni.showModal({
+						title: '确认收货',
+						content: '为保障权益，请收到货确认无误后，再确认收货',
+						success: function(res) {
+							if (res.confirm) {
+								orderTake(item.order_id).then(res => {
+									return that.$util.Tips({
+										title: '操作成功',
+										icon: 'success'
+									}, function() {
+										that.orderList.splice(index, 1);
+										that.getOrderData();
+									});
+								}).catch(err => {
+									return that.$util.Tips({
+										title: err
+									});
+								})
+							}
+						}
+					})
+				},
+				/*申请开票*/
+				applyInvoice(order_id) {
+					let that = this;
+					that.invoice_order_id = order_id
+					that.invoice.invoice = true;
+					that.$refs.addInvoicing.getInvoiceDefault();
+					that.$refs.addInvoicing.getInvoiceList();
+				},
+				// 关闭发票弹窗
+				changeInvoiceClose: function(data) {
+					if (data) this.getInvoiceData(data);
+					this.$set(this.invoice, 'invoice', false);
+				},
+				// 开票回调
+				getInvoiceData(data) {
+					let that = this
+					applyInvoiceApi(that.invoice_order_id, data).then(res => {
+						return that.$util.Tips({
+							title: res.message,
+						});
+					}).catch(err => {
+						return that.$util.Tips({
+							title: err
+						});
+					})
+				}
+			},
+			onReachBottom: function() {
+				this.getOrderList();
+			}
+		}
+	</script>
+
+	<style scoped lang="scss">
+		.warp {
+			margin: auto;
+
+			.guanbi {
+				position: absolute;
+				right: 0px;
+				top: 120rpx;
+				z-index: 1;
+				width: 30px;
+				height: 30px;
+			}
+		}
+
+		.textp {
+			width: 320px;
+			padding-bottom: 20px;
+			position: absolute;
+			top: 110px;
+			border-radius: 10px;
+
+			span {
+				display: block;
+				width: 280px;
+				padding-top: 20px;
+				margin: auto;
+			}
+
+			h3 {
+				text-align: center;
+			}
+
+			.shouhuobtn {
+				margin: auto;
+				line-height: 54px;
+				margin-top: 30px;
+				width: 191px;
+				height: 54px;
+				color: white;
+				background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
+				border-radius: 27px 27px 27px 27px;
+			}
+
+			.cle {
+				margin: auto;
+				text-align: center;
+				margin-top: 15px;
+				height: 40px;
+				background-color: #FFFFFF;
+				border-radius: 10px;
+				color: #999999;
+			}
+		}
+
+		.head-menu {
+			height: 50rpx;
+			padding-left: 20rpx;
+			line-height: 50rpx;
+			font-weight: bold;
+		}
+
+		.my-order .header {
+			height: 260rpx;
+			padding: 0 30rpx;
+			background-color: var(--view-theme);
+		}
+
+		.t-color {
+			color: var(--view-theme);
+		}
+
+		.p-color {
+			color: var(--view-priceColor);
+		}
+
+		.b-color {
+			background-color: var(--view-theme);
+		}
+
+		.my-order .header .picTxt {
+			height: 190rpx;
+		}
+
+		.my-order .header .picTxt .text {
+			color: rgba(255, 255, 255, 0.8);
+			font-size: 26rpx;
+			// font-family: 'Guildford Pro';
+		}
+
+		.my-order .header .picTxt .text .name {
+			font-size: 34rpx;
+			font-weight: bold;
+			color: #fff;
+			margin-bottom: 20rpx;
+		}
+
+		.my-order .header .picTxt .pictrue {
+			width: 122rpx;
+			height: 109rpx;
+		}
+
+		.my-order .header .picTxt .pictrue image {
+			width: 100%;
+			height: 100%;
+		}
+
+		.my-order .nav {
+			background-color: #fff;
+			width: 690rpx;
+			height: 140rpx;
+			border-radius: 16rpx;
+			margin: 20rpx auto 0 auto;
+		}
+
+		.my-order .nav .item {
+			text-align: center;
+			font-size: 26rpx;
+			color: #282828;
+			padding: 29rpx 0;
+		}
+
+		.my-order .nav .item.on {
+			font-weight: bold;
+			border-bottom: 5rpx solid var(--view-theme);
+		}
+
+		.my-order .nav .item .num {
+			margin-top: 18rpx;
+		}
+
+		.my-order .list {
+			width: 690rpx;
+			margin: 14rpx auto 0 auto;
+		}
+
+		.my-order .list .item {
+			background-color: #fff;
+			border-radius: 16rpx;
+			margin-bottom: 14rpx;
+		}
+
+		.my-order .list .item .title {
+			height: 84rpx;
+			padding: 0 30rpx;
+			border-bottom: 1px solid #eee;
+			font-size: 28rpx;
+			color: #282828;
+
+			.left-wrapper {
+				.iconfont {
+					margin-top: 5rpx;
+				}
+
+				.store-name {
+					margin: 0 10rpx;
+				}
+
+				.icon-xiangyou {
+					font-size: 20rpx;
+				}
+			}
+		}
+
+		.my-order .list .item .title .sign {
+			font-size: 24rpx;
+			padding: 0 7rpx;
+			height: 36rpx;
+			margin-right: 15rpx;
+		}
+
+		.my-order .list .item .item-info {
+			padding: 0 30rpx;
+			margin-top: 22rpx;
+		}
+
+		.my-order .list .item .item-info .pictrue {
+			width: 120rpx;
+			height: 120rpx;
+		}
+
+		.my-order .list .item .item-info .pictrue image {
+			width: 100%;
+			height: 100%;
+			border-radius: 6rpx;
+		}
+
+		.my-order .list .item .item-info .text {
+			width: 486rpx;
+			font-size: 28rpx;
+			color: #999;
+			margin-top: 6rpx;
+		}
+
+		.my-order .list .item .item-info .text .name {
+			width: 320rpx;
+			color: #282828;
+		}
+
+		.event_bg {
+			background: #FF7F00;
+		}
+
+		.event_color {
+			color: #FF7F00;
+		}
+
+		.my-order .list .item .event_name {
+			display: inline-block;
+			margin-right: 9rpx;
+			color: #fff;
+			font-size: 20rpx;
+			padding: 0 8rpx;
+			line-height: 30rpx;
+			text-align: center;
+			border-radius: 6rpx;
+		}
+
+		.my-order .list .item .event_ship {
+			font-size: 20rpx;
+			margin-top: 10rpx;
+		}
+
+		.my-order .list .event_price {
+			margin: 0 0 50rpx 120rpx;
+		}
+
+		.my-order .list .item .item-info .text .money {
+			text-align: right;
+		}
+
+		.my-order .list .item .totalPrice {
+			font-size: 26rpx;
+			color: #282828;
+			text-align: right;
+			margin: 27rpx 0 0 30rpx;
+			padding: 0 30rpx 30rpx 0;
+		}
+
+		.my-order .list .item .totalPrice .money {
+			font-size: 28rpx;
+			font-weight: bold;
+		}
+
+		.my-order .list .item .bottom {
+			height: 107rpx;
+			padding: 0 30rpx;
+			border-top: 1px solid #f0f0f0;
+		}
+
+		.my-order .list .item .bottom .bnt {
+			width: 176rpx;
+			height: 60rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #fff;
+			border-radius: 50rpx;
+			font-size: 27rpx;
+		}
+
+		.my-order .list .item .bottom .bnt.cancelBnt {
+			border: 1px solid #ddd;
+			color: #aaa;
+		}
+
+		.my-order .list .item .bottom .bnt.colorBnt {
+			border: 1px solid var(--view-theme);
+			color: var(--view-theme);
+		}
+
+		.my-order .list .item .bottom .bnt .icon-fabu {
+			font-size: 26rpx;
+			margin-right: 10rpx;
+		}
+
+		.my-order .list .item .bottom .bnt~.bnt {
+			margin-left: 17rpx;
+		}
+
+		.noCart {
+			margin-top: 171rpx;
+			padding-top: 0.1rpx;
+		}
+
+		.noCart .pictrue {
+			width: 414rpx;
+			height: 336rpx;
+			margin: 78rpx auto 56rpx auto;
+		}
+
+		.noCart .pictrue image {
+			width: 100%;
+			height: 100%;
+		}
+
+		.event_container {
+			width: 690rpx;
+			background-image: url(../static/images/presell_orderBg.png);
+			background-size: cover;
+			background-repeat: no-repeat;
+			margin: 20rpx auto;
+			padding: 26rpx 30rpx;
+			border-radius: 16rpx;
+
+			.info {
+				width: 420rpx;
+
+				.title {
+					color: #282828;
+					font-size: 26rpx;
+				}
+
+				.desc {
+					color: #999;
+					font-size: 24rpx;
+					margin-top: 30rpx;
+				}
+			}
+
+			.photo {
+				width: 180rpx;
+
+				.picture {
+					width: 120rpx;
+					height: 120rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+						border-radius: 8rpx;
+					}
+				}
+
+				.more_btn {
+					color: #fff;
+					background: #F97E3B;
+					width: 40rpx;
+					height: 40rpx;
+					border-radius: 40rpx;
+					text-align: center;
+					line-height: 40rpx;
+					position: relative;
+					top: 40rpx;
+
+					text {
+						font-size: 20rpx;
+					}
+				}
+			}
+		}
+
+		.search {
+			height: 70rpx;
+			padding: 0 30rpx;
+			border-radius: 35rpx;
+			margin: -35rpx 30rpx 0;
+			background-color: #FFFFFF;
+			font-size: 26rpx;
+			color: #999999;
+
+			.iconfont {
+				margin-right: 10rpx;
+				font-size: 23rpx;
+			}
+		}
+	</style>
\ No newline at end of file
diff --git a/static/images/bubble.png b/static/images/bubble.png
new file mode 100644
index 0000000000000000000000000000000000000000..3509978c95e0e86bf4d13362a8a9a17cd0560257
GIT binary patch
literal 2425
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
bPayN6+uQ8>Mb+?K3gL0U*R5_p>HPlzrFK^T

literal 0
HcmV?d00001

diff --git a/static/images/relase.png b/static/images/relase.png
new file mode 100644
index 0000000000000000000000000000000000000000..a35dc02065a892fd088d8340a8c0609f6fdb3998
GIT binary patch
literal 1815
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
FV1gwaT~Po4

literal 0
HcmV?d00001