Merge branch 'main' of https://gitlab.com/tea28/client

# Conflicts:
#	src/pages/to-pay-list/index.vue

src/pages/accountDetails/teaBaby.vue

@@ -22,6 +22,7 @@
           <view class="head_name" v-else-if="item.type == 3">退款到茶宝</view>
           <view class="head_name" v-else-if="item.type == 4">提现转茶宝</view>
           <view class="head_name" v-else-if="item.type == 5">赠送茶宝</view>
+          <view class="head_name" v-else-if="item.type == 6">消费茶宝</view>
           <view class="head_price g_color">{{item.act}}{{ item.num }}</view>
         </view>
         <view class="list_con flex_r flex_ac flex_jb">

src/pages/my/index.vue

@@ -174,23 +174,23 @@
 			</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">
+					<navigator class="more flexr flex_ac" url="/pages/szw-order-list/index?status=0" 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"
+					<navigator class="fun_list flex_c flex_ac" url="/pages/szw-order-list/index?status=1"
 						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"
+					<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/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"
+					<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/take.png" mode=""></image>
 						<view class="fun_text">待收货</view>
@@ -200,10 +200,10 @@
 						<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"
+					<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/refund.png" mode=""></image>
-						<view class="fun_text">退换货</view>
+						<view class="fun_text">已收货</view>
 					</navigator>
 				</view>
 			</view>

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

@@ -30,8 +30,8 @@
                             </view>
                         </view>
                     </view>
-                    <view class="price-box flex_r flex_ac">
-                        <template v-if="li.pay_status === 0">
+                    <view class="price-box flex_r flex_ac" >
+                        <template v-if="(li.pay_status === 0 || li.pay_status === 2) && li.order_status != 5">
                             <view class="btn cancel-btn" @tap="toCancel(li)">取消订单</view>
                             <view class="btn topay-btn" @tap="toPay(li)">立即支付</view>
                         </template>
@@ -39,6 +39,7 @@
                             <view class="btn cancel-btn" @click="toDetails(li)">查看订单</view>
                             <view class="btn topay-btn" @tap="toTake(li)" v-if="[0, 1].includes(li.order_status)">确认收货</view>
                         </template>
+                        
                     </view>
                 </view>
                 <!-- 未付款 end -->
@@ -80,7 +81,7 @@ export default {
         };
     },
     onLoad(options) {
-        // this.currentType = options.status ? options.status : 1;
+        this.currentType = options.status ? options.status : 1;
     },
     onShow() {
         this.loadData();
@@ -214,10 +215,12 @@ export default {
         },
     },
     computed: {
+        // 0  支付状态   1 订单状态
         tidyStatus() {
             return (da) => {
-                if (da[0] === 0) return "待支付";
-                if (da[1] === 0) return "待发货";
+                if (da[0] === 0 && da[1] != 5) return "待支付";
+                if (da[1] === 0 && da[0] == 1) return "待发货";
+                if (da[1] === 0 && da[0] != 1) return "待支付";
                 if (da[1] == 1) return "待收货";
                 if (da[1] == 2) return "已收货";
                 if (da[1] == 3) return "申请退货";

src/pages/to-pay-list/index.vue

@@ -1,90 +1,129 @@
 <template>
-    <view class="container">
-        <!-- 收货地址 -->
-        <view class="address" v-if="Data.is_sell != 1">
-            <block v-if="DefaultAddress != '' && DefaultAddress.name !='' && DefaultAddress.name != undefined">
-                <view class="add_head flex_r flex_ac flex_jb">
-                    <view class="user_info flex_r flex_ac">
-                        <view class="user_name">{{DefaultAddress.name}}</view>
-                        <view class="user_phone">{{DefaultAddress.mobile}}</view>
-                    </view>
-                    <view class="set_address flex_r flex_ac" @tap="chooseWXaddress">
-                        <image class="set_img" src="/static/img/setAddress.png" mode=""></image>
-                        <view class="set_text">修改</view>
-                    </view>
-                </view>
-                <view class="add_name mar_t20">{{DefaultAddress.address}}</view>
-            </block>
-            <block v-else>
-                <view class="add_address flex_c flex_ac flex_jc" @tap="chooseWXaddress('add')">
-                    <image class="add_icon" src="/static/img/add.png" mode=""></image>
-                    <view class="add_text">添加收货地址</view>
-                </view>
-            </block>
+  <view class="container">
+    <!-- 收货地址 -->
+    <view class="address" v-if="Data.is_sell != 1">
+      <block
+        v-if="
+          DefaultAddress != '' &&
+          DefaultAddress.name != '' &&
+          DefaultAddress.name != undefined
+        "
+      >
+        <view class="add_head flex_r flex_ac flex_jb">
+          <view class="user_info flex_r flex_ac">
+            <view class="user_name">{{ DefaultAddress.name }}</view>
+            <view class="user_phone">{{ DefaultAddress.mobile }}</view>
+          </view>
+          <view class="set_address flex_r flex_ac" @tap="chooseWXaddress">
+            <image
+              class="set_img"
+              src="/static/img/setAddress.png"
+              mode=""
+            ></image>
+            <view class="set_text">修改</view>
+          </view>
         </view>
-        <!-- 收货地址-end -->
-        <!-- 商品信息 -->
-        <view class="goods_info mar_t20">
-            <view class="info_type">{{modularName}}</view>
-            <view class="goods flex_r">
-                <image class="goods_img" :src="goodsInfo.original_img" mode=""></image>
-                <view class="goods_con flex_c flex_jc flex_jb">
-                    <view class="goods_name ellipsis2">{{goodsInfo.goods_name}}</view>
-                    <view class="flex_r flex_ac flex_jb">
-                        <view class="goods_msg">{{Data.type == 2 ? goodsInfo.trade_num + '消费积分' + '￥' + goodsInfo.trade_price : '￥' + goodsInfo.cost_price}}</view>
-                        <view class="goods_num">x {{Data.num}}</view>
-                    </view>
-                </view>
-            </view>
+        <view class="add_name mar_t20">{{ DefaultAddress.address }}</view>
+      </block>
+      <block v-else>
+        <view
+          class="add_address flex_c flex_ac flex_jc"
+          @tap="chooseWXaddress('add')"
+        >
+          <image class="add_icon" src="/static/img/add.png" mode=""></image>
+          <view class="add_text">添加收货地址</view>
         </view>
-        <!-- 商品信息-end -->
-        <!-- 订单信息 -->
-        <view class="order mar_t20">
-            <view class="order_list flex_r flex_ac flex_jb">
-                <view class="list_name">数量</view>
-                <view class="list_con">{{Data.num}}</view>
-            </view>
-            <view class="order_list flex_r flex_ac flex_jb" v-if="Data.is_sell != 1">
-                <view class="flex_r flex_ac">
-                    <view class="list_name">运费</view>
-                    <view class="list_con p_color">({{freight}}元/每套)</view>
-                </view>
-                <view class="list_con">￥{{freight * Data.num}}</view>
-            </view>
-            <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type == 2 || Data.type == 5">
-                <view class="flex_r flex_ac">
-                    <view class="list_name">茶宝</view>
-                    <view class="list_con p_color">(可用{{userinfo.cha_bao}})</view>
-                </view>
-                <view class="list_con" v-if="Data.type != 5">{{goodsInfo.treasure_price }} 茶宝</view>
-                <view class="list_con" v-else>{{goodsInfo.cha_bao }} 茶宝</view>
-            </view>
-            <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type == 2">
-                <view class="flex_r flex_ac">
-                    <view class="list_name">批发积分</view>
-                    <view class="list_con p_color">(可用{{userinfo.integral}})</view>
-                </view>
-                <view class="list_con">{{goodsInfo.trade_num * Data.num}} 批发积分</view>
-            </view>
-            <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type != 5">
-                <view class="list_name">商品金额</view>
-                <view class="list_con">￥{{(Data.type == 2 ? goodsInfo.trade_price : goodsInfo.cost_price) * Data.num || 0}}</view>
-            </view>
-            <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type != 4 && Data.type != 5">
-                <view class="list_name">可用余额</view>
-                <view class="list_con p_color">￥{{userinfo.user_money}}</view>
-            </view>
+      </block>
+    </view>
+    <!-- 收货地址-end -->
+    <!-- 商品信息 -->
+    <view class="goods_info mar_t20">
+      <view class="info_type">{{ modularName }}</view>
+      <view class="goods flex_r">
+        <image class="goods_img" :src="goodsInfo.original_img" mode=""></image>
+        <view class="goods_con flex_c flex_jc flex_jb">
+          <view class="goods_name ellipsis2">{{ goodsInfo.goods_name }}</view>
+          <view class="flex_r flex_ac flex_jb">
+            <view class="goods_msg">{{
+              Data.type == 2
+                ? goodsInfo.trade_num +
+                  "消费积分" +
+                  "￥" +
+                  goodsInfo.trade_price
+                : "￥" + goodsInfo.cost_price
+            }}</view>
+            <view class="goods_num">x {{ Data.num }}</view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <!-- 商品信息-end -->
+    <!-- 订单信息 -->
+    <view class="order mar_t20">
+      <view class="order_list flex_r flex_ac flex_jb">
+        <view class="list_name">数量</view>
+        <view class="list_con">{{ Data.num }}</view>
+      </view>
+      <view class="order_list flex_r flex_ac flex_jb" v-if="Data.is_sell != 1">
+        <view class="flex_r flex_ac">
+          <view class="list_name">运费</view>
+          <view class="list_con p_color">({{ freight }}元/每套)</view>
         </view>
-        <!-- 订单信息-end -->
-        <!-- 底部操作栏 -->
-        <view class="bar flex_r flex_ac flex_jb">
-            <view class="bar_info flex_r flex_ac">待支付<text>￥{{obligation}}</text></view>
-            <view class="pay_btn flex_r flex_ac flex_jc" @tap="payment">立即支付</view>
+        <view class="list_con">￥{{ freight * Data.num }}</view>
+      </view>
+      <view
+        class="order_list flex_r flex_ac flex_jb"
+        v-if="Data.type == 2 || Data.type == 5"
+      >
+        <view class="flex_r flex_ac">
+          <view class="list_name">茶宝</view>
+          <view class="list_con p_color">(可用{{ userinfo.cha_bao }})</view>
         </view>
-        <!-- 底部操作栏-end -->
-        <!-- 收获地址弹窗 -->
-        <userAddress ref="userAddress" @addressConfirm="loadDa" />
+        <view class="list_con" v-if="Data.type != 5"
+          >{{ goodsInfo.treasure_price }} 茶宝</view
+        >
+        <view class="list_con" v-else>{{ goodsInfo.cha_bao }} 茶宝</view>
+      </view>
+      <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type == 2">
+        <view class="flex_r flex_ac">
+          <view class="list_name">批发积分</view>
+          <view class="list_con p_color">(可用{{ userinfo.integral }})</view>
+        </view>
+        <view class="list_con"
+          >{{ goodsInfo.trade_num * Data.num }} 批发积分</view
+        >
+      </view>
+      <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type != 5">
+        <view class="list_name">商品金额</view>
+        <view class="list_con"
+          >￥{{
+            (Data.type == 2 ? goodsInfo.trade_price : goodsInfo.cost_price) *
+              Data.num || 0
+          }}</view
+        >
+      </view>
+      <view
+        class="order_list flex_r flex_ac flex_jb"
+        v-if="Data.type != 4 && Data.type != 5"
+      >
+        <view class="list_name">可用余额</view>
+        <view class="list_con p_color">￥{{ userinfo.user_money }}</view>
+      </view>
+    </view>
+    <!-- 订单信息-end -->
+    <!-- 底部操作栏 -->
+    <view class="bar flex_r flex_ac flex_jb">
+      <view class="bar_info flex_r flex_ac"
+        >待支付<text>￥{{ obligation }}</text></view
+      >
+      <view class="pay_btn flex_r flex_ac flex_jc" @tap="payment"
+        >立即支付</view
+      >
     </view>
+    <!-- 底部操作栏-end -->
+    <!-- 收获地址弹窗 -->
+    <userAddress ref="userAddress" @addressConfirm="loadDa" />
+  </view>
 </template>
 <script>
 let page = 1;
@@ -93,375 +132,398 @@ var appEv = app.$vm.$options;
 import { get, post, u_post } from "@/request/api.js";
 import { ToPayOpre } from "@/utils/reqTools.js";
 let toPayOpre = new ToPayOpre();
-import userAddress from "pages/xghc-addrress/userAddress"
+import userAddress from "pages/xghc-addrress/userAddress";
 export default {
-    data() {
-        return {
-            Data: {},
-            goodsInfo: '', // 商品信息
-            modularName: '', // 商品类型
-            DefaultAddress: '', // 用户默认地址
-            basicsInfo: '', // 订单信息
-
-            freight: 0, //运费
-            userinfo: {},
-            obligation: 0, //待支付
-        };
-    },
-    components: {
-        userAddress,
-    },
-    onLoad(e) {
-        this.Data = e
-
-        this.userinfo = uni.getStorageSync('userinfo');
-        // 1零售 2批发 3精品 4今日值买
-        this.modularName = e.type == 1 ? "零售专区" : e.type == 2 ? "批发专区" : e.type == 3 ? "精品专区" : "今日值买"
+  data() {
+    return {
+      Data: {},
+      goodsInfo: "", // 商品信息
+      modularName: "", // 商品类型
+      DefaultAddress: "", // 用户默认地址
+      basicsInfo: "", // 订单信息
+
+      freight: 0, //运费
+      userinfo: {},
+      obligation: 0, //待支付
+    };
+  },
+  components: {
+    userAddress,
+  },
+  onLoad(e) {
+    this.Data = e;
+    this.loadData(e);
+    this.loadAddress();
+
+    this.userinfo = uni.getStorageSync("userinfo");
+    // 1零售 2批发 3精品 4今日值买
+    this.modularName =
+      e.type == 1
+        ? "零售专区"
+        : e.type == 2
+        ? "批发专区"
+        : e.type == 3
+        ? "精品专区"
+        : "今日值买";
+  },
+  mounted() {
+    // this.$refs.popup.open('top');
+  },
+  methods: {
+    loadData(da) {
+      post("goods/goodsDetail", da).then((res) => {
+        if (res.code === 0) {
+          this.goodsInfo = res.data.data;
+          post("goods/freight", { type: da.type }).then((res) => {
+            if (res.code === 0) this.freight = res.data.freight;
+
+            // 计算待支付
+            let p =
+              this.Data.type == 2
+                ? this.goodsInfo.trade_price
+                : this.goodsInfo.cost_price; //商品单价
+            let y = this.Data.is_sell == 1 ? 0 : this.freight; // 运费   寄售的话退运费为0
+            let a = (p * this.Data.num + y * this.Data.num) * 100; //商品总价
+            let b = (a - this.userinfo.user_money * 100) / 100; //待支付金额
+            if (this.Data.type == 4) this.obligation = a / 100;
+            else if (this.Data.type == 5) {
+              this.obligation = a / 100;
+            } else this.obligation = b > 0 ? b : 0;
+          });
+        }
+      });
     },
-    onShow(){
-        this.loadData(this.Data);
-        this.loadAddress();
+    // 获取用户地址
+    loadAddress() {
+      post("user/addressList").then((res) => {
+        if (res.code === 0) {
+          let da = res.data.data;
+          for (const i of da) {
+            if (i.status == 1) {
+              this.DefaultAddress = i;
+              break;
+            } else this.DefaultAddress = da[0];
+          }
+          // #ifdef  MP-WEIXIN
+          if (!da.length && this.Data.is_sell != 1) this.getwexinAddress();
+          // #endif
+        }
+      });
     },
-    methods: {
-        loadData(da) {
-            post("goods/goodsDetail", da).then(res => {
-                if (res.code === 0) {
-                    this.goodsInfo = res.data.data
-                    post("goods/freight", { type: da.type }).then(res => {
-                        if (res.code === 0) this.freight = res.data.freight;
-
-                        // 计算待支付
-                        let p = this.Data.type == 2 ? this.goodsInfo.trade_price : this.goodsInfo.cost_price; //商品单价
-                        let y = this.Data.is_sell == 1 ? 0 : this.freight; // 运费   寄售的话退运费为0
-                        let a = (p * this.Data.num + y * this.Data.num) * 100; //商品总价
-                        let b = (a - this.userinfo.user_money * 100) / 100; //待支付金额
-                        if(this.Data.type == 4) this.obligation = a / 100;
-                        else if(this.Data.type == 5){ this.obligation = a / 100;}
-                        else this.obligation = b > 0 ? b : 0
-                    })
-                }
-            })
-        },
-        // 获取用户地址
-        loadAddress() {
-            post("user/addressList").then(res => {
-                if (res.code === 0) {
-                    let da = res.data.data;
-                    for (const i of da) {
-                        if (i.status == 1) {
-                            this.DefaultAddress = i;
-                            break;
-                        } else this.DefaultAddress = da[0]
-                    }
-                    // #ifdef  MP-WEIXIN
-                    if(!da.length && this.Data.is_sell != 1) this.getwexinAddress()
-                    // #endif
-                }
-            })
-        },
-        //获取微信的收货地址
-        getwexinAddress(){
-            uni.chooseAddress({
-                success(res) {
-                    if(res.errMsg == "chooseAddress:ok"){
-                        let data = {
-                            address: res.provinceName + res.cityName + res.countyName + res.detailInfo,
-                            mobile: res.telNumber,
-                            name: res.userName,
-                            is_default: 0
-                        }
-                        post("user/addAddress", data).then(res => {
-                            if (res.code === 0) {
-                                appEv.errTips(res.msg);
-                                this.loadAddress();
-                            }
-                        })
-                    }
-                }
-            })
+    //获取微信的收货地址
+    getwexinAddress() {
+      uni.chooseAddress({
+        success(res) {
+          if (res.errMsg == "chooseAddress:ok") {
+            let data = {
+              address:
+                res.provinceName +
+                res.cityName +
+                res.countyName +
+                res.detailInfo,
+              mobile: res.telNumber,
+              name: res.userName,
+              is_default: 0,
+            };
+            post("user/addAddress", data).then((res) => {
+              if (res.code === 0) {
+                appEv.errTips(res.msg);
+                this.loadAddress();
+              }
+            });
+          }
         },
+      });
+    },
 
-        chooseWXaddress(va) {
-            // this.getwexinAddress()
-            let a = va != "add" ? this.DefaultAddress.id : 'add'
-            this.$refs.userAddress.open(a);
+    chooseWXaddress(va) {
+      // this.getwexinAddress()
+      let a = va != "add" ? this.DefaultAddress.id : "add";
+      this.$refs.userAddress.open(a);
 
-            // this.goto("/pages/xghc-addrress/userAddress");
-        },
-        // 支付
-        payment() {
-            // #ifdef  H5
-            let type = "H5";
-            // #endif
-            // #ifdef  APP
-            let type = "app";
-            // #endif
-            // #ifdef  MP-WEIXIN
-            let type = "jsapi";
-            // #endif
-
-            if (!this.DefaultAddress.id) {
-                appEv.errTips('请选择地址')
-                return
-            }
-            post('goods/submitOrder', {
-                ...this.Data,
-                address_id: this.DefaultAddress.id,
-                trade_type: type
-            }).then(res => {
-                if (res.code === 0) {
-					if(res.data.length !== 0){
-						toPayOpre.toPay(res.data, (rea) => {
-							if (!rea) {
-								// 支付成功
-								appEv.errTips('支付成功')
-								setTimeout(() => {
-									this.goto("/pages/szw-order-list/index")
-								}, 1500);
-							} else {
-								// 支付失败
-								appEv.errTips('支付已取消')
-							}
-						});
-					}else{
-						appEv.errTips('支付成功')
-						setTimeout(() => {
-                            if(this.Data.is_sell != 1) this.goto("/pages/szw-order-list/index")
-							else this.goto("/pages/account/consignment")
-						}, 1500);
-					}
+      // this.goto("/pages/xghc-addrress/userAddress");
+    },
+    // 支付
+    payment() {
+      // #ifdef  H5
+      let type = "H5";
+      // #endif
+      // #ifdef  APP
+      let type = "app";
+      // #endif
+      // #ifdef  MP-WEIXIN
+      let type = "jsapi";
+      // #endif
+
+      if (!this.DefaultAddress.id) {
+        appEv.errTips("请选择地址");
+        return;
+      }
+      post("goods/submitOrder", {
+        ...this.Data,
+        address_id: this.DefaultAddress.id,
+        trade_type: type,
+      }).then((res) => {
+        if (res.code === 0) {
+          if (res.data.length !== 0) {
+            toPayOpre.toPay(res.data, (rea) => {
+              if (!rea) {
+                // 支付成功
+                appEv.errTips("支付成功");
+                if (this.Data.type == 2 && this.Data.is_sell == 1) {
+                    setTimeout(() => {
+                    this.goto("/pages/account/consignment");
+                  }, 1500);
+                } else {
+                  setTimeout(() => {
+                    this.goto("/pages/szw-order-list/index");
+                  }, 1500);
                 }
-            })
-        },
-
-        loadDa(da) {
-            this.DefaultAddress = da;
+              } else {
+                // 支付失败
+                appEv.errTips("支付已取消");
+              }
+            });
+          } else {
+            appEv.errTips("支付成功");
+            setTimeout(() => {
+              if (this.Data.is_sell != 1)
+                this.goto("/pages/szw-order-list/index");
+              else this.goto("/pages/account/consignment");
+            }, 1500);
+          }
         }
-    }
-}
+      });
+    },
+
+    loadDa(da) {
+      this.DefaultAddress = da;
+    },
+  },
+};
 </script>
 <style lang="scss">
 // 页面配置
 page {
-    background: #f5f5f5;
+  background: #f5f5f5;
 }
 
 .container {
-    padding: 20rpx;
-    box-sizing: border-box;
+  padding: 20rpx;
+  box-sizing: border-box;
 }
 
 // 页面配置-end
 
 // 收货地址
 .user_phone {
-    font-size: 26rpx;
-    color: #222;
+  font-size: 26rpx;
+  color: #222;
 }
 
 .set_text {
-    font-size: 24rpx;
-    color: #868686;
+  font-size: 24rpx;
+  color: #868686;
 }
 
 .set_img {
-    width: 24rpx;
-    height: 24rpx;
-    margin-right: 9rpx;
+  width: 24rpx;
+  height: 24rpx;
+  margin-right: 9rpx;
 }
 
 .add_address {
-    width: 100%;
-    overflow: hidden;
-    height: 109rpx;
+  width: 100%;
+  overflow: hidden;
+  height: 109rpx;
 }
 
 .add_icon {
-    width: 60rpx;
-    height: 60rpx;
-    margin-bottom: 12rpx;
+  width: 60rpx;
+  height: 60rpx;
+  margin-bottom: 12rpx;
 }
 
 .user_name {
-    font-size: 32rpx;
-    color: #000;
-    margin-right: 46rpx;
+  font-size: 32rpx;
+  color: #000;
+  margin-right: 46rpx;
 }
 
 .add_name {
-    width: 448rpx;
-    overflow: hidden;
-    font-size: 24rpx;
-    color: #868686;
+  width: 448rpx;
+  overflow: hidden;
+  font-size: 24rpx;
+  color: #868686;
 }
 
 .add_text {
-    font-size: 24rpx;
-    color: #868686;
-    font-family: "SourceHanSansCN-Normal";
+  font-size: 24rpx;
+  color: #868686;
+  font-family: "SourceHanSansCN-Normal";
 }
 
 .address {
-    width: 100%;
-    overflow: hidden;
-    padding: 28rpx;
-    box-sizing: border-box;
-    background: #fff;
-    border-radius: 12rpx;
+  width: 100%;
+  overflow: hidden;
+  padding: 28rpx;
+  box-sizing: border-box;
+  background: #fff;
+  border-radius: 12rpx;
 }
 
 // 收货地址-end
 
 // 商品信息
 .goods:nth-last-child(1) {
-    margin-bottom: 0;
+  margin-bottom: 0;
 }
 
 .goods_num {
-    font-size: 26rpx;
-    color: #989898;
+  font-size: 26rpx;
+  color: #989898;
 }
 
 .goods_con {
-    width: calc(100% - 202rpx - 36rpx);
-    overflow: hidden;
+  width: calc(100% - 202rpx - 36rpx);
+  overflow: hidden;
 }
 
 .goods {
-    width: 100%;
-    overflow: hidden;
-    margin-bottom: 20rpx;
-    align-items: initial;
+  width: 100%;
+  overflow: hidden;
+  margin-bottom: 20rpx;
+  align-items: initial;
 }
 
 .goods_img {
-    width: 202rpx;
-    height: 140rpx;
-    margin-right: 36rpx;
-    border-radius: 12rpx;
+  width: 202rpx;
+  height: 140rpx;
+  margin-right: 36rpx;
+  border-radius: 12rpx;
 }
 
 .goods_name {
-    font-size: 34rpx;
-    color: #1B1B1B;
-    font-family: "SourceHanSansCN-Bold";
-    font-weight: bold;
+  font-size: 34rpx;
+  color: #1b1b1b;
+  font-family: "SourceHanSansCN-Bold";
+  font-weight: bold;
 }
 
 .goods_msg {
-    overflow: hidden;
-    font-size: 26rpx;
-    color: #18BB88;
-    font-family: 'SourceHanSansCN-Medium';
-    font-weight: 500;
+  overflow: hidden;
+  font-size: 26rpx;
+  color: #18bb88;
+  font-family: "SourceHanSansCN-Medium";
+  font-weight: 500;
 }
 
 .info_type {
-    font-size: 30rpx;
-    color: #353535;
-    font-family: "SourceHanSansCN-Bold";
-    font-weight: bold;
-    margin-bottom: 43rpx;
+  font-size: 30rpx;
+  color: #353535;
+  font-family: "SourceHanSansCN-Bold";
+  font-weight: bold;
+  margin-bottom: 43rpx;
 }
 
 .goods_info {
-    width: 100%;
-    overflow: hidden;
-    padding: 28rpx;
-    background: #fff;
-    border-radius: 12rpx;
-    box-sizing: border-box;
+  width: 100%;
+  overflow: hidden;
+  padding: 28rpx;
+  background: #fff;
+  border-radius: 12rpx;
+  box-sizing: border-box;
 }
 
 // 商品信息-end
 
 // 订单信息
 .list_name {
-    width: 112rpx;
-    text-align-last: justify;
-    font-size: 26rpx;
-    color: rgba(0,0,0,.8);
-    font-family: SourceHanSansCN-Medium;
-    font-weight: 700;
+  width: 112rpx;
+  text-align-last: justify;
+  font-size: 26rpx;
+  color: rgba(0, 0, 0, 0.8);
+  font-family: SourceHanSansCN-Medium;
+  font-weight: 700;
 }
 
 .order_list:nth-last-child(1) {
-    margin-bottom: 0;
+  margin-bottom: 0;
 }
 
 .order_list {
-    width: 100%;
-    overflow: hidden;
-    margin-bottom: 30rpx;
+  width: 100%;
+  overflow: hidden;
+  margin-bottom: 30rpx;
 }
 
 .list_con {
-    font-size: 24rpx;
-    color: #000;
-    font-family: "SourceHanSansCN-Medium";
-    font-weight: bold;
-    line-height: 1;
+  font-size: 24rpx;
+  color: #000;
+  font-family: "SourceHanSansCN-Medium";
+  font-weight: bold;
+  line-height: 1;
 }
 
 .order {
-    width: 100%;
-    overflow: hidden;
-    padding: 28rpx;
-    box-sizing: border-box;
-    background: #fff;
-    border-radius: 12rpx;
+  width: 100%;
+  overflow: hidden;
+  padding: 28rpx;
+  box-sizing: border-box;
+  background: #fff;
+  border-radius: 12rpx;
 }
 
 .list_name text {
-    font-size: 26rpx;
-    color: rgba(0, 0, 0, .8);
-    font-family: "SourceHanSansCN-Medium";
-    font-weight: bold;
-    line-height: 1;
+  font-size: 26rpx;
+  color: rgba(0, 0, 0, 0.8);
+  font-family: "SourceHanSansCN-Medium";
+  font-weight: bold;
+  line-height: 1;
 }
 
 .p_color {
-    color: #FF6D44;
+  color: #ff6d44;
 }
 
 // 订单信息-end
 
 // 底部操作栏
 .bar_info {
-    font-size: 24rpx;
-    color: #000;
-    font-family: "SourceHanSansCN-Medium";
-    font-weight: bold;
+  font-size: 24rpx;
+  color: #000;
+  font-family: "SourceHanSansCN-Medium";
+  font-weight: bold;
 }
 
 .bar_info text {
-    font-size: 30rpx;
-    color: #FF6D44;
-    font-family: "SourceHanSansCN-Medium";
-    font-weight: bold;
+  font-size: 30rpx;
+  color: #ff6d44;
+  font-family: "SourceHanSansCN-Medium";
+  font-weight: bold;
 }
 
 .pay_btn {
-    width: 187rpx;
-    height: 72rpx;
-    font-size: 30rpx;
-    font-family: "SourceHanSansCN-Medium";
-    font-weight: bold;
-    background: #2DB48A;
-    border-radius: 36rpx;
-    color: #fff;
+  width: 187rpx;
+  height: 72rpx;
+  font-size: 30rpx;
+  font-family: "SourceHanSansCN-Medium";
+  font-weight: bold;
+  background: #2db48a;
+  border-radius: 36rpx;
+  color: #fff;
 }
 
 .bar {
-    width: 100%;
-    overflow: hidden;
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    background: #fff;
-    box-shadow: 0 0 10rpx rgba(0, 0, 0, .15);
-    padding: 14rpx 30rpx;
-    box-sizing: border-box;
+  width: 100%;
+  overflow: hidden;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  background: #fff;
+  box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.15);
+  padding: 14rpx 30rpx;
+  box-sizing: border-box;
 }
 
 // 底部操作栏-end