修改问题

src/pages/cash/index.vue

@@ -74,7 +74,7 @@ export default {
   methods: {
     getExolain(){
       post('/withdrawdesc').then(res => {
-        console.log(res,"qqqqqqqqqq");
+        this.show = res.data.data[0]
       })
     },
     onSubForm() {

src/pages/course/index.vue

@@ -3,7 +3,6 @@
 		<!-- 用户须知 -->
 		<jyf-parser :html="content" class="mar_t50"></jyf-parser>
 		<!-- 用户须知-end -->
-		<!-- <view  class="mar_t50" v-html="content"></view> -->
 	</view>
 </template>
 
@@ -25,12 +24,9 @@ import jyfParser from '@/components/jyf-parser/jyf-parser.vue'
 		},
 		methods:{
 			loadData(){
-				let data = {
-					type:3
-				}
-				post("/my/article",data).then(res => {
-				  if (res.code == 0) {
-				    this.content = res.data.data.content
+				post("ShuZiTeaYW/shop/newTutorial").then(res => {
+				  if (res.status == 200) {
+				    this.content = res.data.content
 					console.log(this.content)
 				    // this.BannerImg = res.list;
 				  }

src/pages/my/index.vue

@@ -1,175 +1,113 @@
 <template>
-  <view class="container">
-    <view
-      class="content"
-      :style="userinfo.is_authentication == 1 ? 'padding-top:30rpx;' : ''"
-    >
-      <!-- 用户信息 -->
-      <view class="uerInfo mar_t16 flex_r">
-        <view class="user_img">
-          <image
-            class="image"
-            :src="
+	<view class="container">
+		<view class="content" :style="userinfo.is_authentication == 1 ? 'padding-top:30rpx;' : ''">
+			<!-- 用户信息 -->
+			<view class="uerInfo mar_t16 flex_r">
+				<view class="user_img" @click="login">
+					<image class="image" :src="
               userinfo && userinfo.head_pic != ''
                 ? userinfo.head_pic
                 : 'https://tea.soowin.com/mnt/image/m_avar.jpg'
-            "
-            mode=""
-          ></image>
-          <view
-            class="coupon_info flex_r flex_ac"
-            v-if="isShiMing"
-            @tap="goToAutonym"
-          >
-            完成实名认证，享受更多权益
-            <image
-              src="/static/my/f_close.png"
-              mode="widthFix"
-              class="close_icon"
-              @tap.stop="closeAuto"
-            ></image>
-            <view class="sj_icon"></view>
-          </view>
-        </view>
-        <block v-if="userinfo && userinfo != ''">
-          <view class="user_con flex_c">
-            <view class="user_name flex_r flex_ae ellipsis"
-              >{{ userinfo.nickname
-              }}<text
-                >({{
+            " mode=""></image>
+					<view class="coupon_info flex_r flex_ac" v-if="isShiMing" @tap="goToAutonym">
+						完成实名认证，享受更多权益
+						<image src="/static/my/f_close.png" mode="widthFix" class="close_icon" @tap.stop="closeAuto">
+						</image>
+						<view class="sj_icon"></view>
+					</view>
+				</view>
+				<block v-if="userinfo && userinfo != ''">
+					<view class="user_con flex_c">
+						<view class="user_name flex_r flex_ae ellipsis" @click="login">{{ userinfo.nickname
+              }}<text>({{
                   userinfo.is_authentication == 0 ? "未实名" : "已实名"
-                }})</text
-              ></view
-            >
-            <view class="flex_r flex_ac">
-              <view class="user_level flex_r mar_t10">
-                <image
-                  class="level_img"
-                  src="/static/my/huangguan.png"
-                  mode=""
-                ></image>
-                <view class="level_text">{{ userinfo.level_name }}</view>
-              </view>
-            </view>
-            <view class="user_account flex_r flex_ac mar_t10">
-              <view class="account">账号：{{ userinfo.mobile }}</view>
-              <view
-                class="copy_account flex_r flex_ac flex_jc"
-                @tap="copyText(userinfo.mobile)"
-                >复制</view
-              >
-            </view>
-          </view>
-          <view class="user_option flex_r flex_ac">
-            <image
-              class="code_img"
-              src="/static/my/f_img_code.png"
-              @tap="getImgPage"
-              mode=""
-            ></image>
-            <image
+                }})</text></view>
+						<view class="flex_r flex_ac">
+							<view class="user_level flex_r mar_t10">
+								<image class="level_img" src="/static/my/huangguan.png" mode=""></image>
+								<view class="level_text">{{ userinfo.level_name }}</view>
+							</view>
+						</view>
+						<view class="user_account flex_r flex_ac mar_t10">
+							<view class="account">账号：{{ userinfo.mobile }}</view>
+							<view class="copy_account flex_r flex_ac flex_jc" @tap="copyText(userinfo.mobile)">复制</view>
+						</view>
+					</view>
+					<view class="user_option flex_r flex_ac">
+						<image class="code_img" src="/static/my/f_img_code.png" @tap="getImgPage" mode=""></image>
+						<!--            <image
               class="code_img"
               src="/static/my/setting.png"
               @tap="getToSetting"
               mode=""
-            ></image>
-          </view>
-        </block>
-        <block v-else>
-          <view class="user_con flex_c flex_jb">
-            <view class="user_name flex_r flex_ae ellipsis">点此处登录</view>
-          </view>
-        </block>
-      </view>
-      <!-- 用户信息-end -->
-
-      <!-- 账户信息 -->
-      <view class="acc_info">
-        <view class="acc_head flex_r flex_ac flex_jb">
-          <view class="acc_price"
-            >账号余额￥<text>{{ userinfo.user_money }}</text></view
-          >
-          <view class="C flex_r flex_ac">
-            <navigator
-              class="recharge flex_r flex_ac flex_jc"
-              url="/pages/top-up/index"
-              hover-class="none"
-              >充值</navigator
-            >
-            <view class="withdraw flex_r flex_ac flex_jc" @tap="getToCash"
-              >提现</view
-            >
-          </view>
-        </view>
-        <view class="info_con flex_r flex_jb">
-          <view class="info_list flex_c flex_jb">
-            <view class="list_name">昨日收益(元)</view>
-            <view class="list_text">{{ userinfo.yesterdayProfit || 0 }}</view>
-          </view>
-          <view class="info_list flex_c flex_jb" @tap="getToAccMoney">
-            <view class="list_name">积分</view>
-            <view class="list_text">{{ userinfo.integral || 0 }}</view>
-          </view>
-          <!-- 					<view class="info_list flex_c flex_jb" @tap="getToBean">
+            ></image> -->
+					</view>
+				</block>
+				<block v-else>
+					<view class="user_con flex_c flex_jb">
+						<view class="user_name flex_r flex_ae ellipsis">点此处登录</view>
+					</view>
+				</block>
+			</view>
+			<!-- 用户信息-end -->
+
+			<!-- 账户信息 -->
+			<view class="acc_info">
+				<view class="acc_head flex_r flex_ac flex_jb">
+					<view class="acc_price">账号余额￥<text>{{ userinfo.user_money }}</text></view>
+					<view class="C flex_r flex_ac">
+						<navigator class="recharge flex_r flex_ac flex_jc" url="/pages/top-up/index" hover-class="none">
+							充值</navigator>
+						<view class="withdraw flex_r flex_ac flex_jc" @tap="getToCash">提现</view>
+					</view>
+				</view>
+				<view class="info_con flex_r flex_jb">
+					<view class="info_list flex_c flex_jb">
+						<view class="list_name">昨日收益(元)</view>
+						<view class="list_text">{{ userinfo.yesterdayProfit || 0 }}</view>
+					</view>
+					<view class="info_list flex_c flex_jb" @tap="getToAccMoney">
+						<view class="list_name">积分</view>
+						<view class="list_text">{{ userinfo.integral || 0 }}</view>
+					</view>
+					<!-- 					<view class="info_list flex_c flex_jb" @tap="getToBean">
 						<view class="list_name">拼豆</view>
 						<view class="list_text">{{userInfoAccount.accountBean}}</view>
 					</view> -->
-          <view class="info_list flex_c flex_jb" @tap="getToTeaList">
-            <view class="list_name">茶友(人)</view>
-            <view class="list_text">{{ userinfo.friends || 0 }}</view>
-          </view>
-        </view>
-        <view class="acc_hint mar_t50" @tap="SetHint"
-          >如何快速晋升茶友等级？看这里>></view
-        >
-      </view>
-      <!-- 账户信息-end -->
-    </view>
-
-    <!-- 功能列表 -->
-    <view class="fun_container">
-      <view class="fun mar_t30">
-        <view class="fun_title">我的账户</view>
-        <view class="fun_con mar_t50 flex_r flex_ac flex_jb">
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/top-up/index"
-            hover-class="none"
-          >
-            <image
-              class="fun_img"
-              src="/static/my/recharge.png"
-              mode=""
-            ></image>
-            <view class="fun_text">充值</view>
-          </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/account/wealth"
-            hover-class="none"
-          >
-            <image class="fun_img" src="/static/my/wealth.png" mode=""></image>
-            <view class="fun_text">财富</view>
-          </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/account/consignment"
-            hover-class="none"
-          >
-            <image class="fun_img" src="/static/my/consign.png" mode=""></image>
-            <view class="fun_text">寄售</view>
-          </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/account/giveAsPresent"
-            hover-class="none"
-          >
-            <image class="fun_img" src="/static/my/give.png" mode=""></image>
-            <view class="fun_text">赠送</view>
-          </navigator>
-        </view>
-      </view>
-      <!-- <view class="fun mar_t30">
+					<view class="info_list flex_c flex_jb" @tap="getToTeaList">
+						<view class="list_name">茶友(人)</view>
+						<view class="list_text">{{ userinfo.friends || 0 }}</view>
+					</view>
+				</view>
+				<view class="acc_hint mar_t50" @tap="SetHint">如何快速晋升茶友等级？看这里>></view>
+			</view>
+			<!-- 账户信息-end -->
+		</view>
+
+		<!-- 功能列表 -->
+		<view class="fun_container">
+			<view class="fun mar_t30">
+				<view class="fun_title">我的账户</view>
+				<view class="fun_con mar_t50 flex_r flex_ac flex_jb">
+					<navigator class="fun_list flex_c flex_ac" url="/pages/top-up/index" hover-class="none">
+						<image class="fun_img" src="/static/my/recharge.png" mode=""></image>
+						<view class="fun_text">充值</view>
+					</navigator>
+					<navigator class="fun_list flex_c flex_ac" url="/pages/account/wealth" hover-class="none">
+						<image class="fun_img" src="/static/my/wealth.png" mode=""></image>
+						<view class="fun_text">财富</view>
+					</navigator>
+					<navigator class="fun_list flex_c flex_ac" url="/pages/account/consignment" hover-class="none">
+						<image class="fun_img" src="/static/my/consign.png" mode=""></image>
+						<view class="fun_text">寄售</view>
+					</navigator>
+					<navigator class="fun_list flex_c flex_ac" url="/pages/account/giveAsPresent" hover-class="none">
+						<image class="fun_img" src="/static/my/give.png" mode=""></image>
+						<view class="fun_text">赠送</view>
+					</navigator>
+				</view>
+			</view>
+			<!-- <view class="fun mar_t30">
         <view class="fun_title">拼团管理</view>
         <view class="fun_con mar_t50 flex_r flex_ac flex_jb">
           <navigator
@@ -222,614 +160,618 @@
           </navigator>
         </view>
       </view> -->
-      <view class="fun mar_t30">
-        <view class="fun_title">账户明细</view>
-        <view class="fun_con mar_t50 flex_r flex_ac flex_jb">
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/accountDetails/running"
-            hover-class="none"
-          >
-            <image class="fun_img" src="/static/my/fund.png" mode=""></image>
-            <view class="fun_text">流水明细</view>
-          </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/accountDetails/withdraw"
-            hover-class="none"
-          >
-            <image
-              class="fun_img"
-              src="/static/my/withdraw.png"
-              mode=""
-            ></image>
-            <view class="fun_text">提现明细</view>
-          </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/accountDetails/topup"
-            hover-class="none"
-          >
-            <image class="fun_img" src="/static/my/topup.png" mode=""></image>
-            <view class="fun_text">充值明细</view>
-          </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/accountDetails/integral"
-            hover-class="none"
-          >
-            <image
-              class="fun_img"
-              src="/static/my/inte-list.png"
-              mode=""
-            ></image>
-            <view class="fun_text">积分明细</view>
-          </navigator>
-        </view>
-      </view>
-      <view class="fun mar_t30">
-        <view class="fun_title flex_r flex_ac flex_jb"
-          >我的订单
-          <navigator
-            class="more flexr flex_ac"
-            url="/pages/szw-order-list/index?status=1"
-            hover-class="none"
-            >全部订单
-            <image class="more_img" src="/static/my/more.png" mode=""></image>
-          </navigator>
-        </view>
-        <view class="fun_con mar_t50 flex_r flex_ac flex_jb">
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/szw-order-list/index?status=2"
-            hover-class="none"
-          >
-            <image class="fun_img" src="/static/my/payment.png" mode=""></image>
-            <view class="fun_text">待付款</view>
-          </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/szw-order-list/index?status=3"
-            hover-class="none"
-          >
-            <image class="fun_img" src="/static/my/deliver.png" mode=""></image>
-            <view class="fun_text">待发货</view>
-          </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/szw-order-list/index?status=4"
-            hover-class="none"
-          >
-            <image class="fun_img" src="/static/my/take.png" mode=""></image>
-            <view class="fun_text">待收货</view>
-          </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/szw-order-list/index?status=5"
-            hover-class="none"
-          >
-            <image
-              class="fun_img"
-              src="/static/my/evaluate.png"
-              mode=""
-            ></image>
-            <view class="fun_text">待评价</view>
-          </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/order-refund-list/index?status=5"
-            hover-class="none"
-          >
-            <image class="fun_img" src="/static/my/refund.png" mode=""></image>
-            <view class="fun_text">退换货</view>
-          </navigator>
-        </view>
-      </view>
-      <view class="fun mar_t30">
-        <view class="fun_title">我的服务</view>
-        <view class="fun_con mar_t50 flex_r flex_ac flex_jb">
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/about/index"
-            hover-class="none"
-          >
-            <image class="fun_img" src="/static/my/about.png" mode=""></image>
-            <view class="fun_text">关于我们</view>
-          </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/notice/index"
-            hover-class="none"
-          >
-            <image
-              class="fun_img"
-              src="/static/my/feedback.png"
-              mode=""
-            ></image>
-            <view class="fun_text">用户须知</view>
-          </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/course/index"
-            hover-class="none"
-          >
-            <image class="fun_img" src="/static/my/green.png" mode=""></image>
-            <view class="fun_text">新手教程</view>
-          </navigator>
-          <view class="fun_list flex_c flex_ac">
-            <button
-              open-type="contact"
-              style="background: #fff; border: 0; line-height: 1; padding: 0"
-            >
-              <image
-                class="fun_img"
-                src="/static/my/service.png"
-                mode=""
-              ></image>
-              <view class="fun_text">在线客服</view>
-            </button>
-          </view>
-        </view>
-      </view>
-    </view>
-    <view class="fz_w_text mar_t20 mar_b20">茶，让生活更美好！</view>
-    <!-- 功能列表-end -->
-
-    <!-- 授权 -->
-    <authorize-module
-      v-if="showAuth"
-      :shopInfo="shopInfo"
-      @authGetTelSuccess="onauthGetTelSuccess"
-    ></authorize-module>
-    <!-- 授权-end -->
-    <!-- <newauthorize ref="newauthorize" /> -->
-  </view>
+			<view class="fun mar_t30">
+				<view class="fun_title">账户明细</view>
+				<view class="fun_con mar_t50 flex_r flex_ac flex_jb">
+					<navigator class="fun_list flex_c flex_ac" url="/pages/accountDetails/running" hover-class="none">
+						<image class="fun_img" src="/static/my/fund.png" mode=""></image>
+						<view class="fun_text">流水明细</view>
+					</navigator>
+					<navigator class="fun_list flex_c flex_ac" url="/pages/accountDetails/withdraw" hover-class="none">
+						<image class="fun_img" src="/static/my/withdraw.png" mode=""></image>
+						<view class="fun_text">提现明细</view>
+					</navigator>
+					<navigator class="fun_list flex_c flex_ac" url="/pages/accountDetails/topup" hover-class="none">
+						<image class="fun_img" src="/static/my/topup.png" mode=""></image>
+						<view class="fun_text">充值明细</view>
+					</navigator>
+					<navigator class="fun_list flex_c flex_ac" url="/pages/accountDetails/integral" hover-class="none">
+						<image class="fun_img" src="/static/my/inte-list.png" mode=""></image>
+						<view class="fun_text">积分明细</view>
+					</navigator>
+				</view>
+			</view>
+			<view class="fun mar_t30">
+				<view class="fun_title flex_r flex_ac flex_jb">我的订单
+					<navigator class="more flexr flex_ac" url="/pages/szw-order-list/index?status=1" hover-class="none">
+						全部订单
+						<image class="more_img" src="/static/my/more.png" mode=""></image>
+					</navigator>
+				</view>
+				<view class="fun_con mar_t50 flex_r flex_ac flex_jb">
+					<navigator class="fun_list flex_c flex_ac" url="/pages/szw-order-list/index?status=2"
+						hover-class="none">
+						<image class="fun_img" src="/static/my/payment.png" mode=""></image>
+						<view class="fun_text">待付款</view>
+					</navigator>
+					<navigator class="fun_list flex_c flex_ac" url="/pages/szw-order-list/index?status=3"
+						hover-class="none">
+						<image class="fun_img" src="/static/my/deliver.png" mode=""></image>
+						<view class="fun_text">待发货</view>
+					</navigator>
+					<navigator class="fun_list flex_c flex_ac" url="/pages/szw-order-list/index?status=4"
+						hover-class="none">
+						<image class="fun_img" src="/static/my/take.png" mode=""></image>
+						<view class="fun_text">待收货</view>
+					</navigator>
+					<navigator class="fun_list flex_c flex_ac" url="/pages/szw-order-list/index?status=5"
+						hover-class="none">
+						<image class="fun_img" src="/static/my/evaluate.png" mode=""></image>
+						<view class="fun_text">待评价</view>
+					</navigator>
+					<navigator class="fun_list flex_c flex_ac" url="/pages/order-refund-list/index?status=5"
+						hover-class="none">
+						<image class="fun_img" src="/static/my/refund.png" mode=""></image>
+						<view class="fun_text">退换货</view>
+					</navigator>
+				</view>
+			</view>
+			<view class="fun mar_t30">
+				<view class="fun_title">我的服务</view>
+				<view class="fun_con mar_t50 flex_r flex_ac flex_jb">
+					<navigator class="fun_list flex_c flex_ac" url="/pages/about/index" hover-class="none">
+						<image class="fun_img" src="/static/my/about.png" mode=""></image>
+						<view class="fun_text">关于我们</view>
+					</navigator>
+					<navigator class="fun_list flex_c flex_ac" url="/pages/notice/index" hover-class="none">
+						<image class="fun_img" src="/static/my/feedback.png" mode=""></image>
+						<view class="fun_text">用户须知</view>
+					</navigator>
+					<navigator class="fun_list flex_c flex_ac" url="/pages/course/index" hover-class="none">
+						<image class="fun_img" src="/static/my/green.png" mode=""></image>
+						<view class="fun_text">新手教程</view>
+					</navigator>
+					<view class="fun_list flex_c flex_ac">
+						<button open-type="contact" style="background: #fff; border: 0; line-height: 1; padding: 0">
+							<image class="fun_img" src="/static/my/service.png" mode=""></image>
+							<view class="fun_text">在线客服</view>
+						</button>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="fz_w_text mar_t20 mar_b20">茶，让生活更美好！</view>
+		<!-- 功能列表-end -->
+
+		<!-- 授权 -->
+		<authorize-module v-if="showAuth" :shopInfo="shopInfo" @authGetTelSuccess="onauthGetTelSuccess">
+		</authorize-module>
+		<!-- 授权-end -->
+		<!-- <newauthorize ref="newauthorize" /> -->
+	</view>
 </template>
 
 <script>
-let page = 1;
-let app = getApp();
-var appEv = app.$vm.$options;
-// let reqApi = new ReqApi();
-// import { ReqApi } from "@/utils/reqTools.js";
-import authorizeModule from "@/components/authorize-module/index";
-// import newauthorize from "@/components/authorize-module/new";
-import uniCopy from "../../utils/copy";
-import { get, post, u_post } from "@/request/api.js";
-export default {
-  components: {
-    authorizeModule,
-    // newauthorize
-  },
-  data() {
-    return {
-      showAuth: false,
-      shopInfo: {}, // 商铺信息
-      userInfoAccount: {}, // 账户数据
-      customerServiceWeiXin: "", // 客服微信
-      isShiMing: true,
-      agentName: "", // 缘起
-      user_id: undefined,
-      userinfo: undefined, // 获取用户信息
-
-      unid: "",
-    };
-  },
-  onLoad: function (options) {
-    //推荐人ID
-    if (options.agentId) {
-      app.globalData.agentId = options.agentId;
-    }
-    if (options && options.scene) {
-      var scene = decodeURIComponent(options.scene).split("&");
-      if (scene.length > 0) {
-        var agentId = scene[0].split(":");
-        app.globalData.agentId =
-          agentId[1] && agentId[1] != "" ? agentId[1] : app.globalData.agentId;
-      }
-    }
-  },
-  onShow: function () {
-    this.userinfo = uni.getStorageSync("userinfo");
-    this.isShiMing = this.userinfo.is_authentication == 0 ? true : false;
-    this.getuserInfo();
-    let token = uni.getStorageSync("token");
-    if (!token) {
-      this.login();
-    }
-  },
-  methods: {
-    login() {
-      let that = this;
-      // #ifdef  MP-WEIXIN
-      wx.login({
-        success(res) {
-          if (res.code) {
-            post("appletLogin", { code: res.code }).then((res) => {
-              if (res.code === 0) {
-                if (res.data.token) {
-                  uni.setStorageSync("token", res.data.token);
-                  that.getuserInfo();
-                } else {
-                  that.unid = res.data.unid;
-                  // setTimeout(() => {
-                  that.showAuth = true;
-                  that.shopInfo = app.globalData.shopInfo;
-                  // }, 500);
-                }
-              }
-            });
-          }
-        },
-      });
-      // #endif
-
-      // #ifdef  H5 || APP-PLUS
-      this.goto("/pages/my/login");
-      // #endif
-    },
-    onauthGetTelSuccess(da) {
-      this.showAuth = false;
-      post("getMobile", { unid: this.unid, ...da.detail }).then((res) => {
-        if (res.code === 0) {
-          uni.setStorageSync("token", res.data.token);
-          this.getuserInfo();
-        }
-      });
-    },
-    getuserInfo() {
-      post("/user/userinfo").then((res) => {
-        if (res.code === 0) {
-          uni.setStorageSync("userinfo", res.data.data);
-          this.userinfo = res.data.data;
-          this.isShiMing = this.userinfo.is_authentication == 0 ? true : false;
-        }
-      });
-    },
-
-    //授权并登录
-    onAuthSuccess: function () {
-      var that = this;
-      uni.showLoading({ mask: true });
-      appEv.setData((res) => {
-        uni.hideLoading();
-        that.showAuth = false;
-      });
-    },
-    // 跳转到实名页面
-    goToAutonym() {
-      // post('/user/isPayAuth').then(res => {
-      // 	if(res.code === 0){
-      // 		if(res.data.)
-      // 	}
-      // })
-      // return
-      uni.navigateTo({
-        url: "/pages/autonym-submit/index",
-      });
-    },
-    // 关闭实名信息
-    closeAuto() {
-      this.isShiMing = false;
-    },
-    // 未开放提示信息
-    SetHint: function () {
-      appEv.errTips("此功能暂未开放");
-    },
-
-    // 跳转到分享页面
-    getImgPage: function () {
-      let that = this;
-      if (this.userinfo.is_authentication == 1) {
-        uni.navigateTo({
-          url: "/pages/invi-img/index",
-        });
-      } else {
-        appEv.errTips("您还未实名");
-        uni.navigateTo({
-          url: "/pages/autonym-submit/index",
-        });
-      }
-    },
-    // 跳转到提现页面
-    getToCash: function () {
-      let that = this;
-      if (this.userinfo.is_authentication == 1) {
-        uni.navigateTo({
-          url: "/pages/cash/index",
-        });
-      } else {
-        appEv.errTips("您还未实名");
-        uni.navigateTo({
-          url: "/pages/autonym-submit/index",
-        });
-      }
-    },
-    // 复制账号
-    copyText(e) {
-      uniCopy({
-        content: e,
-        success: (res) => {},
-        error: (e) => {},
-      });
-    },
-    // 跳转到用户设置页面
-    getToSetting: function () {
-      uni.navigateTo({
-        url: "/pages/setting/index",
-      });
-    },
-    // 跳转到我的茶友页面
-    getToTeaList: function () {
-      uni.navigateTo({
-        url: "/pages/my-tea-list/index",
-      });
-    },
-    // 跳转到拼豆页面
-    getToBean: function () {
-      uni.navigateTo({
-        url: "/pages/bean-info/index",
-      });
-    },
-    // 跳转到拼团金页面
-    getToAccMoney: function () {
-      uni.navigateTo({
-        url: "/pages/my-acc-money/my-acc-money",
-      });
-    },
-  },
-};
+	let page = 1;
+	let app = getApp();
+	var appEv = app.$vm.$options;
+	// let reqApi = new ReqApi();
+	// import { ReqApi } from "@/utils/reqTools.js";
+	import authorizeModule from "@/components/authorize-module/index";
+	// import newauthorize from "@/components/authorize-module/new";
+	import uniCopy from "../../utils/copy";
+	import {
+		get,
+		post,
+		u_post
+	} from "@/request/api.js";
+	export default {
+		components: {
+			authorizeModule,
+			// newauthorize
+		},
+		data() {
+			return {
+				showAuth: false,
+				shopInfo: {}, // 商铺信息
+				userInfoAccount: {}, // 账户数据
+				customerServiceWeiXin: "", // 客服微信
+				isShiMing: true,
+				agentName: "", // 缘起
+				user_id: undefined,
+				userinfo: undefined, // 获取用户信息
+
+				unid: "",
+			};
+		},
+		onLoad: function(options) {
+			//推荐人ID
+			if (options.agentId) {
+				app.globalData.agentId = options.agentId;
+			}
+			if (options && options.scene) {
+				var scene = decodeURIComponent(options.scene).split("&");
+				if (scene.length > 0) {
+					var agentId = scene[0].split(":");
+					app.globalData.agentId =
+						agentId[1] && agentId[1] != "" ? agentId[1] : app.globalData.agentId;
+				}
+			}
+		},
+		onShow: function() {
+			this.userinfo = uni.getStorageSync("userinfo");
+			this.isShiMing = this.userinfo.is_authentication == 0 ? true : false;
+			this.getuserInfo();
+			let token = uni.getStorageSync("token");
+			if (!token) {
+				this.login();
+			}
+		},
+		methods: {
+			login() {
+				let that = this;
+				// #ifdef  MP-WEIXIN
+				wx.login({
+					success(res) {
+						if (res.code) {
+							post("appletLogin", {
+								code: res.code
+							}).then((res) => {
+								if (res.code === 0) {
+									if (res.data.token) {
+										uni.setStorageSync("token", res.data.token);
+										that.getuserInfo();
+									} else {
+										that.unid = res.data.unid;
+										// setTimeout(() => {
+										that.showAuth = true;
+										that.shopInfo = app.globalData.shopInfo;
+										// }, 500);
+									}
+								}
+							});
+						}
+					},
+				});
+				// #endif
+
+				// #ifdef  H5 || APP-PLUS
+				this.goto("/pages/my/login");
+				// #endif
+			},
+			onauthGetTelSuccess(da) {
+				this.showAuth = false;
+				post("getMobile", {
+					unid: this.unid,
+					...da.detail
+				}).then((res) => {
+					if (res.code === 0) {
+						uni.setStorageSync("token", res.data.token);
+						this.getuserInfo();
+					}
+				});
+			},
+			login() {
+				uni.getUserProfile({
+					desc: '登录',
+					success: (response) => {
+						console.log('response', response)
+						try {
+							uni.showLoading({
+								title: '登录中...'
+							});
+							//请求后台，成功并隐藏加载
+							uni.hideLoading({})
+						} catch (e) {
+							uni.showToast({
+								title: "微信登录失败",
+								icon: "none"
+							});
+						}
+					},
+					fail: (res) => {
+						uni.showToast({
+							title: "您已取消授权",
+							icon: "none"
+						});
+					}
+				});
+			},
+			getuserInfo() {
+				post("/user/userinfo").then((res) => {
+					if (res.code === 0) {
+						uni.setStorageSync("userinfo", res.data.data);
+						this.userinfo = res.data.data;
+						this.isShiMing = this.userinfo.is_authentication == 0 ? true : false;
+					}
+				});
+			},
+
+			//授权并登录
+			onAuthSuccess: function() {
+				var that = this;
+				uni.showLoading({
+					mask: true
+				});
+				appEv.setData((res) => {
+					uni.hideLoading();
+					that.showAuth = false;
+				});
+			},
+			// 跳转到实名页面
+			goToAutonym() {
+				// post('/user/isPayAuth').then(res => {
+				// 	if(res.code === 0){
+				// 		if(res.data.)
+				// 	}
+				// })
+				// return
+				uni.navigateTo({
+					url: "/pages/autonym-submit/index",
+				});
+			},
+			// 关闭实名信息
+			closeAuto() {
+				this.isShiMing = false;
+			},
+			// 未开放提示信息
+			SetHint: function() {
+				appEv.errTips("此功能暂未开放");
+			},
+
+			// 跳转到分享页面
+			getImgPage: function() {
+				let that = this;
+				if (this.userinfo.is_authentication == 1) {
+					uni.navigateTo({
+						url: "/pages/invi-img/index",
+					});
+				} else {
+					appEv.errTips("您还未实名");
+					uni.navigateTo({
+						url: "/pages/autonym-submit/index",
+					});
+				}
+			},
+			// 跳转到提现页面
+			getToCash: function() {
+				let that = this;
+				if (this.userinfo.is_authentication == 1) {
+					uni.navigateTo({
+						url: "/pages/cash/index",
+					});
+				} else {
+					appEv.errTips("您还未实名");
+					uni.navigateTo({
+						url: "/pages/autonym-submit/index",
+					});
+				}
+			},
+			// 复制账号
+			copyText(e) {
+				uniCopy({
+					content: e,
+					success: (res) => {},
+					error: (e) => {},
+				});
+			},
+			// 跳转到用户设置页面
+			getToSetting: function() {
+				uni.navigateTo({
+					url: "/pages/setting/index",
+				});
+			},
+			// 跳转到我的茶友页面
+			getToTeaList: function() {
+				uni.navigateTo({
+					url: "/pages/my-tea-list/index",
+				});
+			},
+			// 跳转到拼豆页面
+			getToBean: function() {
+				uni.navigateTo({
+					url: "/pages/bean-info/index",
+				});
+			},
+			// 跳转到拼团金页面
+			getToAccMoney: function() {
+				uni.navigateTo({
+					url: "/pages/my-acc-money/my-acc-money",
+				});
+			},
+		},
+	};
 </script>
 
 <style lang="scss">
-// 页面配置
-page {
-  background: #f5f5f5;
-}
-.container {
-  padding: 0 0 30rpx;
-  box-sizing: border-box;
-}
-.content {
-  padding: 66rpx 30rpx 0;
-  box-sizing: border-box;
-  width: 100%;
-  overflow: hidden;
-  background-image: linear-gradient(to bottom, #fff, #f5f5f5);
-}
-// 页面配置-end
-
-// 用户信息
-.close_icon {
-  margin-left: 24rpx;
-  width: 26rpx;
-}
-.sj_icon {
-  position: absolute;
-  top: 100%;
-  left: 60rpx;
-  border-top: 16rpx solid rgba(0, 0, 0, 0.8);
-  border-right: 16rpx solid transparent;
-  border-left: 16rpx solid transparent;
-  border-bottom: 0;
-}
-.coupon_info {
-  position: absolute;
-  top: -70rpx;
-  left: 0;
-  border-radius: 12rpx;
-  background-color: rgba(0, 0, 0, 0.8);
-  color: #fff;
-  font-size: 28rpx;
-  font-weight: 500;
-  padding: 10rpx 24rpx;
-  transition: all 0.6s ease;
-  width: 420rpx;
-}
-
-.uerInfo {
-  width: 100%;
-}
-.code_img:nth-child(1) {
-  margin-left: 20rpx;
-}
-.level_img {
-  width: 42rpx;
-  height: 35rpx;
-  z-index: 30;
-}
-.code_img {
-  width: 42rpx;
-  height: 44rpx;
-  margin-left: 36rpx;
-}
-.account {
-  font-size: 26rpx;
-  color: #121212;
-  margin-right: 20rpx;
-}
-.user_img .image {
-  width: 100%;
-  height: 100%;
-  border-radius: 50%;
-}
-.user_con {
-  width: calc(100% - 136rpx - 140rpx - 20rpx);
-  overflow: hidden;
-}
-.user_img {
-  width: 136rpx;
-  height: 136rpx;
-  margin-right: 20rpx;
-  border-radius: 50%;
-  position: relative;
-}
-.user_name text {
-  font-size: 26rpx;
-  font-family: "SourceHanSansSC-Medium";
-  color: #121212;
-  font-weight: 500;
-}
-.copy_account {
-  width: 60rpx;
-  height: 32rpx;
-  background: #f1d3a8;
-  font-size: 22rpx;
-  color: #6b2909;
-  border-radius: 6rpx;
-}
-.level_text {
-  padding: 0 16rpx;
-  border-radius: 13rpx;
-  font-size: 20rpx;
-  color: #6b2909;
-  margin-left: -14rpx;
-  margin-top: 6rpx;
-}
-.user_name {
-  width: 100%;
-  overflow: hidden;
-  font-size: 46rpx;
-  color: #121212;
-  font-family: "SourceHanSansSC-Medium";
-  font-weight: 500;
-  line-height: 1;
-}
-// 用户信息-end
-
-// 账户信息
-.acc_head {
-  width: 100%;
-  overflow: hidden;
-}
-.acc_price {
-  font-size: 24rpx;
-  color: #fff;
-}
-.info_list:nth-child(1) {
-  padding-left: 0;
-}
-.list_name {
-  font-size: 24rpx;
-  color: #ffffff;
-}
-.info_list:nth-last-child(1) {
-  border-right: 0;
-}
-.info_con {
-  width: 100%;
-  overflow: hidden;
-  margin-top: 60rpx;
-}
-.acc_hint {
-  width: 100%;
-  overflow: hidden;
-  font-size: 20rpx;
-  color: #fff;
-}
-.acc_price text {
-  font-size: 46rpx;
-  font-family: "SourceHanSansSC-Bold";
-  color: #fff;
-}
-.list_text {
-  font-size: 34rpx;
-  font-size: 34rpx;
-  font-family: "SourceHanSansSC-Bold";
-  font-weight: bold;
-  color: #fff;
-}
-.info_list {
-  width: calc(100% / 3);
-  height: 78rpx;
-  align-items: inherit;
-  box-sizing: border-box;
-  padding-left: 30rpx;
-}
-.withdraw {
-  width: 100rpx;
-  height: 54rpx;
-  background: #fff;
-  border-radius: 27rpx;
-  font-size: 26rpx;
-  color: #11a375;
-  font-family: "SourceHanSansSC-Medium";
-  margin-left: 20rpx;
-}
-.recharge {
-  width: 100rpx;
-  height: 54rpx;
-  box-sizing: border-box;
-  border: 3rpx solid #fff;
-  color: #fff;
-  font-family: "SourceHanSansSC-Medium";
-  border-radius: 27rpx;
-  font-size: 26rpx;
-}
-.acc_info {
-  width: 100%;
-  overflow: hidden;
-  background: url("~@/static/my/myBack.png") no-repeat;
-  border-radius: 16rpx;
-  padding: 30rpx;
-  box-sizing: border-box;
-  margin-top: 50rpx;
-  background-size: 100% 100%;
-}
-// 账户信息-end
-
-// 功能列表
-.more {
-  font-size: 24rpx;
-  color: #999999;
-}
-.fun_con {
-  width: 100%;
-  overflow: hidden;
-}
-.fun_text {
-  font-size: 24rpx;
-  color: #333333;
-}
-.fun_list button::after {
-  border: 0 !important;
-}
-.more_img {
-  width: 12rpx;
-  height: 20rpx;
-  margin-left: 11rpx;
-}
-.fun_img {
-  width: 50rpx;
-  height: 50rpx;
-  margin-bottom: 20rpx;
-}
-.fun_container {
-  width: 100%;
-  overflow: hidden;
-  padding: 0 30rpx;
-  box-sizing: border-box;
-}
-.fun_title {
-  font-size: 32rpx;
-  color: #232323;
-  font-family: "SourceHanSansSC-Bold";
-  font-weight: bold;
-}
-.fun {
-  width: 100%;
-  overflow: hidden;
-  border-radius: 16rpx;
-  background: #fff;
-  padding: 30rpx;
-  box-sizing: border-box;
-}
-.user_level {
-  background: linear-gradient(to right, #ffeabd, #ffc479);
-  padding: 10rpx 20rpx;
-  box-sizing: border-box;
-  border-radius: 6rpx;
-  overflow: hidden;
-}
-// 功能列表-end
+	// 页面配置
+	page {
+		background: #f5f5f5;
+	}
+
+	.container {
+		padding: 0 0 30rpx;
+		box-sizing: border-box;
+	}
+
+	.content {
+		padding: 66rpx 30rpx 0;
+		box-sizing: border-box;
+		width: 100%;
+		overflow: hidden;
+		background-image: linear-gradient(to bottom, #fff, #f5f5f5);
+	}
+
+	// 页面配置-end
+
+	// 用户信息
+	.close_icon {
+		margin-left: 24rpx;
+		width: 26rpx;
+	}
+
+	.sj_icon {
+		position: absolute;
+		top: 100%;
+		left: 60rpx;
+		border-top: 16rpx solid rgba(0, 0, 0, 0.8);
+		border-right: 16rpx solid transparent;
+		border-left: 16rpx solid transparent;
+		border-bottom: 0;
+	}
+
+	.coupon_info {
+		position: absolute;
+		top: -70rpx;
+		left: 0;
+		border-radius: 12rpx;
+		background-color: rgba(0, 0, 0, 0.8);
+		color: #fff;
+		font-size: 28rpx;
+		font-weight: 500;
+		padding: 10rpx 24rpx;
+		transition: all 0.6s ease;
+		width: 420rpx;
+	}
+
+	.uerInfo {
+		width: 100%;
+	}
+
+	.code_img:nth-child(1) {
+		margin-left: 20rpx;
+	}
+
+	.level_img {
+		width: 42rpx;
+		height: 35rpx;
+		z-index: 30;
+	}
+
+	.code_img {
+		width: 42rpx;
+		height: 44rpx;
+		margin-left: 36rpx;
+	}
+
+	.account {
+		font-size: 26rpx;
+		color: #121212;
+		margin-right: 20rpx;
+	}
+
+	.user_img .image {
+		width: 100%;
+		height: 100%;
+		border-radius: 50%;
+	}
+
+	.user_con {
+		width: calc(100% - 136rpx - 140rpx - 20rpx);
+		overflow: hidden;
+	}
+
+	.user_img {
+		width: 136rpx;
+		height: 136rpx;
+		margin-right: 20rpx;
+		border-radius: 50%;
+		position: relative;
+	}
+
+	.user_name text {
+		font-size: 26rpx;
+		font-family: "SourceHanSansSC-Medium";
+		color: #121212;
+		font-weight: 500;
+	}
+
+	.copy_account {
+		width: 60rpx;
+		height: 32rpx;
+		background: #f1d3a8;
+		font-size: 22rpx;
+		color: #6b2909;
+		border-radius: 6rpx;
+	}
+
+	.level_text {
+		padding: 0 16rpx;
+		border-radius: 13rpx;
+		font-size: 20rpx;
+		color: #6b2909;
+		margin-left: -14rpx;
+		margin-top: 6rpx;
+	}
+
+	.user_name {
+		width: 100%;
+		overflow: hidden;
+		font-size: 46rpx;
+		color: #121212;
+		font-family: "SourceHanSansSC-Medium";
+		font-weight: 500;
+		line-height: 1;
+	}
+
+	// 用户信息-end
+
+	// 账户信息
+	.acc_head {
+		width: 100%;
+		overflow: hidden;
+	}
+
+	.acc_price {
+		font-size: 24rpx;
+		color: #fff;
+	}
+
+	.info_list:nth-child(1) {
+		padding-left: 0;
+	}
+
+	.list_name {
+		font-size: 24rpx;
+		color: #ffffff;
+	}
+
+	.info_list:nth-last-child(1) {
+		border-right: 0;
+	}
+
+	.info_con {
+		width: 100%;
+		overflow: hidden;
+		margin-top: 60rpx;
+	}
+
+	.acc_hint {
+		width: 100%;
+		overflow: hidden;
+		font-size: 20rpx;
+		color: #fff;
+	}
+
+	.acc_price text {
+		font-size: 46rpx;
+		font-family: "SourceHanSansSC-Bold";
+		color: #fff;
+	}
+
+	.list_text {
+		font-size: 34rpx;
+		font-size: 34rpx;
+		font-family: "SourceHanSansSC-Bold";
+		font-weight: bold;
+		color: #fff;
+	}
+
+	.info_list {
+		width: calc(100% / 3);
+		height: 78rpx;
+		align-items: inherit;
+		box-sizing: border-box;
+		padding-left: 30rpx;
+	}
+
+	.withdraw {
+		width: 100rpx;
+		height: 54rpx;
+		background: #fff;
+		border-radius: 27rpx;
+		font-size: 26rpx;
+		color: #11a375;
+		font-family: "SourceHanSansSC-Medium";
+		margin-left: 20rpx;
+	}
+
+	.recharge {
+		width: 100rpx;
+		height: 54rpx;
+		box-sizing: border-box;
+		border: 3rpx solid #fff;
+		color: #fff;
+		font-family: "SourceHanSansSC-Medium";
+		border-radius: 27rpx;
+		font-size: 26rpx;
+	}
+
+	.acc_info {
+		width: 100%;
+		overflow: hidden;
+		background: url("~@/static/my/myBack.png") no-repeat;
+		border-radius: 16rpx;
+		padding: 30rpx;
+		box-sizing: border-box;
+		margin-top: 50rpx;
+		background-size: 100% 100%;
+	}
+
+	// 账户信息-end
+
+	// 功能列表
+	.more {
+		font-size: 24rpx;
+		color: #999999;
+	}
+
+	.fun_con {
+		width: 100%;
+		overflow: hidden;
+	}
+
+	.fun_text {
+		font-size: 24rpx;
+		color: #333333;
+	}
+
+	.fun_list button::after {
+		border: 0 !important;
+	}
+
+	.more_img {
+		width: 12rpx;
+		height: 20rpx;
+		margin-left: 11rpx;
+	}
+
+	.fun_img {
+		width: 50rpx;
+		height: 50rpx;
+		margin-bottom: 20rpx;
+	}
+
+	.fun_container {
+		width: 100%;
+		overflow: hidden;
+		padding: 0 30rpx;
+		box-sizing: border-box;
+	}
+
+	.fun_title {
+		font-size: 32rpx;
+		color: #232323;
+		font-family: "SourceHanSansSC-Bold";
+		font-weight: bold;
+	}
+
+	.fun {
+		width: 100%;
+		overflow: hidden;
+		border-radius: 16rpx;
+		background: #fff;
+		padding: 30rpx;
+		box-sizing: border-box;
+	}
+
+	.user_level {
+		background: linear-gradient(to right, #ffeabd, #ffc479);
+		padding: 10rpx 20rpx;
+		box-sizing: border-box;
+		border-radius: 6rpx;
+		overflow: hidden;
+	}
+
+	// 功能列表-end
 </style>

src/pages/szw-order-list/index.vue

@@ -1,82 +1,186 @@
 <template>
-    <view class="container">
-        <view class="status-box">
-            <view class="status_tap_box" style="position: relative">
-                <view @tap="statusTap" class="status-label" v-for="(item, index) in statusType" :key="index" :class="item[0] == currentType ? 'active' : ''" :data-index="item[0]">
-                    {{ item[1] }}
-                </view>
-            </view>
+  <view class="container">
+    <view class="status-box">
+      <view class="status_tap_box" style="position: relative">
+        <view
+          @tap="statusTap"
+          class="status-label"
+          v-for="(item, index) in statusType"
+          :key="index"
+          :class="item[0] == currentType ? 'active' : ''"
+          :data-index="item[0]"
+        >
+          {{ item[1] }}
+          <!-- {{index && (index+1) != statusType.length ? item[2] ? '(' + item[2] + ')' : '(0)' : ''}} -->
         </view>
-        <not-goods v-if="haveGoods" textStr="抱歉！暂无相关订单" />
-        <view class="order-list" v-if="orderList && orderList.length > 0">
-            <view v-for="(li, index) in orderList" :key="index">
-                <!-- 未付款 -->
-                <view class="a-order">
-                    <view class="overflow" :data-id="li.id">
-                        <view class="list-title flex_r flex_ac flex_jb ellipsis">
-                            <view class="flex_r flex_ac">
-                                <view class="imgs_bar avaImgs">
-                                    <image class="image" :src="pt.platFormLogo" mode="widthFix" />
-                                </view>{{ pt.platFormName }}
-                            </view>
-                            <view class="fz_text r_color" v-if="li.data.assembleType != 1 && li.data.assembleStatus == 1">正在拼团中</view>
-                            <view class="fz_text" v-else>{{ li.data.statusMsg }}</view>
-                        </view>
-                        <view class="goods-info flex_r flex_ac flex_jb" :data-type="li.type" :data-id="li.data.orderDetailId" @tap="toDetails(li)">
-                            <view class="goods-info-bar overflow flex_r flex_ac">
-                                <block v-if="li.type == 1 || li.data.orderTypes == 4">
-                                    <view class="imgs_bar img-box">
-                                        <image :src="li.data.image" mode="" class="goods-img"></image>
-                                    </view>
-                                    <view class="goods_name ellipsis2">{{ li.data.goodsName || "" }}</view>
-                                </block>
-                                <block v-else>
-                                    <scroll-view class="goods-img-container" scroll-x="true">
-                                        <view class="imgs_bar img-box" v-for="(item, ind) in li.data.imgs" :key="ind">
-                                            <image :src="item" mode="" class="goods-img"></image>
-                                        </view>
-                                    </scroll-view>
-                                </block>
-                            </view>
-                            <view class="goodsDetail_info">
-                                <view class="goods_price r_color" v-if="li.data.orderTypes != 5">￥<text class="r_color">{{ li.data.totalPrice }}</text></view>
-                                <view class="goods_price r_color" v-if="li.data.orderTypes == 5"><text class="r_color">{{ li.data.integral }}</text>积分</view>
-                                <view class="unimport">共{{ li.data.buyCount }}件</view>
-                            </view>
-                        </view>
-                    </view>
-                    <view class="price-box flex_r flex_ac">
-                        <view class="ptz" v-if="li.data.orderTypes == 7">
-                            拼团金：{{ li.data.totalAccountSpell }}
-                        </view>
-                        <view class="btn cancel-btn" :data-type="li.type" :data-types="li.data.orderTypes" :data-id="li.data.orderDetailId" @tap="toCancel" v-if="li.data.status == 2">取消订单</view>
-                        <view class="btn topay-btn" :data-id="li.data.orderDetailId" :data-index="index" :data-ojsType="li.data.ojsType" @tap="toPay" v-if="li.data.status == 2">立即支付</view>
-                        <block v-else>
-                            <block v-if="
-                              (li.data.status == 4 || li.data.status == 5) &&
-                              li.returnType == 1 &&
-                              li.data.orderTypes != 2
-                            ">
-                                <view class="btn" :data-orderno="li.data.orderNo" v-if="li.data.assembleStatus == 2">拼团成功</view>
-                                <view v-if="li.refundId" class="btn" :class="li && li.refundId ? 'topay-btn' : 'cancel-btn'" :data-type="li.type" :data-id="li.data.orderDetailId" :data-reid="li.refundId" @tap="toRefundDetails(li)">
-                                    退款中
-                                </view>
-                                <view v-else class="btn" :class="li && li.refundId ? 'topay-btn' : 'cancel-btn'" :data-type="li.type" :data-id="li.data.orderDetailId" :data-reid="li.refundId" @tap="toRefund(li)">
-                                    退货/退款
-                                </view>
-                            </block>
-                            <view class="btn cancel-btn" v-if="li.data.status != 2" :data-type="li.type" :ata-id="li.data.orderDetailId" @tap="toDetail(li)">查看订单</view>
-                            <view class="btn topay-btn" :data-id="li.data.orderDetailId" :data-status="li.data.status" :data-type="li.type" @tap="toTake" v-if="li.data.status == 4 || li.data.status == 3">确认收货</view>
-                            <view class="btn topay-btn" :data-type="li.type" :data-id="li.data.orderDetailId" :data-no="li.data.orderNo" @tap="toCommen" v-if="li.comType && li.comType == 1">去评价</view>
-                        </block>
+      </view>
+    </view>
+    <not-goods v-if="haveGoods" textStr="抱歉！暂无相关订单" />
+    <view class="order-list" v-if="orderList && orderList.length > 0">
+      <view v-for="(li, index) in orderList" :key="index">
+        <!-- 未付款 -->
+        <view class="a-order">
+          <view class="overflow" :data-id="li.id">
+            <view class="list-title flex_r flex_ac flex_jb ellipsis">
+              <view class="flex_r flex_ac">
+                <view class="imgs_bar avaImgs">
+                  <image
+                    class="image"
+                    :src="pt.platFormLogo"
+                    mode="widthFix"
+                  /> </view
+                >{{ pt.platFormName }}
+              </view>
+              <view
+                class="fz_text r_color"
+                v-if="li.data.assembleType != 1 && li.data.assembleStatus == 1"
+                >正在拼团中</view
+              >
+              <view class="fz_text" v-else>{{ li.data.statusMsg }}</view>
+            </view>
+            <view
+              class="goods-info flex_r flex_ac flex_jb"
+              :data-type="li.type"
+              :data-id="li.data.orderDetailId"
+              @tap="toDetails(li)"
+            >
+              <view class="goods-info-bar overflow flex_r flex_ac">
+                <block v-if="li.type == 1 || li.data.orderTypes == 4">
+                  <view class="imgs_bar img-box">
+                    <image
+                      :src="li.data.image"
+                      mode=""
+                      class="goods-img"
+                    ></image>
+                  </view>
+                  <view class="goods_name ellipsis2">{{
+                    li.data.goodsName || ""
+                  }}</view>
+                </block>
+                <block v-else>
+                  <scroll-view class="goods-img-container" scroll-x="true">
+                    <view
+                      class="imgs_bar img-box"
+                      v-for="(item, ind) in li.data.imgs"
+                      :key="ind"
+                    >
+                      <image :src="item" mode="" class="goods-img"></image>
                     </view>
-                </view>
-                <!-- 未付款 end -->
+                  </scroll-view>
+                </block>
+              </view>
+              <view class="goodsDetail_info">
+                <view class="goods_price r_color" v-if="li.data.orderTypes != 5"
+                  >￥<text class="r_color">{{ li.data.totalPrice }}</text></view
+                >
+                <view class="goods_price r_color" v-if="li.data.orderTypes == 5"
+                  ><text class="r_color">{{ li.data.integral }}</text
+                  >积分</view
+                >
+                <view class="unimport">共{{ li.data.buyCount }}件</view>
+              </view>
+            </view>
+          </view>
+          <view class="price-box flex_r flex_ac">
+            <view class="ptz" v-if="li.data.orderTypes == 7">
+              拼团金：{{ li.data.totalAccountSpell }}
             </view>
+            <view
+              class="btn cancel-btn"
+              :data-type="li.type"
+              :data-types="li.data.orderTypes"
+              :data-id="li.data.orderDetailId"
+              @tap="toCancel"
+              v-if="li.data.status == 2"
+              >取消订单</view
+            >
+            <view
+              class="btn topay-btn"
+              :data-id="li.data.orderDetailId"
+              :data-index="index"
+              :data-ojsType="li.data.ojsType"
+              @tap="toPay"
+              v-if="li.data.status == 2"
+              >立即支付</view
+            >
+
+            <block v-else>
+              <block
+                v-if="
+                  (li.data.status == 4 || li.data.status == 5) &&
+                  li.returnType == 1 &&
+                  li.data.orderTypes != 2
+                "
+              >
+                <view
+                  class="btn"
+                  :data-orderno="li.data.orderNo"
+                  v-if="li.data.assembleStatus == 2"
+                  >拼团成功</view
+                >
+                <view
+                  v-if="li.refundId"
+                  class="btn"
+                  :class="li && li.refundId ? 'topay-btn' : 'cancel-btn'"
+                  :data-type="li.type"
+                  :data-id="li.data.orderDetailId"
+                  :data-reid="li.refundId"
+                  @tap="toRefundDetails(li)"
+                >
+                  退款中
+                </view>
+                <view
+                  v-else
+                  class="btn"
+                  :class="li && li.refundId ? 'topay-btn' : 'cancel-btn'"
+                  :data-type="li.type"
+                  :data-id="li.data.orderDetailId"
+                  :data-reid="li.refundId"
+                  @tap="toRefund(li)"
+                >
+                  退货/退款
+                </view>
+              </block>
+              <view
+                class="btn cancel-btn"
+                v-if="li.data.status != 2"
+                :data-type="li.type"
+                :ata-id="li.data.orderDetailId"
+                @tap="toDetail(li)"
+                >查看订单</view
+              >
+              <view
+                class="btn topay-btn"
+                :data-id="li.data.orderDetailId"
+                :data-status="li.data.status"
+                :data-type="li.type"
+                @tap="toTake"
+                v-if="li.data.status == 4 || li.data.status == 3"
+                >确认收货</view
+              >
+              <view
+                class="btn topay-btn"
+                :data-type="li.type"
+                :data-id="li.data.orderDetailId"
+                :data-no="li.data.orderNo"
+                @tap="toCommen"
+                v-if="li.comType && li.comType == 1"
+                >去评价</view
+              >
+            </block>
+          </view>
         </view>
-        <view class="loading-indicator" :class="loadingMoreHidden ? 'opacity' : ''">{{ loadingTip }}</view>
+        <!-- 未付款 end -->
+      </view>
     </view>
+    <view
+      class="loading-indicator"
+      :class="loadingMoreHidden ? 'opacity' : ''"
+      >{{ loadingTip }}</view
+    >
+  </view>
 </template>
+
 <script>
 // var reqApi = new ReqApi();
 // var toPayOpre = new ToPayOpre();
@@ -88,573 +192,571 @@ import { get, post, u_post } from "@/request/api.js";
 // import terraceTagbar from '@/components/terrace-tagbar/index'
 // import { ReqApi, ToPayOpre } from "../../utils/reqTools.js";
 export default {
-    components: {
-        notGoods,
-        // terraceTagbar
+  components: {
+    notGoods,
+    // terraceTagbar
+  },
+  data() {
+    return {
+      statusType: [
+        ["1", "全部"],
+        ["2", "待付款"],
+        ["3", "待发货"],
+        ["4", "待收货"],
+        ["5", "已收货"],
+      ],
+      orderList: [],
+      currentType: "1",
+      haveGoods: false,
+      loadingMoreHidden: true,
+      loadingTip: "没有更多了",
+      userId: "",
+      isweixin: "",
+      pt: {},
+    };
+  },
+  onLoad: function (options) {
+    var that = this;
+    this.currentType = options.status ? options.status : 1;
+	
+  },
+  onShow: function () {
+    let that = this;
+    const userId =
+      app.globalData.systemUserInfo && app.globalData.systemUserInfo.userId
+        ? app.globalData.systemUserInfo.userId
+        : "";
+    if (!userId || userId == "" || userId == undefined) {
+      // that.showAuth=true
+      appEv.authorizeUserInfo((res) => {
+        if (res) {
+          that.clearData();
+          that.loadData();
+        }
+      }, true);
+    } else {
+      that.clearData();
+      that.loadData();
+    }
+  },
+  methods: {
+    returnBtn: function () {
+      uni.navigateBack({});
     },
-    data() {
-        return {
-            statusType: [
-                ["0", "全部"],
-                ["1", "待付款"],
-                ["2", "待发货"],
-                ["3", "待收货"],
-                ["4", "已收货"],
-            ],
-            orderList: [],
-            currentType: "1",
-            haveGoods: false,
-            loadingMoreHidden: true,
-            loadingTip: "没有更多了",
-            userId: "",
-            isweixin: "",
-            pt: {},
-        };
+    clearData(isclearCat = true, callBack) {
+      page = 1;
+      this.orderList = [];
+      this.haveGoods = false;
+      if (callBack) {
+        callBack();
+      }
     },
-    onLoad(options) {
-        var that = this;
-        this.currentType = options.status ? options.status : 1;
-
+    loadData() {
+      if (page == -1) {
+        return;
+      }
+      uni.showLoading({
+        title: "加载中…",
+        mask: true,
+      });
+      var data = {
+        page,
+        status: this.currentType == 1 ? "" : this.currentType,
+      };
+
+      u_post("ShuZiTeaYW/shop/pendingPayment", data).then(res => {
+        if (res.status == 200) {
+          if (res) {
+            setTimeout(() => {
+              uni.hideLoading();
+            }, 100);
+            uni.stopPullDownRefresh();
+            var resData = res.mallGoods;
+            if (resData && resData.length <= 0) {
+              if (page <= 1) {
+                this.haveGoods = true;
+                this.loadingMoreHidden = true;
+              } else {
+                this.loadingMoreHidden = false;
+              }
+            }
+          }
+          if (resData && resData.length > 0) {
+            var orderList = this.orderList;
+            var list = orderList.concat(resData);
+            this.pt = res.platform;
+            this.orderList = list;
+            this.haveGoods = false;
+            this.loadingMoreHidden = true;
+          }
+        } else {
+          appEv.errTips(res.msg || "");
+          if (res.status == 999) {
+            // that.arrangeData(res.data.data);
+            page = -1;
+            this.loadingMoreHidden = false;
+          }
+        }
+      });
     },
-    onShow() {
-      that.loadData();
+    toDetails(data) {
+      if (data.data.orderTypes == 4) {
+        uni.navigateTo({
+          url:
+            "/pages/szw-order-details/index?id=" +
+            data.data.orderDetailId +
+            "&type=1",
+        });
+      } else {
+        uni.navigateTo({
+          url:
+            "/pages/szw-order-details/index?id=" +
+            data.data.orderDetailId +
+            "&type=" +
+            data.type,
+        });
+      }
     },
-    methods: {
-        returnBtn: function() {
-            uni.navigateBack({});
-        },
-        clearData(isclearCat = true, callBack) {
-            page = 1;
-            this.orderList = [];
-            this.haveGoods = false;
-            if (callBack) {
-                callBack();
-            }
-        },
-        loadData() {
-            if (page == -1) {
-                return;
-            }
-            uni.showLoading({
-                title: "加载中…",
+    toDetail: function (data) {
+      if (data.data.orderTypes == 4) {
+        uni.navigateTo({
+          url:
+            "/pages/szw-order-details/index?id=" +
+            data.data.orderDetailId +
+            "&type=1",
+        });
+      } else {
+        uni.navigateTo({
+          url:
+            "/pages/szw-order-details/index?id=" +
+            data.data.orderDetailId +
+            "&type=" +
+            data.type,
+        });
+      }
+    },
+    toRefund(data) {
+      uni.navigateTo({
+        url:
+          "/pages/order-refund/index?id=" +
+          data.data.orderDetailId +
+          "&type=" +
+          data.type,
+      });
+    },
+    toRefundDetails(data) {
+      uni.navigateTo({
+        url: "/pages/order-refund-details/index?id=" + data.refundId,
+      });
+    },
+    // 立即支付
+    toPay(e) {
+      var orderDetailIds = e.currentTarget.dataset.id;
+      var index = e.currentTarget.dataset.index;
+      var price = this.orderList[index].data.totalPrice;
+      var type = this.orderList[index].data.patType;
+      var teaIntegral = this.orderList[index].data.totalTeaInt;
+      var pfIntegral = this.orderList[index].data.totalPfInt;
+      var xfIntegral = this.orderList[index].data.totalXfInt;
+      var totalAccount = this.orderList[index].data.totalAccount;
+      var orderNo = this.orderList[index].data.orderNo;
+      let data = {
+        orderDetailIds: orderDetailIds,
+        types: 1,
+        price: price,
+        account: totalAccount,
+        teaIntegral: teaIntegral,
+        pfIntegral: pfIntegral,
+        xfIntegral: xfIntegral,
+        zfType: type,
+        ojsType: e.currentTarget.dataset.ojstype,
+      };
+      var info;
+      info = reqApi.payOrder(data);
+      var that = this;
+      if (info) {
+        info.then((res) => {
+          if (res.data.status == 200) {
+            toPayOpre.toPay(res.data.payParam);
+          } else {
+            appEv.errTips(res.data.msg || "支付失败");
+          }
+        });
+      }
+    },
+    // 取消订单
+    toCancel(e) {
+      var isTuan = e.currentTarget.dataset.tuan;
+      if (isTuan) {
+        uni.showModal({
+          title: "温馨提示",
+          content: "发起拼单24小时后，若未拼单成功将自动取消订单并退款哦~",
+          showCancel: false,
+          confirmText: "知道了",
+          confirmColor: "#f02f2f",
+        });
+      } else {
+        var orderDetailId = e.currentTarget.dataset.id,
+          type = e.currentTarget.dataset.type;
+        let types = e.currentTarget.dataset.types;
+        console.log(types);
+        if (types == 4) {
+          type = 1;
+        }
+        const info = reqApi.cancelOrder({ orderDetailId, type });
+        var that = this;
+        if (info) {
+          info.then((res) => {
+            if (res.data.status == 200) {
+              uni.showToast({
+                title: res.data.msg || "订单已取消",
+                duration: 1200,
                 mask: true,
-            });
-            var data = {
-                page,
-                type: this.currentType,
-            };
-
-            post("my/order", data).then(res => {
-                if (res.code === 0) {
-                    if (res) {
-                        setTimeout(() => {
-                            uni.hideLoading();
-                        }, 100);
-                        uni.stopPullDownRefresh();
-                        var resData = res.mallGoods;
-                        if (resData && resData.length <= 0) {
-                            if (page <= 1) {
-                                this.haveGoods = true;
-                                this.loadingMoreHidden = true;
-                            } else {
-                                this.loadingMoreHidden = false;
-                            }
-                        }
-                    }
-                    if (resData && resData.length > 0) {
-                        var orderList = this.orderList;
-                        var list = orderList.concat(resData);
-                        this.pt = res.platform;
-                        this.orderList = list;
-                        this.haveGoods = false;
-                        this.loadingMoreHidden = true;
-                    }
-                } else {
-                    appEv.errTips(res.msg || "");
-                    if (res.status == 999) {
-                        page = -1;
-                        this.loadingMoreHidden = false;
-                    }
-                }
-            });
-        },
-        toDetails(data) {
-            if (data.data.orderTypes == 4) {
-                uni.navigateTo({
-                    url: "/pages/szw-order-details/index?id=" +
-                        data.data.orderDetailId +
-                        "&type=1",
+              });
+              setTimeout(function () {
+                that.clearData(false, () => {
+                  that.loadData();
                 });
+              }, 1200);
             } else {
-                uni.navigateTo({
-                    url: "/pages/szw-order-details/index?id=" +
-                        data.data.orderDetailId +
-                        "&type=" +
-                        data.type,
-                });
-            }
-        },
-        toDetail: function(data) {
-            if (data.data.orderTypes == 4) {
-                uni.navigateTo({
-                    url: "/pages/szw-order-details/index?id=" +
-                        data.data.orderDetailId +
-                        "&type=1",
-                });
-            } else {
-                uni.navigateTo({
-                    url: "/pages/szw-order-details/index?id=" +
-                        data.data.orderDetailId +
-                        "&type=" +
-                        data.type,
-                });
+              appEv.errTips(res.data.msg || "取消失败");
             }
-        },
-        toRefund(data) {
-            uni.navigateTo({
-                url: "/pages/order-refund/index?id=" +
-                    data.data.orderDetailId +
-                    "&type=" +
-                    data.type,
-            });
-        },
-        toRefundDetails(data) {
-            uni.navigateTo({
-                url: "/pages/order-refund-details/index?id=" + data.refundId,
+          });
+        }
+      }
+    },
+    // 确认收货
+    toTake(e) {
+      let type = e.currentTarget.dataset.type;
+      var that = this;
+      uni.showModal({
+        content:
+          "亲，“确定收货”代表着本订单的交付流程已经完成，不再支持任何形式的退换货。",
+        confirmText: "确认收货",
+        confirmColor: "#fa2f2e",
+        cancelText: "取消",
+        cancelColor: "#bbb",
+        success(res) {
+          if (res.confirm) {
+            var orderDetailId = e.currentTarget.dataset.id;
+            const info = reqApi.takeOrder({
+              orderDetailId: orderDetailId,
+              type: type,
             });
-        },
-        // 立即支付
-        toPay(e) {
-            var orderDetailIds = e.currentTarget.dataset.id;
-            var index = e.currentTarget.dataset.index;
-            var price = this.orderList[index].data.totalPrice;
-            var type = this.orderList[index].data.patType;
-            var teaIntegral = this.orderList[index].data.totalTeaInt;
-            var pfIntegral = this.orderList[index].data.totalPfInt;
-            var xfIntegral = this.orderList[index].data.totalXfInt;
-            var totalAccount = this.orderList[index].data.totalAccount;
-            var orderNo = this.orderList[index].data.orderNo;
-            let data = {
-                orderDetailIds: orderDetailIds,
-                types: 1,
-                price: price,
-                account: totalAccount,
-                teaIntegral: teaIntegral,
-                pfIntegral: pfIntegral,
-                xfIntegral: xfIntegral,
-                zfType: type,
-                ojsType: e.currentTarget.dataset.ojstype,
-            };
-            var info;
-            info = reqApi.payOrder(data);
-            var that = this;
             if (info) {
-                info.then((res) => {
-                    if (res.data.status == 200) {
-                        toPayOpre.toPay(res.data.payParam);
-                    } else {
-                        appEv.errTips(res.data.msg || "支付失败");
-                    }
-                });
-            }
-        },
-        // 取消订单
-        toCancel(e) {
-            var isTuan = e.currentTarget.dataset.tuan;
-            if (isTuan) {
-                uni.showModal({
-                    title: "温馨提示",
-                    content: "发起拼单24小时后，若未拼单成功将自动取消订单并退款哦~",
-                    showCancel: false,
-                    confirmText: "知道了",
-                    confirmColor: "#f02f2f",
-                });
-            } else {
-                var orderDetailId = e.currentTarget.dataset.id,
-                    type = e.currentTarget.dataset.type;
-                let types = e.currentTarget.dataset.types;
-                console.log(types);
-                if (types == 4) {
-                    type = 1;
-                }
-                const info = reqApi.cancelOrder({ orderDetailId, type });
-                var that = this;
-                if (info) {
-                    info.then((res) => {
-                        if (res.data.status == 200) {
-                            uni.showToast({
-                                title: res.data.msg || "订单已取消",
-                                duration: 1200,
-                                mask: true,
-                            });
-                            setTimeout(function() {
-                                that.clearData(false, () => {
-                                    that.loadData();
-                                });
-                            }, 1200);
-                        } else {
-                            appEv.errTips(res.data.msg || "取消失败");
-                        }
+              info.then((res) => {
+                if (res.data.status == 200) {
+                  appEv.errTips(res.data.msg);
+                  setTimeout(function () {
+                    that.clearData(false, () => {
+                      that.loadData();
                     });
+                  }, 1200);
+                } else {
+                  appEv.errTips(res.data.msg || "收货失败");
                 }
+              });
             }
+          } else if (res.cancel) {
+            // console.log('用户点击取消');
+          }
         },
-        // 确认收货
-        toTake(e) {
-            let type = e.currentTarget.dataset.type;
-            var that = this;
-            uni.showModal({
-                content: "亲，“确定收货”代表着本订单的交付流程已经完成，不再支持任何形式的退换货。",
-                confirmText: "确认收货",
-                confirmColor: "#fa2f2e",
-                cancelText: "取消",
-                cancelColor: "#bbb",
-                success(res) {
-                    if (res.confirm) {
-                        var orderDetailId = e.currentTarget.dataset.id;
-                        const info = reqApi.takeOrder({
-                            orderDetailId: orderDetailId,
-                            type: type,
-                        });
-                        if (info) {
-                            info.then((res) => {
-                                if (res.data.status == 200) {
-                                    appEv.errTips(res.data.msg);
-                                    setTimeout(function() {
-                                        that.clearData(false, () => {
-                                            that.loadData();
-                                        });
-                                    }, 1200);
-                                } else {
-                                    appEv.errTips(res.data.msg || "收货失败");
-                                }
-                            });
-                        }
-                    } else if (res.cancel) {
-                        // console.log('用户点击取消');
-                    }
-                },
-            });
-        },
-        // 整理数据
-        arrangeData(data = appEv.parameter("data")) {
-            var statusType = this.data.statusType;
-            statusType[0][2] = data.wholeCount;
-            statusType[1][2] = data.AlreadyPaymentCount;
-            statusType[2][2] = data.AlreadyCompleteCount;
-            statusType[3][2] = data.AlreadySettlementCount;
-            this.statusType = statusType;
-        },
-        //菜单切换
-        statusTap: function(e) {
-            //重置数据
-            var curType = e.currentTarget.dataset.index;
-            this.currentType = curType;
-            this.clearData(false, this.loadData);
-        },
-        // 跳转拼团分享页面
-        toTuanShare(e) {
-            uni.navigateTo({
-                url: "/pages/tuan-share-info/index?orderNo=" +
-                    e.currentTarget.dataset.orderno,
-            });
-        },
-        // 加评价
-        toCommen(e) {
-            let id = e.currentTarget.dataset.id;
-            let no = e.currentTarget.dataset.no;
-            let orderType = e.currentTarget.dataset.type;
-            uni.navigateTo({
-                url: "/pages/add-goods-commen/index?orderId=" +
-                    id +
-                    "&orderNo=" +
-                    no +
-                    "&orderType=" +
-                    orderType,
-            });
-        },
-        pageBack: function() {
-            uni.reLaunch({
-                url: "/pages/my/index",
-            });
-        },
+      });
     },
-    //上拉加载事件
-    onReachBottom: function() {
-        if (page != -1) {
-            var that = this;
-            setTimeout(function() {
-                // 为页数迭加1
-                ++page;
-                that.loadData();
-            }, 800);
-        }
+    // 整理数据
+    arrangeData(data = appEv.parameter("data")) {
+      var statusType = this.data.statusType;
+      statusType[0][2] = data.wholeCount;
+      statusType[1][2] = data.AlreadyPaymentCount;
+      statusType[2][2] = data.AlreadyCompleteCount;
+      statusType[3][2] = data.AlreadySettlementCount;
+      this.statusType = statusType;
     },
-    // 下拉刷新
-    onPullDownRefresh: function() {
-        var that = this;
-        that.clearData(false, () => {
-            that.loadData();
-        });
+    //菜单切换
+    statusTap: function (e) {
+      //重置数据
+      var curType = e.currentTarget.dataset.index;
+      this.currentType = curType;
+      this.clearData(false, this.loadData);
+    },
+    // 跳转拼团分享页面
+    toTuanShare(e) {
+      uni.navigateTo({
+        url:
+          "/pages/tuan-share-info/index?orderNo=" +
+          e.currentTarget.dataset.orderno,
+      });
     },
+    // 加评价
+    toCommen(e) {
+      let id = e.currentTarget.dataset.id;
+      let no = e.currentTarget.dataset.no;
+      let orderType = e.currentTarget.dataset.type;
+      uni.navigateTo({
+        url:
+          "/pages/add-goods-commen/index?orderId=" +
+          id +
+          "&orderNo=" +
+          no +
+          "&orderType=" +
+          orderType,
+      });
+    },
+    pageBack: function () {
+      uni.reLaunch({
+        url: "/pages/my/index",
+      });
+    },
+  },
+  //上拉加载事件
+  onReachBottom: function () {
+    if (page != -1) {
+      var that = this;
+      setTimeout(function () {
+        // 为页数迭加1
+        ++page;
+        that.loadData();
+      }, 800);
+    }
+  },
+  // 下拉刷新
+  onPullDownRefresh: function () {
+    var that = this;
+    that.clearData(false, () => {
+      that.loadData();
+    });
+  },
 };
 </script>
+
 <style lang="scss">
 page {
-    background-color: #f3f5f7;
+  background-color: #f3f5f7;
 }
-
 .container {
-    width: 100%;
+  width: 100%;
 }
-
 .fl {
-    float: left;
+  float: left;
 }
-
 .fr {
-    float: right;
+  float: right;
 }
-
 .overflow {
-    overflow: hidden;
+  overflow: hidden;
 }
-
 .r_color {
-    color: #fa2f2e;
+  color: #fa2f2e;
 }
-
 .loading-indicator {
-    width: 100%;
-    text-align: center;
-    font-size: 24rpx;
-    color: #666;
-    margin: 20rpx 0;
-    line-height: 1.5;
+  width: 100%;
+  text-align: center;
+  font-size: 24rpx;
+  color: #666;
+  margin: 20rpx 0;
+  line-height: 1.5;
 }
-
 .opacity {
-    opacity: 0;
-    display: none;
+  opacity: 0;
+  display: none;
 }
-
 .terraceComp {
-    height: 84rpx;
+  height: 84rpx;
 }
-
 .terraceComp_fix {
-    position: fixed;
-    top: -12rpx;
-    left: 0;
-    right: 0;
-    z-index: 15;
+  position: fixed;
+  top: -12rpx;
+  left: 0;
+  right: 0;
+  z-index: 15;
 }
-
 .status-box {
-    width: 100%;
-    height: 94rpx;
+  width: 100%;
+  height: 94rpx;
 }
-
 .status_tap_box {
-    position: fixed;
-    left: 0;
-    top: 0;
-    width: 100%;
-    overflow: hidden;
-    line-height: 88rpx;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    background-color: #fff;
-    z-index: 300;
-    box-shadow: 0rpx 8rpx 8rpx rgba(0, 0, 0, 0.025);
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  overflow: hidden;
+  line-height: 88rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  z-index: 300;
+  box-shadow: 0rpx 8rpx 8rpx rgba(0, 0, 0, 0.025);
 }
-
 .status-box .status-label {
-    flex-grow: 1;
-    height: 100%;
-    text-align: center;
-    font-size: 28rpx;
-    color: #353535;
-    box-sizing: border-box;
-    position: relative;
-    border-bottom: 6rpx solid transparent;
+  flex-grow: 1;
+  height: 100%;
+  text-align: center;
+  font-size: 28rpx;
+  color: #353535;
+  box-sizing: border-box;
+  position: relative;
+  border-bottom: 6rpx solid transparent;
 }
 
 .status-box .status-label.active {
-    color: #e05f0b;
-    border-bottom-color: #e05f0b;
+  color: #e05f0b;
+  border-bottom-color: #e05f0b;
 }
 
 .order-list {
-    width: 100%;
-    overflow: hidden;
+  width: 100%;
+  overflow: hidden;
 }
 
 .order-list .a-order {
-    width: 100%;
-    background-color: #fff;
-    margin-top: 24rpx;
+  width: 100%;
+  background-color: #fff;
+  margin-top: 24rpx;
 }
 
 .order-list .a-order .order-date {
-    padding: 16rpx 30rpx 20rpx;
-    line-height: 40rpx;
-    font-size: 26rpx;
-    color: #000;
-    overflow: hidden;
+  padding: 16rpx 30rpx 20rpx;
+  line-height: 40rpx;
+  font-size: 26rpx;
+  color: #000;
+  overflow: hidden;
 }
 
 .order-list .a-order .order-date .red {
-    font-size: 26rpx;
-    color: #fa2f2e;
+  font-size: 26rpx;
+  color: #fa2f2e;
 }
-
 .order-list .a-order .order-date text.r_color {
-    font-weight: 600;
+  font-weight: 600;
 }
 
 .a-order .goods-info {
-    width: 100%;
-    overflow: hidden;
+  width: 100%;
+  overflow: hidden;
 }
-
 .a-order .list-title {
-    font-size: 28rpx;
-    font-weight: 600;
-    color: #000;
-    padding: 16rpx 24rpx;
+  font-size: 28rpx;
+  font-weight: 600;
+  color: #000;
+  padding: 16rpx 24rpx;
 }
-
 .avaImgs {
-    width: 54rpx;
-    height: 54rpx;
-    overflow: hidden;
-    border-radius: 50%;
-    background-color: #f3f5f7;
-    margin-right: 20rpx;
+  width: 54rpx;
+  height: 54rpx;
+  overflow: hidden;
+  border-radius: 50%;
+  background-color: #f3f5f7;
+  margin-right: 20rpx;
 }
 
 .goods-info {
-    width: 100%;
-    line-height: 39rpx;
-    font-size: 26rpx;
-    color: #000;
-    overflow: hidden;
-    padding: 30rpx;
-    background-color: #f3f5f7;
-    box-sizing: border-box;
+  width: 100%;
+  line-height: 39rpx;
+  font-size: 26rpx;
+  color: #000;
+  overflow: hidden;
+  padding: 30rpx;
+  background-color: #f3f5f7;
+  box-sizing: border-box;
 }
-
 .goods-info-bar {
-    width: calc(100% - 190rpx);
+  width: calc(100% - 190rpx);
 }
-
 .goods-info .img-box {
-    width: 172rpx;
-    height: 120rpx;
-    overflow: hidden;
-    background-color: #fff;
-    border-radius: 12rpx;
-    margin-right: 20rpx;
+  width: 172rpx;
+  height: 120rpx;
+  overflow: hidden;
+  background-color: #fff;
+  border-radius: 12rpx;
+  margin-right: 20rpx;
 }
-
 .goods-info .img-box .goods-img {
-    width: 100%;
-    display: block;
-    height: 100%;
+  width: 100%;
+  display: block;
+  height: 100%;
 }
-
 .goods-img-container {
-    overflow: hidden;
-    box-sizing: border-box;
-    width: 100%;
-    height: 172rpx;
-    white-space: nowrap;
+  overflow: hidden;
+  box-sizing: border-box;
+  width: 100%;
+  height: 172rpx;
+  white-space: nowrap;
 }
-
 .goods-img-container .img-box {
-    display: inline-block;
+  display: inline-block;
 }
-
 .goods-img-container .img-box:last-of-type {
-    margin-right: 0;
+  margin-right: 0;
 }
-
 .goods-info .goods_name {
-    width: calc(100% - 192rpx);
-    font-size: 28rpx;
-    font-weight: 500;
-    color: #121212;
+  width: calc(100% - 192rpx);
+  font-size: 28rpx;
+  font-weight: 500;
+  color: #121212;
 }
-
 .goodsDetail_info {
-    overflow: hidden;
-    width: 180rpx;
-    line-height: 1.5;
-    text-align: right;
+  overflow: hidden;
+  width: 180rpx;
+  line-height: 1.5;
+  text-align: right;
 }
-
 .goodsDetail_info .unimport {
-    font-size: 24rpx;
-    color: #999;
+  font-size: 24rpx;
+  color: #999;
 }
-
 .goodsDetail_info .goods_price {
-    font-size: 26rpx;
-    line-height: 1.2;
-    font-weight: 600;
-    margin-bottom: 10rpx;
+  font-size: 26rpx;
+  line-height: 1.2;
+  font-weight: 600;
+  margin-bottom: 10rpx;
 }
-
 .goodsDetail_info .goods_price text {
-    font-size: 36rpx;
+  font-size: 36rpx;
 }
 
 .order-list .a-order .price-box {
-    position: relative;
-    width: 100%;
-    box-sizing: border-box;
-    padding: 16rpx 30rpx;
-    display: flex;
-    justify-content: flex-end;
-    font-size: 26rpx;
+  position: relative;
+  width: 100%;
+  box-sizing: border-box;
+  padding: 16rpx 30rpx;
+  display: flex;
+  justify-content: flex-end;
+  font-size: 26rpx;
 }
 
 .a-order .price-box .btn {
-    box-sizing: border-box;
-    text-align: center;
-    border-radius: 40rpx;
-    margin-left: 20rpx;
-    border: 1rpx solid #ccc;
-    padding: 12rpx 24rpx;
+  box-sizing: border-box;
+  text-align: center;
+  border-radius: 40rpx;
+  margin-left: 20rpx;
+  border: 1rpx solid #ccc;
+  padding: 12rpx 24rpx;
 }
-
 .order-list .a-order .price-box .total-price {
-    color: #e05f0b;
+  color: #e05f0b;
 }
 
 .a-order .price-box .topay-btn {
-    border-color: #e05f0b;
-    color: #e05f0b;
+  border-color: #e05f0b;
+  color: #e05f0b;
 }
 
 .a-order .price-box .r_topay-btn {
-    border-color: #e05f0b;
-    background-color: #e05f0b;
-    color: #fff;
+  border-color: #e05f0b;
+  background-color: #e05f0b;
+  color: #fff;
 }
 
 //拼团金
 .flot_left {
-    // float: left;
-    margin-left: auto;
+  // float: left;
+  margin-left: auto;
 }
-
 .ptz {
-    color: #18bb88;
-    font-size: 30rpx;
-    position: absolute;
-    left: 30rpx;
+  color: #18bb88;
+  font-size: 30rpx;
+  position: absolute;
+  left: 30rpx;
 }
-</style>
+</style>

src/request/request.js

@@ -60,6 +60,12 @@ uni.addInterceptor('request', {
 				});
 				// #endif
 			}, 1500);
+		}else if(args.data.code == -1){
+			uni.showToast({
+				title: args.data.msg,
+				duration: 2000,
+				icon: "none",
+			});
 		}
 	},
 	fail(err) {