酒店图片

common/request.js

@@ -4,7 +4,7 @@ const request = function(options) {
      try {
        // 获取放入缓存的字段token obj.header["token"] = userToken;
         const token = uni.getStorageSync('sessionId');
-	    //const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczpcL1wvd3d3LnF6YWl3YW5nLmNvbSIsImlhdCI6MTU5MDIwMTk3OSwiZXhwIjoxNTkxMDY1OTc5LCJuYmYiOjE1OTAyMDE5NzksInN1YiI6MTYsInBydiI6ImU5YTM5YzhhZjYwMWYyNGMzZjA3ZjQ0NjMyMmE1NmM4MDVjNWNkZTYifQ.lYkvBvJ3rh2NRLyii6aCe625YfzOpuCPNnpVY1jw_gA';
+	    //const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczpcL1wvd3d3LnF6YWl3YW5nLmNvbSIsImlhdCI6MTU5MTI0MDg5NiwiZXhwIjoxNTkyMTA0ODk2LCJuYmYiOjE1OTEyNDA4OTYsInN1YiI6MTAwLCJwcnYiOiJlOWEzOWM4YWY2MDFmMjRjM2YwN2Y0NDYzMjJhNTZjODA1YzVjZGU2In0.gJTUiEVvMtHv8GGzUWZO_OSsG0hSrJ4sQDdCrtqQcTM';
        if (token) { // 如果存在token 配置请求头
          options.header = {
            'X-TOKEN' : token,

pages/index/hotel.vue

@@ -454,10 +454,13 @@
 						let { data } = res.data;
 						this.hoteldetail = data;
 						this.hotelitle = data.store_name;
-						this.store_slide = data.store_slide;
+						data.store_slide.forEach(item => {
+							if(item.indexOf('jpg')!= -1) {
+								this.store_slide.push(item);
+							}
+						})
 						this.store_summary = data.store_summary;
 						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;`);
 						this.store_description = data.store_description;

pages/index/searchresult.vue

@@ -13,7 +13,7 @@
 			 </template>
 		 </van-cell>
 		 
-		 <view class="hotelList" v-for="(item,index) in hotelist" :key="index">
+		 <view class="hotelList" v-for="(item,index) in hotelist" :key="index" @click="openinfo(item)">
 		 		 <view class="hotleLeft">									
 		 		 			 <image  style="width: 214upx;height: 152upx;" :src="pictureUrl+'/uploads/home/store/'+item.store_id+'/'+item.store_banner" />
 		 		 		 </view>
@@ -60,6 +60,13 @@
 				this.hotelist = [];
 				this.gethotelist();
 			},
+			// 跳转到新页面  酒店详情
+			openinfo(item) {
+						 let id = item.store_id;
+						  uni.navigateTo({
+						        url: `/pages/index/hotel?id=${id}`
+						  });
+			},
 			// 获取酒店列表
 					 gethotelist() {
 						 if(this.searchvalue == '') {

pages/index/sureBuy.vue

@@ -1,5 +1,8 @@
 <template>
 	<view style="width: 100%;height:　100vh;background-color: #F5F5F5;">
+		<scroll-view  class="floor-list"
+		 :scroll-top="scrollTop" scroll-y="true" 
+		 :refresher-enabled="false">
 		<van-radio-group >
 		   <van-cell-group 
 		   v-for="(item, index) in list"
@@ -156,6 +159,7 @@
 				  <view style="font-size: 28upx;">运费：{{ralodprice}}</view>
 			   </view>
 		 </view>
+		 </scroll-view>
 		 <!-- 底部付款 -->
 		 <view class="adressbutton">
 		 		<view class="buttonStatus">
@@ -172,6 +176,7 @@
 	export default {
 		data() {
 			return {
+				scrollTop: 0,
 				ishow: false,
 				firstprice: 0,
 				read: 0,

pages/myCenter/Settled.vue

@@ -112,6 +112,7 @@
 					url: '/v2/member/application',
 					method:'post',
 					data: {
+						hotel_name: this.hotel_name,
 						contacts_name: this.contacts_name,	
 						contacts_phone: this.contacts_phone,		
 						contacts_number	: this.contacts_number,	

pages/myCenter/information.vue

@@ -3,14 +3,18 @@
 		 <scroll-view  style="height: 100vh;" class="floor-list"
 		  :scroll-top="scrollTop" scroll-y="true"  v-if="list.length > 0"   @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
 		  :refresher-enabled="false">
-			  <view class="hotelcontent" v-for="(item,index) in getlist" :key="index">
+			  <view class="hotelcontent" v-for="(item,index) in list" :key="index">
 				 <view class="contentleft">
-					  <image style="width: 100%;height: 100%;"></image>
+					 <!--  :src="pictureUrl+'/uploads/home/store/goods/'+item.goodsimage_url.substr(0, item.goodsimage_url.indexOf('\_')) + '/' + item.goodsimage_url" -->
+					  <image
+					   :src="pictureUrl+'/uploads/home/store/goods/'+item.goods_image.substr(0, item.goods_image.indexOf('\_')) + '/' + item.goods_image"
+					   style="width: 100%;height: 100%;"></image>
 				  </view>
 				  <view class="contentitle">
-					  <view v-if="item.types == 0">催单信息</view>
+					<!--  <view v-if="item.types == 0">催单信息</view>
 					  <view v-if="item.types == 1">联系酒店</view>
-					  <view v-if="item.types == 2">客户退货</view>
+					  <view v-if="item.types == 2">客户退货</view> -->
+					  <view>{{item.status}}</view>
 					  <view>{{item.content}}</view>
 					  <view>订单号：{{item.order_sn}}</view>
 					  <view style="text-align: right;">{{item.add_time}}</view>
@@ -27,6 +31,7 @@
 	export default {
 		data() {
 		   return{
+			   pictureUrl: this.pictureUrl,
 			   list:[],
 			   page:　1,
 			   scrollTop: 0,
@@ -63,6 +68,7 @@
 						page_size:　10
 					},
 					success: (res) => {
+						
 						this.list = this.list.concat(res.data.data.msg_list);
 					}
 				})

pages/myOrder/adressManger.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
-		<view class="row b-b">
-			<input class="input" type="text" @click="changeshow" v-model="addressData.addressName" placeholder="省,城市,区县" placeholder-class="placeholder" />
+		<view class="row b-b"  @click="changeshow">
+			<input class="input"  id="box" type="text" :disabled="true" v-model="addressData.addressName" placeholder="省,城市,区县" placeholder-class="placeholder" />
 		</view>
 		
 		<view class="row b-b">
@@ -121,12 +121,15 @@
 				this.addressData.default = e.detail;
 			},
 			changeshow() {
+				
 				this.adress = '';
 				this.area_id = '';
 				this.getadress();
 				this.show = !this.show;
 				
 			},
+			
+		    
 			cancelCity() {
 				this.show = false;
 			},

pages/myOrder/index.vue

@@ -32,10 +32,10 @@
 		   </view>
 			   <view class="topTip">
 				  <view style="font-size: 28upx;">合计：{{item.order_amount}}</view>
-				 <view class="deleChange" v-if="item.order_state == 10">去付款</view>
-				  <view class="deleChange" v-if="item.order_state == 20">催单</view>
-				  <view class="deleChange" v-if="item.order_state == 30">确认收货</view> 
-				  <view class="deleChange" v-if="item.order_state == 40 && item.evaluation_state == 0">去评价</view>
+				  <view class="deleChange"  @click="gopay(item)" v-if="item.order_state == 10">去付款</view>
+				  <view class="deleChange"  @click="gopay(item)" v-if="item.order_state == 20">催单</view>
+				  <view class="deleChange"  @click="gopay(item)" v-if="item.order_state == 30">确认收货</view> 
+				  <view class="deleChange"  @click="gopay(item)" v-if="item.order_state == 40 && item.evaluation_state == 0">去评价</view>
 				  <!-- <view class="deleChange" @click="gopay(item)">{{item.operate}}</view> -->
 			   </view>
 		  </view>

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

@@ -2771,7 +2771,7 @@ var request = function request(options) {
   try {
     // 获取放入缓存的字段token obj.header["token"] = userToken;
     var token = uni.getStorageSync('sessionId');
-    //const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczpcL1wvd3d3LnF6YWl3YW5nLmNvbSIsImlhdCI6MTU5MDIwMTk3OSwiZXhwIjoxNTkxMDY1OTc5LCJuYmYiOjE1OTAyMDE5NzksInN1YiI6MTYsInBydiI6ImU5YTM5YzhhZjYwMWYyNGMzZjA3ZjQ0NjMyMmE1NmM4MDVjNWNkZTYifQ.lYkvBvJ3rh2NRLyii6aCe625YfzOpuCPNnpVY1jw_gA';
+    //const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczpcL1wvd3d3LnF6YWl3YW5nLmNvbSIsImlhdCI6MTU5MTI0MDg5NiwiZXhwIjoxNTkyMTA0ODk2LCJuYmYiOjE1OTEyNDA4OTYsInN1YiI6MTAwLCJwcnYiOiJlOWEzOWM4YWY2MDFmMjRjM2YwN2Y0NDYzMjJhNTZjODA1YzVjZGU2In0.gJTUiEVvMtHv8GGzUWZO_OSsG0hSrJ4sQDdCrtqQcTM';
     if (token) {// 如果存在token 配置请求头
       options.header = {
         'X-TOKEN': token,

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

@@ -587,10 +587,13 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
           data = res.data.data;
           _this5.hoteldetail = data;
           _this5.hotelitle = data.store_name;
-          _this5.store_slide = data.store_slide;
+          data.store_slide.forEach(function (item) {
+            if (item.indexOf('jpg') != -1) {
+              _this5.store_slide.push(item);
+            }
+          });
           _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;");
 
           _this5.store_description = data.store_description;

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

@@ -131,7 +131,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uniIcon = function uniIcon() {__webpack_require__.e(/*! require.ensure | component/uni-icon/uni-icon */ "component/uni-icon/uni-icon").then((function () {return resolve(__webpack_require__(/*! @/component/uni-icon/uni-icon.vue */ 301));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uniIcon = function uniIcon() {__webpack_require__.e(/*! require.ensure | component/uni-icon/uni-icon */ "component/uni-icon/uni-icon").then((function () {return resolve(__webpack_require__(/*! @/component/uni-icon/uni-icon.vue */ 301));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 
@@ -193,6 +193,13 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
       this.hotelist = [];
       this.gethotelist();
     },
+    // 跳转到新页面  酒店详情
+    openinfo: function openinfo(item) {
+      var id = item.store_id;
+      uni.navigateTo({
+        url: "/pages/index/hotel?id=".concat(id) });
+
+    },
     // 获取酒店列表
     gethotelist: function gethotelist() {var _this = this;
       if (this.searchvalue == '') {
@@ -225,6 +232,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
         } });
 
     } } };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/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/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>
+<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 data-event-opts="{{[['tap',[['openinfo',['$0'],[[['hotelist','',index]]]]]]]}}" class="hotelList" bindtap="__e"><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>

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

@@ -316,11 +316,16 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
+//
+//
 var _default =
 
 {
   data: function data() {
     return {
+      scrollTop: 0,
       ishow: false,
       firstprice: 0,
       read: 0,

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

@@ -245,6 +245,7 @@ __webpack_require__.r(__webpack_exports__);
         url: '/v2/member/application',
         method: 'post',
         data: {
+          hotel_name: this.hotel_name,
           contacts_name: this.contacts_name,
           contacts_phone: this.contacts_phone,
           contacts_number: this.contacts_number,

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

@@ -98,6 +98,22 @@ var render = function() {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
+  var l0 = _vm.__map(_vm.list, function(item, index) {
+    var g0 = item.goods_image.substr(0, item.goods_image.indexOf("_"))
+    return {
+      $orig: _vm.__get_orig(item),
+      g0: g0
+    }
+  })
+
+  _vm.$mp.data = Object.assign(
+    {},
+    {
+      $root: {
+        l0: l0
+      }
+    }
+  )
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -156,10 +172,15 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 //
 //
 //
+//
+//
+//
+//
 var _default =
 {
   data: function data() {
     return {
+      pictureUrl: this.pictureUrl,
       list: [],
       page: 1,
       scrollTop: 0,
@@ -196,6 +217,7 @@ var _default =
           page_size: 10 },
 
         success: function success(res) {
+
           _this.list = _this.list.concat(res.data.data.msg_list);
         } });
 

unpackage/dist/dev/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="{{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>
+<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="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="hotelcontent"><view class="contentleft"><image style="width:100%;height:100%;" src="{{pictureUrl+'/uploads/home/store/goods/'+item.g0+'/'+item.$orig.goods_image}}"></image></view><view class="contentitle"><view>{{item.$orig.status}}</view><view>{{item.$orig.content}}</view><view>{{"订单号："+item.$orig.order_sn}}</view><view style="text-align:right;">{{item.$orig.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>

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

@@ -254,12 +254,15 @@ __webpack_require__.r(__webpack_exports__);
       this.addressData.default = e.detail;
     },
     changeshow: function changeshow() {
+
       this.adress = '';
       this.area_id = '';
       this.getadress();
       this.show = !this.show;
 
     },
+
+
     cancelCity: function cancelCity() {
       this.show = false;
     },