wcni hace 5 años
padre
commit
aac6543df0
Se han modificado 100 ficheros con 188 adiciones y 132 borrados
  1. 0 2
      App.vue
  2. 0 32
      component/popup.vue
  3. 1 2
      component/shopList.vue
  4. 3 10
      pages/index/index.vue
  5. 3 3
      pages/index/sureBuy.vue
  6. 17 5
      pages/myCenter/Settled.vue
  7. 13 3
      pages/myCenter/applyfor.vue
  8. 0 7
      pages/myCenter/index.vue
  9. 0 9
      pages/myCenter/logion.vue
  10. 0 1
      pages/myCenter/myCollect.vue
  11. 6 5
      pages/myCenter/orderdetail.vue
  12. 1 1
      pages/myOrder/paymoment.vue
  13. 27 11
      pages/myOrder/returndetail.vue
  14. 1 1
      pages/myOrder/returngood.vue
  15. 8 8
      pages/myone/onedetail.vue
  16. 13 0
      unpackage/dist/build/mp-weixin/app.json
  17. 0 0
      unpackage/dist/build/mp-weixin/common/main.js
  18. 0 0
      unpackage/dist/build/mp-weixin/common/main.wxss
  19. 0 0
      unpackage/dist/build/mp-weixin/common/runtime.js
  20. 1 1
      unpackage/dist/build/mp-weixin/common/vendor.js
  21. 10 0
      unpackage/dist/build/mp-weixin/component/Gobacktop.js
  22. 4 0
      unpackage/dist/build/mp-weixin/component/Gobacktop.json
  23. 1 0
      unpackage/dist/build/mp-weixin/component/Gobacktop.wxml
  24. 1 0
      unpackage/dist/build/mp-weixin/component/Gobacktop.wxss
  25. 0 0
      unpackage/dist/build/mp-weixin/component/assess.js
  26. 1 1
      unpackage/dist/build/mp-weixin/component/assess.wxml
  27. 10 0
      unpackage/dist/build/mp-weixin/component/popup.js
  28. 6 0
      unpackage/dist/build/mp-weixin/component/popup.json
  29. 1 0
      unpackage/dist/build/mp-weixin/component/popup.wxml
  30. 0 0
      unpackage/dist/build/mp-weixin/component/popup.wxss
  31. 1 1
      unpackage/dist/build/mp-weixin/component/shopList.js
  32. 1 1
      unpackage/dist/build/mp-weixin/component/shopList.wxml
  33. 1 1
      unpackage/dist/build/mp-weixin/component/shopList.wxss
  34. 10 0
      unpackage/dist/build/mp-weixin/component/uni-popup.js
  35. 4 0
      unpackage/dist/build/mp-weixin/component/uni-popup.json
  36. 1 0
      unpackage/dist/build/mp-weixin/component/uni-popup.wxml
  37. 3 0
      unpackage/dist/build/mp-weixin/component/uni-popup.wxss
  38. 0 0
      unpackage/dist/build/mp-weixin/pages/index/cart.js
  39. 0 0
      unpackage/dist/build/mp-weixin/pages/index/cart.wxml
  40. 1 1
      unpackage/dist/build/mp-weixin/pages/index/cart.wxss
  41. 0 0
      unpackage/dist/build/mp-weixin/pages/index/feedback.js
  42. 0 0
      unpackage/dist/build/mp-weixin/pages/index/hotel.js
  43. 1 1
      unpackage/dist/build/mp-weixin/pages/index/hotel.json
  44. 0 0
      unpackage/dist/build/mp-weixin/pages/index/hotel.wxml
  45. 0 0
      unpackage/dist/build/mp-weixin/pages/index/hotel.wxss
  46. 0 0
      unpackage/dist/build/mp-weixin/pages/index/hoteldetail.js
  47. 2 1
      unpackage/dist/build/mp-weixin/pages/index/hoteldetail.json
  48. 0 0
      unpackage/dist/build/mp-weixin/pages/index/hoteldetail.wxml
  49. 1 1
      unpackage/dist/build/mp-weixin/pages/index/hoteldetail.wxss
  50. 0 0
      unpackage/dist/build/mp-weixin/pages/index/hotelsearch.js
  51. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.js
  52. 3 1
      unpackage/dist/build/mp-weixin/pages/index/index.json
  53. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.wxml
  54. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.wxss
  55. 0 1
      unpackage/dist/build/mp-weixin/pages/index/searchresult.js
  56. 1 1
      unpackage/dist/build/mp-weixin/pages/index/searchresult.wxml
  57. 1 1
      unpackage/dist/build/mp-weixin/pages/index/searchresult.wxss
  58. 0 0
      unpackage/dist/build/mp-weixin/pages/index/shop.js
  59. 1 1
      unpackage/dist/build/mp-weixin/pages/index/shop.json
  60. 0 0
      unpackage/dist/build/mp-weixin/pages/index/shop.wxml
  61. 0 0
      unpackage/dist/build/mp-weixin/pages/index/shop.wxss
  62. 0 0
      unpackage/dist/build/mp-weixin/pages/index/sureBuy.js
  63. 0 0
      unpackage/dist/build/mp-weixin/pages/index/sureBuy.wxml
  64. 1 1
      unpackage/dist/build/mp-weixin/pages/index/sureBuy.wxss
  65. 0 0
      unpackage/dist/build/mp-weixin/pages/myCenter/Settled.js
  66. 1 1
      unpackage/dist/build/mp-weixin/pages/myCenter/Settled.wxml
  67. 1 0
      unpackage/dist/build/mp-weixin/pages/myCenter/Settled.wxss
  68. 0 0
      unpackage/dist/build/mp-weixin/pages/myCenter/applyfor.js
  69. 1 1
      unpackage/dist/build/mp-weixin/pages/myCenter/applyfor.wxml
  70. 1 1
      unpackage/dist/build/mp-weixin/pages/myCenter/applyfor.wxss
  71. 0 0
      unpackage/dist/build/mp-weixin/pages/myCenter/commentback.js
  72. 1 1
      unpackage/dist/build/mp-weixin/pages/myCenter/definite.js
  73. 0 0
      unpackage/dist/build/mp-weixin/pages/myCenter/index.js
  74. 0 0
      unpackage/dist/build/mp-weixin/pages/myCenter/index.wxml
  75. 1 1
      unpackage/dist/build/mp-weixin/pages/myCenter/index.wxss
  76. 1 1
      unpackage/dist/build/mp-weixin/pages/myCenter/information.js
  77. 1 1
      unpackage/dist/build/mp-weixin/pages/myCenter/information.wxml
  78. 0 0
      unpackage/dist/build/mp-weixin/pages/myCenter/logion.js
  79. 0 1
      unpackage/dist/build/mp-weixin/pages/myCenter/myCollect.js
  80. 0 0
      unpackage/dist/build/mp-weixin/pages/myCenter/myCollect.wxml
  81. 0 0
      unpackage/dist/build/mp-weixin/pages/myCenter/orderdetail.js
  82. 8 0
      unpackage/dist/build/mp-weixin/pages/myCenter/orderdetail.json
  83. 0 0
      unpackage/dist/build/mp-weixin/pages/myCenter/orderdetail.wxml
  84. 1 0
      unpackage/dist/build/mp-weixin/pages/myCenter/orderdetail.wxss
  85. 0 1
      unpackage/dist/build/mp-weixin/pages/myOrder/adress.js
  86. 4 1
      unpackage/dist/build/mp-weixin/pages/myOrder/adress.json
  87. 0 1
      unpackage/dist/build/mp-weixin/pages/myOrder/adress.wxml
  88. 1 1
      unpackage/dist/build/mp-weixin/pages/myOrder/adress.wxss
  89. 0 0
      unpackage/dist/build/mp-weixin/pages/myOrder/adressManger.js
  90. 0 0
      unpackage/dist/build/mp-weixin/pages/myOrder/estimate.js
  91. 0 0
      unpackage/dist/build/mp-weixin/pages/myOrder/index.js
  92. 1 1
      unpackage/dist/build/mp-weixin/pages/myOrder/index.json
  93. 0 0
      unpackage/dist/build/mp-weixin/pages/myOrder/index.wxml
  94. 1 1
      unpackage/dist/build/mp-weixin/pages/myOrder/index.wxss
  95. 0 0
      unpackage/dist/build/mp-weixin/pages/myOrder/order.js
  96. 0 0
      unpackage/dist/build/mp-weixin/pages/myOrder/order.wxml
  97. 1 1
      unpackage/dist/build/mp-weixin/pages/myOrder/order.wxss
  98. 0 0
      unpackage/dist/build/mp-weixin/pages/myOrder/paymoment.js
  99. 1 1
      unpackage/dist/build/mp-weixin/pages/myOrder/paymoment.wxml
  100. 1 1
      unpackage/dist/build/mp-weixin/pages/myOrder/paymoment.wxss

+ 0 - 2
App.vue

@@ -15,14 +15,12 @@
 			  'sessionId',   // 登录成功的token
 			  'getcode',  // logion时候获取的code session_key oppen_id
 			  'beginload'
-			  
 			]),
 		},
 		onLaunch: function() {
 			// 用户登录
 			let that = this;
 			let sessionId =  uni.getStorageSync('sessionId');// 用户token
-			console.log(sessionId);
 			let userInfo = uni.getStorageSync('userInfo');// 用户头像信息
 			let getcode= uni.getStorageSync('getcode');// 用户code oppenid
 			console.log(userInfo)

+ 0 - 32
component/popup.vue

@@ -1,43 +1,11 @@
 <template>
 	<view>
-	<!-- 	<view class="example">
-			<view class="example-title">基本用法</view>
-			<button type="button" @click="togglePopup('top')">顶部弹出 popup</button>
-			<uniPopup :show="type === 'top'" position="top" mode="fixed" msg="顶部弹出popup" @hidePopup="togglePopup('')" />
-			<button type="button" @click="togglePopup('middle')">居中弹出 popup</button>
-			<uniPopup :show="type === 'middle'" position="middle" mode="fixed" msg="居中弹出popup" @hidePopup="togglePopup('')" />
-			<button type="button" @click="togglePopup('bottom')">底部部弹出 popup</button>
-			<uniPopup :show="type === 'bottom'" position="bottom" mode="fixed" msg="底部弹出popup" @hidePopup="togglePopup('')" />
-		</view> -->
 		<view class="example">
-			<!-- <view class="example-title">slot用法</view> -->
-			<!-- <button type="button" @click="togglePopup('middle-img')">居中弹出(插屏广告)</button> -->
 			<uniPopup :show="type" position="middle" mode="insert" @hidePopup="togglePopup('')">
 				<view  @click="gomoney" class="uni-center center-box">
 					<image class="image" :src="pictureUrl+'/uploads/home/adv/'+images"  />
 				</view>
 			</uniPopup>
-			<!-- <button type="button" @click="togglePopup('middle-list')">居中弹出(滚动列表)</button>
-			<uniPopup :show="type === 'middle-list'" position="middle" mode="fixed" @hidePopup="togglePopup('')">
-				<scroll-view :scroll-y="true" class="uni-center center-box">
-					<view v-for="(item, index) in list" :key="index" class="uni-list-item">滚动列表数据 {{ item }}</view>
-				</scroll-view>
-			</uniPopup> -->
-			<!-- <button type="button" data-position="bottom" @click="togglePopup('bottom-share')">底部弹出(分享界面)</button>
-			<uniPopup :show="type === 'bottom-share'" position="bottom" @hidePopup="togglePopup('')">
-				<view style="display: block;">
-					<view class="bottom-title">分享到</view>
-					<view class="bottom-content">
-						<view v-for="(item, index) in bottomData" :key="index" class="bottom-content-box">
-							<view :class="item.name" class="bottom-content-image">
-								<text class="icon">{{ item.icon }}</text>
-							</view>
-							<view class="bottom-content-text">{{ item.text }}</view>
-						</view>
-					</view>
-					<view class="bottom-btn" @click="togglePopup('')">取消分享</view>
-				</view>
-			</uniPopup> -->
 		</view>
 	</view>
 </template>

+ 1 - 2
component/shopList.vue

@@ -54,9 +54,8 @@ export default {
 
 <style>
 	.textover {
-		width: 280rpx;
 		text-overflow:ellipsis;  /* ellipsis:显示省略符号来代表被修剪的文本  string:使用给定的字符串来代表被修剪的文本*/ 
		white-space: nowrap;   /* nowrap:规定段落中的文本不进行换行   */ 
		overflow: hidden; /*超出 */ 
-				
+	    display: inline-block;	 /*display:box的时候省略好不出现*/ 
 	}
 	.tags {
 		display:inline-block!important; 

+ 3 - 10
pages/index/index.vue

@@ -1,13 +1,5 @@
 <template>
 	<view class="content">
-	<!-- <view>
-		<view>点击授权{{hasLogin}}</view>
-		<button @click="wxlogion"   open-type="getUserInfo">请点击授权</button>
-	 </view> -->
-	<!-- <logionDialog @confirmDiaolog="confirmDiaolog"  @cancelDiaolog="cancelDiaolog" :showdialog="showdialog"/> -->
-	 <scroll-view  style="height: 100vh;" class="floor-list"
-	  :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
-	  :refresher-enabled="false">
 	 <uniNavBar class="top"  :shadow="false"  :fixed="false" color="#333333" background-color="#FFFFFF">
 	 	<block  style="width: 70%;padding-left: 32upx;" slot="left">
 	 		<view class="city" v-if="!allow">
@@ -51,7 +43,9 @@
 		 在附近酒店找到您入住的酒店
 	 </view>
 	 <view style="border-bottom: 2upx solid #EEEEEE;width: 100%;margin-bottom: 24upx 0;"></view>
-	
+	<scroll-view  class="floor-list"
+	 :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
+	 :refresher-enabled="false">
 	<view v-if="!allow">
      <view class="hotelList" v-for='(item,index) in hotelist' :key="index" @click="openinfo(item)">
 		 <view class="hotleLeft">					
@@ -241,7 +235,6 @@
 				// 		   scrollTop: 0,  
 				// 		})  
 				// },300)  
-			
 				   this.scrollTop = this.old.scrollTop
 	                this.$nextTick(function(){
 	                    this.scrollTop=0;

+ 3 - 3
pages/index/sureBuy.vue

@@ -260,13 +260,13 @@
 						   let arr = item.goods_name.split(' ');
 						   item.desarray = arr[0];
 						   item.descire = item.goods_name.replace(arr[0], '');
-						   totalprice+=Number(item.goods_pay_price)*Number(item.goods_num);
+						   totalprice+=Number(item.goods_pay_price*item.goods_num);
 						})
 						this.hotelname = this.store.store_name
 						this.reserve = this.store.store_name
 						this.pricelist = data.og_list;
 						this.firstprice = totalprice;
-						this.prices = totalprice;
+						this.prices = totalprice.toFixed(2);
 					}
 				})
 			},
@@ -376,7 +376,7 @@
 					success:(res) => {
 						    let price = this.firstprice;
 						    this.ralodprice = Number(res.data.data.shipping_fee);
-							this.prices =  Number(price) + this.ralodprice;
+							this.prices =  Number(price + this.ralodprice).toFixed(2);;
 					}
 				})
 			},

+ 17 - 5
pages/myCenter/Settled.vue

@@ -1,10 +1,11 @@
 <template>
-	<view style="padding: 0 32upx;">
+	<view style="padding: 0 40upx;">
 		 <van-field
 		    :value="hotel_name"
 		    placeholder="请输入酒店名称"
 		    label="酒店名称"
-			@change="hotel_name"
+			style="padding: 0;"
+			@change="changehotel_name"
 		  />
 		<van-field
 		   :value="contacts_address"
@@ -32,7 +33,7 @@
 		  />
 		<view>
 				 <uploadImage  @getImg="getImg"  />
-				 <view>须上传营业执照和手持身份证照</view>
+				 <view style="padding: 15upx 0;">须上传营业执照和手持身份证照</view>
 		</view>
 		<view class="submitRemin" @click="submitRemin">申请入驻</view>
 		   
@@ -56,7 +57,7 @@
 			}
 		},
 		methods: {
-			hotel_name(e) {
+			changehotel_name(e) {
 				this.hotel_name = e.detail;
 			},
 			onChange(e) {
@@ -74,7 +75,10 @@
 			getImg(e) {
 				this.imageList = e;
 			},
+
 			submitRemin() {
+				let reg_card =  /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;
+				let reg_phone = /^1[3456789]\d{9}$/;
 				if(this.hotel_name == '') {
 					this.$msg("请输入酒店名称");
 					return;
@@ -90,9 +94,15 @@
 					this.$msg("请输入电话号码");
 					return;
 					
+				}else if( !reg_phone.test(this.contacts_phone)) {
+						this.$msg("请输入正确手机号")
+						return;
 				}else if(this.contacts_number == '') {
 					this.$msg("请输入身份证号码");
 					return;
+				}else if( !reg_card.test(this.contacts_number)) {
+						this.$msg("请输入正确身份证号码")
+						return;
 				}else if(this.imageList.length == 0) {
 					this.$msg("请上传图片");
 					return;
@@ -124,5 +134,7 @@
 </script>
 
 <style>
-	
+	.van-cell {
+		padding-left: 0!important;
+	}
 </style>

+ 13 - 3
pages/myCenter/applyfor.vue

@@ -1,5 +1,5 @@
 <template>
-	<view style="padding: 0 32upx;">
+	<view style="padding: 0 40upx;">
 		 <van-field
 		    :value="contacts_name"
 		    placeholder="请输入您的姓名"
@@ -26,7 +26,7 @@
 		   />
 		<view>
 				<uploadImage @getImg="getImg" />
-				 <view>须上传营业执照和手持身份证照</view>
+				 <view style="padding: 15upx 0;">须上传营业执照和手持身份证照</view>
 		</view>
 		<view class="submitRemin" @click="goapply">申请代理</view>
 		   
@@ -65,16 +65,23 @@
 				this.contacts_address = e.detail;
 			},
 			goapply() {
-		
+				let reg_card =  /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;
+				let reg_phone = /^1[3456789]\d{9}$/;
 				if(this.contacts_name == '') {
 					this.$msg("请输入姓名");
 					return;
 				}else if(this.contacts_phone == '') {
 					this.$msg("请输入电话号码");
 					return;
+				}else if( !reg_phone.test(this.contacts_phone)) {
+						this.$msg("请输入正确手机号")
+						return;
 				}else if(this.contacts_number == '') {
 					this.$msg("请输入身份证号码");
 					return;
+				}else if( !reg_card.test(this.contacts_number)) {
+						this.$msg("请输入正确身份证号码")
+						return;
 				}else if(this.contacts_address == '') {
 					this.$msg("请输入地址");
 					return;
@@ -117,4 +124,7 @@
 		height: 108upx;
 		width: 108upx;
 	}
+	.van-cell {
+		padding-left: 0!important;
+	}
 </style>

+ 0 - 7
pages/myCenter/index.vue

@@ -168,7 +168,6 @@
 		},
 		watch:{
 			'hasLogin':function(val) {
-				console.log("监听")
 			   if(val) {
 				  this.getuserinfo(); 
 			   }else {
@@ -178,7 +177,6 @@
 			   }
 			},
 			'successlogion':function(val) {
-				console.log("监听")
 			   if(val) {
 				  this.getuserinfo(); 
 			   }else {
@@ -199,7 +197,6 @@
 						uni.navigateTo({
 						   url: `/pages/myCenter/orderdetail?state=${state}`  // 我的消息通知
 						})
-						
 					}else if(e == 1) {
 						 state = 'waiting';
 						uni.navigateTo({
@@ -385,24 +382,20 @@
 				   font-size: 24upx;;
 				}
 			}
-			
 		}
 		.myorder {
 			padding: 0 32upx;
 			.orderList {
 				padding: 28upx 0;
 				display: flex;
-				
 			}
 			.orderOne {
 				flex: 1;
 				flex-direction: column;
 				text-align: center;
-				
 				.imagewidth {
 					width: 44upx;
 					height: 44upx;
-					background-color: red;
 				}
 			}
 		}

+ 0 - 9
pages/myCenter/logion.vue

@@ -14,15 +14,6 @@
 				 <button type="primary" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">手机号登录</button>
 			</view>
 		</view>
-	<!-- 	<van-dialog  title="请登录"
-		:show-cancel-button="ishow"
-		:show="show"
-		@cancel="cancelDialog" @confirm="confirmOrder"
-		confirm-button-open-type="getUserInfo"	
-		confirm-button-color = "#323232"	
-		>
-		</van-dialog> -->
-			<!-- <button @click="wxlogion"   open-type="getUserInfo">请点击授权</button> -->
 	</view>
 	
 </template>

+ 0 - 1
pages/myCenter/myCollect.vue

@@ -25,7 +25,6 @@
 		  						  <view>{{item.store_name}}</view>
 		  						  <view class="contentip">{{item.store_summary}}</view>
 		  					  </view>
-		  					  
 		  				  </view>
 		  </view>
 		  <view v-if="active == 2" v-for="(item,index) in goods_list" @click="goshop(item)" :key="index">

+ 6 - 5
pages/myCenter/orderdetail.vue

@@ -4,7 +4,7 @@
 		  <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-view  v-if="order_list.length > 0" style="height: 100vh;" class="floor-list"
 		  :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
 		  :refresher-enabled="false">
 		  <view v-for="(item,index) in order_list" :key="index"   class="cart-list">
@@ -134,7 +134,6 @@
 			       this.getlist();
 			   })
 			if(this.successlogion && this.hasLogin){
-				
 				let title = '';
 				if(a.state == 'waiting') {
 					title = '待付款';
@@ -144,6 +143,8 @@
 						title = '已取消';
 				}else if(a.state == 'complete'){
 						title = '已收货';
+				}else if(a.state == 'all') {
+					title = '我的订单';
 				}
 				uni.setNavigationBarTitle({
 					title: title
@@ -182,9 +183,9 @@
 		methods: {
 			getop() {
 			        this.scrollTop = this.old.scrollTop
-			                this.$nextTick(function(){
-			                    this.scrollTop=0;
-			                });
+					this.$nextTick(function(){
+						this.scrollTop=0;
+					});
 			        this.isTop = false;
 			      },
 			gotologion() {

+ 1 - 1
pages/myOrder/paymoment.vue

@@ -113,7 +113,7 @@
 									url: `/pages/myOrder/finsh?isform=${this.isform}&order_id=${this.order_id}`
 								})
 								//uni.navigateBack()
-							}, 2000)
+							}, 1000)
 						}
 						
 					}

+ 27 - 11
pages/myOrder/returndetail.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view v-if="isrefash">
 		<view class="cart-list">
 		   <view style="padding: 0 36upx;line-height: 70upx;border-bottom: 14upx solid #F5F5F5;">
 			   <span v-if="detail.status == 1">待处理</span>
@@ -7,13 +7,11 @@
 			   <span v-if="detail.status == 3">退款失败</span>
 		   </view>  
 		   <view style="padding: 30upx 36upx 15upx 36upx;border-bottom: 1px solid #F5F5F5;">
-			   <image :src="pictureUrl+'/uploads/home/store/'+detail.store_id+'/'+detail.store_avatar" style="border-radius: 50%;
+			   <image :src="pictureUrl+'/uploads/home/store/'+store.store_id+'/'+store.store_avatar" style="border-radius: 50%;
 			   width: 50upx;height: 50upx;vertical-align: middle;"></image>
-			  <span style="padding-left: 16upx;">{{detail.store_name}}</span>
+			  <span style="padding-left: 16upx;">{{store.store_name}}</span>
 		   </view>
-		
-		
-				  <view>
+				  <view v-if="isrefash">
 					  <van-card
 						title-class="changewidth"
 						price-class ="priceClass"
@@ -24,10 +22,8 @@
 					  >
 					  </van-card>
 				  </view>
-		 
 		 <view class="topTip">
 			  <view style="font-size: 28upx;">合计:{{detail.goods_price}}</view>
-			
 		 </view>
 		 <view style="padding: 15upx 36upx;">订单编号:<text class="orderCode">{{detail.order_sn}}</text></view>
 		 <view style="padding: 15upx 36upx;">快递单号:<text class="orderCode">{{detail.goods_price}}</text></view>
@@ -50,14 +46,18 @@
 		data() {
 			return {
 				id: 0,
-				detail: {},
+				isrefash: false,
+				detail: null,
+				store: null,
+				store_id: 1,
 				pictureUrl: this.pictureUrl,
 			}
 		},
 		onLoad(e) {
+			console.log(this.detail);
 			this.id = e.id;
 			this.submitRemin();
-			
+			this.getlist();
 		},
 		methods: {
 			submitRemin() {
@@ -73,9 +73,25 @@
 						data.desarray = arr[0];
 						data.descire = data.goods_name.replace(arr[0], '');
 						this.detail = data;
+						this.store_id = data.store_id;
+						this.getstore();
 					}
 				})
-			}
+			},
+			getstore() {
+				this.request({
+					url: '/v1/store/info',
+					method: 'post',
+					data: {
+						store_id: this.store_id
+					},
+					success: (res) => {
+						let { data } = res.data;
+						this.store = data;
+						this.isrefash = true;
+					}
+				})
+			},
 		}
 	}
 </script>

+ 1 - 1
pages/myOrder/returngood.vue

@@ -31,7 +31,7 @@
 		 <view style="padding: 0upx 32upx;">
 			 <TextArea ref="getValue" :tips="tips" @submitValue="submitValue"/>
 			 <uploadImage @getImg="getImg" />	
-			 <view style="margin-top: 20upx;" class="submitRemin" @click="submitRemin">提交</view>
+			 <view style="margin-top: 30upx;" class="submitRemin" @click="submitRemin">提交</view>
 		 </view>
 		   
 	</view>

+ 8 - 8
pages/myone/onedetail.vue

@@ -1,12 +1,14 @@
 <template>
 		<view style="padding: 20upx 32upx;">
+			<view style="font-size: 35rpx;padding-bottom: 30upx;">{{aricte.article_title}}</view>
+			<view style="color: #999;padding-bottom: 30upx;">{{aricte.article_time}}</view>
 			<rich-text :nodes="nodes"></rich-text>
 			<view v-if="aricte.ad_type!=0" class="aricte" :class="isclose?'closeacrile':''">
-				<view style="display: flex;justify-content: space-between;">
+				<view style="display: flex;justify-content: space-between;padding: 20upx 0;">
 					<view>{{aricte.ad_title}}</view>
 					<view style="color:#4399FC;" @click="close">x关闭</view>
 				</view>
-				<view   @click="godetail"  style="padding: 10upx 0upx;position: relative;">
+				<view @click="godetail" style="padding: 10upx 0upx;position: relative;">
 					<image :src=" pictureUrl + '/' + aricte.ad_image" style="height: 600upx;width: 100%;" />
 					<view style="color: #fff;position: absolute;bottom: 20upx;left: 20upx;">广告</view>
 				</view>
@@ -43,9 +45,7 @@
 					uni.navigateTo({
 						url:`/pages/index/shop?id=${id}&store_id=${store_id}`
 					})
-					// uni.navigateTo({
-					// 	url:`/pages/index/shop/?id=${id}&store_id=${store_id}`
-					// })
+				
 				}else if(this.aricte.ad_type == 2) {
 				   //商品
 				   let id = this.aricte.store_id;  // 商品Id
@@ -68,9 +68,8 @@
 						let { data } = res.data;
 						this.aricte = data;
 						const regex = new RegExp('<img', 'gi');
-						data.article_content =data.article_content.replace(regex, 
-						`<img class="changeimg"`);
-						this.nodes = data.article_content;
+						data.article_content =data.article_content.replace(regex,`<img class="changeimg"`);
+						this.nodes = data.article_content;  // 富文本渲染
 					}
 				})
 			}
@@ -81,6 +80,7 @@
 <style>
 	.aricte {
 		background-color: #EEEEEE;
+		padding: 0 28upx 10upx 28upx;
 	}
 	.closeacrile {
 		display: none;

+ 13 - 0
unpackage/dist/build/mp-weixin/app.json

@@ -6,6 +6,10 @@
     "pages/index/cart",
     "pages/index/shop",
     "pages/index/commemt",
+    "pages/myOrder/returngood",
+    "pages/myOrder/returndetail",
+    "pages/myOrder/refuend",
+    "pages/myCenter/orderdetail",
     "pages/index/searchresult",
     "pages/index/feedback",
     "pages/index/hotelsearch",
@@ -16,6 +20,7 @@
     "pages/myOrder/paymoment",
     "pages/myOrder/order",
     "pages/myOrder/reminder",
+    "pages/myone/ariclle",
     "pages/myOrder/estimate",
     "pages/myOrder/adress",
     "pages/myOrder/adressManger",
@@ -43,18 +48,26 @@
     "list": [
       {
         "pagePath": "pages/index/index",
+        "iconPath": "static/bottombtn0101.png",
+        "selectedIconPath": "static/bottombtn0102.png",
         "text": "首页"
       },
       {
         "pagePath": "pages/myone/oneIndex",
+        "iconPath": "static/bottombtn0201.png",
+        "selectedIconPath": "static/bottombtn0202.png",
         "text": "发现"
       },
       {
         "pagePath": "pages/myOrder/index",
+        "iconPath": "static/bottombtn0301.png",
+        "selectedIconPath": "static/bottombtn0302.png",
         "text": "订单"
       },
       {
         "pagePath": "pages/myCenter/index",
+        "iconPath": "static/bottombtn0401.png",
+        "selectedIconPath": "static/bottombtn0402.png",
         "text": "我的"
       }
     ]

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/common/main.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/common/main.wxss


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/common/runtime.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/build/mp-weixin/common/vendor.js


+ 10 - 0
unpackage/dist/build/mp-weixin/component/Gobacktop.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["component/Gobacktop"],{3941:function(t,n,e){},"3b2f":function(t,n,e){"use strict";e.r(n);var u=e("8ea8"),o=e.n(u);for(var c in u)"default"!==c&&function(t){e.d(n,t,(function(){return u[t]}))}(c);n["default"]=o.a},"8ea8":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={props:{isTop:{default:!1,type:Boolean},bottomtop:{default:1}},methods:{goback:function(){this.$emit("getop")}}};n.default=u},cc62:function(t,n,e){"use strict";var u,o=function(){var t=this,n=t.$createElement;t._self._c},c=[];e.d(n,"b",(function(){return o})),e.d(n,"c",(function(){return c})),e.d(n,"a",(function(){return u}))},e3cf:function(t,n,e){"use strict";e.r(n);var u=e("cc62"),o=e("3b2f");for(var c in o)"default"!==c&&function(t){e.d(n,t,(function(){return o[t]}))}(c);e("f103");var a,f=e("f0c5"),r=Object(f["a"])(o["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],a);n["default"]=r.exports},f103:function(t,n,e){"use strict";var u=e("3941"),o=e.n(u);o.a}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'component/Gobacktop-create-component',
+    {
+        'component/Gobacktop-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("e3cf"))
+        })
+    },
+    [['component/Gobacktop-create-component']]
+]);

+ 4 - 0
unpackage/dist/build/mp-weixin/component/Gobacktop.json

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

+ 1 - 0
unpackage/dist/build/mp-weixin/component/Gobacktop.wxml

@@ -0,0 +1 @@
+<view data-event-opts="{{[['tap',[['goback',['$event']]]]]}}" class="{{['top',bottomtop==1?'':'activebottom']}}" bindtap="__e"><image class="imgTop _img" src="/static/back_top.png"></image></view>

+ 1 - 0
unpackage/dist/build/mp-weixin/component/Gobacktop.wxss

@@ -0,0 +1 @@
+.top{width:80rpx;height:80rpx;border-radius:50%;background-color:#fff;border:1px solid #ccc;position:fixed;right:32rpx;bottom:15rpx;background-color:initial}.activebottom{width:90rpx;height:90rpx;border-radius:50%;background-color:#fff;border:1px solid #ccc;position:fixed;right:32rpx;bottom:130rpx;background-color:initial}.imgTop{width:100%;height:100%}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/component/assess.js


+ 1 - 1
unpackage/dist/build/mp-weixin/component/assess.wxml

@@ -1 +1 @@
-<view><block wx:for="{{feedback_list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="uni-padding-wrap" style="border-bottom:1px solid #EEEEEE;padding-bottom:10rpx;"><view class="uni-comment"><view class="uni-comment-list"><view class="uni-comment-face"><image src="{{item.member_avatar}}"></image></view><view class="uni-comment-body"><view class="uni-comment-top"><text style="font-size:28rpx;color:#303133;">{{item.member_truename}}</text><uni-icon vue-id="{{'1573bc42-1-'+index}}" type="star" size="16" bind:__l="__l"></uni-icon></view><view class="uni-comment-date"><text style="color:#909399;font-size:20rpx;">{{item.add_time}}</text></view></view><view><van-rate vue-id="{{'1573bc42-2-'+index}}" value="{{item.satisfaction}}" void-icon="star" void-color="#eee" color="#ee0a24" readonly="true" data-com-type="wx" bind:__l="__l"></van-rate></view></view><view class="uni-comment-content" style="color:#303133;font-size:28rpx;">{{item.content}}</view></view></view></block></view>
+<view><block wx:for="{{feedback_list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="uni-padding-wrap" style="border-bottom:1px solid #EEEEEE;padding-bottom:10rpx;"><view class="uni-comment"><view class="uni-comment-list"><view class="uni-comment-face"><image style="width:100%;height:100%;" src="{{item.member_avatar}}"></image></view><view class="uni-comment-body"><view class="uni-comment-top"><text style="font-size:28rpx;color:#303133;">{{item.member_truename}}</text><uni-icon vue-id="{{'1573bc42-1-'+index}}" type="star" size="16" bind:__l="__l"></uni-icon></view><view class="uni-comment-date"><text style="color:#909399;font-size:20rpx;">{{item.add_time}}</text></view></view><view><van-rate vue-id="{{'1573bc42-2-'+index}}" value="{{item.satisfaction}}" void-icon="star" void-color="#eee" color="#ee0a24" readonly="true" data-com-type="wx" bind:__l="__l"></van-rate></view></view><view class="uni-comment-content" style="color:#303133;font-size:28rpx;">{{item.content}}</view></view></view></block></view>

+ 10 - 0
unpackage/dist/build/mp-weixin/component/popup.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["component/popup"],{"11d5":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o=function(){e.e("component/uni-popup").then(function(){return resolve(e("d589"))}.bind(null,e)).catch(e.oe)},u={props:{ishow:{default:!1,type:Boolean},images:{default:"",type:String}},components:{uniPopup:o},data:function(){return{type:!0,pictureUrl:this.pictureUrl,list:["1","2","3","4","5","6","7","8","9","10"],bottomData:[{text:"微信",icon:"",name:"wx"},{text:"朋友圈",icon:"",name:"wx"},{text:"QQ",icon:"",name:"qq"},{text:"新浪",icon:"",name:"sina"},{text:"复制",icon:"",name:"copy"},{text:"更多",icon:"",name:"more"}]}},onBackPress:function(){if(""!==this.type)return this.type="",!0},methods:{togglePopup:function(){this.type=!1},gomoney:function(){t.navigateTo({url:"/pages/myCenter/definite"})}}};n.default=u}).call(this,e("543d")["default"])},"18e8":function(t,n,e){"use strict";e.r(n);var o=e("11d5"),u=e.n(o);for(var i in o)"default"!==i&&function(t){e.d(n,t,(function(){return o[t]}))}(i);n["default"]=u.a},"1b6a":function(t,n,e){"use strict";var o,u=function(){var t=this,n=t.$createElement;t._self._c},i=[];e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return o}))},"4e89":function(t,n,e){},"5c7f":function(t,n,e){"use strict";var o=e("4e89"),u=e.n(o);u.a},"65d0":function(t,n,e){"use strict";e.r(n);var o=e("1b6a"),u=e("18e8");for(var i in u)"default"!==i&&function(t){e.d(n,t,(function(){return u[t]}))}(i);e("5c7f");var c,a=e("f0c5"),r=Object(a["a"])(u["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],c);n["default"]=r.exports}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'component/popup-create-component',
+    {
+        'component/popup-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("65d0"))
+        })
+    },
+    [['component/popup-create-component']]
+]);

+ 6 - 0
unpackage/dist/build/mp-weixin/component/popup.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "uni-popup": "/component/uni-popup"
+  }
+}

+ 1 - 0
unpackage/dist/build/mp-weixin/component/popup.wxml

@@ -0,0 +1 @@
+<view><view class="example"><uni-popup vue-id="99e654ec-1" show="{{type}}" position="middle" mode="insert" data-event-opts="{{[['^hidePopup',[['togglePopup',['']]]]]}}" bind:hidePopup="__e" bind:__l="__l" vue-slots="{{['default']}}"><view data-event-opts="{{[['tap',[['gomoney',['$event']]]]]}}" class="uni-center center-box" bindtap="__e"><image class="image" src="{{pictureUrl+'/uploads/home/adv/'+images}}"></image></view></uni-popup></view></view>

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/component/popup.wxss


+ 1 - 1
unpackage/dist/build/mp-weixin/component/shopList.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["component/shopList"],{"5cf7":function(t,n,o){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{productList:{type:Array}},data:function(){return{title:"product-list",renderImage:!1,pictureUrl:this.pictureUrl}},methods:{goshop:function(n){console.log(n);var o=n.goods_commonid,e=n.store_id;t.navigateTo({url:"/pages/index/shop?id=".concat(o,"&store_id=").concat(e)})}},onLoad:function(){},onPullDownRefresh:function(){},onReachBottom:function(){}};n.default=o}).call(this,o("543d")["default"])},"989b":function(t,n,o){"use strict";o.r(n);var e=o("b129"),r=o("d4f4");for(var u in r)"default"!==u&&function(t){o.d(n,t,(function(){return r[t]}))}(u);o("f2ca");var a,c=o("f0c5"),i=Object(c["a"])(r["default"],e["b"],e["c"],!1,null,null,null,!1,e["a"],a);n["default"]=i.exports},a01a:function(t,n,o){},b129:function(t,n,o){"use strict";var e,r=function(){var t=this,n=t.$createElement,o=(t._self._c,t.__map(t.productList,(function(n,o){var e=n.goods_image.substr(0,n.goods_image.indexOf("_"));return{$orig:t.__get_orig(n),g0:e}})));t.$mp.data=Object.assign({},{$root:{l0:o}})},u=[];o.d(n,"b",(function(){return r})),o.d(n,"c",(function(){return u})),o.d(n,"a",(function(){return e}))},d4f4:function(t,n,o){"use strict";o.r(n);var e=o("5cf7"),r=o.n(e);for(var u in e)"default"!==u&&function(t){o.d(n,t,(function(){return e[t]}))}(u);n["default"]=r.a},f2ca:function(t,n,o){"use strict";var e=o("a01a"),r=o.n(e);r.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["component/shopList"],{"5cf7":function(t,n,o){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{productList:{type:Array}},data:function(){return{title:"product-list",renderImage:!1,pictureUrl:this.pictureUrl}},methods:{goshop:function(n){console.log(n);var o=n.goods_commonid,e=n.store_id;t.navigateTo({url:"/pages/index/shop?id=".concat(o,"&store_id=").concat(e)})}},onLoad:function(){},onPullDownRefresh:function(){},onReachBottom:function(){}};n.default=o}).call(this,o("543d")["default"])},"989b":function(t,n,o){"use strict";o.r(n);var e=o("fadb"),r=o("d4f4");for(var a in r)"default"!==a&&function(t){o.d(n,t,(function(){return r[t]}))}(a);o("f2ca");var u,c=o("f0c5"),i=Object(c["a"])(r["default"],e["b"],e["c"],!1,null,null,null,!1,e["a"],u);n["default"]=i.exports},a01a:function(t,n,o){},d4f4:function(t,n,o){"use strict";o.r(n);var e=o("5cf7"),r=o.n(e);for(var a in e)"default"!==a&&function(t){o.d(n,t,(function(){return e[t]}))}(a);n["default"]=r.a},f2ca:function(t,n,o){"use strict";var e=o("a01a"),r=o.n(e);r.a},fadb:function(t,n,o){"use strict";var e,r=function(){var t=this,n=t.$createElement,o=(t._self._c,t.__map(t.productList,(function(n,o){var e=n.goods_image.substr(0,n.goods_image.indexOf("_"));return{$orig:t.__get_orig(n),g0:e}})));t.$mp.data=Object.assign({},{$root:{l0:o}})},a=[];o.d(n,"b",(function(){return r})),o.d(n,"c",(function(){return a})),o.d(n,"a",(function(){return e}))}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'component/shopList-create-component',
     {

+ 1 - 1
unpackage/dist/build/mp-weixin/component/shopList.wxml

@@ -1 +1 @@
-<view class="page"><view class="uni-product-list"><block wx:for="{{$root.l0}}" wx:for-item="product" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['goshop',['$0'],[[['productList','',index]]]]]]]}}" class="uni-product" bindtap="__e"><view class="image-view"><image class="uni-product-image" src="{{pictureUrl+'/uploads/home/store/goods/'+product.g0+'/'+product.$orig.goods_image}}"></image></view><view class="uni-product-title textover">{{product.$orig.goods_name}}</view><view class="uni-product-price"><text class="uni-product-price-original">{{"¥"+product.$orig.goods_marketprice}}</text><text class="uni-product-price-favour">{{"¥"+product.$orig.goods_costprice}}</text></view></view></block></view></view>
+<view class="page"><view class="uni-product-list"><block wx:for="{{$root.l0}}" wx:for-item="product" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['goshop',['$0'],[[['productList','',index]]]]]]]}}" style="padding:20rpx;" bindtap="__e"><view class="image-view"><image class="uni-product-image" src="{{pictureUrl+'/uploads/home/store/goods/'+product.g0+'/'+product.$orig.goods_image}}"></image></view><view class="uni-product-title textover">{{product.$orig.goods_name}}</view><view class="uni-product-price"><text class="uni-product-price-original" style="color:#D9332E!important;font-weight:bold;">{{"¥"+product.$orig.goods_price}}</text><text class="uni-product-price-favour">{{"¥"+product.$orig.goods_marketprice}}</text></view><block wx:if="{{product.$orig.goods_advword!=''}}"><view class="tags">{{product.$orig.goods_advword}}</view></block></view></block></view></view>

+ 1 - 1
unpackage/dist/build/mp-weixin/component/shopList.wxss

@@ -1 +1 @@
-.textover{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.textover{width:280rpx;text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.tags{display:inline-block!important;border:1px solid #d9332e;color:#d9332e;text-align:center;line-height:50rpx;width:auto;padding:0 10rpx;margin-top:10rpx}

+ 10 - 0
unpackage/dist/build/mp-weixin/component/uni-popup.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["component/uni-popup"],{"25d2":function(t,n,e){"use strict";var o,i=function(){var t=this,n=t.$createElement;t._self._c},u=[];e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){return o}))},6487:function(t,n,e){"use strict";var o=e("92bd"),i=e.n(o);i.a},"731d":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={name:"UniPopup",props:{show:{type:Boolean,default:!1},position:{type:String,default:"middle"},mode:{type:String,default:"insert"},msg:{type:String,default:""},h5Top:{type:Boolean,default:!1},buttonMode:{type:String,default:"bottom"}},data:function(){return{offsetTop:0}},watch:{h5Top:function(t){this.offsetTop=t?44:0}},created:function(){var t=0;this.offsetTop=t},methods:{hide:function(){"insert"===this.mode&&"middle"===this.position||this.$emit("hidePopup")},closeMask:function(){"insert"===this.mode&&this.$emit("hidePopup")},moveHandle:function(){}}};n.default=o},"92bd":function(t,n,e){},d589:function(t,n,e){"use strict";e.r(n);var o=e("25d2"),i=e("fd06");for(var u in i)"default"!==u&&function(t){e.d(n,t,(function(){return i[t]}))}(u);e("6487");var f,d=e("f0c5"),r=Object(d["a"])(i["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],f);n["default"]=r.exports},fd06:function(t,n,e){"use strict";e.r(n);var o=e("731d"),i=e.n(o);for(var u in o)"default"!==u&&function(t){e.d(n,t,(function(){return o[t]}))}(u);n["default"]=i.a}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'component/uni-popup-create-component',
+    {
+        'component/uni-popup-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("d589"))
+        })
+    },
+    [['component/uni-popup-create-component']]
+]);

+ 4 - 0
unpackage/dist/build/mp-weixin/component/uni-popup.json

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

+ 1 - 0
unpackage/dist/build/mp-weixin/component/uni-popup.wxml

@@ -0,0 +1 @@
+<view><view data-event-opts="{{[['tap',[['hide',['$event']]]],['touchmove',[['moveHandle',['$event']]]]]}}" hidden="{{!(show)}}" class="uni-mask" style="{{'top:'+(offsetTop+'px')+';'}}" bindtap="__e" catchtouchmove="__e"></view><view hidden="{{!(show)}}" class="{{['uni-popup','uni-popup-'+position+' '+'uni-popup-'+mode]}}">{{''+msg+''}}<slot></slot><block wx:if="{{position==='middle'&&mode==='insert'}}"><view data-event-opts="{{[['tap',[['closeMask',['$event']]]]]}}" class="{{[' uni-icon uni-icon-close',(buttonMode==='bottom')?'uni-close-bottom':'',(buttonMode==='right')?'uni-close-right':'']}}" bindtap="__e"></view></block></view></view>

+ 3 - 0
unpackage/dist/build/mp-weixin/component/uni-popup.wxss

@@ -0,0 +1,3 @@
+.uni-mask{position:fixed;z-index:998;top:0;right:0;bottom:0;left:0;background-color:rgba(0,0,0,.3)}.uni-popup{position:fixed;z-index:999;background-color:#fff}.uni-popup-middle{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.uni-popup-middle.uni-popup-insert{min-width:380rpx;min-height:380rpx;max-width:100%;max-height:80%;-webkit-transform:translate(-50%,-65%);transform:translate(-50%,-65%);background:none;box-shadow:none}.uni-popup-middle.uni-popup-fixed{border-radius:10rpx;padding:30rpx}.uni-close-bottom,
+.uni-close-right{position:absolute;bottom:-180rpx;text-align:center;border-radius:50%;color:#f5f5f5;font-size:60rpx;font-weight:700;opacity:.8;z-index:-1}.uni-close-bottom{margin:auto;left:0;right:0}.uni-close-right{right:-60rpx;top:-80rpx}.uni-close-bottom:after{content:"";position:absolute;width:0;border:1px #f5f5f5 solid;top:-200rpx;bottom:56rpx;left:50%;-webkit-transform:translate(-50%);transform:translate(-50%);opacity:.8}.uni-popup-top,
+.uni-popup-bottom{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}.uni-popup-top{top:0;left:0;width:100%;height:100rpx;line-height:100rpx;text-align:center}.uni-popup-bottom{left:0;bottom:0;width:100%;min-height:100rpx;line-height:100rpx;text-align:center}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/cart.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/cart.wxml


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/index/cart.wxss

@@ -1 +1 @@
-.uniNavBar{height:100%}.cart-list{background-color:#fff}.titleright{text-align:right;padding:10rpx 30rpx;background:#fff;border-bottom:1px solid #eee;height:4vh}.changewidth{color:#303133;font-size:32rpx;font-weight:100!important;width:70%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.priceClass{color:#303133!important;font-weight:100!important;font-size:36rpx}.van-card{background-color:#fff!important}.shoplist{display:-webkit-box;display:-webkit-flex;display:flex;padding:0 35rpx;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;align-items:center;padding-bottom:25rpx}.checklabel{-webkit-transform:scale(.7);transform:scale(.7);border-radius:100%}.checkboxteil{-webkit-transform:scale(.7);transform:scale(.7);border-radius:100%}.uni-numbox{position:static!important;float:right}.isdiaplay .van-submit-bar__text{visibility:hidden}.isdiaplay{visibility:hidden}
+.betweenclass{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify!important;-webkit-justify-content:space-between!important;justify-content:space-between!important}.uniNavBar{height:100%}.cart-list{background-color:#fff}.titleright{text-align:right;padding:10rpx 30rpx;background:#fff;border-bottom:1px solid #eee;height:4vh}.changewidth{color:#303133;font-size:32rpx;font-weight:100!important;width:70%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.van-card{background-color:#fff!important}.shoplist{display:-webkit-box;display:-webkit-flex;display:flex;padding:0 35rpx;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;align-items:center;padding-bottom:25rpx}.checklabel{-webkit-transform:scale(.7);transform:scale(.7);border-radius:100%}.checkboxteil{-webkit-transform:scale(.7);transform:scale(.7);border-radius:100%}.uni-numbox{position:static!important;float:right}.isdiaplay .van-submit-bar__text{visibility:hidden}.isdiaplay{visibility:hidden}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/feedback.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/hotel.js


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/index/hotel.json

@@ -16,6 +16,6 @@
     "commo-nar": "/component/commoNar",
     "assess": "/component/assess",
     "shop-list": "/component/shopList",
-    "logion-dialog": "/component/loginDialog"
+    "gobacktop": "/component/Gobacktop"
   }
 }

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/hotel.wxml


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/hotel.wxss


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/hoteldetail.js


+ 2 - 1
unpackage/dist/build/mp-weixin/pages/index/hoteldetail.json

@@ -6,6 +6,7 @@
     "van-dropdown-menu": "/wxcomponents/dist/dropdown-menu/index",
     "van-dropdown-item": "/wxcomponents/dist/dropdown-item/index",
     "van-icon": "/wxcomponents/dist/icon/index",
-    "shop-list": "/component/shopList"
+    "shop-list": "/component/shopList",
+    "gobacktop": "/component/Gobacktop"
   }
 }

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/hoteldetail.wxml


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/index/hoteldetail.wxss

@@ -1 +1 @@
-.active{color:#f76260}.typeItem{width:25%;display:inline-block;text-align:center}.iconClass{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;flex-direction:row;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-justify-content:space-around;justify-content:space-around}
+.active{color:#f76260}.typeItem{width:25%;display:inline-block;text-align:center}.iconClass{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;flex-direction:row;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/hotelsearch.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/index.js


+ 3 - 1
unpackage/dist/build/mp-weixin/pages/index/index.json

@@ -2,8 +2,10 @@
   "navigationBarTitleText": "首页",
   "usingComponents": {
     "van-search": "/wxcomponents/dist/search/index",
+    "unipopup": "/component/popup",
     "uni-nav-bar": "/component/uni-nav-bar/uni-nav-bar",
     "uni-icon": "/component/uni-icon/uni-icon",
-    "logion-dialog": "/component/loginDialog"
+    "logion-dialog": "/component/loginDialog",
+    "gobacktop": "/component/Gobacktop"
   }
 }

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/index.wxml


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/index.wxss


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 1
unpackage/dist/build/mp-weixin/pages/index/searchresult.js


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/index/searchresult.wxml

@@ -1 +1 @@
-<view class="searchType" style="background:#fff;height:100vh;"><van-cell vue-id="92afc16a-1" value-class="searchclass" data-com-type="wx" bind:__l="__l" vue-slots="{{['default','title']}}"><view slot="title"><view class="input-view"><uni-icon vue-id="{{('92afc16a-2')+','+('92afc16a-1')}}" type="search" size="22" color="#666666" bind:__l="__l"></uni-icon><input class="input" confirm-type="search" type="text" placeholder="输入搜索关键词" data-event-opts="{{[['input',[['confirm',['$event']]]]]}}" bindinput="__e"/></view></view><view data-event-opts="{{[['tap',[['search',['$event']]]]]}}" bindtap="__e">搜索</view></van-cell><block wx:for="{{hotelist}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="hotelList"><view class="hotleLeft"><image style="width:214rpx;height:152rpx;" src="{{pictureUrl+'/uploads/home/adv/'+item.store_logo}}"></image></view><view class="hotelright"><view style="font-size:32rpx;color:#303133;font-weight:550;">{{item.store_name+''}}</view><view style="display:flex;flex-direction:row;justify-content:space-between;align-items:center;padding:10rpx 0;"><view style="font-size:32rpx;color:#303133;font-weight:550;">{{item.store_servicecredit}}</view><view style="color:#606266;font-size:24rpx;">{{"月访客"+item.store_visitor}}</view><view style="color:#606266;font-size:24rpx;">{{item.distance}}</view></view><block wx:if="{{item.tages.length!=1}}"><view class="undertip"><block wx:for="{{item.tages}}" wx:for-item="items" wx:for-index="index" wx:key="index"><view class="tipsTop">{{items}}</view></block></view></block></view></view></block></view>
+<view class="searchType" style="background:#fff;height:100vh;"><van-cell vue-id="92afc16a-1" value-class="searchclass" data-com-type="wx" bind:__l="__l" vue-slots="{{['default','title']}}"><view slot="title"><view class="input-view"><uni-icon vue-id="{{('92afc16a-2')+','+('92afc16a-1')}}" type="search" size="22" color="#666666" bind:__l="__l"></uni-icon><input class="input" confirm-type="search" type="text" placeholder="输入搜索关键词" data-event-opts="{{[['input',[['confirm',['$event']]]]]}}" bindinput="__e"/></view></view><view data-event-opts="{{[['tap',[['search',['$event']]]]]}}" bindtap="__e">搜索</view></van-cell><block wx:for="{{hotelist}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="hotelList"><view class="hotleLeft"><image style="width:214rpx;height:152rpx;" src="{{pictureUrl+'/uploads/home/store/'+item.store_id+'/'+item.store_banner}}"></image></view><view class="hotelright"><view style="font-size:32rpx;color:#303133;font-weight:550;">{{item.store_name+''}}</view><view style="display:flex;flex-direction:row;justify-content:space-between;align-items:center;padding:10rpx 0;"><view style="font-size:32rpx;color:#303133;font-weight:550;">{{item.store_servicecredit}}</view><view style="color:#606266;font-size:24rpx;">{{"月访客"+item.store_visitor}}</view><view style="color:#606266;font-size:24rpx;">{{item.distance}}</view></view><block wx:if="{{item.tages.length!=1}}"><view class="undertip"><block wx:for="{{item.tages}}" wx:for-item="items" wx:for-index="index" wx:key="index"><view class="tipsTop">{{items}}</view></block></view></block></view></view></block></view>

+ 1 - 1
unpackage/dist/build/mp-weixin/pages/index/searchresult.wxss

@@ -1 +1 @@
-.searchType .input-view{width:80%;display:-webkit-box;display:-webkit-flex;display:flex;background-color:#e7e7e7;height:30px;border-radius:15px;padding:0 4%;-webkit-flex-wrap:nowrap;flex-wrap:nowrap;margin:7px 0;line-height:30px;margin:24rpx 0 24rpx 32rpx}.searchType .input-view .uni-icon{line-height:30px!important}.searchType .input-view .input{height:30px;line-height:30px;width:94%;padding:0 3%}.van-cell__title{-webkit-box-flex:6!important;-webkit-flex:6!important;flex:6!important}.searchclass{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}.van-cell{padding:15rpx 32rpx 0 32rpx!important}.hotelList{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;flex-direction:row;padding:24rpx 32rpx}.hotleLeft{width:214rpx;height:152rpx;background-color:#007aff}.hotelright{padding-left:16rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;width:100%}.undertip{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;flex-direction:row;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.tipsTop{border:2rpx solid #bbb;margin-right:14rpx;color:#bbb;padding:4rpx}
+.searchType .input-view{width:80%;display:-webkit-box;display:-webkit-flex;display:flex;background-color:#e7e7e7;height:30px;border-radius:15px;padding:0 4%;-webkit-flex-wrap:nowrap;flex-wrap:nowrap;margin:7px 0;line-height:30px;margin:24rpx 0 24rpx 32rpx}.searchType .input-view .uni-icon{line-height:30px!important}.searchType .input-view .input{height:30px;line-height:30px;width:94%;padding:0 3%}.van-cell__title{-webkit-box-flex:6!important;-webkit-flex:6!important;flex:6!important}.searchclass{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}.van-cell{padding:15rpx 32rpx 0 32rpx!important}.hotelList{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;flex-direction:row;padding:24rpx 32rpx}.hotleLeft{width:214rpx;height:152rpx}.hotelright{padding-left:16rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;width:100%}.undertip{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;flex-direction:row;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.tipsTop{border:2rpx solid #bbb;margin-right:14rpx;color:#bbb;padding:4rpx}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/shop.js


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/index/shop.json

@@ -9,6 +9,6 @@
     "uni-icon": "/component/uni-icon/uni-icon",
     "assess": "/component/assess",
     "uninumberbox": "/component/uinNumber",
-    "logion-dialog": "/component/loginDialog"
+    "gobacktop": "/component/Gobacktop"
   }
 }

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/shop.wxml


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/shop.wxss


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/sureBuy.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/sureBuy.wxml


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/index/sureBuy.wxss

@@ -1 +1 @@
-.LinkAdress .van-cell{border-top:15rpx solid #f5f5f5;border-bottom:15rpx solid #f5f5f5}.wrapper{border-top:15rpx solid #f5f5f5;border-bottom:15rpx solid #f5f5f5;padding:0 32rpx}.u-box{padding:15rpx 0}.topTip{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;padding:20rpx 36rpx;border-bottom:1px solid #f5f5f5}.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}.shoplist{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.adressbutton{position:fixed;bottom:0;width:100%}.adressbutton .buttonStatus{display:-webkit-box;display:-webkit-flex;display:flex;text-align:left}.adressbutton .buttonStatus .deleteOrder{-webkit-box-flex:3;-webkit-flex:3;flex:3;color:#303133;font-size:32rpx;background-color:#fff;padding:10px 0}.adressbutton .buttonStatus .payOrder{-webkit-box-flex:1;-webkit-flex:1;flex:1;font-size:32rpx;color:#fff;background-color:#d9332e;padding:10px 0;text-align:center}
+.LinkAdress .van-cell{border-top:15rpx solid #f5f5f5;border-bottom:15rpx solid #f5f5f5}.wrapper{border-top:15rpx solid #f5f5f5;border-bottom:15rpx solid #f5f5f5;padding:0 32rpx;background-color:#fff}.u-box{padding:15rpx 0}.topTip{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;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}.van-card{background-color:#fff!important}.shoplist{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.adressbutton{position:fixed;bottom:0;width:100%}.adressbutton .buttonStatus{display:-webkit-box;display:-webkit-flex;display:flex;text-align:left;height:100rpx;line-height:100rpx}.adressbutton .buttonStatus .deleteOrder{-webkit-box-flex:6;-webkit-flex:6;flex:6;color:#303133;font-size:32rpx;border-top:1px solid #f5f5f5;background-color:#fff;padding:0 0 0 32rpx}.adressbutton .buttonStatus .payOrder{-webkit-box-flex:3;-webkit-flex:3;flex:3;font-size:32rpx;color:#fff;background-color:#d9332e;text-align:center}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/myCenter/Settled.js


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/myCenter/Settled.wxml

@@ -1 +1 @@
-<view style="padding:0 32rpx;"><van-field vue-id="3487a5bc-1" value="{{hotel_name}}" placeholder="请输入酒店名称" label="酒店名称" data-event-opts="{{[['^change',[['hotel_name']]]]}}" data-com-type="wx" bind:change="__e" bind:__l="__l"></van-field><van-field vue-id="3487a5bc-2" value="{{contacts_address}}" placeholder="请输入酒店地址" label="酒店地址" data-event-opts="{{[['^change',[['changaddress']]]]}}" data-com-type="wx" bind:change="__e" bind:__l="__l"></van-field><van-field vue-id="3487a5bc-3" value="{{contacts_name}}" placeholder="请输入负责人姓名" label="负责人" data-event-opts="{{[['^change',[['onChange']]]]}}" data-com-type="wx" bind:change="__e" bind:__l="__l"></van-field><van-field vue-id="3487a5bc-4" value="{{contacts_phone}}" placeholder="请输入负责人手机号码" label="手机号码" data-event-opts="{{[['^change',[['changenumber']]]]}}" data-com-type="wx" bind:change="__e" bind:__l="__l"></van-field><van-field vue-id="3487a5bc-5" value="{{contacts_number}}" placeholder="请输入负责人身份证号码" label="身份证号码" data-event-opts="{{[['^change',[['changIdcard']]]]}}" data-com-type="wx" bind:change="__e" bind:__l="__l"></van-field><view><upload-image bind:getImg="__e" vue-id="3487a5bc-6" data-event-opts="{{[['^getImg',[['getImg']]]]}}" bind:__l="__l"></upload-image><view>须上传营业执照和手持身份证照</view></view><view data-event-opts="{{[['tap',[['submitRemin',['$event']]]]]}}" class="submitRemin" bindtap="__e">申请入驻</view></view>
+<view style="padding:0 40rpx;"><van-field style="padding:0;" vue-id="3487a5bc-1" value="{{hotel_name}}" placeholder="请输入酒店名称" label="酒店名称" data-event-opts="{{[['^change',[['changehotel_name']]]]}}" data-com-type="wx" bind:change="__e" bind:__l="__l"></van-field><van-field vue-id="3487a5bc-2" value="{{contacts_address}}" placeholder="请输入酒店地址" label="酒店地址" data-event-opts="{{[['^change',[['changaddress']]]]}}" data-com-type="wx" bind:change="__e" bind:__l="__l"></van-field><van-field vue-id="3487a5bc-3" value="{{contacts_name}}" placeholder="请输入负责人姓名" label="负责人" data-event-opts="{{[['^change',[['onChange']]]]}}" data-com-type="wx" bind:change="__e" bind:__l="__l"></van-field><van-field vue-id="3487a5bc-4" value="{{contacts_phone}}" placeholder="请输入负责人手机号码" label="手机号码" data-event-opts="{{[['^change',[['changenumber']]]]}}" data-com-type="wx" bind:change="__e" bind:__l="__l"></van-field><van-field vue-id="3487a5bc-5" value="{{contacts_number}}" placeholder="请输入负责人身份证号码" label="身份证号码" data-event-opts="{{[['^change',[['changIdcard']]]]}}" data-com-type="wx" bind:change="__e" bind:__l="__l"></van-field><view><upload-image bind:getImg="__e" vue-id="3487a5bc-6" data-event-opts="{{[['^getImg',[['getImg']]]]}}" bind:__l="__l"></upload-image><view style="padding:15rpx 0;">须上传营业执照和手持身份证照</view></view><view data-event-opts="{{[['tap',[['submitRemin',['$event']]]]]}}" class="submitRemin" bindtap="__e">申请入驻</view></view>

+ 1 - 0
unpackage/dist/build/mp-weixin/pages/myCenter/Settled.wxss

@@ -0,0 +1 @@
+.van-cell{padding-left:0!important}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/myCenter/applyfor.js


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/myCenter/applyfor.wxml

@@ -1 +1 @@
-<view style="padding:0 32rpx;"><van-field vue-id="3e08fe34-1" value="{{contacts_name}}" placeholder="请输入您的姓名" label="姓名" data-event-opts="{{[['^change',[['onChange']]]]}}" data-com-type="wx" bind:change="__e" bind:__l="__l"></van-field><van-field vue-id="3e08fe34-2" value="{{contacts_phone}}" placeholder="请输入您的手机号码" label="手机号码" data-event-opts="{{[['^change',[['changenumber']]]]}}" data-com-type="wx" bind:change="__e" bind:__l="__l"></van-field><van-field vue-id="3e08fe34-3" value="{{contacts_number}}" placeholder="请输入您的身份证号码" label="身份证号码" data-event-opts="{{[['^change',[['changIdcard']]]]}}" data-com-type="wx" bind:change="__e" bind:__l="__l"></van-field><van-field vue-id="3e08fe34-4" value="{{contacts_address}}" placeholder="请输入您的联系地址" label="联系地址" data-event-opts="{{[['^change',[['changaddress']]]]}}" data-com-type="wx" bind:change="__e" bind:__l="__l"></van-field><view><upload-image bind:getImg="__e" vue-id="3e08fe34-5" data-event-opts="{{[['^getImg',[['getImg']]]]}}" bind:__l="__l"></upload-image><view>须上传营业执照和手持身份证照</view></view><view data-event-opts="{{[['tap',[['goapply',['$event']]]]]}}" class="submitRemin" bindtap="__e">申请代理</view></view>
+<view style="padding:0 40rpx;"><van-field vue-id="3e08fe34-1" value="{{contacts_name}}" placeholder="请输入您的姓名" label="姓名" data-event-opts="{{[['^change',[['onChange']]]]}}" data-com-type="wx" bind:change="__e" bind:__l="__l"></van-field><van-field vue-id="3e08fe34-2" value="{{contacts_phone}}" placeholder="请输入您的手机号码" label="手机号码" data-event-opts="{{[['^change',[['changenumber']]]]}}" data-com-type="wx" bind:change="__e" bind:__l="__l"></van-field><van-field vue-id="3e08fe34-3" value="{{contacts_number}}" placeholder="请输入您的身份证号码" label="身份证号码" data-event-opts="{{[['^change',[['changIdcard']]]]}}" data-com-type="wx" bind:change="__e" bind:__l="__l"></van-field><van-field vue-id="3e08fe34-4" value="{{contacts_address}}" placeholder="请输入您的联系地址" label="联系地址" data-event-opts="{{[['^change',[['changaddress']]]]}}" data-com-type="wx" bind:change="__e" bind:__l="__l"></van-field><view><upload-image bind:getImg="__e" vue-id="3e08fe34-5" data-event-opts="{{[['^getImg',[['getImg']]]]}}" bind:__l="__l"></upload-image><view style="padding:15rpx 0;">须上传营业执照和手持身份证照</view></view><view data-event-opts="{{[['tap',[['goapply',['$event']]]]]}}" class="submitRemin" bindtap="__e">申请代理</view></view>

+ 1 - 1
unpackage/dist/build/mp-weixin/pages/myCenter/applyfor.wxss

@@ -1 +1 @@
-.deepHeight{height:108rpx;width:108rpx}
+.deepHeight{height:108rpx;width:108rpx}.van-cell{padding-left:0!important}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/myCenter/commentback.js


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/myCenter/definite.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/myCenter/definite"],{"25a0":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={onReady:function(){console.log("进来了"),t.setNavigationBarColor({frontColor:"#ffffff",backgroundColor:"#D9332E",animation:{duration:400,timingFunc:"easeIn"}})},data:function(){return{page:1,point_list:[],userinfo:{}}},onLoad:function(){this.getuserinfo(),this.getlist()},methods:{getuserinfo:function(){var t=this;this.request({url:"/v2/member/info",method:"GET",success:function(n){var e=n.data.data;t.userinfo=e}})},getlist:function(){var t=this;this.request({url:"/v2/member/points",method:"post",data:{page:this.page,page_size:10},success:function(n){console.log(n),t.point_list=n.data.data.point_list}})}}};n.default=e}).call(this,e("543d")["default"])},"34fb":function(t,n,e){"use strict";var o,i=function(){var t=this,n=t.$createElement;t._self._c},u=[];e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){return o}))},3963:function(t,n,e){"use strict";var o=e("7b37"),i=e.n(o);i.a},5097:function(t,n,e){"use strict";e.r(n);var o=e("34fb"),i=e("7c94");for(var u in i)"default"!==u&&function(t){e.d(n,t,(function(){return i[t]}))}(u);e("3963");var a,r=e("f0c5"),c=Object(r["a"])(i["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],a);n["default"]=c.exports},"7b37":function(t,n,e){},"7c94":function(t,n,e){"use strict";e.r(n);var o=e("25a0"),i=e.n(o);for(var u in o)"default"!==u&&function(t){e.d(n,t,(function(){return o[t]}))}(u);n["default"]=i.a},bc9c:function(t,n,e){"use strict";(function(t){e("0bef"),e("921b");o(e("66fd"));var n=o(e("5097"));function o(t){return t&&t.__esModule?t:{default:t}}t(n.default)}).call(this,e("543d")["createPage"])}},[["bc9c","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/myCenter/definite"],{"25a0":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={onReady:function(){t.setNavigationBarColor({frontColor:"#ffffff",backgroundColor:"#D9332E",animation:{duration:400,timingFunc:"easeIn"}})},data:function(){return{page:1,point_list:[],userinfo:{}}},onLoad:function(){this.getuserinfo(),this.getlist()},methods:{getuserinfo:function(){var t=this;this.request({url:"/v2/member/info",method:"GET",success:function(n){var e=n.data.data;t.userinfo=e}})},getlist:function(){var t=this;this.request({url:"/v2/member/points",method:"post",data:{page:this.page,page_size:10},success:function(n){t.point_list=n.data.data.point_list}})}}};n.default=e}).call(this,e("543d")["default"])},3963:function(t,n,e){"use strict";var i=e("7b37"),u=e.n(i);u.a},"453b":function(t,n,e){"use strict";var i,u=function(){var t=this,n=t.$createElement;t._self._c},o=[];e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return o})),e.d(n,"a",(function(){return i}))},5097:function(t,n,e){"use strict";e.r(n);var i=e("453b"),u=e("7c94");for(var o in u)"default"!==o&&function(t){e.d(n,t,(function(){return u[t]}))}(o);e("3963");var a,r=e("f0c5"),c=Object(r["a"])(u["default"],i["b"],i["c"],!1,null,null,null,!1,i["a"],a);n["default"]=c.exports},"7b37":function(t,n,e){},"7c94":function(t,n,e){"use strict";e.r(n);var i=e("25a0"),u=e.n(i);for(var o in i)"default"!==o&&function(t){e.d(n,t,(function(){return i[t]}))}(o);n["default"]=u.a},bc9c:function(t,n,e){"use strict";(function(t){e("0bef"),e("921b");i(e("66fd"));var n=i(e("5097"));function i(t){return t&&t.__esModule?t:{default:t}}t(n.default)}).call(this,e("543d")["createPage"])}},[["bc9c","common/runtime","common/vendor"]]]);

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/myCenter/index.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/myCenter/index.wxml


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/myCenter/index.wxss

@@ -1 +1 @@
-.myBox{height:100vh;width:100%;background-color:#fff}.myBox .myhead{height:290rpx;background-color:#d9332e}.myBox .myhead .myheadImg{padding:10rpx 32rpx 0 0;height:85rpx;text-align:right;line-height:85rpx}.myBox .myhead .myNmae{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;flex-direction:row;-webkit-box-align:center;-webkit-align-items:center;align-items:center;padding:20rpx 32rpx 0 32rpx}.myBox .myhead .myNmae .myNmaeLeft{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;flex-direction:row;-webkit-box-align:center;-webkit-align-items:center;align-items:center;color:#fff}.myBox .myhead .myNmae .myNmaeLeft .myNmaeImg{width:128rpx;height:128rpx;border-radius:50%;padding-right:32rpx}.myBox .myhead .myNmae .myNmaeLeft .myNmaeImg image{width:100%;height:100%;border-radius:50%;background-color:#fff}.myBox .myhead .myNmae .myNmaeRight{width:144rpx;height:52rpx;background:hsla(0,0%,100%,.27);border-radius:44rpx;border:2rpx solid #fff;color:#fff;line-height:52rpx;text-align:center;font-size:24rpx}.myBox .myorder{padding:0 32rpx}.myBox .myorder .orderList{padding:28rpx 0;display:-webkit-box;display:-webkit-flex;display:flex}.myBox .myorder .orderOne{-webkit-box-flex:1;-webkit-flex:1;flex:1;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;text-align:center}.myBox .myorder .orderOne .imagewidth{width:44rpx;height:44rpx;background-color:red}
+.myBox{height:100vh;width:100%;background-color:#fff}.myBox .myhead{height:290rpx;background-color:#d9332e}.myBox .myhead .myheadImg{padding:10rpx 32rpx 0 0;height:85rpx;text-align:right;line-height:85rpx}.myBox .myhead .myNmae{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;flex-direction:row;-webkit-box-align:center;-webkit-align-items:center;align-items:center;padding:20rpx 32rpx 0 32rpx}.myBox .myhead .myNmae .myNmaeLeft{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;flex-direction:row;-webkit-box-align:center;-webkit-align-items:center;align-items:center;color:#fff}.myBox .myhead .myNmae .myNmaeLeft .myNmaeImg{width:128rpx;height:128rpx;border-radius:50%;padding-right:32rpx}.myBox .myhead .myNmae .myNmaeLeft .myNmaeImg image{width:100%;height:100%;border-radius:50%;background-color:#fff}.myBox .myhead .myNmae .myNmaeRight{width:144rpx;height:52rpx;background:hsla(0,0%,100%,.27);border-radius:44rpx;border:2rpx solid #fff;color:#fff;line-height:52rpx;text-align:center;font-size:24rpx}.myBox .myorder{padding:0 32rpx}.myBox .myorder .orderList{padding:28rpx 0;display:-webkit-box;display:-webkit-flex;display:flex}.myBox .myorder .orderOne{-webkit-box-flex:1;-webkit-flex:1;flex:1;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;text-align:center}.myBox .myorder .orderOne .imagewidth{width:44rpx;height:44rpx}

+ 1 - 1
unpackage/dist/build/mp-weixin/pages/myCenter/information.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/myCenter/information"],{"1e3f":function(t,n,e){"use strict";(function(t){e("0bef"),e("921b");o(e("66fd"));var n=o(e("87dd"));function o(t){return t&&t.__esModule?t:{default:t}}t(n.default)}).call(this,e("543d")["createPage"])},"1faa":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={data:function(){return{list:[],page:1,scrollTop:0,old:{scrollTop:0}}},onLoad:function(){this.getlist()},methods:{upper:function(t){console.log("顶部")},lower:function(t){this.page=this.page+1,this.ispull&&this.getlist()},scroll:function(t){this.old.scrollTop=t.detail.scrollTop},getlist:function(){var t=this;this.request({url:"/v2/shop/msg_list",method:"POST",data:{page:this.page,page_size:10},success:function(n){t.list=t.list.concat(n.data.data.msg_list)}})}}};n.default=o},"518d":function(t,n,e){"use strict";var o=e("6285"),a=e.n(o);a.a},6285:function(t,n,e){},6678:function(t,n,e){"use strict";var o,a=function(){var t=this,n=t.$createElement;t._self._c},i=[];e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return o}))},"806a":function(t,n,e){"use strict";e.r(n);var o=e("1faa"),a=e.n(o);for(var i in o)"default"!==i&&function(t){e.d(n,t,(function(){return o[t]}))}(i);n["default"]=a.a},"87dd":function(t,n,e){"use strict";e.r(n);var o=e("6678"),a=e("806a");for(var i in a)"default"!==i&&function(t){e.d(n,t,(function(){return a[t]}))}(i);e("518d");var u,s=e("f0c5"),c=Object(s["a"])(a["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],u);n["default"]=c.exports}},[["1e3f","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/myCenter/information"],{"1e3f":function(t,n,e){"use strict";(function(t){e("0bef"),e("921b");o(e("66fd"));var n=o(e("87dd"));function o(t){return t&&t.__esModule?t:{default:t}}t(n.default)}).call(this,e("543d")["createPage"])},"1faa":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={data:function(){return{list:[],page:1,scrollTop:0,old:{scrollTop:0}}},onLoad:function(){this.getlist()},methods:{upper:function(t){console.log("顶部")},lower:function(t){this.page=this.page+1,this.ispull&&this.getlist()},scroll:function(t){this.old.scrollTop=t.detail.scrollTop},getlist:function(){var t=this;this.request({url:"/v2/shop/msg_list",method:"POST",data:{page:this.page,page_size:10},success:function(n){t.list=t.list.concat(n.data.data.msg_list)}})}}};n.default=o},"518d":function(t,n,e){"use strict";var o=e("6285"),a=e.n(o);a.a},6285:function(t,n,e){},"806a":function(t,n,e){"use strict";e.r(n);var o=e("1faa"),a=e.n(o);for(var i in o)"default"!==i&&function(t){e.d(n,t,(function(){return o[t]}))}(i);n["default"]=a.a},"87dd":function(t,n,e){"use strict";e.r(n);var o=e("d15e"),a=e("806a");for(var i in a)"default"!==i&&function(t){e.d(n,t,(function(){return a[t]}))}(i);e("518d");var u,s=e("f0c5"),c=Object(s["a"])(a["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],u);n["default"]=c.exports},d15e:function(t,n,e){"use strict";var o,a=function(){var t=this,n=t.$createElement;t._self._c},i=[];e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return o}))}},[["1e3f","common/runtime","common/vendor"]]]);

+ 1 - 1
unpackage/dist/build/mp-weixin/pages/myCenter/information.wxml

@@ -1 +1 @@
-<view><block wx:if="{{list.length>0}}"><scroll-view class="floor-list" style="height:100vh;" scroll-top="{{scrollTop}}" scroll-y="true" refresher-enabled="true" data-event-opts="{{[['scroll',[['scroll',['$event']]]],['scrolltoupper',[['upper',['$event']]]],['scrolltolower',[['lower',['$event']]]]]}}" bindscroll="__e" bindscrolltoupper="__e" bindscrolltolower="__e"><block wx:for="{{getlist}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="hotelcontent"><view class="contentleft"><image style="width:100%;height:100%;"></image></view><view class="contentitle"><block wx:if="{{item.types==0}}"><view>催单信息</view></block><block wx:if="{{item.types==1}}"><view>联系酒店</view></block><block wx:if="{{item.types==2}}"><view>客户退货</view></block><view>{{item.content}}</view><view>{{"订单号:"+item.order_sn}}</view><view style="text-align:right;">{{item.add_time}}</view></view></view></block></scroll-view></block><block wx:if="{{list.length==0}}"><view style="text-align:center;margin-top:300rpx;">暂无消息通知哦</view></block></view>
+<view><block wx:if="{{list.length>0}}"><scroll-view class="floor-list" style="height:100vh;" scroll-top="{{scrollTop}}" scroll-y="true" refresher-enabled="{{false}}" data-event-opts="{{[['scroll',[['scroll',['$event']]]],['scrolltoupper',[['upper',['$event']]]],['scrolltolower',[['lower',['$event']]]]]}}" bindscroll="__e" bindscrolltoupper="__e" bindscrolltolower="__e"><block wx:for="{{getlist}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="hotelcontent"><view class="contentleft"><image style="width:100%;height:100%;"></image></view><view class="contentitle"><block wx:if="{{item.types==0}}"><view>催单信息</view></block><block wx:if="{{item.types==1}}"><view>联系酒店</view></block><block wx:if="{{item.types==2}}"><view>客户退货</view></block><view>{{item.content}}</view><view>{{"订单号:"+item.order_sn}}</view><view style="text-align:right;">{{item.add_time}}</view></view></view></block></scroll-view></block><block wx:if="{{list.length==0}}"><view style="text-align:center;margin-top:300rpx;">暂无消息通知哦</view></block></view>

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/myCenter/logion.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 1
unpackage/dist/build/mp-weixin/pages/myCenter/myCollect.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/myCenter/myCollect.wxml


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/myCenter/orderdetail.js


+ 8 - 0
unpackage/dist/build/mp-weixin/pages/myCenter/orderdetail.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "",
+  "usingComponents": {
+    "van-card": "/wxcomponents/dist/card/index",
+    "dialog": "/component/Dialog",
+    "gobacktop": "/component/Gobacktop"
+  }
+}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/myCenter/orderdetail.wxml


+ 1 - 0
unpackage/dist/build/mp-weixin/pages/myCenter/orderdetail.wxss

@@ -0,0 +1 @@
+page{background-color:#f5f5f5}.cart-list{background-color:#fff;border-top:12rpx solid #f5f5f5}.topTip{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;padding:20rpx 36rpx;border-bottom:1px solid #f5f5f5}.changewidth{color:#303133;font-size:32rpx;font-weight:100!important}.van-card__desc{font-size:25rpx;color:#999!important;padding-top:10rpx}.priceClass{color:#303133!important;font-size:36rpx;font-weight:400!important}.van-card{background-color:#fff!important}.shoplist{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.deleChange{border:1px solid #c0c4cc;padding:8rpx}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 1
unpackage/dist/build/mp-weixin/pages/myOrder/adress.js


+ 4 - 1
unpackage/dist/build/mp-weixin/pages/myOrder/adress.json

@@ -2,6 +2,9 @@
   "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"
   }
 }

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 1
unpackage/dist/build/mp-weixin/pages/myOrder/adress.wxml


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/myOrder/adress.wxss

@@ -1 +1 @@
-page{padding-bottom:120rpx}.content{position:relative}.list{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;padding:20rpx 30rpx;background:#fff;position:relative}.wrapper{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-flex:1;-webkit-flex:1;flex:1}.address-box{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.address-box .tag{font-size:35rpx;color:#fa436a;margin-right:10rpx;background:#fffafb;border-radius:4rpx;padding:4rpx 10rpx;line-height:1}.address-box .address{font-size:30rpx;color:#303133}.u-box{font-size:28rpx;color:#909399;margin-top:16rpx}.u-box .name{margin-right:30rpx}.icon-bianji{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;height:80rpx;font-size:40rpx;color:#909399;padding-left:30rpx}.add-btn{position:fixed;left:30rpx;right:30rpx;bottom:16rpx;z-index:95;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;width:690rpx;height:80rpx;font-size:32rpx;color:#fff;background-color:#d9332e;border-radius:10rpx;box-shadow:1px 2px 5px rgba(219,63,96,.4)}
+page{padding-bottom:120rpx}.content{position:relative}.list{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;padding:20rpx 30rpx;background:#fff;position:relative}.wrapper{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-flex:1;-webkit-flex:1;flex:1}.address-box{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.address-box .tag{font-size:35rpx;color:#fa436a;margin-right:10rpx;background:#fffafb;border-radius:4rpx;padding:4rpx 10rpx;line-height:1}.address-box .address{font-size:30rpx;color:#303133}.u-box{font-size:28rpx;color:#909399;margin-top:16rpx}.u-box .name{margin-right:30rpx}.icon-bianji{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;height:80rpx;font-size:40rpx;color:#909399;padding-left:30rpx}.add-btn{position:fixed;left:30rpx;right:30rpx;bottom:16rpx;z-index:95;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;width:690rpx;height:80rpx;font-size:32rpx;color:#fff;background-color:#d9332e;border-radius:10rpx;box-shadow:1px 2px 5px rgba(219,63,96,.4)}.isdiaplay .van-submit-bar__text{visibility:hidden}.isdiaplay{visibility:hidden}.van-submit-bar__bar{-webkit-box-pack:justify!important;-webkit-justify-content:space-between!important;justify-content:space-between!important}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/myOrder/adressManger.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/myOrder/estimate.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/myOrder/index.js


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/myOrder/index.json

@@ -6,6 +6,6 @@
     "van-card": "/wxcomponents/dist/card/index",
     "van-icon": "/wxcomponents/dist/icon/index",
     "dialog": "/component/Dialog",
-    "logion-dialog": "/component/loginDialog"
+    "gobacktop": "/component/Gobacktop"
   }
 }

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/myOrder/index.wxml


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/myOrder/index.wxss

@@ -1 +1 @@
-page{background-color:#f5f5f5}.cart-list{background-color:#fff;border-top:12rpx solid #f5f5f5}.topTip{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;padding:20rpx 36rpx;border-bottom:1px solid #f5f5f5}.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}.shoplist{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.deleChange{border:1px solid #c0c4cc;padding:8rpx}
+page{background-color:#f5f5f5}.cart-list{background-color:#fff;border-top:12rpx solid #f5f5f5}.topTip{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;padding:20rpx 36rpx;border-bottom:1px solid #f5f5f5}.changewidth{color:#303133;font-size:32rpx;font-weight:100!important}.van-card__desc{font-size:25rpx;color:#999!important;padding-top:10rpx}.van-card{background-color:#fff!important}.shoplist{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.deleChange{border:1px solid #c0c4cc;padding:8rpx}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/myOrder/order.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/myOrder/order.wxml


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/myOrder/order.wxss

@@ -1 +1 @@
-page{background-color:#f5f5f5}.cart-list{background-color:#fff}.topTip{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;padding:20rpx 36rpx}.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}.shoplist{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.adress{padding:35rpx 36rpx;border-bottom:14rpx solid #f5f5f5}.adressDetail{padding:6rpx 0}.orderCode{padding-left:15rpx;font-weight:500}.adressbottom{padding:0 36rpx;color:#606266;border-top:16rpx solid #f5f5f5;padding-bottom:32rpx;margin-bottom:100rpx}.adressbottom view{padding:32rpx 0 0 0}.adressbottom .time{padding-left:16rpx}.adressbutton{position:fixed;bottom:0;width:100%}.adressbutton .buttonStatus{display:-webkit-box;display:-webkit-flex;display:flex;text-align:center}.adressbutton .buttonStatus .deleteOrder{-webkit-box-flex:1;-webkit-flex:1;flex:1;color:#303133;font-size:32rpx;background-color:#fff;padding:10px 0}.adressbutton .buttonStatus .payOrder{-webkit-box-flex:1;-webkit-flex:1;flex:1;font-size:32rpx;color:#fff;background-color:#d9332e;padding:10px 0}
+page{background-color:#f5f5f5}.cart-list{background-color:#fff}.topTip{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;padding:20rpx 36rpx}.changewidth{color:#303133;font-size:32rpx;font-weight:100!important}.priceClass{color:#303133!important;font-weight:400!important;font-size:36rpx}.van-card{background-color:#fff!important}.shoplist{padding:10rpx 32rpx}.retungood{text-align:right;padding:0rpx 32rpx;float:right;border:1px solid #666}.adress{padding:35rpx 36rpx;border-bottom:14rpx solid #f5f5f5}.adressDetail{padding:15rpx 0}.orderCode{padding-left:15rpx;font-weight:500}.adressbottom{padding:0 36rpx;color:#606266;border-top:16rpx solid #f5f5f5;padding-bottom:32rpx;margin-bottom:100rpx}.adressbottom view{padding:32rpx 0 0 0}.adressbottom .time{padding-left:16rpx}.adressbutton{position:fixed;bottom:0;width:100%}.adressbutton .buttonStatus{display:-webkit-box;display:-webkit-flex;display:flex;text-align:center}.adressbutton .buttonStatus .deleteOrder{-webkit-box-flex:1;-webkit-flex:1;flex:1;color:#303133;font-size:32rpx;background-color:#fff;padding:10px 0}.adressbutton .buttonStatus .payOrder{-webkit-box-flex:1;-webkit-flex:1;flex:1;font-size:32rpx;color:#fff;background-color:#d9332e;padding:10px 0}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/myOrder/paymoment.js


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/myOrder/paymoment.wxml

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

+ 1 - 1
unpackage/dist/build/mp-weixin/pages/myOrder/paymoment.wxss

@@ -1 +1 @@
-.payMoney{width:90%;color:#fff;background-color:#d9332e;position:fixed;text-align:center;padding:20rpx 0;bottom:5%;left:5%}
+.payMoney{width:90%;color:#fff;background-color:#d9332e;position:fixed;text-align:center;padding:20rpx 0;bottom:5%;left:5%}.changtitle{padding-left:10rpx}

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio