diff --git a/pages.json b/pages.json
index c4c32ca..57960f7 100644
--- a/pages.json
+++ b/pages.json
@@ -22,6 +22,13 @@
"navigationBarTitleText" : ""
}
},
+ {
+ "path" : "pages/mine/mineorders/mineorders",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
+ }
+ },
{
"path": "pages/Shopping-cart/productmain/productmain",
"style" :
diff --git a/pages/mine/main/main.vue b/pages/mine/main/main.vue
index 431f8c7..66c5993 100644
--- a/pages/mine/main/main.vue
+++ b/pages/mine/main/main.vue
@@ -17,12 +17,12 @@
</view>
<view class="flex-col relative group_2">
<view class="flex-row equal-division">
- <view class="flex-col items-center group_3 group_1">
+ <view class="flex-col items-center group_3 group_1" @click="goto()">
<image
class="image_2"
:src="dingdan"
/>
- <text class="font text_4">总订单</text>
+ <text class="font text_4" >总订单</text>
</view>
<view class="flex-col items-center group_3 group_4">
<image
@@ -115,6 +115,11 @@ import setting_s from '@/pages/mine/main/img/setting_s.png'
import tuikuan from '@/pages/mine/main/img/tuikuan.png'
import you from '@/pages/mine/main/img/you.png'
+const goto=()=>{
+ uni.navigateTo({
+ url:"/pages/mine/mineorders/mineorders"
+ })
+}
const store = userStore()
const login = () => {
diff --git a/pages/mine/mineorders/mineorders.vue b/pages/mine/mineorders/mineorders.vue
index 3870660..4844419 100644
--- a/pages/mine/mineorders/mineorders.vue
+++ b/pages/mine/mineorders/mineorders.vue
@@ -1,331 +1,431 @@
<template>
- <view class="flex-col page">
- <view class="flex-col section">
- <view class="flex-col justify-start section_2">
- <view class="flex-row justify-center items-center section_3">
- <image
- class="image"
- src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=fdbd983b280698c0b56f8e9ecc269b70.png"
- />
- <text class="ml-4 font text">搜索订单</text>
- </view>
+ <!-- <view class="flex-row relative page">
+ <view class="aaa">
+ <view class="bbb">
+ <view class="ccc"
+ v-for="(item, index) in sort"
+ :key="index"
+ :style="getBoxStyle(index)"
+ @click="changeTypes(item , index)"
+ >
+ <image class="eee"
+ :src="item.imgurl" />
+ <text class="ddd">{{ item.name }}</text>
+ </view>
+ </view>
+ </view>
+ <view class="pos_5">
+ <view class="flex-row section_9 list-item_2 mt-5" v-for="(item, index) in productList" :key="index" @click="goToProduct(item)">
+ <image class="self-center image_4"
+ :src="item.goodImg" />
+ <view style="width: 220rpx;" class="flex-col items-start self-center group_3">
+ <text class="font_2 text_5">{{ item.name }}</text>
+ <text class="font_3 mt-13">{{ item.intro }}</text>
+ <text class="font mt-13">￥{{ item.price }}</text>
+ </view>
+ <image class="self-start image_5"
+ :src="add_img" />
+ </view>
+ </view>
+ </view> -->
+ <template>
+ <!-- <view v-for="zhuangtai in Status.orders" :key="zhuangtai.id">
+ {{zhuangtai.orderStatus}}
+ </view> -->
+ <view class="container">
+ <view class="order-tabs">
+ <view class="tab-item" :class="{active: orderStatus === '全部'}" @click="changeTab('全部')">全部</view>
+ <view class="tab-item" :class="{active: orderStatus === '代支付'}" @click="changeTab('代支付')">代支付</view>
+ <view class="tab-item" :class="{active: orderStatus === '代发货'}" @click="changeTab('代发货')">代发货</view>
+ <view class="tab-item" :class="{active: orderStatus === '已发货'}" @click="changeTab('已发货')">已发货</view>
+ <view class="tab-item" :class="{active: orderStatus === '售后'}" @click="changeTab('售后')">售后</view>
</view>
- <view class="flex-col section_4">
- <view class="flex-row justify-between self-stretch group">
- <text class="font_2 text_2">全部</text>
- <text class="font_2 text_3">待付款</text>
- <text class="font_2">待发货</text>
- <text class="font_2">待收货</text>
- <text class="font_2 text_4">退款/售后</text>
- </view>
- <view class="self-start section_5"></view>
+ <view class="order-list">
+ <view v-for="order in Status.orders" :key="order.id" class="order-item">
+ <view v-for="item in order.orderItemList" :key="item.id">
+ {{ item.goodSnapshot.name }}
+ </view>
+ <view v-for="item in order.orderItemList" :key="item.id">
+ {{ item.goodSnapshot.type }}
+ </view>
+ <view v-for="item in order.orderItemList" :key="item.id">
+ {{ item.goodSnapshot.price }}
+ </view>
+ </view>
</view>
</view>
- <view class="flex-col section_6 mt-15">
- <text class="self-end font_3 text_5">等待买家付款</text>
- <view class="flex-row items-baseline self-stretch group_2">
- <text class="font_4 text_6">订单编号：</text>
- <text class="font_4 text_7 ml-5">E20241005095840091406189</text>
- </view>
- <view class="flex-row justify-between self-stretch group_3">
- <view class="flex-row">
- <image
- class="image_2"
- src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=841a568e645c15ed7f22f808c4b71453.png"
- />
- <view class="ml-18 flex-col self-start">
- <view class="flex-row self-stretch">
- <text class="font text_8">非遗绒花</text>
- <text class="ml-4 font text_9">【材料包】</text>
- </view>
- <text class="self-start font_4 text_12 mt-11">已选种类：紫色</text>
- </view>
- </view>
- <view class="flex-col self-start group_4">
- <view class="flex-row items-center self-stretch">
- <text class="text_10">138.</text>
- <image
- class="shrink-0 image_3 image_4"
- src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=c19714fa97c855c9c925359cea5f932e.png"
- />
- <text class="font_5 text_11">00</text>
- </view>
- <text class="mt-22 self-end font text_13">×1</text>
- </view>
- </view>
- <view class="flex-row justify-end items-center self-stretch group_5 view">
- <text class="font_6 text_14">已优惠：</text>
- <image
- class="image_3"
- src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=8baea7ad504b97f55d44d57ebf139e5a.png"
- />
- <view class="group_6">
- <text class="font_7 text_15">50</text>
- <text class="font_5">.00</text>
- </view>
- </view>
- <view class="flex-row justify-end items-center self-stretch group_5 view_2">
- <text class="font_6 text_16">需付款：</text>
- <image
- class="image_3"
- src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=678e4e6a1249193068520fa98adb13ef.png"
- />
- <view class="group_7">
- <text class="font_7 text_17">88</text>
- <text class="font_5 text_18">.00</text>
- </view>
- </view>
- <view class="flex-row justify-end self-stretch group_5 view_3">
- <view class="flex-col justify-start items-center text-wrapper"><text class="font text_19">取消订单</text></view>
- <view class="flex-col justify-start items-center text-wrapper_2 ml-15">
- <text class="font_3 text_20">立即付款</text>
- </view>
- </view>
- </view>
- </view>
+ </template>
</template>
<script setup>
-
-
+import {
+ ref,onMounted, toRaw
+} from 'vue';
+import { baseUrl, testUrl , suiUrl} from '@/api/request';
+import img1 from '@/pages/store-home/main/img/cailiaobao.png';
+import img2 from '@/pages/store-home/main/img/shouchiwu.png';
+import img3 from '@/pages/store-home/main/img/toushi.png';
+import img4 from '@/pages/store-home/main/img/dingzhi.png';
+import img5 from '@/pages/store-home/main/img/jifenduihuan.png';
+import product_img from '@/pages/store-home/main/img/shangpingtupian.png';
+import add_img from '@/pages/store-home/main/img/tianjia.png';
+import sousuokuang from '@/pages/store-home/main/img/sousuokuang.png';
+
+const currentColor = ref(0);
+const sort =ref([{}]) //商品类别对象数组
+const headerList = ref([{}]) //类别标题和介绍
+const productList = ref([{}]) //类别下对应的商品
+onMounted( async () => {
+ await Getsort()
+ await changeTypes( sort.value[0] , 0 )
+ await Getorder()
+ Status.displayedOrders = Status.orders;
+})
+const userInfo=ref({
+ userInfo:wx.getStorageSync('userInfo')
+})
+const Getorder = async () => {
+ const res = await uni.request({
+ url: baseUrl + '/order/list',
+ method: 'POST',
+ data: {
+ // id:userInfo.value.userInfo.id ,
+ id:215
+ }
+ })
+ if (res.data.code === 1) {
+ Status.value.orders=res.data.data;
+ // for(let key in res.data.data){
+ // Status.value.orders[key]=res.data.data[key]
+ // }
+ console.log(Status.value.orders[0].orderStatus)//待支付
+ console.log(res.data.data[0].orderStatus)//待支付
+ }else{
+ console.log("没拿到用户数据")
+ }
+};
+//订单类别
+const Status =ref({
+ orderStatus: '全部',
+ orders:[
+ {
+
+ }
+ ],
+
+ displayedOrders: []
+})
+const changeTab = (tab) => {
+ for(let key in Status.value.orders){
+ tab[key]={
+ Status.value.orders[key].orderStatus
+ }
+ }
+ // Status.value.orders.orderStatus = tab;
+ if (tab === '全部') {
+ Status.value.displayedOrders = Status.value.orders;
+ } else {
+ Status.value.displayedOrders = Status.value.orders.filter(order => {
+ switch (tab) {
+ case '待支付':
+ return order.orderStatus === '代支付';
+ case '代发货':
+ return order.orderStatus === '代发货';
+ case '已发货':
+ return order.orderStatus === '已发货';
+ case '售后':
+ return order.orderStatus === '售后';
+ default:
+ return false;
+ }
+ });
+ }
+}
+
+//console.log(userInfo.value.userInfo.id)//216
+//获取商品分类
+const Getsort = async ()=>{
+ const res = await uni.request({
+ url: testUrl + '/category/list',
+ method:'POST'
+ })
+ if(res.data.code === 1){
+ for(let key in res.data.data) {
+ sort.value[key] = {//类别列表
+ name : res.data.data[key].typeName,
+ imgurl : res.data.data[key].typeUrl,
+ id : res.data.data[key].id
+ }//标题列表
+ headerList.value[key] = {
+ name : res.data.data[key].typeName,
+ typeIntro : res.data.data[key].typeIntro
+ }
+ }
+ } else {
+ uni.showToast({ //提示请求错误
+ title: '请求商品分类错误',
+ icon: 'none',
+ duration: 2000
+ })
+ }
+}
+//更改类别
+const changeTypes = async (item , index) =>{
+ currentColor.value = index
+ const res = await uni.request({
+ url: testUrl + '/category/list/type',
+ method: 'POST',
+ data: {
+ id : item.id
+ }
+ })
+ if(res.data.code === 1) {
+ productList.value = res.data.data[item.id]
+ } else {
+ uni.showToast({ //商品请求错误
+ title: '更改类别错误',
+ icon: 'none',
+ duration: 2000
+ })
+ }
+}
+//更改box颜色
+const getBoxStyle = (index) => ({
+ backgroundColor: currentColor.value === index ? 'brown' : '#fffef8'
+});
+
+const goToProduct = (item) => {
+ console.log(item,123);
+ uni.navigateTo({
+ url: '../../../pages/store-home/ProductDetails/ProductDetails?info=' + JSON.stringify(item)
+ })
+}
</script>
<style lang="scss" scoped>
-.mt-15 {
- margin-top: 28.13rpx;
+// .navbar {
+// background-color: #333;
+// color: #fff;
+// padding: 10px;
+// }
+// .bbb {
+// display: flex;
+// align-items: center;
+// }
+// .ccc {
+// display: flex;
+// flex-direction: column;
+// align-items: center;
+// margin: 20rpx;
+// }
+// .eee {
+// width: 30px;
+// height: 30px;
+// }
+// .ddd {
+// font-size: 14px;
+// }
+// .flex-row {
+// display: flex;
+// }
+// .flex-item {
+// flex: 1;
+// }
+// .ml-15 {
+// margin-left: 28.13rpx;
+// }
+// .ml-3 {
+// margin-left: 5.63rpx;
+// }
+// .mt-3 {
+// margin-top: 5.63rpx;
+// text-align: center;
+// }
+// .mt-13 {
+// margin-top: 17.38rpx;
+// }
+// .mt-5 {
+// margin-top: 9.38rpx;
+// }
+// .page {
+// background-color: #f5f5dc;
+// // height: 1413.75rpx;
+// width: 100%;
+// overflow-y: auto;
+// overflow-x: hidden;
+// height: 100vh;
+// overflow: hidden;
+// }
+// .section {
+// padding: 22.5rpx 39.28rpx 16.88rpx;
+// background-color: #f7de98;
+// }
+// .pos_8 {
+// position: absolute;
+// left: 0;
+// right: 0;
+// top: 0;
+// }
+// .text {
+// color: #c1651a;
+// font-size: 37.5rpx;
+// font-family: STFangsong;
+// line-height: 36.19rpx;
+// }
+// .section_2 {
+// padding: 5.63rpx 15rpx 8.44rpx;
+// background-color: #ffffff;
+// border-radius: 28.13rpx;
+// height: 63.75rpx;
+// width: 500.69rpx;
+// }
+// .image {
+// width: 50.63rpx;
+// height: 50.63rpx;
+// }
+// .text-wrapper {
+// margin-right: 17.42rpx;
+// }
+// .font {
+// font-size: 26.25rpx;
+// font-family: STFangsong;
+// line-height: 18rpx;
+// color: #ff0000;
+// }
+// .image-wrapper {
+// background-color: #ffffff;
+// border-radius: 28.13rpx;
+// overflow: hidden;
+// border: solid 9.38rpx #ffffff;
+// }
+// .pos_1 {
+// position: absolute;
+// left: 22.5rpx;
+// right: 24.38rpx;
+// top: 118.13rpx;
+// }
+// .image_2 {
+// width: 91.25vw;
+// height: 37.5vw;
+// }
+
+// .group {
+// margin: auto;
+// width: 137.81rpx;
+// }
+// //类别列表
+// .list-item {
+// padding: 11.25rpx 0 9.94rpx;
+// background-color: #fffef8;
+// border-radius: 9.38rpx;
+// }
+// .list-item:first-child {
+// margin-top: 0;
+// }
+// .image_3 {
+// border-radius: 0rpx 9.38rpx 9.38rpx 0rpx;
+// width: 60rpx;
+// height: 60rpx;
+// }
+// .font_4 {
+// font-size: 25rpx;
+// font-family: STFangsong;
+// line-height: 28.26rpx;
+// color: #c1651a;
+// }
+// .section_4 {
+// padding-bottom: 879.38rpx;
+// background-color: #f8e8c1;
+// border-radius: 0rpx 18.75rpx 0rpx 0rpx;
+// width: 600.13rpx;
+// }
+// .pos_4 {
+// position: absolute;
+// right: 0;
+// top: 440.63rpx;
+// }
+// .section_5 {
+// padding: 18.06rpx 16.24rpx 14.94rpx;
+// background-color: #fffef8;
+// border-radius: 0rpx 18.75rpx 0rpx 0rpx;
+// width: 598.13rpx;
+// }
+// .font_2 {
+// font-size: 30rpx;
+// font-family: STFangsong;
+// line-height: 28.26rpx;
+// color: #000000;
+// }
+// .font_3 {
+// font-size: 22.5rpx;
+// font-family: STFangsong;
+// line-height: 21.56rpx;
+// color: #727272;
+// }
+// .text_3 {
+// line-height: 21.15rpx;
+// }
+// .pos_5 {
+// position: absolute;
+// top: 120rpx;
+// width: 95%;
+// margin: 2.5%;
+// }
+// .section_9 {
+// padding: 20.63rpx 22.88rpx 22.5rpx;
+// background-color: #fffef8;
+// border-radius: 9.38rpx;
+// right: 13.13rpx;
+// }
+// .list-item_2:first-child {
+// margin-top: 0;
+// }
+// .image_4 {
+// border-radius: 9.38rpx;
+// width: 131.25rpx;
+// height: 131.25rpx;
+// }
+// .group_3 {
+// margin-left: 24.84rpx;
+// }
+// .text_5 {
+// line-height: 28.65rpx;
+// }
+// .image_5 {
+// margin: 75rpx 5.63rpx 0 107.96rpx;
+// border-radius: 9.38rpx;
+// width: 56.25rpx;
+// height: 56.25rpx;
+// }
+.container {
+ padding: 20px;
}
-.ml-5 {
- margin-left: 9.38rpx;
+
+.order-tabs {
+ display: flex;
+ justify-content: space-around;
+ background-color: #f5f5f5;
+ padding: 10px 0;
}
-.mt-11 {
- margin-top: 20.63rpx;
+
+.tab-item {
+ cursor: pointer;
+ padding: 5px 10px;
}
-.ml-15 {
- margin-left: 28.13rpx;
+
+.tab-item.active {
+ color: blue;
+ border-bottom: 2px solid blue;
}
-.page {
- padding-bottom: 993.75rpx;
- background-color: #fffaf0;
- width: 100%;
- overflow-y: auto;
- overflow-x: hidden;
- height: 100%;
+
+.order-list {
+ margin-top: 20px;
}
-.section {
- background-color: #fffef8;
-}
-.section_2 {
- padding: 15rpx 0;
- background-color: #f5f5dc;
-}
-.section_3 {
- margin: 0 35.63rpx;
- padding: 9.38rpx 0;
- background-color: #ffffff;
- border-radius: 75rpx;
-}
-.image {
- width: 37.5rpx;
- height: 37.5rpx;
-}
-.section_4 {
- padding-left: 33.75rpx;
- padding-right: 30rpx;
- background-color: #fffef8;
-}
-.group {
- padding: 22.5rpx 0 18.75rpx;
-}
-.font_2 {
- font-size: 30rpx;
- font-family: Open Sans;
- line-height: 27.81rpx;
- color: #323232;
-}
-.text_2 {
- line-height: 27.66rpx;
-}
-.text_3 {
- line-height: 27.69rpx;
-}
-.text_4 {
- line-height: 27.71rpx;
-}
-.section_5 {
- margin-left: 123.75rpx;
- background-color: #fb8b05;
- width: 73.13rpx;
- height: 5.63rpx;
-}
-.section_6 {
- margin: 0 15rpx;
- padding: 30rpx 11.25rpx 18.75rpx 22.5rpx;
- background-color: #fffef8;
- border-radius: 18.75rpx;
- border-left: solid 1.88rpx #81818154;
- border-right: solid 1.88rpx #81818154;
- border-top: solid 1.88rpx #81818154;
- border-bottom: solid 1.88rpx #81818154;
-}
-.font_3 {
- font-size: 26.25rpx;
- font-family: Open Sans;
- line-height: 24.34rpx;
- color: #fb8b05;
-}
-.text_5 {
- margin-right: 3.75rpx;
-}
-.group_2 {
- margin-top: 18.75rpx;
-}
-.font_4 {
- font-size: 22.5rpx;
- font-family: Open Sans;
- line-height: 21.99rpx;
- color: #818181;
-}
-.text_6 {
- line-height: 20.85rpx;
-}
-.text_7 {
- line-height: 16.54rpx;
-}
-.group_3 {
- margin-top: 30rpx;
-}
-.image_2 {
- border-radius: 9.38rpx;
- width: 146.25rpx;
- height: 144.38rpx;
-}
-.text_12 {
- line-height: 20.79rpx;
-}
-.group_4 {
- margin-right: 18.75rpx;
-}
-.text_10 {
- margin-left: 26.25rpx;
- color: #323232;
- font-size: 33.75rpx;
- font-family: Open Sans;
- font-weight: 600;
- line-height: 24.88rpx;
-}
-.image_3 {
- width: 30rpx;
- height: 26.25rpx;
-}
-.image_4 {
- margin-left: -90rpx;
-}
-.font_5 {
- font-size: 26.25rpx;
- font-family: Open Sans;
- line-height: 19.39rpx;
- font-weight: 600;
- color: #323232;
-}
-.text_11 {
- margin-left: 60rpx;
- line-height: 19.29rpx;
-}
-.font {
- font-size: 26.25rpx;
- font-family: Open Sans;
- line-height: 24.34rpx;
- color: #323232;
-}
-.text_9 {
- line-height: 24.43rpx;
-}
-.text_8 {
- line-height: 24.43rpx;
-}
-.text {
- color: #c0c0c0;
-}
-.text_13 {
- line-height: 18.73rpx;
-}
-.group_5 {
- padding: 0 15rpx;
-}
-.view {
- margin-top: 7.5rpx;
-}
-.font_6 {
- font-size: 26.25rpx;
- font-family: Open Sans;
- line-height: 24.34rpx;
- color: #000000;
-}
-.text_14 {
- margin-right: -7.5rpx;
- line-height: 24.09rpx;
-}
-.group_6 {
- line-height: 22.05rpx;
- height: 22.11rpx;
-}
-.font_7 {
- font-size: 30rpx;
- font-family: Open Sans;
- line-height: 21.99rpx;
- font-weight: 600;
-}
-.text_15 {
- color: #323232;
- line-height: 22.05rpx;
-}
-.view_2 {
- margin-top: 18.75rpx;
-}
-.text_16 {
- margin-right: -7.5rpx;
- line-height: 24.23rpx;
-}
-.group_7 {
- line-height: 21.99rpx;
- height: 22.05rpx;
-}
-.text_17 {
- color: #fb8b05;
-}
-.text_18 {
- color: #fb8b05;
-}
-.view_3 {
- margin-top: 45rpx;
-}
-.text-wrapper {
- padding: 15rpx 0;
- background-color: #fffef8;
- border-radius: 75rpx;
- width: 155.63rpx;
- height: 56.25rpx;
- border-left: solid 1.88rpx #cbcbcb;
- border-right: solid 1.88rpx #cbcbcb;
- border-top: solid 1.88rpx #cbcbcb;
- border-bottom: solid 1.88rpx #cbcbcb;
-}
-.text_19 {
- line-height: 24.15rpx;
-}
-.text-wrapper_2 {
- padding: 15rpx 0;
- background-color: #fffef8;
- border-radius: 75rpx;
- width: 155.63rpx;
- height: 56.25rpx;
- border-left: solid 1.88rpx #fb8b05;
- border-right: solid 1.88rpx #fb8b05;
- border-top: solid 1.88rpx #fb8b05;
- border-bottom: solid 1.88rpx #fb8b05;
-}
-.text_20 {
- line-height: 24.23rpx;
+
+.order-item {
+ border: 1px solid #ccc;
+ padding: 10px;
+ margin-bottom: 10px;
}
@import url(../../../common/css/global.css);
-</style>
+</style>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js
index 622c3d4..6b71191 100644
--- a/unpackage/dist/dev/mp-weixin/app.js
+++ b/unpackage/dist/dev/mp-weixin/app.js
@@ -6,6 +6,7 @@ if (!Math) {
"./pages/home/home.js";
"./pages/store-home/main/main.js";
"./pages/mine/main/main.js";
+ "./pages/mine/mineorders/mineorders.js";
"./pages/Shopping-cart/productmain/productmain.js";
"./pages/Shopping-cart/servicemain/servicemain.js";
"./pages/booking/AppointmentHome.js";
@@ -32,7 +33,7 @@ const _sfc_main = {};
function _sfc_render(_ctx, _cache) {
return {};
}
-const App = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
+const App = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/jiangchengfeiyi-xiaochengxu/App.vue"]]);
function createApp() {
const app = common_vendor.createSSRApp(App);
app.use(store_index.pinia);
diff --git a/unpackage/dist/dev/mp-weixin/app.json b/unpackage/dist/dev/mp-weixin/app.json
index 10a28d9..978c4e3 100644
--- a/unpackage/dist/dev/mp-weixin/app.json
+++ b/unpackage/dist/dev/mp-weixin/app.json
@@ -3,6 +3,7 @@
"pages/home/home",
"pages/store-home/main/main",
"pages/mine/main/main",
+ "pages/mine/mineorders/mineorders",
"pages/Shopping-cart/productmain/productmain",
"pages/Shopping-cart/servicemain/servicemain",
"pages/booking/AppointmentHome",
diff --git a/unpackage/dist/dev/mp-weixin/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js
index 7574a05..8cbc8b2 100644
--- a/unpackage/dist/dev/mp-weixin/common/vendor.js
+++ b/unpackage/dist/dev/mp-weixin/common/vendor.js
@@ -180,6 +180,7 @@ const stringifySymbol = (v, i = "") => {
var _a;
return isSymbol(v) ? `Symbol(${(_a = v.description) != null ? _a : i})` : v;
};
+const LINEFEED = "\n";
const SLOT_DEFAULT_NAME = "d";
const ON_SHOW = "onShow";
const ON_HIDE = "onHide";
@@ -620,7 +621,7 @@ function getApiCallbacks(args) {
}
return apiCallbacks;
}
-function normalizeErrMsg(errMsg, name) {
+function normalizeErrMsg$1(errMsg, name) {
if (!errMsg || errMsg.indexOf(":fail") === -1) {
return name + ":ok";
}
@@ -637,7 +638,7 @@ function createAsyncApiCallback(name, args = {}, { beforeAll, beforeSuccess } =
const callbackId = invokeCallbackId++;
addInvokeCallback(callbackId, name, (res) => {
res = res || {};
- res.errMsg = normalizeErrMsg(res.errMsg, name);
+ res.errMsg = normalizeErrMsg$1(res.errMsg, name);
isFunction(beforeAll) && beforeAll(res);
if (res.errMsg === name + ":ok") {
isFunction(beforeSuccess) && beforeSuccess(res, args);
@@ -769,7 +770,7 @@ function promisify$1(name, fn) {
}
function formatApiArgs(args, options) {
const params = args[0];
- if (!options || !options.formatArgs || !isPlainObject$1(options.formatArgs) && isPlainObject$1(params)) {
+ if (!options || !isPlainObject$1(options.formatArgs) && isPlainObject$1(params)) {
return;
}
const formatArgs = options.formatArgs;
@@ -816,12 +817,12 @@ function beforeInvokeApi(name, args, protocol, options) {
return errMsg;
}
}
-function parseErrMsg(errMsg) {
+function normalizeErrMsg(errMsg) {
if (!errMsg || isString(errMsg)) {
return errMsg;
}
if (errMsg.stack) {
- console.error(errMsg.message + "\n" + errMsg.stack);
+ console.error(errMsg.message + LINEFEED + errMsg.stack);
return errMsg.message;
}
return errMsg;
@@ -835,7 +836,7 @@ function wrapperTaskApi(name, fn, protocol, options) {
}
return fn(args, {
resolve: (res) => invokeSuccess(id, name, res),
- reject: (errMsg2, errRes) => invokeFail(id, name, parseErrMsg(errMsg2), errRes)
+ reject: (errMsg2, errRes) => invokeFail(id, name, normalizeErrMsg(errMsg2), errRes)
});
};
}
@@ -1297,8 +1298,8 @@ function populateParameters(fromRes, toRes) {
appVersion: "1.0.0",
appVersionCode: "100",
appLanguage: getAppLanguage(hostLanguage),
- uniCompileVersion: "4.23",
- uniRuntimeVersion: "4.23",
+ uniCompileVersion: "4.15",
+ uniRuntimeVersion: "4.15",
uniPlatform: "mp-weixin",
deviceBrand,
deviceModel: model,
@@ -7303,7 +7304,7 @@ function initDefaultProps(options, isBehavior = false) {
};
}
if (options.behaviors) {
- if (options.behaviors.includes("wx://form-field")) {
+ if (options.behaviors.includes("__GLOBAL__://form-field")) {
if (!options.properties || !options.properties.name) {
properties.name = {
type: null,
@@ -7474,7 +7475,7 @@ function initBehaviors(vueOptions) {
const behaviors = [];
if (isArray(vueBehaviors)) {
vueBehaviors.forEach((behavior) => {
- behaviors.push(behavior.replace("uni://", "wx://"));
+ behaviors.push(behavior.replace("uni://", "__GLOBAL__://"));
if (behavior === "uni://form-field") {
if (isArray(vueProps)) {
vueProps.push("name");
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.js
index b710aed..3dd6605 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.js
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.js
@@ -4,5 +4,5 @@ const _sfc_main = {};
function _sfc_render(_ctx, _cache) {
return {};
}
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/Contact/Contact.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Phone/Phone.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Phone/Phone.js
index af0173b..5b34f16 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Phone/Phone.js
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Phone/Phone.js
@@ -10,5 +10,5 @@ function _sfc_render(_ctx, _cache) {
})
};
}
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-6d058dc0"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-6d058dc0"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/Phone/Phone.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.js
index 1637d9a..902d404 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.js
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.js
@@ -68,5 +68,5 @@ const _sfc_main = {
};
}
};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-fdeeb5e5"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-fdeeb5e5"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/address/address.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.js
index ee8dc87..2bb033c 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.js
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.js
@@ -18,5 +18,5 @@ const _sfc_main = {
};
}
};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-fb57d854"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-fb57d854"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.js
index 2b3d8d4..1e781db 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.js
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.js
@@ -115,5 +115,5 @@ const _sfc_main = {
};
}
};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-641af6de"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-641af6de"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/productmain/productmain.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.js
index d25b171..b2f5957 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.js
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.js
@@ -15,5 +15,5 @@ const _sfc_main = {
};
}
};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-b7001184"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-b7001184"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/servicemain/servicemain.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/AppointmentHome.js b/unpackage/dist/dev/mp-weixin/pages/booking/AppointmentHome.js
index 078f7f6..99abf27 100644
--- a/unpackage/dist/dev/mp-weixin/pages/booking/AppointmentHome.js
+++ b/unpackage/dist/dev/mp-weixin/pages/booking/AppointmentHome.js
@@ -15,5 +15,5 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
};
}
});
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-60893f73"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-60893f73"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/AppointmentHome.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/BillingOfFees/BillingOfFees.js b/unpackage/dist/dev/mp-weixin/pages/booking/BillingOfFees/BillingOfFees.js
index 038beec..59012db 100644
--- a/unpackage/dist/dev/mp-weixin/pages/booking/BillingOfFees/BillingOfFees.js
+++ b/unpackage/dist/dev/mp-weixin/pages/booking/BillingOfFees/BillingOfFees.js
@@ -15,5 +15,5 @@ const _sfc_main = {
};
}
};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-cab9a6c6"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-cab9a6c6"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/BillingOfFees/BillingOfFees.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/ContactInformation.js b/unpackage/dist/dev/mp-weixin/pages/booking/ContactInformation.js
index bb23879..e4ea835 100644
--- a/unpackage/dist/dev/mp-weixin/pages/booking/ContactInformation.js
+++ b/unpackage/dist/dev/mp-weixin/pages/booking/ContactInformation.js
@@ -4,5 +4,5 @@ const _sfc_main = {};
function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
return {};
}
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-43413e24"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-43413e24"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/ContactInformation.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/ReservationInstructions/ReservationInstructions.js b/unpackage/dist/dev/mp-weixin/pages/booking/ReservationInstructions/ReservationInstructions.js
index ccd57ba..9720bc7 100644
--- a/unpackage/dist/dev/mp-weixin/pages/booking/ReservationInstructions/ReservationInstructions.js
+++ b/unpackage/dist/dev/mp-weixin/pages/booking/ReservationInstructions/ReservationInstructions.js
@@ -4,5 +4,5 @@ const _sfc_main = {};
function _sfc_render(_ctx, _cache) {
return {};
}
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-a9d91b4b"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-a9d91b4b"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/ReservationInstructions/ReservationInstructions.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/Simple/Simple.js b/unpackage/dist/dev/mp-weixin/pages/booking/Simple/Simple.js
index 803cefc..a7bf5f5 100644
--- a/unpackage/dist/dev/mp-weixin/pages/booking/Simple/Simple.js
+++ b/unpackage/dist/dev/mp-weixin/pages/booking/Simple/Simple.js
@@ -10,5 +10,5 @@ function _sfc_render(_ctx, _cache) {
})
};
}
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-d54bd2fc"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-d54bd2fc"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/Simple/Simple.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/bookingpay/bookingpay.js b/unpackage/dist/dev/mp-weixin/pages/booking/bookingpay/bookingpay.js
index f314148..aa1bc8b 100644
--- a/unpackage/dist/dev/mp-weixin/pages/booking/bookingpay/bookingpay.js
+++ b/unpackage/dist/dev/mp-weixin/pages/booking/bookingpay/bookingpay.js
@@ -4,5 +4,5 @@ const _sfc_main = {};
function _sfc_render(_ctx, _cache) {
return {};
}
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-1d20d48c"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-1d20d48c"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/bookingpay/bookingpay.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/date.js b/unpackage/dist/dev/mp-weixin/pages/booking/date.js
index dd67dc4..995a8f4 100644
--- a/unpackage/dist/dev/mp-weixin/pages/booking/date.js
+++ b/unpackage/dist/dev/mp-weixin/pages/booking/date.js
@@ -4,5 +4,5 @@ const _sfc_main = {};
function _sfc_render(_ctx, _cache) {
return {};
}
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-f815bf4c"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-f815bf4c"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/date.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/respectable/respectable.js b/unpackage/dist/dev/mp-weixin/pages/booking/respectable/respectable.js
index be62484..61de849 100644
--- a/unpackage/dist/dev/mp-weixin/pages/booking/respectable/respectable.js
+++ b/unpackage/dist/dev/mp-weixin/pages/booking/respectable/respectable.js
@@ -21,5 +21,5 @@ const _sfc_main = {
};
}
};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-cad4fb76"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-cad4fb76"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/respectable/respectable.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/home/home.js b/unpackage/dist/dev/mp-weixin/pages/home/home.js
index 26f15ad..0fb05e2 100644
--- a/unpackage/dist/dev/mp-weixin/pages/home/home.js
+++ b/unpackage/dist/dev/mp-weixin/pages/home/home.js
@@ -70,5 +70,5 @@ const _sfc_main = {
};
}
};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-07e72d3c"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-07e72d3c"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/home/home.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/login/login.js b/unpackage/dist/dev/mp-weixin/pages/login/login.js
index 782353f..266a494 100644
--- a/unpackage/dist/dev/mp-weixin/pages/login/login.js
+++ b/unpackage/dist/dev/mp-weixin/pages/login/login.js
@@ -54,5 +54,5 @@ const _sfc_main = {
};
}
};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-e4e4508d"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-e4e4508d"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/login/login.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/main/main.js b/unpackage/dist/dev/mp-weixin/pages/mine/main/main.js
index b3bc411..c0084cb 100644
--- a/unpackage/dist/dev/mp-weixin/pages/mine/main/main.js
+++ b/unpackage/dist/dev/mp-weixin/pages/mine/main/main.js
@@ -5,24 +5,30 @@ const common_assets = require("../../../common/assets.js");
const _sfc_main = {
__name: "main",
setup(__props) {
+ const goto = () => {
+ common_vendor.index.navigateTo({
+ url: "/pages/mine/mineorders/mineorders"
+ });
+ };
store_userStore.userStore();
return (_ctx, _cache) => {
return {
a: common_vendor.unref(common_assets.avator),
b: common_vendor.unref(common_assets.dingdan),
- c: common_vendor.unref(common_assets.qianbao),
- d: common_vendor.unref(common_assets.daifahuo),
- e: common_vendor.unref(common_assets.daishouhuo),
- f: common_vendor.unref(common_assets.tuikuan),
- g: common_vendor.unref(common_assets.address),
- h: common_vendor.unref(common_assets.you$1),
- i: common_vendor.unref(common_assets.lianxiren_s),
- j: common_vendor.unref(common_assets.you$1),
- k: common_vendor.unref(common_assets.setting_s),
- l: common_vendor.unref(common_assets.you$1)
+ c: common_vendor.o(($event) => goto()),
+ d: common_vendor.unref(common_assets.qianbao),
+ e: common_vendor.unref(common_assets.daifahuo),
+ f: common_vendor.unref(common_assets.daishouhuo),
+ g: common_vendor.unref(common_assets.tuikuan),
+ h: common_vendor.unref(common_assets.address),
+ i: common_vendor.unref(common_assets.you$1),
+ j: common_vendor.unref(common_assets.lianxiren_s),
+ k: common_vendor.unref(common_assets.you$1),
+ l: common_vendor.unref(common_assets.setting_s),
+ m: common_vendor.unref(common_assets.you$1)
};
};
}
};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-8172b2ba"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-8172b2ba"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/mine/main/main.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/main/main.wxml b/unpackage/dist/dev/mp-weixin/pages/mine/main/main.wxml
index 9b8b9e6..7796e94 100644
--- a/unpackage/dist/dev/mp-weixin/pages/mine/main/main.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/mine/main/main.wxml
@@ -1 +1 @@
-<view class="flex-col page data-v-8172b2ba"><view class="flex-row section data-v-8172b2ba"><image class="self-center image data-v-8172b2ba" src="{{a}}"/><view class="flex-col self-start group data-v-8172b2ba"><text class="self-start text data-v-8172b2ba">默认用户</text><view class="flex-col justify-start items-center self-stretch text-wrapper mt-6 data-v-8172b2ba"><text class="font text_2 data-v-8172b2ba">剩余积分：0</text></view></view><view class="flex-col justify-start items-center self-start text-wrapper_2 data-v-8172b2ba"><text class="font text_3 data-v-8172b2ba">优惠卷：0 张</text></view></view><view class="flex-col relative group_2 data-v-8172b2ba"><view class="flex-row equal-division data-v-8172b2ba"><view class="flex-col items-center group_3 group_1 data-v-8172b2ba"><image class="image_2 data-v-8172b2ba" src="{{b}}"/><text class="font text_4 data-v-8172b2ba">总订单</text></view><view class="flex-col items-center group_3 group_4 data-v-8172b2ba"><image class="image_2 data-v-8172b2ba" src="{{c}}"/><text class="font text_1 data-v-8172b2ba">待付款</text></view><view class="flex-col items-center group_3 group_5 data-v-8172b2ba"><image class="image_2 data-v-8172b2ba" src="{{d}}"/><text class="font data-v-8172b2ba">待发货</text></view><view class="flex-col items-start group_3 group_6 data-v-8172b2ba"><image class="image_2 data-v-8172b2ba" src="{{e}}"/><text class="font data-v-8172b2ba">待收货</text></view><view class="flex-col items-center group_3 group_7 data-v-8172b2ba"><image class="image_2 data-v-8172b2ba" src="{{f}}"/><text class="font text_9 data-v-8172b2ba">退款/售后</text></view></view><view class="flex-col mt-37 data-v-8172b2ba"><view class="flex-row justify-between items-center section_2 data-v-8172b2ba"><view class="flex-row items-center data-v-8172b2ba"><image class="shrink-0 image_3 data-v-8172b2ba" src="{{g}}"/><text class="font_2 ml-5 data-v-8172b2ba">地址列表</text></view><image class="image_4 image_5 data-v-8172b2ba" src="{{h}}"/></view><view class="list-divider mt-5 data-v-8172b2ba"></view><view class="flex-row justify-between items-center section_4 mt-5 data-v-8172b2ba"><view class="flex-row items-center data-v-8172b2ba"><image class="shrink-0 image_3 data-v-8172b2ba" src="{{i}}"/><text class="font_2 text_5 ml-5 data-v-8172b2ba">联系人列表</text></view><image class="image_6 data-v-8172b2ba" src="{{j}}"/></view><view class="list-divider mt-5 data-v-8172b2ba"></view><view class="flex-row justify-between items-center list-item_2 mt-5 data-v-8172b2ba"><view class="flex-row items-center data-v-8172b2ba"><image class="shrink-0 image_8 data-v-8172b2ba" src="{{k}}"/><text class="font_2 text_6 ml-7 data-v-8172b2ba">设置</text></view><image class="image_4 image_7 data-v-8172b2ba" src="{{l}}"/></view></view></view></view>
\ No newline at end of file
+<view class="flex-col page data-v-8172b2ba"><view class="flex-row section data-v-8172b2ba"><image class="self-center image data-v-8172b2ba" src="{{a}}"/><view class="flex-col self-start group data-v-8172b2ba"><text class="self-start text data-v-8172b2ba">默认用户</text><view class="flex-col justify-start items-center self-stretch text-wrapper mt-6 data-v-8172b2ba"><text class="font text_2 data-v-8172b2ba">剩余积分：0</text></view></view><view class="flex-col justify-start items-center self-start text-wrapper_2 data-v-8172b2ba"><text class="font text_3 data-v-8172b2ba">优惠卷：0 张</text></view></view><view class="flex-col relative group_2 data-v-8172b2ba"><view class="flex-row equal-division data-v-8172b2ba"><view class="flex-col items-center group_3 group_1 data-v-8172b2ba" bindtap="{{c}}"><image class="image_2 data-v-8172b2ba" src="{{b}}"/><text class="font text_4 data-v-8172b2ba">总订单</text></view><view class="flex-col items-center group_3 group_4 data-v-8172b2ba"><image class="image_2 data-v-8172b2ba" src="{{d}}"/><text class="font text_1 data-v-8172b2ba">待付款</text></view><view class="flex-col items-center group_3 group_5 data-v-8172b2ba"><image class="image_2 data-v-8172b2ba" src="{{e}}"/><text class="font data-v-8172b2ba">待发货</text></view><view class="flex-col items-start group_3 group_6 data-v-8172b2ba"><image class="image_2 data-v-8172b2ba" src="{{f}}"/><text class="font data-v-8172b2ba">待收货</text></view><view class="flex-col items-center group_3 group_7 data-v-8172b2ba"><image class="image_2 data-v-8172b2ba" src="{{g}}"/><text class="font text_9 data-v-8172b2ba">退款/售后</text></view></view><view class="flex-col mt-37 data-v-8172b2ba"><view class="flex-row justify-between items-center section_2 data-v-8172b2ba"><view class="flex-row items-center data-v-8172b2ba"><image class="shrink-0 image_3 data-v-8172b2ba" src="{{h}}"/><text class="font_2 ml-5 data-v-8172b2ba">地址列表</text></view><image class="image_4 image_5 data-v-8172b2ba" src="{{i}}"/></view><view class="list-divider mt-5 data-v-8172b2ba"></view><view class="flex-row justify-between items-center section_4 mt-5 data-v-8172b2ba"><view class="flex-row items-center data-v-8172b2ba"><image class="shrink-0 image_3 data-v-8172b2ba" src="{{j}}"/><text class="font_2 text_5 ml-5 data-v-8172b2ba">联系人列表</text></view><image class="image_6 data-v-8172b2ba" src="{{k}}"/></view><view class="list-divider mt-5 data-v-8172b2ba"></view><view class="flex-row justify-between items-center list-item_2 mt-5 data-v-8172b2ba"><view class="flex-row items-center data-v-8172b2ba"><image class="shrink-0 image_8 data-v-8172b2ba" src="{{l}}"/><text class="font_2 text_6 ml-7 data-v-8172b2ba">设置</text></view><image class="image_4 image_7 data-v-8172b2ba" src="{{m}}"/></view></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js
new file mode 100644
index 0000000..0be6e2d
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js
@@ -0,0 +1,159 @@
+"use strict";
+const common_vendor = require("../../../common/vendor.js");
+const api_request = require("../../../api/request.js");
+if (!Array) {
+ const _component_template = common_vendor.resolveComponent("template");
+ _component_template();
+}
+const _sfc_main = {
+ __name: "mineorders",
+ setup(__props) {
+ const currentColor = common_vendor.ref(0);
+ const sort = common_vendor.ref([{}]);
+ const headerList = common_vendor.ref([{}]);
+ const productList = common_vendor.ref([{}]);
+ common_vendor.onMounted(async () => {
+ await Getsort();
+ await changeTypes(sort.value[0], 0);
+ await Getorder();
+ Status.displayedOrders = Status.orders;
+ });
+ common_vendor.ref({
+ userInfo: common_vendor.wx$1.getStorageSync("userInfo")
+ });
+ const Getorder = async () => {
+ const res = await common_vendor.index.request({
+ url: api_request.baseUrl + "/order/list",
+ method: "POST",
+ data: {
+ // id:userInfo.value.userInfo.id ,
+ id: 215
+ }
+ });
+ if (res.data.code === 1) {
+ Status.value.orders = res.data.data;
+ console.log(Status.value.orders[0].orderStatus);
+ console.log(res.data.data[0].orderStatus);
+ } else {
+ console.log("没拿到用户数据");
+ }
+ };
+ const Status = common_vendor.ref({
+ orderStatus: "全部",
+ orders: [
+ {}
+ ],
+ displayedOrders: []
+ });
+ const changeTab = (tab) => {
+ for (let key in Status.value.orders) {
+ tab[key] = {};
+ }
+ Status.value.orders.orderStatus = tab;
+ if (tab === "全部") {
+ Status.value.displayedOrders = Status.value.orders;
+ } else {
+ Status.value.displayedOrders = Status.value.orders.filter((order) => {
+ switch (tab) {
+ case "待支付":
+ return order.orderStatus === "代支付";
+ case "代发货":
+ return order.orderStatus === "代发货";
+ case "已发货":
+ return order.orderStatus === "已发货";
+ case "售后":
+ return order.orderStatus === "售后";
+ default:
+ return false;
+ }
+ });
+ }
+ };
+ const Getsort = async () => {
+ const res = await common_vendor.index.request({
+ url: api_request.testUrl + "/category/list",
+ method: "POST"
+ });
+ if (res.data.code === 1) {
+ for (let key in res.data.data) {
+ sort.value[key] = {
+ //类别列表
+ name: res.data.data[key].typeName,
+ imgurl: res.data.data[key].typeUrl,
+ id: res.data.data[key].id
+ };
+ headerList.value[key] = {
+ name: res.data.data[key].typeName,
+ typeIntro: res.data.data[key].typeIntro
+ };
+ }
+ } else {
+ common_vendor.index.showToast({
+ //提示请求错误
+ title: "请求商品分类错误",
+ icon: "none",
+ duration: 2e3
+ });
+ }
+ };
+ const changeTypes = async (item, index) => {
+ currentColor.value = index;
+ const res = await common_vendor.index.request({
+ url: api_request.testUrl + "/category/list/type",
+ method: "POST",
+ data: {
+ id: item.id
+ }
+ });
+ if (res.data.code === 1) {
+ productList.value = res.data.data[item.id];
+ } else {
+ common_vendor.index.showToast({
+ //商品请求错误
+ title: "更改类别错误",
+ icon: "none",
+ duration: 2e3
+ });
+ }
+ };
+ return (_ctx, _cache) => {
+ return {
+ a: _ctx.orderStatus === "全部" ? 1 : "",
+ b: common_vendor.o(($event) => changeTab("全部")),
+ c: _ctx.orderStatus === "代支付" ? 1 : "",
+ d: common_vendor.o(($event) => changeTab("代支付")),
+ e: _ctx.orderStatus === "代发货" ? 1 : "",
+ f: common_vendor.o(($event) => changeTab("代发货")),
+ g: _ctx.orderStatus === "已发货" ? 1 : "",
+ h: common_vendor.o(($event) => changeTab("已发货")),
+ i: _ctx.orderStatus === "售后" ? 1 : "",
+ j: common_vendor.o(($event) => changeTab("售后")),
+ k: common_vendor.f(Status.value.orders, (order, k0, i0) => {
+ return {
+ a: common_vendor.f(order.orderItemList, (item, k1, i1) => {
+ return {
+ a: common_vendor.t(item.goodSnapshot.name),
+ b: item.id
+ };
+ }),
+ b: common_vendor.f(order.orderItemList, (item, k1, i1) => {
+ return {
+ a: common_vendor.t(item.goodSnapshot.type),
+ b: item.id
+ };
+ }),
+ c: common_vendor.f(order.orderItemList, (item, k1, i1) => {
+ return {
+ a: common_vendor.t(item.goodSnapshot.price),
+ b: item.id
+ };
+ }),
+ d: order.id
+ };
+ })
+ };
+ };
+ }
+};
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-7d0f2622"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/mine/mineorders/mineorders.vue"]]);
+wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.json b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.json
new file mode 100644
index 0000000..a0812ee
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.json
@@ -0,0 +1,4 @@
+{
+ "navigationBarTitleText": "",
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.wxml b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.wxml
new file mode 100644
index 0000000..9144741
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.wxml
@@ -0,0 +1 @@
+<block class="data-v-7d0f2622" u-s="{{['d']}}"><view class="container data-v-7d0f2622"><view class="order-tabs data-v-7d0f2622"><view class="{{['tab-item', 'data-v-7d0f2622', a && 'active']}}" bindtap="{{b}}">全部</view><view class="{{['tab-item', 'data-v-7d0f2622', c && 'active']}}" bindtap="{{d}}">代支付</view><view class="{{['tab-item', 'data-v-7d0f2622', e && 'active']}}" bindtap="{{f}}">代发货</view><view class="{{['tab-item', 'data-v-7d0f2622', g && 'active']}}" bindtap="{{h}}">已发货</view><view class="{{['tab-item', 'data-v-7d0f2622', i && 'active']}}" bindtap="{{j}}">售后</view></view><view class="order-list data-v-7d0f2622"><view wx:for="{{k}}" wx:for-item="order" wx:key="d" class="order-item data-v-7d0f2622"><view wx:for="{{order.a}}" wx:for-item="item" wx:key="b" class="data-v-7d0f2622">{{item.a}}</view><view wx:for="{{order.b}}" wx:for-item="item" wx:key="b" class="data-v-7d0f2622">{{item.a}}</view><view wx:for="{{order.c}}" wx:for-item="item" wx:key="b" class="data-v-7d0f2622">{{item.a}}</view></view></view></view></block>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.wxss b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.wxss
new file mode 100644
index 0000000..e35aa47
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.wxss
@@ -0,0 +1,428 @@
+/* 水平间距 */
+/* 水平间距 */
+/************************************************************
+** 请将全局样式拷贝到项目的全局 CSS 文件或者当前页面的顶部 **
+** 否则页面将无法正常显示 **
+************************************************************/
+html.data-v-7d0f2622 {
+ font-size: 16px;
+}
+body.data-v-7d0f2622 {
+ margin: 0;
+ font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans',
+ 'Droid Sans', 'Helvetica Neue', 'Microsoft Yahei', sans-serif;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+view.data-v-7d0f2622,
+image.data-v-7d0f2622,
+text.data-v-7d0f2622 {
+ box-sizing: border-box;
+ flex-shrink: 0;
+}
+#app.data-v-7d0f2622 {
+ width: 100vw;
+ height: 100vh;
+}
+.flex-row.data-v-7d0f2622 {
+ display: flex;
+ flex-direction: row;
+}
+.flex-col.data-v-7d0f2622 {
+ display: flex;
+ flex-direction: column;
+}
+.justify-start.data-v-7d0f2622 {
+ justify-content: flex-start;
+}
+.justify-end.data-v-7d0f2622 {
+ justify-content: flex-end;
+}
+.justify-center.data-v-7d0f2622 {
+ justify-content: center;
+}
+.justify-between.data-v-7d0f2622 {
+ justify-content: space-between;
+}
+.justify-around.data-v-7d0f2622 {
+ justify-content: space-around;
+}
+.justify-evenly.data-v-7d0f2622 {
+ justify-content: space-evenly;
+}
+.items-start.data-v-7d0f2622 {
+ align-items: flex-start;
+}
+.items-end.data-v-7d0f2622 {
+ align-items: flex-end;
+}
+.items-center.data-v-7d0f2622 {
+ align-items: center;
+}
+.items-baseline.data-v-7d0f2622 {
+ align-items: baseline;
+}
+.items-stretch.data-v-7d0f2622 {
+ align-items: stretch;
+}
+.self-start.data-v-7d0f2622 {
+ align-self: flex-start;
+}
+.self-end.data-v-7d0f2622 {
+ align-self: flex-end;
+}
+.self-center.data-v-7d0f2622 {
+ align-self: center;
+}
+.self-baseline.data-v-7d0f2622 {
+ align-self: baseline;
+}
+.self-stretch.data-v-7d0f2622 {
+ align-self: stretch;
+}
+.flex-1.data-v-7d0f2622 {
+ flex: 1 1 0%;
+}
+.flex-auto.data-v-7d0f2622 {
+ flex: 1 1 auto;
+}
+.grow.data-v-7d0f2622 {
+ flex-grow: 1;
+}
+.grow-0.data-v-7d0f2622 {
+ flex-grow: 0;
+}
+.shrink.data-v-7d0f2622 {
+ flex-shrink: 1;
+}
+.shrink-0.data-v-7d0f2622 {
+ flex-shrink: 0;
+}
+.relative.data-v-7d0f2622 {
+ position: relative;
+}
+.ml-2.data-v-7d0f2622 {
+ margin-left: 3.75rpx;
+}
+.mt-2.data-v-7d0f2622 {
+ margin-top: 3.75rpx;
+}
+.ml-4.data-v-7d0f2622 {
+ margin-left: 7.5rpx;
+}
+.mt-4.data-v-7d0f2622 {
+ margin-top: 7.5rpx;
+}
+.ml-6.data-v-7d0f2622 {
+ margin-left: 11.25rpx;
+}
+.mt-6.data-v-7d0f2622 {
+ margin-top: 11.25rpx;
+}
+.ml-8.data-v-7d0f2622 {
+ margin-left: 15rpx;
+}
+.mt-8.data-v-7d0f2622 {
+ margin-top: 15rpx;
+}
+.ml-10.data-v-7d0f2622 {
+ margin-left: 18.75rpx;
+}
+.mt-10.data-v-7d0f2622 {
+ margin-top: 18.75rpx;
+}
+.ml-12.data-v-7d0f2622 {
+ margin-left: 22.5rpx;
+}
+.mt-12.data-v-7d0f2622 {
+ margin-top: 22.5rpx;
+}
+.ml-14.data-v-7d0f2622 {
+ margin-left: 26.25rpx;
+}
+.mt-14.data-v-7d0f2622 {
+ margin-top: 26.25rpx;
+}
+.ml-16.data-v-7d0f2622 {
+ margin-left: 30rpx;
+}
+.mt-16.data-v-7d0f2622 {
+ margin-top: 30rpx;
+}
+.ml-18.data-v-7d0f2622 {
+ margin-left: 33.75rpx;
+}
+.mt-18.data-v-7d0f2622 {
+ margin-top: 33.75rpx;
+}
+.ml-20.data-v-7d0f2622 {
+ margin-left: 37.5rpx;
+}
+.mt-20.data-v-7d0f2622 {
+ margin-top: 37.5rpx;
+}
+.ml-22.data-v-7d0f2622 {
+ margin-left: 41.25rpx;
+}
+.mt-22.data-v-7d0f2622 {
+ margin-top: 41.25rpx;
+}
+.ml-24.data-v-7d0f2622 {
+ margin-left: 45rpx;
+}
+.mt-24.data-v-7d0f2622 {
+ margin-top: 45rpx;
+}
+.ml-26.data-v-7d0f2622 {
+ margin-left: 48.75rpx;
+}
+.mt-26.data-v-7d0f2622 {
+ margin-top: 48.75rpx;
+}
+.ml-28.data-v-7d0f2622 {
+ margin-left: 52.5rpx;
+}
+.mt-28.data-v-7d0f2622 {
+ margin-top: 52.5rpx;
+}
+.ml-30.data-v-7d0f2622 {
+ margin-left: 56.25rpx;
+}
+.mt-30.data-v-7d0f2622 {
+ margin-top: 56.25rpx;
+}
+.ml-32.data-v-7d0f2622 {
+ margin-left: 60rpx;
+}
+.mt-32.data-v-7d0f2622 {
+ margin-top: 60rpx;
+}
+.ml-34.data-v-7d0f2622 {
+ margin-left: 63.75rpx;
+}
+.mt-34.data-v-7d0f2622 {
+ margin-top: 63.75rpx;
+}
+.ml-36.data-v-7d0f2622 {
+ margin-left: 67.5rpx;
+}
+.mt-36.data-v-7d0f2622 {
+ margin-top: 67.5rpx;
+}
+.ml-38.data-v-7d0f2622 {
+ margin-left: 71.25rpx;
+}
+.mt-38.data-v-7d0f2622 {
+ margin-top: 71.25rpx;
+}
+.ml-40.data-v-7d0f2622 {
+ margin-left: 75rpx;
+}
+.mt-40.data-v-7d0f2622 {
+ margin-top: 75rpx;
+}
+.ml-42.data-v-7d0f2622 {
+ margin-left: 78.75rpx;
+}
+.mt-42.data-v-7d0f2622 {
+ margin-top: 78.75rpx;
+}
+.ml-44.data-v-7d0f2622 {
+ margin-left: 82.5rpx;
+}
+.mt-44.data-v-7d0f2622 {
+ margin-top: 82.5rpx;
+}
+.ml-46.data-v-7d0f2622 {
+ margin-left: 86.25rpx;
+}
+.mt-46.data-v-7d0f2622 {
+ margin-top: 86.25rpx;
+}
+.ml-48.data-v-7d0f2622 {
+ margin-left: 90rpx;
+}
+.mt-48.data-v-7d0f2622 {
+ margin-top: 90rpx;
+}
+.ml-50.data-v-7d0f2622 {
+ margin-left: 93.75rpx;
+}
+.mt-50.data-v-7d0f2622 {
+ margin-top: 93.75rpx;
+}
+.ml-52.data-v-7d0f2622 {
+ margin-left: 97.5rpx;
+}
+.mt-52.data-v-7d0f2622 {
+ margin-top: 97.5rpx;
+}
+.ml-54.data-v-7d0f2622 {
+ margin-left: 101.25rpx;
+}
+.mt-54.data-v-7d0f2622 {
+ margin-top: 101.25rpx;
+}
+.ml-56.data-v-7d0f2622 {
+ margin-left: 105rpx;
+}
+.mt-56.data-v-7d0f2622 {
+ margin-top: 105rpx;
+}
+.ml-58.data-v-7d0f2622 {
+ margin-left: 108.75rpx;
+}
+.mt-58.data-v-7d0f2622 {
+ margin-top: 108.75rpx;
+}
+.ml-60.data-v-7d0f2622 {
+ margin-left: 112.5rpx;
+}
+.mt-60.data-v-7d0f2622 {
+ margin-top: 112.5rpx;
+}
+.ml-62.data-v-7d0f2622 {
+ margin-left: 116.25rpx;
+}
+.mt-62.data-v-7d0f2622 {
+ margin-top: 116.25rpx;
+}
+.ml-64.data-v-7d0f2622 {
+ margin-left: 120rpx;
+}
+.mt-64.data-v-7d0f2622 {
+ margin-top: 120rpx;
+}
+.ml-66.data-v-7d0f2622 {
+ margin-left: 123.75rpx;
+}
+.mt-66.data-v-7d0f2622 {
+ margin-top: 123.75rpx;
+}
+.ml-68.data-v-7d0f2622 {
+ margin-left: 127.5rpx;
+}
+.mt-68.data-v-7d0f2622 {
+ margin-top: 127.5rpx;
+}
+.ml-70.data-v-7d0f2622 {
+ margin-left: 131.25rpx;
+}
+.mt-70.data-v-7d0f2622 {
+ margin-top: 131.25rpx;
+}
+.ml-72.data-v-7d0f2622 {
+ margin-left: 135rpx;
+}
+.mt-72.data-v-7d0f2622 {
+ margin-top: 135rpx;
+}
+.ml-74.data-v-7d0f2622 {
+ margin-left: 138.75rpx;
+}
+.mt-74.data-v-7d0f2622 {
+ margin-top: 138.75rpx;
+}
+.ml-76.data-v-7d0f2622 {
+ margin-left: 142.5rpx;
+}
+.mt-76.data-v-7d0f2622 {
+ margin-top: 142.5rpx;
+}
+.ml-78.data-v-7d0f2622 {
+ margin-left: 146.25rpx;
+}
+.mt-78.data-v-7d0f2622 {
+ margin-top: 146.25rpx;
+}
+.ml-80.data-v-7d0f2622 {
+ margin-left: 150rpx;
+}
+.mt-80.data-v-7d0f2622 {
+ margin-top: 150rpx;
+}
+.ml-82.data-v-7d0f2622 {
+ margin-left: 153.75rpx;
+}
+.mt-82.data-v-7d0f2622 {
+ margin-top: 153.75rpx;
+}
+.ml-84.data-v-7d0f2622 {
+ margin-left: 157.5rpx;
+}
+.mt-84.data-v-7d0f2622 {
+ margin-top: 157.5rpx;
+}
+.ml-86.data-v-7d0f2622 {
+ margin-left: 161.25rpx;
+}
+.mt-86.data-v-7d0f2622 {
+ margin-top: 161.25rpx;
+}
+.ml-88.data-v-7d0f2622 {
+ margin-left: 165rpx;
+}
+.mt-88.data-v-7d0f2622 {
+ margin-top: 165rpx;
+}
+.ml-90.data-v-7d0f2622 {
+ margin-left: 168.75rpx;
+}
+.mt-90.data-v-7d0f2622 {
+ margin-top: 168.75rpx;
+}
+.ml-92.data-v-7d0f2622 {
+ margin-left: 172.5rpx;
+}
+.mt-92.data-v-7d0f2622 {
+ margin-top: 172.5rpx;
+}
+.ml-94.data-v-7d0f2622 {
+ margin-left: 176.25rpx;
+}
+.mt-94.data-v-7d0f2622 {
+ margin-top: 176.25rpx;
+}
+.ml-96.data-v-7d0f2622 {
+ margin-left: 180rpx;
+}
+.mt-96.data-v-7d0f2622 {
+ margin-top: 180rpx;
+}
+.ml-98.data-v-7d0f2622 {
+ margin-left: 183.75rpx;
+}
+.mt-98.data-v-7d0f2622 {
+ margin-top: 183.75rpx;
+}
+.ml-100.data-v-7d0f2622 {
+ margin-left: 187.5rpx;
+}
+.mt-100.data-v-7d0f2622 {
+ margin-top: 187.5rpx;
+}
+.container.data-v-7d0f2622 {
+ padding: 20px;
+}
+.order-tabs.data-v-7d0f2622 {
+ display: flex;
+ justify-content: space-around;
+ background-color: #f5f5f5;
+ padding: 10px 0;
+}
+.tab-item.data-v-7d0f2622 {
+ cursor: pointer;
+ padding: 5px 10px;
+}
+.tab-item.active.data-v-7d0f2622 {
+ color: blue;
+ border-bottom: 2px solid blue;
+}
+.order-list.data-v-7d0f2622 {
+ margin-top: 20px;
+}
+.order-item.data-v-7d0f2622 {
+ border: 1px solid #ccc;
+ padding: 10px;
+ margin-bottom: 10px;
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.js b/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.js
index 84a7d08..f99351b 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.js
+++ b/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.js
@@ -49,5 +49,5 @@ const _sfc_main = {
};
}
};
-const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-c20b9e4d"]]);
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-c20b9e4d"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/order/component/addressComponent.vue"]]);
wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/paysuccess/paysuccess.js b/unpackage/dist/dev/mp-weixin/pages/order/paysuccess/paysuccess.js
index 8c7487f..d90283d 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/paysuccess/paysuccess.js
+++ b/unpackage/dist/dev/mp-weixin/pages/order/paysuccess/paysuccess.js
@@ -55,5 +55,5 @@ const _sfc_main = {
};
}
};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-0b647166"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-0b647166"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/order/paysuccess/paysuccess.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.js b/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.js
index 4cb96cd..faae301 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.js
+++ b/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.js
@@ -15,5 +15,5 @@ const _sfc_main = {
};
}
};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-41495ba5"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-41495ba5"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/order/product-close/product-close.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/product-unpay/product-unpay.js b/unpackage/dist/dev/mp-weixin/pages/order/product-unpay/product-unpay.js
index ea440be..03f035d 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/product-unpay/product-unpay.js
+++ b/unpackage/dist/dev/mp-weixin/pages/order/product-unpay/product-unpay.js
@@ -4,5 +4,5 @@ const _sfc_main = {};
function _sfc_render(_ctx, _cache) {
return {};
}
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-8a444854"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-8a444854"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/order/product-unpay/product-unpay.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.js b/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.js
index 6786627..c955f64 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.js
+++ b/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.js
@@ -166,5 +166,5 @@ const _sfc_main = {
};
}
};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-eda1e8f0"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-eda1e8f0"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/order/product-waitpay/product-waitpay.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/productOrderDetail/productOrderDetail.js b/unpackage/dist/dev/mp-weixin/pages/order/productOrderDetail/productOrderDetail.js
index 4e8dfa8..380a521 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/productOrderDetail/productOrderDetail.js
+++ b/unpackage/dist/dev/mp-weixin/pages/order/productOrderDetail/productOrderDetail.js
@@ -14,5 +14,5 @@ const _sfc_main = {
};
}
};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-f0df60ad"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-f0df60ad"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/order/productOrderDetail/productOrderDetail.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.js b/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.js
index c5cd4fe..72f1d6e 100644
--- a/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.js
+++ b/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.js
@@ -43,5 +43,5 @@ const _sfc_main = {
};
}
};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-3361b524"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-3361b524"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/store-home/ProductDetails/ProductDetails.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.js b/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.js
index dae8a3f..5a5f47b 100644
--- a/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.js
+++ b/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.js
@@ -97,5 +97,5 @@ const _sfc_main = {
};
}
};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-7e3c386d"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-7e3c386d"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/store-home/main/main.vue"]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/project.config.json b/unpackage/dist/dev/mp-weixin/project.config.json
index bc80aed..eca82f3 100644
--- a/unpackage/dist/dev/mp-weixin/project.config.json
+++ b/unpackage/dist/dev/mp-weixin/project.config.json
@@ -18,7 +18,7 @@
}
},
"compileType": "miniprogram",
- "libVersion": "3.6.0",
+ "libVersion": "3.6.2",
"appid": "wx3f968a09e31d6bed",
"projectname": "FeiYi",
"condition": {
diff --git a/unpackage/dist/dev/mp-weixin/project.private.config.json b/unpackage/dist/dev/mp-weixin/project.private.config.json
index 44a4b7f..2633c30 100644
--- a/unpackage/dist/dev/mp-weixin/project.private.config.json
+++ b/unpackage/dist/dev/mp-weixin/project.private.config.json
@@ -7,6 +7,20 @@
"condition": {
"miniprogram": {
"list": [
+ {
+ "name": "pages/mine/mineorders/mineorders",
+ "pathName": "pages/mine/mineorders/mineorders",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
+ {
+ "name": "pages/mine/mineorders/mineorders",
+ "pathName": "pages/mine/mineorders/mineorders",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
{
"name": "pages/store-home/main/main",
"pathName": "pages/store-home/main/main",
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js b/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js
index 291ab4e..2167945 100644
--- a/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js
@@ -389,5 +389,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
l: common_vendor.n($options.isDesktop ? "fixforpc-z-index" : "")
}) : {});
}
-const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/jiangchengfeiyi-xiaochengxu/uni_modules/uni-popup/components/uni-popup/uni-popup.vue"]]);
wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml b/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml
index 4e06aa2..cd9441d 100644
--- a/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml
@@ -1 +1 @@
-<view wx:if="{{a}}" class="{{['uni-popup', k, l]}}"><view bindtouchstart="{{j}}"><uni-transition wx:if="{{b}}" key="1" bindclick="{{c}}" u-i="4302e1fd-0" bind:__l="__l" u-p="{{d}}"/><uni-transition wx:if="{{i}}" u-s="{{['d']}}" key="2" bindclick="{{h}}" u-i="4302e1fd-1" bind:__l="__l" u-p="{{i}}"><view style="{{e}}" class="{{['uni-popup__wrapper', f]}}" bindtap="{{g}}"><slot/></view></uni-transition></view></view>
\ No newline at end of file
+<view wx:if="{{a}}" class="{{['uni-popup', k, l]}}"><view bindtouchstart="{{j}}"><uni-transition wx:if="{{b}}" key="1" bindclick="{{c}}" u-i="6f1d5c71-0" bind:__l="__l" u-p="{{d}}"/><uni-transition wx:if="{{i}}" u-s="{{['d']}}" key="2" bindclick="{{h}}" u-i="6f1d5c71-1" bind:__l="__l" u-p="{{i}}"><view style="{{e}}" class="{{['uni-popup__wrapper', f]}}" bindtap="{{g}}"><slot/></view></uni-transition></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js b/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js
index cc27c04..b35c215 100644
--- a/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js
@@ -261,5 +261,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
e: common_vendor.o((...args) => $options.onClick && $options.onClick(...args))
};
}
-const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/jiangchengfeiyi-xiaochengxu/uni_modules/uni-transition/components/uni-transition/uni-transition.vue"]]);
wx.createComponent(Component);