代码提交

component/Dialog.vue

@@ -1,10 +1,14 @@
 <template>
     <view v-if="showdialog">
-		<van-dialog  title="确定取消订单？"
+		<van-dialog  
+		:title="titles"
 		show-cancel-button="true"
 		:show="showdialog"
 		@cancel="cancelDialog" @confirm="confirmOrder"
 		>
+		<view>
+			{{values}}
+		</view>
 		</van-dialog>
 	</view>
 </template>
@@ -15,7 +19,15 @@
       orderCancel:{
         default: false,
         type: Boolean
-      }
+      },
+	  titles: {
+		  default: '确定取消订单？',
+		  type: String
+	  },
+	  values:{
+		  default: '',
+		  type: String
+	  },
     },
     data() {
       return {
@@ -31,8 +43,8 @@
 			}
 		}
 	},
-	created() {
-		console.log(this.orderCancel)
+	onLoad() {
+		console.log(this.titles)
 	},
     methods: {
       cancelDialog() {

pages.json

@@ -109,7 +109,8 @@
 				"usingComponents":{
 					 "van-tab": "/wxcomponents/dist/tab/index",
 					 "van-tabs": "/wxcomponents/dist/tabs/index",
-					 "van-card": "/wxcomponents/dist/card/index"
+					 "van-card": "/wxcomponents/dist/card/index",
+					 "van-icon": "/wxcomponents/dist/icon/index"
 				}
 			}
 		},

pages/index/hotel.vue

@@ -140,6 +140,8 @@
         },
         data() {
             return {
+				chosegoods_commonid:　true,
+				chosegoods_price: true,
 				firstwo: 1,
 				isDetail: 1,
 				pictureUrl: this.pictureUrl,
@@ -239,50 +241,39 @@
 			choseType(e) {
 			    this.tabIndex = e;
 				this.goods_list = [];
-				if(this.tabIndex == 1) {
+				if(this.tabIndex == 1) {  // 服务
 					this.istopclick = 0;
 					this.gc_id_1 = '';
 					this.goods_price = ''; 
 					this.goods_commonid = '';
-				}else if(this.tabIndex == 2){
-						this.istopclick = 1;
+				}else if(this.tabIndex == 2){ //价格
+				        this.chosegoods_price = true;
+						console.log(this.chosegoods_commonid);
+						this.istopclick = this.chosegoods_commonid?1:2;
 						this.goods_price = ''; 
-						this.goods_commonid = 'asc';
+						this.goods_commonid = this.chosegoods_commonid?'asc':'desc';
 						this.gc_id_1 = '';
-				}else if(this.tabIndex == 3){
-						this.istopclick = 3;
-						this.goods_price = 'asc';
+						this.chosegoods_commonid = !this.chosegoods_commonid;
+				}else if(this.tabIndex == 3){ // 上新
+						this.chosegoods_commonid = true;
+						console.log(this.chosegoods_price);
+						this.istopclick = this.chosegoods_price?3:4;
+						this.goods_price = this.chosegoods_price?'asc':'desc';
 						this.goods_commonid = '';
 						this.gc_id_1 = '';
-					}else if(this.tabIndex ==4) {
+						this.chosegoods_price = !this.chosegoods_price;
+					}else if(this.tabIndex ==4) {  // 分类
 						this.istopclick = 0;
 						this.goods_price = ''; 
 						this.goods_commonid = '';
+						this.chosegoods_price = true;
+						this.chosegoods_commonid = true;
 					}
 				this.getshopdetail();
 			},
 			// 点击切换上下
 			changeisclick(e) {
-				this.istopclick = e;
-				this.gc_id_1 = '';
-				if(e == 2) {
-					this.goods_commonid = 'desc';
-					this.goods_price = ''
-					this.tabIndex = 2;
-				}else if(e == 4) {
-					this.goods_price = 'desc';
-					this.goods_commonid = '';
-					this.tabIndex = 3;
-				}else if(e == 1) {
-					this.tabIndex = 2;
-					this.goods_commonid = 'asc';
-					this.goods_price = ''
-				}else if(e == 3) {
-					this.tabIndex = 3;
-					this.goods_commonid = '';
-					this.goods_price = 'asc';
-				}
-				 this.getshopdetail();
+				
 			},
 			godetail(item) {
 				console.log(item);

pages/index/sureBuy.vue

@@ -138,6 +138,7 @@
 					{title:'处理我的客房预定'}
 				],
 				username:'',
+				shipping_type: 0,
 				radio: 0,
 				store: {},
 				pricelist: [],
@@ -146,7 +147,6 @@
 			}
 		},
 		onLoad(options) {
-			console.log(options);
 			this.order_id = options.order_id;
 			this.store = JSON.parse(options.store);
 			this.pricelist = JSON.parse(options.pricelist);
@@ -154,24 +154,54 @@
 			this.prices = prices; 
 			 uni.$on("getadress",(adress)=>{
 			        this.choseadress = adress;
-					console.log(this.choseadress)
 					this.address_id = this.choseadress.address_id;
 					this.getralodprice();
 			 })
 		},
 		methods: {
+			// 付款
+			goPay() {
+				this.request({
+					url:'/v1/order/create',
+					method: 'post',
+					data: {
+						gorderid: this.order_id,
+						address_id: this.address_id,
+						store_id: this.store.store_id,
+						shipping_type: this.shipping_type
+					},
+					success: (res) => {
+						console.log(res);
+						let order_id = res.data.data.order_id; // 订单id
+						let prices = this.prices;
+						uni.navigateTo({
+							url:`/pages/myOrder/paymoment?order_id=${order_id}&prices=${prices}`
+						})
+					}
+				})
+			},
 			// 核算运费
 			getralodprice() {
 				this.request({
 					url: '/v2/entry/orderFreight',
 					method: 'POST',
 					data: {
-						
+						order_id: this.order_id,
+						address_id:　this.address_id
+					},
+					success:(res) => {
+						    this.ralodprice = res.data.data.shipping_fee;
 					}
 				})
 			},
 			onChange(index) {
 				this.radio = index;
+					
+				if(index == 1) {
+					this.shipping_type = 0; // 订单付款快递类型
+				}else {
+					this.shipping_type = 1;
+				}
 			},
 			goAdress() {
 				console.log("dddd")

pages/myOrder/adress.vue

@@ -25,27 +25,10 @@
 			return {
 				source: 0,
 				addressList: [
-					{
-						name: '刘晓晓',
-						mobile: '18666666666',
-						addressName: '贵族皇仕牛排(东城店)',
-						address: '北京市东城区',
-						area: 'B区',
-						default: true
-					},{
-						name: '刘大大',
-						mobile: '18667766666',
-						addressName: '龙回1区12号楼',
-						address: '山东省济南市历城区',
-						area: '西单元302',
-						default: false,
-					}
 				]
 			}
 		},
 		onLoad(option){
-			console.log("kkkkk")
-			console.log(option.source);
 			this.source = option.source;
 			this.getlist();
 			uni.$on("refeshadress",(adress)=>{
@@ -65,7 +48,6 @@
 			},
 			//选择地址
 			checkAddress(item){
-				console.log(item);
 				 uni.$emit('getadress', item)
 				 uni.navigateBack();
 				// if(this.source == 1){
@@ -79,8 +61,6 @@
 				// });
 			},
 			addAddress(type, item){
-				console.log(type)
-				console.log(item)
 				uni.navigateTo({
 					url: `/pages/myOrder/adressManger?type=${type}&data=${JSON.stringify(item)}`
 				})

pages/myOrder/index.vue

@@ -1,68 +1,170 @@
 <template>
 	<view>
-		<van-tabs v-model="active">
-		  <van-tab v-for="(item, key) in menu"  :name="key" :title="item.name">
-			 <scroll-view  style="height: 95vh;" class="floor-list"
-			  :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
-			  refresher-enabled="true">
-			  <view @tap="goDetail()" class="cart-list">
-			   <view class="topTip">
-				   <view>
-					  <image src="" style="width: 50upx;height: 50upx; vertical-align: middle;background-color: #007AFF;"></image>
-					  <span style="padding-left: 16upx;">华南酒店</span>
-				   </view>
-				   <view style="color: #D9332E;font-size: 24upx;">已取消</view>
+		<van-tabs :active="active"  @change="changeselect" >
+		  <van-tab v-for="(item, index) in menu" :name="index" :title="item.name">
+		  </van-tab>
+		</van-tabs>
+		<scroll-view  v-if="order_list.length > 0" style="height: 95vh;" class="floor-list"
+		  :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
+		  refresher-enabled="true">
+		  <view v-for="(item,index) in order_list" :key="index"   class="cart-list">
+		   <view class="topTip" @click="goDetail(item.order_id)">
+			   <view>
+				   <image :src="pictureUrl+'/uploads/home/store/'+item.store_id+'/'+item.store_avatar" style="border-radius: 50%;
+				   width: 50upx;height: 50upx;vertical-align: middle;"></image>
+				  <span style="padding-left: 16upx;">{{item.store_name}}</span>
 			   </view>
-			   
-			   <view class="shoplist" style="background-color: #fff;">
-				  <view>
-					  <van-card
-						title-class="changewidth"
-						price-class ="priceClass"
-						price="10.00"
-						desc="描述信息"
-						title="商品标题"
-						thumb="https://gd3.alicdn.com/imgextra/i3/0/O1CN01IiyFQI1UGShoFKt1O_!!0-item_pic.jpg_400x400.jpg"
-					  >
-					  </van-card>
-				  </view>
+			   <view style="color: #D9332E;font-size: 24upx;">{{item.status}}</view>
+		   </view>
+		   
+		   <view  @click="goDetail(item.order_id)" v-for="(items,indexs) in item.goods"  :key="indexs" class="shoplist" style="background-color: #fff;">
+			  <view>
+				  <van-card
+					title-class="changewidth"
+					price-class ="priceClass"
+					:price="item.order_amount"
+					:desc="items.goods_name.split(' ')[1]+'X'+items.goods_num"
+					:title="items.goods_name.split(' ')[0]"
+					:thumb="pictureUrl + '/uploads/home/store/goods/'+items.goods_image.substr(0, items.goods_image.indexOf('\_')) + '/' + items.goods_image"
+				  >
+				  </van-card>
+			  </view>
+		   </view>
+			   <view class="topTip">
+				  <view style="font-size: 28upx;">合计：{{item.order_amount}}</view>
+				<!--  <view class="deleChange" v-if="item.order_state == 10">未付款</view>
+				  <view class="deleChange" v-if="item.order_state == 20">催单</view>
+				  <view class="deleChange" v-if="item.order_state == 20">确认收货</view> uni.navigateTo({
+					url:`/pages/myOrder/paymoment?order_id=${order_id}&prices=${prices}`
+				})
+				  <view class="deleChange" v-if="item.order_state == 40 && item.evaluation_state == 0">去评价</view> -->
+				  <view class="deleChange" @click="gopay(item)">{{item.operate}}</view> 
 			   </view>
-				   <view class="topTip">
-					  <view style="font-size: 28upx;">合计：50</view>
-					  <view class="deleChange">删除</view>
-				   </view>
+			  
+		  </view>
+		
+		</scroll-view> 
+		<view  v-if="order_list.length == 0" >
+			  <view style="margin: 120upx auto;text-align: center;">
+					<van-icon size="160rpx" color="#909399" name="description" />
+					<view style="text-align: center;color: #909399;"> 去买点什么</view>
 			  </view>
-			</scroll-view> 
-		  </van-tab>
-		</van-tabs>
+		</view>
+		<Dialog  :orderCancel="orderCancel"
+		    :titles="titles"
+		    @colseDialog="cancelDialog" 
+		    @confirmPay="confirmOrder"
+		 />
 	</view>
 </template>
 
 <script>
+	import Dialog from '@/component/Dialog.vue'
 	export default{
-		
+		components: {
+			Dialog
+		},
 		data() {
 			return {
+				orderCancel:　false,
+				titles:'',
+				pictureUrl: this.pictureUrl,
 				menu:[
 					{name:'全部'},
-					{name:'待付款'},
+					{name:'待支付'},
 					{name:'处理中'},
-					{name:'待评价'},
+					{name:'已收货'},
 					{name:'已取消'},
+					{name:'退款售后'}
 				],
+				// 要查找的订单状态 all-全部 waiting-待支付 payed-处理中 complete-已收货 cancel-已取消 refund-退款售后
 				active: 0,
 				scrollTop: 0,
 				old: {
 					scrollTop: 0
-				}
+				},
+				order_id:'',
+				page: 1,
+				page_size:　10,
+				state: 'all',
+				order_list:[]
 			}
 		},
+		onLoad() {
+			uni.$on("refehlist",()=>{
+			      this.getlist();
+			  })
+			this.getlist(); // 获取订单
+		},
 		methods: {
-			goDetail() {
-				uni.navigateTo({
-					url: './order'
+			changeselect(e) {
+				console.log(e);
+				this.active = e.target.name;
+				if(e.target.name == 0) {
+					this.state = 'all';
+				}else if(e.target.name == 1) {
+					this.state = 'waiting';
+				}else if(e.target.name == 2) {
+					this.state = 'payed';
+				}else if(e.target.name == 3) {
+					this.state = 'complete';
+				}else if(e.target.name == 4) {
+					this.state = 'cancel';
+				}else if(e.target.name == 5) {
+					this.state = 'refund';
+				}
+				this.getlist();
+			},
+			getlist() {
+				this.request({
+					url: '/v2/order/orders',
+					method: 'POST',
+					data: {
+						state: this.state,
+						page: this.page,
+						page_size:　10
+					},
+					success: (res) => {
+						this.order_list = res.data.data.order_list;
+					}
 				})
 			},
+			gopay(e) {
+				console.log(e);
+				let prices = e.order_amount;
+				this.order_id = e.order_id;
+				let order_id = e.order_id;
+				if(e.operate == '去付款') {
+					uni.navigateTo({
+							url:`/pages/myOrder/paymoment?order_id=${order_id}&prices=${prices}`
+				    })
+				}else if(e.operate == '删除') {
+					this.titles = '确认删除订单？'
+					this.orderCancel = true;
+				}
+			},
+			cancelDialog() {
+				this.orderCancel = false;
+			},
+			confirmOrder() {
+				this.orderCancel = false;
+				this.request({
+					url:'/v2/order/drop',
+					method:'POST',
+					data: {
+						order_id: this.order_id
+					},
+					success: (res) => {
+						this.getlist();
+					}
+				})
+			},
+			goDetail(e) {
+				let order_id = e; 
+				uni.navigateTo({
+				        url: `/pages/myOrder/order?id=${order_id}`
+				});
+			},
 			upper(e) {
 				console.log(e)
 				console.log("顶部")

pages/myOrder/order.vue

@@ -1,13 +1,27 @@
 <template>
 	<view class="cart-list">
-       <view style="padding: 0 36upx;line-height: 70upx;border-bottom: 14upx solid #F5F5F5;">已取消</view>  
+       <view v-if="detail.refund_state == 0" style="padding: 0 36upx;line-height: 70upx;border-bottom: 14upx solid #F5F5F5;">
+		   
+		   <span v-if="detail.order_state == 10">未付款</span>
+		   <span v-if="detail.order_state == 0">已取消</span>
+		   <span v-if="detail.order_state == 20">待发货</span>  
+		   <!-- 已付款  -->
+		   <span v-if="detail.order_state == 30">已发货</span>
+		   <span v-if="detail.order_state == 40">已收货</span>
+	   </view>  
+	   <view v-else style="padding: 0 36upx;line-height: 70upx;border-bottom: 14upx solid #F5F5F5;">
+	   		   <span v-if="detail.refund_state == 1">等待酒店处理退货申请</span>
+	   		   <span v-if="detail.refund_state == 2">同意退款售后</span>
+	   		   <span v-if="detail.order_state == 3">拒绝退款</span>  
+	   </view>  
 	   <view class="adress">
-	   		 <view class="adressDetail">156355</view>
-	   		 <view>北京大酒店将诶怕</view>
+	   		 <view class="adressDetail">{{detail.reciver_info.mob_phone}}</view>
+	   		 <view>{{detail.reciver_info.address}}</view>
 	   </view>
 	   <view style="padding: 30upx 36upx 15upx 36upx;border-bottom: 1px solid #F5F5F5;">
-		  <image src="" style="width: 50upx;height: 50upx; vertical-align: middle;background-color: #007AFF;"></image>
-		  <span style="padding-left: 16upx;">华南酒店</span>
+		   <image :src="pictureUrl+'/uploads/home/store/'+detail.store_id+'/'+detail.store_avatar" style="border-radius: 50%;
+		   width: 50upx;height: 50upx;vertical-align: middle;"></image>
+		  <span style="padding-left: 16upx;">{{detail.store_name}}</span>
 	   </view>
 	
 	 <view class="shoplist">
@@ -24,27 +38,41 @@
 			  </view>
 	 </view>
 	 <view class="topTip">
-		  <view style="font-size: 28upx;">合计：50</view>
-		  <view style="padding-left: 20upx;">运费: 50</view>
+		  <view style="font-size: 28upx;">合计：{{detail.order_amount}}</view>
+		  <view style="padding-left: 20upx;">运费: {{detail.shipping_fee}}</view>
 	 </view>
-	 <view style="padding: 15upx 36upx;">订单编号:<text class="orderCode">DDERKIJGIOSJKGPE</text></view>
+	 <view style="padding: 15upx 36upx;">订单编号:<text class="orderCode">{{detail.order_sn}}</text></view>
 	 <view class="adressbottom">
-		 <view>下单时间: <text  style="font-weight: 500;" class="time">2552558555</text></view>
-		 <view>支付订单: <text class="time">2552558555</text></view>
-		 <view>商家发货: <text class="time">2552558555</text></view>
-		 <view>确认收货: <text class="time">2552558555</text></view>
+		 <view>下单时间: <text  style="font-weight: 500;" class="time">{{detail.add_time}}</text></view> 
+		 <view>支付订单: 
+		     <text class="time"  v-if="detail.order_state == 10 || detail.order_state == 0">未支付</text>
+		     <text class="time"  v-else>{{detail.payment_time}}</text>
+		 </view>
+		 <view>商家发货: 
+		   <text class="time"  v-if="detail.order_state == 10 || detail.order_state == 0">未发货</text>
+		   <text class="time"  v-else>{{detail.shipping_time}}</text>
+		 </view>
+		 <view>确认收货: 
+			<text class="time"  v-if="detail.order_state == 10 || detail.order_state == 0">未确认</text>
+			<text class="time"  v-else>{{detail.finnshed_time}}</text>
+		 </view>
 	 </view>
 	 
 	 <view class="adressbutton">
-		<view class="buttonStatus">
-			<view @click="estimate" class="deleteOrder">晒单</view>
-			<view @click="reminder" class="deleteOrder">催单</view>
-			<view @click="cancelOrder" class="deleteOrder">取消订单</view>
-			<view class="payOrder" @click="goPay">去付款</view>
+		<view v-if="detail.refund_state == 0" class="buttonStatus">
+			<view v-if="detail.order_state == 0 || detail.order_state == 40 " @click="cancelOrder(2)" class="deleteOrder">删除订单</view>
+			<view @click="reminder"  v-if="detail.order_state == 20" class="deleteOrder">催单</view>
+			<view @click="cancelOrder(1)" v-if="detail.order_state == 10" class="deleteOrder">取消订单</view>
+			<view class="payOrder" v-if="detail.order_state == 10" @click="goPay">去付款</view>
+		</view>
+		<view v-else>
+			<view v-if="detail.refund_state == 2">删除订单</view>
+			
 		</view>
 	 </view>
 
 	<Dialog  :orderCancel="orderCancel" 
+	    :titles="titles"
 	    @colseDialog="cancelDialog" 
 	    @confirmPay="confirmOrder"
 	 />
@@ -59,25 +87,80 @@
 		},
 		data() {
 			return {
+			  isCancel: false,
+			  isDelete: false,
+			  titles:'',
+			  pictureUrl: this.pictureUrl,
 			  orderCancel: false,
+			  detail:{},
+			  id: '' ,// 订单id
 		    }
 	    },
+		onLoad(e) {
+			console.log(e);
+			this.id = e.id;
+			this.getDetail();
+		},
 		methods: {
+			getDetail() {
+				this.request({
+					url: '/v2/order/info',
+					method: 'post',
+					data: {
+						order_id: this.id
+					},
+					success: (res) => {
+						this.detail = res.data.data;
+						detail.order_amount
+						console.log(this.detail);
+					}
+				})
+			},
 			// 取消订单
-			cancelOrder() {
+			cancelOrder(e) { 
+				if(e == 1) {
+					this.titles="确认取消订单？"
+					this.isCancel = true;
+				}else {
+				   this.titles="确认删除订单？"
+				   this.isDelete = true;
+				}
 				this.orderCancel = true;
 			},
 			cancelDialog() {
-				
+				this.isCancel = false;
+				this.isDelete = false;
 				this.orderCancel = false;
 			},
 			confirmOrder() {
-				
+				let url = '';
 				this.orderCancel = false;
+				// 取消
+				if(this.isCancel) {
+					url = '/v2/order/cancel';
+				}else if(this.isDelete) {
+					// 删除
+					url = '/v2/order/drop';
+				}
+				this.request({
+					url: url,
+					method:'post',
+					data: {
+						order_id: this.id
+					},
+					success: (res) => {
+						uni.$emit("refehlist");
+						uni.navigateBack();
+					}
+				})
+				
+				
 			},
 			goPay() {
+				let prices = this.detail.order_amount;
+				let order_id = this.id;
 				uni.navigateTo({
-					url: './paymoment'
+					url:`/pages/myOrder/paymoment?order_id=${order_id}&prices=${prices}`
 				})
 			},
 			

pages/myOrder/paymoment.vue

@@ -18,33 +18,86 @@
 		     </van-cell>
 		   </van-cell-group>
 		 </van-radio-group>
-		 <view class="payMoney">支付</view>
+		 <view class="payMoney" @click="payMoney">支付({{prices}})</view>
+		 <Dialog  :orderCancel="orderCancel"
+		     :titles="titles"
+			 :values="values"
+		     @colseDialog="cancelDialog" 
+		     @confirmPay="confirmOrder"
+		  />
 	</view>
 </template>
 
 <script>
+	import Dialog from '@/component/Dialog.vue'
 	export default {
+		components: {
+			Dialog
+		},
 		data() {
 			return {
+				values:'',
+				orderCancel:　false,
+				titles:'',
 				list:[
 					{title:'微信支付'},
 					{title:'支付宝支付'},
 					{title:'圈币支付'}
 				],
-				radio: 0
+				radio: 0,
+				prices: '',
+				order_id:''
 			}
 		},
+		onLoad(e) {
+			this.prices = e.prices;
+			this.order_id = e.order_id;
+		},
 		methods: {
+			cancelDialog() {
+				this.orderCancel = false;
+			},
+			confirmOrder() {
+				this.orderCancel = false;
+				this.request({
+					url:'/v1/payment/pay',
+					method:'POST',
+					data: {
+						pay_code: 'point',
+						order_id: this.order_id
+					},
+					success: (res) => {
+						console.log(res);
+						
+					}
+				})
+			},
 			onChange(index) {
 				this.radio = index;
 			},
 			payMoney() {
+				console.log("kkk")
 				if(this.radio == 0) {
 					// 微信支付
 				}else if(this.radio == 1) {
 					// 支付宝支付
 				}else {
+					this.titles = "圈币支付";
+					this.values = "使用圈币支付"+this.prices;
+					this.orderCancel = true;
 					// 圈币支付
+					// this.request({
+					// 	url:'/v1/payment/pay',
+					// 	method:'POST',
+					// 	data: {
+					// 		pay_code: 'point',
+					// 		order_id: this.order_id
+					// 	},
+					// 	success: (res) => {
+					// 		console.log(res);
+							
+					// 	}
+					// })
 				}
 			}
 		}

pages/myone/oneIndex.vue

@@ -7,11 +7,8 @@
 	   	 </view>
 	    </view>
 	   <view>
-		   <van-tabs :active="active" @click="onChange">
-			 <van-tab  :name="1" title="标签 1"></van-tab>
-			 <van-tab  :name="2" title="标签 2"></van-tab>
-			 <van-tab  :name="3" title="标签 3"></van-tab>
-			 <van-tab  :name="4" title="标签 4"></van-tab>
+		   <van-tabs :active="active" @change="onChange">
+			 <van-tab  v-for="(item,index) in typelist"  :key="index" :name="index" :title="item.ac_name"></van-tab>
 		   </van-tabs>
 	   </view>
 	  
@@ -47,20 +44,46 @@
 		},
 		data() {
 			return {
-				active: 1,
+				page: 1,
+				page_size: 10,
+				ac_id:'',
+				keyword:'',
+				active: 0,
 				scrollTop: 0,
 				old: {
 					scrollTop: 0
-				}
+				},
+				typelist:[]
 		    }
 	    },
+		onLoad() {
+			this.getype(); // 获取文章分类
+			this.getlist(); // 获取文章列表
+		},
 		methods: {
+			getype() {
+				this.request({
+					url: '/v1/entry/news_cate',
+					success: (res) =>　{
+						let array = [{ac_name:'全部'}];
+						this.typelist = array.concat(res.data.data);
+						console.log(this.typelist);
+					}
+				})
+			},
+			getlist() {
+				this.request({
+					url: '',
+					method:'POST'
+				})
+			},
+			
 			confirm() {
 				
 			},
-			onChange(event) {
+			onChange(event,) {
+				console.log(event);
 				this.active = event.detail.name;
-				console.log(this.active)
 			},
 			// 自定义下拉控件被触发
 			onPulling() {

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

@@ -62,5 +62,6 @@
     "van-dialog": "/wxcomponents/dist/dialog/index",
     "van-rate": "/wxcomponents/dist/rate/index",
     "van-cell": "/wxcomponents/dist/cell/index"
-  }
+  },
+  "sitemapLocation": "sitemap56.json"
 }

unpackage/dist/dev/mp-weixin/component/Dialog.js

@@ -125,12 +125,24 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 //
 //
 //
+//
+//
+//
+//
 var _default =
 {
   props: {
     orderCancel: {
       default: false,
-      type: Boolean } },
+      type: Boolean },
+
+    titles: {
+      default: '确定取消订单？',
+      type: String },
+
+    values: {
+      default: '',
+      type: String } },
 
 
   data: function data() {
@@ -147,8 +159,8 @@ var _default =
       }
     } },
 
-  created: function created() {
-    console.log(this.orderCancel);
+  onLoad: function onLoad() {
+    console.log(this.titles);
   },
   methods: {
     cancelDialog: function cancelDialog() {

unpackage/dist/dev/mp-weixin/component/Dialog.wxml

@@ -1 +1 @@
-<block wx:if="{{showdialog}}"><view><van-dialog vue-id="2ef268be-1" title="确定取消订单？" show-cancel-button="true" show="{{showdialog}}" data-event-opts="{{[['^cancel',[['cancelDialog']]],['^confirm',[['confirmOrder']]]]}}" data-com-type="wx" bind:cancel="__e" bind:confirm="__e" bind:__l="__l"></van-dialog></view></block>
+<block wx:if="{{showdialog}}"><view><van-dialog vue-id="2ef268be-1" title="{{titles}}" show-cancel-button="true" show="{{showdialog}}" data-event-opts="{{[['^cancel',[['cancelDialog']]],['^confirm',[['confirmOrder']]]]}}" data-com-type="wx" bind:cancel="__e" bind:confirm="__e" bind:__l="__l" vue-slots="{{['default']}}"><view>{{''+values+''}}</view></van-dialog></view></block>

unpackage/dist/dev/mp-weixin/pages/index/cart.js

@@ -147,7 +147,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uniNavBar = function uniNavBar() {__webpack_require__.e(/*! require.ensure | component/uni-nav-bar/uni-nav-bar */ "component/uni-nav-bar/uni-nav-bar").then((function () {return resolve(__webpack_require__(/*! @/component/uni-nav-bar/uni-nav-bar.vue */ 209));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var uninumberbox = function uninumberbox() {__webpack_require__.e(/*! require.ensure | component/uinNumberCart */ "component/uinNumberCart").then((function () {return resolve(__webpack_require__(/*! @/component/uinNumberCart.vue */ 324));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uniNavBar = function uniNavBar() {__webpack_require__.e(/*! require.ensure | component/uni-nav-bar/uni-nav-bar */ "component/uni-nav-bar/uni-nav-bar").then((function () {return resolve(__webpack_require__(/*! @/component/uni-nav-bar/uni-nav-bar.vue */ 209));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var uninumberbox = function uninumberbox() {__webpack_require__.e(/*! require.ensure | component/uinNumberCart */ "component/uinNumberCart").then((function () {return resolve(__webpack_require__(/*! @/component/uinNumberCart.vue */ 247));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/pages/index/hotel.js

@@ -273,6 +273,8 @@ var _default = {
 
   data: function data() {
     return {
+      chosegoods_commonid: true,
+      chosegoods_price: true,
       firstwo: 1,
       isDetail: 1,
       pictureUrl: this.pictureUrl,
@@ -372,50 +374,39 @@ var _default = {
     choseType: function choseType(e) {
       this.tabIndex = e;
       this.goods_list = [];
-      if (this.tabIndex == 1) {
+      if (this.tabIndex == 1) {// 服务
         this.istopclick = 0;
         this.gc_id_1 = '';
         this.goods_price = '';
         this.goods_commonid = '';
-      } else if (this.tabIndex == 2) {
-        this.istopclick = 1;
+      } else if (this.tabIndex == 2) {//价格
+        this.chosegoods_price = true;
+        console.log(this.chosegoods_commonid);
+        this.istopclick = this.chosegoods_commonid ? 1 : 2;
         this.goods_price = '';
-        this.goods_commonid = 'asc';
+        this.goods_commonid = this.chosegoods_commonid ? 'asc' : 'desc';
         this.gc_id_1 = '';
-      } else if (this.tabIndex == 3) {
-        this.istopclick = 3;
-        this.goods_price = 'asc';
+        this.chosegoods_commonid = !this.chosegoods_commonid;
+      } else if (this.tabIndex == 3) {// 上新
+        this.chosegoods_commonid = true;
+        console.log(this.chosegoods_price);
+        this.istopclick = this.chosegoods_price ? 3 : 4;
+        this.goods_price = this.chosegoods_price ? 'asc' : 'desc';
         this.goods_commonid = '';
         this.gc_id_1 = '';
-      } else if (this.tabIndex == 4) {
+        this.chosegoods_price = !this.chosegoods_price;
+      } else if (this.tabIndex == 4) {// 分类
         this.istopclick = 0;
         this.goods_price = '';
         this.goods_commonid = '';
+        this.chosegoods_price = true;
+        this.chosegoods_commonid = true;
       }
       this.getshopdetail();
     },
     // 点击切换上下
     changeisclick: function changeisclick(e) {
-      this.istopclick = e;
-      this.gc_id_1 = '';
-      if (e == 2) {
-        this.goods_commonid = 'desc';
-        this.goods_price = '';
-        this.tabIndex = 2;
-      } else if (e == 4) {
-        this.goods_price = 'desc';
-        this.goods_commonid = '';
-        this.tabIndex = 3;
-      } else if (e == 1) {
-        this.tabIndex = 2;
-        this.goods_commonid = 'asc';
-        this.goods_price = '';
-      } else if (e == 3) {
-        this.tabIndex = 3;
-        this.goods_commonid = '';
-        this.goods_price = 'asc';
-      }
-      this.getshopdetail();
+
     },
     godetail: function godetail(item) {
       console.log(item);

unpackage/dist/dev/mp-weixin/pages/index/sureBuy.js

@@ -300,6 +300,7 @@ var _default =
       { title: '处理我的客房预定' }],
 
       username: '',
+      shipping_type: 0,
       radio: 0,
       store: {},
       pricelist: [],
@@ -308,7 +309,6 @@ var _default =
 
   },
   onLoad: function onLoad(options) {var _this = this;
-    console.log(options);
     this.order_id = options.order_id;
     this.store = JSON.parse(options.store);
     this.pricelist = JSON.parse(options.pricelist);
@@ -316,24 +316,54 @@ var _default =
     this.prices = prices;
     uni.$on("getadress", function (adress) {
       _this.choseadress = adress;
-      console.log(_this.choseadress);
       _this.address_id = _this.choseadress.address_id;
       _this.getralodprice();
     });
   },
   methods: {
+    // 付款
+    goPay: function goPay() {var _this2 = this;
+      this.request({
+        url: '/v1/order/create',
+        method: 'post',
+        data: {
+          gorderid: this.order_id,
+          address_id: this.address_id,
+          store_id: this.store.store_id,
+          shipping_type: this.shipping_type },
+
+        success: function success(res) {
+          console.log(res);
+          var order_id = res.data.data.order_id; // 订单id
+          var prices = _this2.prices;
+          uni.navigateTo({
+            url: "/pages/myOrder/paymoment?order_id=".concat(order_id, "&prices=").concat(prices) });
+
+        } });
+
+    },
     // 核算运费
-    getralodprice: function getralodprice() {
+    getralodprice: function getralodprice() {var _this3 = this;
       this.request({
         url: '/v2/entry/orderFreight',
         method: 'POST',
-        data: {} });
-
+        data: {
+          order_id: this.order_id,
+          address_id: this.address_id },
 
+        success: function success(res) {
+          _this3.ralodprice = res.data.data.shipping_fee;
+        } });
 
     },
     onChange: function onChange(index) {
       this.radio = index;
+
+      if (index == 1) {
+        this.shipping_type = 0; // 订单付款快递类型
+      } else {
+        this.shipping_type = 1;
+      }
     },
     goAdress: function goAdress() {
       console.log("dddd");

unpackage/dist/dev/mp-weixin/pages/myOrder/adress.js

@@ -157,28 +157,11 @@ var _default =
   data: function data() {
     return {
       source: 0,
-      addressList: [
-      {
-        name: '刘晓晓',
-        mobile: '18666666666',
-        addressName: '贵族皇仕牛排(东城店)',
-        address: '北京市东城区',
-        area: 'B区',
-        default: true },
-      {
-        name: '刘大大',
-        mobile: '18667766666',
-        addressName: '龙回1区12号楼',
-        address: '山东省济南市历城区',
-        area: '西单元302',
-        default: false }] };
-
+      addressList: [] };
 
 
   },
   onLoad: function onLoad(option) {var _this = this;
-    console.log("kkkkk");
-    console.log(option.source);
     this.source = option.source;
     this.getlist();
     uni.$on("refeshadress", function (adress) {
@@ -198,7 +181,6 @@ var _default =
     },
     //选择地址
     checkAddress: function checkAddress(item) {
-      console.log(item);
       uni.$emit('getadress', item);
       uni.navigateBack();
       // if(this.source == 1){
@@ -212,8 +194,6 @@ var _default =
       // });
     },
     addAddress: function addAddress(type, item) {
-      console.log(type);
-      console.log(item);
       uni.navigateTo({
         url: "/pages/myOrder/adressManger?type=".concat(type, "&data=").concat(JSON.stringify(item)) });
 

unpackage/dist/dev/mp-weixin/pages/myOrder/index.js

@@ -98,6 +98,33 @@ var render = function() {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
+  var l1 = _vm.__map(_vm.order_list, function(item, index) {
+    var l0 = _vm.__map(item.goods, function(items, indexs) {
+      var g0 = items.goods_name.split(" ")
+      var g1 = items.goods_name.split(" ")
+      var g2 = items.goods_image.substr(0, items.goods_image.indexOf("_"))
+      return {
+        $orig: _vm.__get_orig(items),
+        g0: g0,
+        g1: g1,
+        g2: g2
+      }
+    })
+
+    return {
+      $orig: _vm.__get_orig(item),
+      l0: l0
+    }
+  })
+
+  _vm.$mp.data = Object.assign(
+    {},
+    {
+      $root: {
+        l1: l1
+      }
+    }
+  )
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -131,69 +158,171 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0; //
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-var _default =
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var Dialog = function Dialog() {__webpack_require__.e(/*! require.ensure | component/Dialog */ "component/Dialog").then((function () {return resolve(__webpack_require__(/*! @/component/Dialog.vue */ 261));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 {
+  components: {
+    Dialog: Dialog },
 
   data: function data() {
     return {
+      orderCancel: false,
+      titles: '',
+      pictureUrl: this.pictureUrl,
       menu: [
       { name: '全部' },
-      { name: '待付款' },
+      { name: '待支付' },
       { name: '处理中' },
-      { name: '待评价' },
-      { name: '已取消' }],
+      { name: '已收货' },
+      { name: '已取消' },
+      { name: '退款售后' }],
 
+      // 要查找的订单状态 all-全部 waiting-待支付 payed-处理中 complete-已收货 cancel-已取消 refund-退款售后
       active: 0,
       scrollTop: 0,
       old: {
-        scrollTop: 0 } };
+        scrollTop: 0 },
 
+      order_id: '',
+      page: 1,
+      page_size: 10,
+      state: 'all',
+      order_list: [] };
 
   },
+  onLoad: function onLoad() {var _this = this;
+    uni.$on("refehlist", function () {
+      _this.getlist();
+    });
+    this.getlist(); // 获取订单
+  },
   methods: {
-    goDetail: function goDetail() {
+    changeselect: function changeselect(e) {
+      console.log(e);
+      this.active = e.target.name;
+      if (e.target.name == 0) {
+        this.state = 'all';
+      } else if (e.target.name == 1) {
+        this.state = 'waiting';
+      } else if (e.target.name == 2) {
+        this.state = 'payed';
+      } else if (e.target.name == 3) {
+        this.state = 'complete';
+      } else if (e.target.name == 4) {
+        this.state = 'cancel';
+      } else if (e.target.name == 5) {
+        this.state = 'refund';
+      }
+      this.getlist();
+    },
+    getlist: function getlist() {var _this2 = this;
+      this.request({
+        url: '/v2/order/orders',
+        method: 'POST',
+        data: {
+          state: this.state,
+          page: this.page,
+          page_size: 10 },
+
+        success: function success(res) {
+          _this2.order_list = res.data.data.order_list;
+        } });
+
+    },
+    gopay: function gopay(e) {
+      console.log(e);
+      var prices = e.order_amount;
+      this.order_id = e.order_id;
+      var order_id = e.order_id;
+      if (e.operate == '去付款') {
+        uni.navigateTo({
+          url: "/pages/myOrder/paymoment?order_id=".concat(order_id, "&prices=").concat(prices) });
+
+      } else if (e.operate == '删除') {
+        this.titles = '确认删除订单？';
+        this.orderCancel = true;
+      }
+    },
+    cancelDialog: function cancelDialog() {
+      this.orderCancel = false;
+    },
+    confirmOrder: function confirmOrder() {var _this3 = this;
+      this.orderCancel = false;
+      this.request({
+        url: '/v2/order/drop',
+        method: 'POST',
+        data: {
+          order_id: this.order_id },
+
+        success: function success(res) {
+          _this3.getlist();
+        } });
+
+    },
+    goDetail: function goDetail(e) {
+      var order_id = e;
       uni.navigateTo({
-        url: './order' });
+        url: "/pages/myOrder/order?id=".concat(order_id) });
 
     },
     upper: function upper(e) {

unpackage/dist/dev/mp-weixin/pages/myOrder/index.json

@@ -3,6 +3,8 @@
   "usingComponents": {
     "van-tab": "/wxcomponents/dist/tab/index",
     "van-tabs": "/wxcomponents/dist/tabs/index",
-    "van-card": "/wxcomponents/dist/card/index"
+    "van-card": "/wxcomponents/dist/card/index",
+    "van-icon": "/wxcomponents/dist/icon/index",
+    "dialog": "/component/Dialog"
   }
 }

unpackage/dist/dev/mp-weixin/pages/myOrder/order.js

@@ -165,6 +165,34 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -192,25 +220,80 @@ __webpack_require__.r(__webpack_exports__);
 
   data: function data() {
     return {
-      orderCancel: false };
-
+      isCancel: false,
+      isDelete: false,
+      titles: '',
+      pictureUrl: this.pictureUrl,
+      orderCancel: false,
+      detail: {},
+      id: '' // 订单id
+    };
+  },
+  onLoad: function onLoad(e) {
+    console.log(e);
+    this.id = e.id;
+    this.getDetail();
   },
   methods: {
+    getDetail: function getDetail() {var _this = this;
+      this.request({
+        url: '/v2/order/info',
+        method: 'post',
+        data: {
+          order_id: this.id },
+
+        success: function success(res) {
+          _this.detail = res.data.data;
+          detail.order_amount;
+          console.log(_this.detail);
+        } });
+
+    },
     // 取消订单
-    cancelOrder: function cancelOrder() {
+    cancelOrder: function cancelOrder(e) {
+      if (e == 1) {
+        this.titles = "确认取消订单？";
+        this.isCancel = true;
+      } else {
+        this.titles = "确认删除订单？";
+        this.isDelete = true;
+      }
       this.orderCancel = true;
     },
     cancelDialog: function cancelDialog() {
-
+      this.isCancel = false;
+      this.isDelete = false;
       this.orderCancel = false;
     },
     confirmOrder: function confirmOrder() {
-
+      var url = '';
       this.orderCancel = false;
+      // 取消
+      if (this.isCancel) {
+        url = '/v2/order/cancel';
+      } else if (this.isDelete) {
+        // 删除
+        url = '/v2/order/drop';
+      }
+      this.request({
+        url: url,
+        method: 'post',
+        data: {
+          order_id: this.id },
+
+        success: function success(res) {
+          uni.$emit("refehlist");
+          uni.navigateBack();
+        } });
+
+
+
     },
     goPay: function goPay() {
+      var prices = this.detail.order_amount;
+      var order_id = this.id;
       uni.navigateTo({
-        url: './paymoment' });
+        url: "/pages/myOrder/paymoment?order_id=".concat(order_id, "&prices=").concat(prices) });
 
     },
 

unpackage/dist/dev/mp-weixin/pages/myOrder/paymoment.js

@@ -131,54 +131,107 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0; //
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-var _default =
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var Dialog = function Dialog() {__webpack_require__.e(/*! require.ensure | component/Dialog */ "component/Dialog").then((function () {return resolve(__webpack_require__(/*! @/component/Dialog.vue */ 261));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 {
+  components: {
+    Dialog: Dialog },
+
   data: function data() {
     return {
+      values: '',
+      orderCancel: false,
+      titles: '',
       list: [
       { title: '微信支付' },
       { title: '支付宝支付' },
       { title: '圈币支付' }],
 
-      radio: 0 };
+      radio: 0,
+      prices: '',
+      order_id: '' };
 
   },
+  onLoad: function onLoad(e) {
+    this.prices = e.prices;
+    this.order_id = e.order_id;
+  },
   methods: {
+    cancelDialog: function cancelDialog() {
+      this.orderCancel = false;
+    },
+    confirmOrder: function confirmOrder() {
+      this.orderCancel = false;
+      this.request({
+        url: '/v1/payment/pay',
+        method: 'POST',
+        data: {
+          pay_code: 'point',
+          order_id: this.order_id },
+
+        success: function success(res) {
+          console.log(res);
+
+        } });
+
+    },
     onChange: function onChange(index) {
       this.radio = index;
     },
     payMoney: function payMoney() {
+      console.log("kkk");
       if (this.radio == 0) {
         // 微信支付
       } else if (this.radio == 1) {
         // 支付宝支付
       } else {
-          // 圈币支付
-        }
+        this.titles = "圈币支付";
+        this.values = "使用圈币支付" + this.prices;
+        this.orderCancel = true;
+        // 圈币支付
+        // this.request({
+        // 	url:'/v1/payment/pay',
+        // 	method:'POST',
+        // 	data: {
+        // 		pay_code: 'point',
+        // 		order_id: this.order_id
+        // 	},
+        // 	success: (res) => {
+        // 		console.log(res);
+
+        // 	}
+        // })
+      }
     } } };exports.default = _default;
 
 /***/ }),

unpackage/dist/dev/mp-weixin/pages/myOrder/paymoment.json

@@ -3,6 +3,7 @@
   "usingComponents": {
     "van-cell-group": "/wxcomponents/dist/cell-group/index",
     "van-radio": "/wxcomponents/dist/radio/index",
-    "van-radio-group": "/wxcomponents/dist/radio-group/index"
+    "van-radio-group": "/wxcomponents/dist/radio-group/index",
+    "dialog": "/component/Dialog"
   }
 }

unpackage/dist/dev/mp-weixin/pages/myOrder/paymoment.wxml

@@ -1 +1 @@
-<view><van-radio-group vue-id="329117d8-1" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><van-cell-group vue-id="{{('329117d8-2-'+index)+','+('329117d8-1')}}" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}"><van-cell vue-id="{{('329117d8-3-'+index)+','+('329117d8-2-'+index)}}" title="{{item.title}}" data-event-opts="{{[['^click',[['onChange',[index]]]]]}}" data-com-type="wx" bind:click="__e" bind:__l="__l" vue-slots="{{['icon']}}"><view style="padding-right:10rpx;" slot="icon"><van-radio-group vue-id="{{('329117d8-4-'+index)+','+('329117d8-3-'+index)}}" value="{{radio}}" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}"><van-radio vue-id="{{('329117d8-5-'+index)+','+('329117d8-4-'+index)}}" checked-color="#D9332E" name="{{index}}" data-com-type="wx" bind:__l="__l"></van-radio></van-radio-group></view></van-cell></van-cell-group></block></van-radio-group><view class="payMoney">支付</view></view>
+<view><van-radio-group vue-id="329117d8-1" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><van-cell-group vue-id="{{('329117d8-2-'+index)+','+('329117d8-1')}}" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}"><van-cell vue-id="{{('329117d8-3-'+index)+','+('329117d8-2-'+index)}}" title="{{item.title}}" data-event-opts="{{[['^click',[['onChange',[index]]]]]}}" data-com-type="wx" bind:click="__e" bind:__l="__l" vue-slots="{{['icon']}}"><view style="padding-right:10rpx;" slot="icon"><van-radio-group vue-id="{{('329117d8-4-'+index)+','+('329117d8-3-'+index)}}" value="{{radio}}" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}"><van-radio vue-id="{{('329117d8-5-'+index)+','+('329117d8-4-'+index)}}" checked-color="#D9332E" name="{{index}}" data-com-type="wx" bind:__l="__l"></van-radio></van-radio-group></view></van-cell></van-cell-group></block></van-radio-group><view data-event-opts="{{[['tap',[['payMoney',['$event']]]]]}}" class="payMoney" bindtap="__e">{{"支付("+prices+")"}}</view><dialog vue-id="329117d8-6" orderCancel="{{orderCancel}}" titles="{{titles}}" values="{{values}}" data-event-opts="{{[['^colseDialog',[['cancelDialog']]],['^confirmPay',[['confirmOrder']]]]}}" bind:colseDialog="__e" bind:confirmPay="__e" bind:__l="__l"></dialog></view>

unpackage/dist/dev/mp-weixin/pages/myone/oneIndex.js

@@ -167,9 +167,6 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 
 
 
-
-
-
 
 
 
@@ -180,20 +177,46 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 
   data: function data() {
     return {
-      active: 1,
+      page: 1,
+      page_size: 10,
+      ac_id: '',
+      keyword: '',
+      active: 0,
       scrollTop: 0,
       old: {
-        scrollTop: 0 } };
+        scrollTop: 0 },
 
+      typelist: [] };
 
   },
+  onLoad: function onLoad() {
+    this.getype(); // 获取文章分类
+    this.getlist(); // 获取文章列表
+  },
   methods: {
+    getype: function getype() {var _this = this;
+      this.request({
+        url: '/v1/entry/news_cate',
+        success: function success(res) {
+          var array = [{ ac_name: '全部' }];
+          _this.typelist = array.concat(res.data.data);
+          console.log(_this.typelist);
+        } });
+
+    },
+    getlist: function getlist() {
+      this.request({
+        url: '',
+        method: 'POST' });
+
+    },
+
     confirm: function confirm() {
 
     },
     onChange: function onChange(event) {
+      console.log(event);
       this.active = event.detail.name;
-      console.log(this.active);
     },
     // 自定义下拉控件被触发
     onPulling: function onPulling() {

unpackage/dist/dev/mp-weixin/pages/myone/oneIndex.wxml

@@ -1 +1 @@
-<view><view class="searchType" style="background:#fff;"><view class="input-view"><uni-icon vue-id="24146ccc-1" type="search" size="22" color="#666666" bind:__l="__l"></uni-icon><input class="input" confirm-type="search" type="text" placeholder="搜索文章" data-event-opts="{{[['confirm',[['confirm',['$event']]]]]}}" bindconfirm="__e"/></view></view><view><van-tabs vue-id="24146ccc-2" active="{{active}}" data-event-opts="{{[['^click',[['onChange']]]]}}" data-com-type="wx" bind:click="__e" bind:__l="__l" vue-slots="{{['default']}}"><van-tab vue-id="{{('24146ccc-3')+','+('24146ccc-2')}}" name="{{1}}" title="标签 1" data-com-type="wx" bind:__l="__l"></van-tab><van-tab vue-id="{{('24146ccc-4')+','+('24146ccc-2')}}" name="{{2}}" title="标签 2" data-com-type="wx" bind:__l="__l"></van-tab><van-tab vue-id="{{('24146ccc-5')+','+('24146ccc-2')}}" name="{{3}}" title="标签 3" data-com-type="wx" bind:__l="__l"></van-tab><van-tab vue-id="{{('24146ccc-6')+','+('24146ccc-2')}}" name="{{4}}" title="标签 4" data-com-type="wx" bind:__l="__l"></van-tab></van-tabs></view><scroll-view class="floor-list" scroll-top="{{scrollTop}}" scroll-y="true" refresher-enabled="true" data-event-opts="{{[['scroll',[['scroll',['$event']]]],['scrolltoupper',[['upper',['$event']]]],['scrolltolower',[['lower',['$event']]]],['refresherabort',[['onAbort',['$event']]]],['refresherrefresh',[['onRefresh',['$event']]]],['refresherpulling',[['onPulling',['$event']]]]]}}" bindscroll="__e" bindscrolltoupper="__e" bindscrolltolower="__e" bindrefresherabort="__e" bindrefresherrefresh="__e" bindrefresherpulling="__e"><view><view class="hotelList"><view class="hotleLeft"><image style="width:214rpx;height:152rpx;" src></image></view><view class="hotelright"><view style="font-size:28rpx;color:#303133;">华南城市酒店</view><view>07-05 14:58</view></view></view></view></scroll-view></view>
+<view><view class="searchType" style="background:#fff;"><view class="input-view"><uni-icon vue-id="24146ccc-1" type="search" size="22" color="#666666" bind:__l="__l"></uni-icon><input class="input" confirm-type="search" type="text" placeholder="搜索文章" data-event-opts="{{[['confirm',[['confirm',['$event']]]]]}}" bindconfirm="__e"/></view></view><view><van-tabs vue-id="24146ccc-2" active="{{active}}" data-event-opts="{{[['^change',[['onChange']]]]}}" data-com-type="wx" bind:change="__e" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{typelist}}" wx:for-item="item" wx:for-index="index" wx:key="index"><van-tab vue-id="{{('24146ccc-3-'+index)+','+('24146ccc-2')}}" name="{{index}}" title="{{item.ac_name}}" data-com-type="wx" bind:__l="__l"></van-tab></block></van-tabs></view><scroll-view class="floor-list" scroll-top="{{scrollTop}}" scroll-y="true" refresher-enabled="true" data-event-opts="{{[['scroll',[['scroll',['$event']]]],['scrolltoupper',[['upper',['$event']]]],['scrolltolower',[['lower',['$event']]]],['refresherabort',[['onAbort',['$event']]]],['refresherrefresh',[['onRefresh',['$event']]]],['refresherpulling',[['onPulling',['$event']]]]]}}" bindscroll="__e" bindscrolltoupper="__e" bindscrolltolower="__e" bindrefresherabort="__e" bindrefresherrefresh="__e" bindrefresherpulling="__e"><view><view class="hotelList"><view class="hotleLeft"><image style="width:214rpx;height:152rpx;" src></image></view><view class="hotelright"><view style="font-size:28rpx;color:#303133;">华南城市酒店</view><view>07-05 14:58</view></view></view></view></scroll-view></view>

unpackage/dist/dev/mp-weixin/sitemap56.json

@@ -0,0 +1,7 @@
+{
+  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [{
+  "action": "allow",
+  "page": "*"
+  }]
+}