diff --git a/common/js/config.js b/common/js/config.js
index 4279dca..29d8be9 100644
--- a/common/js/config.js
+++ b/common/js/config.js
@@ -16,7 +16,7 @@ export default  {
 		//https://demo-guojiang-ec-api.guojiang.club/
 		
 		baseUrl: process.env.NODE_ENV === 'development' ? 
-		'http://192.168.3.81/' : 'https://v3-ec-admin-dev.guojiang.club/', // 运行时自动替换变量
+		'https://jincheng.lubanhudong.com/' : 'https://v3-ec-admin-dev.guojiang.club/', // 运行时自动替换变量
     },
 	 PACKAGES: {
         activity: false,
diff --git a/components/lf-shopGoodsCard/lf-shopGoodsCard.vue b/components/lf-shopGoodsCard/lf-shopGoodsCard.vue
index 1ba3d2d..982fb70 100644
--- a/components/lf-shopGoodsCard/lf-shopGoodsCard.vue
+++ b/components/lf-shopGoodsCard/lf-shopGoodsCard.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<view class="shop" @click="$url('/pages/shop/specialList')">
+		<view class="shop" @click="$url(main[0].link)">
 			<image class="img" :src="main[0] && main[0].image" mode="aspectFill"></image>
 		</view>
 		<scroll-view class="scroll-view" :scroll-x="true">
diff --git a/pages/discover/discover.vue b/pages/discover/discover.vue
index 535ccb9..787955b 100644
--- a/pages/discover/discover.vue
+++ b/pages/discover/discover.vue
@@ -12,11 +12,13 @@
 						<view class="lf-p-32">
 							<view class="lf-flex" @click="$url('/pages/user/my/my?user_id='+item.user_id)">
 								<view class="tag-father">
-									<image :src="item.user.avatar" mode="aspectFill" class="head-img"></image>
+									<image :src="item.user.avatar" v-if="item.user.avatar" mode="aspectFill" class="head-img"></image>
+									<image src="../../static/images/empty.png" v-else mode="aspectFill" class="head-img"></image>
 									<view class="head-tag">V</view>
 								</view>
 								<view class="lf-flex-column lf-m-l-20">
 									<view class="lf-font-32 lf-color-black lf-font-bold" v-if="item.user.nick_name">{{item.user.nick_name}}</view>
+									<view class="lf-font-32 lf-color-black lf-font-bold" v-else>{{item.user.mobile_replace}}</view>
 									<view class="lf-font-24 lf-color-777 lf-m-t-15">{{item.created_at}}</view>
 								</view>
 							</view>
diff --git a/pages/discover/discoverdetails.vue b/pages/discover/discoverdetails.vue
index e2111ea..c6db11b 100644
--- a/pages/discover/discoverdetails.vue
+++ b/pages/discover/discoverdetails.vue
@@ -9,7 +9,8 @@
 				</view>
 				<view class="lf-flex-column lf-m-l-20">
 					<view>
-						<text class="lf-font-32 lf-color-black lf-font-bold lf-m-r-15">{{discover_details.user.nick_name}}</text>
+						<text class="lf-font-32 lf-color-black lf-font-bold lf-m-r-15" v-if="discover_details.user.nick_name">{{discover_details.user.nick_name}}</text>
+						<text class="lf-font-32 lf-color-black lf-font-bold lf-m-r-15" v-else>{{discover_details.user.mobile_replace}}</text>
 						<text class="lf-iconfont icon-xiangyou lf-color-777 lf-text-vertical" style="font-size: 18rpx;"></text>
 					</view>
 					<view class="lf-font-24 lf-color-777 lf-m-t-15">{{discover_details.updated_at}}</view>
@@ -46,10 +47,12 @@
 				<view class="lf-m-t-20" @click="applySub(commentitem.user.id,commentitem.id)">
 					<view class="lf-flex">
 						<view @click="$url('/pages/user/my/my?user_id='+commentitem.user_id)">
-							<image class="comment-img" :src="commentitem.user.avatar" mode="aspectFill"></image>
+							<image class="comment-img" :src="commentitem.user.avatar" v-if="commentitem.user.avatar" mode="aspectFill"></image>
+							<image class="comment-img" src="../../static/images/empty.png" v-else mode="aspectFill"></image>
 						</view>
 						<view class="lf-flex-column lf-m-l-20">
-							<view class="lf-color-999 lf-font-24">{{commentitem.user.nick_name}}</view>
+							<view class="lf-color-999 lf-font-24" v-if="commentitem.user.nick_name">{{commentitem.user.nick_name}}</view>
+							<view class="lf-color-999 lf-font-24" v-else>{{commentitem.user.mobile_replace}}</view>
 							<view>
 								<view class="lf-color-black lf-line-2" style="max-width:550rpx;">{{commentitem.content}}<text class="lf-color-999 lf-font-24 lf-m-l-10">{{commentitem.created_at}}</text></view>
 							</view>
@@ -67,14 +70,17 @@
 					<view class="lf-flex" @click="applySub(subitem.user.id,subitem.parent_id)">
 						<view class="lf-flex lf-m-t-30">
 							<view @click="$url('/pages/user/my/my?user_id='+subitem.user_id)">
-								<image class="comment-img" :src="subitem.user.avatar" mode="aspectFill"></image>
+								<image class="comment-img" :src="subitem.user.avatar" v-if="subitem.user.avatar" mode="aspectFill"></image>
+								<image class="comment-img" src="../../static/images/empty.png" v-else mode="aspectFill"></image>
 							</view>
 							<view class="lf-flex-column lf-m-l-20">
 								<view class="lf-flex">
-									<view class="lf-color-999 lf-font-24 lf-m-r-10">{{subitem.user.nick_name}}</view>
+									<view class="lf-color-999 lf-font-24 lf-m-r-10" v-if="subitem.user.nick_name">{{subitem.user.nick_name}}</view>
+									<view class="lf-color-999 lf-font-24 lf-m-r-10" v-else>{{subitem.user.mobile_replace}}</view>
 									<view class="lf-row-center" style="max-width: 446rpx;">
 										<text class="lf-color-333 lf-m-r-10">回复</text>
-										<text class="lf-font-24 lf-color-999">{{subitem.to_user.nick_name}}:</text>
+										<text class="lf-font-24 lf-color-999" v-if="subitem.to_user.nick_name">{{subitem.to_user.nick_name}}:</text>
+										<text class="lf-font-24 lf-color-999" v-else>{{subitem.to_user.mobile_replace}}:</text>
 									</view>
 								</view>
 								<view style="max-width: 460rpx;">
diff --git a/pages/discover/publish.vue b/pages/discover/publish.vue
index 2eab8e8..32f43f4 100644
--- a/pages/discover/publish.vue
+++ b/pages/discover/publish.vue
@@ -99,7 +99,7 @@
 					header: {
 						Authorization: this.$cookieStorage.get('user_token')
 					},
-					url: 'http://192.168.3.29/api/discover/upload_image',
+					url: this.$config.GLOBAL.baseUrl+'api/discover/upload_image',
 					filePath: img,
 					fileType: 'image',
 					name: 'image',
diff --git a/pages/index/index/index.vue b/pages/index/index/index.vue
index 74ce519..1107d99 100644
--- a/pages/index/index/index.vue
+++ b/pages/index/index/index.vue
@@ -26,7 +26,7 @@
 									<indexNav :nav-data="item.value" :meta="item.meta"></indexNav>
 								</view>
 								<!-- 今日头条 -->
-								<view class="fuwu-tips" v-if="item.name == 'micro_page_componet_tips'">
+								<view class="fuwu-tips" v-if="item.name == 'micro_page_componet_article_-' || item.name == 'micro_page_componet_article_|'">
 									<view class="fuwu-tips-title">今日头条</view>
 									<view>
 										<text class="fuwu-tips-desc1">{{ item.title }}</text>
@@ -56,14 +56,15 @@
 								</view>
 								<!-- 店铺商品展示模块 -->
 								<view v-if="item.name == 'micro_page_componet_brand_recommended' && item.value && item.value.length">
-									<view class="lf-module-title" v-if="item.is_show_title" @click="$url('/pages/shop/goodsSpecial')">{{ item.title }}</view>
+									<!-- @click="$url('/pages/shop/goodsSpecial')" -->
+									<view class="lf-module-title" v-if="item.is_show_title">{{ item.title }}</view>
 									<lf-shop-goods-card :list="item.value" :main="item.main"></lf-shop-goods-card>
 								</view>
 								<!-- 为你推荐模块 -->
 								<view v-if="item.name == 'micro_page_componet_recommended' && item.value && item.value.length">
 									<view class="lf-module-title" v-if="item.is_show_title">{{ item.title }}</view>
 									<view style="padding: 0 11px;">
-										<lf-waterfall :list="transformList(item.value)"></lf-waterfall>
+										<lf-waterfall :ifsale="false" :list="transformList(item.value)"></lf-waterfall>
 									</view>
 								</view>
 		        </view>
@@ -316,7 +317,7 @@
 			<view class="fixed-cart" hover-class="lf-opacity" @click="$url('/pages/store/cart/cart')">
 				<text class="lf-iconfont icon-gouwulan icon-text"></text>
 				<text class="tips">购物车</text>
-				<view class="angle-mark">99+</view>
+				<view class="angle-mark">{{car_num}}</view>
 			</view>
 		</view>
 		<!-- ad广告弹出组件 TODO 暂时先注释 -->
@@ -384,6 +385,7 @@
 				show_ad: false, // 是否显示ad广告
 				ad_modal_list: [], // ad广告列表
 				nav_bg_color: 'rgba(255,255,255,0)' ,// 导航背景颜色
+				car_num: 0
             };
         },
         // 注册组件
@@ -421,7 +423,6 @@
 			}
 		},
 		  onShow(e) {
-			 
 		   
 			this.isLogin=!!this.$cookieStorage.get('user_token')
 			
@@ -429,6 +430,7 @@
 			
 		    if (toekn) {
 		      this.getUserInfo();
+			  this.getcarNum()
 		    }
 	
 		
@@ -544,6 +546,33 @@
             changeAbout() {
                 this.is_show_about = false;
             },
+			getcarNum() {
+				this.$http
+				    .get({
+				        api: 'api/shopping/cart/count',
+						header: {
+						   Authorization: this.$cookieStorage.get('user_token')
+						},
+				    })
+				    .then(res => {
+				        if (res.data.code == 200) {
+				           this.car_num = res.data.data;
+				        } else {
+				            wx.showModal({
+				                content: '请下拉页面刷新重试',
+				                showCancel: false
+				            });
+				        }
+				    })
+				    .catch(() => {
+				        wx.stopPullDownRefresh();
+				        wx.hideLoading();
+				        wx.showModal({
+				            content: '请求失败',
+				            showCancel: false
+				        });
+				    });
+			},
             // 请求数据
             queryMicroData() {
                 this.$http
diff --git a/pages/order/confirm/confirm.vue b/pages/order/confirm/confirm.vue
index 8e91210..e721108 100644
--- a/pages/order/confirm/confirm.vue
+++ b/pages/order/confirm/confirm.vue
@@ -14,12 +14,17 @@
 					<text class="lf-font-28 lf-color-primary lf-m-r-10">更换收获地址</text>
 					<text class="lf-iconfont icon-xiangyou lf-font-24 lf-color-777"></text>
 				</view>
-				<view class="lf-m-t-20">
-					<text class="lf-font-28 lf-color-222 lf-font-bold">{{ address.accept_name }}</text>
-					<text class="lf-font-28 lf-color-777 lf-m-l-20">{{ address.mobile }}</text>
+				<view v-if="address">
+					<view class="lf-m-t-20">
+						<text class="lf-font-28 lf-color-222 lf-font-bold">{{ address.accept_name }}</text>
+						<text class="lf-font-28 lf-color-777 lf-m-l-20">{{ address.mobile }}</text>
+					</view>
+					<view class="lf-font-28 lf-color-333 lf-m-t-10">
+						<text>{{  address.address_name }}{{ address.address }}</text>
+					</view>
 				</view>
-				<view class="lf-font-28 lf-color-333 lf-m-t-10">
-					<text>{{  address.address_name }}{{ address.address }}</text>
+				<view v-else class="lf-font-28 lf-color-777">
+					暂无收货地址,请前往添加
 				</view>
 			</view>
 			<view class="card goods">
@@ -223,6 +228,11 @@
 			},
 			// 提交订单
 			confirm(){
+				console.log(this.address)
+				if(this.address == null) {
+					this.$msg('请先添加收货地址!');
+					return
+				}
 				this.$http.post({
 					api: 'api/shopping/order/confirm',
 					data: {
diff --git a/pages/order/index/onlineorder.vue b/pages/order/index/onlineorder.vue
index bffa7df..d08536f 100644
--- a/pages/order/index/onlineorder.vue
+++ b/pages/order/index/onlineorder.vue
@@ -1,594 +1,593 @@
-<template>
-	<view>
-		<lf-nav :spreadOut="true" :showIcon="true" bgColor="white" title="在线商城订单" @changeHeight="e => nav_height = e"></lf-nav>
-		<view class="lf-row-between lf-bg-white" style="padding: 0 32rpx;">
-			<view class="online-tab" :class="online_tab==0?'online-active':''" @click="changeTab(0)">线上订单</view>
-			<view class="online-tab" :class="online_tab==1?'online-active':''" @click="changeTab(1)">线下订单</view>
-		</view>
-		<view v-if="online_tab == 0">
-			<view class="special_tab">
-				<u-tabs :list="tab_list" active-color="#15716E" inactive-color='#777777' :is-scroll="true" :current="current" @change="tabChange"></u-tabs>
-			</view>
-			<view class="lf-p-30 lf-flex lf-w-100 lf-bg-white lf-m-b-30">
-				<!-- <u-icon name="search" class="search-icon"></u-icon>
-				<input class="rom-search" type="text" placeholder="请输入商品名称" /> -->
-				<u-search placeholder="请输入商品名称" bg-color="#F4F8F8" :show-action="false" style="width: 100%;"></u-search>
-			</view>
-			<swiper :style="{height: autoHeight, width: '750rpx'}" :current="current" @change="swiperChange">
-				<swiper-item v-for="(tabItem, tabIndex) in tab_list" :key="tabIndex">
-					<scroll-view :style="{height: autoHeight}" class="com" :scroll-y="true" :refresher-enabled="true" :refresher-triggered="tabItem.isRefresher" @scrolltolower="onScrolltolower" @refresherrefresh="onRefresherrefresh">
-						
-						<view v-for="(item2,index2) of tabItem.list" :key="index2" class="online-card" @click="$url('/pages/order/newdetail/newdetail?order_id='+item2.order_no)">
-							<view class="lf-font-24 lf-color-777">
-								订单编号{{item2.order_no}}
-							</view>
-							<view class="lf-m-t-30">
-								<text class="lf-iconfont icon-Group- lf-font-28"></text>
-								<text class="lf-color-black lf-font-28 lf-font-bold lf-m-l-10">{{item2.from}}</text>
-								<text class="lf-iconfont icon-xiangyou lf-font-24 lf-m-l-10"></text>
-							</view>
-							<view v-for="(i,index3) of item2.items" :key="index3">
-								<view class="lf-m-t-30" style="display: flex;">
-									<image class="content-img" :src="i.item_meta.image" mode="aspectFill"></image>
-									<view class="lf-m-l-15">
-										<view class="lf-color-333 lf-font-26 lf-line-2" style="max-width: 480rpx;">{{i.item_name}}</view>
-										<view class="lf-font-24 lf-color-777 lf-m-t-14 lf-row-between">
-											<view>{{i.item_meta.specs_text}}</view>
-											<view class="lf-font-32 lf-color-price">￥{{item2.items_total_yuan}}</view>
-										</view>
-									</view>
-								</view>
-								<view class="lf-row-between lf-m-t-30 lf-m-b-50">
-									<view class="lf-font-24 lf-color-777">{{item2.status_text}}</view>
-									<!-- <view class="lf-color-price lf-font-24">删除订单</view> -->
-								</view>
-							</view>
-						</view>
-						
-						<view class="loading-more lf-m-b-10">
-							<text :class="{'loading-more-text': tabItem.loadingClass}" v-if="tabItem.list.length">{{tabItem.loadingText}}</text>
-							<lf-nocontent v-else></lf-nocontent>
-						<!-- 	<view> 
-								{{tabItem.list.length}}
-							</view> -->
-						</view>
-						
-						
-					</scroll-view>
-				</swiper-item>
-			</swiper>
-		</view>
-		<view v-else>
-			<!-- <view class="special_tab">
-				<u-tabs :list="tab_list" active-color="#15716E" inactive-color='#777777' :is-scroll="true" :current="current" @change="tabChange"></u-tabs>
-			</view> -->
-			<scroll-view :style="{height: autoHeightTwo}" class="com" :scroll-y="true" :refresher-enabled="true" :refresher-triggered="isRefresher" @scrolltolower="onScrolltolower" @refresherrefresh="onRefresherrefresh">
-				
-				<view class="item" v-for="(item, index) in list" :key="index">
-					<view class="lf-row-between">
-						<text class="lf-font-36 lf-color-black lf-font-bold lf-color-price">{{item.balance.balance}}</text>
-						<text class="lf-font-24 lf-color-555">{{item.balance.note}}</text>
-					</view>
-					<view class="lf-row-between lf-m-t-20">
-						<text class="lf-font-24 lf-color-555">¥{{item.balance.current}}</text>
-						<text class="lf-font-24 lf-color-777">{{item.created_at}}</text>
-					</view>
-				</view>
-				
-				<view class="loading-more lf-m-b-10">
-					<text :class="{'loading-more-text': loadingClass}" v-if="list.length">{{loadingText}}</text>
-					<lf-nocontent v-else></lf-nocontent>
-				</view>
-				
-				
-			</scroll-view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				online_tab: 0,
-				tab_list: [
-					{
-						id: 1,
-						name: '全部',
-						type: '',
-						list: [],
-						isRefresher: false,
-						loadingClass: false,
-						loadingText: '正在加载中',
-						page: 1,
-						isPage: true
-					},
-					{
-						id: 2,
-						name: '代付款',
-						type: 1,
-						list: [],
-						isRefresher: false,
-						loadingClass: true,
-						loadingText: '正在加载中',
-						page: 1,
-						isPage: true
-					},
-					{
-						id: 3,
-						name: '待发货',
-						type: 2,
-						list: [],
-						isRefresher: false,
-						loadingClass: true,
-						loadingText: '正在加载中',
-						page: 1,
-						isPage: true
-					},
-					{
-						id: 4,
-						name: '待收货',
-						type: 3,
-						list: [],
-						isRefresher: false,
-						loadingClass: true,
-						loadingText: '正在加载中',
-						page: 1,
-						isPage: true
-					},
-					{
-						id: 5,
-						name: '已完成',
-						type: 4,
-						list: [],
-						isRefresher: false,
-						loadingClass: true,
-						loadingText: '正在加载中',
-						page: 1,
-						isPage: true
-					}
-				],
-				list: [],
-				current: 0,
-				windowHeight: 0,
-				loadingClass: false,
-				loadingText: '没有更多数据啦~',
-				scrollH: '',
-				nav_height: '',
-				isRefresher: false,
-				page: 1
-			}
-		},
-		computed: {
-			autoHeight(){
-				return `calc(${this.scrollH}px - ${this.nav_height}px - 86rpx - 120rpx - 120rpx)`;
-			},
-			autoHeightTwo(){
-				return `calc(${this.scrollH}px - ${this.nav_height}px - 90rpx)`;
-			}
-		},
-		onLoad(){
-			let info = uni.getSystemInfoSync();
-			this.scrollH = info.screenHeight;
-			this.getData()
-		},
-		methods: {
-			changeTab(index) {
-				this.online_tab = index
-				if(this.online_tab == 0) {
-					this.getData();
-				}else {
-					this.getUploadList();
-				}
-			},
-			getUploadList(options={}) {
-				this.$http
-				    .post({
-				        api: 'api/offline/order',
-						data:{
-							page:this.page
-						},
-						header: {
-						    Authorization: `Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjVkYTY5YjM5NWFhYzM5NzVmMzI3ZTEwZDEyMzAzZjI5MzE4ZmU2OGE2Njg0MTU0MWVjMjQ2NWM4ZWJkYjRlMTUwMmY1NWM0NDlkOTcxZDdjIn0.eyJhdWQiOiIzIiwianRpIjoiNWRhNjliMzk1YWFjMzk3NWYzMjdlMTBkMTIzMDNmMjkzMThmZTY4YTY2ODQxNTQxZWMyNDY1YzhlYmRiNGUxNTAyZjU1YzQ0OWQ5NzFkN2MiLCJpYXQiOjE2MzIzODY3NDAsIm5iZiI6MTYzMjM4Njc0MCwiZXhwIjoxNjYzOTIyNzQwLCJzdWIiOiIxIiwic2NvcGVzIjpbXX0.am-szF_sZcjtyOnEJT1DHMnr1hjAZ90MJc1Pc3AD3FrcQU5xb-u43ddL70ZmM3OxxLTZlmrB8OA3XJYREMtcz26MzwOMfopB9A5AH1EjHiFCV_368cq4ZpXNFi_Sn_LrY9Wje0-WMvkznF8tbrdCNrZn5YyIV47cwEnUNQrrREX4OhcgrSfNvwnh8_O_fueBwws9yY3tTlvVB7-AvG2urFI5XCzygsE3llE0wxF5ZJO1T5QRYLDse2BQ3d9feFzO5_7FiVspKr8DrJUlZP-Zz02UgIDIA_PX0UO2M0KeBwqPYq2d5uEnXT8or7K9coSnHRqbbr4qn6iczxDu4ofM58oCcaPycbtI3RvP2SMZuWmX8fXw-T99XltK_uJEU_wlIkrjvabzyo3tkrxRrwmzJEb3Yf4Lbah_xtfi24Nsu9SRjdw8YoiF6YhuuU5YaOn-wLltgmugfYpkFpEOneVAxoMjkm5IxZAJYMXF-DeSpdOoiTmuIRZYX4GDa55s_31r0YMyF6IIQNUvOjHHk-sJSHG0kPd5QivLP7dxE5XndwyFKAOeM97X2TjdYMhJz0EBCyS4Y_pI6AFWsxJkKsa0aqvBAeJyOV9k8kbYwtPeeBhBNsDWSlGBEZYMcoAv-C-IBZzd7gu2Ceh_MJPItrnsvj8W43Cv1TwxD26bJyt9EUY`
-						},
-				    })
-				    .then(res => {
-				       if (res.data.status) {
-				       	let isPage =  res.data.per_page == 15?true:false;
-				       	this.isPage = isPage;
-				       	if(!isPage) {
-				       		this.loadingClass = false;
-				       		this.loadingText = '没有更多数据啦~';
-				       	}
-				       	if(options.type == 'pageRefresh') {
-				       		uni.stopPullDownRefresh();
-				       	}else if(options.type == 'scrollRefresh') {
-				       		this.isRefresher = false;
-				       	}
-				       	if(this.page == 1) {
-				       		this.list = res.data.data.data;
-				       	}else {
-				       		this.list.push(...res.data.data.data);
-				       	}
-				          console.log('数组列表',this.list)
-				       } else {
-				           wx.showModal({
-				               content: res.message || '请下拉页面刷新重试',
-				               showCancel: false
-				           });
-				       }
-				        wx.hideLoading();
-				    })
-				    .catch(() => {
-				        wx.hideLoading();
-				        wx.showModal({
-				            content: '请求失败',
-				            showCancel: false
-				        });
-				    });
-			},
-			tabChange(index){
-				this.current = index;
-				this.getData();
-			},
-			getData(options ={}) {
-				let tab_item = this.tab_list[this.current];
-				console.log('=====adada===',tab_item)
-				this.$http
-				    .get({
-				        api: 'api/order/list',
-						data:{
-							status: tab_item.type,
-							page: tab_item.page,
-							type: 0,
-							channel: ''
-						},
-						header: {
-						    Authorization: this.$cookieStorage.get('user_token')
-						},
-				    })
-				    .then(res => {
-				       if (res.data.status) {
-				       	let isPage =  tab_item.page < res.data.meta.pagination.total_pages?true:false;
-				       	tab_item.isPage = isPage;
-				       	if(!isPage) {
-				       		tab_item.loadingClass = false;
-				       		tab_item.loadingText = '没有更多数据啦~';
-				       	}
-				       	if(options.type == 'pageRefresh') {
-				       		uni.stopPullDownRefresh();
-				       	}else if(options.type == 'scrollRefresh') {
-				       		tab_item.isRefresher = false;
-				       	}
-				       	if(tab_item.page == 1) {
-				       		tab_item.list = res.data.data;
-				       	}else {
-				       		tab_item.list.push(...res.data.data);
-				       	}
-				          console.log('数组列表',tab_item.list)
-				       } else {
-				           wx.showModal({
-				               content: res.message || '请下拉页面刷新重试',
-				               showCancel: false
-				           });
-				       }
-				        wx.hideLoading();
-				    })
-				    .catch(() => {
-				        wx.hideLoading();
-				        wx.showModal({
-				            content: '请求失败',
-				            showCancel: false
-				        });
-				    });
-			},
-			// 滑块下标值变化
-			swiperChange(event){
-				this.current = event.detail.current;
-				if(event.detail.source == '') return; // 如果是被动出发，没有事件类型则不做处理
-				this.getData();
-			},
-			// 页面触底，加载下一页
-			onScrolltolower(){
-				let tab_item = this.tab_list[this.current];
-				if(tab_item.isPage){
-					tab_item.page = tab_item.page + 1;
-					this.getData();
-				}
-				if(this.isPage) {
-					this.page = this.page + 1;
-					this.getUploadList()
-				}
-			},
-			// scroll-view 下拉刷新
-			onRefresherrefresh(){
-				this.$u.throttle(() => {
-					this.refreshFn({type: 'scrollRefresh'});
-				}, 200);
-			},
-			// 下拉刷新处理
-			refreshFn(options){
-				let tab_item = this.tab_list[this.current];
-				tab_item.page = 1;
-				tab_item.isPage = true;
-				tab_item.loadingClass = true;
-				tab_item.list = [];
-				tab_item.isRefresher = true;
-				tab_item.loadingText = '正在加载中';
-				this.getData(options);
-				this.page = 1;
-				this.isPage = true;
-				this.loadingClass = true;
-				this.list = [];
-				this.isRefresher = true;
-				this.loadingText = '正在加载中';
-				this.getUploadList(options);
-			},
-		}
-	}
-</script>
-
-<style>
-	page {
-		background-color: #F8F8F8;
-	}
-</style>
-
-<style scoped lang="scss">
-	.content-img {
-		width: 130rpx;
-		height: 130rpx;
-		border-radius: 5rpx;
-	}
-	.online-card {
-		width: 686rpx;
-		height: auto;
-		background: #FFFFFF;
-		border-radius: 20rpx;
-		margin-bottom: 30rpx;
-		padding: 30rpx;
-	}
-	.online-tab {
-		width: 375rpx;
-		height: 90rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		color: #555555;
-		font-size: 32rpx;
-	}
-	.online-active {
-		background: #15716E;
-		color: #FFFFFF;
-		border-radius: 45rpx 45rpx 0rpx 0rpx;
-	}
-	//tab相关
-	
-	.search-icon {
-		position: relative;
-		bottom: 0;
-		left: 54rpx;
-	}
-	/deep/.input-placeholder{
-		color: #777;
-		font-size: 28rpx;
-	}
-	.rom-search {
-		width: 686rpx;
-		height: 60rpx;
-		background: #F4F8F8;
-		border-radius: 30rpx;
-		padding-left: 74rpx;
-		font-size: 28rpx;
-	}
-	.goods-rom {
-		border-radius: 20rpx;
-		width: 333rpx;
-		height: 497rpx;
-		background-color: white;
-		box-shadow: 0px 2rpx 8rpx 1rpx rgba(0, 0, 0, 0.1);
-		&:nth-child(2n) {
-			margin-right: 0;
-		}
-		&:nth-child(n + 3) {
-			margin-top: 20rpx;
-		}
-	}
-	.introduct {
-		padding: 0 0 30rpx 32rpx;
-	}
-	.com{
-		width: 100%;
-		height: 100%;
-		box-sizing: border-box;
-		padding: 0rpx 28rpx;
-	}
-	.shop-head {
-		width: 100%;
-		height: 400rpx;
-		position: relative;
-	}
-	.shop-flex {
-		display: flex;
-		padding: 30rpx;
-	}
-	.shop-title {
-		width: 686rpx;
-		height: 274rpx;
-		border-radius: 20rpx;
-		background-color: white;
-		box-shadow: 0rpx 2rpx 8rpx 1rpx rgba(0, 0, 0, 0.1);
-		margin: 0 auto;
-		position: relative;
-		top: -32rpx;
-	}
-	.shop-img {
-		width: 90rpx;
-		height: 90rpx;
-		margin-right: 15rpx;
-	}
-	.shop-function {
-		width: 80rpx;
-		height: 80rpx;
-		border-radius: 50%;
-		font-size: 40rpx;
-	}
-	.function-total {
-		display: flex;
-		justify-content: space-between;
-		padding: 0 65rpx 0 65rpx;
-	}
-	
-	.item{
-		width: 686rpx;
-		height: max-content;
-		background: #F4F8F8;
-		border-radius: 10rpx;
-		// margin-bottom: 30rpx;
-		margin-top: 30rpx;
-		padding: 30rpx;
-		box-sizing: border-box;
-		line-height: 1;
-	}
-	
-	/deep/.u-scroll-box {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		border-bottom: 1rpx solid rgba(0, 0, 0, 0.1);
-	}
-
-	/deep/.special_tab .u-tabs .u-scroll-box .u-tab-bar {
-		background-color: #15716E!important;
-		width: 80rpx!important;
-		position: absolute;
-		height: 10rpx;
-		left: 0;
-		border-radius: 8rpx 8rpx 0px 0px!important;
-		bottom: -12rpx;
-	}
-	
-	/deep/ .u-tab-item {
-		font-size: 28rpx!important;
-	}
-	
-	
-	//价格筛选伪类
-	// /deep/.special_tab .u-tab-item:nth-child(4n) ::after{
-	// 	font-size: 48rpx!important;
-	// 	content: '';
-		
-	// 	color: red;
-	// }
-	
-	// loading加载
-	.loading-more {
-		align-items: center;
-		justify-content: center;
-		padding-top: 10px;
-		padding-bottom: 10px;
-		text-align: center;
-		font-size: 28rpx;
-		color: #999;
-	}
-	.loading-more-text::before {
-		content: '';
-		width: 20px;
-		height: 20px;
-		display: inline-block;
-		vertical-align: middle;
-		-webkit-animation: weuiLoading 1s steps(12, end) infinite;
-		animation: weuiLoading 1s steps(12, end) infinite;
-		background-repeat: no-repeat;
-		background-image: url("data:image/svg+xml;charset=utf8, %3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23E9E9E9' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23989697' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%239B999A' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23A3A1A2' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23ABA9AA' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23B2B2B2' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23BAB8B9' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23C2C0C1' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23CBCBCB' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23D2D2D2' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23DADADA' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23E2E2E2' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E");
-		background-size: 100%;
-	}
-	@keyframes weuiLoading {
-		0% {
-			transform: rotate3d(0, 0, 1, 0deg);
-		}
-		100% {
-			transform: rotate3d(0, 0, 1, 360deg);
-		}
-	}
-	
-	
-	.list-warter {
-		border-radius: 20rpx;
-		margin: 10px 5px;
-		margin-top: 0px;
-		background-color: #ffffff;
-		// padding: 8px;
-		position: relative;
-		overflow: hidden;
-		box-shadow: 0rpx 2rpx 8rpx 1rpx rgba(0, 0, 0, 0.1);
-	}
-	
-	.u-close {
-		position: absolute;
-		top: 32rpx;
-		right: 32rpx;
-	}
-	
-	.list-image {
-		width: 100%;
-		border-radius: 4px;
-	}
-	
-	.list-title {
-		font-size: 28rpx;
-		font-weight: bold;
-		color: $u-main-color;
-	}
-	
-	.list-label{
-		position: absolute;
-		bottom: 0;
-		right: 0;
-		background-color: rgba(0,0,0,0.5);
-		width: 140rpx;
-		height: 48rpx;
-		border-radius: 20rpx 0rpx 0rpx 0rpx;
-		font-size: 22rpx;
-		color: #FFFFFF;
-		line-height: 48rpx;
-		text-align: center;
-	}
-	
-	.list-tag {
-		display: flex;
-		margin-top: 5px;
-	}
-	
-	.list-tag-owner {
-		background-color: $u-type-error;
-		color: #FFFFFF;
-		display: flex;
-		align-items: center;
-		padding: 4rpx 14rpx;
-		border-radius: 50rpx;
-		font-size: 20rpx;
-		line-height: 1;
-	}
-	
-	.list-tag-text {
-		border: 1px solid $u-type-primary;
-		color: $u-type-primary;
-		margin-left: 10px;
-		border-radius: 50rpx;
-		line-height: 1;
-		padding: 4rpx 14rpx;
-		display: flex;
-		align-items: center;
-		border-radius: 50rpx;
-		font-size: 20rpx;
-	}
-	
-	.list-price {
-		font-size: 30rpx;
-		color: $u-type-error;
-		margin-top: 5px;
-		display: flex;
-		align-items: center;
-	}
-</style>
+<template>
+	<view>
+		<lf-nav :spreadOut="true" :showIcon="true" bgColor="white" title="在线商城订单" @changeHeight="e => nav_height = e"></lf-nav>
+		<view class="lf-row-between lf-bg-white" style="padding: 0 32rpx;">
+			<view class="online-tab" :class="online_tab==0?'online-active':''" @click="changeTab(0)">线上订单</view>
+			<view class="online-tab" :class="online_tab==1?'online-active':''" @click="changeTab(1)">线下订单</view>
+		</view>
+		<view v-if="online_tab == 0">
+			<view class="special_tab">
+				<u-tabs :list="tab_list" active-color="#15716E" inactive-color='#777777' :is-scroll="true" :current="current" @change="tabChange"></u-tabs>
+			</view>
+			<view class="lf-p-30 lf-flex lf-w-100 lf-bg-white lf-m-b-30">
+				<!-- <u-icon name="search" class="search-icon"></u-icon>
+				<input class="rom-search" type="text" placeholder="请输入商品名称" /> -->
+				<u-search placeholder="请输入商品名称" bg-color="#F4F8F8" :show-action="false" style="width: 100%;"></u-search>
+			</view>
+			<swiper :style="{height: autoHeight, width: '750rpx'}" :current="current" @change="swiperChange">
+				<swiper-item v-for="(tabItem, tabIndex) in tab_list" :key="tabIndex">
+					<scroll-view :style="{height: autoHeight}" class="com" :scroll-y="true" :refresher-enabled="true" :refresher-triggered="tabItem.isRefresher" @scrolltolower="onScrolltolower" @refresherrefresh="onRefresherrefresh">
+						
+						<view v-for="(item2,index2) of tabItem.list" :key="index2" class="online-card" @click="$url('/pages/order/newdetail/newdetail?order_id='+item2.order_no)">
+							<view class="lf-font-24 lf-color-777">
+								订单编号{{item2.order_no}}
+							</view>
+							<view class="lf-m-t-30">
+								<text class="lf-iconfont icon-Group- lf-font-28"></text>
+								<text class="lf-color-black lf-font-28 lf-font-bold lf-m-l-10">{{item2.from}}</text>
+								<text class="lf-iconfont icon-xiangyou lf-font-24 lf-m-l-10"></text>
+							</view>
+							<view v-for="(i,index3) of item2.items" :key="index3">
+								<view class="lf-m-t-30" style="display: flex;">
+									<image class="content-img" :src="i.item_meta.image" mode="aspectFill"></image>
+									<view class="lf-m-l-15">
+										<view class="lf-color-333 lf-font-26 lf-line-2" style="max-width: 480rpx;">{{i.item_name}}</view>
+										<view class="lf-font-24 lf-color-777 lf-m-t-14 lf-row-between">
+											<view>{{i.item_meta.specs_text}}</view>
+											<view class="lf-font-32 lf-color-price">￥{{item2.items_total_yuan}}</view>
+										</view>
+									</view>
+								</view>
+								<view class="lf-row-between lf-m-t-30 lf-m-b-50">
+									<view class="lf-font-24 lf-color-777">{{item2.status_text}}</view>
+									<!-- <view class="lf-color-price lf-font-24">删除订单</view> -->
+								</view>
+							</view>
+						</view>
+						
+						<view class="loading-more lf-m-b-10">
+							<text :class="{'loading-more-text': tabItem.loadingClass}" v-if="tabItem.list.length">{{tabItem.loadingText}}</text>
+							<lf-nocontent v-else></lf-nocontent>
+						<!-- 	<view> 
+								{{tabItem.list.length}}
+							</view> -->
+						</view>
+						
+						
+					</scroll-view>
+				</swiper-item>
+			</swiper>
+		</view>
+		<view v-else>
+			<!-- <view class="special_tab">
+				<u-tabs :list="tab_list" active-color="#15716E" inactive-color='#777777' :is-scroll="true" :current="current" @change="tabChange"></u-tabs>
+			</view> -->
+			<scroll-view :style="{height: autoHeightTwo}" class="com" :scroll-y="true" :refresher-enabled="true" :refresher-triggered="isRefresher" @scrolltolower="onScrolltolower" @refresherrefresh="onRefresherrefresh">
+				
+				<view class="item" v-for="(item, index) in list" :key="index">
+					<view class="lf-row-between">
+						<text class="lf-font-36 lf-color-black lf-font-bold lf-color-price">{{item.balance.balance}}</text>
+						<text class="lf-font-24 lf-color-555">{{item.balance.note}}</text>
+					</view>
+					<view class="lf-row-between lf-m-t-20">
+						<text class="lf-font-24 lf-color-555">¥{{item.balance.current}}</text>
+						<text class="lf-font-24 lf-color-777">{{item.created_at}}</text>
+					</view>
+				</view>
+				
+				<view class="loading-more lf-m-b-10">
+					<text :class="{'loading-more-text': loadingClass}" v-if="list.length">{{loadingText}}</text>
+					<lf-nocontent v-else></lf-nocontent>
+				</view>
+				
+				
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				online_tab: 0,
+				tab_list: [
+					{
+						id: 1,
+						name: '全部',
+						type: '',
+						list: [],
+						isRefresher: false,
+						loadingClass: false,
+						loadingText: '正在加载中',
+						page: 1,
+						isPage: true
+					},
+					{
+						id: 2,
+						name: '代付款',
+						type: 1,
+						list: [],
+						isRefresher: false,
+						loadingClass: true,
+						loadingText: '正在加载中',
+						page: 1,
+						isPage: true
+					},
+					{
+						id: 3,
+						name: '待发货',
+						type: 2,
+						list: [],
+						isRefresher: false,
+						loadingClass: true,
+						loadingText: '正在加载中',
+						page: 1,
+						isPage: true
+					},
+					{
+						id: 4,
+						name: '待收货',
+						type: 3,
+						list: [],
+						isRefresher: false,
+						loadingClass: true,
+						loadingText: '正在加载中',
+						page: 1,
+						isPage: true
+					},
+					{
+						id: 5,
+						name: '已完成',
+						type: 4,
+						list: [],
+						isRefresher: false,
+						loadingClass: true,
+						loadingText: '正在加载中',
+						page: 1,
+						isPage: true
+					}
+				],
+				list: [],
+				current: 0,
+				windowHeight: 0,
+				loadingClass: false,
+				loadingText: '没有更多数据啦~',
+				scrollH: '',
+				nav_height: '',
+				isRefresher: false,
+				page: 1
+			}
+		},
+		computed: {
+			autoHeight(){
+				return `calc(${this.scrollH}px - ${this.nav_height}px - 86rpx - 120rpx - 120rpx)`;
+			},
+			autoHeightTwo(){
+				return `calc(${this.scrollH}px - ${this.nav_height}px - 90rpx)`;
+			}
+		},
+		onLoad(){
+			let info = uni.getSystemInfoSync();
+			this.scrollH = info.screenHeight;
+			this.getData()
+		},
+		methods: {
+			changeTab(index) {
+				this.online_tab = index
+				if(this.online_tab == 0) {
+					this.getData();
+				}else {
+					this.getUploadList();
+				}
+			},
+			getUploadList(options={}) {
+				this.$http
+				    .post({
+				        api: 'api/offline/order',
+						data:{
+							page:this.page
+						},
+						header: {
						    Authorization: this.$cookieStorage.get('user_token')
+						},
+				    })
+				    .then(res => {
+				       if (res.data.status) {
+				       	let isPage =  res.data.per_page == 15?true:false;
+				       	this.isPage = isPage;
+				       	if(!isPage) {
+				       		this.loadingClass = false;
+				       		this.loadingText = '没有更多数据啦~';
+				       	}
+				       	if(options.type == 'pageRefresh') {
+				       		uni.stopPullDownRefresh();
+				       	}else if(options.type == 'scrollRefresh') {
+				       		this.isRefresher = false;
+				       	}
+				       	if(this.page == 1) {
+				       		this.list = res.data.data.data;
+				       	}else {
+				       		this.list.push(...res.data.data.data);
+				       	}
+				          console.log('数组列表',this.list)
+				       } else {
+				           wx.showModal({
+				               content: res.message || '请下拉页面刷新重试',
+				               showCancel: false
+				           });
+				       }
+				        wx.hideLoading();
+				    })
+				    .catch(() => {
+				        wx.hideLoading();
+				        wx.showModal({
+				            content: '请求失败',
+				            showCancel: false
+				        });
+				    });
+			},
+			tabChange(index){
+				this.current = index;
+				this.getData();
+			},
+			getData(options ={}) {
+				let tab_item = this.tab_list[this.current];
+				console.log('=====adada===',tab_item)
+				this.$http
+				    .get({
+				        api: 'api/order/list',
+						data:{
+							status: tab_item.type,
+							page: tab_item.page,
+							type: 0,
+							channel: ''
+						},
+						header: {
+						    Authorization: this.$cookieStorage.get('user_token')
+						},
+				    })
+				    .then(res => {
+				       if (res.data.status) {
+				       	let isPage =  tab_item.page < res.data.meta.pagination.total_pages?true:false;
+				       	tab_item.isPage = isPage;
+				       	if(!isPage) {
+				       		tab_item.loadingClass = false;
+				       		tab_item.loadingText = '没有更多数据啦~';
+				       	}
+				       	if(options.type == 'pageRefresh') {
+				       		uni.stopPullDownRefresh();
+				       	}else if(options.type == 'scrollRefresh') {
+				       		tab_item.isRefresher = false;
+				       	}
+				       	if(tab_item.page == 1) {
+				       		tab_item.list = res.data.data;
+				       	}else {
+				       		tab_item.list.push(...res.data.data);
+				       	}
+				          console.log('数组列表',tab_item.list)
+				       } else {
+				           wx.showModal({
+				               content: res.message || '请下拉页面刷新重试',
+				               showCancel: false
+				           });
+				       }
+				        wx.hideLoading();
+				    })
+				    .catch(() => {
+				        wx.hideLoading();
+				        wx.showModal({
+				            content: '请求失败',
+				            showCancel: false
+				        });
+				    });
+			},
+			// 滑块下标值变化
+			swiperChange(event){
+				this.current = event.detail.current;
+				if(event.detail.source == '') return; // 如果是被动出发，没有事件类型则不做处理
+				this.getData();
+			},
+			// 页面触底，加载下一页
+			onScrolltolower(){
+				let tab_item = this.tab_list[this.current];
+				if(tab_item.isPage){
+					tab_item.page = tab_item.page + 1;
+					this.getData();
+				}
+				if(this.isPage) {
+					this.page = this.page + 1;
+					this.getUploadList()
+				}
+			},
+			// scroll-view 下拉刷新
+			onRefresherrefresh(){
+				this.$u.throttle(() => {
+					this.refreshFn({type: 'scrollRefresh'});
+				}, 200);
+			},
+			// 下拉刷新处理
+			refreshFn(options){
+				let tab_item = this.tab_list[this.current];
+				tab_item.page = 1;
+				tab_item.isPage = true;
+				tab_item.loadingClass = true;
+				tab_item.list = [];
+				tab_item.isRefresher = true;
+				tab_item.loadingText = '正在加载中';
+				this.getData(options);
+				this.page = 1;
+				this.isPage = true;
+				this.loadingClass = true;
+				this.list = [];
+				this.isRefresher = true;
+				this.loadingText = '正在加载中';
+				this.getUploadList(options);
+			},
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #F8F8F8;
+	}
+</style>
+
+<style scoped lang="scss">
+	.content-img {
+		width: 130rpx;
+		height: 130rpx;
+		border-radius: 5rpx;
+	}
+	.online-card {
+		width: 686rpx;
+		height: auto;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		margin-bottom: 30rpx;
+		padding: 30rpx;
+	}
+	.online-tab {
+		width: 375rpx;
+		height: 90rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: #555555;
+		font-size: 32rpx;
+	}
+	.online-active {
+		background: #15716E;
+		color: #FFFFFF;
+		border-radius: 45rpx 45rpx 0rpx 0rpx;
+	}
+	//tab相关
+	
+	.search-icon {
+		position: relative;
+		bottom: 0;
+		left: 54rpx;
+	}
+	/deep/.input-placeholder{
+		color: #777;
+		font-size: 28rpx;
+	}
+	.rom-search {
+		width: 686rpx;
+		height: 60rpx;
+		background: #F4F8F8;
+		border-radius: 30rpx;
+		padding-left: 74rpx;
+		font-size: 28rpx;
+	}
+	.goods-rom {
+		border-radius: 20rpx;
+		width: 333rpx;
+		height: 497rpx;
+		background-color: white;
+		box-shadow: 0px 2rpx 8rpx 1rpx rgba(0, 0, 0, 0.1);
+		&:nth-child(2n) {
+			margin-right: 0;
+		}
+		&:nth-child(n + 3) {
+			margin-top: 20rpx;
+		}
+	}
+	.introduct {
+		padding: 0 0 30rpx 32rpx;
+	}
+	.com{
+		width: 100%;
+		height: 100%;
+		box-sizing: border-box;
+		padding: 0rpx 28rpx;
+	}
+	.shop-head {
+		width: 100%;
+		height: 400rpx;
+		position: relative;
+	}
+	.shop-flex {
+		display: flex;
+		padding: 30rpx;
+	}
+	.shop-title {
+		width: 686rpx;
+		height: 274rpx;
+		border-radius: 20rpx;
+		background-color: white;
+		box-shadow: 0rpx 2rpx 8rpx 1rpx rgba(0, 0, 0, 0.1);
+		margin: 0 auto;
+		position: relative;
+		top: -32rpx;
+	}
+	.shop-img {
+		width: 90rpx;
+		height: 90rpx;
+		margin-right: 15rpx;
+	}
+	.shop-function {
+		width: 80rpx;
+		height: 80rpx;
+		border-radius: 50%;
+		font-size: 40rpx;
+	}
+	.function-total {
+		display: flex;
+		justify-content: space-between;
+		padding: 0 65rpx 0 65rpx;
+	}
+	
+	.item{
+		width: 686rpx;
+		height: max-content;
+		background: #F4F8F8;
+		border-radius: 10rpx;
+		// margin-bottom: 30rpx;
+		margin-top: 30rpx;
+		padding: 30rpx;
+		box-sizing: border-box;
+		line-height: 1;
+	}
+	
+	/deep/.u-scroll-box {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-bottom: 1rpx solid rgba(0, 0, 0, 0.1);
+	}
+
+	/deep/.special_tab .u-tabs .u-scroll-box .u-tab-bar {
+		background-color: #15716E!important;
+		width: 80rpx!important;
+		position: absolute;
+		height: 10rpx;
+		left: 0;
+		border-radius: 8rpx 8rpx 0px 0px!important;
+		bottom: -12rpx;
+	}
+	
+	/deep/ .u-tab-item {
+		font-size: 28rpx!important;
+	}
+	
+	
+	//价格筛选伪类
+	// /deep/.special_tab .u-tab-item:nth-child(4n) ::after{
+	// 	font-size: 48rpx!important;
+	// 	content: '';
+		
+	// 	color: red;
+	// }
+	
+	// loading加载
+	.loading-more {
+		align-items: center;
+		justify-content: center;
+		padding-top: 10px;
+		padding-bottom: 10px;
+		text-align: center;
+		font-size: 28rpx;
+		color: #999;
+	}
+	.loading-more-text::before {
+		content: '';
+		width: 20px;
+		height: 20px;
+		display: inline-block;
+		vertical-align: middle;
+		-webkit-animation: weuiLoading 1s steps(12, end) infinite;
+		animation: weuiLoading 1s steps(12, end) infinite;
+		background-repeat: no-repeat;
+		background-image: url("data:image/svg+xml;charset=utf8, %3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23E9E9E9' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23989697' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%239B999A' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23A3A1A2' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23ABA9AA' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23B2B2B2' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23BAB8B9' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23C2C0C1' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23CBCBCB' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23D2D2D2' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23DADADA' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23E2E2E2' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E");
+		background-size: 100%;
+	}
+	@keyframes weuiLoading {
+		0% {
+			transform: rotate3d(0, 0, 1, 0deg);
+		}
+		100% {
+			transform: rotate3d(0, 0, 1, 360deg);
+		}
+	}
+	
+	
+	.list-warter {
+		border-radius: 20rpx;
+		margin: 10px 5px;
+		margin-top: 0px;
+		background-color: #ffffff;
+		// padding: 8px;
+		position: relative;
+		overflow: hidden;
+		box-shadow: 0rpx 2rpx 8rpx 1rpx rgba(0, 0, 0, 0.1);
+	}
+	
+	.u-close {
+		position: absolute;
+		top: 32rpx;
+		right: 32rpx;
+	}
+	
+	.list-image {
+		width: 100%;
+		border-radius: 4px;
+	}
+	
+	.list-title {
+		font-size: 28rpx;
+		font-weight: bold;
+		color: $u-main-color;
+	}
+	
+	.list-label{
+		position: absolute;
+		bottom: 0;
+		right: 0;
+		background-color: rgba(0,0,0,0.5);
+		width: 140rpx;
+		height: 48rpx;
+		border-radius: 20rpx 0rpx 0rpx 0rpx;
+		font-size: 22rpx;
+		color: #FFFFFF;
+		line-height: 48rpx;
+		text-align: center;
+	}
+	
+	.list-tag {
+		display: flex;
+		margin-top: 5px;
+	}
+	
+	.list-tag-owner {
+		background-color: $u-type-error;
+		color: #FFFFFF;
+		display: flex;
+		align-items: center;
+		padding: 4rpx 14rpx;
+		border-radius: 50rpx;
+		font-size: 20rpx;
+		line-height: 1;
+	}
+	
+	.list-tag-text {
+		border: 1px solid $u-type-primary;
+		color: $u-type-primary;
+		margin-left: 10px;
+		border-radius: 50rpx;
+		line-height: 1;
+		padding: 4rpx 14rpx;
+		display: flex;
+		align-items: center;
+		border-radius: 50rpx;
+		font-size: 20rpx;
+	}
+	
+	.list-price {
+		font-size: 30rpx;
+		color: $u-type-error;
+		margin-top: 5px;
+		display: flex;
+		align-items: center;
+	}
+</style>
diff --git a/pages/order/newdetail/newdetail.vue b/pages/order/newdetail/newdetail.vue
index dfb6101..f4a6278 100644
--- a/pages/order/newdetail/newdetail.vue
+++ b/pages/order/newdetail/newdetail.vue
@@ -1,12 +1,13 @@
 <template>
-	<view>
+	<view v-if="$isRight(order_details)">
 		<lf-nav title="订单详情" :showIcon="true"></lf-nav>
-		<view class="tips" v-if="type == 'default'">
+		<!-- v-if="order_details.last_pay_time" -->
+		<view class="tips" v-if="show">
 			<view class="lf-font-24 lf-color-white">剩余支付时间：</view>
-			<view>
+			<view class="lf-font-24 lf-color-white">
+				<!-- {{time}} -->
 				<countdown-timer :time="time" :autoStart="true" @finish="dateFinish">
 					<template v-slot="{minute, second}">
-						<!-- <view>{{minute}}:{{second}}</view> -->
 						<view class="lf-flex">
 							<view class="lf-font-24 lf-color-white">{{ minute >= 10 ? minute : "0" + minute }}</view>
 							<view class="lf-font-24 lf-color-white">:</view>
@@ -87,7 +88,8 @@
 				<text class="lf-color-777">商品订单编号</text>
 				<text>
 					<text class="lf-color-222">{{order_details.order_no}}</text>
-					<text class="lf-font-28 lf-m-l-20" style="color: #22A19F;" @click="copy(order_details.order_no)">复制</text>
+					<text class="lf-font-28 lf-m-l-20" style="color: #22A19F;"
+						@click="copy(order_details.order_no)">复制</text>
 				</text>
 			</view>
 			<view class="lf-row-between lf-font-28 lf-m-t-30">
@@ -173,21 +175,24 @@
 <script>
 	import countdownTimer from '@/components/countdown-timer/countdown-timer';
 	export default {
-		data(){
+		data() {
 			return {
-				type: 'default' ,// point积分订单详情, default默认普通商品订单详情
-				time: new Date('2021/09/8 14:15:00').getTime() - new Date('2021/09/8 14:10:00').getTime(),
+				type: 'default', // point积分订单详情, default默认普通商品订单详情
+				time: '',
 				order_no: '',
-				order_details: ''
+				order_details: '',
+				countdown_minute: '',
+				time: '',
+				show: false
 			}
 		},
 		components: {
 			countdownTimer
 		},
-		onLoad(options){
+		onLoad(options) {
 			this.type = options.type || this.type;
 			this.order_no = options.order_id;
-			if(this.order_no) {
+			if (this.order_no) {
 				this.getOrderDetails();
 			}
 		},
@@ -198,17 +203,76 @@
 					data: text
 				});
 			},
-			dateFinish(){
+			dateFinish() {
+				this.show = false;
 				console.log("倒计时结束");
 			},
+			countDown(munite, second) {
+				let m = munite;
+				let s = second;
+				let m2, s2;
+				let _this = this;
+				let tiem = setInterval(function() {
+					s--;
+					if (s < 0) {
+						s = 59;
+						m--;
+						if (m < 0) {
+							_this.time = '00分00秒';
+							_this.show = false;
+							// _this.getOrderDetails();
+							clearTimeout(tiem);
+							return;
+						}
+					}
+					m2 = m < 10? '0' + m : m;
+					s2 = s < 10 ? ('0' + s) : s;
+					_this.time = m2 + '分' + s2 + '秒';
+				}, 1000)
+			},
+			s_to_hs(s) {
+				//计算分钟
+				//算法：将秒数除以60，然后下舍入，既得到分钟数
+				var h;
+				h = Math.floor(s / 60);
+				//计算秒
+				//算法：取得秒%60的余数，既得到秒数
+				s = s % 60;
+				//将变量转换为字符串
+				h += '';
+				s += '';
+				//如果只有一位数，前面增加一个0
+				// h = (h.length == 1) ? '0' + h : h;
+				// s = (s.length == 1) ? '0' + s : s;
+				this.countDown(h,s)
+				// return h + ':' + s;
+			},
+			getTime(){
+				var date = new Date(),
+				year = date.getFullYear(),
+				month = date.getMonth() + 1,
+				day = date.getDate(),
+				hour = date.getHours() < 10 ? "0" + date.getHours() : date.getHours(),
+				minute = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes(),
+				second = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
+				month >= 1 && month <= 9 ? (month = "0" + month) : "";
+				day >= 0 && day <= 9 ? (day = "0" + day) : "";
+				var timer = year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second;
+				return timer;
+			},
 			getOrderDetails() {
 				this.$http.get({
-					api: 'api/order/'+this.order_no,
+					api: 'api/order/' + this.order_no,
 					header: {
-					   Authorization: `Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjVkYTY5YjM5NWFhYzM5NzVmMzI3ZTEwZDEyMzAzZjI5MzE4ZmU2OGE2Njg0MTU0MWVjMjQ2NWM4ZWJkYjRlMTUwMmY1NWM0NDlkOTcxZDdjIn0.eyJhdWQiOiIzIiwianRpIjoiNWRhNjliMzk1YWFjMzk3NWYzMjdlMTBkMTIzMDNmMjkzMThmZTY4YTY2ODQxNTQxZWMyNDY1YzhlYmRiNGUxNTAyZjU1YzQ0OWQ5NzFkN2MiLCJpYXQiOjE2MzIzODY3NDAsIm5iZiI6MTYzMjM4Njc0MCwiZXhwIjoxNjYzOTIyNzQwLCJzdWIiOiIxIiwic2NvcGVzIjpbXX0.am-szF_sZcjtyOnEJT1DHMnr1hjAZ90MJc1Pc3AD3FrcQU5xb-u43ddL70ZmM3OxxLTZlmrB8OA3XJYREMtcz26MzwOMfopB9A5AH1EjHiFCV_368cq4ZpXNFi_Sn_LrY9Wje0-WMvkznF8tbrdCNrZn5YyIV47cwEnUNQrrREX4OhcgrSfNvwnh8_O_fueBwws9yY3tTlvVB7-AvG2urFI5XCzygsE3llE0wxF5ZJO1T5QRYLDse2BQ3d9feFzO5_7FiVspKr8DrJUlZP-Zz02UgIDIA_PX0UO2M0KeBwqPYq2d5uEnXT8or7K9coSnHRqbbr4qn6iczxDu4ofM58oCcaPycbtI3RvP2SMZuWmX8fXw-T99XltK_uJEU_wlIkrjvabzyo3tkrxRrwmzJEb3Yf4Lbah_xtfi24Nsu9SRjdw8YoiF6YhuuU5YaOn-wLltgmugfYpkFpEOneVAxoMjkm5IxZAJYMXF-DeSpdOoiTmuIRZYX4GDa55s_31r0YMyF6IIQNUvOjHHk-sJSHG0kPd5QivLP7dxE5XndwyFKAOeM97X2TjdYMhJz0EBCyS4Y_pI6AFWsxJkKsa0aqvBAeJyOV9k8kbYwtPeeBhBNsDWSlGBEZYMcoAv-C-IBZzd7gu2Ceh_MJPItrnsvj8W43Cv1TwxD26bJyt9EUY`
+						Authorization: this.$cookieStorage.get('user_token')
 					}
 				}).then(res => {
 					this.order_details = res.data.data
+					var date = this.getTime()
+					this.time = new Date(this.order_details.will_closed_at).getTime() - new Date(date).getTime()
+					if(this.time > 0) {
+						this.show = true;
+					}
 					console.log(this.order_details);
 				})
 			},
@@ -217,7 +281,7 @@
 </script>
 
 <style>
-	page{
+	page {
 		background-color: #F8F8F8;
 	}
 </style>
@@ -231,6 +295,7 @@
 		padding: 0 32rpx;
 		align-items: center;
 	}
+
 	.waitconfirm-tag {
 		width: 136rpx;
 		height: 53rpx;
@@ -242,6 +307,7 @@
 		justify-content: center;
 		align-items: center;
 	}
+
 	.btn-cancel {
 		width: 220rpx;
 		height: 90rpx;
@@ -253,6 +319,7 @@
 		justify-content: center;
 		align-items: center;
 	}
+
 	.btn-confirm {
 		width: 220rpx;
 		height: 90rpx;
@@ -264,6 +331,7 @@
 		justify-content: center;
 		align-items: center;
 	}
+
 	.btn-atonce {
 		width: 220rpx;
 		height: 90rpx;
@@ -275,6 +343,7 @@
 		justify-content: center;
 		align-items: center;
 	}
+
 	.order-btn {
 		width: 100%;
 		height: 120rpx;
@@ -285,6 +354,7 @@
 		position: fixed;
 		bottom: 0;
 	}
+
 	.tips {
 		display: flex;
 		background-color: #F63434;
@@ -293,42 +363,49 @@
 		justify-content: center;
 		align-items: center;
 	}
-	.card{
+
+	.card {
 		height: max-content;
 		width: 750rpx;
 		padding: 30rpx 32rpx;
 		background-color: #FFFFFF;
-		&:nth-child(n+2){
+
+		&:nth-child(n+2) {
 			margin-top: 20rpx;
 		}
 	}
-	.goods{
-		.shop-name{
+
+	.goods {
+		.shop-name {
 			font-size: 28rpx;
 			color: #222222;
 			font-weight: bold;
 			margin: 0 15rpx;
 		}
-		.goods-img{
+
+		.goods-img {
 			width: 130rpx;
 			height: 130rpx;
 			border-radius: 4rpx;
 			margin-right: 15rpx;
 			background-color: #EEEEEE;
 		}
-		.info{
+
+		.info {
 			width: 540rpx;
 			height: 130rpx;
 			display: flex;
 			flex-direction: column;
 			justify-content: space-around;
-			.price{
+
+			.price {
 				font-size: 32rpx;
 				color: #F63434;
 				font-weight: bold;
 			}
 		}
-		.order-num{
+
+		.order-num {
 			font-size: 24rpx;
 			color: #999999;
 			display: flex;
diff --git a/pages/point/exchangeRecord/exchangeRecord.vue b/pages/point/exchangeRecord/exchangeRecord.vue
index b3b2aba..abde852 100644
--- a/pages/point/exchangeRecord/exchangeRecord.vue
+++ b/pages/point/exchangeRecord/exchangeRecord.vue
@@ -95,7 +95,7 @@
 				this.$http.get({
 					api: 'api/order/point/list',
 					header: {
-					   Authorization: `Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjVkYTY5YjM5NWFhYzM5NzVmMzI3ZTEwZDEyMzAzZjI5MzE4ZmU2OGE2Njg0MTU0MWVjMjQ2NWM4ZWJkYjRlMTUwMmY1NWM0NDlkOTcxZDdjIn0.eyJhdWQiOiIzIiwianRpIjoiNWRhNjliMzk1YWFjMzk3NWYzMjdlMTBkMTIzMDNmMjkzMThmZTY4YTY2ODQxNTQxZWMyNDY1YzhlYmRiNGUxNTAyZjU1YzQ0OWQ5NzFkN2MiLCJpYXQiOjE2MzIzODY3NDAsIm5iZiI6MTYzMjM4Njc0MCwiZXhwIjoxNjYzOTIyNzQwLCJzdWIiOiIxIiwic2NvcGVzIjpbXX0.am-szF_sZcjtyOnEJT1DHMnr1hjAZ90MJc1Pc3AD3FrcQU5xb-u43ddL70ZmM3OxxLTZlmrB8OA3XJYREMtcz26MzwOMfopB9A5AH1EjHiFCV_368cq4ZpXNFi_Sn_LrY9Wje0-WMvkznF8tbrdCNrZn5YyIV47cwEnUNQrrREX4OhcgrSfNvwnh8_O_fueBwws9yY3tTlvVB7-AvG2urFI5XCzygsE3llE0wxF5ZJO1T5QRYLDse2BQ3d9feFzO5_7FiVspKr8DrJUlZP-Zz02UgIDIA_PX0UO2M0KeBwqPYq2d5uEnXT8or7K9coSnHRqbbr4qn6iczxDu4ofM58oCcaPycbtI3RvP2SMZuWmX8fXw-T99XltK_uJEU_wlIkrjvabzyo3tkrxRrwmzJEb3Yf4Lbah_xtfi24Nsu9SRjdw8YoiF6YhuuU5YaOn-wLltgmugfYpkFpEOneVAxoMjkm5IxZAJYMXF-DeSpdOoiTmuIRZYX4GDa55s_31r0YMyF6IIQNUvOjHHk-sJSHG0kPd5QivLP7dxE5XndwyFKAOeM97X2TjdYMhJz0EBCyS4Y_pI6AFWsxJkKsa0aqvBAeJyOV9k8kbYwtPeeBhBNsDWSlGBEZYMcoAv-C-IBZzd7gu2Ceh_MJPItrnsvj8W43Cv1TwxD26bJyt9EUY`
+					    Authorization: this.$cookieStorage.get('user_token')
 					},
 					data: {
 						page: this.page
diff --git a/pages/shop/shopdetail.vue b/pages/shop/shopdetail.vue
index 4a6ddab..3238dde 100644
--- a/pages/shop/shopdetail.vue
+++ b/pages/shop/shopdetail.vue
@@ -2,7 +2,7 @@
 	<view>
 		<lf-nav :spreadOut="false" :showIcon="true" bgColor="transparent!important"></lf-nav>
 		<view class="shop-head">
-			<image class="lf-w-100 lf-h-100" :src="detail.logo" mode="aspectFill"></image>
+			<image class="lf-w-100 lf-h-100" :src="detail.images[0].path" mode="aspectFill"></image>
 		</view>
 		<view class="shop-title">
 			<view class="shop-flex">
@@ -86,7 +86,7 @@
 				<swiper-item v-for="(tabItem, tabIndex) in tab_list" :key="tabIndex">
 					<scroll-view class="com" :scroll-y="true" :refresher-enabled="true" :refresher-triggered="tabItem.isRefresher" @scrolltolower="onScrolltolower" @refresherrefresh="onRefresherrefresh">
 						<view class="lf-m-t-20"></view>
-						<lf-waterfall :list="tabItem.list" :listlength="tab_list.length" :tabindex='tabIndex' ref="uWaterfallFather"></lf-waterfall>
+						<lf-waterfall :ifsale="false" :list="tabItem.list" :listlength="tab_list.length" :tabindex='tabIndex' ref="uWaterfallFather"></lf-waterfall>
 						<view class="loading-more lf-m-b-10">
 							<text :class="{'loading-more-text': tabItem.loadingClass}" v-if="tabItem.list.length">{{tabItem.loadingText}}</text>
 							<lf-nocontent v-else></lf-nocontent>
diff --git a/pages/shop/specialList.vue b/pages/shop/specialList.vue
index 41fefc7..1a51181 100644
--- a/pages/shop/specialList.vue
+++ b/pages/shop/specialList.vue
@@ -9,7 +9,7 @@
 		</view>
 		<view class="goods-list">
 			<!-- TODO 此处应为渲染多个lf-waterfall组件 -->
-			<lf-waterfall :list="list" ref="uWaterfallFather"></lf-waterfall>
+			<lf-waterfall :ifsale="false" :list="list" ref="uWaterfallFather"></lf-waterfall>
 		</view>
 		<u-back-top :scrollTop="pageScrollTop"></u-back-top>
 	</view>