修改培训

components/page-component/app-diy-form/app-diy-form.vue

@@ -85,7 +85,7 @@
                         </view>
                     </view>
 
-                    <view :key="index" v-if="item.key=='date'" v-show="item.key=='date'? false:true"
+                    <view :key="index" v-if="item.key=='date'" v-show="item.key=='date'? true:false"
                           class="item"
                           :class="[itemClass, index===0 ? `is-first-item` : ``,]"
                           :style="{

components/page-component/app-my-service/app-my-service.vue

@@ -1,145 +1,137 @@
 <template>
-    <view class="app-view">
-
-        <view class="app-my-service" :class="[!margin?'no-margin':'', !round?'no-round':'',]">
-            <view class="title" v-if="title">{{title}}</view>
-            <view class="list" :class="[listStyle]">
-                <view class="item" v-for="(item, index) in menus" :key="index">
-                    <app-jump-button form
-                                     :url="item.name == '我的课程'? item.link_url+'?type=1':item.name == '我的比赛'? item.link_url+'?type=2':item.link_url"
-                                     :open_type="item.open_type"
-                                     :item="item"
-                                     :arrangement="`${menu_style === '1' ? 'row' : menu_style === '2' ? 'column' : ''}`">
-                        <view style="width: 100%"
-                              class="item-container"
-                              :class="[
+	<view class="app-view">
+
+		<view class="app-my-service" :class="[!margin?'no-margin':'', !round?'no-round':'',]">
+			<view class="title" v-if="title">{{title}}</view>
+			<view class="list" :class="[listStyle]">
+				<view class="item" v-for="(item, index) in menus" :key="index">
+					<app-jump-button form :url="item.name == '我的课程'? item.link_url+'?type=1':item.name == '我的比赛'? item.link_url+'?type=2':item.name=='全部订单'?item.link_url+'&goods_type=2':item.link_url"
+					 :open_type="item.open_type" :item="item" :arrangement="`${menu_style === '1' ? 'row' : menu_style === '2' ? 'column' : ''}`">
+						<view style="width: 100%" class="item-container" :class="[
                               menu_style=='1'?'dir-left-nowrap cross-center':'',
                               menu_style=='2'?'dir-top-nowrap cross-center':'',
                               ]">
-                            <view class="box-grow-0">
-                                <image :src="item.icon_url" class="icon"></image>
-                            </view>
-                            <view class="box-grow-1" style="max-width: 100%">
-                                <view class="name">{{item.name}}</view>
-                            </view>
-                            <view class="box-grow-0" v-if="menu_style=='1'">
-                                <image src="/static/image/icon/arrow-right.png" class="arrow"></image>
-                            </view>
-                        </view>
-                    </app-jump-button>
-                </view>
-            </view>
-        </view>
-    </view>
+							<view class="box-grow-0">
+								<image :src="item.icon_url" class="icon"></image>
+							</view>
+							<view class="box-grow-1" style="max-width: 100%">
+								<view class="name">{{item.name}}</view>
+							</view>
+							<view class="box-grow-0" v-if="menu_style=='1'">
+								<image src="/static/image/icon/arrow-right.png" class="arrow"></image>
+							</view>
+						</view>
+					</app-jump-button>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-
-    export default {
-        name: "app-my-service",
-        props: {
-            title: {
-                default: null,
-            },
-            menus: Array,
-            menu_style: String,
-            margin: {
-                type: Boolean,
-                default: false,
-            },
-            round: {
-                type: Boolean,
-                default: false,
-            },
-        },
-        computed: {
-            listStyle() {
-                if (this.menu_style == 1) return 'row';
-                if (this.menu_style == 2) return 'grid dir-left-wrap';
-                return '';
-            },
-        },
-		methods:{
-			gotolianjie(){
+	export default {
+		name: "app-my-service",
+		props: {
+			title: {
+				default: null,
+			},
+			menus: Array,
+			menu_style: String,
+			margin: {
+				type: Boolean,
+				default: false,
+			},
+			round: {
+				type: Boolean,
+				default: false,
+			},
+		},
+		computed: {
+			listStyle() {
+				if (this.menu_style == 1) return 'row';
+				if (this.menu_style == 2) return 'grid dir-left-wrap';
+				return '';
+			},
+		},
+		methods: {
+			gotolianjie() {
 				uni.navigateTo({
-					url:"/plugins/flash_sale/index/index"
+					url: "/plugins/flash_sale/index/index"
 				})
 			}
 		}
-    }
+	}
 </script>
 
 <style scoped lang="scss">
+	.app-my-service.no-margin {
+		width: 100%;
+		margin: 0 auto;
+		box-shadow: none;
+	}
+
+	.app-my-service.no-round {
+		border-radius: 0;
+	}
+
+	.app-my-service {
+		width: #{702rpx};
+		border-radius: #{16rpx};
+		margin: #{24rpx} auto;
+		box-shadow: 0 0 #{8rpx} rgba(0, 0, 0, .05);
+		background: #fff;
+
+		.title {
+			padding: #{32rpx} #{32rpx} #{16rpx};
+		}
 
-    .app-my-service.no-margin {
-        width: 100%;
-        margin: 0 auto;
-        box-shadow: none;
-    }
-
-    .app-my-service.no-round {
-        border-radius: 0;
-    }
-
-    .app-my-service {
-        width: #{702rpx};
-        border-radius: #{16rpx};
-        margin: #{24rpx} auto;
-        box-shadow: 0 0 #{8rpx} rgba(0, 0, 0, .05);
-        background: #fff;
-
-        .title {
-            padding: #{32rpx} #{32rpx} #{16rpx};
-        }
-
-        .list {
-            .item {
-                .icon {
-                    width: #{50rpx};
-                    height: #{50rpx};
-                    display: block;
-                }
-
-                .arrow {
-                    width: #{12rpx};
-                    height: #{22rpx};
-                }
-            }
-        }
-
-        .list.row {
-            .item-container {
-                padding: #{20rpx} #{32rpx};
-            }
-
-            .icon {
-                margin-right: #{16rpx};
-            }
-        }
-
-        .list.grid {
-            .item {
-                width: 25%;
+		.list {
+			.item {
+				.icon {
+					width: #{50rpx};
+					height: #{50rpx};
+					display: block;
+				}
+
+				.arrow {
+					width: #{12rpx};
+					height: #{22rpx};
+				}
+			}
+		}
 
-                .icon {
-                    margin-bottom: #{28rpx};
-                }
+		.list.row {
+			.item-container {
+				padding: #{20rpx} #{32rpx};
+			}
 
-                .name {
-                    padding: 0 #{12rpx};
-                    font-size: $uni-font-size-weak-one;
-                    color: $uni-general-color-one;
-                    white-space: nowrap;
-                    overflow: hidden;
-                    text-overflow: ellipsis;
-                    line-height: 1;
-                }
-            }
+			.icon {
+				margin-right: #{16rpx};
+			}
+		}
 
-            .item-container {
-                padding: #{24rpx} 0;
-            }
-        }
-    }
+		.list.grid {
+			.item {
+				width: 25%;
+
+				.icon {
+					margin-bottom: #{28rpx};
+				}
+
+				.name {
+					padding: 0 #{12rpx};
+					font-size: $uni-font-size-weak-one;
+					color: $uni-general-color-one;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					line-height: 1;
+				}
+			}
 
+			.item-container {
+				padding: #{24rpx} 0;
+			}
+		}
+	}
 </style>

pages/order/index/index.vue

@@ -1,567 +1,593 @@
 <template>
-    <app-layout>
-        <view class="order-box">
-<!--            <view class="title-box">
+	<app-layout>
+		<view class="order-box">
+			<!--            <view class="title-box">
                 <app-switch-tab @tabEvent="clickTab" :isborderBottom="false" :bgColor="bgColor"
                                 :currentIndex="currentIndex" :list="list"></app-switch-tab>
             </view> -->
-            <view v-if="is_show" class='content-box'>
-                <template v-if="orders.length">
-              <!--      <view v-for='(item, index) in orders' :key='item.id'
-                          :style="{'margin-top': index == 0 ? '104rpx' : '0'}" class='order-item-box dir-top-wrap'>  -->    
-						  <view v-for='(item, index) in orders' :key='item.id' class='order-item-box dir-top-wrap' style="margin-top:20rpx"> 
-                        <app-jump-button :url="getPageUrl(item.id, item.sign)">
-                            <view class="dir-top-nowrap" style="width: 100%">
-                                <view class='dir-left-nowrap view-1'>
-                                    <view class='box-grow-1'>订单号：{{item.order_no}}</view>
-<!--                                    <template v-if='item.status == 0'>
+			<view v-if="is_show" class='content-box'>
+				<template v-if="orders.length">
+					<!--      <view v-for='(item, index) in orders' :key='item.id'
+                          :style="{'margin-top': index == 0 ? '104rpx' : '0'}" class='order-item-box dir-top-wrap'>  -->
+					<view v-for='(item, index) in orders' :key='item.id' class='order-item-box dir-top-wrap' style="margin-top:20rpx">
+						<app-jump-button :url="getPageUrl(item.id, item.sign)">
+							<view class="dir-top-nowrap" style="width: 100%">
+								<view class='dir-left-nowrap view-1'>
+									<view class='box-grow-1' style="display: flex; justify-content: space-between;align-items: center;">
+										<text>订单号：{{item.order_no}}</text>
+										<text v-if="item.is_pay==0&&item.goods_type==2&&item.audit_status==1">待审核</text>
+										<text v-else-if="item.is_pay==0&&item.goods_type==2&&item.audit_status==2">审核通过</text>
+										<text v-else-if="item.is_pay==0&&item.goods_type==2&&item.audit_status==3">审核拒绝</text>
+										<text v-else></text>
+									</view>
+									<!--                                    <template v-if='item.status == 0'>
                                         <text v-if='item.sign == "pintuan"'>{{item.is_pay == 1 ? '拼团中' : '待付款'}}</text>
                                     </template>
                                     <template v-else>
                                         <view>{{item.status_text}}</view>
                                     </template> -->
-                                </view>
-                                <view v-for='(dItem, dIndex) in item.detail' :key='dIndex' class='view-2'>
-                                    <app-order-goods-info :goods='dItem.goods_info'></app-order-goods-info>
-                                </view>
-                            </view>
-                        </app-jump-button>
-                        <view class='dir-top-nowrap view-3'>
-                            <template v-if='currentIndex == 5'>
-                                <view v-if='item.type == 1' class='box-grow-1'>退货退款:
-                                    <text class='price-color'>￥{{item.refund_price}}</text>
-                                </view>
-                                <view v-else class='box-grow-1'>换货</view>
-                            </template>
-                            <template v-else>
-                                <view class='box-grow-1 main-right cross-center price-count-box'>
-                                    <text class="price-label">合计:</text>
-                                    <text class='price-color'>￥{{item.total_pay_price}}</text>
-                                    <text v-if="item.express_price > 0" class="price-express">(含运费￥{{item.express_price}})</text>
-                                </view>
-                            </template>
-                            <view class='box-grow-0 main-right action-button-box'>
-                                <app-jump-button>
-                                    <view class="main-right action-box-view">
-                                        <!-- 售后订单 -->
-                                        <template v-if='currentIndex == 5'>
-                                            <text :class="{'success-color': item.is_confirm == 1 ? true : false}">
-                                                {{item.status_text}}
-                                            </text>
-                                        </template>
-                                        <!-- 其它订单 -->
-                                        <template v-else>
-                                            <!-- 货到付款订单操作 start -->
-                                            <template v-if='item.pay_type == 2'>
-                                                <!-- 进行中的订单 不能进行订单操作 -->
-                                                <template v-if='item.status == 1'>
-                                                    <!-- 待收货-->
-                                                    <template v-if='item.is_confirm == 0'>
-                                                        <block v-if='item.is_send == 1 && item.der_info.length == 1 && item.send_type == 0'>
-                                                            <view v-if="item.der_info[0].orderExpress.send_type == 1"
-                                                                  @click='logistics(item)' class='order-btn'>
-                                                                物流
-                                                            </view>
-                                                        </block>
-                                                        <view v-else-if='item.der_info.length == 0 && item.is_send == 1 && item.send_type == 0 && item.express_no && item.express'
-                                                              @click='logistics(item)' class='order-btn'>物流
-                                                        </view>
-                                                        <view v-else-if='item.der_info.length >= 1'
-                                                              @click='logistics(item)' class='order-btn'>物流
-                                                        </view>
-                                                        <view v-if="item.is_send == 1 && item.is_confirm == 0" @click='confirm(item)'
-                                                              class='order-btn'>确认收货
-                                                        </view>
-                                                    </template>
-                                                    <!-- 核销 -->
-                                                    <!-- 到店自提订单 在核销前有收款操作 -->
-                                                    <template
-                                                            v-if='item.send_type ==1 && item.is_confirm == 0 && item.cancel_status == 0'>
-                                                        <view @click='getClerkCode(item)' class='order-btn'>核销码</view>
-                                                    </template>
-                                                    <template
-                                                            v-if='item.is_confirm == 1 && item.is_comment == 0 && item.is_sale == 0 && item.sale_status == 0'>
-                                                        <view @click='appraise(item)' class='order-btn'>评价</view>
-                                                    </template>
-                                                </template>
-                                            </template>
-                                            <!-- 货到付款订单操作 end -->
-                                            <!-- 已支付订单操作 start -->
-                                            <template v-else>
-                                                <!-- 待付款 -->
-                                                <template v-if='item.is_pay == 0'>
-                                                    <view @click="cancel(item)" class='order-btn'>取消</view>
-                                                    <view @click='orderPay(item)' class='order-btn'>付款</view>
-                                                </template>
-                                                <template v-if='item.status == 1'>
-                                                    <!-- 核销 -->
-                                                    <!-- 到店自提订单 未支付不显示核销码 | 未支付 货到付款订单显示核销码 -->
-                                                    <template
-                                                            v-if='item.send_type ==1 && item.is_confirm == 0 && ((item.is_pay == 0 && item.pay_type == 2) || (item.is_pay == 1 && item.pay_type != 2))'>
-                                                        <view @click='getClerkCode(item)' class='order-btn'>核销码</view>
-                                                    </template>
-                                                    <!-- 待收货-->
-                                                    <template v-if='item.is_pay == 1 && item.is_confirm == 0'>
-                                                        <block v-if='item.der_info.length == 1 && item.is_send == 1 && item.send_type == 0'>
-                                                            <view v-if="item.der_info[0].orderExpress.send_type == 1"
-                                                                  @click='logistics(item)' class='order-btn'>
-                                                                物流
-                                                            </view>
-                                                        </block>
-                                                        <view v-else-if='item.der_info.length == 0 && item.is_send == 1 && item.send_type == 0 && item.express_no && item.express'
-                                                              @click='logistics(item)' class='order-btn'>物流
-                                                        </view>
-                                                        <view v-else-if='item.der_info.length >= 1'
-                                                              @click='logistics(item)' class='order-btn'>物流
-                                                        </view>
-                                                        <view v-if="item.is_send == 1 && item.is_confirm == 0" @click='confirm(item)' class='order-btn'>确认收货</view>
-                                                    </template>
-                                                    <template
-                                                            v-if='item.is_confirm == 1 && item.is_comment == 0 && item.is_sale == 0 && item.sale_status == 0'>
-                                                        <view @click='appraise(item)' class='order-btn'>评价</view>
-                                                    </template>
-                                                </template>
-                                            </template>
-                                            <!-- 已支付订单操作 end -->
-                                        </template>
-                                    </view>
-                                </app-jump-button>
-                            </view>
-                        </view>
-                    </view>
-                </template>
-                <view class="no-list" v-else>
-                    <app-no-goods background="#f7f7f7" title="暂无相关订单" :is_image="1"></app-no-goods>
-                </view>
-                <!-- 核销码展示 -->
-                <view v-if='is_qrcode' class='qrcode-box'>
-                    <view class='dir-top-wrap main-center cross-center item'>
-                        <view>核销码</view>
-                        <image class='img' :src='qr_code_url'></image>
-                        <image @click='closeQrcode' src='/static/image/icon/icon-close.png' class='remove'></image>
-                    </view>
-                </view>
-            </view>
-            <app-load-text v-if="is_load_show"></app-load-text>
-            <view class="return-index-btn" v-if="show_index">
-                <app-jump-button open_type="redirect" url="/pages/index/index">
-                    <image src="/static/image/icon/index.png" style="width: 50rpx;height: 50rpx"></image>
-                </app-jump-button>
-            </view>
-        </view>
-    </app-layout>
+								</view>
+								<view v-for='(dItem, dIndex) in item.detail' :key='dIndex' class='view-2'>
+									<app-order-goods-info :goods='dItem.goods_info'></app-order-goods-info>
+								</view>
+							</view>
+						</app-jump-button>
+						<view class='dir-top-nowrap view-3'>
+							<template v-if='currentIndex == 5'>
+								<view v-if='item.type == 1' class='box-grow-1'>退货退款:
+									<text class='price-color'>￥{{item.refund_price}}</text>
+								</view>
+								<view v-else class='box-grow-1'>换货</view>
+							</template>
+							<template v-else>
+								<view class='box-grow-1 main-right cross-center price-count-box'>
+									<text class="price-label">合计:</text>
+									<text class='price-color'>￥{{item.total_pay_price}}</text>
+									<text v-if="item.express_price > 0" class="price-express">(含运费￥{{item.express_price}})</text>
+								</view>
+							</template>
+							<view class='box-grow-0 main-right action-button-box'>
+								<app-jump-button>
+									<view class="main-right action-box-view">
+										<!-- 售后订单 -->
+										<template v-if='currentIndex == 5'>
+											<text :class="{'success-color': item.is_confirm == 1 ? true : false}">
+												{{item.status_text}}
+											</text>
+										</template>
+										<!-- 其它订单 -->
+										<template v-else>
+											<!-- 货到付款订单操作 start -->
+											<template v-if='item.pay_type == 2'>
+												<!-- 进行中的订单 不能进行订单操作 -->
+												<template v-if='item.status == 1'>
+													<!-- 待收货-->
+													<template v-if='item.is_confirm == 0'>
+														<block v-if='item.is_send == 1 && item.der_info.length == 1 && item.send_type == 0'>
+															<view v-if="item.der_info[0].orderExpress.send_type == 1" @click='logistics(item)' class='order-btn'>
+																物流
+															</view>
+														</block>
+														<view v-else-if='item.der_info.length == 0 && item.is_send == 1 && item.send_type == 0 && item.express_no && item.express'
+														 @click='logistics(item)' class='order-btn'>物流
+														</view>
+														<view v-else-if='item.der_info.length >= 1' @click='logistics(item)' class='order-btn'>物流
+														</view>
+														<view v-if="item.is_send == 1 && item.is_confirm == 0" @click='confirm(item)' class='order-btn'>确认收货
+														</view>
+													</template>
+													<!-- 核销 -->
+													<!-- 到店自提订单 在核销前有收款操作 -->
+													<template v-if='item.send_type ==1 && item.is_confirm == 0 && item.cancel_status == 0'>
+														<view @click='getClerkCode(item)' class='order-btn'>核销码</view>
+													</template>
+													<template v-if='item.is_confirm == 1 && item.is_comment == 0 && item.is_sale == 0 && item.sale_status == 0'>
+														<view @click='appraise(item)' class='order-btn'>评价</view>
+													</template>
+												</template>
+											</template>
+											<!-- 货到付款订单操作 end -->
+											<!-- 已支付订单操作 start -->
+											<template v-else>
+												<!-- 待付款 -->
+												<template v-if='item.is_pay == 0'>
+													<view @click="cancel(item)" class='order-btn'>取消</view>
+													<view @click='orderPay(item)' v-if="item.audit_status!=2&&item.goods_type!=2" class='order-btn'>付款</view>
+												</template>
+												<template v-if='item.status == 1'>
+													<!-- 核销 -->
+													<!-- 到店自提订单 未支付不显示核销码 | 未支付 货到付款订单显示核销码 -->
+													<template v-if='item.send_type ==1 && item.is_confirm == 0 && ((item.is_pay == 0 && item.pay_type == 2) || (item.is_pay == 1 && item.pay_type != 2))'>
+														<view @click='getClerkCode(item)' class='order-btn'>核销码</view>
+													</template>
+													<!-- 待收货-->
+													<template v-if='item.is_pay == 1 && item.is_confirm == 0'>
+														<block v-if='item.der_info.length == 1 && item.is_send == 1 && item.send_type == 0'>
+															<view v-if="item.der_info[0].orderExpress.send_type == 1" @click='logistics(item)' class='order-btn'>
+																物流
+															</view>
+														</block>
+														<view v-else-if='item.der_info.length == 0 && item.is_send == 1 && item.send_type == 0 && item.express_no && item.express'
+														 @click='logistics(item)' class='order-btn'>物流
+														</view>
+														<view v-else-if='item.der_info.length >= 1' @click='logistics(item)' class='order-btn'>物流
+														</view>
+														<view v-if="item.is_send == 1 && item.is_confirm == 0" @click='confirm(item)' class='order-btn'>确认收货</view>
+													</template>
+													<template v-if='item.is_confirm == 1 && item.is_comment == 0 && item.is_sale == 0 && item.sale_status == 0'>
+														<view @click='appraise(item)' class='order-btn'>评价</view>
+													</template>
+												</template>
+											</template>
+											<!-- 已支付订单操作 end -->
+										</template>
+									</view>
+								</app-jump-button>
+							</view>
+						</view>
+					</view>
+				</template>
+				<view class="no-list" v-else>
+					<app-no-goods background="#f7f7f7" title="暂无相关订单" :is_image="1"></app-no-goods>
+				</view>
+				<!-- 核销码展示 -->
+				<view v-if='is_qrcode' class='qrcode-box'>
+					<view class='dir-top-wrap main-center cross-center item'>
+						<view>核销码</view>
+						<image class='img' :src='qr_code_url'></image>
+						<image @click='closeQrcode' src='/static/image/icon/icon-close.png' class='remove'></image>
+					</view>
+				</view>
+			</view>
+			<app-load-text v-if="is_load_show"></app-load-text>
+			<view class="return-index-btn" v-if="show_index">
+				<app-jump-button open_type="redirect" url="/pages/index/index">
+					<image src="/static/image/icon/index.png" style="width: 50rpx;height: 50rpx"></image>
+				</app-jump-button>
+			</view>
+		</view>
+	</app-layout>
 </template>
 
 <script>
-    import appSwitchTab from '../../../components/basic-component/app-switch-tab/app-switch-tab.vue';
-    import appNoGoods from '../../../components/page-component/app-no-goods/app-no-goods.vue';
-    import appOrderGoodsInfo from '../../../components/page-component/app-order-goods-info/app-order-goods-info.vue';
-    import {mapGetters} from 'vuex';
+	import appSwitchTab from '../../../components/basic-component/app-switch-tab/app-switch-tab.vue';
+	import appNoGoods from '../../../components/page-component/app-no-goods/app-no-goods.vue';
+	import appOrderGoodsInfo from '../../../components/page-component/app-order-goods-info/app-order-goods-info.vue';
+	import {
+		mapGetters
+	} from 'vuex';
 
-    export default {
-        data() {
-            return {
-                list: [{name: '全部'}, {name: '待付款'}, {name: '待发货'}, {name: '待收货'}, {name: '待评价'}],
-                page: 1,
-                currentIndex: 0,
-                orders: [],
-                pagination: null,
-                qr_code_url: '',
-                is_qrcode: false,
-                is_show: false,
-                is_load_show: false,
-                show_index: false,
-                bgColor: '#f7f7f7',
-                isRequest: true,//防止数据重复加载
-                template_message: [],
-            }
-        },
-        methods: {
-            getList() {
-                this.isRequest = false;
-                this.$request({
-                    url: this.$api.order.list,
-                    data: {
-                        status: this.currentIndex,
-                        page: this.page,
-                    }
-                }).then(response => {
-                    let {code, data, msg} = response;
-                    this.$hideLoading();
-                    this.is_load_show = false;
-                    this.is_show = true;
-                    if (code == 0) {
-                        let {list, pagination} = data;
-                        if (this.page != 1) {
-                            this.orders = this.orders.concat(list)
-                        } else {
-                            this.orders = list;
-                        }
-                        this.page = list.length ? this.page + 1 : this.page;
-                        this.pagination = pagination;
-                        this.template_message = data.template_message;
-                    } else {
-                        uni.showModal({
-                            title: '',
-                            content: msg,
-                            showCancel: false,
-                        });
-                    }
-                    this.isRequest = true;
-                }).catch(() => {
-                    this.is_load_show = false;
-                    this.$hideLoading();
-                });
-            },
-            clickTab(params) {
-                if (this.isRequest) {
-                    this.page = 1;
-                    this.currentIndex = params.currentIndex;
-                    this.is_show = false;
-                    this.$showLoading();
-                    this.getList();
-                }
-            },
-            getPageUrl: function (id, sign) {
-                if (this.currentIndex == 5) {
-                    return `/pages/order/refund-detail/refund-detail?id=${id}&sign=${sign}`
-                } else {
-                    return `/pages/order/order-detail/order-detail?id=${id}&sign=${sign}`
-                }
-            },
-            // 确认收货
-            confirm(item) {
-                let self = this;
-                uni.showModal({
-                    title: '提示',
-                    content: '是否确认收货?',
-                    success: function (res) {
-                        if (res.confirm) {
-                            uni.showLoading({title: '确认收货中'});
-                            self.$request({
-                                url: self.$api.order.confirm,
-                                data: {
-                                    id: item.id
-                                }
-                            }).then(response => {
-                                uni.hideLoading();
-                                if (response.code === 0) {
-                                    uni.redirectTo({
-                                        url: '/pages/order/index/index?status=' + 4
-                                    });
-                                } else {
-                                    uni.showModal({
-                                        title: '',
-                                        content: response.msg,
-                                        showCancel: false,
-                                    });
-                                }
-                            }).catch(() => {
-                                uni.hideLoading()
-                            });
-                        }
-                    }
-                });
-            },
-            // 取消
-            cancel(e) {
-                let self = this;
-                uni.showModal({
-                    title: '提示',
-                    content: '是否取消订单？',
-                    success: function (res) {
-                        if (res.confirm) {
-                            uni.showLoading({title: '取消中'});
-                            self.$request({
-                                url: self.$api.order.cancel,
-                                data: {
-                                    id: e.id
-                                }
-                            }).then(response => {
-                                uni.hideLoading();
-                                if (response.code == 0) {
-                                    uni.redirectTo({
-                                        url: '/pages/order/index/index?status=' + self.currentIndex
-                                    })
-                                } else {
-                                    uni.showModal({
-                                        title: '',
-                                        content: response.msg,
-                                        showCancel: false,
-                                    });
-                                }
-                            }).catch(() => {
-                                uni.hideLoading();
-                            });
-                        }
-                    }
-                });
-            },
-            // 物流信息
-            logistics(orderDetail) {
-                if (orderDetail.is_send == 1 && orderDetail.detailExpress.length == 0) {
-                    let [id, express, express_no, customer_name, cover_pic] = [orderDetail.id, orderDetail.express, orderDetail.express_no, orderDetail.customer_name, orderDetail.detail[0].goods_info.pic_url];
-                    uni.navigateTo({
-                        url: `/pages/order/express-detail/express-detail?id=${id}&express=${express}&express_no=${express_no}&customer_name=${customer_name}&cover_pic=${cover_pic}`
-                    })
-                } else if (orderDetail.is_send == 1 && orderDetail.detailExpress.length == 1) {
-                    let express = orderDetail.detailExpress[0].express;
-                    let express_no = orderDetail.detailExpress[0].express_no;
-                    let customer_name = orderDetail.detailExpress[0].customer_name;
-                    let cover_pic = orderDetail.detailExpress[0].expressRelation[0].orderDetail.goods_info.goods_attr.cover_pic;
-                    uni.navigateTo({
-                        url: `/pages/order/express-detail/express-detail?express=` + express + `&customer_name=` + customer_name + `&express_no=` + express_no + `&cover_pic=` + cover_pic
-                    })
-                } else if (orderDetail.detailExpress.length >= 1) {
-                    uni.navigateTo({
-                        url: '/pages/order/express-list/express-list?order_id=' + orderDetail.id
-                    });
-                }
-            },
-            // 订单支付
-            orderPay(e) {
-                let _this = this;
-                _this.$showLoading();
-                _this.$request({
-                    url: _this.$api.order.list_pay_data,
-                    data: {
-                        id: e.id
-                    }
-                }).then(response => {
-                    _this.$hideLoading();
-                    if (response.code === 0) {
-                        _this.$payment.pay(response.data.id).then(() => {
-                            // 支付成功
-                            uni.redirectTo({
-                                url: '/pages/order/index/index?status=2'
-                            })
-                        }).catch(e => {
-                            // 支付失败
-                            uni.showModal({
-                                title: '',
-                                content: e.errMsg,
-                                showCancel: false
-                            })
-                        })
-                    }
-                }).catch(() => {
-                    _this.$hideLoading();
-                });
-            },
-            // 订单评价
-            appraise(e) {
-                uni.navigateTo({
-                    url: `/pages/order/appraise/appraise?id=${e.id}`
-                })
-            },
-            getClerkCode(e) {
-                let self = this;
-                self.$showLoading();
-                self.$request({
-                    url: self.$api.order.clerk_qr_code,
-                    data: {
-                        id: e.id
-                    }
-                }).then(response => {
-                    self.$hideLoading();
-                    if (response.code === 0) {
-                        self.qr_code_url = response.data.file_path;
-                        self.is_qrcode = true;
-                    } else {
-                        uni.showModal({
-                            title: '',
-                            content: response.msg,
-                            showCancel: false,
-                        });
-                    }
-                }).catch(() => {
-                    self.$hideLoading();
-                });
-            },
-            closeQrcode() {
-                this.is_qrcode = false;
-            },
-        },
-        onLoad(options) {
-            this.currentIndex = options.status ? options.status : this.currentIndex;
-        },
-        onReachBottom() {
-            this.is_load_show = true;
-            this.getList()
-        },
-        onShow() {
-            let self = this;
-            let interval = setInterval(function () {
-                if (self.isRequest) {
-                    self.page = 1;
-                    self.$showLoading();
-                    self.getList();
-                    self.$store.dispatch('gConfig/setTabBarBoolean', self.tabBarNavs.navs);
-                }
-                let pages = getCurrentPages();
-                if (pages.length < 2) {
-                    self.show_index = true;
-                }
-                clearInterval(interval)
-            }, 300);
-        },
-        computed: {
-            ...mapGetters('mallConfig', {
-                tabBarNavs: 'getNavBar'
-            }),
-        },
-        components: {
-            'app-switch-tab': appSwitchTab,
-            'app-order-goods-info': appOrderGoodsInfo,
-            'app-no-goods': appNoGoods,
-        },
-    }
+	export default {
+		data() {
+			return {
+				list: [{
+					name: '全部'
+				}, {
+					name: '待付款'
+				}, {
+					name: '待发货'
+				}, {
+					name: '待收货'
+				}, {
+					name: '待评价'
+				}],
+				page: 1,
+				currentIndex: 0,
+				orders: [],
+				pagination: null,
+				qr_code_url: '',
+				is_qrcode: false,
+				is_show: false,
+				is_load_show: false,
+				show_index: false,
+				bgColor: '#f7f7f7',
+				isRequest: true, //防止数据重复加载
+				template_message: [],
+				goods_type: ""
+			}
+		},
+		methods: {
+			getList() {
+				this.isRequest = false;
+				this.$request({
+					url: this.$api.order.list,
+					data: {
+						status: this.currentIndex,
+						page: this.page,
+						goods_type: this.goods_type
+					}
+				}).then(response => {
+					let {
+						code,
+						data,
+						msg
+					} = response;
+					this.$hideLoading();
+					this.is_load_show = false;
+					this.is_show = true;
+					if (code == 0) {
+						let {
+							list,
+							pagination
+						} = data;
+						if (this.page != 1) {
+							this.orders = this.orders.concat(list)
+						} else {
+							this.orders = list;
+						}
+						this.page = list.length ? this.page + 1 : this.page;
+						this.pagination = pagination;
+						this.template_message = data.template_message;
+					} else {
+						uni.showModal({
+							title: '',
+							content: msg,
+							showCancel: false,
+						});
+					}
+					this.isRequest = true;
+				}).catch(() => {
+					this.is_load_show = false;
+					this.$hideLoading();
+				});
+			},
+			clickTab(params) {
+				if (this.isRequest) {
+					this.page = 1;
+					this.currentIndex = params.currentIndex;
+					this.is_show = false;
+					this.$showLoading();
+					this.getList();
+				}
+			},
+			getPageUrl: function(id, sign) {
+				if (this.currentIndex == 5) {
+					return `/pages/order/refund-detail/refund-detail?id=${id}&sign=${sign}`
+				} else {
+					return `/pages/order/order-detail/order-detail?id=${id}&sign=${sign}`
+				}
+			},
+			// 确认收货
+			confirm(item) {
+				let self = this;
+				uni.showModal({
+					title: '提示',
+					content: '是否确认收货?',
+					success: function(res) {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '确认收货中'
+							});
+							self.$request({
+								url: self.$api.order.confirm,
+								data: {
+									id: item.id
+								}
+							}).then(response => {
+								uni.hideLoading();
+								if (response.code === 0) {
+									uni.redirectTo({
+										url: '/pages/order/index/index?status=' + 4
+									});
+								} else {
+									uni.showModal({
+										title: '',
+										content: response.msg,
+										showCancel: false,
+									});
+								}
+							}).catch(() => {
+								uni.hideLoading()
+							});
+						}
+					}
+				});
+			},
+			// 取消
+			cancel(e) {
+				let self = this;
+				uni.showModal({
+					title: '提示',
+					content: '是否取消订单？',
+					success: function(res) {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '取消中'
+							});
+							self.$request({
+								url: self.$api.order.cancel,
+								data: {
+									id: e.id
+								}
+							}).then(response => {
+								uni.hideLoading();
+								if (response.code == 0) {
+									uni.redirectTo({
+										url: '/pages/order/index/index?status=' + self.currentIndex
+									})
+								} else {
+									uni.showModal({
+										title: '',
+										content: response.msg,
+										showCancel: false,
+									});
+								}
+							}).catch(() => {
+								uni.hideLoading();
+							});
+						}
+					}
+				});
+			},
+			// 物流信息
+			logistics(orderDetail) {
+				if (orderDetail.is_send == 1 && orderDetail.detailExpress.length == 0) {
+					let [id, express, express_no, customer_name, cover_pic] = [orderDetail.id, orderDetail.express, orderDetail.express_no,
+						orderDetail.customer_name, orderDetail.detail[0].goods_info.pic_url
+					];
+					uni.navigateTo({
+						url: `/pages/order/express-detail/express-detail?id=${id}&express=${express}&express_no=${express_no}&customer_name=${customer_name}&cover_pic=${cover_pic}`
+					})
+				} else if (orderDetail.is_send == 1 && orderDetail.detailExpress.length == 1) {
+					let express = orderDetail.detailExpress[0].express;
+					let express_no = orderDetail.detailExpress[0].express_no;
+					let customer_name = orderDetail.detailExpress[0].customer_name;
+					let cover_pic = orderDetail.detailExpress[0].expressRelation[0].orderDetail.goods_info.goods_attr.cover_pic;
+					uni.navigateTo({
+						url: `/pages/order/express-detail/express-detail?express=` + express + `&customer_name=` + customer_name +
+							`&express_no=` + express_no + `&cover_pic=` + cover_pic
+					})
+				} else if (orderDetail.detailExpress.length >= 1) {
+					uni.navigateTo({
+						url: '/pages/order/express-list/express-list?order_id=' + orderDetail.id
+					});
+				}
+			},
+			// 订单支付
+			orderPay(e) {
+				let _this = this;
+				_this.$showLoading();
+				_this.$request({
+					url: _this.$api.order.list_pay_data,
+					data: {
+						id: e.id
+					}
+				}).then(response => {
+					_this.$hideLoading();
+					if (response.code === 0) {
+						_this.$payment.pay(response.data.id).then(() => {
+							// 支付成功
+							uni.redirectTo({
+								url: '/pages/order/index/index?status=2'
+							})
+						}).catch(e => {
+							// 支付失败
+							uni.showModal({
+								title: '',
+								content: e.errMsg,
+								showCancel: false
+							})
+						})
+					}
+				}).catch(() => {
+					_this.$hideLoading();
+				});
+			},
+			// 订单评价
+			appraise(e) {
+				uni.navigateTo({
+					url: `/pages/order/appraise/appraise?id=${e.id}`
+				})
+			},
+			getClerkCode(e) {
+				let self = this;
+				self.$showLoading();
+				self.$request({
+					url: self.$api.order.clerk_qr_code,
+					data: {
+						id: e.id
+					}
+				}).then(response => {
+					self.$hideLoading();
+					if (response.code === 0) {
+						self.qr_code_url = response.data.file_path;
+						self.is_qrcode = true;
+					} else {
+						uni.showModal({
+							title: '',
+							content: response.msg,
+							showCancel: false,
+						});
+					}
+				}).catch(() => {
+					self.$hideLoading();
+				});
+			},
+			closeQrcode() {
+				this.is_qrcode = false;
+			},
+		},
+		onLoad(options) {
+			this.currentIndex = options.status ? options.status : this.currentIndex;
+			this.goods_type = options.goods_type ? options.goods_type : this.goods_type
+			console.log(options)
+		},
+		onReachBottom() {
+			this.is_load_show = true;
+			this.getList()
+		},
+		onShow() {
+			let self = this;
+			let interval = setInterval(function() {
+				if (self.isRequest) {
+					self.page = 1;
+					self.$showLoading();
+					self.getList();
+					self.$store.dispatch('gConfig/setTabBarBoolean', self.tabBarNavs.navs);
+				}
+				let pages = getCurrentPages();
+				if (pages.length < 2) {
+					self.show_index = true;
+				}
+				clearInterval(interval)
+			}, 300);
+		},
+		computed: {
+			...mapGetters('mallConfig', {
+				tabBarNavs: 'getNavBar'
+			}),
+		},
+		components: {
+			'app-switch-tab': appSwitchTab,
+			'app-order-goods-info': appOrderGoodsInfo,
+			'app-no-goods': appNoGoods,
+		},
+	}
 </script>
 
 <style scoped lang="scss">
-    .order-box {
-        width: 100%;
-        height: 100%;
-    }
+	.order-box {
+		width: 100%;
+		height: 100%;
+	}
 
-    .title-box {
-        height: 80#{rpx};
-        width: 100%;
-        position: fixed;
-        border-bottom: 1#{rpx} solid $uni-weak-color-one;
-        top: 0;
-        background: #fff;
-        z-index: 1;
-    }
+	.title-box {
+		height: 80#{rpx};
+		width: 100%;
+		position: fixed;
+		border-bottom: 1#{rpx} solid $uni-weak-color-one;
+		top: 0;
+		background: #fff;
+		z-index: 1;
+	}
 
-    .no-list {
-        margin-top: #{150upx};
-    }
-    .content-box {
-        // margin-top: 80#{rpx};
-    }
+	.no-list {
+		margin-top: #{150upx};
+	}
 
-    .not-order-box {
-        height: calc(100vh - 80#{rpx});
-        color: $uni-general-color-two;
-    }
+	.content-box {
+		// margin-top: 80#{rpx};
+	}
 
-    .order-item-box {
-        background: #fff;
-        padding: 0 24#{rpx};
-        margin: 0 24#{rpx};
-        margin-bottom: 24#{rpx};
-        border-radius: 16#{rpx};
-        font-size: $uni-font-size-general-two;
-        box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.06);
-    }
+	.not-order-box {
+		height: calc(100vh - 80#{rpx});
+		color: $uni-general-color-two;
+	}
 
-    .order-item-box .view-1 {
-        width: 100%;
-        font-size: $uni-font-size-weak-one;
-        color: $uni-important-color-black;
-        margin: 32#{rpx} 0;
-    }
+	.order-item-box {
+		background: #fff;
+		padding: 0 24#{rpx};
+		margin: 0 24#{rpx};
+		margin-bottom: 24#{rpx};
+		border-radius: 16#{rpx};
+		font-size: $uni-font-size-general-two;
+		box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.06);
+	}
 
-    .order-item-box .view-2 {
-    }
+	.order-item-box .view-1 {
+		width: 100%;
+		font-size: $uni-font-size-weak-one;
+		color: $uni-important-color-black;
+		margin: 32#{rpx} 0;
+	}
 
-    .order-item-box .view-3 {
-        font-size: $uni-font-size-import-two;
-    }
+	.order-item-box .view-2 {}
 
-    .order-item-box .view-3 .btn {
-        margin-left: 15#{rpx};
-    }
+	.order-item-box .view-3 {
+		font-size: $uni-font-size-import-two;
+	}
 
-    .price-count-box {
-        margin: 28#{rpx} 0;
-    }
+	.order-item-box .view-3 .btn {
+		margin-left: 15#{rpx};
+	}
 
-    .price-label {
-        margin-right: 5#{rpx};
-    }
+	.price-count-box {
+		margin: 28#{rpx} 0;
+	}
 
-    .price-color {
-        color: $uni-important-color-black;
-    }
+	.price-label {
+		margin-right: 5#{rpx};
+	}
 
-    .price-express {
-        font-size: $uni-font-size-weak-two;
-        color: $uni-general-color-two;
-    }
+	.price-color {
+		color: $uni-important-color-black;
+	}
 
-    .success-color {
-        color: $uni-important-color-black;
-    }
+	.price-express {
+		font-size: $uni-font-size-weak-two;
+		color: $uni-general-color-two;
+	}
 
-    .error-color {
-        color: $uni-important-color-red;
-    }
+	.success-color {
+		color: $uni-important-color-black;
+	}
 
-    .qrcode-box {
-        width: 100%;
-        height: 100%;
-        position: fixed;
-        top: 0;
-        left: 0;
-        background: rgba(0, 0, 0, 0.5);
-    }
+	.error-color {
+		color: $uni-important-color-red;
+	}
 
-    .qrcode-box .item {
-        position: absolute;
-        top: 25%;
-        width: 562#{rpx};
-        height: 562#{rpx};
-        background: #fff;
-        left: 94#{rpx};
-        z-index: 999;
-        border-radius: 15#{rpx};
-    }
+	.qrcode-box {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		background: rgba(0, 0, 0, 0.5);
+	}
 
-    .qrcode-box .img {
-        margin-top: 30#{rpx};
-        width: 375#{rpx};
-        height: 375#{rpx};
-    }
+	.qrcode-box .item {
+		position: absolute;
+		top: 25%;
+		width: 562#{rpx};
+		height: 562#{rpx};
+		background: #fff;
+		left: 94#{rpx};
+		z-index: 999;
+		border-radius: 15#{rpx};
+	}
 
-    .qrcode-box .item .remove {
-        position: absolute;
-        top: 0;
-        right: 0;
-        width: 50#{rpx};
-        height: 50#{rpx};
-        margin: 15#{rpx};
-        padding: #{7rpx}
-    }
+	.qrcode-box .img {
+		margin-top: 30#{rpx};
+		width: 375#{rpx};
+		height: 375#{rpx};
+	}
 
-    .order-btn {
-        display: inline-block;
-        line-height: 2.3;
-        font-size: 26#{rpx};
-        padding: 0 30#{rpx};
-        border: 1#{rpx} solid $uni-weak-color-one;
-        border-radius: 30#{rpx};
-        margin-left: 16#{rpx};
-    }
+	.qrcode-box .item .remove {
+		position: absolute;
+		top: 0;
+		right: 0;
+		width: 50#{rpx};
+		height: 50#{rpx};
+		margin: 15#{rpx};
+		padding: #{7rpx}
+	}
 
-    .action-button-box {
-        margin-bottom: 24#{rpx};
-    }
+	.order-btn {
+		display: inline-block;
+		line-height: 2.3;
+		font-size: 26#{rpx};
+		padding: 0 30#{rpx};
+		border: 1#{rpx} solid $uni-weak-color-one;
+		border-radius: 30#{rpx};
+		margin-left: 16#{rpx};
+	}
 
-    .return-index-btn {
-        position: fixed;
-        right: 0;
-        bottom: #{100rpx};
-        display: inline-block;
-        background: rgba(157, 157, 157, 0.5);
-        padding: #{10rpx} #{20rpx};
-        z-index: 1000;
-        border-radius: #{10rpx} 0 0 #{10rpx};
-    }
+	.action-button-box {
+		margin-bottom: 24#{rpx};
+	}
 
-    .action-box-view {
-        width: 100%;
-    }
+	.return-index-btn {
+		position: fixed;
+		right: 0;
+		bottom: #{100rpx};
+		display: inline-block;
+		background: rgba(157, 157, 157, 0.5);
+		padding: #{10rpx} #{20rpx};
+		z-index: 1000;
+		border-radius: #{10rpx} 0 0 #{10rpx};
+	}
 
-</style>
+	.action-box-view {
+		width: 100%;
+	}
+</style>

unpackage/dist/build/mp-weixin/app.json

@@ -197,5 +197,5 @@
     "app-load-text": "/components/basic-component/app-load-text/app-load-text",
     "app-image": "/components/basic-component/app-image/app-image"
   },
-  "sitemapLocation": "sitemap1.json"
+  "sitemapLocation": "sitemap39.json"
 }

unpackage/dist/build/mp-weixin/components/basic-component/app-layout/app-user-phone/app-user-phone.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/build/mp-weixin/components/basic-component/app-rich/components/wxParseImg.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/components/basic-component/uni-swiper-dot/uni-swiper-dot.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/build/mp-weixin/components/page-component/app-category-list/app-category-list.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/build/mp-weixin/components/page-component/app-head-navigation/app-head-navigation.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/build/mp-weixin/components/page-component/app-my-service/app-my-service.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/page-component/app-my-service/app-my-service"],{"1d76":function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r={name:"app-my-service",props:{title:{default:null},menus:Array,menu_style:String,margin:{type:Boolean,default:!1},round:{type:Boolean,default:!1}},computed:{listStyle:function(){return 1==this.menu_style?"row":2==this.menu_style?"grid dir-left-wrap":""}}};t.default=r},"6c56":function(e,t,n){},8146:function(e,t,n){"use strict";n.r(t);var r=n("a8b2e"),u=n("fe9d");for(var a in u)"default"!==a&&function(e){n.d(t,e,(function(){return u[e]}))}(a);n("dc77");var c,o=n("f0c5"),i=Object(o["a"])(u["default"],r["b"],r["c"],!1,null,"1004e824",null,!1,r["a"],c);t["default"]=i.exports},a8b2e:function(e,t,n){"use strict";var r;n.d(t,"b",(function(){return u})),n.d(t,"c",(function(){return a})),n.d(t,"a",(function(){return r}));var u=function(){var e=this,t=e.$createElement;e._self._c},a=[]},dc77:function(e,t,n){"use strict";var r=n("6c56"),u=n.n(r);u.a},fe9d:function(e,t,n){"use strict";n.r(t);var r=n("1d76"),u=n.n(r);for(var a in r)"default"!==a&&function(e){n.d(t,e,(function(){return r[e]}))}(a);t["default"]=u.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/page-component/app-my-service/app-my-service"],{"1d76":function(e,t,n){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var n={name:"app-my-service",props:{title:{default:null},menus:Array,menu_style:String,margin:{type:Boolean,default:!1},round:{type:Boolean,default:!1}},computed:{listStyle:function(){return 1==this.menu_style?"row":2==this.menu_style?"grid dir-left-wrap":""}},methods:{gotolianjie:function(){e.navigateTo({url:"/plugins/flash_sale/index/index"})}}};t.default=n}).call(this,n("543d")["default"])},"3af0":function(e,t,n){"use strict";var u;n.d(t,"b",(function(){return a})),n.d(t,"c",(function(){return r})),n.d(t,"a",(function(){return u}));var a=function(){var e=this,t=e.$createElement;e._self._c},r=[]},8146:function(e,t,n){"use strict";n.r(t);var u=n("3af0"),a=n("fe9d");for(var r in a)"default"!==r&&function(e){n.d(t,e,(function(){return a[e]}))}(r);n("9bf7");var i,o=n("f0c5"),f=Object(o["a"])(a["default"],u["b"],u["c"],!1,null,"00853449",null,!1,u["a"],i);t["default"]=f.exports},8966:function(e,t,n){},"9bf7":function(e,t,n){"use strict";var u=n("8966"),a=n.n(u);a.a},fe9d:function(e,t,n){"use strict";n.r(t);var u=n("1d76"),a=n.n(u);for(var r in u)"default"!==r&&function(e){n.d(t,e,(function(){return u[e]}))}(r);t["default"]=a.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/page-component/app-my-service/app-my-service-create-component',
     {

unpackage/dist/build/mp-weixin/components/page-component/app-my-service/app-my-service.wxml

@@ -1 +1 @@
-<view class="app-view data-v-1004e824"><view class="{{['app-my-service data-v-1004e824',!margin?'no-margin':'',!round?'no-round':'']}}"><block wx:if="{{title}}"><view class="title data-v-1004e824">{{title}}</view></block><view class="{{['list data-v-1004e824',listStyle]}}"><block wx:for="{{menus}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item data-v-1004e824"><app-jump-button vue-id="{{'62e965ec-1-'+index}}" form="{{true}}" url="{{item.name=='我的课程'?item.link_url+'?type=1':item.name=='我的比赛'?item.link_url+'?type=2':item.link_url}}" open_type="{{item.open_type}}" item="{{item}}" arrangement="{{''+(menu_style==='1'?'row':menu_style==='2'?'column':'')}}" class="data-v-1004e824" bind:__l="__l" vue-slots="{{['default']}}"><view class="{{['item-container data-v-1004e824',menu_style=='1'?'dir-left-nowrap cross-center':'',menu_style=='2'?'dir-top-nowrap cross-center':'']}}" style="width:100%;"><view class="box-grow-0 data-v-1004e824"><image class="icon data-v-1004e824" src="{{item.icon_url}}"></image></view><view class="box-grow-1 data-v-1004e824" style="max-width:100%;"><view class="name data-v-1004e824">{{item.name}}</view></view><block wx:if="{{menu_style=='1'}}"><view class="box-grow-0 data-v-1004e824"><image class="arrow data-v-1004e824" src="/static/image/icon/arrow-right.png"></image></view></block></view></app-jump-button></view></block></view></view></view>
+<view class="app-view data-v-00853449"><view class="{{['app-my-service data-v-00853449',!margin?'no-margin':'',!round?'no-round':'']}}"><block wx:if="{{title}}"><view class="title data-v-00853449">{{title}}</view></block><view class="{{['list data-v-00853449',listStyle]}}"><block wx:for="{{menus}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item data-v-00853449"><app-jump-button vue-id="{{'62e965ec-1-'+index}}" form="{{true}}" url="{{item.name=='我的课程'?item.link_url+'?type=1':item.name=='我的比赛'?item.link_url+'?type=2':item.name=='全部订单'?item.link_url+'&goods_type=2':item.link_url}}" open_type="{{item.open_type}}" item="{{item}}" arrangement="{{''+(menu_style==='1'?'row':menu_style==='2'?'column':'')}}" class="data-v-00853449" bind:__l="__l" vue-slots="{{['default']}}"><view class="{{['item-container data-v-00853449',menu_style=='1'?'dir-left-nowrap cross-center':'',menu_style=='2'?'dir-top-nowrap cross-center':'']}}" style="width:100%;"><view class="box-grow-0 data-v-00853449"><image class="icon data-v-00853449" src="{{item.icon_url}}"></image></view><view class="box-grow-1 data-v-00853449" style="max-width:100%;"><view class="name data-v-00853449">{{item.name}}</view></view><block wx:if="{{menu_style=='1'}}"><view class="box-grow-0 data-v-00853449"><image class="arrow data-v-00853449" src="/static/image/icon/arrow-right.png"></image></view></block></view></app-jump-button></view></block></view></view></view>

unpackage/dist/build/mp-weixin/pages/cats/second-class.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/build/mp-weixin/project.config.json

@@ -5,34 +5,9 @@
   },
   "setting": {
     "urlCheck": false,
-    "es6": true,
-    "enhance": false,
     "postcss": false,
-    "preloadBackgroundData": false,
     "minified": true,
-    "newFeature": false,
-    "coverView": true,
-    "nodeModules": false,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "useMultiFrameRuntime": false,
-    "useApiHook": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "useIsolateContext": true,
-    "useCompilerModule": true,
-    "userConfirmedUseCompilerModuleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": []
+    "es6": true
   },
   "compileType": "miniprogram",
   "libVersion": "",
@@ -42,19 +17,15 @@
   "simulatorPluginLibVersion": {},
   "condition": {
     "search": {
-      "current": -1,
       "list": []
     },
     "conversation": {
-      "current": -1,
       "list": []
     },
     "game": {
-      "current": -1,
       "list": []
     },
     "miniprogram": {
-      "current": -1,
       "list": []
     }
   }