瀏覽代碼

考勤修改

wcni 5 年之前
父節點
當前提交
b84f3058e5
共有 100 個文件被更改,包括 1343 次插入488 次删除
  1. 5 0
      common/uin.css
  2. 29 1
      pages.json
  3. 1 5
      pages/index/cart.vue
  4. 15 7
      pages/index/shop.vue
  5. 10 10
      pages/index/sureBuy.vue
  6. 19 21
      pages/myCenter/index.vue
  7. 431 0
      pages/myCenter/orderdetail.vue
  8. 109 6
      pages/myOrder/adress.vue
  9. 24 21
      pages/myOrder/index.vue
  10. 35 7
      pages/myOrder/order.vue
  11. 4 2
      pages/myOrder/paymoment.vue
  12. 265 0
      pages/myOrder/refuend.vue
  13. 7 3
      pages/myOrder/returndetail.vue
  14. 1 0
      pages/myOrder/returngood.vue
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/Dialog.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/Gobacktop.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/assess.js.map
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/commoNar.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/mpvue-citypicker/mpvueCityPicker.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/popup.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/shopList.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/textarea.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/uinNumber.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/uinNumberCart.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/uni-icon/uni-icon.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/uni-nav-bar/uni-nav-bar.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/uni-popup.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/uni-status-bar/uni-status-bar.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/uploadImage.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/cart.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/feedback.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/hotel.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/hoteldetail.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/hotelsearch.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/searchresult.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/shop.js.map
  40. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/sureBuy.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/applyfor.js.map
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/commentback.js.map
  43. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/definite.js.map
  44. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/index.js.map
  45. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/information.js.map
  46. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/myCollect.js.map
  47. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/orderdetail.js.map
  48. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/adress.js.map
  49. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/adressManger.js.map
  50. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/estimate.js.map
  51. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/index.js.map
  52. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/order.js.map
  53. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/paymoment.js.map
  54. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/refuend.js.map
  55. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/reminder.js.map
  56. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/returndetail.js.map
  57. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/returngood.js.map
  58. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myone/oneIndex.js.map
  59. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myone/onedetail.js.map
  60. 3 1
      unpackage/dist/dev/mp-weixin/app.json
  61. 5 0
      unpackage/dist/dev/mp-weixin/common/main.wxss
  62. 3 3
      unpackage/dist/dev/mp-weixin/common/vendor.js
  63. 12 12
      unpackage/dist/dev/mp-weixin/component/Dialog.js
  64. 12 12
      unpackage/dist/dev/mp-weixin/component/Gobacktop.js
  65. 12 12
      unpackage/dist/dev/mp-weixin/component/assess.js
  66. 12 12
      unpackage/dist/dev/mp-weixin/component/commoNar.js
  67. 10 10
      unpackage/dist/dev/mp-weixin/component/loginDialog.js
  68. 15 15
      unpackage/dist/dev/mp-weixin/component/mpvue-citypicker/mpvueCityPicker.js
  69. 13 13
      unpackage/dist/dev/mp-weixin/component/popup.js
  70. 12 12
      unpackage/dist/dev/mp-weixin/component/shopList.js
  71. 12 12
      unpackage/dist/dev/mp-weixin/component/textarea.js
  72. 12 12
      unpackage/dist/dev/mp-weixin/component/uinNumber.js
  73. 12 12
      unpackage/dist/dev/mp-weixin/component/uinNumberCart.js
  74. 12 12
      unpackage/dist/dev/mp-weixin/component/uni-icon/uni-icon.js
  75. 13 13
      unpackage/dist/dev/mp-weixin/component/uni-nav-bar/uni-nav-bar.js
  76. 12 12
      unpackage/dist/dev/mp-weixin/component/uni-popup.js
  77. 12 12
      unpackage/dist/dev/mp-weixin/component/uni-status-bar/uni-status-bar.js
  78. 12 12
      unpackage/dist/dev/mp-weixin/component/uploadImage.js
  79. 1 1
      unpackage/dist/dev/mp-weixin/pages/index/cart.js
  80. 0 5
      unpackage/dist/dev/mp-weixin/pages/index/cart.wxss
  81. 1 1
      unpackage/dist/dev/mp-weixin/pages/index/commemt.js
  82. 15 28
      unpackage/dist/dev/mp-weixin/pages/index/feedback.js
  83. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/hotel.js
  84. 1 1
      unpackage/dist/dev/mp-weixin/pages/index/hoteldetail.js
  85. 15 15
      unpackage/dist/dev/mp-weixin/pages/index/hotelsearch.js
  86. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  87. 15 15
      unpackage/dist/dev/mp-weixin/pages/index/searchresult.js
  88. 0 3
      unpackage/dist/dev/mp-weixin/pages/index/shop.js
  89. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/shop.wxml
  90. 13 13
      unpackage/dist/dev/mp-weixin/pages/index/sureBuy.js
  91. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/sureBuy.wxml
  92. 12 13
      unpackage/dist/dev/mp-weixin/pages/index/sureBuy.wxss
  93. 13 13
      unpackage/dist/dev/mp-weixin/pages/myCenter/Settled.js
  94. 15 15
      unpackage/dist/dev/mp-weixin/pages/myCenter/applyfor.js
  95. 12 12
      unpackage/dist/dev/mp-weixin/pages/myCenter/business.js
  96. 14 14
      unpackage/dist/dev/mp-weixin/pages/myCenter/commentback.js
  97. 13 13
      unpackage/dist/dev/mp-weixin/pages/myCenter/definite.js
  98. 29 31
      unpackage/dist/dev/mp-weixin/pages/myCenter/index.js
  99. 0 0
      unpackage/dist/dev/mp-weixin/pages/myCenter/index.wxml
  100. 13 13
      unpackage/dist/dev/mp-weixin/pages/myCenter/information.js

+ 5 - 0
common/uin.css

@@ -1455,4 +1455,9 @@ radio-group label, checkbox-group label{
 		text-align: center;
 		line-height: 70upx;
         margin-top: 35upx;
+	}
+.priceClass {
+		color:#303133!important;
+		font-size: 36upx;
+		font-weight: normal!important;
 	}

+ 29 - 1
pages.json

@@ -104,6 +104,31 @@
 				
 			}
 		},
+		{
+			"path": "pages/myOrder/refuend",
+			"style": {
+				"navigationBarTitleText": "退货/售后",
+				"usingComponents":{
+					"van-card": "/wxcomponents/dist/card/index"
+				}
+				
+			}
+		},
+		
+		
+		{
+			"path": "pages/myCenter/orderdetail",
+			"style": {
+				"navigationBarTitleText": "",
+				"usingComponents":{
+					"van-card": "/wxcomponents/dist/card/index"
+				}
+				
+			}
+		},
+		
+		
+		
 		{
 			"path": "pages/index/searchresult",
 			"style": {
@@ -229,7 +254,10 @@
 				"navigationBarTitleText": "我的地址",
 				"usingComponents":{
 					     "van-field": "/wxcomponents/dist/field/index",
-						  "van-icon": "/wxcomponents/dist/icon/index"
+						  "van-icon": "/wxcomponents/dist/icon/index",
+						  "van-checkbox": "/wxcomponents/dist/checkbox/index",
+						  "van-checkbox-group": "/wxcomponents/dist/checkbox-group/index",
+						  "van-submit-bar": "/wxcomponents/dist/submit-bar/index"
 						}
 			}
 			

+ 1 - 5
pages/index/cart.vue

@@ -324,11 +324,7 @@
 		text-overflow: ellipsis;
 
 	}
-	.priceClass {
-		color:#303133!important;
-		font-weight: 100!important;
-		font-size: 36upx;
-	}
+	
 	.van-card {
 		background-color: #fff!important;
 	}

+ 15 - 7
pages/index/shop.vue

@@ -115,7 +115,7 @@
  				<view class="a-t">
  					<image :src="nuberImg==''?firstImg:nuberImg"></image>
  					<view class="right">
- 						<text class="price" style="font-size: 36upx;color: #303133">{{datalist.goods_price}}</text>
+ 						<text class="price" style="font-size: 36upx;color: #303133">{{totalprice==0?datalist.goods_price:totalprice}}</text>
 						<view v-if="datalist.spec_list.length > 0 ">
 							<view class="selected" v-if="specSelected.length > 0 ">
 								<text class="selected-text" v-for="(sItem, sIndex) in specSelected" :key="sIndex">
@@ -150,7 +150,6 @@
  						</text>
  					</view>
  				</view>
-				
 				<view class="numberchange">
 					  <span>数量</span>
 					  <uninumberbox :max="goods_storage" :min="1" @change="changestorage"/>
@@ -175,8 +174,6 @@
 			</van-goods-action>
 		</View>
 		<Gobacktop @getop="getop" :bottomtop="2" v-if="isTop" />
-
-		<!-- <logionDialog @confirmDiaolog="confirmDiaolog"  @cancelDiaolog="cancelDiaolog" :showdialog="showdialog"/> -->
  	</view>
  </template>
  
@@ -225,7 +222,8 @@
 				},
  				specClass: 'none',
  				specSelected:[],
- 				
+ 				totalprice:0,
+				firstprice: 0,
  				favorite: true,
  				shareList: [],
  				imgList: [
@@ -306,13 +304,20 @@
 					
 			// 跳转到首页
 			goIndex() {
-				uni.switchTab({
-					url:'./index'
+				let id = this.store_id;
+				uni.redirectTo({
+				  url: `/pages/index/hotel?id=${id}`
 				})
+				// uni.switchTab({
+				// 	url:'./index'
+				// })
+				// uni.navigateBack();
 			},
 			// 更改商品数量
 			changestorage(e) {
 				this.shopnumber = e;
+				let firstprice = this.firstprice;
+				this.totalprice = firstprice*this.shopnumber;
 			},
 			// 获取商品详情
 			getshopdetail() {
@@ -518,6 +523,9 @@
 					this.specSelected.push(items)
 					this.goods_storage = items.goods_storage;
 					this.goods_id = items.goods_id;
+					this.firstprice = items.goods_price;
+					this.totalprice = items.goods_price*this.shopnumber;
+					console.log(items);
 				}
 				
 				// if(this.arrayId.length == this.datalist.spec_list.length) {

+ 10 - 10
pages/index/sureBuy.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view style="width: 100%;height: 100vh;background-color: #F5F5F5;">
 		<van-radio-group >
 		   <van-cell-group 
 		   v-for="(item, index) in list"
@@ -398,6 +398,7 @@
 		border-top: 15rpx solid #F5F5F5;
 		border-bottom: 15rpx solid #F5F5F5;
         padding: 0 32upx;
+		background-color: #fff;
 	}
 	.u-box {
 		padding: 15upx 0;
@@ -408,17 +409,14 @@
 		justify-content: space-between;
 		padding: 20upx 36upx;
 		border-bottom: 1px solid #F5F5F5;
+		background-color: #fff;
 	}
 	.changewidth {
 		color: #303133;
 		font-size: 32upx;
 		font-weight: 100!important;
 	}
-	.priceClass {
-		color:#303133!important;
-		font-weight: 100!important;
-		font-size: 36upx;
-	}
+	
 	.van-card {
 		background-color: #fff!important;
 	}
@@ -434,19 +432,21 @@
 		.buttonStatus {
 			display: flex;
 			text-align: left;
+			height: 100upx;
+			line-height: 100upx;
 			.deleteOrder {
-				flex: 3;
+				flex: 6;
 				color: #303133;
 				font-size: 32upx;
+				border-top: 1px solid #f5f5f5;
 				background-color: #fff;
-				padding: 10px 0;
+				padding: 0 0 0 32upx;
 			}
 			.payOrder {
-				flex: 1;
+				flex: 3;
 				font-size: 32upx;
 				color: #fff;
 				background-color: #D9332E;
-				padding: 10px 0;
 				text-align: center;
 			}
 		}

+ 19 - 21
pages/myCenter/index.vue

@@ -26,7 +26,7 @@
 					</view>
 				</view>
 					<view class="myNmaeRight" @click="writeday" v-if="menberinfo.has_sign == 0">每日签到></view>
-					<view class="myNmaeRight" v-if="menberinfo.has_sign == 1">已签到></view>
+					<view class="myNmaeRight" v-if="menberinfo.has_sign == 1">已签到</view>
 			</view>
 		</view>
 		<van-cell @click="gomyorder(0)"  title="我的订单" is-link />
@@ -42,7 +42,7 @@
 				</view>
 				<view class="orderOne"  @click="gomyorder(3)">
 					<image class="imagewidth" src="../../static/order_comment.png"></image>
-					<view>评价</view>
+					<view>评价</view>
 				</view>
 				<view class="orderOne"  @click="gomyorder(4)">
 					<image class="imagewidth"  src="../../static/order_cancel.png"></image>
@@ -199,39 +199,36 @@
 					let state = '';
 					if(e == 0) {
 						state = 'all';
-						uni.$emit('getstate', state)
-						uni.switchTab({
-						   url: '/pages/myOrder/index'  // 我的消息通知
+						uni.navigateTo({
+						   url: `/pages/myCenter/orderdetail?state=${state}`  // 我的消息通知
 						})
 						
 					}else if(e == 1) {
 						 state = 'waiting';
-						 uni.$emit('getstate', state)
-						uni.switchTab({
-						   url: '/pages/myOrder/index'  // 我的消息通知
+						uni.navigateTo({
+						   url: `/pages/myCenter/orderdetail?state=${state}`  // 我的消息通知
 						})
 						
 					}else if(e == 2) {
 						 state = 'payed'; 
-						 uni.$emit('getstate', state)
-						uni.switchTab({
-						   url: '/pages/myOrder/index'  // 我的消息通知
+						uni.navigateTo({
+						   url: `/pages/myCenter/orderdetail?state=${state}`  // 我的消息通知
 						})
 					}else if(e == 3) {
 						 state = 'complete';
-						
+						 uni.navigateTo({
+						    url: `/pages/myCenter/orderdetail?state=${state}`  // 我的消息通知
+						 })
 					}else if(e == 4) {
 						 state = 'cancel';
-						 uni.$emit('getstate', state)
-						uni.switchTab({
-						   url: '/pages/myOrder/index'  // 我的消息通知
+						uni.navigateTo({
+						   url: `/pages/myCenter/orderdetail?state=${state}`  // 我的消息通知
 						})
 					}else if(e == 5) {
-						 state = 'refund';
-						 uni.$emit('getstate', state)
-						uni.switchTab({
-						   url: '/pages/myOrder/index'  // 我的消息通知
-						})
+						state = 'refund';
+						uni.navigateTo({
+							url: '/pages/myOrder/refuend'  // 我的消息通知
+						});
 					}
 					
 				}
@@ -278,8 +275,9 @@
 			goAdress(e) {
 				if(this.successlogion && this.hasLogin) {
 					if(e == 1) {
+						let a = 1;
 							uni.navigateTo({
-								url: '../myOrder/adress'  // 我的地址
+								url: `/pages/myOrder/adress?isform=${a}`  // 我的地址
 							})
 					}else if(e == 0) {
 							uni.navigateTo({

+ 431 - 0
pages/myCenter/orderdetail.vue

@@ -0,0 +1,431 @@
+<template>
+	<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 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="items.goods_pay_price"
+					:desc="items.descire+'X'+items.goods_num"
+					:title="items.desarray"
+					: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>
+		
+		</scroll-view> 
+		<view  v-if="order_list.length == 0 && successlogion && hasLogin" >
+			  <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>
+		</view>
+		<view  v-if="order_list.length == 0 && !successlogion || order_list.length == 0 && !hasLogin" >
+			  <view style="margin: 120upx auto;text-align: center;">
+					<van-icon size="160rpx" color="#909399" name="description" />
+					<view style="text-align: center;color: #909399;">啥都没有
+					<span style="color: #F76260;" @click="gotologion">去登录吧</span></view>
+			  </view>
+		</view>
+		<!-- 催单 -->
+		<Dialog  :orderCancel="orderCancel"
+		    :titles="titles"
+		    @colseDialog="cancelDialog" 
+		    @confirmPay="confirmOrder"
+		 />
+		 <Gobacktop @getop="getop" v-if="isTop" />
+		<!--  <logionDialog @confirmDiaolog="confirmDiaolog" :ishow="false" @cancelDiaolog="cancelDiaolog" :showdialog="showdialog"/> -->
+	</view>
+</template>
+
+<script>
+	import {
+		mapMutations,mapState
+	} from 'vuex'
+	import Dialog from '@/component/Dialog.vue'
+	import Gobacktop from '@/component/Gobacktop.vue'
+	export default{
+		components: {
+			Dialog,
+			Gobacktop
+		},
+		data() {
+			return {
+				isTop: false,
+				ispull: true,
+				showdialog: false,
+				orderCancel: false,
+				titles:'',
+				pictureUrl: this.pictureUrl,
+				menu:[
+					{name:'全部'},
+					{name:'待支付'},
+					{name:'处理中'},
+					{name:'已收货'},
+					{name:'已取消'},
+					{name:'退款售后'}
+				],
+				deleteorder: 0, // 判断删除订单还是确认收货
+				// 要查找的订单状态 all-全部 waiting-待支付 payed-处理中 complete-已收货 cancel-已取消 refund-退款售后
+				active: 0,
+				scrollTop: 0,
+				old: {
+					scrollTop: 0
+				},
+				order_id:'',
+				page: 1,
+				page_size: 10,
+				state: 'all',
+				order_list:[]
+			}
+		},
+		computed:{
+			...mapState([
+			  'hasLogin',
+			  'userInfo',
+			  'successlogion'
+			]),
+		},
+		onLoad(a) {
+			 uni.$on("refehlist",()=>{
+				  this.order_list = [];
+			      this.getlist();
+			  })
+			  // 完成支付
+			  uni.$on(" finshlist",()=>{
+				  this.page = 1;
+			  	  this.order_list = [];
+			      this.getlist();
+			   })
+			 
+			  // 完成评价 
+			  uni.$on("finshesitmate",()=>{
+				   this.page = 1;
+				   this.order_list = [];
+			       this.getlist();
+			   })
+			if(this.successlogion && this.hasLogin){
+				
+				let title = '';
+				if(a.state == 'waiting') {
+					title = '待付款';
+				}else if(a.state == 'payed') {
+						title = '处理中';
+				}else if(a.state == 'cancel'){
+						title = '已取消';
+				}else if(a.state == 'complete'){
+						title = '待评价';
+				}
+				uni.setNavigationBarTitle({
+					title: title
+				})
+			    this.state = a.state;
+				this.getlist(); // 获取订单
+		  	}else {
+				uni.navigateTo({
+					url: '/pages/myCenter/logion'
+				})
+			}
+		},
+		watch:{
+			'successlogion':function(val) {
+			   if(val) {
+				  this.active = 0;
+				  this.getlist(); 
+			   }else {
+				  uni.navigateTo({
+				  	url: '/pages/myCenter/logion'
+				  })
+			   }
+			},
+			'hasLogin':function(val) {
+			   if(val) {
+				  this.active = 0;
+				  this.getlist(); 
+			   }else {
+				  uni.navigateTo({
+				  	url: '/pages/myCenter/logion'
+				  })
+			   }
+			},
+			
+		},
+		methods: {
+			getop() {
+			        this.scrollTop = this.old.scrollTop
+			                this.$nextTick(function(){
+			                    this.scrollTop=0;
+			                });
+			        this.isTop = false;
+			      },
+			gotologion() {
+				uni.navigateTo({
+					url: '/pages/myCenter/logion'
+				})
+			},
+			// 关闭弹窗
+			// cancelDiaolog() {
+			// 	this.showdialog = false;
+			// },
+			// // 确定
+			// confirmDiaolog() {
+			// 	this.showdialog = false;
+			// 	this.getlist(); // 获取订单
+			// },
+			// changeselect(e) {
+			// 	if(this.successlogion && this.hasLogin) {
+			// 		  console.log(e);
+			// 		  this.active = e.target.name;
+			// 		  this.page = 1;
+			// 		  this.ispull = true;
+			// 		  this.order_list = [];
+			// 		  if(e.target.name == 0) {
+			// 			this.state = 'all';
+			// 			this.getlist();
+			// 		  }else if(e.target.name == 1) {
+			// 			this.state = 'waiting';
+			// 			this.getlist();
+			// 		  }else if(e.target.name == 2) {
+			// 			this.state = 'payed';
+			// 			this.getlist();
+			// 		  }else if(e.target.name == 3) {
+			// 			this.state = 'complete';
+			// 			this.getlist();
+			// 		  }else if(e.target.name == 4) {
+			// 			this.state = 'cancel';
+			// 			this.getlist();
+			// 		  }
+					  
+			// 		  if(e.target.name == 5) {
+			// 		  	this.state = 'refund';
+			// 			this.refund();	
+			// 		  }
+			// 	}else {
+			// 		uni.navigateTo({
+			// 			url: '/pages/myCenter/logion'
+			// 		})
+			// 	}
+				
+			// },
+			
+			
+			// 订单退款售后列表
+			refund() {
+				this.request({
+					url: '/v3/order/refund_list',
+					method: 'POST',
+					data: {
+						state: this.state,
+						page: this.page,
+						page_size: 10
+					},
+					success: (res) => {
+						console.log(res.data.data.refund_list);
+						if(res.data.data.refund_list.length< 10) {
+							this.ispull = false;
+						}
+						res.data.data.refund_list.forEach((item,index) => {
+							// item.goods.forEach(items => {
+								let arr = item.goods_name.split(' ');
+								item.desarray = arr[0];
+								item.descire = item.goods_name.replace(arr[0], '');
+							// })
+						})
+						this.order_list = this.order_list.concat(res.data.data.refund_list);
+					}
+				})
+			},
+			// 订单列表
+			getlist() {
+				this.request({
+					url: '/v2/order/orders',
+					method: 'POST',
+					data: {
+						state: this.state,
+						page: this.page,
+						page_size: 10
+					},
+					success: (res) => {
+						if(res.data.data.order_list.length< 10) {
+							this.ispull = false;
+						}
+						res.data.data.order_list.forEach((item,index) => {
+							item.goods.forEach(items => {
+								let arr = items.goods_name.split(' ');
+								items.desarray = arr[0];
+								items.descire = items.goods_name.replace(arr[0], '');
+							})
+						})
+					
+						// let arr = item.goods_name.split(' ');
+						// item.desarray = arr[0];
+						// item.descire = arr.replace(arr[0], '');
+						this.order_list = this.order_list.concat(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.deleteorder = 1;
+					this.orderCancel = true;
+				}else if(e.operate == '催单') {
+					let a = 1;
+					uni.navigateTo({
+							url:`/pages/myOrder/reminder?order_id=${order_id}&a=${a}`
+					})
+				}else if(e.operate == '确认收货') {
+					this.deleteorder = 2;
+					this.titles = '确认收货?'
+					this.orderCancel = true;
+				}else if(e.operate == '去评价') {
+					uni.navigateTo({
+							url:`/pages/myOrder/estimate?order_id=${order_id}`
+					})
+					
+				}else if(e.operate == '联系酒店') {
+					let a = 2;
+					uni.navigateTo({
+							url:`/pages/myOrder/reminder?order_id=${order_id}&a=${a}`
+					})
+				}
+			},
+			cancelDialog() {
+				this.orderCancel = false;
+			},
+			confirmOrder() {
+				// 删除订单 确认收货
+				this.orderCancel = false;
+				let url = this.deleteorder == 1?'/v2/order/drop':'/v2/order/confirm';
+				this.request({
+					url: url,
+					method:'POST',
+					data: {
+						order_id: this.order_id
+					},
+					success: (res) => {
+						this.order_list = [];
+						this.page = 1;
+						this.ispull = true;
+						this.getlist();
+					}
+				})
+			},
+			goDetail(e) {
+				let order_id = e; 
+				uni.navigateTo({
+				        url: `/pages/myOrder/order?id=${order_id}`
+				});
+			},
+			upper(e) {
+				console.log(e)
+				console.log("顶部")
+			},
+			
+			// 滚到底部
+			lower(e) {
+				if(this.ispull) {
+					console.log("l;ll")
+					this.page += 1;
+					this.getlist();
+				}
+				
+			},
+			
+			// 滚动时触发
+			scroll(e) {
+				if(e.detail.scrollTop > 400) {
+				          this.isTop = true;
+				        }else{ //当距离小于500时显示回到顶部按钮
+				          this.isTop = false;
+				        }
+				        this.old.scrollTop = e.detail.scrollTop
+			}
+		}
+		
+	}
+</script>
+  
+<style>
+	page {
+		background-color: #F5F5F5;
+	}
+	.cart-list {
+		background-color: #fff;
+		border-top: 12upx solid #F5F5F5;
+	}
+		
+	.topTip {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 20upx 36upx;
+		border-bottom: 1px solid #F5F5F5;
+	}
+	.changewidth {
+		color: #303133;
+		font-size: 32upx;
+		font-weight: 100!important;
+	}
+		
+	.van-card__desc {
+		font-size: 25rpx;
+		color: #999!important;
+		padding-top: 10rpx;
+	}
+	.priceClass {
+		color:#303133!important;
+		font-size: 36upx;
+		font-weight: normal!important;
+	}
+	.van-card {
+		background-color: #fff!important;
+	}
+	.shoplist {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+	.deleChange {
+		border: 1px solid #C0C4CC;
+		padding: 8upx;
+	}
+</style>

+ 109 - 6
pages/myOrder/adress.vue

@@ -1,7 +1,11 @@
 <template>
 	<view class="content b-t">
+		<view @click="choseAdress" style="text-align: right;padding: 10upx 32upx;">
+			{{isdelete?'管理':'删除'}}
+		</view>
 		<view class="list b-b" v-for="(item, index) in addressList" :key="index">
-			<view  @click="checkAddress(item)" class="wrapper">
+			
+			<view  @click="checkAddress(item)" style="flex: 15;" class="wrapper">
 				<view class="u-box">
 					<text v-if="item.address_is_default == 1" class="tag">↑</text>
 					<text class="name">{{item.address_realname}}</text>
@@ -11,11 +15,28 @@
 					<text class="address">{{item.area_info}} {{item.address_detail}}</text>
 				</view>
 			</view>
-			<van-icon size="30" name="edit" @click="addAddress('edit', item)" color="#D9332E" />
+			<van-icon v-if="isdelete" size="30" name="edit" @click="addAddress('edit', item)" color="#D9332E" />
+			<view  v-if="!isdelete"  style="flex: 2;border-radius: 100%;">
+				<van-checkbox-group :value="checkboxList" @change="checkboxChange()">
+					<van-checkbox  checked-color="#D9332E" :name="index"></van-checkbox>
+				</van-checkbox-group> 
+			</view>
 		<!-- 	<text class="yticon icon-bianji" @click.stop="addAddress('edit', item)"></text> -->
 		</view>
 		
-		<button class="add-btn" @click="addAddress('add', {})">新增地址</button>
+		<button  v-if="isdelete" class="add-btn" @click="addAddress('add', {})">添加地址</button>
+		<view v-if="!isdelete" style="position: fixed;bottom: 0;border-top:1px solid #eee;height: 8vh;">
+		<van-submit-bar
+		  button-text="删除"
+		  @submit="onClickButton"
+		  :tip="true"
+		>
+		<van-checkbox checked-color="#D9332E" :value="isAll" shape="round" @change="onChange">
+		 全选
+		</van-checkbox>
+			
+		</van-submit-bar>
+		</view>
 	</view>
 </template>
 
@@ -23,19 +44,89 @@
 	export default {
 		data() {
 			return {
+				isform: 0,
+				isAll: false,
 				source: 0,
+				isdelete: true,
 				addressList: [
-				]
+				],
+				pricelist: [],
+				checkboxList:[]
 			}
 		},
 		onLoad(option){
 			this.source = option.source;
+			this.isform =  option.isform;
 			this.getlist();
 			uni.$on("refeshadress",(adress)=>{
 			      this.getlist();
 			  })
 		},
 		methods: {
+			
+			// 全选
+			onChange(a) {
+				this.isAll = !this.isAll;
+				let items = this.addressList;
+				if(this.isAll) {
+					items.forEach((item, idx) => {
+						this.$set(this.checkboxList, idx, idx.toString())
+					})
+					let price = [];
+					this.checkboxList.forEach(item => {
+						 price.push(items[item].address_id)
+					})
+					this.pricelist = price;
+					
+				}else {
+						  this.checkboxList = [];
+						  this.pricelist = [];
+					}
+					
+				
+			},
+			
+			// 地址管理
+			choseAdress() {
+				this.isdelete =!this.isdelete; 
+				this.checkboxList = [];
+			},
+			checkboxChange(e) {
+				// 单选
+				console.log(e);
+				this.checkboxList = []
+				e.detail.forEach((item, idx) => {
+					this.$set(this.checkboxList, idx, item)
+				})
+				let array = this.addressList;
+				let price = [];
+				this.checkboxList.forEach(item => {
+					 price.push(array[item].address_id)
+				})
+				this.pricelist = price;
+				console.log(this.pricelist)
+				  
+			   
+			},
+			// 删除地址
+			onClickButton() {
+				console.log(address_ids)
+				let address_ids = this.pricelist.join(',');
+				this.request({
+					url: '/v1/member/address_drop',
+					method: 'post',
+					data: {
+						address_ids: address_ids
+					},
+						
+					success: (res) => {
+						if(res.data.code == 1000) {
+							this.checkboxList = [];
+							this.getlist();
+						}
+					}
+				})
+			},
 			// 获取地址列表
 			getlist() {
 				this.request({
@@ -48,8 +139,11 @@
 			},
 			//选择地址
 			checkAddress(item){
-				 uni.$emit('getadress', item)
-				 uni.navigateBack();
+				if(this.isform!=1) {
+					uni.$emit('getadress', item)
+					uni.navigateBack();
+				}
+			
 				// if(this.source == 1){
 				// 	//this.$api.prePage()获取上一页实例,在App.vue定义
 					
@@ -146,4 +240,13 @@
 		border-radius: 10upx;
 		box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);		
 	}
+	.isdiaplay .van-submit-bar__text {
+		visibility: hidden;
+	}
+	.isdiaplay {
+		visibility: hidden;
+	}
+	.van-submit-bar__bar {
+		justify-content: space-between!important;
+	}
 </style>

+ 24 - 21
pages/myOrder/index.vue

@@ -8,7 +8,7 @@
 		  :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 class="topTip" @click="goStore(item.store_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>
@@ -22,7 +22,7 @@
 				  <van-card
 					title-class="changewidth"
 					price-class ="priceClass"
-					:price="item.order_amount"
+					:price="items.goods_pay_price"
 					:desc="items.descire+'X'+items.goods_num"
 					:title="items.desarray"
 					:thumb="pictureUrl + '/uploads/home/store/goods/'+items.goods_image.substr(0, items.goods_image.indexOf('\_')) + '/' + items.goods_image"
@@ -92,7 +92,7 @@
 					{name:'处理中'},
 					{name:'已收货'},
 					{name:'已取消'},
-					{name:'退款售后'}
+					// s{name:'退款售后'}
 				],
 				deleteorder: 0, // 判断删除订单还是确认收货
 				// 要查找的订单状态 all-全部 waiting-待支付 payed-处理中 complete-已收货 cancel-已取消 refund-退款售后
@@ -121,10 +121,10 @@
 			      this.getlist();
 			  })
 			  // 我的跳掉订单
-			  uni.$on('getstate', (e) => {
-				  console.log(e);
-				  console.log("ss")
-			  })
+			  // uni.$on('getstate', (e) => {
+				 //  console.log(e);
+				 //  console.log("ss")
+			  // })
 			  // 完成支付
 			  uni.$on(" finshlist",()=>{
 				  this.page = 1;
@@ -217,7 +217,7 @@
 					  
 					  if(e.target.name == 5) {
 					  	this.state = 'refund';
-						this.refund();	
+						//this.refund();	
 					  }
 				}else {
 					uni.navigateTo({
@@ -239,17 +239,18 @@
 						page_size: 10
 					},
 					success: (res) => {
-						if(res.data.data.order_list.length< 10) {
+						console.log(res.data.data.refund_list);
+						if(res.data.data.refund_list.length< 10) {
 							this.ispull = false;
 						}
-						res.data.data.order_list.forEach((item,index) => {
-							item.goods.forEach(items => {
-								let arr = items.goods_name.split(' ');
-								items.desarray = arr[0];
-								items.descire = items.goods_name.replace(arr[0], '');
-							})
+						res.data.data.refund_list.forEach((item,index) => {
+							// item.goods.forEach(items => {
+								let arr = item.goods_name.split(' ');
+								item.desarray = arr[0];
+								item.descire = item.goods_name.replace(arr[0], '');
+							// })
 						})
-						this.order_list = this.order_list.concat(res.data.data.order_list);
+						this.order_list = this.order_list.concat(res.data.data.refund_list);
 					}
 				})
 			},
@@ -344,6 +345,12 @@
 				        url: `/pages/myOrder/order?id=${order_id}`
 				});
 			},
+			goStore(e) {
+				let id = e; 
+				 uni.navigateTo({
+				       url: `/pages/index/hotel?id=${id}`
+				 });
+			},
 			upper(e) {
 				console.log(e)
 				console.log("顶部")
@@ -401,11 +408,7 @@
 		color: #999!important;
 		padding-top: 10rpx;
 	}
-	.priceClass {
-		color:#303133!important;
-		font-size: 36upx;
-		font-weight: normal!important;
-	}
+	
 	.van-card {
 		background-color: #fff!important;
 	}

+ 35 - 7
pages/myOrder/order.vue

@@ -1,7 +1,6 @@
 <template>
 	<view class="cart-list">
        <view 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>  
@@ -26,7 +25,7 @@
 	   </view>
 	
 	 <view class="shoplist" v-for="(items,index) in detail.goods" :key="index">
-			  <view>
+			  <view @click="goDetail(items)">
 				  <van-card
 					title-class="changewidth"
 					price-class ="priceClass"
@@ -37,10 +36,10 @@
 				  >
 				  </van-card>
 			  </view>
-			  <view style="clear:both;width: 100%;overflow: hidden;">
+			  <view style="clear:both;width: 100%;overflow: hidden;padding: 20rpx 0;">
 				  <view  class="retungood" v-if="detail.status=='已收货' && items.status == 2" @click="goreturngood(items)">退货退款</view>
 				  <view class="retungood" v-if="detail.status=='已收货' && items.status == 4" @click="goreturndetail(items.or_id)">退款成功</view>
-				   <view class="retungood" v-if="detail.status=='已收货' && items.status ==3" @click="goreturndetail(items.or_id)">退款申请中</view>
+				  <view class="retungood" v-if="detail.status=='已收货' && items.status ==3" @click="goreturndetail(items.or_id)">退款申请中</view>
 			  </view>
 			 
 	 </view>
@@ -58,7 +57,7 @@
 		 </view>
 		 <view>商家发货: 
 		   <text class="time"  v-if="detail.order_state == 10 || detail.order_state == 0 ||  detail.order_state == 20">未发货</text>
-		   <text class="time"  v-else>{{detail.shipping_time}}</text>
+		   <text class="time"  v-else>{{happenTimeFun(detail.shipping_time)}}</text>
 		 </view>
 		 <view>确认收货: 
 			<text class="time"  v-if="detail.order_state == 10 || detail.order_state == 0||  detail.order_state == 20">未确认</text>
@@ -81,10 +80,8 @@
 		</view>
 		<!-- <view v-else>
 			<view v-if="detail.refund_state == 2">删除订单</view>
-			
 		</view> -->
 	 </view>
-
 	<Dialog  :orderCancel="orderCancel" 
 	    :titles="titles"
 	    @colseDialog="cancelDialog" 
@@ -115,8 +112,39 @@
 			console.log(e);
 			this.id = e.id;
 			this.getDetail();
+			// 刷新订单详情  
+			uni.$on('refshlist', (e) => {
+				this.getDetail();			
+			})
+			
 		},
 		methods: {
+			
+			  happenTimeFun(num){//时间戳数据处理
+			                  let date = new Date(num * 1000);
+			                //时间戳为10位需*1000,时间戳为13位的话不需乘1000
+			                let y = date.getFullYear();
+			                let MM = date.getMonth() + 1;
+			                MM = MM < 10 ? ('0' + MM) : MM;//月补0
+			                let d = date.getDate();
+			                 d = d < 10 ? ('0' + d) : d;//天补0
+			                let h = date.getHours();
+			                 h = h < 10 ? ('0' + h) : h;//小时补0
+			                let m = date.getMinutes();
+			                 m = m < 10 ? ('0' + m) : m;//分钟补0
+			                 let s = date.getSeconds();
+			                 s = s < 10 ? ('0' + s) : s;//秒补0
+			                 return y + '-' + MM + '-' + d+ ' ' + h + ':' + m; //年月日
+			                 //return y + '-' + MM + '-' + d + ' ' + h + ':' + m+ ':' + s; //年月日时分秒
+			            },           
+			
+			goDetail(e) {
+				let id = e.goods_commonid; 
+				let store_id = e.store_id; 
+				uni.navigateTo({
+									url: `/pages/index/shop?id=${id}&store_id=${store_id}`
+								}); 
+			},
 			// 退货退款
 			goreturngood(item) {
 				item.statusremak =  this.detail.status;

+ 4 - 2
pages/myOrder/paymoment.vue

@@ -149,10 +149,12 @@
 								    package:  wx.package,
 								    signType: 'MD5',
 								    paySign: wx.paySign,
-								    success: function (res) {
+								    success:  (res) => {
 								        console.log('success:' + JSON.stringify(res));
+										let isform = 2;
+										let order_id = this.order_id;
 										uni.navigateTo({
-											url: `/pages/myOrder/finsh?isform=${this.isform}&order_id=${this.order_id}`
+											url: `/pages/myOrder/finsh?isform=${isform}&order_id=${order_id}`
 										})
 								    },
 								    fail: function (err) {

+ 265 - 0
pages/myOrder/refuend.vue

@@ -0,0 +1,265 @@
+<template>
+	<view>
+		
+		<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="(items,index) in order_list" :key="index"   class="cart-list">
+		   <view  @click="goDetail(items.id)"   class="shoplist" style="background-color: #fff;">
+			  <view>
+				  <van-card
+					title-class="changewidth"
+					price-class ="priceClass"
+					:price="items.goods_price"
+					:desc="items.descire+'X'+items.goods_num"
+					:title="items.desarray"
+					: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;">合计:{{items.total_price}}</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" v-if="items.status == 1" @click="gopay(item)">待处理</view> 
+				  <view class="deleChange" v-if="items.status == 2" @click="gopay(item)">退款成功</view> 
+				  <view class="deleChange" v-if="items.status == 3" @click="gopay(item)">退款失败</view> 
+			   </view>
+		  </view>
+		
+		</scroll-view> 
+		<view  v-if="order_list.length == 0 && successlogion && hasLogin" >
+			  <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>
+		</view>
+	
+		 <Gobacktop @getop="getop" v-if="isTop" />
+		<!--  <logionDialog @confirmDiaolog="confirmDiaolog" :ishow="false" @cancelDiaolog="cancelDiaolog" :showdialog="showdialog"/> -->
+	</view>
+</template>
+
+<script>
+	import {
+		mapMutations,mapState
+	} from 'vuex'
+	import Dialog from '@/component/Dialog.vue'
+	import Gobacktop from '@/component/Gobacktop.vue'
+	export default{
+		components: {
+			Dialog,
+			Gobacktop
+		},
+		data() {
+			return {
+				isTop: false,
+				ispull: true,
+				showdialog: false,
+				orderCancel: false,
+				titles:'',
+				pictureUrl: this.pictureUrl,
+				menu:[
+					{name:'全部'},
+					{name:'待支付'},
+					{name:'处理中'},
+					{name:'已收货'},
+					{name:'已取消'},
+					{name:'退款售后'}
+				],
+				deleteorder: 0, // 判断删除订单还是确认收货
+				// 要查找的订单状态 all-全部 waiting-待支付 payed-处理中 complete-已收货 cancel-已取消 refund-退款售后
+				active: 0,
+				scrollTop: 0,
+				old: {
+					scrollTop: 0
+				},
+				order_id:'',
+				page: 1,
+				page_size: 10,
+				state: 'all',
+				order_list:[]
+			}
+		},
+		computed:{
+			...mapState([
+			  'hasLogin',
+			  'userInfo',
+			  'successlogion'
+			]),
+		},
+		onLoad(a) {
+			if(this.successlogion && this.hasLogin) {
+				this.refund(); // 获取订单
+		  	}else {
+				uni.navigateTo({
+					url: '/pages/myCenter/logion'
+				})
+			}
+		},
+		watch:{
+			'successlogion':function(val) {
+			   if(val) {
+				
+				  this.refund(); 
+			   }else {
+				  uni.navigateTo({
+				  	url: '/pages/myCenter/logion'
+				  })
+			   }
+			},
+			'hasLogin':function(val) {
+			   if(val) {
+				  
+				  this.refund(); 
+			   }else {
+				  uni.navigateTo({
+				  	url: '/pages/myCenter/logion'
+				  })
+			   }
+			},
+			
+		},
+		methods: {
+			getop() {
+			        this.scrollTop = this.old.scrollTop
+					this.$nextTick(function(){
+						this.scrollTop=0;
+					});
+			        this.isTop = false;
+			      },
+			gotologion() {
+				uni.navigateTo({
+					url: '/pages/myCenter/logion'
+				})
+			},
+			// 关闭弹窗
+			// cancelDiaolog() {
+			// 	this.showdialog = false;
+			// },
+			// // 确定
+			// confirmDiaolog() {
+			// 	this.showdialog = false;
+			// 	this.getlist(); // 获取订单
+			
+			
+			
+			// 订单退款售后列表
+			refund() {
+				this.request({
+					url: '/v3/order/refund_list',
+					method: 'POST',
+					data: {
+						state: this.state,
+						page: this.page,
+						page_size: 10
+					},
+					success: (res) => {
+						console.log(res.data.data.refund_list);
+						if(res.data.data.refund_list.length< 10) {
+							this.ispull = false;
+						}
+						res.data.data.refund_list.forEach((item,index) => {
+							// item.goods.forEach(items => {
+								let arr = item.goods_name.split(' ');
+								item.desarray = arr[0];
+								item.descire = item.goods_name.replace(arr[0], '');
+							// })
+						})
+						this.order_list = this.order_list.concat(res.data.data.refund_list);
+					}
+				})
+			},
+		
+			
+			cancelDialog() {
+				this.orderCancel = false;
+			},
+			
+			goDetail(e) {
+				let order_id = e; 
+				console.log(order_id)
+				uni.navigateTo({
+				        url: `/pages/myOrder/returndetail?id=${order_id}`
+				});
+			},
+			upper(e) {
+				console.log(e)
+				console.log("顶部")
+			},
+			
+			// 滚到底部
+			lower(e) {
+				if(this.ispull) {
+					console.log("l;ll")
+					this.page += 1;
+					this.getlist();
+				}
+				
+			},
+			
+			// 滚动时触发
+			scroll(e) {
+				if(e.detail.scrollTop > 400) {
+				          this.isTop = true;
+				        }else{ //当距离小于500时显示回到顶部按钮
+				          this.isTop = false;
+				        }
+				
+				        this.old.scrollTop = e.detail.scrollTop
+			}
+		}
+		
+	}
+</script>
+  
+<style>
+	page {
+		background-color: #F5F5F5;
+	}
+	.cart-list {
+		background-color: #fff;
+		border-top: 12upx solid #F5F5F5;
+	}
+		
+	.topTip {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 20upx 36upx;
+		border-bottom: 1px solid #F5F5F5;
+	}
+	.changewidth {
+		color: #303133;
+		font-size: 32upx;
+		font-weight: 100!important;
+	}
+		
+	.van-card__desc {
+		font-size: 25rpx;
+		color: #999!important;
+		padding-top: 10rpx;
+	}
+	.priceClass {
+		color:#303133!important;
+		font-size: 36upx;
+		font-weight: normal!important;
+	}
+	.van-card {
+		background-color: #fff!important;
+	}
+	.shoplist {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+	.deleChange {
+		border: 1px solid #C0C4CC;
+		padding: 8upx;
+	}
+</style>

+ 7 - 3
pages/myOrder/returndetail.vue

@@ -50,7 +50,8 @@
 		data() {
 			return {
 				id: 0,
-				detail: {}
+				detail: {},
+				pictureUrl: this.pictureUrl,
 			}
 		},
 		onLoad(e) {
@@ -59,7 +60,6 @@
 			
 		},
 		methods: {
-			
 			submitRemin() {
 				this.request({
 					url: '/v3/order/refund_info',
@@ -68,7 +68,11 @@
 						id: this.id
 					},
 					success: (res) => {
-						this.detail = res.data.data;
+						let { data } = res.data;
+						let arr = data.goods_name.split(' ');
+						data.desarray = arr[0];
+						data.descire = data.goods_name.replace(arr[0], '');
+						this.detail = data;
 					}
 				})
 			}

+ 1 - 0
pages/myOrder/returngood.vue

@@ -90,6 +90,7 @@
 						if(res.data.data.code == 1000) {
 							this.$msg("申请退款成功")
 						}
+						uni.$emit('refshlist'); // 刷新订单详情
 						uni.navigateBack();
 					}
 				})

文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/Dialog.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/Gobacktop.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/assess.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/commoNar.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/mpvue-citypicker/mpvueCityPicker.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/popup.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/shopList.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/textarea.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/uinNumber.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/uinNumberCart.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/uni-icon/uni-icon.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/uni-nav-bar/uni-nav-bar.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/uni-popup.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/uni-status-bar/uni-status-bar.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/uploadImage.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/cart.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/feedback.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/hotel.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/hoteldetail.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/hotelsearch.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/searchresult.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/shop.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/sureBuy.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/applyfor.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/commentback.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/definite.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/information.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/myCollect.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/orderdetail.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/adress.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/adressManger.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/estimate.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/order.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/paymoment.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/refuend.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/reminder.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/returndetail.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/returngood.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myone/oneIndex.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myone/onedetail.js.map


+ 3 - 1
unpackage/dist/dev/mp-weixin/app.json

@@ -8,6 +8,8 @@
     "pages/index/commemt",
     "pages/myOrder/returngood",
     "pages/myOrder/returndetail",
+    "pages/myOrder/refuend",
+    "pages/myCenter/orderdetail",
     "pages/index/searchresult",
     "pages/index/feedback",
     "pages/index/hotelsearch",
@@ -71,5 +73,5 @@
     "van-rate": "/wxcomponents/dist/rate/index",
     "van-cell": "/wxcomponents/dist/cell/index"
   },
-  "sitemapLocation": "sitemap14.json"
+  "sitemapLocation": "sitemap4.json"
 }

+ 5 - 0
unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -1646,4 +1646,9 @@ radio-group label, checkbox-group label{
 		line-height: 70rpx;
         margin-top: 35rpx;
 }
+.priceClass {
+		color:#303133!important;
+		font-size: 36rpx;
+		font-weight: normal!important;
+}
 

文件差異過大導致無法顯示
+ 3 - 3
unpackage/dist/dev/mp-weixin/common/vendor.js


文件差異過大導致無法顯示
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/Dialog.js


文件差異過大導致無法顯示
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/Gobacktop.js


文件差異過大導致無法顯示
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/assess.js


文件差異過大導致無法顯示
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/commoNar.js


+ 10 - 10
unpackage/dist/dev/mp-weixin/component/loginDialog.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["component/loginDialog"],{
 
-/***/ 272:
+/***/ 298:
 /*!****************************************************!*\
   !*** D:/uinapp/myuinapp/component/loginDialog.vue ***!
   \****************************************************/
@@ -9,8 +9,8 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _loginDialog_vue_vue_type_template_id_67987460___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./loginDialog.vue?vue&type=template&id=67987460& */ 273);
-/* harmony import */ var _loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./loginDialog.vue?vue&type=script&lang=js& */ 275);
+/* harmony import */ var _loginDialog_vue_vue_type_template_id_67987460___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./loginDialog.vue?vue&type=template&id=67987460& */ 299);
+/* harmony import */ var _loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./loginDialog.vue?vue&type=script&lang=js& */ 301);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 15);
 
@@ -39,7 +39,7 @@ component.options.__file = "D:/uinapp/myuinapp/component/loginDialog.vue"
 
 /***/ }),
 
-/***/ 273:
+/***/ 299:
 /*!***********************************************************************************!*\
   !*** D:/uinapp/myuinapp/component/loginDialog.vue?vue&type=template&id=67987460& ***!
   \***********************************************************************************/
@@ -48,7 +48,7 @@ component.options.__file = "D:/uinapp/myuinapp/component/loginDialog.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_loginDialog_vue_vue_type_template_id_67987460___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./loginDialog.vue?vue&type=template&id=67987460& */ 274);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_loginDialog_vue_vue_type_template_id_67987460___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./loginDialog.vue?vue&type=template&id=67987460& */ 300);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_loginDialog_vue_vue_type_template_id_67987460___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_loginDialog_vue_vue_type_template_id_67987460___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -61,7 +61,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 274:
+/***/ 300:
 /*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/uinapp/myuinapp/component/loginDialog.vue?vue&type=template&id=67987460& ***!
   \***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -88,7 +88,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 275:
+/***/ 301:
 /*!*****************************************************************************!*\
   !*** D:/uinapp/myuinapp/component/loginDialog.vue?vue&type=script&lang=js& ***!
   \*****************************************************************************/
@@ -97,14 +97,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./loginDialog.vue?vue&type=script&lang=js& */ 276);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./loginDialog.vue?vue&type=script&lang=js& */ 302);
 /* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 276:
+/***/ 302:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/uinapp/myuinapp/component/loginDialog.vue?vue&type=script&lang=js& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -199,7 +199,7 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
     'component/loginDialog-create-component',
     {
         'component/loginDialog-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('1')['createComponent'](__webpack_require__(272))
+            __webpack_require__('1')['createComponent'](__webpack_require__(298))
         })
     },
     [['component/loginDialog-create-component']]

文件差異過大導致無法顯示
+ 15 - 15
unpackage/dist/dev/mp-weixin/component/mpvue-citypicker/mpvueCityPicker.js


文件差異過大導致無法顯示
+ 13 - 13
unpackage/dist/dev/mp-weixin/component/popup.js


文件差異過大導致無法顯示
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/shopList.js


文件差異過大導致無法顯示
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/textarea.js


文件差異過大導致無法顯示
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/uinNumber.js


文件差異過大導致無法顯示
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/uinNumberCart.js


文件差異過大導致無法顯示
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/uni-icon/uni-icon.js


文件差異過大導致無法顯示
+ 13 - 13
unpackage/dist/dev/mp-weixin/component/uni-nav-bar/uni-nav-bar.js


文件差異過大導致無法顯示
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/uni-popup.js


文件差異過大導致無法顯示
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/uni-status-bar/uni-status-bar.js


文件差異過大導致無法顯示
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/uploadImage.js


+ 1 - 1
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 */ 268));}).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 */ 313));}).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 */ 284));}).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 */ 329));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

+ 0 - 5
unpackage/dist/dev/mp-weixin/pages/index/cart.wxss

@@ -22,11 +22,6 @@
 		overflow: hidden;
 		text-overflow: ellipsis;
 }
-.priceClass {
-		color:#303133!important;
-		font-weight: 100!important;
-		font-size: 36rpx;
-}
 .van-card {
 		background-color: #fff!important;
 }

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/index/commemt.js

@@ -129,7 +129,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var assess = function assess() {__webpack_require__.e(/*! require.ensure | component/assess */ "component/assess").then((function () {return resolve(__webpack_require__(/*! @/component/assess.vue */ 308));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var assess = function assess() {__webpack_require__.e(/*! require.ensure | component/assess */ "component/assess").then((function () {return resolve(__webpack_require__(/*! @/component/assess.vue */ 324));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};
 
 
 

文件差異過大導致無法顯示
+ 15 - 28
unpackage/dist/dev/mp-weixin/pages/index/feedback.js


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/hotel.js


+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/index/hoteldetail.js

@@ -131,7 +131,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 shopList = function shopList() {__webpack_require__.e(/*! require.ensure | component/shopList */ "component/shopList").then((function () {return resolve(__webpack_require__(/*! @/component/shopList.vue */ 301));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var Gobacktop = function Gobacktop() {__webpack_require__.e(/*! require.ensure | component/Gobacktop */ "component/Gobacktop").then((function () {return resolve(__webpack_require__(/*! @/component/Gobacktop.vue */ 287));}).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 shopList = function shopList() {__webpack_require__.e(/*! require.ensure | component/shopList */ "component/shopList").then((function () {return resolve(__webpack_require__(/*! @/component/shopList.vue */ 317));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var Gobacktop = function Gobacktop() {__webpack_require__.e(/*! require.ensure | component/Gobacktop */ "component/Gobacktop").then((function () {return resolve(__webpack_require__(/*! @/component/Gobacktop.vue */ 303));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

文件差異過大導致無法顯示
+ 15 - 15
unpackage/dist/dev/mp-weixin/pages/index/hotelsearch.js


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/index.js


文件差異過大導致無法顯示
+ 15 - 15
unpackage/dist/dev/mp-weixin/pages/index/searchresult.js


文件差異過大導致無法顯示
+ 0 - 3
unpackage/dist/dev/mp-weixin/pages/index/shop.js


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/shop.wxml


文件差異過大導致無法顯示
+ 13 - 13
unpackage/dist/dev/mp-weixin/pages/index/sureBuy.js


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/sureBuy.wxml


+ 12 - 13
unpackage/dist/dev/mp-weixin/pages/index/sureBuy.wxss

@@ -38,6 +38,7 @@
   border-top: 15rpx solid #F5F5F5;
   border-bottom: 15rpx solid #F5F5F5;
   padding: 0 32rpx;
+  background-color: #fff;
 }
 .u-box {
   padding: 15rpx 0;
@@ -54,17 +55,13 @@
           justify-content: space-between;
   padding: 20rpx 36rpx;
   border-bottom: 1px solid #F5F5F5;
+  background-color: #fff;
 }
 .changewidth {
   color: #303133;
   font-size: 32rpx;
   font-weight: 100 !important;
 }
-.priceClass {
-  color: #303133 !important;
-  font-weight: 100 !important;
-  font-size: 36rpx;
-}
 .van-card {
   background-color: #fff !important;
 }
@@ -89,24 +86,26 @@
     display: -webkit-flex;
     display: flex;
     text-align: left;
+    height: 100rpx;
+    line-height: 100rpx;
 }
 .adressbutton .buttonStatus .deleteOrder {
-      -webkit-box-flex: 3;
-      -webkit-flex: 3;
-              flex: 3;
+      -webkit-box-flex: 6;
+      -webkit-flex: 6;
+              flex: 6;
       color: #303133;
       font-size: 32rpx;
+      border-top: 1px solid #f5f5f5;
       background-color: #fff;
-      padding: 10px 0;
+      padding: 0 0 0 32rpx;
 }
 .adressbutton .buttonStatus .payOrder {
-      -webkit-box-flex: 1;
-      -webkit-flex: 1;
-              flex: 1;
+      -webkit-box-flex: 3;
+      -webkit-flex: 3;
+              flex: 3;
       font-size: 32rpx;
       color: #fff;
       background-color: #D9332E;
-      padding: 10px 0;
       text-align: center;
 }
 

+ 13 - 13
unpackage/dist/dev/mp-weixin/pages/myCenter/Settled.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pages/myCenter/Settled"],{
 
-/***/ 211:
+/***/ 227:
 /*!************************************************************************!*\
   !*** D:/uinapp/myuinapp/main.js?{"page":"pages%2FmyCenter%2FSettled"} ***!
   \************************************************************************/
@@ -11,13 +11,13 @@
 /* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 4);__webpack_require__(/*! @dcloudio/uni-stat */ 5);
 
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 2));
-var _Settled = _interopRequireDefault(__webpack_require__(/*! ./pages/myCenter/Settled.vue */ 212));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
+var _Settled = _interopRequireDefault(__webpack_require__(/*! ./pages/myCenter/Settled.vue */ 228));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
 createPage(_Settled.default);
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"]))
 
 /***/ }),
 
-/***/ 212:
+/***/ 228:
 /*!*****************************************************!*\
   !*** D:/uinapp/myuinapp/pages/myCenter/Settled.vue ***!
   \*****************************************************/
@@ -26,8 +26,8 @@ createPage(_Settled.default);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _Settled_vue_vue_type_template_id_dfc9d076___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Settled.vue?vue&type=template&id=dfc9d076& */ 213);
-/* harmony import */ var _Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Settled.vue?vue&type=script&lang=js& */ 215);
+/* harmony import */ var _Settled_vue_vue_type_template_id_dfc9d076___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Settled.vue?vue&type=template&id=dfc9d076& */ 229);
+/* harmony import */ var _Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Settled.vue?vue&type=script&lang=js& */ 231);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 15);
 
@@ -56,7 +56,7 @@ component.options.__file = "D:/uinapp/myuinapp/pages/myCenter/Settled.vue"
 
 /***/ }),
 
-/***/ 213:
+/***/ 229:
 /*!************************************************************************************!*\
   !*** D:/uinapp/myuinapp/pages/myCenter/Settled.vue?vue&type=template&id=dfc9d076& ***!
   \************************************************************************************/
@@ -65,7 +65,7 @@ component.options.__file = "D:/uinapp/myuinapp/pages/myCenter/Settled.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_template_id_dfc9d076___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./Settled.vue?vue&type=template&id=dfc9d076& */ 214);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_template_id_dfc9d076___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./Settled.vue?vue&type=template&id=dfc9d076& */ 230);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_template_id_dfc9d076___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_template_id_dfc9d076___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -78,7 +78,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 214:
+/***/ 230:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/uinapp/myuinapp/pages/myCenter/Settled.vue?vue&type=template&id=dfc9d076& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -105,7 +105,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 215:
+/***/ 231:
 /*!******************************************************************************!*\
   !*** D:/uinapp/myuinapp/pages/myCenter/Settled.vue?vue&type=script&lang=js& ***!
   \******************************************************************************/
@@ -114,14 +114,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./Settled.vue?vue&type=script&lang=js& */ 216);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./Settled.vue?vue&type=script&lang=js& */ 232);
 /* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 216:
+/***/ 232:
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/uinapp/myuinapp/pages/myCenter/Settled.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -129,7 +129,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 uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 334));}).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 uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 350));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 
@@ -254,5 +254,5 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ })
 
-},[[211,"common/runtime","common/vendor"]]]);
+},[[227,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/myCenter/Settled.js.map

文件差異過大導致無法顯示
+ 15 - 15
unpackage/dist/dev/mp-weixin/pages/myCenter/applyfor.js


+ 12 - 12
unpackage/dist/dev/mp-weixin/pages/myCenter/business.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pages/myCenter/business"],{
 
-/***/ 231:
+/***/ 247:
 /*!*************************************************************************!*\
   !*** D:/uinapp/myuinapp/main.js?{"page":"pages%2FmyCenter%2Fbusiness"} ***!
   \*************************************************************************/
@@ -11,13 +11,13 @@
 /* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 4);__webpack_require__(/*! @dcloudio/uni-stat */ 5);
 
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 2));
-var _business = _interopRequireDefault(__webpack_require__(/*! ./pages/myCenter/business.vue */ 232));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
+var _business = _interopRequireDefault(__webpack_require__(/*! ./pages/myCenter/business.vue */ 248));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
 createPage(_business.default);
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"]))
 
 /***/ }),
 
-/***/ 232:
+/***/ 248:
 /*!******************************************************!*\
   !*** D:/uinapp/myuinapp/pages/myCenter/business.vue ***!
   \******************************************************/
@@ -26,8 +26,8 @@ createPage(_business.default);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _business_vue_vue_type_template_id_626f98f8___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./business.vue?vue&type=template&id=626f98f8& */ 233);
-/* harmony import */ var _business_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./business.vue?vue&type=script&lang=js& */ 235);
+/* harmony import */ var _business_vue_vue_type_template_id_626f98f8___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./business.vue?vue&type=template&id=626f98f8& */ 249);
+/* harmony import */ var _business_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./business.vue?vue&type=script&lang=js& */ 251);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _business_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _business_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 15);
 
@@ -56,7 +56,7 @@ component.options.__file = "D:/uinapp/myuinapp/pages/myCenter/business.vue"
 
 /***/ }),
 
-/***/ 233:
+/***/ 249:
 /*!*************************************************************************************!*\
   !*** D:/uinapp/myuinapp/pages/myCenter/business.vue?vue&type=template&id=626f98f8& ***!
   \*************************************************************************************/
@@ -65,7 +65,7 @@ component.options.__file = "D:/uinapp/myuinapp/pages/myCenter/business.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_business_vue_vue_type_template_id_626f98f8___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./business.vue?vue&type=template&id=626f98f8& */ 234);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_business_vue_vue_type_template_id_626f98f8___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./business.vue?vue&type=template&id=626f98f8& */ 250);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_business_vue_vue_type_template_id_626f98f8___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_business_vue_vue_type_template_id_626f98f8___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -78,7 +78,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 234:
+/***/ 250:
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/uinapp/myuinapp/pages/myCenter/business.vue?vue&type=template&id=626f98f8& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -105,7 +105,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 235:
+/***/ 251:
 /*!*******************************************************************************!*\
   !*** D:/uinapp/myuinapp/pages/myCenter/business.vue?vue&type=script&lang=js& ***!
   \*******************************************************************************/
@@ -114,14 +114,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_business_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./business.vue?vue&type=script&lang=js& */ 236);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_business_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./business.vue?vue&type=script&lang=js& */ 252);
 /* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_business_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_business_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_business_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_business_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_business_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 236:
+/***/ 252:
 /*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/uinapp/myuinapp/pages/myCenter/business.vue?vue&type=script&lang=js& ***!
   \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -162,5 +162,5 @@ var _default =
 
 /***/ })
 
-},[[231,"common/runtime","common/vendor"]]]);
+},[[247,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/myCenter/business.js.map

文件差異過大導致無法顯示
+ 14 - 14
unpackage/dist/dev/mp-weixin/pages/myCenter/commentback.js


文件差異過大導致無法顯示
+ 13 - 13
unpackage/dist/dev/mp-weixin/pages/myCenter/definite.js


文件差異過大導致無法顯示
+ 29 - 31
unpackage/dist/dev/mp-weixin/pages/myCenter/index.js


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/myCenter/index.wxml


文件差異過大導致無法顯示
+ 13 - 13
unpackage/dist/dev/mp-weixin/pages/myCenter/information.js


部分文件因文件數量過多而無法顯示