样式修改 功能补交

App.vue

@@ -97,15 +97,13 @@
 								  if(token == '') {
 									   this.setOpenid(token); // 保存用户token
 									   this.islogionsuccess(false);
-									  
 								  }else {
 									  this.setOpenid(token); // 保存用户token
 									  this.islogionsuccess(true);
 								  }
 								   this.beginload(true);
-								  this.showDialog(false); // 没有同意授权头像等;
-								  this.login(); // 清空用户头像信息
-								
+								   this.showDialog(false); // 没有同意授权头像等;
+								   this.login(); // 清空用户头像信息
 			  				  }
 			  			  })
 			  		},

common/request.js

@@ -14,6 +14,7 @@ const request = function(options) {
            // uni.navigateTo({
            // 	url:'/pages/myCenter/logion'
            // })
+		 //  return;
         }
      } catch (err) {
       console.log(err)

pages/index/cart.vue

@@ -54,8 +54,9 @@
 		  </view>
 		   
 		 <view style="position: fixed;bottom: 0;border-top:1px solid #eee;height: 8vh;">
+			 <!--    :price-class="isdelete? '':'isdiaplay' " -->
 		 <van-submit-bar
-		   :price-class="isdelete? '':'isdiaplay' "	
+			v-if="isdelete"
 		   :price="prices"
 		   :button-text="listip"
 		   @submit="onClickButton"
@@ -66,6 +67,20 @@
 		 </van-checkbox>
 	
 		 </van-submit-bar>
+		 
+		 <van-submit-bar
+		   bar-class="betweenclass"	
+		   v-if="!isdelete"
+		   :button-text="listip"
+		   @submit="onClickButton"
+		   :tip="true"
+		 >
+		 <van-checkbox checked-color="#D9332E" :value="isAll" shape="round" @change="onChange">
+		  全选
+		 </van-checkbox>
+		 	
+		 </van-submit-bar>
+		 
 		 </view>
 		 
 		
@@ -105,7 +120,6 @@
 		},
 		// 隐藏分享菜单
 		onLoad: function (options) {
-			console.log(options)
 			this.store_id = options.store_id;
 			this.listip = "结算" + '(' + this.nums + ')';
 			this.getshoplist();
@@ -212,7 +226,6 @@
 							 item.descire = item.goods_name.replace(arr[0], '');
 						 })
 						this.list = data.cart_list;
-						console.log(this.list);
 						this.store = data.store;
 						//console.log(data.cart_list[0].goods_name.split(' '));
 					}
@@ -298,7 +311,10 @@
 </script>
 
 <style>
-		
+	.betweenclass {
+		display: flex;
+		justify-content: space-between!important;
+	}
 	.uniNavBar {
 	  height: 100%;	
 	}

pages/index/feedback.vue

@@ -107,7 +107,6 @@
 			},
 			getImg(e) {
 				this.img_list = e.join(',');
-				console.log(this.img_list);
 			},
 			submitValue(e) {
 				this.content = e.detail.value;

pages/index/hotel.vue

@@ -230,7 +230,6 @@
         	
         	if (res.from === 'button') {
               // 来自页面内分享按钮
-        		console.log(res.target)
         	}
         	return {
         		title: that.hotelitle,
@@ -334,7 +333,6 @@
 					this.getshopdetail(2);
 				}else if(this.tabIndex == 2){ //伤
 				        this.chosegoods_price = true;
-						console.log(this.chosegoods_commonid);
 						this.istopclick = this.chosegoods_commonid?1:2;
 						this.isprice = 0;
 						this.goods_price = ''; 
@@ -343,7 +341,6 @@
 						this.getshopdetail(2);
 				}else if(this.tabIndex == 3){ // 价格
 						this.chosegoods_commonid = true;
-						console.log(this.chosegoods_price);
 						this.istopclick = 0;
 						this.isprice = this.chosegoods_price?3:4;
 						this.goods_price = this.chosegoods_price?'desc':'asc';
@@ -364,7 +361,6 @@
 				
 			},
 			godetail(item) {
-				console.log(item);
 				let id = item.gc_id; // 一级菜单id
 				let store_id = this.goodId;
 				let gc_name = item.gc_name; 
@@ -414,7 +410,6 @@
 									 let array = [{gc_id:'',gc_name:'全部'}];
 									 _this.classify =  array.concat(category_list);
 									 _this.category_list = category_list.splice(0,10);
-									 console.log(_this.category_list)
 								},
 				})
 			},
@@ -464,7 +459,7 @@
 						const regex = new RegExp('<img', 'gi');
 						// class="changeimg"
 						data.store_description = data.store_description.replace(regex, 
-						`<img style="width: 100%;height: auto;display: block;text-align: center;  `);
+						`<img style="width: 100%;height: auto;display: block;text-align: center;`);
 						this.store_description = data.store_description;
 						this.has_collected = data.has_collected; // 是否收藏
 					}
@@ -481,13 +476,11 @@
 				this.getshopdetail(2);
             },
             upper(e) {
-                console.log("顶部")
+               
             },
             
             // 滚到底部
             lower(e) {
-				console.log(this.activeindex)
-				console.log(this.isDetail)
 				// if(this.activeindex == 1) {
 					if(this.isnexttwo == 1 && this.activeindex == 1) {
 						this.page = this.page + 1;

pages/index/hoteldetail.vue

@@ -103,7 +103,6 @@
 			}
 		},
 		onLoad(options){
-			console.log(options)
 			this.title = options.gc_name;
 			this.gc_id_1 = options.id;
 			this.store_id = options.store_id;
@@ -134,7 +133,6 @@
 				this.getshopdetail(2); 
 			}else if(this.tabIndex == 2){ //伤
 			        this.chosegoods_price = true;
-					console.log(this.chosegoods_commonid);
 					this.istopclick = this.chosegoods_commonid?1:2;
 					this.isprice = 0;
 					this.goods_price = ''; 
@@ -144,7 +142,6 @@
 					this.getshopdetail(2);
 			}else if(this.tabIndex == 3){ // 价格
 					this.chosegoods_commonid = true;
-					console.log(this.chosegoods_price);
 					this.isprice = this.chosegoods_price?3:4;
 					this.goods_price = this.chosegoods_price?'desc':'asc';
 					this.goods_commonid = '';
@@ -159,7 +156,6 @@
 					this.goods_commonid = '';
 					this.chosegoods_price = true;
 					this.chosegoods_commonid = true;
-					console.log(this.goods_list);
 				}
 			
 			},
@@ -169,7 +165,6 @@
 				
 			},
 			confirm(e) {
-				console.log(e);
 				this.tabIndex = 0;
 				this.gc_id_2 = e.gc_id;
 				this.getshopdetail(2);
@@ -215,7 +210,7 @@
 						let { category_list } = res.data.data;
 						let array = [{gc_id:'',gc_name:'全部'}];
 						that.category_list = array.concat(category_list)
-						console.log(that.category_list)
+						
 					}
 				})
 			},

pages/index/hotelsearch.vue

@@ -61,7 +61,7 @@
 			shopList
 		},
 		onLoad(a) {
-			console.log(a);
+		
 			this.goodId = a.store_id;
 			//this.gethotelist();
 		},
@@ -124,7 +124,6 @@
 					this.goods_commonid = '';
 				}else if(this.tabIndex == 2){ //伤
 				        this.chosegoods_price = true;
-						console.log(this.chosegoods_commonid);
 						this.istopclick = this.chosegoods_commonid?1:2;
 						this.goods_price = ''; 
 						this.goods_commonid = this.chosegoods_commonid?'asc':'desc';
@@ -132,7 +131,6 @@
 						this.chosegoods_commonid = !this.chosegoods_commonid;
 				}else if(this.tabIndex == 3){ // 价格
 						this.chosegoods_commonid = true;
-						console.log(this.chosegoods_price);
 						this.istopclick = this.chosegoods_price?3:4;
 						this.goods_price = this.chosegoods_price?'desc':'asc';
 						this.goods_commonid = '';

pages/index/index.vue

@@ -139,7 +139,7 @@
 		},
 		onLoad() {
 			if(this.beginload) {
-				console.log("jinlaieeeeee")
+				
 			this.getpicture(); // 开机广告
 			//this.gethotelist(); // 酒店列表
 			if(this.allow) {
@@ -159,10 +159,9 @@
 		watch: {
 			'allow': function(val) {
 				if(val) {
-					console.log(val);
+					
 				}else {
-					console.log(val);
-					console.log("dddjdjdjjdjd")
+					
 					//this.gethotelist(); // 酒店列表
 				}
 			},
@@ -194,7 +193,6 @@
 					method: 'get',
 					success: (res) => {
 						let { data } = res.data;
-						console.log(res.data.data);
 						this.images = data.images;
 						this.enable = data.enable;
 					}
@@ -233,7 +231,7 @@
 			},
 			// 滚动到顶部
 			upper(e) {
-				console.log("顶部")
+			
 			},
 			
 			getop() {
@@ -303,7 +301,6 @@
 					uni.authorize({
 						scope: a,
 						success(res) { //允许授权
-						   console.log("调用位置授权")
 							_this.getRegeo();
 						},
 						fail(){    //拒绝授权
@@ -327,7 +324,7 @@
 				},
 				fail: (res) => {
 					this.allow = true;
-					console.log(res);
+					
 					uni.hideLoading(); 
 				}
 			});  
@@ -376,7 +373,7 @@
 							 this.hotelist =  this.hotelist.concat(data.store_list);
 						 }
 						
-						console.log(this.hotelist);
+						
 					 }else {
 						 this.$msg("网络错误稍后再试")
 					 }
@@ -388,7 +385,7 @@
 		 scan(){
 		 	uni.scanCode({
 		 		success: (res) => {
-		 			console.log(res);
+		 			
 		 		}
 		 	});
 		 },

pages/index/shop.vue

@@ -288,7 +288,7 @@
 			let store_id = this.store_id;
 			if (res.from === 'button') {
 		      // 来自页面内分享按钮
-				console.log(res.target)
+				
 			}
 			return {
 				title: that.datalist.goods_name,
@@ -429,7 +429,6 @@
 						this.specSelected = this.datalist.goods_list;
 						return;
 					}
-					console.log( this.datalist);
 					 let goods = [];
 					     goods.push({});
 						 goods[0].goods_id = this.goods_id;
@@ -442,7 +441,6 @@
 							 goods: JSON.stringify(goods)
 						 },
 						 success:(res) => {
-							 console.log(res);
 							 let store = this.store_id;
 							 let order_id = res.data.data.order_id;
 							 this.specClass = 'none';
@@ -535,7 +533,6 @@
 					this.goods_id = items.goods_id;
 					this.firstprice = items.goods_price;
 					this.totalprice = items.goods_price*this.shopnumber;
-					console.log(items);
 				}
 				
 				// if(this.arrayId.length == this.datalist.spec_list.length) {
@@ -573,8 +570,7 @@
  			}, 					 					
  			// 滚动到顶部
  			upper(e) {
- 				console.log(e)
- 				console.log("顶部")
+ 				
  			},
  			
  			// 滚到底部

pages/index/sureBuy.vue

@@ -50,7 +50,6 @@
 			   label="手机号"
 			   placeholder="请输入手机号"
 			 />
-		 			 
 		    </view>
 			
 		 <view v-if="radio === 2"
@@ -92,12 +91,12 @@
 			   >
 				 <van-cell
 				   :border="false"
-				   @click="getread"
+				 
 			     >
 				 <template slot="title">
-					 我已阅读并同意 <span style="color: #007AFF">预定须知</span>
+					 我已阅读并同意 <span @click="readshouknow" style="color: #007AFF">预定须知</span>
 				 </template>
-				 <template slot="right-icon">
+				 <template   @click="getread" slot="right-icon">
 				    <van-radio-group style="width: 20upx;" :value="read" >
 				      <van-radio checked-color="#D9332E" :name="4" >
 					  </van-radio>
@@ -108,7 +107,18 @@
 			 </van-radio-group>
 		</view>
 		
+		 <van-dialog
+		   use-slot
+		   title="标题"
+		   :show="ishow"
+		   @confirm="confirmOrder"
+		   :show-cancel-button="false"
+		 >
+		  <view style="padding: 0 32rpx;">
+			  <rich-text :nodes="store.buy_notice"></rich-text>
+		  </view>
 		 
+		 </van-dialog>
 		 <van-cell v-if="radio === 1&&choseadress == '' " @click="goAdress" class="LinkAdress" title="选择地址"  is-link/>
 		  <view v-if="radio === 1&&choseadress != ''" @click="goAdress" class="wrapper">
 		  	<view class="u-box" >
@@ -162,6 +172,7 @@
 	export default {
 		data() {
 			return {
+				ishow: false,
 				firstprice: 0,
 				read: 0,
 				hotelname:'', // 
@@ -191,14 +202,12 @@
 			}
 		},
 		onLoad(options) {
-			console.log(options);
 			this.order_id = options.order_id;
 			this.store_id = options.store;
 			// let prices =  Number((options.prices/100).toFixed(2));
 			// this.prices = prices; 
 			this.getorder(); // 获取订单详情
 			 uni.$on("getadress",(adress)=>{
-				    console.log(adress);
 			        this.choseadress = adress;
 					this.address_id = this.choseadress.address_id;
 					//this.getorder();
@@ -206,8 +215,13 @@
 			 })
 		},
 		methods: {
+			readshouknow() {
+				this.ishow = true;
+			},
+			confirmOrder() {
+				this.ishow = false;
+			},
 			getread() {
-				console.log("kkk")
 				this.read = 4;
 			},
 			
@@ -252,7 +266,7 @@
 						this.reserve = this.store.store_name
 						this.pricelist = data.og_list;
 						this.firstprice = totalprice;
-						this.prices = totalprice;;
+						this.prices = totalprice;
 					}
 				})
 			},
@@ -288,7 +302,6 @@
 							area_id: this.store.region_id
 						},
 						success: (res) => {
-							console.log(res.data.data.address_id);
 							this.address_id = res.data.data.address_id;
 							this.shipping_type = 1;
 							this.gopaymoment();
@@ -321,7 +334,6 @@
 							area_id: this.store.region_id
 						},
 						success: (res) => {
-							console.log(res.data.data.address_id);
 							this.address_id = res.data.data.address_id;
 							this.shipping_type = 1;
 							this.gopaymoment();
@@ -344,7 +356,6 @@
 						remark: this.remark
 					},
 					success: (res) => {
-						console.log(res);
 						let order_id = res.data.data.order_id; // 订单id
 						let prices = this.prices;
 						uni.navigateTo({

pages/myCenter/applyfor.vue

@@ -52,7 +52,7 @@
 		},
 		methods: {
 			onChange(e) {
-			    console.log(e);
+			   
 				this.contacts_name = e.detail;
 			},
 			changenumber(e){
@@ -65,7 +65,7 @@
 				this.contacts_address = e.detail;
 			},
 			goapply() {
-				console.log(this.contacts_name)
+		
 				if(this.contacts_name == '') {
 					this.$msg("请输入姓名");
 					return;
@@ -105,7 +105,7 @@
 				})
 			},
 			getImg(e) {
-				console.log(e);
+				
 				this.imageList = e;
 			}
 		}

pages/myCenter/commentback.vue

@@ -34,7 +34,6 @@
 		},
 		methods: {
 			getImg(e) {
-				console.log(e);
 				this.imageList = e;
 			},
 			submitValue(e) {

pages/myCenter/definite.vue

@@ -18,7 +18,6 @@
 <script>
 	    export default {
 	        onReady: function() {
-				console.log("进来了")
 				   uni.setNavigationBarColor({
 					   frontColor: '#ffffff',
 					   backgroundColor: '#D9332E',
@@ -60,7 +59,6 @@
 							page_size:　10
 						},
 						success: (res) => {
-							console.log(res);
 							this.point_list = res.data.data.point_list;
 						}
 					})

pages/myCenter/index.vue

@@ -155,8 +155,7 @@
 			]),
 		},
 		onLoad() {
-			console.log(this.userInfo);
-			console.log(this.hasLogin);
+		
 			if(this.successlogion && this.hasLogin) {
 				this.getuserinfo();
 		  	}else {
@@ -193,7 +192,6 @@
 		methods: {
 			// 跳转到我的订单
 			gomyorder(e) {
-		        console.log(e);
 				if(this.successlogion && this.hasLogin) {
 					let state = '';
 					if(e == 0) {

pages/myCenter/logion.vue

@@ -70,7 +70,6 @@
 							 that.login(res.userInfo);
 							 that.showDialog(true); // 改变haslogion的值
 							 that.$msg("授权成功");
-							 console.log(this.successlogion)
 							 if(this.successlogion) {
 								uni.navigateBack();
 							 }

pages/myCenter/myCollect.vue

@@ -78,7 +78,6 @@
 				 uni.navigateTo({
 				              url: `/pages/index/hotel?id=${id}`
 				        });
-				console.log(item);
 			},
 			goshop(item) {
 				let store_id = item.store_id;

pages/myCenter/orderdetail.vue

@@ -249,7 +249,6 @@
 						page_size:　10
 					},
 					success: (res) => {
-						console.log(res.data.data.refund_list);
 						if(res.data.data.refund_list.length< 10) {
 							this.ispull = false;
 						}
@@ -294,7 +293,6 @@
 				})
 			},
 			gopay(e) {
-				console.log(e);
 				let prices = e.order_amount;
 				this.order_id = e.order_id;
 				let order_id = e.order_id;
@@ -363,7 +361,6 @@
 			// 滚到底部
 			lower(e) {
 				if(this.ispull) {
-					console.log("l;ll")
 					this.page += 1;
 					this.getlist();
 				}

pages/myOrder/adress.vue

@@ -92,8 +92,7 @@
 				this.checkboxList = [];
 			},
 			checkboxChange(e) {
-				// 单选
-				console.log(e);
+				
 				this.checkboxList = []
 				e.detail.forEach((item, idx) => {
 					this.$set(this.checkboxList, idx, item)
@@ -104,13 +103,13 @@
 					 price.push(array[item].address_id)
 				})
 				this.pricelist = price;
-				console.log(this.pricelist)
+			
 				  
 			   
 			},
 			// 删除地址
 			onClickButton() {
-				console.log(address_ids)
+				
 				let address_ids = this.pricelist.join(',');
 				this.request({
 					url: '/v1/member/address_drop',
@@ -163,8 +162,6 @@
 			refreshList(data, type){
 				//添加或修改后事件，这里直接在最前面添加了一条数据，实际应用中直接刷新地址列表即可
 				this.addressList.unshift(data);
-				
-				console.log(data, type);
 			}
 		}
 	}

pages/myOrder/adressManger.vue

@@ -63,21 +63,18 @@
 			}
 		},
 		onLoad(option){
-			console.log(option)
+			
 			let title = '新增收货地址';
 			if(option.type==='edit'){
 				title = '编辑收货地址'
 				let data = JSON.parse(option.data);
-				console.log(data.area_info);
 				this.addressData.addressName = data.area_info;
-				console.log(this.addressData.addressName);
 				this.addressData.mobile = data.address_mob_phone;
 				this.addressData.name = data.address_realname;
 				this.addressData.area = data.address_detail;
 				this.address_id = data.address_id;
 				this.area_id = data.area_id;
 			}
-			console.log(JSON.parse(option.data))
 			this.manageType = option.type;
 			uni.setNavigationBarTitle({
 				title
@@ -141,7 +138,6 @@
 			//提交
 			confirm(){ 
 				let data = this.addressData;
-				console.log(data);
 				if(!data.addressName){
 					this.$msg('请选择省市区');
 					return;

pages/myOrder/estimate.vue

@@ -51,7 +51,6 @@
 				this.valueNumber = e.detail;
 			},
 			getImg(e) {
-				console.log(e);
 				this.imageList = e.join(',');
 			},
 			submitValue(e) {

pages/myOrder/order.vue

@@ -109,7 +109,6 @@
 		    }
 	    },
 		onLoad(e) {
-			console.log(e);
 			this.id = e.id;
 			this.getDetail();
 			// 刷新订单详情  
@@ -179,7 +178,6 @@
 								items.descire = items.goods_name.replace(arr[0], '');
 						})
 						this.detail = data;
-						console.log(this.detail);
 					}
 				})
 			},
@@ -317,7 +315,7 @@
 		border-bottom: 14upx solid #F5F5F5;
 	}
 	.adressDetail {
-		padding: 6upx 0;
+		padding: 15upx 0;
 	}
 	.orderCode {
 		padding-left: 15upx;

pages/myOrder/paymoment.vue

@@ -6,6 +6,7 @@
 		   :key="index"
 		   >
 			 <van-cell
+			   title-class="changtitle"
 		       :title="item.title"
 			   @click="onChange(index)" 
 		     >
@@ -52,7 +53,6 @@
 			}
 		},
 		onLoad(e) {
-			console.log(e);
 			this.prices = e.prices;
 			this.order_id = e.order_id;
 			this.getuserInfo();
@@ -78,7 +78,6 @@
 					method:'post',
 					success: (res) => {
 						this.ratio_points = res.data.data.ratio_points;
-						console.log(this.ratio_points);
 						if(this.ratio_points > 0) {
 							this.list = [
 								{title:'微信支付'},
@@ -108,10 +107,6 @@
 						order_id: this.order_id
 					},
 					success: (res) => {
-						console.log(res);
-						//uni.$emit('finshesitmate');
-						console.log(res.data.code)
-						console.log(res.data.data);
 						if(res.data.code == 1000) {
 							setTimeout(()=> {
 								uni.navigateTo({
@@ -128,7 +123,6 @@
 				this.radio = index;
 			},
 			payMoney() {
-				console.log("kkk")
 				if(this.radio == 0) {
 					// 微信支付
 					this.request({
@@ -141,7 +135,6 @@
 						},
 						success:(res) => {
 							let { wx } = res.data.data;
-							console.log(wx)
 							uni.requestPayment({
 								    provider: 'wxpay',
 								    timeStamp: wx.timeStamp,
@@ -150,7 +143,6 @@
 								    signType: 'MD5',
 								    paySign: wx.paySign,
 								    success:  (res) => {
-								        console.log('success:' + JSON.stringify(res));
 										let isform = 2;
 										let order_id = this.order_id;
 										uni.navigateTo({
@@ -158,7 +150,6 @@
 										})
 								    },
 								    fail: function (err) {
-								        console.log('fail:' + JSON.stringify(err));
 								    }
 							})
 						}
@@ -197,4 +188,7 @@
 	  bottom: 5%;
 	  left: 5%;
   }
+  .changtitle {
+	  padding-left: 10upx;
+  }
 </style>

pages/myOrder/refuend.vue

@@ -160,7 +160,6 @@
 						page_size:　10
 					},
 					success: (res) => {
-						console.log(res.data.data.refund_list);
 						if(res.data.data.refund_list.length< 10) {
 							this.ispull = false;
 						}
@@ -183,7 +182,6 @@
 			
 			goDetail(e) {
 				let order_id = e; 
-				console.log(order_id)
 				uni.navigateTo({
 				        url: `/pages/myOrder/returndetail?id=${order_id}`
 				});
@@ -196,7 +194,6 @@
 			// 滚到底部
 			lower(e) {
 				if(this.ispull) {
-					console.log("l;ll")
 					this.page += 1;
 					this.getlist();
 				}

pages/myOrder/reminder.vue

@@ -21,7 +21,6 @@
 		onLoad(e) {
 			this.order_id = e.order_id;
 			let a = e.a;
-			console.log(a);
 			if(a == 1) {
 				uni.setNavigationBarTitle({
 				    title: '催单'

pages/myOrder/returngood.vue

@@ -58,7 +58,6 @@
 		},
 		onLoad(e) {
 			this.detail = JSON.parse(e.id);
-			console.log(this.detail);
 		},
 		methods: {
 			submitValue(e) {

pages/myone/onedetail.vue

@@ -36,7 +36,6 @@
 		
 		methods: {
 			godetail() {
-				console.log(this.aricte.ad_type)
 				if(this.aricte.ad_type == 1) {
 					//商品 
 					let id = this.aricte.goods_id;  // 商品Id

unpackage/dist/dev/mp-weixin/common/main.js

@@ -211,7 +211,6 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
               if (token == '') {
                 _this.setOpenid(token); // 保存用户token
                 _this.islogionsuccess(false);
-
               } else {
                 _this.setOpenid(token); // 保存用户token
                 _this.islogionsuccess(true);
@@ -219,7 +218,6 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
               _this.beginload(true);
               _this.showDialog(false); // 没有同意授权头像等;
               _this.login(); // 清空用户头像信息
-
             } });
 
         },

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -121,8 +121,6 @@
 
 
 
-
-
 
 
 

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

@@ -208,6 +208,21 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -254,7 +269,6 @@ __webpack_require__.r(__webpack_exports__);
   },
   // 隐藏分享菜单
   onLoad: function onLoad(options) {
-    console.log(options);
     this.store_id = options.store_id;
     this.listip = "结算" + '(' + this.nums + ')';
     this.getshoplist();
@@ -361,7 +375,6 @@ __webpack_require__.r(__webpack_exports__);
             item.descire = item.goods_name.replace(arr[0], '');
           });
           _this3.list = data.cart_list;
-          console.log(_this3.list);
           _this3.store = data.store;
           //console.log(data.cart_list[0].goods_name.split(' '));
         } });

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

@@ -1,4 +1,12 @@
 
+.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%;
 }

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

@@ -240,7 +240,6 @@ __webpack_require__.r(__webpack_exports__);
     },
     getImg: function getImg(e) {
       this.img_list = e.join(',');
-      console.log(this.img_list);
     },
     submitValue: function submitValue(e) {
       this.content = e.detail.value;

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

@@ -363,7 +363,6 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
 
     if (res.from === 'button') {
       // 来自页面内分享按钮
-      console.log(res.target);
     }
     return {
       title: that.hotelitle,
@@ -467,7 +466,6 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
         this.getshopdetail(2);
       } else if (this.tabIndex == 2) {//伤
         this.chosegoods_price = true;
-        console.log(this.chosegoods_commonid);
         this.istopclick = this.chosegoods_commonid ? 1 : 2;
         this.isprice = 0;
         this.goods_price = '';
@@ -476,7 +474,6 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
         this.getshopdetail(2);
       } else if (this.tabIndex == 3) {// 价格
         this.chosegoods_commonid = true;
-        console.log(this.chosegoods_price);
         this.istopclick = 0;
         this.isprice = this.chosegoods_price ? 3 : 4;
         this.goods_price = this.chosegoods_price ? 'desc' : 'asc';
@@ -497,7 +494,6 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
 
     },
     godetail: function godetail(item) {
-      console.log(item);
       var id = item.gc_id; // 一级菜单id
       var store_id = this.goodId;
       var gc_name = item.gc_name;
@@ -547,7 +543,6 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
           var array = [{ gc_id: '', gc_name: '全部' }];
           _this.classify = array.concat(category_list);
           _this.category_list = category_list.splice(0, 10);
-          console.log(_this.category_list);
         } });
 
     },
@@ -596,7 +591,7 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
           _this5.store_summary = data.store_summary;
           var regex = new RegExp('<img', 'gi');
           // class="changeimg"
-          data.store_description = data.store_description.replace(regex, "<img style=\"width: 100%;height: auto;display: block;text-align: center;  ");
+          data.store_description = data.store_description.replace(regex, "<img style=\"width: 100%;height: auto;display: block;text-align: center;");
 
           _this5.store_description = data.store_description;
           _this5.has_collected = data.has_collected; // 是否收藏
@@ -614,13 +609,11 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
       this.getshopdetail(2);
     },
     upper: function upper(e) {
-      console.log("顶部");
+
     },
 
     // 滚到底部
     lower: function lower(e) {
-      console.log(this.activeindex);
-      console.log(this.isDetail);
       // if(this.activeindex == 1) {
       if (this.isnexttwo == 1 && this.activeindex == 1) {
         this.page = this.page + 1;

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

@@ -236,7 +236,6 @@ __webpack_require__.r(__webpack_exports__);
     };
   },
   onLoad: function onLoad(options) {
-    console.log(options);
     this.title = options.gc_name;
     this.gc_id_1 = options.id;
     this.store_id = options.store_id;
@@ -267,7 +266,6 @@ __webpack_require__.r(__webpack_exports__);
         this.getshopdetail(2);
       } else if (this.tabIndex == 2) {//伤
         this.chosegoods_price = true;
-        console.log(this.chosegoods_commonid);
         this.istopclick = this.chosegoods_commonid ? 1 : 2;
         this.isprice = 0;
         this.goods_price = '';
@@ -277,7 +275,6 @@ __webpack_require__.r(__webpack_exports__);
         this.getshopdetail(2);
       } else if (this.tabIndex == 3) {// 价格
         this.chosegoods_commonid = true;
-        console.log(this.chosegoods_price);
         this.isprice = this.chosegoods_price ? 3 : 4;
         this.goods_price = this.chosegoods_price ? 'desc' : 'asc';
         this.goods_commonid = '';
@@ -292,7 +289,6 @@ __webpack_require__.r(__webpack_exports__);
         this.goods_commonid = '';
         this.chosegoods_price = true;
         this.chosegoods_commonid = true;
-        console.log(this.goods_list);
       }
 
     },
@@ -302,7 +298,6 @@ __webpack_require__.r(__webpack_exports__);
 
     },
     confirm: function confirm(e) {
-      console.log(e);
       this.tabIndex = 0;
       this.gc_id_2 = e.gc_id;
       this.getshopdetail(2);
@@ -348,7 +343,7 @@ __webpack_require__.r(__webpack_exports__);
           category_list = res.data.data.category_list;
           var array = [{ gc_id: '', gc_name: '全部' }];
           that.category_list = array.concat(category_list);
-          console.log(that.category_list);
+
         } });
 
     },

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

@@ -194,7 +194,7 @@ var _default = {
     shopList: shopList },
 
   onLoad: function onLoad(a) {
-    console.log(a);
+
     this.goodId = a.store_id;
     //this.gethotelist();
   },
@@ -257,7 +257,6 @@ var _default = {
         this.goods_commonid = '';
       } else if (this.tabIndex == 2) {//伤
         this.chosegoods_price = true;
-        console.log(this.chosegoods_commonid);
         this.istopclick = this.chosegoods_commonid ? 1 : 2;
         this.goods_price = '';
         this.goods_commonid = this.chosegoods_commonid ? 'asc' : 'desc';
@@ -265,7 +264,6 @@ var _default = {
         this.chosegoods_commonid = !this.chosegoods_commonid;
       } else if (this.tabIndex == 3) {// 价格
         this.chosegoods_commonid = true;
-        console.log(this.chosegoods_price);
         this.istopclick = this.chosegoods_price ? 3 : 4;
         this.goods_price = this.chosegoods_price ? 'desc' : 'asc';
         this.goods_commonid = '';

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

@@ -288,7 +288,7 @@ var _amapWx = _interopRequireDefault(__webpack_require__(/*! @/common/amap-wx.js
 
   onLoad: function onLoad() {
     if (this.beginload) {
-      console.log("jinlaieeeeee");
+
       this.getpicture(); // 开机广告
       //this.gethotelist(); // 酒店列表
       if (this.allow) {
@@ -308,10 +308,9 @@ var _amapWx = _interopRequireDefault(__webpack_require__(/*! @/common/amap-wx.js
   watch: {
     'allow': function allow(val) {
       if (val) {
-        console.log(val);
+
       } else {
-        console.log(val);
-        console.log("dddjdjdjjdjd");
+
         //this.gethotelist(); // 酒店列表
       }
     },
@@ -343,7 +342,6 @@ var _amapWx = _interopRequireDefault(__webpack_require__(/*! @/common/amap-wx.js
         method: 'get',
         success: function success(res) {var
           data = res.data.data;
-          console.log(res.data.data);
           _this2.images = data.images;
           _this2.enable = data.enable;
         } });
@@ -383,7 +381,7 @@ var _amapWx = _interopRequireDefault(__webpack_require__(/*! @/common/amap-wx.js
     },
     // 滚动到顶部
     upper: function upper(e) {
-      console.log("顶部");
+
     },
 
     getop: function getop() {
@@ -453,7 +451,6 @@ var _amapWx = _interopRequireDefault(__webpack_require__(/*! @/common/amap-wx.js
       uni.authorize({
         scope: a,
         success: function success(res) {//允许授权
-          console.log("调用位置授权");
           _this.getRegeo();
         },
         fail: function fail() {//拒绝授权
@@ -477,7 +474,7 @@ var _amapWx = _interopRequireDefault(__webpack_require__(/*! @/common/amap-wx.js
         },
         fail: function fail(res) {
           _this3.allow = true;
-          console.log(res);
+
           uni.hideLoading();
         } });
 
@@ -526,7 +523,7 @@ var _amapWx = _interopRequireDefault(__webpack_require__(/*! @/common/amap-wx.js
               _this5.hotelist = _this5.hotelist.concat(data.store_list);
             }
 
-            console.log(_this5.hotelist);
+
           } else {
             _this5.$msg("网络错误稍后再试");
           }
@@ -538,7 +535,7 @@ var _amapWx = _interopRequireDefault(__webpack_require__(/*! @/common/amap-wx.js
     scan: function scan() {
       uni.scanCode({
         success: function success(res) {
-          console.log(res);
+
         } });
 
     },

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

@@ -437,7 +437,7 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function _interopRequireDefault(
     var store_id = this.store_id;
     if (res.from === 'button') {
       // 来自页面内分享按钮
-      console.log(res.target);
+
     }
     return {
       title: that.datalist.goods_name,
@@ -578,7 +578,6 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function _interopRequireDefault(
           this.specSelected = this.datalist.goods_list;
           return;
         }
-        console.log(this.datalist);
         var goods = [];
         goods.push({});
         goods[0].goods_id = this.goods_id;
@@ -591,7 +590,6 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function _interopRequireDefault(
             goods: JSON.stringify(goods) },
 
           success: function success(res) {
-            console.log(res);
             var store = _this3.store_id;
             var order_id = res.data.data.order_id;
             _this3.specClass = 'none';
@@ -684,7 +682,6 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function _interopRequireDefault(
         this.goods_id = items.goods_id;
         this.firstprice = items.goods_price;
         this.totalprice = items.goods_price * this.shopnumber;
-        console.log(items);
       }
 
       // if(this.arrayId.length == this.datalist.spec_list.length) {
@@ -722,8 +719,7 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function _interopRequireDefault(
     },
     // 滚动到顶部
     upper: function upper(e) {
-      console.log(e);
-      console.log("顶部");
+
     },
 
     // 滚到底部

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

@@ -306,11 +306,22 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default =
 
 {
   data: function data() {
     return {
+      ishow: false,
       firstprice: 0,
       read: 0,
       hotelname: '', // 
@@ -340,14 +351,12 @@ var _default =
 
   },
   onLoad: function onLoad(options) {var _this = this;
-    console.log(options);
     this.order_id = options.order_id;
     this.store_id = options.store;
     // let prices =  Number((options.prices/100).toFixed(2));
     // this.prices = prices; 
     this.getorder(); // 获取订单详情
     uni.$on("getadress", function (adress) {
-      console.log(adress);
       _this.choseadress = adress;
       _this.address_id = _this.choseadress.address_id;
       //this.getorder();
@@ -355,8 +364,13 @@ var _default =
     });
   },
   methods: {
+    readshouknow: function readshouknow() {
+      this.ishow = true;
+    },
+    confirmOrder: function confirmOrder() {
+      this.ishow = false;
+    },
     getread: function getread() {
-      console.log("kkk");
       this.read = 4;
     },
 
@@ -401,7 +415,7 @@ var _default =
           _this2.reserve = _this2.store.store_name;
           _this2.pricelist = data.og_list;
           _this2.firstprice = totalprice;
-          _this2.prices = totalprice;;
+          _this2.prices = totalprice;
         } });
 
     },
@@ -437,7 +451,6 @@ var _default =
             area_id: this.store.region_id },
 
           success: function success(res) {
-            console.log(res.data.data.address_id);
             _this3.address_id = res.data.data.address_id;
             _this3.shipping_type = 1;
             _this3.gopaymoment();
@@ -470,7 +483,6 @@ var _default =
             area_id: this.store.region_id },
 
           success: function success(res) {
-            console.log(res.data.data.address_id);
             _this3.address_id = res.data.data.address_id;
             _this3.shipping_type = 1;
             _this3.gopaymoment();
@@ -493,7 +505,6 @@ var _default =
           remark: this.remark },
 
         success: function success(res) {
-          console.log(res);
           var order_id = res.data.data.order_id; // 订单id
           var prices = _this4.prices;
           uni.navigateTo({

unpackage/dist/dev/mp-weixin/pages/myCenter/applyfor.js

@@ -185,7 +185,7 @@ var _new_file = _interopRequireDefault(__webpack_require__(/*! @/common/new_file
   },
   methods: {
     onChange: function onChange(e) {
-      console.log(e);
+
       this.contacts_name = e.detail;
     },
     changenumber: function changenumber(e) {
@@ -198,7 +198,7 @@ var _new_file = _interopRequireDefault(__webpack_require__(/*! @/common/new_file
       this.contacts_address = e.detail;
     },
     goapply: function goapply() {var _this = this;
-      console.log(this.contacts_name);
+
       if (this.contacts_name == '') {
         this.$msg("请输入姓名");
         return;
@@ -238,7 +238,7 @@ var _new_file = _interopRequireDefault(__webpack_require__(/*! @/common/new_file
 
     },
     getImg: function getImg(e) {
-      console.log(e);
+
       this.imageList = e;
     } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))

unpackage/dist/dev/mp-weixin/pages/myCenter/commentback.js

@@ -167,7 +167,6 @@ __webpack_require__.r(__webpack_exports__);
   },
   methods: {
     getImg: function getImg(e) {
-      console.log(e);
       this.imageList = e;
     },
     submitValue: function submitValue(e) {

unpackage/dist/dev/mp-weixin/pages/myCenter/definite.js

@@ -151,7 +151,6 @@ __webpack_require__.r(__webpack_exports__);
 var _default =
 {
   onReady: function onReady() {
-    console.log("进来了");
     uni.setNavigationBarColor({
       frontColor: '#ffffff',
       backgroundColor: '#D9332E',
@@ -193,7 +192,6 @@ var _default =
           page_size: 10 },
 
         success: function success(res) {
-          console.log(res);
           _this2.point_list = res.data.data.point_list;
         } });
 

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

@@ -288,8 +288,7 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
 
 
   onLoad: function onLoad() {
-    console.log(this.userInfo);
-    console.log(this.hasLogin);
+
     if (this.successlogion && this.hasLogin) {
       this.getuserinfo();
     } else {
@@ -326,7 +325,6 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
   methods: {
     // 跳转到我的订单
     gomyorder: function gomyorder(e) {
-      console.log(e);
       if (this.successlogion && this.hasLogin) {
         var state = '';
         if (e == 0) {

unpackage/dist/dev/mp-weixin/pages/myCenter/logion.js

@@ -201,7 +201,6 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
           that.login(res.userInfo);
           that.showDialog(true); // 改变haslogion的值
           that.$msg("授权成功");
-          console.log(_this.successlogion);
           if (_this.successlogion) {
             uni.navigateBack();
           }

unpackage/dist/dev/mp-weixin/pages/myCenter/myCollect.js

@@ -227,7 +227,6 @@ var _default =
       uni.navigateTo({
         url: "/pages/index/hotel?id=".concat(id) });
 
-      console.log(item);
     },
     goshop: function goshop(item) {
       var store_id = item.store_id;

unpackage/dist/dev/mp-weixin/pages/myCenter/orderdetail.js

@@ -418,7 +418,6 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
           page_size: 10 },
 
         success: function success(res) {
-          console.log(res.data.data.refund_list);
           if (res.data.data.refund_list.length < 10) {
             _this2.ispull = false;
           }
@@ -463,7 +462,6 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
 
     },
     gopay: function gopay(e) {
-      console.log(e);
       var prices = e.order_amount;
       this.order_id = e.order_id;
       var order_id = e.order_id;
@@ -532,7 +530,6 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
     // 滚到底部
     lower: function lower(e) {
       if (this.ispull) {
-        console.log("l;ll");
         this.page += 1;
         this.getlist();
       }

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

@@ -225,8 +225,7 @@ var _default =
       this.checkboxList = [];
     },
     checkboxChange: function checkboxChange(e) {var _this3 = this;
-      // 单选
-      console.log(e);
+
       this.checkboxList = [];
       e.detail.forEach(function (item, idx) {
         _this3.$set(_this3.checkboxList, idx, item);
@@ -237,13 +236,13 @@ var _default =
         price.push(array[item].address_id);
       });
       this.pricelist = price;
-      console.log(this.pricelist);
+
 
 
     },
     // 删除地址
     onClickButton: function onClickButton() {var _this4 = this;
-      console.log(address_ids);
+
       var address_ids = this.pricelist.join(',');
       this.request({
         url: '/v1/member/address_drop',
@@ -296,8 +295,6 @@ var _default =
     refreshList: function refreshList(data, type) {
       //添加或修改后事件，这里直接在最前面添加了一条数据，实际应用中直接刷新地址列表即可
       this.addressList.unshift(data);
-
-      console.log(data, type);
     } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 

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

@@ -196,21 +196,18 @@ __webpack_require__.r(__webpack_exports__);
 
   },
   onLoad: function onLoad(option) {
-    console.log(option);
+
     var title = '新增收货地址';
     if (option.type === 'edit') {
       title = '编辑收货地址';
       var data = JSON.parse(option.data);
-      console.log(data.area_info);
       this.addressData.addressName = data.area_info;
-      console.log(this.addressData.addressName);
       this.addressData.mobile = data.address_mob_phone;
       this.addressData.name = data.address_realname;
       this.addressData.area = data.address_detail;
       this.address_id = data.address_id;
       this.area_id = data.area_id;
     }
-    console.log(JSON.parse(option.data));
     this.manageType = option.type;
     uni.setNavigationBarTitle({
       title: title });
@@ -274,7 +271,6 @@ __webpack_require__.r(__webpack_exports__);
     //提交
     confirm: function confirm() {
       var data = this.addressData;
-      console.log(data);
       if (!data.addressName) {
         this.$msg('请选择省市区');
         return;

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

@@ -184,7 +184,6 @@ __webpack_require__.r(__webpack_exports__);
       this.valueNumber = e.detail;
     },
     getImg: function getImg(e) {
-      console.log(e);
       this.imageList = e.join(',');
     },
     submitValue: function submitValue(e) {

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

@@ -260,7 +260,6 @@ __webpack_require__.r(__webpack_exports__);
     };
   },
   onLoad: function onLoad(e) {var _this = this;
-    console.log(e);
     this.id = e.id;
     this.getDetail();
     // 刷新订单详情  
@@ -330,7 +329,6 @@ __webpack_require__.r(__webpack_exports__);
             items.descire = items.goods_name.replace(arr[0], '');
           });
           _this2.detail = data;
-          console.log(_this2.detail);
         } });
 
     },

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

@@ -75,7 +75,7 @@ page {
   border-bottom: 14rpx solid #F5F5F5;
 }
 .adressDetail {
-  padding: 6rpx 0;
+  padding: 15rpx 0;
 }
 .orderCode {
   padding-left: 15rpx;

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

@@ -162,6 +162,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
 
 
 {
@@ -185,7 +186,6 @@ __webpack_require__.r(__webpack_exports__);
 
   },
   onLoad: function onLoad(e) {
-    console.log(e);
     this.prices = e.prices;
     this.order_id = e.order_id;
     this.getuserInfo();
@@ -211,7 +211,6 @@ __webpack_require__.r(__webpack_exports__);
         method: 'post',
         success: function success(res) {
           _this.ratio_points = res.data.data.ratio_points;
-          console.log(_this.ratio_points);
           if (_this.ratio_points > 0) {
             _this.list = [
             { title: '微信支付' },
@@ -241,10 +240,6 @@ __webpack_require__.r(__webpack_exports__);
           order_id: this.order_id },
 
         success: function success(res) {
-          console.log(res);
-          //uni.$emit('finshesitmate');
-          console.log(res.data.code);
-          console.log(res.data.data);
           if (res.data.code == 1000) {
             setTimeout(function () {
               uni.navigateTo({
@@ -261,7 +256,6 @@ __webpack_require__.r(__webpack_exports__);
       this.radio = index;
     },
     payMoney: function payMoney() {var _this3 = this;
-      console.log("kkk");
       if (this.radio == 0) {
         // 微信支付
         this.request({
@@ -274,7 +268,6 @@ __webpack_require__.r(__webpack_exports__);
 
           success: function success(res) {var
             wx = res.data.data.wx;
-            console.log(wx);
             uni.requestPayment({
               provider: 'wxpay',
               timeStamp: wx.timeStamp,
@@ -283,7 +276,6 @@ __webpack_require__.r(__webpack_exports__);
               signType: 'MD5',
               paySign: wx.paySign,
               success: function success(res) {
-                console.log('success:' + JSON.stringify(res));
                 var isform = 2;
                 var order_id = _this3.order_id;
                 uni.navigateTo({
@@ -291,7 +283,6 @@ __webpack_require__.r(__webpack_exports__);
 
               },
               fail: function fail(err) {
-                console.log('fail:' + JSON.stringify(err));
               } });
 
           } });