Browse Source

order联调

qinjie 2 months ago
parent
commit
b1b6829388

+ 3 - 0
common/uni.css

@@ -1459,4 +1459,7 @@ radio-group label, checkbox-group label{
 
 
 uni-toast .uni-toast__content {
 uni-toast .uni-toast__content {
 	margin-top: 32upx
 	margin-top: 32upx
+}
+.uni-picker-container {
+	z-index: 999;
 }
 }

+ 2 - 2
components/itmister-address-picker/itmister-address-picker.nvue

@@ -217,7 +217,7 @@
 		right: 0;
 		right: 0;
 		top: 0;
 		top: 0;
 		bottom: 0;
 		bottom: 0;
-		z-index: 999988;
+		z-index: 99988;
 	}
 	}
 
 
 	.address-picker-container {
 	.address-picker-container {
@@ -225,7 +225,7 @@
 		left: 0;
 		left: 0;
 		right: 0;
 		right: 0;
 		bottom: 0;
 		bottom: 0;
-		z-index: 999999;
+		z-index: 999;
 		height: 640rpx;
 		height: 640rpx;
 		background-color: #FFFFFF;
 		background-color: #FFFFFF;
 	}
 	}

+ 1 - 1
components/zaiui-common/basics/modal-img.vue

@@ -39,7 +39,7 @@
 		left: inherit;
 		left: inherit;
 		right: inherit;
 		right: inherit;
 		bottom: inherit;
 		bottom: inherit;
-		z-index: 99999999;
+		z-index: 999;
 	    text-align: center;
 	    text-align: center;
 	    background: rgba(0, 0, 0, 0.6);
 	    background: rgba(0, 0, 0, 0.6);
 	    transition: all 0.3s;
 	    transition: all 0.3s;

+ 4 - 0
components/zaiui-common/footer/footer-tabbar.vue

@@ -48,6 +48,7 @@
 		created() {
 		created() {
 			this.TabID = this.tabID;
 			this.TabID = this.tabID;
 			this.MsgDot = this.msgDot;
 			this.MsgDot = this.msgDot;
+			this.loadInfo()
 		},
 		},
 		watch: {
 		watch: {
 			tabID() {
 			tabID() {
@@ -60,6 +61,9 @@
 			}
 			}
 		},
 		},
 		methods: {
 		methods: {
+			loadInfo() {
+				console.log('infffff')
+			},
 			tabTap(index) {
 			tabTap(index) {
 				if(index != this.TabID) {
 				if(index != this.TabID) {
 					this.$emit('tabTap', index);
 					this.$emit('tabTap', index);

+ 1 - 1
components/zaiui-common/view/find.vue

@@ -241,7 +241,7 @@
 		position: fixed;
 		position: fixed;
 		width: 100%;
 		width: 100%;
 		top: 0;
 		top: 0;
-		z-index: 999999;
+		z-index: 999;
 		padding: calc(var(--status-bar-height) + 9.09upx) 27.27upx 9.09upx 9.09upx;
 		padding: calc(var(--status-bar-height) + 9.09upx) 27.27upx 9.09upx 9.09upx;
 		.flex {
 		.flex {
 			.basis-l {
 			.basis-l {

+ 33 - 52
components/zaiui-common/view/home.vue

@@ -1,24 +1,20 @@
 <template>
 <template>
-	<view class="zaiui-home-box" :class="show?'show':''">
-		<!--欢迎-->
-		<welcome-tip content="中午好,仔仔" :show="true" :c_s="3000" @closeFinish="welcomeClose"/>
-		
-		<!--轮播背景-->
-		<swiper-background :list_data="swiperInfo.list" :indexs="swiperInfo.index" :show="swiperInfo.show" :welcome="swiperInfo.welcome"/>
-		
-		<view class="zaiui-head-search-box" :class="headInfo.Class" :style="[{backgroundColor:'rgba(229, 77, 66,'+ headInfo.opacity +')'}]">
-			
-			<!--小程序端的标题-->
-			<!-- #ifdef MP -->
-			<view class="text-center text-white zaiui-small-routine-title">首页</view>
-			<!-- #endif -->
-			
+	<view class="zaiui-home-box show" >
+		<bar-title bgColor='bg-red' :isBack="false" :title="place.name">
+			<block slot="content">{{place.name}}</block>
+			<block slot="right">
+				
+			</block>
+		</bar-title>
+		<view class="zaiui-head-search-box" :class="headInfo.Class">
 			<!--搜索框-->
 			<!--搜索框-->
 			<view class="cu-bar search zaiui-search-box">
 			<view class="cu-bar search zaiui-search-box">
-				<view class="search-form round" @tap="searchTap">
-					<text class="cuIcon-search"/>
-					<text>口罩</text>
-				</view>
+				<form  @submit="search">
+					<view class="search-form round">
+						<text class="cuIcon-search"/>
+						<input type="search" />
+					</view>
+				</form>
 				<view class="action text-white"></view>
 				<view class="action text-white"></view>
 			</view>
 			</view>
 			
 			
@@ -35,28 +31,17 @@
 							</block>
 							</block>
 						</scroll-view>
 						</scroll-view>
 					</view>
 					</view>
-					<view class="basis-xxs">
+					<!-- <view class="basis-xxs">
 						<view class="sort-icon" @tap="sortVueTap">
 						<view class="sort-icon" @tap="sortVueTap">
 							<text class="cuIcon-sort"/>
 							<text class="cuIcon-sort"/>
 						</view>
 						</view>
-					</view>
+					</view> -->
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
 		
 		
 		<!--中间内容区域-->
 		<!--中间内容区域-->
-		<view class="zaiui-view-content" :class="[viewContent.welcome?'welcome':'',headTab.TabCur==0?'show':'']">
-			<!--轮播图-->
-			<view class="zaiui-swiper-box">
-				<swiper class="screen-swiper square-dot c" autoplay circular indicator-dots :current="swiperInfo.index"  @change="swiperChange">
-					<swiper-item v-for="(item,index) in swiperInfo.list" :key="index">
-						<view class="swiper-padding">
-							<image :src="item.swiper" mode="widthFix"/>
-						</view>
-					</swiper-item>
-				</swiper>
-			</view>
-			
+		<view class="zaiui-view-content" :class="[headTab.TabCur==0?'show':'']">
 			<!--滑动菜单-->
 			<!--滑动菜单-->
 			<grid-menu-list v-if="gridMenuData.length" :list_data='gridMenuData' @listTap='gridMenuTap'/>
 			<grid-menu-list v-if="gridMenuData.length" :list_data='gridMenuData' @listTap='gridMenuTap'/>
 			
 			
@@ -161,11 +146,14 @@
 	//======================================================================
 	//======================================================================
 	import _home_data from '@/static/zaiui/data/home.js';	//虚拟数据
 	import _home_data from '@/static/zaiui/data/home.js';	//虚拟数据
 	import _tool from '@/static/zaiui/util/tools.js';
 	import _tool from '@/static/zaiui/util/tools.js';
+	import barTitle from '@/components/zaiui-common/basics/bar-title';
+	
+	
 	export default {
 	export default {
 		name: 'home',
 		name: 'home',
 		components: { 
 		components: { 
 			welcomeTip, swiperBackground, gridMenuList, identifyList, sellQuicklyList, activityList, goodsList, liveList, videoList, footerTabbar,
 			welcomeTip, swiperBackground, gridMenuList, identifyList, sellQuicklyList, activityList, goodsList, liveList, videoList, footerTabbar,
-			gridSortList, modalImg
+			gridSortList, modalImg,barTitle
 		},
 		},
 		data() {
 		data() {
 			return {
 			return {
@@ -173,6 +161,7 @@
 				headTab: {TabCur: 0, scrollLeft: 0, list: []}, viewContent: {welcome: false,}, gridMenuData: [], identifyData: [],
 				headTab: {TabCur: 0, scrollLeft: 0, list: []}, viewContent: {welcome: false,}, gridMenuData: [], identifyData: [],
 				quickly: {}, activity: [], goodsTabData: {TabCur: 0, list: []}, goodsData: [], liveData: [], videoData: [],
 				quickly: {}, activity: [], goodsTabData: {TabCur: 0, list: []}, goodsData: [], liveData: [], videoData: [],
 				gridSortData: [], modalShow: false,
 				gridSortData: [], modalShow: false,
+				place: {}
 			}
 			}
 		},
 		},
 		props: {
 		props: {
@@ -236,6 +225,9 @@
 			// this.gridSortData = _home_data.gridSortData();
 			// this.gridSortData = _home_data.gridSortData();
 		},
 		},
 		methods: {
 		methods: {
+			search() {
+				console.log('ddddd')
+			},
 			getListByCate(cate_id) {
 			getListByCate(cate_id) {
 				this.req({
 				this.req({
 					url: '?l=resource.home', 
 					url: '?l=resource.home', 
@@ -250,6 +242,7 @@
 								this.gridSortData = res.data.data.cate_child
 								this.gridSortData = res.data.data.cate_child
 							}
 							}
 							this.goodsData = res.data.data.list;
 							this.goodsData = res.data.data.list;
+							this.place = res.data.data.place;
 						}else {
 						}else {
 							this.error = res.data.msg
 							this.error = res.data.msg
 						}
 						}
@@ -395,12 +388,12 @@
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 	.zaiui-head-search-box {
 	.zaiui-head-search-box {
-		position: fixed;
+		// position: fixed;
 		width: 100%;
 		width: 100%;
-		top: 0;
-		z-index: 9999;
-		background-color: rgba(229, 77, 66,0);
-		padding-top: var(--status-bar-height);
+		// top: 0;
+		z-index: 999;
+		background-color: rgb(229, 77, 66);
+		// padding-top: var(--status-bar-height);
 		transition: top .25s;
 		transition: top .25s;
 		padding-bottom: 10upx;
 		padding-bottom: 10upx;
 		.zaiui-search-box {
 		.zaiui-search-box {
@@ -437,18 +430,6 @@
 		display: none;
 		display: none;
 		width: 100%;
 		width: 100%;
 		
 		
-		/* #ifdef APP-PLUS */
-		margin-top: calc(var(--status-bar-height) + 30upx);
-		/* #endif */
-		
-		/* #ifdef H5 */
-		margin-top: calc(var(--status-bar-height) + 70upx);
-		/* #endif */
-		
-		/* #ifdef MP */
-		margin-top: calc(var(--status-bar-height) + 85upx);
-		/* #endif */
-		
 		.zaiui-tab-list {
 		.zaiui-tab-list {
 			position: relative;
 			position: relative;
 			width: 100%;
 			width: 100%;
@@ -489,7 +470,7 @@
 		position: sticky;
 		position: sticky;
 		padding: 2upx 0;
 		padding: 2upx 0;
 		transition: all .25s;
 		transition: all .25s;
-		z-index: 9999;
+		z-index: 999;
 		background: #fff;
 		background: #fff;
 		
 		
 		/* #ifndef MP */
 		/* #ifndef MP */
@@ -529,7 +510,7 @@
 	}
 	}
 	.zaiui-add-btn-view-box {
 	.zaiui-add-btn-view-box {
 		position: fixed;
 		position: fixed;
-		z-index: 999999;
+		z-index: 999;
 		bottom: 181.81upx;
 		bottom: 181.81upx;
 		right: 27.27upx;
 		right: 27.27upx;
 		.cu-btn {
 		.cu-btn {

+ 1 - 1
components/zaiui-common/view/my.vue

@@ -67,7 +67,7 @@
 		<view class="zaiui-view-content">
 		<view class="zaiui-view-content">
 			<!--用户数据-->
 			<!--用户数据-->
 			<view class="padding-xs bg-white zaiui-user-info-order-box">
 			<view class="padding-xs bg-white zaiui-user-info-order-box">
-				<view class="text-black text-lg text-bold padding-sm">我的交易</view>
+				<view class="text-black text-lg text-bold padding-sm">商品订单</view>
 				<view class="cu-list grid col-4 no-border">
 				<view class="cu-list grid col-4 no-border">
 					<view class="cu-item" v-for="item in orderInfo" :key="item.name" @click="order_list_tap(item)">
 					<view class="cu-item" v-for="item in orderInfo" :key="item.name" @click="order_list_tap(item)">
 						<view class="text-xxl text-red" v-if="isLogin">
 						<view class="text-xxl text-red" v-if="isLogin">

+ 179 - 0
components/zaiui-common/view/resource - 副本.vue

@@ -0,0 +1,179 @@
+<template>
+	<view class="zaiui-news-box" :class="show?'show':''">
+		<!--标题栏-->
+		<bar-title bgColor="bg-white" title="资源" :isBack="false">
+			<block slot="content">资源</block>
+		</bar-title>
+		
+		<!--消息列表-->
+		<view class="bg-white zaiui-news-list-box">
+			<view class="margin-bottom cu-list menu-avatar">
+				
+				<view class="cu-item goods" v-for="item in list" :key="item.id" :class="modalName=='move-box-'+ 1?'move-cur':''" :data-id="item.id" @tap="tapNews">
+					<view class="action">
+						<view class="cu-avatar radius" :style="`background-image:url(${item.pic});`"/>
+					</view>
+					<view class="content">
+						<view class="text-black">
+							<text class="margin-right-xs">{{item.name}}</text>
+							<!-- <text class="cu-tag bg-blue sm radius">
+								<text class="cuIcon-male"></text>
+							</text> -->
+						</view>
+						<view class="text-gray text-sm text-cut">{{item.info||'-'}}</view>
+						<view class="text-gray text-sm">{{item.cdate_str}}</view>
+					</view>
+				</view>
+				
+			</view>
+		</view>
+		
+		<!--占位底部距离-->
+		<view class="cu-tabbar-height"/>
+	</view>
+</template>
+
+<script>
+	import barTitle from '@/components/zaiui-common/basics/bar-title';
+	
+	import _tool from '@/static/zaiui/util/tools.js';	//工具函数
+	export default {
+		name: 'news',
+		components: { 
+			barTitle
+		},
+		data() {
+			return {
+				list: [],
+				modalName: ''
+			}
+		},
+		props: {
+			show: {
+				type: Boolean,
+				default: true
+			},
+			scrollY: {
+				type: Number,
+				default: 0
+			},
+			scrollBottom: {
+				type: Number,
+				default: 0
+			}
+		},
+		watch: {
+			
+		},
+		created() {
+			//加载虚拟数据
+			this.loadList()
+		},
+		mounted() {
+			_tool.setBarColor(true);
+			uni.pageScrollTo({
+			    scrollTop: 0,
+			    duration: 0
+			});
+		},
+		methods: {
+			loadList() {
+				this.req({
+					url: '?l=resource.home', 
+					data: {type: 1},
+					success: res => {
+						if(res.data.status == 1) {
+							console.log(res.data.data)
+							this.list = res.data.data.list;
+						}else {
+							this.error = res.data.msg
+						}
+					}
+				})
+			},
+			//被点击
+			tapNews(e) {
+				uni.navigateTo({
+					url: '/pages/goods/resource?id='+e.currentTarget.dataset.id
+				});
+					
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.zaiui-news-box {
+		width: 100%;
+		display: none;
+		.zaiui-follow-box {
+			.action-text-cut {
+				width: 70%;
+			}
+		}
+		.zaiui-grid-menu {
+			.cu-list.grid.no-border>.cu-item {
+				.cu-avatar {
+					margin: 0 auto;
+				}
+			}
+		}
+		.zaiui-news-list-box {
+			padding: 0 9.09upx;
+			.cu-list.menu-avatar>.cu-item>.cu-avatar {
+				width: 81.81upx;
+				height: 81.81upx;
+			}
+			.cu-list.menu-avatar>.cu-item {
+				height: 163.63upx;
+				align-items: inherit;
+				.cu-avatar {
+					margin-top: 25.45upx;
+					.cu-tag.badge {
+					    width: 21.81upx;
+					    height: 21.81upx;
+					    top: 0;
+					    right: 0;
+					    border: 1.81upx solid #fff;	
+					}
+				}
+				.content {
+				    left: 160upx;
+					margin-top: 18.18upx;
+				    width: calc(100% - 90.9upx - 54.54upx - 18.18upx);
+				    line-height: 1.7em;	
+					.cu-tag {
+						padding: 0 3.63upx;
+						text {
+							position: relative;
+							top: -2upx;
+						}
+					}
+				}
+				&:after {
+					width: 0;
+					height: 0;
+					border-bottom: 0;
+				}
+			}
+			.cu-list.menu-avatar>.cu-item.goods {
+				.content {
+				    width: calc(100% - 309.09upx);
+				}
+				.action {
+					position: absolute;	
+				    left: 11upx;
+					width: 127.27upx;
+					.cu-avatar {
+						width: 127.27upx;
+						height: 127.27upx;
+						margin-top: 18.18upx;
+					}
+				}
+			}
+		}
+	}
+	.zaiui-news-box.show {
+		display: block;
+	}
+</style>

+ 447 - 98
components/zaiui-common/view/resource.vue

@@ -1,51 +1,165 @@
 <template>
 <template>
-	<view class="zaiui-news-box" :class="show?'show':''">
-		<!--标题栏-->
-		<bar-title bgColor="bg-white" title="资源" :isBack="false">
-			<block slot="content">资源</block>
-		</bar-title>
-		
-		<!--消息列表-->
-		<view class="bg-white zaiui-news-list-box">
-			<view class="margin-bottom cu-list menu-avatar">
+	<view class="zaiui-home-box show" >
+		<bar-title bgColor='bg-red' :isBack="false" :title="place.name">
+			<block slot="content">{{place.name}}</block>
+			<block slot="right">
 				
 				
-				<view class="cu-item goods" v-for="item in list" :key="item.id" :class="modalName=='move-box-'+ 1?'move-cur':''" :data-id="item.id" @tap="tapNews">
-					<view class="action">
-						<view class="cu-avatar radius" :style="`background-image:url(${item.pic});`"/>
+			</block>
+		</bar-title>
+		<view class="zaiui-head-search-box" :class="headInfo.Class">
+			<!--搜索框-->
+			<view class="cu-bar search zaiui-search-box">
+				<view class="search-form round" @tap="searchTap">
+					<text class="cuIcon-search"/>
+					<text>口罩</text>
+				</view>
+				<view class="action text-white"></view>
+			</view>
+			
+			<!--选项卡-->
+			<view class="zaiui-flex-tab show">
+				<view class="flex text-white">
+					<view class="basis-xxl">
+						<scroll-view scroll-x class="nav z" scroll-with-animation :scroll-left="headTab.scrollLeft">
+							<block v-for="(item,index) in headTab.list" :key="item.id">
+								<view class="cu-item" :class="item.id==headTab.TabCur?'select':''" @tap="tabSelect" :data-id="item.id">
+									<view>{{item.name}}</view>
+									<view class="tab-dot bg-white"/>
+								</view>
+							</block>
+						</scroll-view>
 					</view>
 					</view>
-					<view class="content">
-						<view class="text-black">
-							<text class="margin-right-xs">{{item.name}}</text>
-							<!-- <text class="cu-tag bg-blue sm radius">
-								<text class="cuIcon-male"></text>
-							</text> -->
+					<!-- <view class="basis-xxs">
+						<view class="sort-icon" @tap="sortVueTap">
+							<text class="cuIcon-sort"/>
 						</view>
 						</view>
-						<view class="text-gray text-sm text-cut">{{item.info||'-'}}</view>
-						<view class="text-gray text-sm">{{item.cdate_str}}</view>
-					</view>
+					</view> -->
 				</view>
 				</view>
+			</view>
+		</view>
+		
+		<!--中间内容区域-->
+		<view class="zaiui-view-content" :class="[headTab.TabCur==0?'show':'']">
+			<!--滑动菜单-->
+			<grid-menu-list v-if="gridMenuData.length" :list_data='gridMenuData' @listTap='gridMenuTap'/>
+			
+			<!--红包块-->
+			<!-- <view class="bg-red margin radius padding-sm">
+				<image class="red-envelopes" src="/static/images/home/sundry/2.png" mode="widthFix"/>
+			</view> -->
+			
+			<!--免费鉴别-->
+			<!-- <identify-list :list_data='identifyData' @listTap='identifyTap'/> -->
+			
+			<!--省心快卖-->
+			<!-- <sell-quickly-list :list_data='quickly' @listTap='quicklyTap'/> -->
+			
+			<!--活动区域-->
+			<!-- <activity-list :list_data='activity' @listTap='activityTap'/> -->
+			
+			<!--商品tab-->
+			<!-- <view class="zaiui-goods-tab-box">
+				<scroll-view scroll-x class="nav z margin-tb-sm">
+					<view class="flex text-center">
+						<block v-for="(item,index) in goodsTabData.list" :key="index">
+							<view class="cu-item flex-sub nf" :class="index==goodsTabData.TabCur?'select':''" @tap="goodsTab" :data-id="index">
+								<view class="cu-tag badge z bg-gradual-pink" v-if="item.tag">{{item.tag}}</view>
+								<view :class="index == goodsTabData.TabCur?'text-red':''">{{item.title}}</view>
+								<view class="tab-dot bg-red"/>
+							</view>
+						</block>
+					</view>
+				</scroll-view>
+			</view> -->
+			
+			<view class="zaiui-tab-list">
+				<!--商品列表-->
+				<goods-list :list_data="goodsData" @listTap="goodsListTap" :show="goodsTabData.TabCur!=2 && goodsTabData.TabCur!=4?true:false"/>
 				
 				
+				<!--直播列表-->
+				<!-- <live-list :list_data="liveData" @listTap="liveListTap" :show="goodsTabData.TabCur==2?true:false"/> -->
+				
+				<!--视频列表-->
+				<!-- <video-list :list_data="videoData" @listTap="videoListTap" :show="goodsTabData.TabCur==4?true:false"/> -->
 			</view>
 			</view>
+			
+			<!--占位底部距离-->
+			<view class="cu-tabbar-height"/>
 		</view>
 		</view>
 		
 		
-		<!--占位底部距离-->
-		<view class="cu-tabbar-height"/>
+		<!--中间内容区域-分类-->
+		<view class="zaiui-view-content" :class="headTab.TabCur!=0?'show':''">
+			
+			<!--宫格分类-->
+			<grid-sort-list v-if="gridSortData.length" :list_data="gridSortData" @listTap="gridSortTap"/>
+			
+			<!--广告-->
+			
+			<!-- <view class="margin">
+				<image class="zaiui-ad-img" src="/static/images/home/swiper/swiper-1.png" mode="widthFix"/>
+			</view> -->
+			
+			<!--标题-->
+			<!-- <view class="margin-bottom-sm zaiui-tab-list-title">
+				<view class="flex flex-wrap">
+					<view class="basis-sm text-right">
+						<image class="img-aau" src="/static/zaiui/img/aau.png" lazy-load mode="widthFix"/>
+					</view>
+					<view class="basis-xs text-center">
+						<text class="text-black text-xl text-bold">为您推荐</text>
+					</view>
+					<view class="basis-sm text-left">
+						<image class="img-aau" src="/static/zaiui/img/aau.png" lazy-load mode="widthFix"/>
+					</view>
+				</view>
+			</view> -->
+			
+			<!--商品列表-->
+			<goods-list :list_data="goodsData" @listTap="goodsListTap"/>
+			
+			<!--占位底部距离-->
+			<view class="cu-tabbar-height"/>
+		</view>
+		
+		<!--弹出框-->
+		<modal-img :show="modalShow" src="/static/images/home/sundry/reward.png" @imgTap="imgTap" @closeTap="closeTap"/>
+		
 	</view>
 	</view>
 </template>
 </template>
 
 
 <script>
 <script>
+	//加载组件  
+	import welcomeTip from '@/components/zaiui-common/basics/welcome-tip';
+	import swiperBackground from '@/components/zaiui-common/basics/swiper-background';
+	import gridMenuList from '@/components/zaiui-common/list/grid-menu-list';
+	import identifyList from '@/components/zaiui-common/list/identify-list';
+	import sellQuicklyList from '@/components/zaiui-common/list/sell-quickly-list';
+	import activityList from '@/components/zaiui-common/list/activity-list';
+	import goodsList from '@/components/zaiui-common/list/goods-list';
+	import liveList from '@/components/zaiui-common/list/live-list';
+	import videoList from '@/components/zaiui-common/list/video-list';
+	import footerTabbar from '@/components/zaiui-common/footer/footer-tabbar';
+	import gridSortList from '@/components/zaiui-common/list/grid-sort-list';
+	import modalImg from '@/components/zaiui-common/basics/modal-img';
+	//======================================================================
+	import _home_data from '@/static/zaiui/data/home.js';	//虚拟数据
+	import _tool from '@/static/zaiui/util/tools.js';
 	import barTitle from '@/components/zaiui-common/basics/bar-title';
 	import barTitle from '@/components/zaiui-common/basics/bar-title';
 	
 	
-	import _tool from '@/static/zaiui/util/tools.js';	//工具函数
+	
 	export default {
 	export default {
-		name: 'news',
+		name: 'home',
 		components: { 
 		components: { 
-			barTitle
+			welcomeTip, swiperBackground, gridMenuList, identifyList, sellQuicklyList, activityList, goodsList, liveList, videoList, footerTabbar,
+			gridSortList, modalImg,barTitle
 		},
 		},
 		data() {
 		data() {
 			return {
 			return {
-				list: [],
-				modalName: ''
+				swiperInfo: {index: 0, show: true, welcome: true, list: []}, headInfo: {Class: "", opacity: 0,}, goodsShow: true, 
+				headTab: {TabCur: 0, scrollLeft: 0, list: []}, viewContent: {welcome: false,}, gridMenuData: [], identifyData: [],
+				quickly: {}, activity: [], goodsTabData: {TabCur: 0, list: []}, goodsData: [], liveData: [], videoData: [],
+				gridSortData: [], modalShow: false,
+				place: {}
 			}
 			}
 		},
 		},
 		props: {
 		props: {
@@ -63,117 +177,352 @@
 			}
 			}
 		},
 		},
 		watch: {
 		watch: {
-			
+			scrollY() {
+				//通知他妈的滚动了。
+				this.setPageScroll(this.scrollY);
+			},
+			scrollBottom() {
+				if(this.scrollBottom != 0) {
+					//通知他妈的触底了
+					this.setReachBottom();
+				}
+			},
 		},
 		},
 		created() {
 		created() {
+			
+			
 			//加载虚拟数据
 			//加载虚拟数据
-			this.loadList()
+			// this.headTab.list = _home_data.tab();
+			this.swiperInfo.list = _home_data.swiper();
+			// this.gridMenuData = _home_data.nav();
+			// this.identifyData = _home_data.live();
+			// this.quickly.swiper = _home_data.earn();
+			// this.quickly.list = _home_data.sellQuickly();
+			// this.activity = _home_data.activity();
+			// this.goodsTabData.list = _home_data.goodsTab();
+			//商品列表数据
+			// let GoodsData = _home_data.goodsList();
+			//推荐感兴趣数据
+			// let recommendData = _home_data.recommend();
+			//把推荐感兴趣的数据,添加到商品数据里,可扩展为随机位置显示。
+			// GoodsData.splice(1, 0, recommendData);
+			// this.goodsData = GoodsData;
+			this.headInfo.Class = '';
+			this.welcomeClose(true)
+			
+			this.getListByCate('')
 		},
 		},
 		mounted() {
 		mounted() {
-			_tool.setBarColor(true);
 			uni.pageScrollTo({
 			uni.pageScrollTo({
 			    scrollTop: 0,
 			    scrollTop: 0,
 			    duration: 0
 			    duration: 0
 			});
 			});
+			//次级虚拟数据加载
+			this.liveData = _home_data.liveData();
+			this.videoData = _home_data.videoData();
+			// this.gridSortData = _home_data.gridSortData();
 		},
 		},
 		methods: {
 		methods: {
-			loadList() {
+			getListByCate(cate_id) {
 				this.req({
 				this.req({
 					url: '?l=resource.home', 
 					url: '?l=resource.home', 
-					data: {type: 1},
+					data: {type: 1, cate_id},
 					success: res => {
 					success: res => {
 						if(res.data.status == 1) {
 						if(res.data.status == 1) {
 							console.log(res.data.data)
 							console.log(res.data.data)
-							this.list = res.data.data.list;
+							if(!cate_id) {
+								this.headTab.list = [{name: '全部', id: ''},...res.data.data.cate_parent];
+								this.gridMenuData = res.data.data.cate_child
+							} else {
+								this.gridSortData = res.data.data.cate_child
+							}
+							this.goodsData = res.data.data.list;
+							this.place = res.data.data.place;
 						}else {
 						}else {
 							this.error = res.data.msg
 							this.error = res.data.msg
 						}
 						}
 					}
 					}
 				})
 				})
 			},
 			},
-			//被点击
-			tapNews(e) {
+			//页面被滚动
+			setPageScroll(scrollTop) {
+				//console.log(scrollTop);
+				if(this.headTab.TabCur == 0) {
+					if(scrollTop <= 100) {
+						let num = scrollTop / 100;
+						this.headInfo.opacity = num;
+					} else if(scrollTop > 100) {
+						this.headInfo.opacity = 1;
+					}
+				}
+			},
+			//触底了
+			setReachBottom() {
+				console.log('触底了');
+			},
+			//欢迎提示关闭事件
+			welcomeClose(bol) {
+				this.swiperInfo.welcome = bol;
+				this.headTab.welcome = bol;
+				let Class = this.headInfo.Class;
+				this.headInfo.Class = Class.replace(/welcome/g, '');
+				this.viewContent.welcome = bol;
+				//设置颜色
+				_tool.setBarColor(false);
+				console.log(bol);
+			},
+			//搜索框下的tab菜单被点击
+			tabSelect(e) {
+				let index = e.currentTarget.dataset.id;
+				this.headTab.TabCur = index;
+				this.headTab.scrollLeft = (index - 1) * 60;
+				if(index == 0) {
+					this.swiperInfo.show = true;
+					this.headInfo.opacity = 0;
+				} else {
+					this.swiperInfo.show = false;
+					this.headInfo.opacity = 1;
+				}
+				uni.pageScrollTo({
+				    scrollTop: 0,
+				    duration: 0
+				});
+				this.getListByCate(index)
+			},
+			swiperChange(e) {
+				this.swiperInfo.index = e.detail.current;
+			},
+			gridMenuTap(e) {
+				console.log(e);
 				uni.navigateTo({
 				uni.navigateTo({
-					url: '/pages/goods/resource?id='+e.currentTarget.dataset.id
+					url: "/pages/home/sort_list"
+				});
+			},
+			identifyTap(e) {
+				console.log(e);
+			},
+			quicklyTap(e) {
+				console.log(e);
+			},
+			activityTap(e) {
+				console.log(e);
+			},
+			//商品列表上的分类tab被点击
+			goodsTab(e) {
+				this.goodsTabData.TabCur = e.currentTarget.dataset.id;
+				// #ifdef H5
+				uni.pageScrollTo({
+				    scrollTop: 1060,
+				    duration: 200
+				});
+				// #endif
+				
+				// #ifdef APP-PLUS
+				uni.pageScrollTo({
+				    scrollTop: 1010,
+				    duration: 200
 				});
 				});
+				// #endif
+			},
+			goodsListTap(e) {
+				console.log(e);
+				// if(e.index==0) {
+					uni.navigateTo({
+						url: '/pages/goods/resource?id='+e.data.id
+					});
+				// } else if(e.index == 2) {
+				// 	uni.navigateTo({
+				// 		url: '/pages/goods/second_hand'
+				// 	});
+				// } else if(e.index == 3) {
+				// 	uni.navigateTo({
+				// 		url: '/pages/goods/second_terrace'
+				// 	});
+				// } else {
 					
 					
+				// }
+			},
+			liveListTap(e) {
+				console.log(e);
+			},
+			videoListTap(e) {
+				console.log(e);
+			},
+			gridSortTap(e) {
+				console.log(e);
+			},
+			rewardTap() {
+				uni.navigateTo({
+					url: "/pages/goods/reward"
+				});
+			},
+			imgTap() {
+				this.modalShow = false;
+				uni.navigateTo({
+					url: "/pages/goods/reward"
+				});
+				console.log('图片被点击');
+			},
+			closeTap() {
+				this.modalShow = false;
+				console.log('点击了关闭');
+			},
+			sortVueTap() {
+				uni.navigateTo({
+					url: "/pages/home/sort"
+				});
+			},
+			searchTap() {
+				uni.navigateTo({
+					url: "/pages/home/search"
+				});
 			}
 			}
 		}
 		}
 	}
 	}
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
-	.zaiui-news-box {
+	.zaiui-head-search-box {
+		// position: fixed;
 		width: 100%;
 		width: 100%;
-		display: none;
-		.zaiui-follow-box {
-			.action-text-cut {
-				width: 70%;
-			}
+		// top: 0;
+		z-index: 999;
+		background-color: rgb(229, 77, 66);
+		// padding-top: var(--status-bar-height);
+		transition: top .25s;
+		padding-bottom: 10upx;
+		.zaiui-search-box {
+			position: relative;
 		}
 		}
-		.zaiui-grid-menu {
-			.cu-list.grid.no-border>.cu-item {
-				.cu-avatar {
-					margin: 0 auto;
+		.zaiui-flex-tab {
+			position: relative;
+			transition: opacity .25s;
+			.flex {
+				.basis-xxl {
+					flex-basis: 90%;
+					width: 90%;
+					z-index: 1;
+				}
+				.basis-xxs {
+					flex-basis: 10%;
+					z-index: 1;
+					width: 10%;
+				}
+				.sort-icon {
+					font-size: 55upx;
+					height: 64upx;
+					line-height: 64upx;
+					text-align: center;
 				}
 				}
 			}
 			}
 		}
 		}
-		.zaiui-news-list-box {
-			padding: 0 9.09upx;
-			.cu-list.menu-avatar>.cu-item>.cu-avatar {
-				width: 81.81upx;
-				height: 81.81upx;
+	}
+	.zaiui-head-search-box.welcome {
+		top: calc(var(--status-bar-height) + 101upx);
+		transition: top .25s;
+	}
+	.zaiui-view-content {
+		display: none;
+		width: 100%;
+		
+		.zaiui-tab-list {
+			position: relative;
+			width: 100%;
+		}
+	}
+	.zaiui-view-content.welcome {
+		/* #ifdef APP-PLUS */
+		margin-top: calc(var(--status-bar-height) + 180upx);
+		/* #endif */
+		
+		/* #ifdef H5 */
+		margin-top: calc(var(--status-bar-height) + 220upx);
+		/* #endif */
+		
+		/* #ifdef MP */
+		margin-top: calc(var(--status-bar-height) + 220upx);
+		/* #endif */
+		
+		transition: all .25s;
+	}
+	.zaiui-view-content.show {
+		display: block;
+	}
+	.zaiui-swiper-box {
+		width: 100%;
+		.screen-swiper {
+			height: 230upx;
+			min-height: 230upx;
+			.swiper-padding {
+				padding: 0 25upx;
 			}
 			}
-			.cu-list.menu-avatar>.cu-item {
-				height: 163.63upx;
-				align-items: inherit;
-				.cu-avatar {
-					margin-top: 25.45upx;
-					.cu-tag.badge {
-					    width: 21.81upx;
-					    height: 21.81upx;
-					    top: 0;
-					    right: 0;
-					    border: 1.81upx solid #fff;	
-					}
-				}
-				.content {
-				    left: 160upx;
-					margin-top: 18.18upx;
-				    width: calc(100% - 90.9upx - 54.54upx - 18.18upx);
-				    line-height: 1.7em;	
-					.cu-tag {
-						padding: 0 3.63upx;
-						text {
-							position: relative;
-							top: -2upx;
-						}
-					}
-				}
-				&:after {
-					width: 0;
-					height: 0;
-					border-bottom: 0;
-				}
+		}
+	}
+	.red-envelopes {
+		width: 100%;
+	}
+	.zaiui-goods-tab-box {
+		position: sticky;
+		padding: 2upx 0;
+		transition: all .25s;
+		z-index: 999;
+		background: #fff;
+		
+		/* #ifndef MP */
+		top: calc(var(--status-bar-height) + 101upx);
+		/* #endif */
+		
+		/* #ifdef MP */
+		top: calc(var(--status-bar-height) + 161upx);
+		/* #endif */
+		
+		.cu-tag.z {
+			top: 0px;
+			right: -32.72upx;
+			font-size: 20upx;
+			padding: 19upx 6upx;
+			transform: scale(0.8);
+		}
+	}
+	.zaiui-ad-img {
+		width: 100%;
+	}
+	.zaiui-tab-list-title {
+		.img-aau {
+			width: 101.81upx;
+			margin-top: 12.72upx;
+		}
+		.text-right {
+			.img-aau {
+				margin-right: 14.54upx;
 			}
 			}
-			.cu-list.menu-avatar>.cu-item.goods {
-				.content {
-				    width: calc(100% - 309.09upx);
-				}
-				.action {
-					position: absolute;	
-				    left: 11upx;
-					width: 127.27upx;
-					.cu-avatar {
-						width: 127.27upx;
-						height: 127.27upx;
-						margin-top: 18.18upx;
-					}
-				}
+		}
+		.text-left {
+			.img-aau {
+				margin-left: 14.54upx;
 			}
 			}
 		}
 		}
 	}
 	}
-	.zaiui-news-box.show {
+	.zaiui-add-btn-view-box {
+		position: fixed;
+		z-index: 999;
+		bottom: 181.81upx;
+		right: 27.27upx;
+		.cu-btn {
+			margin: auto;
+			width: 81.81upx;
+			height: 81.81upx;
+			font-weight: 800;
+			border-radius: 50%;
+			font-size: 36.36upx;
+			border: 9.09upx solid #fff;
+			box-shadow: 0 0 14.54upx 7.27upx #d0d0d0;
+		}
+	}
+	.zaiui-home-box {
+		display: none;
+	}
+	.zaiui-home-box.show {
 		display: block;
 		display: block;
 	}
 	}
 </style>
 </style>

+ 2 - 2
components/zaiui-common/view/sell.vue

@@ -102,14 +102,14 @@
 		background: #FAFAFA;
 		background: #FAFAFA;
 		position: relative;
 		position: relative;
 		min-height: 100vh;
 		min-height: 100vh;
-		z-index: 99999;
+		z-index: 999;
 		width: 100%;
 		width: 100%;
 		display: none;
 		display: none;
 		.zaiui-bar-view-box {
 		.zaiui-bar-view-box {
 			position: fixed;
 			position: fixed;
 			top: 0;
 			top: 0;
 			width: 100%;
 			width: 100%;
-			z-index: 999999;
+			z-index: 999;
 			background: #FAFAFA;
 			background: #FAFAFA;
 			
 			
 			/* #ifndef MP */
 			/* #ifndef MP */

+ 16 - 0
pages.json

@@ -67,6 +67,22 @@
 				"navigationBarTitleText" : "代理",
 				"navigationBarTitleText" : "代理",
 				"enablePullDownRefresh" : false
 				"enablePullDownRefresh" : false
 			}
 			}
+		},
+		{
+			"path" : "pages/order/refund",
+			"style" : 
+			{
+				"navigationBarTitleText" : "申请退款",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/goods/reviews",
+			"style" : 
+			{
+				"navigationBarTitleText" : "评价",
+				"enablePullDownRefresh" : false
+			}
 		}
 		}
 	],
 	],
 	"globalStyle": {
 	"globalStyle": {

+ 8 - 0
pages/app/index.vue

@@ -51,7 +51,13 @@
 		},
 		},
 		methods: {
 		methods: {
 			tabTap(index) {
 			tabTap(index) {
+				Object.keys(this.loadOn).forEach(key => {
+					this.loadOn[key] = false;
+				})
 				this.tabIndex = this.tabID;
 				this.tabIndex = this.tabID;
+				if (index == 0 && !this.loadOn.home) {
+					this.loadOn.home = true;
+				}
 				if (index == 1 && !this.loadOn.resource) {
 				if (index == 1 && !this.loadOn.resource) {
 					this.loadOn.resource = true;
 					this.loadOn.resource = true;
 				}
 				}
@@ -75,6 +81,8 @@
 				if (index == 4) {
 				if (index == 4) {
 					_tool.setBarColor(false);
 					_tool.setBarColor(false);
 				}
 				}
+				
+				console.log(this.tabID, this.loadOn)
 				uni.pageScrollTo({
 				uni.pageScrollTo({
 				    scrollTop: 0,
 				    scrollTop: 0,
 				    duration: 0
 				    duration: 0

+ 42 - 33
pages/goods/goods.vue

@@ -25,7 +25,7 @@
 		
 		
 		<!--限时秒杀-->
 		<!--限时秒杀-->
 		<view class="zaiui-limited-seckill-box">
 		<view class="zaiui-limited-seckill-box">
-			<view class="zaiui-time-left">
+			<view class="zaiui-time-left" style="align-items: baseline;">
 				<text class="text-price text-xxl">{{info.price ? info.price.value : '0'}}</text>
 				<text class="text-price text-xxl">{{info.price ? info.price.value : '0'}}</text>
 				<view class="text-xs zaiui-cost-price-num price-4">
 				<view class="text-xs zaiui-cost-price-num price-4">
 					<view class="text-through">原价{{info.price ? info.price.original : 0}}</view>
 					<view class="text-through">原价{{info.price ? info.price.original : 0}}</view>
@@ -149,46 +149,36 @@
 		</view>
 		</view>
 		
 		
 		<!--评论-->
 		<!--评论-->
-		<!-- <view class="margin-top bg-white zaiui-comment-view-box">
+		<view class="margin-top bg-white zaiui-comment-view-box" v-if="reviewInfo.total">
 			<view class="cu-bar bg-white">
 			<view class="cu-bar bg-white">
 				<view class="action">
 				<view class="action">
-					<text class="text-black text-lg">评价(3699)</text>
+					<text class="text-black text-lg">评价({{reviewInfo.total}})</text>
 				</view>
 				</view>
 				<view class="action">
 				<view class="action">
-					<view class="text-sm">
-						<text class="margin-right-xs">好评率</text>
-						<text class="text-black text-lg">97%</text>
+					<navigator :url="`/pages/goods/reviews?id=${goodsId}`" class="text-sm" >
+						<text class="margin-right-xs">查看全部</text>
+						<!-- <text class="text-black text-lg">97%</text> -->
 						<text class="cuIcon-right icon margin-left-xs"/>
 						<text class="cuIcon-right icon margin-left-xs"/>
-					</view>
+					</navigator>
 				</view>
 				</view>
 			</view>
 			</view>
 			<view class="zaiui-border-view"/>
 			<view class="zaiui-border-view"/>
-			<view class="zaiui-view-box">
-				<view class="flex flex-wrap text-sm">
-					<view class="basis-1">
-						<view class="cu-avatar sm round" style="background-image:url(/static/images/avatar/1.jpg)"/>
-					</view>
-					<view class="basis-9 text-sm">
-						<view>仔仔</view>
-						<view class="margin-top-xs">X真的是我觉得性价比最高的机器了,大小合适,全面屏操作流畅,灰色也很漂亮,超喜欢</view>
-						<view class="text-gray margin-top-sm">iPhone X 64G深空灰色</view>
-					</view>
-				</view>
-			</view>
-			<view class="zaiui-border-view"/>
-			<view class="zaiui-view-box">
-				<view class="flex flex-wrap text-sm">
-					<view class="basis-1">
-						<view class="cu-avatar sm round" style="background-image:url(/static/images/avatar/2.jpg)"/>
-					</view>
-					<view class="basis-9 text-sm">
-						<view>仔仔</view>
-						<view class="margin-top-xs">X真的是我觉得性价比最高的机器了,大小合适,全面屏操作流畅,灰色也很漂亮,超喜欢</view>
-						<view class="text-gray margin-top-sm">iPhone X 64G深空灰色</view>
+			<block v-for="(item, index) in reviewInfo.list">
+				<view class="zaiui-view-box" :key="item.id">
+					<view class="flex flex-wrap text-sm">
+						<view class="basis-1">
+							<view class="cu-avatar sm round" :style="`background-image:url(${item.user.avatar || '/static/images/avatar/1.jpg'})`"/>
+						</view>
+						<view class="basis-9 text-sm">
+							<view>{{item.user.name}}</view>
+							<view class="margin-top-xs">{{item.content}}</view>
+							<view class="text-gray margin-top-sm">{{item.cdate_str}}</view>
+						</view>
 					</view>
 					</view>
 				</view>
 				</view>
-			</view>
-		</view> -->
+				<view class="zaiui-border-view" v-if="index != 1"/>
+			</block>
+		</view>
 		
 		
 		<!--杂项信息-->
 		<!--杂项信息-->
 		<!-- <view class="margin-top bg-white zaiui-view-box zaiui-goods-info-view-box"> -->
 		<!-- <view class="margin-top bg-white zaiui-view-box zaiui-goods-info-view-box"> -->
@@ -486,7 +476,8 @@
 				skuInfo: {},
 				skuInfo: {},
 				selectedSku: '',
 				selectedSku: '',
 				cartInfo: {},
 				cartInfo: {},
-				isFavor: false
+				isFavor: false,
+				reviewInfo: {}
 			}
 			}
 		},
 		},
 		onLoad(options) {
 		onLoad(options) {
@@ -495,6 +486,7 @@
 			// this.goodsList = _goods_data.goodsList();
 			// this.goodsList = _goods_data.goodsList();
 			this.loadInfo()
 			this.loadInfo()
 			this.loadSku()
 			this.loadSku()
+			this.loadReviewList()
 			if(this.userInfo.t) {
 			if(this.userInfo.t) {
 				this.loadCartList()
 				this.loadCartList()
 			}
 			}
@@ -657,7 +649,24 @@
 						}
 						}
 					}
 					}
 				})
 				})
-			}
+			},
+			loadReviewList() {
+				this.reqByuser({
+					url: '?l=resource.getReviewList', 
+					data: {
+						type: 3,
+						type_id: this.goodsId,
+						num: 2
+					},
+					success: res => {
+						if(res.data.status == 1) {
+							this.reviewInfo = res.data.data
+						}else {
+							this.error = res.data.msg
+						}
+					}
+				})
+			},
 		}
 		}
 	}
 	}
 </script>
 </script>

+ 150 - 0
pages/goods/reviews.vue

@@ -0,0 +1,150 @@
+<template>
+	<view>
+		<!--标题栏-->
+		<bar-title bgColor='bg-white' title="商品评价">
+			<block slot="content">商品评价</block>
+			<block slot="right">
+				
+			</block>
+		</bar-title>
+		
+		<view class="bg-white padding-sm zaiui-goods-info-view margin-bottom" v-if="info.id">
+			<view class="cu-avatar lg" :style="[{backgroundImage:'url('+ info.pic[0] +')'}]"/>
+			<view class="goods-info-view">
+				<view class="text-cut text-black text-lg">{{info.name}}</view>
+				<!-- <view class="text-cut text-gray">{{info.sku_name}}</view> -->
+			</view>
+		</view>
+		
+		<!--评论-->
+		<view class="margin-top bg-white zaiui-comment-view-box" v-if="total">
+			<view class="zaiui-border-view"/>
+			<block v-for="(item, index) in reviewList">
+				<view class="zaiui-view-box" :key="item.id">
+					<view class="flex flex-wrap text-sm">
+						<view class="basis-1">
+							<view class="cu-avatar sm round" :style="`background-image:url(${item.user.avatar || '/static/images/avatar/1.jpg'})`"/>
+						</view>
+						<view class="basis-9 text-sm">
+							<view>{{item.user.name}}</view>
+							<view class="margin-top-xs">{{item.content}}</view>
+							<view class="text-gray margin-top-sm">{{item.cdate_str}}</view>
+						</view>
+					</view>
+				</view>
+				<view class="zaiui-border-view" v-if="index != 1"/>
+			</block>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import barTitle from '@/components/zaiui-common/basics/bar-title';
+	
+	import _goods_data from '@/static/zaiui/data/goods.js';	//虚拟数据
+	import _tool from '@/static/zaiui/util/tools.js';	//工具函数
+	export default {
+		components: {
+			barTitle,
+		},
+		data() {
+			return {
+				bannerCur: 0, bannerList: [], bottomModal: false, modalTitle: '', modalType: 'promotion', selectType: '',
+				goodsId: '',
+				info: {},
+				reviewList: [],
+				total: 0,
+				num: 10,
+				pg: 1,
+				hasNext: true
+			}
+		},
+		onLoad(options) {
+			this.goodsId = options.id;
+			this.loadInfo()
+			this.loadReviewList()
+		},
+		onReady() {
+			_tool.setBarColor(true);
+			uni.pageScrollTo({
+			    scrollTop: 0,
+			    duration: 0
+			});
+		},
+		computed: {
+		},
+		methods: {
+			loadInfo() {
+				this.req({
+					url: '?l=resource.view', 
+					data: {type: 3, type_id: this.goodsId},
+					success: res => {
+						if(res.data.status == 1) {
+							this.info = res.data.data.info;
+						}else {
+							uni.showToast({
+								icon: 'error',
+								title: res.data.msg
+							})
+						}
+					}
+				})
+			},
+			loadReviewList() {
+				this.reqByuser({
+					url: '?l=resource.getReviewList', 
+					data: {
+						type: 3,
+						type_id: this.goodsId,
+						num: this.num,
+						pg: this.pg
+					},
+					success: res => {
+						if(res.data.status == 1) {
+							this.total = res.data.data.total;
+							this.reviewList = this.pg == 1 ? res.data.data.list : this.reviewList.concat(res.data.data.list)
+							this.hasNext = res.data.page.status
+						}else {
+							uni.showToast({
+								icon: 'error',
+								title: res.data.msg
+							})
+						}
+					}
+				})
+			},
+		},
+		onReachBottom() {
+			if(this.hasNext) {
+				this.pg++;
+				this.loadReviewList()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	/* #ifdef APP-PLUS */
+		@import "../../static/colorui/main.css";
+		@import "../../static/colorui/icon.css";
+		@import "../../static/zaiui/style/app.scss";
+	/* #endif */
+	@import "../../static/zaiui/style/goods.scss";
+	
+	
+</style>
+<style scoped lang="scss">
+	.zaiui-goods-info-view {
+		position: relative;
+		.cu-avatar {
+			position: absolute;
+		}
+		.goods-info-view {
+			position: relative;
+			padding-left: 112.72upx;
+			height: 94.54upx;
+			line-height: 1.7;
+		}
+	}
+</style>

+ 76 - 13
pages/order/appraise.vue

@@ -6,24 +6,31 @@
 		</bar-title>
 		</bar-title>
 		
 		
 		<!--提示栏-->
 		<!--提示栏-->
-		<view class="bg-red light text-sm zaiui-tip-view">
+		<!-- <view class="bg-red light text-sm zaiui-tip-view">
 			<view class="text-cut content">对方做出评价前,不会看到您的评价内容哦~</view>
 			<view class="text-cut content">对方做出评价前,不会看到您的评价内容哦~</view>
 			<text class="cuIcon-close icon"/>
 			<text class="cuIcon-close icon"/>
+		</view> -->
+		<view class="cu-form-group margin-top" v-if="info.detail && info.detail.length > 1">
+			<view class="title">选择商品</view>
+			<picker @change="expressPickerChange" :value="goodsIndex" :range="info.detail" range-key="name">
+				<view class="picker">
+					{{info.detail[goodsIndex] && info.detail[goodsIndex].name}}
+				</view>
+			</picker>
 		</view>
 		</view>
-		
 		<!--商品信息-->
 		<!--商品信息-->
 		<view class="bg-white padding-sm zaiui-goods-info-view margin-bottom">
 		<view class="bg-white padding-sm zaiui-goods-info-view margin-bottom">
-			<view class="cu-avatar round lg" :style="[{backgroundImage:'url('+ bg_img +')'}]"/>
+			<view class="cu-avatar round lg" :style="[{backgroundImage:'url('+ curGoods.pic +')'}]"/>
 			<view class="goods-info-view">
 			<view class="goods-info-view">
-				<view class="text-cut text-black text-lg">仔仔科技运营部</view>
-				<view class="text-cut text-gray">本次交易物品 其它CDK</view>
+				<view class="text-cut text-black text-lg">{{curGoods.name}}</view>
+				<view class="text-cut text-gray">{{curGoods.sku_name}}</view>
 			</view>
 			</view>
 		</view>
 		</view>
 		
 		
 		<!--信息-->
 		<!--信息-->
 		<view class="bg-white zaiui-content-view">
 		<view class="bg-white zaiui-content-view">
 			<!--评分-->
 			<!--评分-->
-			<view class="zaiui-score-view">
+			<!-- <view class="zaiui-score-view">
 				<view class="item-score">
 				<view class="item-score">
 					<view class="text-cut text-view">再次与TA交易</view>
 					<view class="text-cut text-view">再次与TA交易</view>
 					<view class="score-img-view">
 					<view class="score-img-view">
@@ -79,12 +86,12 @@
 				</view>
 				</view>
 			</view>
 			</view>
 			
 			
-			
+			 -->
 			<!--评价内容-->
 			<!--评价内容-->
 			<view class="cu-form-group solid-top">
 			<view class="cu-form-group solid-top">
-				<textarea placeholder="随手评价,造福你我他"/>
+				<textarea placeholder="随手评价,造福你我他" v-model="content"/>
 			</view>
 			</view>
-			<view class="zaiui-img-view">
+			<!-- <view class="zaiui-img-view">
 				<view class="img-grid-view">
 				<view class="img-grid-view">
 					<view class="grid col-5">
 					<view class="grid col-5">
 						<block v-for="(item,index) in imgList" :key="index">
 						<block v-for="(item,index) in imgList" :key="index">
@@ -100,13 +107,13 @@
 						</view>
 						</view>
 					</view>	
 					</view>	
 				</view>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		</view>
 		
 		
 		<!--按钮-->
 		<!--按钮-->
 		<view class="bg-white zaiui-btn-view zaiui-foot-padding-bottom">
 		<view class="bg-white zaiui-btn-view zaiui-foot-padding-bottom">
 			<view class="flex flex-direction">
 			<view class="flex flex-direction">
-				<button class="cu-btn bg-red">提交评价</button>
+				<button class="cu-btn bg-red" @click="submit">提交评价</button>
 			</view>
 			</view>
 		</view>
 		</view>
 		
 		
@@ -122,11 +129,22 @@
 		},
 		},
 		data() {
 		data() {
 			return {
 			return {
+				id: '',
+				info: {},
 				bg_img: '/static/images/home/goods/1.png', imgList: [],
 				bg_img: '/static/images/home/goods/1.png', imgList: [],
+				content: '',
+				goodsIndex: 0
 			}
 			}
 		},
 		},
-		onLoad() {
-			
+		computed: {
+			curGoods() {
+				if(!this.info.detail) return {}
+				return this.info.detail && this.info.detail.length > 1 ? this.info.detail[this.goodsIndex] : this.info.detail[0]
+			}
+		},
+		onLoad(options) {
+			this.id = options.id;
+			this.loadInfo()
 		},
 		},
 		onReady() {
 		onReady() {
 			_tool.setBarColor(true);
 			_tool.setBarColor(true);
@@ -136,6 +154,51 @@
 			});
 			});
 		},
 		},
 		methods: {
 		methods: {
+			loadInfo() {
+				this.reqByuser({
+					url: '?l=resource.getOrderView', 
+					data: {
+						type: 3,
+						id: this.id
+					},
+					success: res => {
+						if(res.data.status == 1) {
+							this.info = res.data.data.info;
+						}else {
+							uni.showToast({
+								icon: 'error',
+								title: res.data.msg
+							})
+						}
+					}
+				})
+			},
+			submit() {
+				this.reqByuser({
+					url: '?l=review.up', 
+					data: {
+						type: 3,
+						type_id: this.curGoods.id,
+						content: this.content
+					},
+					success: res => {
+						if(res.data.status == 1) {
+							uni.showToast({
+								icon: 'success',
+								title: '提交成功'
+							})
+							setTimeout(() => {
+								uni.navigateBack()
+							}, 1000)
+						}else {
+							uni.showToast({
+								icon: 'error',
+								title: res.data.msg
+							})
+						}
+					}
+				})
+			},
 			ChooseImage() {
 			ChooseImage() {
 				uni.chooseImage({
 				uni.chooseImage({
 					count: 4,
 					count: 4,

+ 221 - 107
pages/order/details.vue

@@ -6,10 +6,11 @@
 		</bar-title>
 		</bar-title>
 		
 		
 		<!--步骤条区域-->
 		<!--步骤条区域-->
-		<view class="bg-white padding solid-top">
+		<!-- 有退款 -->
+		<view class="bg-white padding solid-top" v-if="info.refund_status == 1">
 			<!--步骤条-->
 			<!--步骤条-->
 			<view class="cu-steps">
 			<view class="cu-steps">
-				<block v-for="(item,index) in info.status_list" :key="index">
+				<block v-for="(item,index) in info.refund_status_list" :key="index">
 					<view class="cu-item" :class="item.selected?'select':''">
 					<view class="cu-item" :class="item.selected?'select':''">
 						<view class="icon-view" v-if="!item.selected">
 						<view class="icon-view" v-if="!item.selected">
 							<text class="text-red" :class="'cuIcon-' + iconlist[index-1]"></text>
 							<text class="text-red" :class="'cuIcon-' + iconlist[index-1]"></text>
@@ -25,20 +26,44 @@
 			
 			
 			<!--提示-->
 			<!--提示-->
 			<view class="text-sm text-center margin-top">
 			<view class="text-sm text-center margin-top">
+				<view class="text-black">{{info.refund.desc}}</view>
+			</view>
+		</view>
+		
+		<!-- 无退款 -->
+		<view class="bg-white padding solid-top" v-if="info.status !== 9">
+			<!--步骤条-->
+			<view class="cu-steps">
+				<block v-for="(item,index) in info.status_list" :key="index">
+					<view class="cu-item" :class="item.selected?'select':''">
+						<view class="icon-view" v-if="!item.selected">
+							<text class="text-red" :class="'cuIcon-' + iconlist[index-1]"></text>
+						</view>
+						<view class="bg-red icon-view" v-else>
+							<text :class="'cuIcon-' + iconlist[index-1]"></text>
+						</view>
+						<view class="text-sm text-black" v-if="!item.selected">{{item.name}}</view>
+						<view class="text-sm text-black" v-else>{{item.name}}</view>
+					</view>
+				</block>
+			</view>
+			
+			<!--提示-->
+			<view class="text-sm text-center margin-top" v-if="info.status !== 5">
 				<view class="text-black">{{info.status_msg}}</view>
 				<view class="text-black">{{info.status_msg}}</view>
 				<view class="text-black" v-if="info.status == 4">
 				<view class="text-black" v-if="info.status == 4">
 					<text class="text-red">9天23小时57分</text>
 					<text class="text-red">9天23小时57分</text>
 					<text>后将自动确认收货</text>
 					<text>后将自动确认收货</text>
 				</view>
 				</view>
 				<view class="text-black" v-if="info.status == 1">
 				<view class="text-black" v-if="info.status == 1">
-					<text class="text-red">14分</text>
+					<text class="text-red">{{info.time}}分</text>
 					<text>后未支付,订单将自动关闭。</text>
 					<text>后未支付,订单将自动关闭。</text>
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
 		
 		
 		<!--状态图标-->
 		<!--状态图标-->
-		<view class="bg-white padding solid-top text-center zaiui-status-img-view" v-if="basics == 4 && !cancel">
+		<view class="bg-white padding solid-top text-center zaiui-status-img-view" v-if="info.status == 5">
 			<view class="are-img-view" @tap="cancel = true">
 			<view class="are-img-view" @tap="cancel = true">
 				<image class="are-img" src="/static/zaiui/img/are.png" mode="widthFix"/>
 				<image class="are-img" src="/static/zaiui/img/are.png" mode="widthFix"/>
 			</view>
 			</view>
@@ -46,7 +71,7 @@
 		</view>
 		</view>
 		
 		
 		<!--状态图标-->
 		<!--状态图标-->
-		<view class="bg-white padding solid-top text-center zaiui-status-img-view" v-if="basics == 4 && cancel">
+		<view class="bg-white padding solid-top text-center zaiui-status-img-view" v-if="info.status == 9">
 			<view class="are-img-view" @tap="cancel = false">
 			<view class="are-img-view" @tap="cancel = false">
 				<image class="are-img" src="/static/zaiui/img/arg.png" mode="widthFix"/>
 				<image class="are-img" src="/static/zaiui/img/arg.png" mode="widthFix"/>
 			</view>
 			</view>
@@ -149,13 +174,13 @@
 					</view>
 					</view>
 				</view> -->
 				</view> -->
 				<view class="text-black text-bold title-right-view">
 				<view class="text-black text-bold title-right-view">
-					<text class="margin-right-xs">付款:</text>
+					<text class="margin-right-xs">付款:</text>
 					<text>{{info.cash}}</text>
 					<text>{{info.cash}}</text>
 				</view>
 				</view>
 				
 				
-				<view class="solid-line"></view>
+				<!-- <view class="solid-line"></view> -->
 				
 				
-				<view class="text-center text-black">联系客服</view>
+				<!-- <view class="text-center text-black">联系客服</view> -->
 			</view>
 			</view>
 		</view>
 		</view>
 		
 		
@@ -168,7 +193,7 @@
 					<view class="title">订单编号</view>
 					<view class="title">订单编号</view>
 					<view class="text-right">
 					<view class="text-right">
 						<text class="margin-right-xs">{{info.order_num}}</text>
 						<text class="margin-right-xs">{{info.order_num}}</text>
-						<button class="cu-btn sm line-black">复制</button>
+						<button class="cu-btn sm line-black" @click="copy">复制</button>
 					</view>
 					</view>
 				</view>
 				</view>
 				<view class="text-black title-view">
 				<view class="text-black title-view">
@@ -183,28 +208,28 @@
 						<text>{{info.cdate_str}}</text>
 						<text>{{info.cdate_str}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="text-black title-view" v-if="basics > 0">
+				<view class="text-black title-view" v-if="info.pdate_str">
 					<view class="title">支付时间</view>
 					<view class="title">支付时间</view>
 					<view class="text-right">
 					<view class="text-right">
-						<text>2020-04-02 14:52:03</text>
+						<text>{{info.pdate_str}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="text-black title-view" v-if="basics > 1">
+				<view class="text-black title-view" v-if="info.ddate_str">
 					<view class="title">发货时间</view>
 					<view class="title">发货时间</view>
 					<view class="text-right">
 					<view class="text-right">
-						<text>2020-04-02 14:52:03</text>
+						<text>{{info.ddate_str}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="text-black title-view" v-if="basics > 2">
-					<view class="title">验机时间</view>
+				<view class="text-black title-view" v-if="info.qdate_str">
+					<view class="title">签收时间</view>
 					<view class="text-right">
 					<view class="text-right">
-						<text>2020-04-02 14:52:03</text>
+						<text>{{info.qdate_str}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="text-black title-view" v-if="basics > 3">
+				<view class="text-black title-view" v-if="info.fdate_str">
 					<view class="title">完成时间</view>
 					<view class="title">完成时间</view>
 					<view class="text-right">
 					<view class="text-right">
-						<text>2020-04-02 14:52:03</text>
+						<text>{{info.fdate_str}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
 			</view>
 			</view>
@@ -288,90 +313,63 @@
 		<!--底部-->
 		<!--底部-->
 		<view class="foot-hight-view"/>
 		<view class="foot-hight-view"/>
 		
 		
-		<view class="bg-white zaiui-footer-fixed zaiui-foot-padding-bottom" v-if="info.status == 1">
-			<!-- <button class="cu-btn bg-orange sm" @tap="nextTap">测试下一步</button> -->
-			<button class="cu-btn line-black radius">取消订单</button>
-			<button class="cu-btn bg-red">确认支付</button>
-		</view>
-		
-		<view class="bg-white zaiui-footer-fixed zaiui-foot-padding-bottom" v-if="info.status == 2">
-			<!-- <button class="cu-btn bg-orange sm" @tap="nextTap">测试下一步</button> -->
-			<button class="cu-btn line-black radius">申请退款</button>
-			<button class="cu-btn bg-red">提醒发货</button>
-		</view>
-		
-		<view class="bg-white zaiui-footer-fixed zaiui-foot-padding-bottom" v-if="info.status == 3">
-			<!-- <button class="cu-btn bg-orange sm" @tap="nextTap">测试下一步</button> -->
-			<button class="cu-btn line-black radius">申请退款</button>
-		</view>
-		
-		<view class="bg-white zaiui-footer-fixed zaiui-foot-padding-bottom" v-if="info.status == 4">
-			<!-- <button class="cu-btn bg-orange sm" @tap="nextTap">测试下一步</button> -->
-			<button class="cu-btn line-black radius">申请退款</button>
-			<button class="cu-btn bg-red" @tap="confirmReceipt">确认收货</button>
-		</view>
-		
-		<view class="bg-white zaiui-footer-fixed zaiui-foot-padding-bottom" v-if="info.status == 5">
-			<!-- <button class="cu-btn bg-orange sm" @tap="nextTap">测试第一步</button> -->
-			<button class="cu-btn line-black radius" @tap="appraiseTap">发表评价</button>
-			<button class="cu-btn bg-red">查看钱款去向</button>
-		</view>
+		<block v-if="info.refund_status == 1">
+			<view class="bg-white zaiui-footer-fixed zaiui-foot-padding-bottom" v-if="info.refund.status == 2">
+				<!-- <button class="cu-btn bg-orange sm" @tap="nextTap">测试下一步</button> -->
+				<button class="cu-btn line-black radius" @click="refundGoods">退货发货</button>
+			</view>
+			
+		</block>
+		<block v-else>
+			<view class="bg-white zaiui-footer-fixed zaiui-foot-padding-bottom" v-if="info.status == 1">
+				<!-- <button class="cu-btn bg-orange sm" @tap="nextTap">测试下一步</button> -->
+				<button class="cu-btn line-black radius" @click="cancelOrder">取消订单</button>
+				<button class="cu-btn bg-red">确认支付</button>
+			</view>
+			
+			<view class="bg-white zaiui-footer-fixed zaiui-foot-padding-bottom" v-if="info.status == 2">
+				<!-- <button class="cu-btn bg-orange sm" @tap="nextTap">测试下一步</button> -->
+				<button class="cu-btn line-black radius" @click="toRefund">申请退款</button>
+				<!-- <button class="cu-btn bg-red">提醒发货</button> -->
+			</view>
+			
+			<view class="bg-white zaiui-footer-fixed zaiui-foot-padding-bottom" v-if="info.status == 3">
+				<!-- <button class="cu-btn bg-orange sm" @tap="nextTap">测试下一步</button> -->
+				<button class="cu-btn line-black radius" @click="toRefund">申请退款</button>
+			</view>
+			
+			<view class="bg-white zaiui-footer-fixed zaiui-foot-padding-bottom" v-if="info.status == 4">
+				<!-- <button class="cu-btn bg-orange sm" @tap="nextTap">测试下一步</button> -->
+				<button class="cu-btn line-black radius" @click="toRefund">申请退款</button>
+				<button class="cu-btn bg-red" @tap="confirmReceipt">确认收货</button>
+			</view>
+			
+			<view class="bg-white zaiui-footer-fixed zaiui-foot-padding-bottom" v-if="info.status == 5">
+				<!-- <button class="cu-btn bg-orange sm" @tap="nextTap">测试第一步</button> -->
+				<button class="cu-btn line-black radius" @tap="appraiseTap">发表评价</button>
+				<!-- <button class="cu-btn bg-red">查看钱款去向</button> -->
+			</view>
+		</block>
 		
 		
 		<!--弹出框-->
 		<!--弹出框-->
 		<view class="cu-modal bottom-modal" :class="bottomModal?'show':''">
 		<view class="cu-modal bottom-modal" :class="bottomModal?'show':''">
 			<view class="cu-dialog">
 			<view class="cu-dialog">
-				<view class="cu-bar bg-white solid-bottom">
-					<view class="text-black text-center title">手机安全验证</view>
-					<text class="text-gray cuIcon-close close" @tap="closeModalTap"></text>
-				</view>
-				<view class="bg-white modal-view">
-					<view class="content">
-						<view class="tel-btn-view">
-							<view class="text-black tel-view">验证码已发至:138****8000</view>
-							<button class="cu-btn sm" @tap="getCodeKey" v-if="btnKey">获取</button>
-							<button class="cu-btn sm" v-else>56s</button>
-						</view>
-						<view class="text-sm text-black margin-tb">
-							<text>确认收货后,交易将结束。您之前付款到平台的</text>
-							<text class="text-red">¥1.00</text>
-							<text>,将会打给卖家。</text>
-						</view>
-						<view class="text-sm text-gray margin-bottom">
-							提醒:确认收货后钱款将脱离平台,届时平台无法保障您的钱款安全,请务必谨慎点击确认收货,谨防诈骗。
-						</view>
-						<view class="code-view">
-							<text class="code" v-if="!codeKey[0]"> — </text>
-							<text class="code" v-else> {{codeKey[0]}} </text>
-							
-							<text class="code" v-if="!codeKey[1]"> — </text>
-							<text class="code" v-else> {{codeKey[1]}} </text>
-							
-							<text class="code" v-if="!codeKey[2]"> — </text>
-							<text class="code" v-else> {{codeKey[2]}} </text>
-							
-							<text class="code" v-if="!codeKey[3]"> — </text>
-							<text class="code" v-else> {{codeKey[3]}} </text>
-						</view>
-					</view>
-					
-					<!--数字键盘-->
-					<view class="num-lock-view">
-						<view class="cu-list grid col-3 solid-top">
-							<block v-for="(item,index) in 9" :key="index">
-								<view class="cu-item" @tap="codeKeyTap(item)">
-									<text class="text-black num">{{item}}</text>
-								</view>
-							</block>
-							<view class="cu-item">
-								<text class="text-black num"></text>
-							</view>
-							<view class="cu-item" @tap="codeKeyTap(0)">
-								<text class="text-black num">0</text>
-							</view>
-							<view class="cu-item" @tap="codeKeyDelTap">
-								<text class="cuIcon-close close"></text>
-							</view>
+				<view class="cu-form-group margin-top">
+					<view class="title">申请类型</view>
+					<picker @change="expressPickerChange" :value="expressIndex" :range="expressList" range-key="name">
+						<view class="picker">
+							{{expressList[expressIndex] && expressList[expressIndex].name}}
 						</view>
 						</view>
+					</picker>
+				</view>
+				<view class="cu-form-group">
+					<view class="title">快递单号</view>
+					<input placeholder="请输入快递单号" v-model="number"></input>
+				</view>
+				
+				<view class="zaiui-footer" style="padding: 20upx;">
+					<view class="flex flex-direction">
+						<button class="cu-btn bg-red lg" @click="submitExpress">确定</button>
 					</view>
 					</view>
 				</view>
 				</view>
 			</view>
 			</view>
@@ -392,12 +390,13 @@
 				id: '',
 				id: '',
 				basics: 0, bg_img: '/static/images/home/goods/1.png', avatar: '/static/images/avatar/1.jpg', cancel: false,
 				basics: 0, bg_img: '/static/images/home/goods/1.png', avatar: '/static/images/avatar/1.jpg', cancel: false,
 				iconlist: ['cartfill','card','deliver_fill','formfill','presentfill'],
 				iconlist: ['cartfill','card','deliver_fill','formfill','presentfill'],
-				basicsList: [
-					{cuIcon: 'cartfill',name: '未拍下', name_s: '已拍下'}, {cuIcon: 'card',name: '待付款', name_s: '已拍下'},
-					{cuIcon: 'deliver_fill',name: '待发货', name_s: '已发货'}, {cuIcon: 'formfill',name: '待验机', name_s: '已验机'},
-					{cuIcon: 'presentfill',name: '待收货', name_s: '已收货'}
-				], bottomModal: false, codeKey: [], btnKey: true,
-				info: {}
+				bottomModal: false, 
+				codeKey: [], 
+				btnKey: true,
+				info: {},
+				expressList: [],
+				expressIndex: 0,
+				number: ''
 			}
 			}
 		},
 		},
 		onLoad(options) {
 		onLoad(options) {
@@ -412,6 +411,62 @@
 			});
 			});
 		},
 		},
 		methods: {
 		methods: {
+			copy() {
+				uni.setClipboardData({
+					data: this.info.order_num
+				})
+			},
+			expressPickerChange(e) {
+				this.expressIndex = e.detail.value
+			},
+			refundGoods() {
+				this.loadExpress()
+				this.bottomModal = true
+			},
+			loadExpress() {
+				this.reqByuser({
+					url: '?l=resource.express', 
+					data: {
+						type: 3,
+						id: this.id
+					},
+					success: res => {
+						if(res.data.status == 1) {
+							this.expressList = res.data.data.express;
+						}else {
+							uni.showToast({
+								icon: 'error',
+								title: res.data.msg
+							})
+						}
+					}
+				})
+			},
+			submitExpress() {
+				this.reqByuser({
+					url: '?l=resource.expressAct', 
+					data: {
+						type: 3,
+						id: this.id,
+						number: this.number,
+						express_id: this.expressList[this.expressIndex].id
+					},
+					success: res => {
+						if(res.data.status == 1) {
+							uni.showToast({
+								icon: 'success',
+								title: '提交成功'
+							})
+							this.bottomModal = false
+						}else {
+							uni.showToast({
+								icon: 'error',
+								title: res.data.msg
+							})
+						}
+					}
+				})
+			},
 			loadInfo() {
 			loadInfo() {
 				this.reqByuser({
 				this.reqByuser({
 					url: '?l=resource.getOrderView', 
 					url: '?l=resource.getOrderView', 
@@ -431,8 +486,40 @@
 					}
 					}
 				})
 				})
 			},
 			},
-			nextTap() {
-				this.basics = this.basics == this.basicsList.length - 1 ? 0 : this.basics + 1;
+			cancelOrder() {
+				uni.showModal({
+				    title: '提醒',
+				    content: '您确认要取消订单吗',
+					confirmText: '确认',
+					class: 'zaiui-modal',
+				    success: res => {
+				        if (res.confirm) {
+							this.reqByuser({
+								url: '?l=resource.upOrderCancel', 
+								data: {
+									type: 3,
+									id: this.id
+								},
+								success: res => {
+									if(res.data.status == 1) {
+										uni.showToast({
+											icon: 'success',
+											title: '提交成功'
+										})
+										this.loadInfo()
+									}else {
+										uni.showToast({
+											icon: 'error',
+											title: res.data.msg
+										})
+									}
+								}
+							})
+							
+							
+				        }
+				    }
+				});
 			},
 			},
 			confirmReceipt() {
 			confirmReceipt() {
 				uni.showModal({
 				uni.showModal({
@@ -443,7 +530,29 @@
 					class: 'zaiui-modal',
 					class: 'zaiui-modal',
 				    success: res => {
 				    success: res => {
 				        if (res.confirm) {
 				        if (res.confirm) {
-							this.bottomModal = true;
+							this.reqByuser({
+								url: '?l=resource.upOrderFinish', 
+								data: {
+									type: 3,
+									id: this.id
+								},
+								success: res => {
+									if(res.data.status == 1) {
+										uni.showToast({
+											icon: 'success',
+											title: '提交成功'
+										})
+										this.loadInfo()
+									}else {
+										uni.showToast({
+											icon: 'error',
+											title: res.data.msg
+										})
+									}
+								}
+							})
+							
+							
 				        }
 				        }
 				    }
 				    }
 				});
 				});
@@ -464,8 +573,13 @@
 			},
 			},
 			appraiseTap() {
 			appraiseTap() {
 				uni.navigateTo({
 				uni.navigateTo({
-					url: "/pages/order/appraise"
+					url: "/pages/order/appraise?id="+this.id
 				});
 				});
+			},
+			toRefund() {
+				uni.navigateTo({
+					url: '/pages/order/refund?id='+this.id
+				})
 			}
 			}
 		}
 		}
 	}
 	}

+ 2 - 2
pages/order/list.vue

@@ -1,8 +1,8 @@
 <template>
 <template>
 	<view>
 	<view>
 		<!--标题栏-->
 		<!--标题栏-->
-		<bar-title bgColor='bg-white' @rightTap="barEditTap" title="我的订单">
-			<block slot="content">我的订单</block>
+		<bar-title bgColor='bg-white' @rightTap="barEditTap" title="商品订单">
+			<block slot="content">商品订单</block>
 			<!-- <block slot="right">
 			<!-- <block slot="right">
 				<text v-if="goods_checked">完成</text>
 				<text v-if="goods_checked">完成</text>
 				<text v-else>编辑</text>
 				<text v-else>编辑</text>

+ 162 - 0
pages/order/refund.vue

@@ -0,0 +1,162 @@
+<template>
+	<view>
+		<!--标题栏-->
+		<bar-title bgColor="bg-white" isBack title="申请退款">
+			<block slot="content">申请退款</block>
+		</bar-title>
+		
+		<view class="cu-form-group margin-top">
+			<view class="title">申请类型</view>
+			<picker @change="typePickerChange" :value="typeIndex" :range="type" range-key="name">
+				<view class="picker">
+					{{type[typeIndex] && type[typeIndex].name}}
+				</view>
+			</picker>
+		</view>
+		<view class="cu-form-group">
+			<view class="title">申请原因</view>
+			<picker @change="descPickerChange" :value="descIndex" :range="desc_type" range-key="name">
+				<view class="picker">
+					{{desc_type[descIndex] && desc_type[descIndex].name}}
+				</view>
+			</picker>
+		</view>
+		<!-- <view class="cu-form-group">
+			<view class="title">退货数量</view>
+			<input placeholder="请输入新昵称" v-model="name"></input>
+		</view> -->
+		<view class="cu-form-group">
+			<view class="title">申请金额</view>
+			¥<input placeholder="请输入退款金额" v-model="cash"></input>
+		</view>
+		<view class="cu-form-group">
+			<view class="title">申请说明</view>
+		</view>
+		<view class="cu-form-group" style="position: relative;">
+			<textarea v-model="desc" placeholder="优秀的用户会这么写。例如:我是XX熊,最爱收集各种闲置物品,交朋友。在架的宝贝都可以交易,快来联系我吧!"/>
+			<text class="text-gray font-num-view">0 / 300</text>
+		</view>
+		
+		
+		<view class="bg-white zaiui-footer-fixed zaiui-foot-padding-bottom" style="padding: 20upx;">
+			<view class="flex flex-direction">
+				<button class="cu-btn bg-red" @click="submit">提交</button>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import barTitle from '@/components/zaiui-common/basics/bar-title';
+	import _tool from '@/static/zaiui/util/tools.js';	//工具函数
+	export default {
+		components: {
+			barTitle
+		},
+		data() {
+			return {
+				id: '',
+				info: {},
+				desc_type: [],
+				type: [],
+				typeIndex: 0,
+				descIndex: 0, 
+				name: '',
+				cash: '',
+				desc: ''
+			}
+		},
+		onLoad(options) {
+			this.id = options.id;
+			this.loadInfo()
+		},
+		onReady() {
+			_tool.setBarColor(true);
+			uni.pageScrollTo({
+			    scrollTop: 0,
+			    duration: 0
+			});
+		},
+		methods: {
+			typePickerChange(e) {
+				this.typeIndex = e.detail.value
+			},
+			descPickerChange(e) {
+				this.descIndex = e.detail.value
+			},
+			loadInfo() {
+				this.reqByuser({
+					url: '?l=resource.applyRefund', 
+					data: {
+						type: 3,
+						id: this.id
+					},
+					success: res => {
+						if(res.data.status == 1) {
+							this.info = res.data.data.detail;
+							this.type = res.data.data.type;
+							this.desc_type = res.data.data.desc_type;
+							this.cash = res.data.data.cash;
+						}else {
+							uni.showToast({
+								icon: 'error',
+								title: res.data.msg
+							})
+						}
+					}
+				})
+			},
+			submit() {
+				uni.showModal({
+					title: '提示',
+					content: '确定要退款吗?',
+					success: res => {
+						if (res.confirm) {
+							this.reqByuser({
+								url: '?l=resource.applyRefundAct', 
+								data: {
+									type: 3,
+									id: this.id,
+									cash: this.cash,
+									apply_type: this.type[this.typeIndex].id,
+									desc_type: this.desc_type[this.descIndex].id,
+									desc: this.desc
+								},
+								success: res => {
+									if(res.data.status == 1) {
+										console.log(res.data.data)
+									}else {
+										uni.showToast({
+											icon: 'error',
+											title: res.data.msg
+										})
+									}
+								}
+							})
+						}
+					}
+				})
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	/* #ifdef APP-PLUS */
+		@import "../../static/colorui/main.css";
+		@import "../../static/colorui/icon.css";
+		@import "../../static/zaiui/style/app.scss";
+	/* #endif */
+	.cu-form-group {
+		textarea {
+			height: 8.6em;
+		}
+		.font-num-view {
+		    position: absolute;
+		    bottom: 9.09upx;
+		    right: 27.27upx;	
+		}
+	}
+</style>

+ 2 - 2
static/colorui/main.css

@@ -1071,7 +1071,7 @@ button.cuIcon.lg {
 	flex-direction: column;
 	flex-direction: column;
 	justify-content: center;
 	justify-content: center;
 	font-size: 28upx;
 	font-size: 28upx;
-	z-index: 9999;
+	z-index: 999;
 	line-height: 2.4em;
 	line-height: 2.4em;
 }
 }
 
 
@@ -1885,7 +1885,7 @@ button.cuIcon.lg {
 	padding-right: 150upx;
 	padding-right: 150upx;
 	/* #endif */
 	/* #endif */
 	box-shadow: 0upx 0upx 0upx;
 	box-shadow: 0upx 0upx 0upx;
-	z-index: 9999;
+	z-index: 999;
 }
 }
 
 
 .cu-custom .cu-bar .border-custom {
 .cu-custom .cu-bar .border-custom {

+ 6 - 6
static/zaiui/style/app.scss

@@ -20,7 +20,7 @@ page, .bg-page {
 }
 }
 .zaiui-footer-fixed {
 .zaiui-footer-fixed {
 	position: fixed;
 	position: fixed;
-	z-index: 999999;
+	z-index: 999;
 	width: 100%;
 	width: 100%;
 	bottom: 0;
 	bottom: 0;
 	left: 0;
 	left: 0;
@@ -111,7 +111,7 @@ page, .bg-page {
 	background: #f9f9f9;
 	background: #f9f9f9;
 }
 }
 .cu-modal {
 .cu-modal {
-	z-index: 9999999;
+	z-index: 999;
 }
 }
 
 
 .zaiui-reward-btn {
 .zaiui-reward-btn {
@@ -124,7 +124,7 @@ page, .bg-page {
     text-align: center;
     text-align: center;
     line-height: 90.9upx;
     line-height: 90.9upx;
     box-shadow: 0 0 25.45upx #cecece;
     box-shadow: 0 0 25.45upx #cecece;
-    z-index: 99999;	
+    z-index: 999;	
 }
 }
 
 
 .zaiui-bar-title-box .cu-bar .content {
 .zaiui-bar-title-box .cu-bar .content {
@@ -141,7 +141,7 @@ page, .bg-page {
 
 
 .zaiui-add-btn-view-box {
 .zaiui-add-btn-view-box {
 	position: fixed;
 	position: fixed;
-	z-index: 999999;
+	z-index: 999;
 	bottom: 181.81upx;
 	bottom: 181.81upx;
 	right: 27.27upx;
 	right: 27.27upx;
 	.cu-btn {
 	.cu-btn {
@@ -161,7 +161,7 @@ page, .bg-page {
 }
 }
 
 
 .zaiui-modal {
 .zaiui-modal {
-	z-index: 999999;
+	z-index: 999;
 }
 }
 .solid-top::after {
 .solid-top::after {
     border-top: 2upx solid rgba(0, 0, 0, 0.1);
     border-top: 2upx solid rgba(0, 0, 0, 0.1);
@@ -204,7 +204,7 @@ page, .bg-page {
 /*底部*/
 /*底部*/
 .wecanui-footer-fixed {
 .wecanui-footer-fixed {
 	position: fixed;
 	position: fixed;
-	z-index: 99999;
+	z-index: 999;
 	width: 100%;
 	width: 100%;
 	bottom: 0;
 	bottom: 0;
 	left: 0;
 	left: 0;

+ 1 - 1
static/zaiui/style/chat.scss

@@ -1,7 +1,7 @@
 .zaiui-goods-details-box {
 .zaiui-goods-details-box {
 	position: relative;
 	position: relative;
 	padding: 18.18upx;
 	padding: 18.18upx;
-	z-index: 9999;
+	z-index: 999;
 	.cu-avatar {
 	.cu-avatar {
 		position: absolute;
 		position: absolute;
 		height: 90.9upx;
 		height: 90.9upx;

+ 3 - 3
static/zaiui/style/footmark.scss

@@ -2,7 +2,7 @@
 	position: sticky;
 	position: sticky;
 	transition: all .25s;
 	transition: all .25s;
 	padding-bottom: 3.63upx;
 	padding-bottom: 3.63upx;
-	z-index: 9999;
+	z-index: 999;
 	width: 100%;
 	width: 100%;
 }
 }
 
 
@@ -116,7 +116,7 @@
 
 
 .zaiui-footer-fixed {
 .zaiui-footer-fixed {
 	box-shadow: 0 -2upx 9.09upx 0 #ececec;
 	box-shadow: 0 -2upx 9.09upx 0 #ececec;
-	z-index: 99999;
+	z-index: 999;
 	.cu-bar {
 	.cu-bar {
 		width: 100%;
 		width: 100%;
 		.checked-view {
 		.checked-view {
@@ -134,7 +134,7 @@
 
 
 .zaiui-add-btn-view-box {
 .zaiui-add-btn-view-box {
 	position: fixed;
 	position: fixed;
-	z-index: 999999;
+	z-index: 999;
 	bottom: 181.81upx;
 	bottom: 181.81upx;
 	right: 27.27upx;
 	right: 27.27upx;
 	.cu-btn {
 	.cu-btn {

+ 1 - 1
static/zaiui/style/my_cart.scss

@@ -94,7 +94,7 @@
 
 
 .zaiui-footer-fixed {
 .zaiui-footer-fixed {
 	box-shadow: 0 -2upx 9.09upx 0 #ececec;
 	box-shadow: 0 -2upx 9.09upx 0 #ececec;
-	z-index: 99999;
+	z-index: 999;
 	.cu-bar {
 	.cu-bar {
 		width: 100%;
 		width: 100%;
 		.checked-view {
 		.checked-view {

+ 1 - 1
static/zaiui/style/order-list.scss

@@ -39,7 +39,7 @@ page {
 .zaiui-nav-tab-view {
 .zaiui-nav-tab-view {
 	position: sticky;
 	position: sticky;
 	padding: 2upx 0 9.09upx;
 	padding: 2upx 0 9.09upx;
-	z-index: 9999;
+	z-index: 999;
 	
 	
 	/* #ifndef MP */
 	/* #ifndef MP */
 	top: calc(var(--status-bar-height) + 101upx);
 	top: calc(var(--status-bar-height) + 101upx);

+ 1 - 1
static/zaiui/style/settlement.scss

@@ -229,7 +229,7 @@
 
 
 .zaiui-footer-fixed {
 .zaiui-footer-fixed {
 	box-shadow: 0 -2upx 9.09upx 0 #ececec;
 	box-shadow: 0 -2upx 9.09upx 0 #ececec;
-	z-index: 99999;
+	z-index: 999;
 	.cu-bar {
 	.cu-bar {
 		width: 100%;
 		width: 100%;
 		.price-view {
 		.price-view {