Browse Source

商品详情

wcni 5 years ago
parent
commit
b8480a29e3
100 changed files with 2195 additions and 1391 deletions
  1. 1 0
      App.vue
  2. 0 0
      common/amap-wx.js
  3. 11 0
      common/new_file.js
  4. 34 0
      common/request.js
  5. 19 10
      component/assess.vue
  6. 25 51
      component/shopList.vue
  7. 4 39
      main.js
  8. 14 3
      pages.json
  9. 12 19
      pages/index/cart.vue
  10. 21 1
      pages/index/commemt.vue
  11. 536 355
      pages/index/hotel.vue
  12. 225 0
      pages/index/hoteldetail.vue
  13. 140 144
      pages/index/index.vue
  14. 12 25
      pages/index/shop.vue
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/Dialog.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/assess.js.map
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/commoNar.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/mpvue-citypicker/mpvueCityPicker.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/shopList.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/textarea.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/uinNumber.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/uni-icon/uni-icon.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/uni-nav-bar/uni-nav-bar.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/uni-status-bar/uni-status-bar.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/component/uploadImage.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/cart.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/commemt.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/hotel.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/hoteldetail.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/searchresult.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/shop.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/sureBuy.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/applyfor.js.map
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/commentback.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/definite.js.map
  40. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/index.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/information.js.map
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/myCollect.js.map
  43. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/adress.js.map
  44. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/adressManger.js.map
  45. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/estimate.js.map
  46. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/index.js.map
  47. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/order.js.map
  48. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/paymoment.js.map
  49. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/reminder.js.map
  50. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myone/oneIndex.js.map
  51. 4 1
      unpackage/dist/dev/mp-weixin/app.json
  52. 6 40
      unpackage/dist/dev/mp-weixin/common/main.js
  53. 1 0
      unpackage/dist/dev/mp-weixin/common/main.wxss
  54. 1 1
      unpackage/dist/dev/mp-weixin/common/runtime.js
  55. 78 6
      unpackage/dist/dev/mp-weixin/common/vendor.js
  56. 12 12
      unpackage/dist/dev/mp-weixin/component/Dialog.js
  57. 12 12
      unpackage/dist/dev/mp-weixin/component/assess.js
  58. 1 1
      unpackage/dist/dev/mp-weixin/component/assess.wxml
  59. 12 12
      unpackage/dist/dev/mp-weixin/component/commoNar.js
  60. 10 10
      unpackage/dist/dev/mp-weixin/component/loginDialog.js
  61. 2 2
      unpackage/dist/dev/mp-weixin/component/loginDialog.json
  62. 15 15
      unpackage/dist/dev/mp-weixin/component/mpvue-citypicker/mpvueCityPicker.js
  63. 43 57
      unpackage/dist/dev/mp-weixin/component/shopList.js
  64. 1 1
      unpackage/dist/dev/mp-weixin/component/shopList.wxml
  65. 7 0
      unpackage/dist/dev/mp-weixin/component/shopList.wxss
  66. 12 12
      unpackage/dist/dev/mp-weixin/component/textarea.js
  67. 12 12
      unpackage/dist/dev/mp-weixin/component/uinNumber.js
  68. 12 12
      unpackage/dist/dev/mp-weixin/component/uni-icon/uni-icon.js
  69. 13 13
      unpackage/dist/dev/mp-weixin/component/uni-nav-bar/uni-nav-bar.js
  70. 12 12
      unpackage/dist/dev/mp-weixin/component/uni-status-bar/uni-status-bar.js
  71. 12 12
      unpackage/dist/dev/mp-weixin/component/uploadImage.js
  72. 23 30
      unpackage/dist/dev/mp-weixin/pages/index/cart.js
  73. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/cart.wxml
  74. 36 17
      unpackage/dist/dev/mp-weixin/pages/index/commemt.js
  75. 13 30
      unpackage/dist/dev/mp-weixin/pages/index/hotel.js
  76. 2 1
      unpackage/dist/dev/mp-weixin/pages/index/hotel.json
  77. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/hotel.wxml
  78. 104 98
      unpackage/dist/dev/mp-weixin/pages/index/hotel.wxss
  79. 352 0
      unpackage/dist/dev/mp-weixin/pages/index/hoteldetail.js
  80. 11 0
      unpackage/dist/dev/mp-weixin/pages/index/hoteldetail.json
  81. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/hoteldetail.wxml
  82. 24 0
      unpackage/dist/dev/mp-weixin/pages/index/hoteldetail.wxss
  83. 19 30
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  84. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/index.wxml
  85. 7 5
      unpackage/dist/dev/mp-weixin/pages/index/index.wxss
  86. 15 15
      unpackage/dist/dev/mp-weixin/pages/index/searchresult.js
  87. 96 141
      unpackage/dist/dev/mp-weixin/pages/index/shop.js
  88. 2 1
      unpackage/dist/dev/mp-weixin/pages/index/shop.json
  89. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/shop.wxml
  90. 13 0
      unpackage/dist/dev/mp-weixin/pages/index/shop.wxss
  91. 26 13
      unpackage/dist/dev/mp-weixin/pages/index/sureBuy.js
  92. 13 13
      unpackage/dist/dev/mp-weixin/pages/myCenter/Settled.js
  93. 15 15
      unpackage/dist/dev/mp-weixin/pages/myCenter/applyfor.js
  94. 12 12
      unpackage/dist/dev/mp-weixin/pages/myCenter/business.js
  95. 14 14
      unpackage/dist/dev/mp-weixin/pages/myCenter/commentback.js
  96. 13 13
      unpackage/dist/dev/mp-weixin/pages/myCenter/definite.js
  97. 14 14
      unpackage/dist/dev/mp-weixin/pages/myCenter/index.js
  98. 13 13
      unpackage/dist/dev/mp-weixin/pages/myCenter/information.js
  99. 13 13
      unpackage/dist/dev/mp-weixin/pages/myCenter/myCollect.js
  100. 13 13
      unpackage/dist/dev/mp-weixin/pages/myOrder/adress.js

+ 1 - 0
App.vue

@@ -1,4 +1,5 @@
 <script>
+
 	import {
 		mapMutations,
 	} from 'vuex';

File diff suppressed because it is too large
+ 0 - 0
common/amap-wx.js


+ 11 - 0
common/new_file.js

@@ -0,0 +1,11 @@
+var baseUrl = ""
+
+if(process.env.NODE_ENV === 'production'){
+    // 生产环境
+  //  baseUrl = 'http://' + window.location.host + '/washer'
+}else{
+    // 开发环境
+    baseUrl = 'https://www.qzaiwang.com';
+}
+
+export default baseUrl

+ 34 - 0
common/request.js

@@ -0,0 +1,34 @@
+import baseUrl from './new_file.js'
+const request = function(options) {
+     options.url = baseUrl + options.url;
+     try {
+       // 获取放入缓存的字段token
+       // const token = uni.getStorageSync('sessionId');
+	    const token = '777';
+       if (token) { // 如果存在token 配置请求头
+         options.header = {
+           'Authorization' : token,
+		   'Content-Type' : 'application/x-www-form-urlencoded',
+         };
+        }else{	// 不存在token 跳转至登录
+            return;
+        }
+     } catch (err) {
+      console.log(err)
+    }
+    // 这里对response进行处理,
+    // 401表示登录状态过期,需重新登录
+	options.complete = (response) => {
+		console.log(response)
+		if(response.data.code != 1000) {
+			uni.showToast({
+				title: response.data.msg,
+				duration: 2000,
+				icon: 'none'
+			});
+		}
+		return;
+	}
+    return uni.request(options);
+  }
+export default request;

+ 19 - 10
component/assess.vue

@@ -1,24 +1,29 @@
 <template>
 	<view>
-	<!-- <page-head :title="title"></page-head> -->
-		<view class="uni-padding-wrap" style="border-bottom: 1px solid #EEEEEE;padding-bottom: 10upx;">
-			<!-- 评论区 start -->
+		<view  v-for="(item,index) in feedback_list" :key="index" class="uni-padding-wrap" style="border-bottom: 1px solid #EEEEEE;padding-bottom: 10upx;">
 			<view class="uni-comment">
 				<view class="uni-comment-list">
-					<view class="uni-comment-face"><image src="https://img-cdn-qiniu.dcloud.net.cn/uniapp/images/uni@2x.png" mode="widthFix"></image></view>
+					<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: 28upx;color: #303133">网友</text>
+							<text style="font-size: 28upx;color: #303133">{{item.member_truename}}</text>
 						    <uniIcon type="star" size="16"></uniIcon>
 						</view>
 						<view class="uni-comment-date">
-							<text style="color: #909399;font-size: 20upx;">08/10 08:12</text>
+							<text style="color: #909399;font-size: 20upx;">{{item.add_time}}</text>
 						</view>
-						
 					</view>
-					
+					<view>
+						<van-rate
+						  :value="item.satisfaction"
+						  void-icon="star"
+						  void-color="#eee"
+						  color="#ee0a24"
+						  readonly='true'
+						/>
+					</view>
 				</view>
-				<view style="color: #303133;font-size: 28upx;" class="uni-comment-content">很酷的HBuilderX和uni-app,开发一次既能生成小程序,又能生成App</view>
+				<view style="color: #303133;font-size: 28upx;" class="uni-comment-content">{{item.content}}</view>
 			</view>
 		</view>
 	</view>
@@ -27,7 +32,11 @@
 <script>
 	import uniIcon from '@/component/uni-icon/uni-icon.vue'
 	export default {
-		
+		props: {
+			feedback_list: {
+				type: Array
+			}
+		},
 		component:{
 			uniIcon
 		},

+ 25 - 51
component/shopList.vue

@@ -1,15 +1,14 @@
 <template>
 	<view class="page">
-		
 		<view class="uni-product-list">
-			<view class="uni-product" v-for="(product,index) in productList" :key="index">
+			<view class="uni-product" v-for="(product,index) in productList" :key="index" @click="goshop(product)">
 				<view class="image-view">
-					<image v-if="renderImage" class="uni-product-image" :src="product.image"></image>
+					<image style="background-color: #007AFF;" class="uni-product-image" :src="pictureUrl+'/uploads/home/store/' + product.goods_image"></image>
 				</view>
-				<view class="uni-product-title">{{product.title}}</view>
+				<view class="uni-product-title textover">{{product.goods_name}}</view>
 				<view class="uni-product-price">
-					<text class="uni-product-price-original">¥{{product.favourPrice}}</text>
-					<text class="uni-product-price-favour">¥{{product.originalPrice}}</text>
+					<text class="uni-product-price-original">¥{{product.goods_marketprice}}</text>
+					<text class="uni-product-price-favour">¥{{product.goods_costprice}}</text>
 				</view>
 			</view>
 		</view>
@@ -18,56 +17,27 @@
 
 <script>
 export default {
+	props: {
+		productList: {
+		  type: Array
+		}
+	},
     data() {
         return {
             title: 'product-list',
-			productList: [ {
-                    image: 'https://img-cdn-qiniu.dcloud.net.cn/uploads/example/product1.jpg',
-                    title: 'Apple iPhone X 256GB 深空灰色 移动联通电信4G手机',
-                    originalPrice: 9999,
-                    favourPrice: 8888,
-                    tip: '自营'
-                },
-                {
-                    image: 'https://img-cdn-qiniu.dcloud.net.cn/uploads/example/product2.jpg',
-                    title: 'Apple iPad 平板电脑 2018年新款9.7英寸',
-                    originalPrice: 3499,
-                    favourPrice: 3399,
-                    tip: '优惠'
-                },
-                {
-                    image: 'https://img-cdn-qiniu.dcloud.net.cn/uploads/example/product3.jpg',
-                    title: 'Apple MacBook Pro 13.3英寸笔记本电脑(2017款Core i5处理器/8GB内存/256GB硬盘 MupxT2CH/A)',
-                    originalPrice: 12999,
-                    favourPrice: 10688,
-                    tip: '秒杀'
-                },
-                {
-                    image: 'https://img-cdn-qiniu.dcloud.net.cn/uploads/example/product4.jpg',
-                    title: 'Kindle Paperwhite电纸书阅读器 电子书墨水屏 6英寸wifi 黑色',
-                    originalPrice: 999,
-                    favourPrice: 958,
-                    tip: '秒杀'
-                },
-                {
-                    image: 'https://img-cdn-qiniu.dcloud.net.cn/uploads/example/product5.jpg',
-                    title: '微软(Microsoft)新Surface Pro 二合一平板电脑笔记本 12.3英寸(i5 8G内存 256G存储)',
-                    originalPrice: 8888,
-                    favourPrice: 8288,
-                    tip: '优惠'
-                },
-                {
-                    image: 'https://img-cdn-qiniu.dcloud.net.cn/uploads/example/product6.jpg',
-                    title: 'Apple Watch Series 3智能手表(GPS款 42毫米 深空灰色铝金属表壳 黑色运动型表带 MQL12CH/A)',
-                    originalPrice: 2899,
-                    favourPrice: 2799,
-                    tip: '自营'
-                }],
-            renderImage: false
+            renderImage: false,
+			pictureUrl: this.pictureUrl
         };
     },
     methods: {
-       
+       goshop(e) {
+		   console.log(e)
+		   let id = e.goods_commonid;
+		   let store_id = e.store_id;
+		   uni.navigateTo({
+		   	url:`/pages/index/shop?id=${id}&store_id=${store_id}`
+		   })
+	   }
     },
     onLoad() {
    
@@ -82,5 +52,9 @@ export default {
 </script>
 
 <style>
-	
+	.textover {
+		overflow: hidden;
+		text-overflow:ellipsis;
+		white-space: nowrap;
+	}
 </style>

+ 4 - 39
main.js

@@ -1,9 +1,9 @@
 import Vue from 'vue'
 import App from './App'
 import store from './store/logion.js'	
-
+import request from './common/request.js'
 // 定义全局提示title
-const baseURL = 'http://192.168.1.12:8082';  
+const pictureUrl = 'https://www.qzaiwang.com'  
 const msg = (title, duration=1500, mask=false, icon='none')=>{
 	//统一提示方便全局修改
 	if(Boolean(title) === false){
@@ -16,44 +16,9 @@ const msg = (title, duration=1500, mask=false, icon='none')=>{
 		icon
 	});
 }
-
-
-const request = function(options) {
-     options.url = baseUrl + options.url;
-	 option.method =  options.method;
-       const token = uni.getStorageSync('sessionId');
-       if (sessionId) { // 如果存在sessionId 配置请求头
-         options.header = {
-           'Authorization' : sessionId,
-		   'Content-Type' : 'application/json'
-         }
-        }else{	// 不存在token 跳转至登录
-            
-           
-        }
-      
-		// 这里对response进行处理,
-		options.complete = (response) => {
-			if (response.statusCode == 401) {
-				
-			}
-		}
-		return uni.request(options);
-	  }
-
-// const request = (url, urlhead, sessIoid) => {
-// 	uni.request({
-// 		url: baseURL+url,
-// 		method: urlhead,
-// 		header = {
-// 		  'Authorization' : 'Bearer ' + sessIoid,
-// 		  'Content-Type' : 'application/json'
-// 		},
-		
-// 	})
-// }
-Vue.prototype.$msg = msg
+Vue.prototype.pictureUrl = pictureUrl
 Vue.prototype.request = request
+Vue.prototype.$msg = msg
 Vue.config.productionTip = false
 Vue.prototype.$store = store
 App.mpType = 'app'

+ 14 - 3
pages.json

@@ -24,11 +24,22 @@
 		 				 "van-row": "/wxcomponents/dist/row/index",
 		 				 "van-col": "/wxcomponents/dist/col/index",
 		 				 "van-icon": "/wxcomponents/dist/icon/index"
-		 				  
 		 				}
 		 	}
 		 },
-		
+		 {
+		 	"path": "pages/index/hoteldetail",
+		 	"style": {
+		 		"navigationBarTitleText": "商品销售",
+		 		"usingComponents":{
+		 				 "van-tab": "/wxcomponents/dist/tab/index",
+		 				 "van-tabs": "/wxcomponents/dist/tabs/index",
+		 				 "van-dropdown-menu": "/wxcomponents/dist/dropdown-menu/index",
+		 				 "van-dropdown-item": "/wxcomponents/dist/dropdown-item/index",
+		 				 "van-icon": "/wxcomponents/dist/icon/index"
+		 				}
+		 	}
+		 },
 		{
 			"path": "pages/index/cart",
 			"style": {
@@ -83,7 +94,6 @@
 					     "van-tab": "/wxcomponents/dist/tab/index",
 					      "van-tabs": "/wxcomponents/dist/tabs/index"
 						},
-						
 				"navigationBarTitleText": "发现"
 			}
 		},
@@ -277,6 +287,7 @@
 		"backgroundColor": "#F8F8F8",
 		"usingComponents":{
 			 "van-dialog": "/wxcomponents/dist/dialog/index",
+			 "van-rate": "/wxcomponents/dist/rate/index",
 			 "van-cell": "/wxcomponents/dist/cell/index"
 		}
 		

+ 12 - 19
pages/index/cart.vue

@@ -1,12 +1,7 @@
 <template>
 	<view style="height: 100vh;background-color: #F5F5F5;">
-	<!-- 	<view style="height:50upx"></view> -->
-	<!-- 	<uniNavBar
-		  left-icon="back"  title="购物车"
-		  @clickLeft="goback"
-		  @clickRight = "deleteShop"	
-		 /> -->
-		 <view class="titleright">编辑</view>
+		 <view class="titleright" @click="changeShop" v-if="isdelete">编辑</view>
+		  <view class="titleright" @click="changeShop" v-else>删除</view>
 		 <view class="cart-list">
 		  <view style="display: flex;align-items: center;padding: 20upx 36upx;
 		   border-bottom: 1px solid #F5F5F5;">
@@ -19,16 +14,6 @@
 				<van-checkbox-group :value="checkboxList" @change="checkboxChange()">
 				    <van-checkbox  checked-color="#D9332E" :name="index"></van-checkbox>
 				  </van-checkbox-group> 
-				  
-				<!-- <checkbox-group style="border-radius: 100%;" @change="checkboxChange(index)">
-				  <label class="checklabel">
-					  <view class="checkboxteil">
-						  <checkbox :checked="item.checked" />
-					  </view>
-					  
-				  </label>
-			    </checkbox-group> -->
-							  
 			  </view>
 			  <view style="flex: 15;">
 			  <van-card
@@ -49,8 +34,8 @@
 		 
 		 <view style="position: fixed;bottom: 0;">
 		 <van-submit-bar
-		   :price="3050"
-		   button-text="结算"
+		   :price="prices"
+		   :button-text="listip"
 		   bind:submit="onClickButton"
 		   :tip="true"
 		 >
@@ -73,6 +58,9 @@
 		},
 		data() {
 			return {
+				prices: 201,
+				listip: '结算',
+				isdelete: true,
 				isAll: false,
 				checkboxList:[],
 				list:[
@@ -104,6 +92,11 @@
 		 // });
 	    },
 		methods: {
+			changeShop() {
+				this.isdelete = !this.isdelete;
+				this.listip = this.isdelete?'结算':'删除';
+				this.prices = this.isdelete?'3201':'';
+			},
 			// 返回上层
 			goback() {
 					uni.navigateBack(); 

+ 21 - 1
pages/index/commemt.vue

@@ -12,7 +12,27 @@
 		},
 		data(){
 			return {
-				
+				goodId: 0,
+				store_id: 0
+			}
+		},
+		onLoad(options) {
+			this.goodId = options.goodId;  // 商品Id
+			this.store_id =  options.store_id;
+			this.getassess();
+		},
+		methods: {
+			getassess() {
+				this.request({
+					url: '?do=getevaluategoods',
+					method: 'post',
+					data: {
+						goodsid: this.goodId
+					},
+					success: function(res) {
+						console.log(res);
+					}
+				})
 			}
 		}
 	}

+ 536 - 355
pages/index/hotel.vue

@@ -1,375 +1,556 @@
 <template>
-	<view>
-		 <view style="height: 50upx;"></view>
-		<scroll-view  style="height: 95vh;" class="floor-list"
-		 :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
-		 refresher-enabled="true">
-	   <view class="scrollswiper">
-	   		 <swiper class="swiper" :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval" :duration="duration">
-	   			<swiper-item>
-	   				<view style="height: 100%;" class="swiper-item uni-bg-red">A</view>
-	   			</swiper-item>
-	   			<swiper-item>
-	   				<view style="height: 100%;" class="swiper-item uni-bg-green">B</view>
-	   			</swiper-item>
-	   			<swiper-item>
-	   				<view style="height: 100%;" class="swiper-item uni-bg-blue">C</view>
-	   			</swiper-item>
-	   		 </swiper>
-	   </view>
-	   
-	   <view class="titeTop"  :class="iScrolltop == 2?'activeColor' : ''">
-		   <view @tap="goback()" class="topleft">
-			   <uniIcon type="back" size="22" color="#666666" />
-		   </view>
-		   <view>
-			   <view class="input-view">
-					<uniIcon type="search" size="22" color="#666666" />
-					<input confirm-type="search" class="input" type="text" placeholder="输入搜索关键词" @confirm="confirm" />
-			   </view>
-		   </view>
-		   
-		   <view class="topright">
-			   <uniIcon type="arrowright" size="22" color="#666666" />
-		   </view>
-	   </view>
-	   
-	   
-	   <view class="tip">
-		   <view style="font-size: 36upx;color: #303133;">{{iScrolltop}}华南城市酒店</view>
-		   <view>
-			   <uniIcon type="star" size="22" color="#909399"></uniIcon>
-		   </view>
-	   </view>
-	   
-	   <view>
-	   		   <van-tabs v-model="active" @click="onChange">
-	   			 <van-tab  :name="0" title="服务">
-				  <view>
-				  	<view class="giveList">
-				  		<view class="giveItem">
-				  		  <image src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1553409398864&di=4a12763adccf229133fb85193b7cc08f&imgtype=0&src=http%3A%2F%2Fb-ssl.duitang.com%2Fuploads%2Fitem%2F201703%2F19%2F20170319150032_MNwmn.jpeg" style="width:100%;height: 100upx;background: #909399"></image>
-				  		  <p style="text-align: center;">商品销售</p>
-				  		</view>
-				  	 	
-				  	</view>
-				  
-				  <view style="padding: 40upx 18upx;">
-					  <view style="width: 95%;margin: 0 auto;">
-					  		<view @click="choseType(1)" :class="tabIndex==1 ? 'active' : ''" class="typeItem">
-					  			全部
-					  		</view>
-					  		<view @click="choseType(2)"   class="typeItem">
-								<view class="iconClass">
-									<view :class="tabIndex==2 ? 'active' : ''">上新</view>
-									<view style="display: flex;flex-direction: column;">
-										<van-icon size="8px" name="arrow-up" />
-										<van-icon  size="8px" name="arrow-down" />
-									</view>
-								</view>
-					  			
-					  		</view>
-					  		<view @click="choseType(3)"  class="typeItem">
-					  			<view class="iconClass">
-					  				<view :class="tabIndex==3 ? 'active' : ''">价格</view>
-					  				<view style="display: flex;flex-direction: column;">
-					  					<van-icon size="8px" name="arrow-up" />
-					  					<van-icon  size="8px" name="arrow-down" />
-					  				</view>
-					  			</view>
-					  			
-					  		</view>
-					  		<view  @click="choseType(4)" class="typeItem">
-					  		<van-dropdown-menu  active-color="#ee0a24" :overlay="false">
-					  		    <van-dropdown-item
-								title="分类"  id="item">
-									   <view @click="confirm()" style="display: flex; flex-direction: wrap;">
-										   <van-cell style="margin: 10upx 15upx;"  v-for="(item, index) in option1" :key="index"    title="包邮">{{item.text}}</van-cell>
-									   </view>
-									   
-					  			 </van-dropdown-item>
-					  		</van-dropdown-menu>
-					  		</view>
-					  	</view>
-						
-						
-					 
+    <view>
+         <view style="height: 50upx;"></view>
+        <scroll-view  style="height: 95vh;" class="floor-list"
+         :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
+         refresher-enabled="true">
+       <view class="scrollswiper">
+                <swiper class="swiper" :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval" :duration="duration">
+                   <swiper-item v-for="(item,index) in store_slide" :key="index"> 
+                       <view style="height: 100%;" class="swiper-item">
+						    <image style="height: 100%;width: 100%;" :src='item' />
+					   </view>
+                   </swiper-item>
+                </swiper>
+       </view>
+       
+       <view class="titeTop"  :class="iScrolltop == 2?'activeColor' : ''">
+           <view @tap="goback()" class="topleft">
+               <uniIcon type="back" size="22" color="#666666" />
+           </view>
+           <view>
+               <view class="input-view">
+                    <uniIcon type="search" size="22" color="#666666" />
+                    <input confirm-type="search" class="input" type="text" placeholder="输入搜索关键词" @confirm="confirm" />
+               </view>
+           </view>
+           
+           <view class="topright">
+               <uniIcon type="arrowright" size="22" color="#666666" />
+           </view>
+       </view>
+       
+       
+       <view class="tip">
+           <view style="font-size: 36upx;color: #303133;">{{hotelitle}}</view>
+           <view @click="gocollect">
+               <uniIcon type="star" size="22" color="#909399"></uniIcon>
+           </view>
+       </view>
+       
+	   <view v-if="store_summary" style="padding: 0 32upx;">{{store_summary}}</view>
+       <view>
+                  <van-tabs v-model="activeindex" @click="onChange">
+                    <van-tab  :name="0" title="服务">
+                  <view>
+                      <view class="giveList">
+                          <view class="giveItem" v-for="(item,index) in category_list" :key="index" @click="godetail(item)">
+                            <image :src="item.pic" 
+							style="width:100%;height: 100upx;background: #909399">
+							</image>
+                            <p style="text-align: center;">{{item.gc_name}}</p>
+                          </view>
+                           
+                      </view>
+                  
+                  <view style="padding: 0upx 18upx;">
+                      <view style="width: 95%;margin: 0 auto;">
+                              <view @click="choseType(1)" :class="tabIndex==1 ? 'active' : ''" class="typeItem">
+                                  综合
+                              </view>
+                              <view @click="choseType(2)"   class="typeItem">
+                                <view class="iconClass">
+                                    <view :class="tabIndex==2 ? 'active' : ''">上新</view>
+                                    <view style="display: flex;flex-direction: column;margin-left: 10rpx;">
+                                        <view @click.stop="changeisclick(1)"><van-icon size="8px" name="arrow-up"    :class="istopclick==1 ? 'active' : ''"  /></view>
+                                        <view @click.stop="changeisclick(2)">
+											<van-icon  :class="istopclick==2 ? 'active' : ''"  size="8px" name="arrow-down" />
+										</view>
+                                    </view>
+                                </view>
+                              </view>
+                              <view @click="choseType(3)"  class="typeItem">
+                                  <view class="iconClass">
+                                      <view :class="tabIndex==3 ? 'active' : ''">价格</view>
+                                      <view style="display: flex;flex-direction: column;margin-left: 10rpx;">
+                                         <view @click.stop="changeisclick(3)" >
+											 <van-icon    :class="istopclick==3 ? 'active' : ''" size="8px" name="arrow-up" />
+										 </view> 
+										 <view   @click.stop="changeisclick(4)">
+											  <van-icon  :class="istopclick==4 ? 'active' : ''" size="8px" name="arrow-down" />
+										 </view>
+                                         
+                                      </view>
+                                  </view>
+                                  
+                              </view>
+                              <view  @click.stop="choseType(4)" class="typeItem">
+								    <view :class="tabIndex==4 ? 'active' : ''">分类</view>
+                              </view>
+                          </view>
+                  </view>
+				  <view v-if="tabIndex==4">
+						  <view style="margin: 10upx 36upx;float: left;" 
+						   v-for="(item, index) in category_list" :key="index"
+							 @click.stop="confirm(item)" >
+							 {{item.gc_name}}
+						  </view> 
 				  </view>
-				   
-				 <!-- 商品列表 -->
-				 <shopList />
-				  
-				  </view> 
-				  
-				 </van-tab>
-	   			 <van-tab  :name="1" title="评价">
-					 <!-- 评价列表 -->
-					 <assess />
-				 </van-tab>
-	   			 <van-tab  :name="2" title="酒店信息">
-					   
-						 <view class="hoteletail">
-							 <view class="hotlItem">酒店信息</view>
-							 <view>
-								 
-							 </view>
-						 </view>
-						 
-						 <view class="hotlItem">
-							 <view>酒店地址</view>
-							 <view>1111111</view>
-						 </view>
-						 
-						 
-						 <view class="hotlItem">
-							 <view>酒店电话</view>
-							 <view>55555555</view>
-						 </view>
-						
-						
-					 
-				 </van-tab>
-	   		   </van-tabs>
-			   <view v-if="active == 3" class="bottomButton">
-			   	  <button type="warn">您的入住意见反馈(反馈送圈币)</button>
-			    </view>
-	   </view>
-	   </scroll-view>
-	   
-	</view>
+                 <!-- 商品列表 -->
+                 <shopList :productList="goods_list" />
+                  </view> 
+                 </van-tab>
+                    <van-tab  :name="1" title="评价">
+                     <!-- 评价列表 -->
+                     <assess :feedback_list="feedback_list" />
+                 </van-tab>
+                    <van-tab  :name="2" title="酒店信息">
+						<view style="padding: 20upx 32upx 0upx 32upx;margin-bottom: 200upx;">
+							  <rich-text :nodes="store_description"></rich-text> 
+						</view>
+                 </van-tab>
+                  </van-tabs>
+               <view v-if="activeindex == 2" class="bottomButton">
+                     <button type="warn">您的入住意见反馈(反馈送圈币)</button>
+                </view>
+       </view>
+       </scroll-view>
+       <logionDialog @confirmDiaolog="confirmDiaolog"  @cancelDiaolog="cancelDiaolog" :showdialog="showdialog"/>
+    </view>
 </template>
   
 <script>
-	import uniIcon from '@/component/uni-icon/uni-icon.vue'
-	import uniNavBar from '@/component/uni-nav-bar/uni-nav-bar.vue'
-	import commoNar from '@/component/commoNar.vue'  // 筛选栏
-	import shopList from '@/component/shopList.vue'  // 商品列表
-	import assess from '@/component/assess.vue'  // 评价列表
-	export default {
-		components: {
-			uniIcon,
-			uniNavBar,
-			commoNar,
-			assess,
-			shopList
+	import {
+		mapMutations,mapState
+	} from 'vuex'
+    import uniIcon from '@/component/uni-icon/uni-icon.vue'
+	import logionDialog from '@/component/loginDialog.vue'
+    import uniNavBar from '@/component/uni-nav-bar/uni-nav-bar.vue'
+    import commoNar from '@/component/commoNar.vue'  // 筛选栏
+    import shopList from '@/component/shopList.vue'  // 商品列表
+    import assess from '@/component/assess.vue'  // 评价列表
+    export default {
+        components: {
+            uniIcon,
+            uniNavBar,
+            commoNar,
+            assess,
+            shopList,
+			logionDialog
+        },
+        data() {
+            return {
+				isDetail: 1,
+				pictureUrl: this.pictureUrl,
+				showdialog: false,
+				store_description: '', //酒店信息
+				store_summary:'', // 标签
+				store_slide: [], //banner
+				goods_list:[], // 首页酒店商品列表
+				isnexttwo: 1,
+				feedback_list:[], // 评价列表
+				hotelitle: '', // 酒店名称
+				istopclick: 0,
+				page: 1,
+				goodId: 0,
+				page_size: 10,
+				gc_id_1:'',//	一级分类id
+				gc_id_2:'',//	二级分类id
+				goods_commonid:'',//	上新排序 desc-降序 asc-尚需
+				goods_price	:'',//	价格排序 desc-降序 asc-尚需
+				praise	:'',//	好评率排序 desc-降序 asc-尚需
+				keyword:'',//g	关键字搜索
+				category_list: [], // 一级菜单栏
+                tabIndex: 1,
+                menu: [{
+                    name: '综合',
+                    id: '0'
+                }, {
+                    name: '上新',
+                    id: '1'
+                }, {
+                    name: '价格',
+                    id: '2'
+                },
+                {
+                    name:'分类',
+                    id:'3'
+                }
+                ],
+                background: ['color1', 'color2', 'color3'],
+                indicatorDots: true,
+                autoplay: true,
+                interval: 2000,
+                duration: 500,
+                activeindex: 1,
+                scrollTop: 0,
+                old: {
+                    scrollTop: 0
+                },
+                    value1: 0,
+                    iScrolltop: 1
+            }
+        },
+        
+        // 初次渲染进来关闭分享菜单栏
+        onReady:function(){
+            uni.hideShareMenu({
+                  success(res) {
+                      console.log(res)
+                      console.log("kkkkkkkkkkkk")
+                  },
+                  fail(res){
+                      console.log(res)
+                      console.log("dddddd")
+                  } 
+            });
+        },
+		onLoad(options){
+			this.goodId = options.id;  // 商品和酒店Id
+			this.getshopdetail(); // 获取商品详情
+			this.hotelmenu();  // 一级菜单
+			this.gethoteil();  // 获取酒店信息
+			this.activeindex = 0;
 		},
-		data() {
-			return {
-				tabIndex: 0,
-				menu: [{
-					name: '综合',
-					id: '0'
-				}, {
-					name: '上新',
-					id: '1'
-				}, {
-					name: '价格',
-					id: '2'
-				},
-				{
-					name:'分类',
-					id:'3'
-				}
-				],
-				option1: [
-				      { text: '全部', value: 1 },
-				      { text: '商品销售', value: 2 },
-					  
-				    ],
-				background: ['color1', 'color2', 'color3'],
-				indicatorDots: true,
-				autoplay: true,
-				interval: 2000,
-				duration: 500,
-				active: 1,
-				scrollTop: 0,
-				old: {
-					scrollTop: 0
-				},
-				 option1: [
-				      { text: '全部商品', value: 0 },
-				      { text: '新款商品', value: 1 },
-				      { text: '活动商品', value: 2 }
-				    ],
-				    value1: 0,
-					iScrolltop: 1
-			}
-		},
-		
-		// 初次渲染进来关闭分享菜单栏
-		onReady:function(){
-			uni.hideShareMenu({
-				  success(res) {
-					  console.log(res)
-					  console.log("kkkkkkkkkkkk")
-				  },
-				  fail(res){
-					  console.log(res)
-					  console.log("dddddd")
-				  } 
-			});
+		computed:{
+			...mapState([
+			  'hasLogin',
+			  'userInfo'
+			]),
 		},
-		methods: {
-			choseType(e) {
-				console.log(e);
-				this.tabIndex = e
-			},
-			onChange(event) {
-					this.active = event.detail.name;
-					console.log(this.active)
+        methods: {
+			// 收藏
+			gocollect() {
+				if(this.hasLogin) {
+				 
+				}else {
+					this.showdialog = true;
+				}
 			},
-			confirm() {
-				this.selectComponent('#item').toggle();
+			// 关闭弹窗
+			cancelDiaolog() {
+				this.showdialog = false;
 			},
-			upper(e) {
-				console.log(e)
-				console.log("顶部")
+			// 确定
+			confirmDiaolog() {
+				this.showdialog = false;
 			},
-			
-			// 滚到底部
-			lower(e) {
-				console.log("底部")
+			choseType(e) {
+			    this.tabIndex = e;
+				this.goods_list = [];
+				if(this.tabIndex == 1) {
+					this.istopclick = 0;
+					this.gc_id_1 = '';
+					this.goods_price = ''; 
+					this.goods_commonid = '';
+				}else if(this.tabIndex == 2){
+						this.istopclick = 1;
+						this.goods_price = ''; 
+						this.goods_commonid = 'asc';
+						this.gc_id_1 = '';
+				}else if(this.tabIndex == 3){
+						this.istopclick = 3;
+						this.goods_price = 'asc';
+						this.goods_commonid = '';
+						this.gc_id_1 = '';
+					}else if(this.tabIndex ==4) {
+						this.istopclick = 0;
+						this.goods_price = ''; 
+						this.goods_commonid = '';
+					}
+				this.getshopdetail();
 			},
-			
-			// 滚动时触发
-			scroll(e) {
-				this.old.scrollTop = e.detail.scrollTop
-				if(e.detail.scrollTop > 160) {
-					this.iScrolltop = 2;
-				}else {
-					this.iScrolltop = 1;
+			// 点击切换上下
+			changeisclick(e) {
+				this.istopclick = e;
+				this.gc_id_1 = '';
+				if(e == 2) {
+					this.goods_commonid = 'desc';
+					this.goods_price = ''
+					this.tabIndex = 2;
+				}else if(e == 4) {
+					this.goods_price = 'desc';
+					this.goods_commonid = '';
+					this.tabIndex = 3;
+				}else if(e == 1) {
+					this.tabIndex = 2;
+					this.goods_commonid = 'asc';
+					this.goods_price = ''
+				}else if(e == 3) {
+					this.tabIndex = 3;
+					this.goods_commonid = '';
+					this.goods_price = 'asc';
 				}
+				 this.getshopdetail();
 			},
-			
-			// 返回上一页
-			goback() {
-				uni.navigateBack()
+			godetail(item) {
+				console.log(item);
+				let id = item.gc_id; // 一级菜单id
+				let store_id = this.goodId;
+				let gc_name = item.gc_name; 
+				uni.navigateTo({
+				        url: `/pages/index/hoteldetail?id=${id}&gc_name=${gc_name}&store_id=${store_id}`
+				    });
 			},
 			
-		}
-	}
+			// 获取商品详情
+			getshopdetail() {
+				let _this = this;
+				this.request({
+				                url:"/v2/entry/storeGoods",
+				                method:'get',
+				                data: {
+				                         store_id: _this.goodId,
+										 page: _this.page,
+										 goods_commonid: _this.goods_commonid, // 上新排序
+										 goods_price: _this.goods_price,
+										 gc_id_1: _this.gc_id_1
+				                    },
+								success: function(res) {
+									if(res.data.data.goods_list.length < 10) {
+										_this.isDetail = 2;
+									}
+									_this.goods_list = _this.goods_list.concat(res.data.data.goods_list);
+								},
+			    })
+			},
+			// 一级菜单
+			hotelmenu() {
+				let _this = this;
+				this.request({
+				                url:"/v1/entry/storeCategory",
+				                method:'get',
+				                data: {
+				                        store_id: this.goodId,
+				                    },
+								success: function(res) {
+									 let { category_list } = res.data.data;
+									 category_list.forEach((item,idx) => {
+										 item.text = item.gc_name;
+										 item.value = idx;
+									 })
+									 _this.category_list = category_list;
+								},
+				})
+			},
+		
+           
+            onChange(event) {
+                    this.activeindex = event.detail.name;
+					this.page = 1;
+                    if(event.detail.name == 1) {
+						this.getcomment();
+					}else if(event.detail.name == 0) {
+						this.getshopdetail()
+					}
+            },
+			// 获取酒店评价
+			getcomment() {
+				let that = this;
+				this.request({
+					url:'/v1/store/feedbackList',
+					method: 'POST',
+					data: {
+						page: this.page,
+						page_size: 10,
+						store_id: this.goodId
+					},
+					success:function(res) {
+						console.log(res.data.data.feedback_list)
+						that.feedback_list = res.data.data.feedback_list;
+						if(res.data.data.feedback_list.length < 10) {
+							that.isnexttwo = 2;
+						}
+					}
+				})
+			},
+			// 获取酒店信息
+            gethoteil() {
+				let that = this;
+				this.request({
+					url:'/v1/store/info',
+					method:'get',
+					data: {
+						store_id: this.goodId
+					},
+					success: function(res) {
+						let { data } = res.data;
+						console.log(data);
+						that.hotelitle = data.store_name;
+						that.store_slide = data.store_slide;
+						that.store_summary = data.store_summary;
+						that.store_description = data.store_description;
+					}
+				})
+			},
+			changemenu(e) {
+				
+			},
+            confirm(e) {
+				this.tabIndex = 0;
+				this.gc_id_1 = e.gc_id;
+				this.getshopdetail();
+            },
+            upper(e) {
+                console.log("顶部")
+            },
+            
+            // 滚到底部
+            lower(e) {
+				if(this.activeindex == 1) {
+					if(this.isnexttwo == 1) {
+						this.page = this.page + 1;
+					}
+					this.getcomment();
+					
+				}else if(this.activeindex == 0 && this.isDetail == 1) {
+					this.page = this.page + 1;
+					this.getshopdetail();
+				}
+            },
+            
+            // 滚动时触发
+            scroll(e) {
+                this.old.scrollTop = e.detail.scrollTop
+                if(e.detail.scrollTop > 160) {
+                    this.iScrolltop = 2;
+                }else {
+                    this.iScrolltop = 1;
+                }
+            },
+            
+            // 返回上一页
+            goback() {
+                uni.navigateBack()
+            },
+            
+        }
+    }
 </script>
   
 <style>
-	.scrollswiper {
-		width: 100%;
-		position: relative;
-	}
-	.titleFixed {
-		position: absolute;
-		top: 0;
-		left: 0;
-		z-index: 99;
-		padding-top: 0;
-	}
-		
-	.van-nav-bar {
-		padding-top: 0!important;
-		/* background: #000000!important; */
-		/* opacity: 0.2; */
-		background:rgba(0,0,0,0.2)!important;
-	}
-	.swiper {
-		height: 300upx;
-	}
-	.swiper-item {
-		display: block;
-		height: 100%!important;
-		line-height: 300upx;
-		text-align: center;
-	}
-		
-	.tip {
-		display: flex;
-		justify-content: space-between;
-		padding: 36upx 32upx;
-	}
-	.giveList {
-	    padding: 10upx  12upx;
-		display: flex;
-		flex-wrap: wrap;
-	}
-	.giveItem {
-		width: 18%;
-		height: 120upx;
-		margin: 10upx 20upx;
-		/* background-color: #909399 */
-	}
-	.active {
-		color: #F76260;
-	}
-	.typeItem {
-		width: 25%;
-		display: inline-block;
-		text-align: center;
-	}
+    .scrollswiper {
+        width: 100%;
+        position: relative;
+    }
+    .titleFixed {
+        position: absolute;
+        top: 0;
+        left: 0;
+        z-index: 99;
+        padding-top: 0;
+    }
+        
+    .van-nav-bar {
+        padding-top: 0!important;
+        /* background: #000000!important; */
+        /* opacity: 0.2; */
+        background:rgba(0,0,0,0.2)!important;
+    }
+    .swiper {
+        height: 300upx;
+    }
+    .swiper-item {
+        display: block;
+        height: 100%!important;
+        line-height: 300upx;
+        text-align: center;
+    }
+        
+    .tip {
+        display: flex;
+        justify-content: space-between;
+        padding: 36upx 32upx;
+    }
+    .giveList {
+        padding: 10upx  12upx;
+        display: flex;
+        flex-wrap: wrap;
+    }
+    .giveItem {
+        height: 120rpx;
+        flex: 1;
+        width: 20%;
+        min-width: 20%;
+        max-width: 20%;
+        margin: 24rpx 0 25rpx 4%;
+        /* background-color: #909399 */
+    }
+    .active {
+        color: #F76260;
+    }
+    .typeItem {
+        width: 25%;
+        display: inline-block;
+        text-align: center;
+    }
     .iconClass {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-around;
-	}
-		
-	.hotlItem {
-		padding: 22upx 30upx;
-		border-bottom: 1px solid #EEEEEE;
-		display: flex;
-		justify-content: space-between;
-	}
-	.bottomButton {
-		width: 95%;
-		left: 2.5%;
-		position: absolute;
-		bottom: 0;
-	}
-		
-	.titeTop {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		position: absolute;
-		top: 10upx;
-		width: 100%;
-	}
-	.topleft {
-		
-	}
-		
-	.topright {
-		
-	}
-	 .input-view {
-		width: 85%;
-		display: flex;
-		height: 30px;
-		border-radius: 15px;
-		padding: 0 4%;
-		flex-wrap: nowrap;
-		margin: 7px 0;
-		line-height: 30px;
-		margin: 24upx auto;
-		background:rgba(0,0,0,1);
-		border-radius:15px;
-		opacity:0.4;
-	}
-	
-	 .input-view .uni-icon {
-		line-height: 30px !important;
-	}
-	
-	 .input-view .input {
-		height: 30px;
-		line-height: 30px;
-		width: 94%;
-		padding: 0 3%;
-	}
-	.activeColor {
-		background: #fff!important;
-		position: fixed;
-		background-color: #fff;
-		top: 50upx;
-		z-index: 99;
-	}
-	.listType {
-	}
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+    }
+        
+    .hotlItem {
+        padding: 22upx 30upx;
+        border-bottom: 1px solid #EEEEEE;
+        display: flex;
+        justify-content: space-between;
+    }
+    .bottomButton {
+        width: 95%;
+        left: 2.5%;
+        position: fixed;
+        bottom: 2.5%;
+    }
+        
+    .titeTop {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        position: absolute;
+        top: 10upx;
+        width: 100%;
+    }
+    .topleft {
+        
+    }
+        
+    .topright {
+        
+    }
+     .input-view {
+        width: 85%;
+        display: flex;
+        height: 30px;
+        border-radius: 15px;
+        padding: 0 4%;
+        flex-wrap: nowrap;
+        margin: 7px 0;
+        line-height: 30px;
+        margin: 24upx auto;
+        background:rgba(0,0,0,1);
+        border-radius:15px;
+        opacity:0.4;
+    }
+    
+     .input-view .uni-icon {
+        line-height: 30px !important;
+    }
+    
+     .input-view .input {
+        height: 30px;
+        line-height: 30px;
+        width: 94%;
+        padding: 0 3%;
+    }
+    .activeColor {
+        background: #fff!important;
+        position: fixed;
+        background-color: #fff;
+        top: 50upx;
+        z-index: 99;
+    }
+    .listType {
+    }
 </style>

+ 225 - 0
pages/index/hoteldetail.vue

@@ -0,0 +1,225 @@
+<template>
+	<view>
+		<scroll-view  style="height: 100vh;" class="floor-list"
+		 :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
+		 refresher-enabled="true">
+	  <view style="padding: 40upx 18upx;">
+	      <view style="width: 95%;margin: 0 auto;">
+	              <view @click="choseType(1)" :class="tabIndex==1 ? 'active' : ''" class="typeItem">
+	                  全部
+	              </view>
+	              <view @click="choseType(2)"   class="typeItem">
+	                <view class="iconClass">
+	                    <view :class="tabIndex==2 ? 'active' : ''">上新</view>
+	                    <view style="display: flex;flex-direction: column;">
+	                      <view @click.stop="changeisclick(1)"><van-icon size="8px" name="arrow-up"    :class="istopclick==1 ? 'active' : ''"  /></view>
+	                      <view @click.stop="changeisclick(2)">
+	                      	<van-icon  :class="istopclick==2 ? 'active' : ''"  size="8px" name="arrow-down" />
+	                      </view>
+	                    </view>
+	                </view>
+	              </view>
+	              <view @click="choseType(3)"  class="typeItem">
+	                  <view class="iconClass">
+	                      <view :class="tabIndex==3 ? 'active' : ''">价格</view>
+	                      <view style="display: flex;flex-direction: column;">
+	                         <view @click.stop="changeisclick(3)" >
+	                         		<van-icon    :class="istopclick==3 ? 'active' : ''" size="8px" name="arrow-up" />
+	                         </view> 
+	                         <view   @click.stop="changeisclick(4)">
+	                         		<van-icon  :class="istopclick==4 ? 'active' : ''" size="8px" name="arrow-down" />
+	                         </view>
+	                      </view>
+	                  </view>
+	              </view>
+	              <view  @click="choseType(4)" class="typeItem">
+	                <view :class="tabIndex==4 ? 'active' : ''">分类</view>
+	              </view>
+	          </view>
+			
+	  </view>
+		  <view style="padding: 10upx  12upx;display: flex;flex-wrap: wrap;" v-if="tabIndex==4">
+			  <view style=" flex: 1;width: 20%;min-width: 20%;max-width: 20%;margin: 24rpx 0 25rpx 4%;" 
+			   v-for="(item, index) in category_list" :key="index"
+				 @click.stop="confirm(item)" >
+				 {{item.gc_name}}
+			  </view> 
+		  </view>
+		  <!-- 商品列表 -->
+		  <shopList :productList="goods_list" />
+		   </scroll-view>
+		  </view>
+		  
+</template>
+
+<script>
+    import shopList from '@/component/shopList.vue'  // 商品列表	
+	export default {
+		components: {
+		    shopList
+		},
+		data() {
+			return {
+				goods_list:[],
+				scrollTop: 0,
+				old: {
+					scrollTop: 0
+				},
+				ispull: false,
+				istopclick: 0,
+				tabIndex: 	1,
+				title:'',
+				store_id:'',
+				category_list:[],
+				page: 1,
+				page_size: 10,
+				gc_id_1:'',//	一级分类id
+				gc_id_2:'',//	二级分类id
+				goods_commonid:'',//	上新排序 desc-降序 asc-尚需
+				goods_price	:'',//	价格排序 desc-降序 asc-尚需
+				praise	:'',//	好评率排序 desc-降序 asc-尚需
+			}
+		},
+		onLoad(options){
+			console.log(options)
+			this.title = options.gc_name;
+			this.gc_id_1 = options.id;
+			this.store_id = options.store_id;
+			uni.setNavigationBarTitle({
+			    title: options.gc_name
+			});
+			this.getshopdetail();
+			this.hotelsecondmenu(); // 二级菜单
+		},
+		methods: {
+			choseType(e) {
+			  this.tabIndex = e;
+			  if(this.tabIndex == 1) {
+			  	this.istopclick = 0;
+			  	this.goods_price = ''; 
+			  	this.goods_commonid = '';
+			  }else if(this.tabIndex == 2){
+			  		this.istopclick = 1;
+			  		this.goods_commonid = 'asc';
+					this.goods_price = ''; 
+					this.gc_id_2 = '';
+			  }else if(this.tabIndex == 3){
+			  		this.istopclick = 3;
+			  		this.goods_price = 'asc';
+					this.goods_commonid = '';
+					this.gc_id_2 = '';
+			  	}else if(this.tabIndex ==4) {
+			  		this.istopclick = 0;
+			  		this.goods_price = ''; 
+			  		this.goods_commonid = '';
+			  	}
+			  this.getshopdetail();
+			},
+			changeisclick(e) {
+				this.istopclick = e;
+				this.gc_id_2 = '';
+				if(e == 2) {
+					this.goods_commonid = 'desc';
+					this.goods_price = ''
+					this.tabIndex = 2;
+				}else if(e == 4) {
+					this.goods_price = 'desc';
+					this.goods_commonid = '';
+					this.tabIndex = 3;
+				}else if(e == 1) {
+					this.tabIndex = 2;
+					this.goods_commonid = 'asc';
+					this.goods_price = ''
+				}else if(e == 3) {
+					this.tabIndex = 3;
+					this.goods_commonid = '';
+					this.goods_price = 'asc';
+				}
+				 this.getshopdetail();
+			},
+			confirm(e) {
+				console.log(e);
+				this.tabIndex = 0;
+				console.log(this.tabIndex);
+				this.gc_id_2 = e.gc_id;
+				this.getshopdetail();
+			},
+			// 获取商品详情
+			getshopdetail() {
+				let _this = this;
+				this.request({
+				                url:"/v2/entry/storeGoods",
+				                method:'get',
+				                data: {
+				                         store_id: _this.store_id,
+										 page: _this.page,
+										 goods_commonid: _this.goods_commonid, // 上新排序
+										 goods_price: _this.goods_price,
+										 gc_id_1: _this.gc_id_1,
+										 gc_id_2: _this.gc_id_2
+				                    },
+								success: function(res) {
+									if(res.data.data.goods_list.length>10) {
+										_this.ispill = true;
+									}else {
+										_this.ispill = false;
+										
+									}
+									_this.goods_list = res.data.data.goods_list;
+								},
+			    })
+			},
+			// 二级菜单
+			hotelsecondmenu(){
+				let that = this;
+				this.request({
+					url:'/v1/entry/storeCategory2',
+					method:'POST',
+					data: {
+						store_id: this.store_id,
+						gc_id: this.gc_id_1
+					},
+					success: function(res) {
+						let { category_list } = res.data.data;
+						that.category_list = category_list;
+					}
+				})
+			},
+			// 滚动到顶部
+			upper(e) {
+				console.log("顶部")
+			},
+			
+			// 滚到底部
+			lower(e) {
+				
+				if(this.ispull) {
+					this.page = this.page + 1;
+					this.gethotelist();
+				}
+			},
+			
+			// 滚动时触发
+			scroll(e) {
+				this.old.scrollTop = e.detail.scrollTop
+			}
+		}
+	}
+</script>
+
+<style>
+	.active {
+	    color: #F76260;
+	}
+	.typeItem {
+	    width: 25%;
+	    display: inline-block;
+	    text-align: center;
+	}
+	.iconClass {
+	    display: flex;
+	    flex-direction: row;
+	    align-items: center;
+	    justify-content: space-around;
+	}
+</style>

+ 140 - 144
pages/index/index.vue

@@ -8,38 +8,41 @@
 	 <scroll-view  style="height: 100vh;" class="floor-list"
 	  :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
 	  refresher-enabled="true">
-	 <uniNavBar class="top" :shadow="false"  :fixed="false" color="#333333" background-color="#FFFFFF">
-	 	<block style="width: 70%;" slot="left">
+	 <uniNavBar class="top"  :shadow="false"  :fixed="false" color="#333333" background-color="#FFFFFF">
+	 	<block  style="width: 70%;padding-left: 32upx;" slot="left">
 	 		<view class="city">
 	 			<view style="font-size: 35upx;">{{ location }}</view>
 	 		</view>
 	 	</block>
 			<view  class="input-view" style="float: right;">
-			  <uni-icon  size="22" @click="scan" type="scan"></uni-icon>
+			  <uni-icon color="#606266" size="22" @click="scan" type="scan"></uni-icon>
 			</view>
 		<block  slot="right">
 			<view  @click="goinfor">
-				<uni-icon  size="22" type="chat"></uni-icon>
+				<uni-icon color="#606266"   size="22" type="chat"></uni-icon>
 			</view>
 		</block>
 	 </uniNavBar>
 	<view @click="goSearch" class="searchType" style="background: #fff;">
 		 <view class="input-view">
 		 	<uni-icon type="search" size="22" color="#666666" />
-		 	<input confirm-type="search" class="input" type="text" placeholder="输入搜索关键词" @confirm="confirm" />
+		 	<input confirm-type="search" class="input" type="text" placeholder="搜索您入住的酒店" @confirm="confirm" />
 		 </view>
 	 </view>
-	 <view   @tap="shopDetail" class="scrollswiper">
-		 <swiper class="swiper" :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval" :duration="duration">
-			<swiper-item>
-				<view class="swiper-item uni-bg-red">A</view>
-			</swiper-item>
-			<swiper-item>
-				<view class="swiper-item uni-bg-green">B</view>
-			</swiper-item>
-			<swiper-item>
-				<view class="swiper-item uni-bg-blue">C</view>
+	 <view  class="scrollswiper">
+		 <swiper class="swiper" 
+		 :indicator-dots="indicatorDots" 
+		 :autoplay="autoplay" 
+		 :interval="interval" 
+		 :duration="duration"
+		 > 
+		   <!-- <img src="' + siteurl + "uploads/home/adv/" + item.adv_code + '"/></div>'); -->
+			<swiper-item v-for="(item,index) in backgroundlist" :key="index">
+			<view class="swiper-item"  @tap="shopDetail(item)" >
+				 <image style="height: 100%;width: 100%;" :src='pictureUrl +"/uploads/home/adv/"+item.adv_code' />
+		    </view>
 			</swiper-item>
+			
 		 </swiper>
 	 </view>
 	 <view class="tips">
@@ -47,21 +50,21 @@
 	 </view>
 	 <view style="border-bottom: 2upx solid #EEEEEE;width: 100%;margin-bottom: 24upx 0;"></view>
 	
-	<view  @tap="openinfo">
-     <view class="hotelList">
+	<view>
+     <view class="hotelList" v-for='(item,index) in hotelist' :key="index" @click="openinfo(item)">
 		 <view class="hotleLeft">
-			 <image  style="width: 214upx;height: 152upx;" src=""/>
+			 <image  style="width: 214upx;height: 152upx;" :src="pictureUrl+'/uploads/home/adv/'+item.store_logo"/>
 		 </view>
 		 <view class="hotelright">
-		 	<view style="font-size: 36upx;color: #303133;">华南城市酒店</view>
-		    <view style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
-				<view style="font-size: 40upx; color: #303133;"> 0.0</view>
-				<view>月访客990</view>
-				<view>8km</view>
+		 	<view style="font-size: 32upx;color: #303133;font-weight: 550;">{{item.store_name}}
 			</view>
-			<view class="undertip">
-				<view class="tipsTop">有停车为</view>
-				<view class="tipsTop">内置酒店</view>
+		    <view style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;padding: 10rpx 0;">
+				<view style="font-size: 32upx; color: #303133;font-weight: 550;">{{item.store_servicecredit}}</view>
+				<view style="color: #606266;font-size: 24upx;">月访客{{item.store_visitor}}</view>
+				<view style="color: #606266;font-size: 24upx;">{{item.distance}}</view>
+			</view>
+			<view  v-if="item.tages.length!=1" class="undertip">
+				<view  v-for="(items,index) in item.tages" :key="index" class="tipsTop">{{items}}</view>
 			</view>
 	 </view>
 	 </view>
@@ -78,6 +81,7 @@
 	import uniNavBar from '@/component/uni-nav-bar/uni-nav-bar.vue'
 	import uniIcon from '@/component/uni-icon/uni-icon.vue'
 	import logionDialog from '@/component/loginDialog.vue'
+	import amap from '@/common/amap-wx.js'
 	export default {
 		components: {
 			uniNavBar,
@@ -86,14 +90,23 @@
 		},
 		data() {
 			return {
+				itemurl: '../../image/',
+				page: 1,
+				ispull: true,
+				pagesize: 10,
+				store_summary:[], // 标签数组
+				pictureUrl: this.pictureUrl,
+				amapPlugin: null,  
+				key: '7277de7a5833626b7da8f2496e9d6bf9',  
 				showdialog: false,   // 点击确定显示弹窗
-			    background: ['color1', 'color2', 'color3'],
+			    backgroundlist: ['color1', 'color2', 'color3'],  // 轮播数组
+				hotelist:[], // 酒店数组
 				indicatorDots: true,
 				autoplay: true,
 				interval: 2000,
 				duration: 500,
 				title: 'Hello',
-				location:'测试定位信息',
+				location:'正在定位...',
 				scrollTop: 0,
 				old: {
 					scrollTop: 0
@@ -107,21 +120,23 @@
 			]),
 		},
 		onLoad() {
+			this.getswiper();   // 获取首页轮播
+			this.gethotelist(); // 酒店列表
 			this.isGetLocation();  // 检查是否开启定位权限
 			this.isUserInfo();  // 检查是否允许获取用户授权
 			 // 用户授全
-			 		
+		    this.amapPlugin = new amap.AMapWX({  
+				key: this.key  
+		    });  		
 	    },
 		methods: {
 			...mapMutations(['login','showDialog']),
 			goinfor() {
-				console.log(this.hasLogin);
-				console.log(this.userInfo);
+			
 				if(this.hasLogin) {
 					uni.navigateTo({
 					   url: '../myCenter/information'  // 我的收藏
 					})
-					
 				}else {
 					this.showdialog = true;
 				}
				
			},
@@ -143,13 +158,16 @@
 			},
 			// 滚动到顶部
 			upper(e) {
-				console.log(e)
+				
 				console.log("顶部")
 			},
 			
 			// 滚到底部
 			lower(e) {
-				console.log("底部")
+				this.page = this.page + 1;
+				if(this.ispull) {
+					this.gethotelist();
+				}
 			},
 			
 			// 滚动时触发
@@ -164,7 +182,7 @@
 							if (!res.authSetting[a]) {  // 每次进入程序判断当前是否获得授权,如果没有就去获得授权,如果获得授权,就直接获取当前地理位置
 								_this.getAuthorizeInfo()
 							}else{
-								_this.getLocationInfo()
+								_this.getRegeo()
 							}
 							
 						}
@@ -189,7 +207,7 @@
 						scope: a,
 						success() { //允许授权
 						   console.log("调用位置授权")
-							_this.getLocationInfo();
+							_this.getRegeo();
 						},
 						fail(){    //拒绝授权
 						  _this.$msg("你拒绝了授权,无法获得周边信息")
@@ -197,106 +215,69 @@
 						}
 					})
 				},
-			
-			//wgs84togcj02  转火星坐标
-			 wgs84togcj02: function (lng, lat) {
-			      const PI = 3.1415926535897932384626
-			      const a = 6378245.0
-			      const ee = 0.00669342162296594323
-			      // WGS84转GCj02
-			      let dlat = this.transformlat(lng - 105.0, lat - 35.0)
-			      let dlng = this.transformlng(lng - 105.0, lat - 35.0)
-			      let radlat = lat / 180.0 * PI
-			      let magic = Math.sin(radlat)
-			      magic = 1 - ee * magic * magic
-			      let sqrtmagic = Math.sqrt(magic)
-			      dlat = (dlat * 180.0) / ((a * (1 - ee)) / (magic * sqrtmagic) * PI)
-			      dlng = (dlng * 180.0) / (a / sqrtmagic * Math.cos(radlat) * PI)
-			      let mglat = lat + dlat
-			      let mglng = lng + dlng
-			      // 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换
-			      return {lng: mglng, lat: mglat}
-			      // return gcj02tobd09(mglng, mglat)
-			    },
-			  transformlat: function (lng, lat) {
-			      const PI = 3.1415926535897932384626
-			      let ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng))
-			      ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0
-			      ret += (20.0 * Math.sin(lat * PI) + 40.0 * Math.sin(lat / 3.0 * PI)) * 2.0 / 3.0
-			      ret += (160.0 * Math.sin(lat / 12.0 * PI) + 320 * Math.sin(lat * PI / 30.0)) * 2.0 / 3.0
-			      return ret
-			    },
-			    transformlng: function (lng, lat) {
-			      const PI = 3.1415926535897932384626
-			      let ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng))
-			      ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0
-			      ret += (20.0 * Math.sin(lng * PI) + 40.0 * Math.sin(lng / 3.0 * PI)) * 2.0 / 3.0
-			      ret += (150.0 * Math.sin(lng / 12.0 * PI) + 300.0 * Math.sin(lng / 30.0 * PI)) * 2.0 / 3.0
-			      return ret
-			    },
 
-		    getLocationInfo(){  //获取地理位置
-		    		let _this=this;
-		    		uni.getLocation({
-		    			type: 'wgs84',
-		    			success (res) {
-		    				console.log(res)
-		    				let latitude,longitude;
-		    				latitude = res.latitude.toString();
-		    				longitude = res.longitude.toString();
-							let ws = _this.wgs84togcj02(latitude,longitude) // 转换成gcjo2
-						    let lng = ws.lng
-						    let lat = ws.lat
-							console.log(lng);console.log(lat)
-							_this.loaction = '测试定位';
-							request({
-								url:'',
-								methods:'',
-								success: (res) => {
-									console.log(res);
-									cosnole.log("请求成功")
-								}
-							})
-		    				// uni.request({
-		    				// 	header:{
-		    				// 		"Content-Type": "application/text"
-		    				// 	},
-		    				// 	url:'',
-		    				// 	success(re) {
-		    				// 		console.log("中文位置")
-		    				// 		console.log(re)	   
-		    				// 		if(re.statusCode===200){
-		    				// 			console.log("获取中文街道地理位置成功")
-		    				// 		}else{
-		    				// 			console.log("获取信息失败,请重试!")
-		    				// 		}
-		    				// 	 }
-		    				// });
-		    			},
-						fail(res) {
-							if(res.errMsg == 'getLocation:fail:system permission denied') {
-								_this.$msg("定位失败开启手机微信定位权限")
-							}
-							console.log(res.errMsg)
-							
-						}
-		    		});
-		    	},
+		    getRegeo(){  //获取地理位置
+			 let _this=this;
+			 uni.showLoading({  
+				title: '获取信息中'  
+			}); 
+			_this.amapPlugin.getRegeo({  
+				success: (data) => {  
+					this.location = data[0].name;
+					uni.hideLoading();  
+				},
+				fail: (res) => {
+					console.log(res);
+					uni.hideLoading(); 
+				}
+			});  
+		   
+		    },
 			
-			// 确定登录
-			wxlogion() {
-			// 	let  that = this;
-			//     uni.getUserInfo({
-			// 	     success(res) {
-			// 			 that.login(res.userInfo);
-			// 			 that.showDialog(true);
-			// 	     },
-			// 	     fail(res) {
-			// 			that.$msg("授权失败")
-			// 	     }
-			//     })
+			// 获取首页轮播
+			 getswiper() {
+			   let _this = this;
+				this.request({
+	                url:"/v1/entry/adv",
+	                method:'get',
+					success: function(res) {
+						 _this.backgroundlist = res.data.data;
+					}
+			   })
+			 
+			 },
+		 // 获取酒店列表
+		 gethotelist() {
+			  let _this=this;
+			 this.request({
+                 url:"/v2/entry/storeList",
+                 method:'get',
+                 data: {
+                         page: _this.page,
+						 page_size: 10
+                     },
+				success: function(res) {
+					 let { data,code } = res.data;
+					 if(code == 1000) {
+							 
+						 if(data.store_list.length<10) {
+							 _this.ispull = false;
+						 }
+						 if(_this.hotelist.length == 0) {
+							 _this.hotelist = data.store_list
+						 }else {
+							 _this.hotelist =  _this.hotelist.concat(data.store_list);
+						 }
+						_this.hotelist.forEach(item => {
+							item.tages = item.store_summary.split('  ');
+						})
+						 console.log(_this.hotelist)
+					 }else {
+						 _this.$msg("网络错误稍后再试")
+					 }
+				}
+		   })
 		 },
-		 
 		 // 点击扫码
 		 scan(){
 		 	uni.scanCode({
@@ -307,25 +288,38 @@
 		 },
 		 
 		 // 跳转到新页面  酒店详情
-		 openinfo() {
+		 openinfo(item) {
+			 let id = item.store_id;
 			  uni.navigateTo({
-			                     url: './hotel',
+			                    url: `/pages/index/hotel?id=${id}`
 			                 });
 		 },
 		 
 		 // 跳转到商品详情
-		 shopDetail() {
-			uni.navigateTo({
-			                   url: './shop',
-			               }); 
+		 shopDetail(item) {
+			 let id = item.adv_target.goods_id;
+			 let store_id = item.adv_target.store_id;
+			 if(item.adv_target.type == 'goods') {
+				 uni.navigateTo({
+									 url: `/pages/index/shop?id=${id}&store_id=${store_id}`
+				                }); 
+			 }else if(item.adv_target.type == 'store') {
+				 let id = item.adv_target.store_id;
+				 let title = item.adv_target.store_name;
+				 uni.navigateTo({
+				                    url: `/pages/index/hotel?id=${id}`
+				                });
+			 }
+			
 		 }
+		
 		}
 }
 </script>
 
 <style>
    .top .uni-navbar__header-btns  {
-		width: 80%!important;
+		width: 77%!important;
 	}
 	.top .uni-navbar__header-container {
 		width: 50%!important;
@@ -419,7 +413,6 @@
 	.hotleLeft {
 		width: 214upx;
 		height: 152upx;
-		background-color: #007AFF;
 	}
 		
 	.hotelright {
@@ -435,9 +428,12 @@
 		align-items: center;
 	}
 	.tipsTop {
-		border: 2upx solid #BBBBBB;
-		margin-right: 14upx;
-		color: #BBBBBB;
+		border: 2upx solid #606266;
+		margin-right: 12upx;
+		color: #606266;
 		padding: 4upx;
+		font-size: 24upx;
+		border-radius: 4rpx;
+		padding: 0 10rpx;
 	}
 </style>

File diff suppressed because it is too large
+ 12 - 25
pages/index/shop.vue


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/Dialog.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/assess.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/commoNar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/mpvue-citypicker/mpvueCityPicker.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/shopList.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/textarea.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/uinNumber.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/uni-icon/uni-icon.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/uni-nav-bar/uni-nav-bar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/uni-status-bar/uni-status-bar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/uploadImage.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/cart.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/commemt.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/hotel.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/hoteldetail.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/searchresult.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/shop.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/sureBuy.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/applyfor.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/commentback.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/definite.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/information.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/myCollect.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/adress.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/adressManger.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/estimate.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/order.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/paymoment.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/reminder.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myone/oneIndex.js.map


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

@@ -2,6 +2,7 @@
   "pages": [
     "pages/index/index",
     "pages/index/hotel",
+    "pages/index/hoteldetail",
     "pages/index/cart",
     "pages/index/shop",
     "pages/index/commemt",
@@ -59,6 +60,8 @@
   },
   "usingComponents": {
     "van-dialog": "/wxcomponents/dist/dialog/index",
+    "van-rate": "/wxcomponents/dist/rate/index",
     "van-cell": "/wxcomponents/dist/cell/index"
-  }
+  },
+  "sitemapLocation": "sitemap22.json"
 }

+ 6 - 40
unpackage/dist/dev/mp-weixin/common/main.js

@@ -10,10 +10,10 @@
 /* WEBPACK VAR INJECTION */(function(uni, createApp) {__webpack_require__(/*! uni-pages */ 4);__webpack_require__(/*! @dcloudio/uni-stat */ 5);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 2));
 var _App = _interopRequireDefault(__webpack_require__(/*! ./App */ 9));
-var _logion = _interopRequireDefault(__webpack_require__(/*! ./store/logion.js */ 16));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}
-
+var _logion = _interopRequireDefault(__webpack_require__(/*! ./store/logion.js */ 16));
+var _request = _interopRequireDefault(__webpack_require__(/*! ./common/request.js */ 17));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}
 // 定义全局提示title
-var baseURL = 'http://192.168.1.12:8082';
+var pictureUrl = 'https://www.qzaiwang.com';
 var msg = function msg(title) {var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1500;var mask = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;var icon = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'none';
   //统一提示方便全局修改
   if (Boolean(title) === false) {
@@ -26,44 +26,9 @@ var msg = function msg(title) {var duration = arguments.length > 1 && arguments[
     icon: icon });
 
 };
-
-
-var request = function request(options) {
-  options.url = baseUrl + options.url;
-  option.method = options.method;
-  var token = uni.getStorageSync('sessionId');
-  if (sessionId) {// 如果存在sessionId 配置请求头
-    options.header = {
-      'Authorization': sessionId,
-      'Content-Type': 'application/json' };
-
-  } else {
-
-
-  } // 不存在token 跳转至登录
-
-  // 这里对response进行处理,
-  options.complete = function (response) {
-    if (response.statusCode == 401) {
-
-    }
-  };
-  return uni.request(options);
-};
-
-// const request = (url, urlhead, sessIoid) => {
-// 	uni.request({
-// 		url: baseURL+url,
-// 		method: urlhead,
-// 		header = {
-// 		  'Authorization' : 'Bearer ' + sessIoid,
-// 		  'Content-Type' : 'application/json'
-// 		},
-
-// 	})
-// }
+_vue.default.prototype.pictureUrl = pictureUrl;
+_vue.default.prototype.request = _request.default;
 _vue.default.prototype.$msg = msg;
-_vue.default.prototype.request = request;
 _vue.default.config.productionTip = false;
 _vue.default.prototype.$store = _logion.default;
 _App.default.mpType = 'app';
@@ -148,6 +113,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 /* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
+
 var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}var _default =
 
 

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

@@ -122,6 +122,7 @@
 
 
 
+
 
 
 /*每个页面公共css */

+ 1 - 1
unpackage/dist/dev/mp-weixin/common/runtime.js

@@ -104,7 +104,7 @@
 /******/
 /******/
 /******/ 		// mini-css-extract-plugin CSS loading
-/******/ 		var cssChunks = {"component/uni-icon/uni-icon":1,"component/uni-nav-bar/uni-nav-bar":1,"component/assess":1,"component/commoNar":1,"component/uinNumber":1,"component/Dialog":1,"component/textarea":1,"component/uploadImage":1,"component/mpvue-citypicker/mpvueCityPicker":1,"component/uni-status-bar/uni-status-bar":1};
+/******/ 		var cssChunks = {"component/uni-icon/uni-icon":1,"component/uni-nav-bar/uni-nav-bar":1,"component/assess":1,"component/commoNar":1,"component/shopList":1,"component/uinNumber":1,"component/Dialog":1,"component/textarea":1,"component/uploadImage":1,"component/mpvue-citypicker/mpvueCityPicker":1,"component/uni-status-bar/uni-status-bar":1};
 /******/ 		if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
 /******/ 		else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
 /******/ 			promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {

File diff suppressed because it is too large
+ 78 - 6
unpackage/dist/dev/mp-weixin/common/vendor.js


File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/Dialog.js


File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/assess.js


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

@@ -1 +1 @@
-<view><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="https://img-cdn-qiniu.dcloud.net.cn/uniapp/images/uni@2x.png" mode="widthFix"></image></view><view class="uni-comment-body"><view class="uni-comment-top"><text style="font-size:28rpx;color:#303133;">网友</text><uni-icon vue-id="1573bc42-1" type="star" size="16" bind:__l="__l"></uni-icon></view><view class="uni-comment-date"><text style="color:#909399;font-size:20rpx;">08/10 08:12</text></view></view></view><view class="uni-comment-content" style="color:#303133;font-size:28rpx;">很酷的HBuilderX和uni-app,开发一次既能生成小程序,又能生成App</view></view></view></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 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>

File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/commoNar.js


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

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

+ 2 - 2
unpackage/dist/dev/mp-weixin/component/loginDialog.json

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

File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/component/mpvue-citypicker/mpvueCityPicker.js


File diff suppressed because it is too large
+ 43 - 57
unpackage/dist/dev/mp-weixin/component/shopList.js


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

@@ -1 +1 @@
-<view class="page"><view class="uni-product-list"><block wx:for="{{productList}}" wx:for-item="product" wx:for-index="index" wx:key="index"><view class="uni-product"><view class="image-view"><block wx:if="{{renderImage}}"><image class="uni-product-image" src="{{product.image}}"></image></block></view><view class="uni-product-title">{{product.title}}</view><view class="uni-product-price"><text class="uni-product-price-original">{{"¥"+product.favourPrice}}</text><text class="uni-product-price-favour">{{"¥"+product.originalPrice}}</text></view></view></block></view></view>
+<view class="page"><view class="uni-product-list"><block wx:for="{{productList}}" 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" style="background-color:#007AFF;" src="{{pictureUrl+'/uploads/home/store/'+product.goods_image}}"></image></view><view class="uni-product-title textover">{{product.goods_name}}</view><view class="uni-product-price"><text class="uni-product-price-original">{{"¥"+product.goods_marketprice}}</text><text class="uni-product-price-favour">{{"¥"+product.goods_costprice}}</text></view></view></block></view></view>

+ 7 - 0
unpackage/dist/dev/mp-weixin/component/shopList.wxss

@@ -0,0 +1,7 @@
+
+.textover {
+	overflow: hidden;
+	text-overflow:ellipsis;
+	white-space: nowrap;
+}
+

File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/textarea.js


File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/uinNumber.js


File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/uni-icon/uni-icon.js


File diff suppressed because it is too large
+ 13 - 13
unpackage/dist/dev/mp-weixin/component/uni-nav-bar/uni-nav-bar.js


File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/uni-status-bar/uni-status-bar.js


File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/uploadImage.js


File diff suppressed because it is too large
+ 23 - 30
unpackage/dist/dev/mp-weixin/pages/index/cart.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/cart.wxml


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

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pages/index/commemt"],{
 
-/***/ 52:
+/***/ 63:
 /*!*********************************************************************!*\
   !*** D:/uinapp/myuinapp/main.js?{"page":"pages%2Findex%2Fcommemt"} ***!
   \*********************************************************************/
@@ -11,13 +11,13 @@
 /* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 4);__webpack_require__(/*! @dcloudio/uni-stat */ 5);
 
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 2));
-var _commemt = _interopRequireDefault(__webpack_require__(/*! ./pages/index/commemt.vue */ 53));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
+var _commemt = _interopRequireDefault(__webpack_require__(/*! ./pages/index/commemt.vue */ 64));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
 createPage(_commemt.default);
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"]))
 
 /***/ }),
 
-/***/ 53:
+/***/ 64:
 /*!**************************************************!*\
   !*** D:/uinapp/myuinapp/pages/index/commemt.vue ***!
   \**************************************************/
@@ -26,8 +26,8 @@ createPage(_commemt.default);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _commemt_vue_vue_type_template_id_111fb119___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./commemt.vue?vue&type=template&id=111fb119& */ 54);
-/* harmony import */ var _commemt_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./commemt.vue?vue&type=script&lang=js& */ 56);
+/* harmony import */ var _commemt_vue_vue_type_template_id_111fb119___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./commemt.vue?vue&type=template&id=111fb119& */ 65);
+/* harmony import */ var _commemt_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./commemt.vue?vue&type=script&lang=js& */ 67);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _commemt_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _commemt_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 15);
 
@@ -56,7 +56,7 @@ component.options.__file = "D:/uinapp/myuinapp/pages/index/commemt.vue"
 
 /***/ }),
 
-/***/ 54:
+/***/ 65:
 /*!*********************************************************************************!*\
   !*** D:/uinapp/myuinapp/pages/index/commemt.vue?vue&type=template&id=111fb119& ***!
   \*********************************************************************************/
@@ -65,7 +65,7 @@ component.options.__file = "D:/uinapp/myuinapp/pages/index/commemt.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_commemt_vue_vue_type_template_id_111fb119___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./commemt.vue?vue&type=template&id=111fb119& */ 55);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_commemt_vue_vue_type_template_id_111fb119___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./commemt.vue?vue&type=template&id=111fb119& */ 66);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_commemt_vue_vue_type_template_id_111fb119___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_commemt_vue_vue_type_template_id_111fb119___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -78,7 +78,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 55:
+/***/ 66:
 /*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/uinapp/myuinapp/pages/index/commemt.vue?vue&type=template&id=111fb119& ***!
   \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -105,7 +105,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 56:
+/***/ 67:
 /*!***************************************************************************!*\
   !*** D:/uinapp/myuinapp/pages/index/commemt.vue?vue&type=script&lang=js& ***!
   \***************************************************************************/
@@ -114,14 +114,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_commemt_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./commemt.vue?vue&type=script&lang=js& */ 57);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_commemt_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./commemt.vue?vue&type=script&lang=js& */ 68);
 /* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_commemt_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_commemt_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_commemt_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_commemt_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_commemt_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 57:
+/***/ 68:
 /*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/uinapp/myuinapp/pages/index/commemt.vue?vue&type=script&lang=js& ***!
   \**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -129,7 +129,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var assess = function assess() {__webpack_require__.e(/*! require.ensure | component/assess */ "component/assess").then((function () {return resolve(__webpack_require__(/*! @/component/assess.vue */ 200));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var assess = function assess() {__webpack_require__.e(/*! require.ensure | component/assess */ "component/assess").then((function () {return resolve(__webpack_require__(/*! @/component/assess.vue */ 242));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};
 
 
 
@@ -142,12 +142,31 @@ var _default = {
     assess: assess },
 
   data: function data() {
-    return {};
-
-
-  } };exports.default = _default;
+    return {
+      goodId: 0,
+      store_id: 0 };
+
+  },
+  onLoad: function onLoad(options) {
+    this.goodId = options.goodId; // 商品Id
+    this.store_id = options.store_id;
+    this.getassess();
+  },
+  methods: {
+    getassess: function getassess() {
+      this.request({
+        url: '?do=getevaluategoods',
+        method: 'post',
+        data: {
+          goodsid: this.goodId },
+
+        success: function success(res) {
+          console.log(res);
+        } });
+
+    } } };exports.default = _default;
 
 /***/ })
 
-},[[52,"common/runtime","common/vendor"]]]);
+},[[63,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/index/commemt.js.map

File diff suppressed because it is too large
+ 13 - 30
unpackage/dist/dev/mp-weixin/pages/index/hotel.js


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

@@ -15,6 +15,7 @@
     "uni-nav-bar": "/component/uni-nav-bar/uni-nav-bar",
     "commo-nar": "/component/commoNar",
     "assess": "/component/assess",
-    "shop-list": "/component/shopList"
+    "shop-list": "/component/shopList",
+    "logion-dialog": "/component/loginDialog"
   }
 }

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/hotel.wxml


+ 104 - 98
unpackage/dist/dev/mp-weixin/pages/index/hotel.wxss

@@ -1,141 +1,147 @@
 
 .scrollswiper {
-		width: 100%;
-		position: relative;
+    width: 100%;
+    position: relative;
 }
 .titleFixed {
-		position: absolute;
-		top: 0;
-		left: 0;
-		z-index: 99;
-		padding-top: 0;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 99;
+    padding-top: 0;
 }
 .van-nav-bar {
-		padding-top: 0!important;
-		/* background: #000000!important; */
-		/* opacity: 0.2; */
-		background:rgba(0,0,0,0.2)!important;
+    padding-top: 0!important;
+    /* background: #000000!important; */
+    /* opacity: 0.2; */
+    background:rgba(0,0,0,0.2)!important;
 }
 .swiper {
-		height: 300rpx;
+    height: 300rpx;
 }
 .swiper-item {
-		display: block;
-		height: 100%!important;
-		line-height: 300rpx;
-		text-align: center;
+    display: block;
+    height: 100%!important;
+    line-height: 300rpx;
+    text-align: center;
 }
 .tip {
-		display: -webkit-box;
-		display: -webkit-flex;
-		display: flex;
-		-webkit-box-pack: justify;
-		-webkit-justify-content: space-between;
-		        justify-content: space-between;
-		padding: 36rpx 32rpx;
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-box-pack: justify;
+    -webkit-justify-content: space-between;
+            justify-content: space-between;
+    padding: 36rpx 32rpx;
 }
 .giveList {
-	    padding: 10rpx  12rpx;
-		display: -webkit-box;
-		display: -webkit-flex;
-		display: flex;
-		-webkit-flex-wrap: wrap;
-		        flex-wrap: wrap;
+    padding: 10rpx  12rpx;
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-flex-wrap: wrap;
+            flex-wrap: wrap;
 }
 .giveItem {
-		width: 18%;
-		height: 120rpx;
-		margin: 10rpx 20rpx;
-		/* background-color: #909399 */
+    height: 120rpx;
+    -webkit-box-flex: 1;
+    -webkit-flex: 1;
+            flex: 1;
+    width: 20%;
+    min-width: 20%;
+    max-width: 20%;
+    margin: 24rpx 0 25rpx 4%;
+    /* background-color: #909399 */
 }
 .active {
-		color: #F76260;
+    color: #F76260;
 }
 .typeItem {
-		width: 25%;
-		display: inline-block;
-		text-align: center;
+    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;
+    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;
 }
 .hotlItem {
-		padding: 22rpx 30rpx;
-		border-bottom: 1px solid #EEEEEE;
-		display: -webkit-box;
-		display: -webkit-flex;
-		display: flex;
-		-webkit-box-pack: justify;
-		-webkit-justify-content: space-between;
-		        justify-content: space-between;
+    padding: 22rpx 30rpx;
+    border-bottom: 1px solid #EEEEEE;
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-box-pack: justify;
+    -webkit-justify-content: space-between;
+            justify-content: space-between;
 }
 .bottomButton {
-		width: 95%;
-		left: 2.5%;
-		position: absolute;
-		bottom: 0;
+    width: 95%;
+    left: 2.5%;
+    position: fixed;
+    bottom: 2.5%;
 }
 .titeTop {
-		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;
-		position: absolute;
-		top: 10rpx;
-		width: 100%;
+    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;
+    position: absolute;
+    top: 10rpx;
+    width: 100%;
 }
 .topleft {
 }
 .topright {
 }
 .input-view {
-		width: 85%;
-		display: -webkit-box;
-		display: -webkit-flex;
-		display: flex;
-		height: 30px;
-		border-radius: 15px;
-		padding: 0 4%;
-		-webkit-flex-wrap: nowrap;
-		        flex-wrap: nowrap;
-		margin: 7px 0;
-		line-height: 30px;
-		margin: 24rpx auto;
-		background:rgba(0,0,0,1);
-		border-radius:15px;
-		opacity:0.4;
+    width: 85%;
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: flex;
+    height: 30px;
+    border-radius: 15px;
+    padding: 0 4%;
+    -webkit-flex-wrap: nowrap;
+            flex-wrap: nowrap;
+    margin: 7px 0;
+    line-height: 30px;
+    margin: 24rpx auto;
+    background:rgba(0,0,0,1);
+    border-radius:15px;
+    opacity:0.4;
 }
 .input-view .uni-icon {
-		line-height: 30px !important;
+    line-height: 30px !important;
 }
 .input-view .input {
-		height: 30px;
-		line-height: 30px;
-		width: 94%;
-		padding: 0 3%;
+    height: 30px;
+    line-height: 30px;
+    width: 94%;
+    padding: 0 3%;
 }
 .activeColor {
-		background: #fff!important;
-		position: fixed;
-		background-color: #fff;
-		top: 50rpx;
-		z-index: 99;
+    background: #fff!important;
+    position: fixed;
+    background-color: #fff;
+    top: 50rpx;
+    z-index: 99;
 }
 .listType {
 }

File diff suppressed because it is too large
+ 352 - 0
unpackage/dist/dev/mp-weixin/pages/index/hoteldetail.js


+ 11 - 0
unpackage/dist/dev/mp-weixin/pages/index/hoteldetail.json

@@ -0,0 +1,11 @@
+{
+  "navigationBarTitleText": "商品销售",
+  "usingComponents": {
+    "van-tab": "/wxcomponents/dist/tab/index",
+    "van-tabs": "/wxcomponents/dist/tabs/index",
+    "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"
+  }
+}

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/hoteldetail.wxml


+ 24 - 0
unpackage/dist/dev/mp-weixin/pages/index/hoteldetail.wxss

@@ -0,0 +1,24 @@
+
+.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;
+}
+

File diff suppressed because it is too large
+ 19 - 30
unpackage/dist/dev/mp-weixin/pages/index/index.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/index.wxml


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

@@ -1,6 +1,6 @@
 
 .top .uni-navbar__header-btns  {
-		width: 80%!important;
+		width: 77%!important;
 }
 .top .uni-navbar__header-container {
 		width: 50%!important;
@@ -97,7 +97,6 @@
 .hotleLeft {
 		width: 214rpx;
 		height: 152rpx;
-		background-color: #007AFF;
 }
 .hotelright {
 		padding-left: 16rpx;
@@ -123,9 +122,12 @@
 		        align-items: center;
 }
 .tipsTop {
-		border: 2rpx solid #BBBBBB;
-		margin-right: 14rpx;
-		color: #BBBBBB;
+		border: 2rpx solid #606266;
+		margin-right: 12rpx;
+		color: #606266;
 		padding: 4rpx;
+		font-size: 24rpx;
+		border-radius: 4rpx;
+		padding: 0 10rpx;
 }
 

File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/pages/index/searchresult.js


File diff suppressed because it is too large
+ 96 - 141
unpackage/dist/dev/mp-weixin/pages/index/shop.js


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

@@ -4,6 +4,7 @@
     "van-tab": "/wxcomponents/dist/tab/index",
     "van-tabs": "/wxcomponents/dist/tabs/index",
     "uni-icon": "/component/uni-icon/uni-icon",
-    "assess": "/component/assess"
+    "assess": "/component/assess",
+    "uninumberbox": "/component/uinNumber"
   }
 }

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/shop.wxml


+ 13 - 0
unpackage/dist/dev/mp-weixin/pages/index/shop.wxss

@@ -472,6 +472,10 @@ page {
       background: #fbebee;
       color: #fa436a;
 }
+.attr-content .item-list .disabled {
+      color: #fbebee;
+      background: rgba(245, 245, 245, 0.5);
+}
 /*  弹出层 */
 .popup {
   position: fixed;
@@ -613,6 +617,15 @@ page {
   z-index: 99;
   margin-top: 0;
 }
+.numberchange {
+  padding-top: 48px;
+  overflow: hidden;
+  clear: both;
+  padding-right: 59rpx;
+}
+.uni-numbox {
+  float: right;
+}
 /* 底部操作菜单 */
 .page-bottom {
   position: fixed;

File diff suppressed because it is too large
+ 26 - 13
unpackage/dist/dev/mp-weixin/pages/index/sureBuy.js


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

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pages/myCenter/Settled"],{
 
-/***/ 146:
+/***/ 165:
 /*!************************************************************************!*\
   !*** D:/uinapp/myuinapp/main.js?{"page":"pages%2FmyCenter%2FSettled"} ***!
   \************************************************************************/
@@ -11,13 +11,13 @@
 /* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 4);__webpack_require__(/*! @dcloudio/uni-stat */ 5);
 
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 2));
-var _Settled = _interopRequireDefault(__webpack_require__(/*! ./pages/myCenter/Settled.vue */ 147));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
+var _Settled = _interopRequireDefault(__webpack_require__(/*! ./pages/myCenter/Settled.vue */ 166));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
 createPage(_Settled.default);
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"]))
 
 /***/ }),
 
-/***/ 147:
+/***/ 166:
 /*!*****************************************************!*\
   !*** D:/uinapp/myuinapp/pages/myCenter/Settled.vue ***!
   \*****************************************************/
@@ -26,8 +26,8 @@ createPage(_Settled.default);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _Settled_vue_vue_type_template_id_dfc9d076___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Settled.vue?vue&type=template&id=dfc9d076& */ 148);
-/* harmony import */ var _Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Settled.vue?vue&type=script&lang=js& */ 150);
+/* harmony import */ var _Settled_vue_vue_type_template_id_dfc9d076___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Settled.vue?vue&type=template&id=dfc9d076& */ 167);
+/* harmony import */ var _Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Settled.vue?vue&type=script&lang=js& */ 169);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 15);
 
@@ -56,7 +56,7 @@ component.options.__file = "D:/uinapp/myuinapp/pages/myCenter/Settled.vue"
 
 /***/ }),
 
-/***/ 148:
+/***/ 167:
 /*!************************************************************************************!*\
   !*** D:/uinapp/myuinapp/pages/myCenter/Settled.vue?vue&type=template&id=dfc9d076& ***!
   \************************************************************************************/
@@ -65,7 +65,7 @@ component.options.__file = "D:/uinapp/myuinapp/pages/myCenter/Settled.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_template_id_dfc9d076___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./Settled.vue?vue&type=template&id=dfc9d076& */ 149);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_template_id_dfc9d076___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./Settled.vue?vue&type=template&id=dfc9d076& */ 168);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_template_id_dfc9d076___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_template_id_dfc9d076___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -78,7 +78,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 149:
+/***/ 168:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/uinapp/myuinapp/pages/myCenter/Settled.vue?vue&type=template&id=dfc9d076& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -105,7 +105,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 150:
+/***/ 169:
 /*!******************************************************************************!*\
   !*** D:/uinapp/myuinapp/pages/myCenter/Settled.vue?vue&type=script&lang=js& ***!
   \******************************************************************************/
@@ -114,14 +114,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./Settled.vue?vue&type=script&lang=js& */ 151);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./Settled.vue?vue&type=script&lang=js& */ 170);
 /* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 151:
+/***/ 170:
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/uinapp/myuinapp/pages/myCenter/Settled.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -129,7 +129,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 226));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 268));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 
@@ -181,5 +181,5 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 
 /***/ })
 
-},[[146,"common/runtime","common/vendor"]]]);
+},[[165,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/myCenter/Settled.js.map

File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/pages/myCenter/applyfor.js


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

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

File diff suppressed because it is too large
+ 14 - 14
unpackage/dist/dev/mp-weixin/pages/myCenter/commentback.js


File diff suppressed because it is too large
+ 13 - 13
unpackage/dist/dev/mp-weixin/pages/myCenter/definite.js


File diff suppressed because it is too large
+ 14 - 14
unpackage/dist/dev/mp-weixin/pages/myCenter/index.js


File diff suppressed because it is too large
+ 13 - 13
unpackage/dist/dev/mp-weixin/pages/myCenter/information.js


File diff suppressed because it is too large
+ 13 - 13
unpackage/dist/dev/mp-weixin/pages/myCenter/myCollect.js


File diff suppressed because it is too large
+ 13 - 13
unpackage/dist/dev/mp-weixin/pages/myOrder/adress.js


Some files were not shown because too many files changed in this diff