浏览代码

退款添加 墨刀修改

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

+ 7 - 1
App.vue

@@ -5,7 +5,7 @@
 	
 	export default {
 		methods: {
-			...mapMutations(['setOpenid','login','showDialog','setcode','islogionsuccess'])
+			...mapMutations(['setOpenid','login','showDialog','setcode','islogionsuccess','beginload'])
 		},
 		computed:{
 			...mapState([
@@ -14,6 +14,8 @@
 			  'successlogion', // 同意手机号授权 登录成功
 			  'sessionId',   // 登录成功的token
 			  'getcode',  // logion时候获取的code session_key oppen_id
+			  'beginload'
+			  
 			]),
 		},
 		onLaunch: function() {
@@ -32,6 +34,7 @@
 						 that.login(userInfo);
 						 that.setcode(getcode);
 						 that.showDialog(true);
+						 that.beginload(true);
 						 that.islogionsuccess(true);
 					    },  
 						fail(){  
@@ -60,6 +63,7 @@
 												  that.setOpenid(token); // 保存用户token
 												  that.islogionsuccess(true);
 											  }
+											  that.beginload(true);
 											  that.showDialog(false); // 没有同意授权头像等;
 											  that.login(); // 清空用户头像信息
 					     				  }
@@ -93,10 +97,12 @@
 								  if(token == '') {
 									   this.setOpenid(token); // 保存用户token
 									   this.islogionsuccess(false);
+									  
 								  }else {
 									  this.setOpenid(token); // 保存用户token
 									  this.islogionsuccess(true);
 								  }
+								   this.beginload(true);
 								  this.showDialog(false); // 没有同意授权头像等;
 								  this.login(); // 清空用户头像信息
 								

+ 5 - 3
common/request.js

@@ -3,15 +3,17 @@ const request = function(options) {
      options.url = baseUrl + options.url;
      try {
        // 获取放入缓存的字段token obj.header["token"] = userToken;
-       // const token = uni.getStorageSync('sessionId');
-	    const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczpcL1wvd3d3LnF6YWl3YW5nLmNvbSIsImlhdCI6MTU5MDIwMTk3OSwiZXhwIjoxNTkxMDY1OTc5LCJuYmYiOjE1OTAyMDE5NzksInN1YiI6MTYsInBydiI6ImU5YTM5YzhhZjYwMWYyNGMzZjA3ZjQ0NjMyMmE1NmM4MDVjNWNkZTYifQ.lYkvBvJ3rh2NRLyii6aCe625YfzOpuCPNnpVY1jw_gA';
+        const token = uni.getStorageSync('sessionId');
+	    //const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczpcL1wvd3d3LnF6YWl3YW5nLmNvbSIsImlhdCI6MTU5MDIwMTk3OSwiZXhwIjoxNTkxMDY1OTc5LCJuYmYiOjE1OTAyMDE5NzksInN1YiI6MTYsInBydiI6ImU5YTM5YzhhZjYwMWYyNGMzZjA3ZjQ0NjMyMmE1NmM4MDVjNWNkZTYifQ.lYkvBvJ3rh2NRLyii6aCe625YfzOpuCPNnpVY1jw_gA';
        if (token) { // 如果存在token 配置请求头
          options.header = {
            'X-TOKEN' : token,
 		   'Content-Type' : 'application/x-www-form-urlencoded',
          };
         }else{	// 不存在token 跳转至登录
-            return;
+           // uni.navigateTo({
+           // 	url:'/pages/myCenter/logion'
+           // })
         }
      } catch (err) {
       console.log(err)

+ 14 - 3
component/shopList.vue

@@ -1,15 +1,16 @@
 <template>
 	<view class="page">
 		<view class="uni-product-list">
-			<view class="uni-product" v-for="(product,index) in productList" :key="index" @click="goshop(product)">
+			<view style="padding: 20upx;" v-for="(product,index) in productList" :key="index" @click="goshop(product)">
 				<view class="image-view">												
 					<image  class="uni-product-image" :src="pictureUrl+'/uploads/home/store/goods/' + product.goods_image.substr(0, product.goods_image.indexOf('\_')) + '/' + 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>
+					<text class="uni-product-price-original" style="color:#D9332E!important;font-weight: bold;">¥{{product.goods_price}}</text>
+					<text class="uni-product-price-favour">¥{{product.goods_marketprice}}</text>
 				</view>
+				<view class="tags" v-if="product.goods_advword!=''">{{product.goods_advword}}</view>
 			</view>
 		</view>
 	</view>
@@ -57,4 +58,14 @@ export default {
 		text-overflow:ellipsis;
 		white-space: nowrap;
 	}
+	.tags {
+		display:inline-block!important; 
+		border: 1px solid #D9332E;
+		color: #D9332E;
+		text-align: center;
+		line-height: 50upx;
+		width:auto;
+		padding: 0 10upx;
+		margin-top: 10upx;
+	}
 </style>

+ 20 - 0
pages.json

@@ -84,6 +84,26 @@
 						}
 			}
 		},
+		{
+			"path": "pages/myOrder/returngood",
+			"style": {
+				"navigationBarTitleText": "退货退款",
+				"usingComponents":{
+					"van-card": "/wxcomponents/dist/card/index"
+				}
+				
+			}
+		},
+		{
+			"path": "pages/myOrder/returndetail",
+			"style": {
+				"navigationBarTitleText": "退货详情",
+				"usingComponents":{
+					"van-card": "/wxcomponents/dist/card/index"
+				}
+				
+			}
+		},
 		{
 			"path": "pages/index/searchresult",
 			"style": {

+ 20 - 14
pages/index/hotel.vue

@@ -32,7 +32,7 @@
            <view style="font-size: 36upx;color: #303133;">{{hotelitle}}</view>
            <view >
 			   <van-icon name="star-o" @click="gocollect" v-if="has_collected == 0" size="22" />
-			   <van-icon name="star" @click="gocollect" v-if="has_collected == 1"  size="22" color= "#D9332E" /> 
+			   <van-icon name="star-o" @click="gocollect" v-if="has_collected == 1"  size="22" color= "#D9332E" /> 
            </view>
        </view>
        
@@ -116,7 +116,7 @@
                  <shopList :productList="goods_list" />
                   </view> 
                  </van-tab>
-                    <van-tab  :name="1" title="评价">
+                    <van-tab  :name="1" :title="'评价' +'  '+hoteldetail.feedback_count">
                      <!-- 评价列表 -->
                      <assess :feedback_list="feedback_list" />
                  </van-tab>
@@ -316,6 +316,8 @@
 			// },
 			choseType(e) {
 			    this.tabIndex = e;
+				this.isDetail = 1;
+				this.page = 1;
 				//this.goods_list = [];
 				if(this.tabIndex == 1) {  // 服务
 					this.istopclick = 0;
@@ -323,6 +325,7 @@
 					this.gc_id_1 = '';
 					this.goods_price = ''; 
 					this.goods_commonid = '';
+					this.getshopdetail(2);
 				}else if(this.tabIndex == 2){ //伤
 				        this.chosegoods_price = true;
 						console.log(this.chosegoods_commonid);
@@ -331,6 +334,7 @@
 						this.goods_price = ''; 
 						this.goods_commonid = this.chosegoods_commonid?'asc':'desc';
 						this.chosegoods_commonid = !this.chosegoods_commonid;
+						this.getshopdetail(2);
 				}else if(this.tabIndex == 3){ // 价格
 						this.chosegoods_commonid = true;
 						console.log(this.chosegoods_price);
@@ -339,6 +343,7 @@
 						this.goods_price = this.chosegoods_price?'desc':'asc';
 						this.goods_commonid = '';
 						this.chosegoods_price = !this.chosegoods_price;
+						this.getshopdetail(2);
 					}else if(this.tabIndex ==4) {  // 分类
 						this.istopclick = 0;
 						this.isprice = 0;
@@ -348,7 +353,7 @@
 						this.chosegoods_commonid = true;
 					}
 					
-				    this.getshopdetail(2);
+				 
 			},
 			// 点击切换上下
 			changeisclick(e) {
@@ -404,7 +409,7 @@
 									 })
 									 let array = [{gc_id:'',gc_name:'全部'}];
 									 _this.classify =  array.concat(category_list);
-									 _this.category_list = category_list;
+									 _this.category_list = category_list.splice(0,10);
 									 console.log(_this.category_list)
 								},
 				})
@@ -475,13 +480,13 @@
             lower(e) {
 				console.log(this.activeindex)
 				console.log(this.isDetail)
-				if(this.activeindex == 1) {
-					if(this.isnexttwo == 1) {
+				// if(this.activeindex == 1) {
+					if(this.isnexttwo == 1 && this.activeindex == 1) {
 						this.page = this.page + 1;
-					}
+					//}
 					this.getcomment();
-				
-				}else if(this.activeindex == 0 && this.isDetail == 1) {
+				// this.activeindex == 0 &&
+				}else if( this.isDetail == 1) {
 					this.page = this.page + 1;
 					this.getshopdetail();
 				}
@@ -531,7 +536,7 @@
         background:rgba(0,0,0,0.2)!important;
     }
     .swiper {
-        height: 300upx;
+        height: 380upx;
     }
     .swiper-item {
         display: block;
@@ -553,10 +558,11 @@
     .giveItem {
         height: 120rpx;
         flex: 1;
-        width: 20%;
-        min-width: 20%;
-        max-width: 20%;
-        margin: 24rpx 0 25rpx 4%;
+        width: 16%;
+        min-width: 16%;
+        max-width: 16%;
+        /* margin: 24rpx 0 25rpx 4%; */
+		margin: 24upx 2%;
     }
     .active {
         color: #F76260;

+ 34 - 11
pages/index/hoteldetail.vue

@@ -1,10 +1,8 @@
 <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 style='width: 100%;height: 70upx;'>
+	      <view style="width: 95%;margin: 0 auto;height: 80upx;position: fixed;top:0;width: 100%;background-color: #fff;z-index:99;">
 			 <view @click="choseType(1)" :class="tabIndex==1 ? 'active' : ''" class="typeItem">
 			    综合
 			 </view>
@@ -59,21 +57,28 @@
 				 {{item.gc_name}}
 			  </view> 
 		  </view>
+		  <scroll-view  class="floor-list"
+		   :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
+		   refresher-enabled="true">
 		  <!-- 商品列表 -->
 		  <shopList :productList="goods_list" />
 		   </scroll-view>
+		    <Gobacktop @getop="getop" v-if="isTop" />
 		  </view>
 		  
 </template>
 
 <script>
     import shopList from '@/component/shopList.vue'  // 商品列表	
+	import Gobacktop from '@/component/Gobacktop.vue'
 	export default {
 		components: {
-		    shopList
+		    shopList,
+			Gobacktop
 		},
 		data() {
 			return {
+				isTop: 0,
 				isprice: 0,
 				goods_list:[],
 				scrollTop: 0,
@@ -109,16 +114,24 @@
 			this.hotelsecondmenu(); // 二级菜单
 		},
 		methods: {
+			getop() {
+				this.scrollTop = this.old.scrollTop
+                this.$nextTick(function(){
+                    this.scrollTop=0;
+                });
+				this.isTop = false;
+			},
 			choseType(e) {
 		      this.page = 1;
 			  this.tabIndex = e;
-			  this.goods_list = [];
+			  //this.goods_list = [];
 			if(this.tabIndex == 1) {  // 服务
 				this.istopclick = 0;
 				this.isprice = 0;
 				this.gc_id_2 = '';
 				this.goods_price = ''; 
 				this.goods_commonid = '';
+				this.getshopdetail(2); 
 			}else if(this.tabIndex == 2){ //伤
 			        this.chosegoods_price = true;
 					console.log(this.chosegoods_commonid);
@@ -128,6 +141,7 @@
 					this.goods_commonid = this.chosegoods_commonid?'asc':'desc';
 					//this.gc_id_1 = '';
 					this.chosegoods_commonid = !this.chosegoods_commonid;
+					this.getshopdetail(2);
 			}else if(this.tabIndex == 3){ // 价格
 					this.chosegoods_commonid = true;
 					console.log(this.chosegoods_price);
@@ -137,6 +151,7 @@
 					this.istopclick = 0;
 					//this.gc_id_1 = '';
 					this.chosegoods_price = !this.chosegoods_price;
+					this.getshopdetail(2);
 				}else if(this.tabIndex ==4) {  // 分类
 					this.istopclick = 0;
 					this.isprice = 0;
@@ -144,8 +159,9 @@
 					this.goods_commonid = '';
 					this.chosegoods_price = true;
 					this.chosegoods_commonid = true;
+					console.log(this.goods_list);
 				}
-			  this.getshopdetail();
+			
 			},
 			
 			// 点击图标上下筛选切换
@@ -155,12 +171,11 @@
 			confirm(e) {
 				console.log(e);
 				this.tabIndex = 0;
-				console.log(this.tabIndex);
 				this.gc_id_2 = e.gc_id;
-				this.getshopdetail();
+				this.getshopdetail(2);
 			},
 			// 获取商品详情
-			getshopdetail() {
+			getshopdetail(e) {
 				let _this = this;
 				this.request({
 				                url:"/v2/entry/storeGoods",
@@ -179,6 +194,9 @@
 									}else {
 										_this.ispill = false;
 									}
+									if(e == 2) {
+										_this.goods_list = [];
+									}
 									_this.goods_list = _this.goods_list.concat(res.data.data.goods_list);
 								},
 			    })
@@ -216,6 +234,11 @@
 			
 			// 滚动时触发
 			scroll(e) {
+				if(e.detail.scrollTop > 400) {
+						this.isTop = true;
+				}else{ //当距离小于500时显示回到顶部按钮
+						this.isTop = false;
+				}
 				this.old.scrollTop = e.detail.scrollTop
 			}
 		}

+ 54 - 13
pages/index/index.vue

@@ -55,7 +55,7 @@
 	<view v-if="!allow">
      <view class="hotelList" v-for='(item,index) in hotelist' :key="index" @click="openinfo(item)">
 		 <view class="hotleLeft">					
-			 <image  style="width: 214upx;height: 152upx;" :src="pictureUrl+'/uploads/home/store/'+item.store_id+'/'+item.store_banner" />
+			 <image  style="width: 214upx;height: 152upx;border-radius: 10upx;" :src="pictureUrl+'/uploads/home/store/'+item.store_id+'/'+item.store_banner" />
 		 </view>
 		 <view class="hotelright">
 		 	<view style="font-size: 28upx;color: #303133;font-weight: 600;">{{item.store_name}}
@@ -65,8 +65,8 @@
 				<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 class="undertip">
+				<view  v-for="(items,index) in item.tageslist" :key="index" class="tipsTop">{{items}}</view>
 			</view>
 	 </view>
 	 </view>
@@ -75,7 +75,8 @@
 		 定位失败暂时获取不到周边酒店信息哦
 	 </view>
      </scroll-view>
-	 <unipopup :images="images" v-if="enable == 1 || !successlogion" :show="ishow"/>
+	 <!-- || !successlogion -->
+	 <unipopup :images="images" v-if="enable == 1" :show="ishow"/>
 	 <Gobacktop @getop="getop" v-if="isTop" />
 	</view>
 </template>
@@ -123,7 +124,7 @@
 				old: {
 					scrollTop: 0
 				},
-				allow: false,
+				allow: true,
 				images: '',  // 开机图片广告
 				enable: '', // 是否展示广告
 			}
@@ -132,25 +133,55 @@
 			...mapState([
 			  'hasLogin',
 			  'userInfo',
-			  'successlogion'
+			  'successlogion',
+			  'beginload'
 			]),
 		},
 		onLoad() {
+			if(this.beginload) {
+				console.log("jinlaieeeeee")
 			this.getpicture(); // 开机广告
-			this.getswiper();   // 获取首页轮播
 			//this.gethotelist(); // 酒店列表
 			if(this.allow) {
 				
 			}else {
 				this.gethotelist(); // 酒店列表
 			}
+			this.amapPlugin = new amap.AMapWX({
+				key: this.key  
+			});  
 			this.isGetLocation();  // 检查是否开启定位权限
 			this.isUserInfo();  // 检查是否允许获取用户授权
 			 // 用户授全
-		    this.amapPlugin = new amap.AMapWX({  
-				key: this.key  
-		    });  		
+			this.getswiper();   // 获取首页轮播
+		   }
 	    },
+		watch: {
+			'allow': function(val) {
+				if(val) {
+					console.log(val);
+				}else {
+					console.log(val);
+					console.log("dddjdjdjjdjd")
+					//this.gethotelist(); // 酒店列表
+				}
+			},
+			'beginload':function(val) {
+				this.getpicture(); // 开机广告
+				// if(this.allow) {
+					
+				// }else {
+				// 	this.gethotelist(); // 酒店列表
+				// }
+				this.amapPlugin = new amap.AMapWX({
+					key: this.key  
+				});  
+				this.isGetLocation();  // 检查是否开启定位权限
+				this.isUserInfo();  // 检查是否允许获取用户授权
+				 // 用户授全
+				this.getswiper();   // 获取首页轮播
+			}
+		},
 		methods: {
 			...mapMutations(['login','showDialog']),
 			intToFloat(val) {
@@ -288,12 +319,14 @@
 				title: '获取信息中'  
 			}); 
 			_this.amapPlugin.getRegeo({  
-				success: (data) => {  
+				success: (data) => {
 					this.location = data[0].name;
 					this.allow = false;
+					this.gethotelist();
 					uni.hideLoading();  
 				},
 				fail: (res) => {
+					this.allow = true;
 					console.log(res);
 					uni.hideLoading(); 
 				}
@@ -326,9 +359,16 @@
 						 }
 						 // data.store_list.forEach(item => {
 						 // 	item.tages = item.store_summary.split('  ');
-						 // })
-						  data.store_list.forEach(items => {
+						 // }) .replace(/(^\s*)|(\s*$)/g, "")
+						  data.store_list.forEach((items,index) => {
 							items.tages = items.store_summary.split(' ');
+							items.tageslist = [];
+							items.tages.forEach((item,index) => {
+								if(item!='') {
+									items.tageslist.push(item);
+								}
+							})
+							
 						 })
 						 if(this.hotelist.length == 0) {
 							 this.hotelist = data.store_list
@@ -343,6 +383,7 @@
 				}
 		   })
 		 },
+		
 		 // 点击扫码
 		 scan(){
 		 	uni.scanCode({

+ 8 - 6
pages/index/sureBuy.vue

@@ -32,7 +32,6 @@
 			 disabled
 		     placeholder="请输入酒店"
 		   />
-		   
 		   <van-field
 		      @change="gethonename"
 		      :value="honename"
@@ -163,6 +162,7 @@
 	export default {
 		data() {
 			return {
+				firstprice: 0,
 				read: 0,
 				hotelname:'', // 
 				honename:'',
@@ -201,6 +201,7 @@
 				    console.log(adress);
 			        this.choseadress = adress;
 					this.address_id = this.choseadress.address_id;
+					//this.getorder();
 					this.getralodprice();
 			 })
 		},
@@ -250,7 +251,8 @@
 						this.hotelname = this.store.store_name
 						this.reserve = this.store.store_name
 						this.pricelist = data.og_list;
-						this.prices = totalprice;
+						this.firstprice = totalprice;
+						this.prices = totalprice;;
 					}
 				})
 			},
@@ -361,9 +363,9 @@
 						address_id: this.address_id
 					},
 					success:(res) => {
-						    let price = this.prices;
-						    this.ralodprice = res.data.data.shipping_fee;
-							this.prices = price + this.ralodprice;
+						    let price = this.firstprice;
+						    this.ralodprice = Number(res.data.data.shipping_fee);
+							this.prices =  Number(price) + this.ralodprice;
 					}
 				})
 			},
@@ -377,7 +379,7 @@
 				}
 			},
 			goAdress() {
-				console.log("dddd")
+			    
 				uni.navigateTo({
 				                   url: '../myOrder/adress',
 				               }); 

+ 3 - 2
pages/myCenter/index.vue

@@ -9,17 +9,18 @@
 					<view class="myNmaeImg">
 						<image :src="userInfo.avatarUrl"></image>
 					</view>
-                    <view v-if="successlogion">
+                    <view v-if="successlogion&&hasLogin">
 						<view  style="font-size: 34upx;margin-bottom: 32upx;">{{userInfo.nickName}}</view>
 						<view style="font-size: 24upx"  @click="goAdress(3)" >圈币{{menberinfo.member_points}}></view>
 					</view>
+					
 					<view v-if="!successlogion && hasLogin">
 						
 						<view  style="font-size: 34upx;margin-bottom: 32upx;">{{userInfo.nickName}}</view>
 						<view style="font-size: 24upx"  @click="goAdress(3)" >请绑定手机号></view>
 					</view>
 					
-					<view v-if="!successlogion && !hasLogin">
+					<view v-if="!successlogion && !hasLogin|| successlogion && !hasLogin">
 						<view  style="font-size: 34upx;margin-bottom: 32upx;"  @click="goAdress(3)">请登录</view>
 						<view style="font-size: 24upx"  @click="goAdress(3)" >圈币***></view>
 					</view>

+ 37 - 11
pages/myCenter/myCollect.vue

@@ -9,7 +9,7 @@
 		<scroll-view  style="height: 95vh;" class="floor-list"
 		  :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
 		  refresher-enabled="true">
-		  <view v-if="active == 1"  v-for="(item,index) in store_list" :key="index">
+		  <view v-if="active == 1" @click="goitem(item)"  v-for="(item,index) in store_list" :key="index">
 		  				  <van-cell :title="item.store_name" title-class="titlepadding">
 		  					  <template slot="icon">
 								  <image :src="pictureUrl+'/uploads/home/store/'+item.store_id+'/'+item.store_logo" style="border-radius: 50%;
@@ -28,7 +28,7 @@
 		  					  
 		  				  </view>
 		  </view>
-		  <view v-if="active == 2" v-for="(item,index) in goods_list" :key="index">
+		  <view v-if="active == 2" v-for="(item,index) in goods_list" @click="goshop(item)" :key="index">
 		  				  <van-cell :title="item.store_name"  title-class	="titlepadding">
 		  					  <template slot="icon">
 		  						 <image :src="pictureUrl+'/uploads/home/store/'+item.store_id+'/'+item.store_avatar" style="border-radius: 50%;
@@ -40,10 +40,10 @@
 		  						title-class="priceClass"
 		  						desc-class="desclass"	
 		  						price-class ="priceClass"
-		  						price="10.00"
-		  						desc="描述信息"
-		  						title="商品标题"
-		  						thumb="https://gd3.alicdn.com/imgextra/i3/0/O1CN01IiyFQI1UGShoFKt1O_!!0-item_pic.jpg_400x400.jpg"
+		  						:price="item.favlog_price"
+		  						:desc="item.descire"
+		  						:title="item.desarray"
+		  						:thumb="pictureUrl+'/uploads/home/store/goods/' + item.goods_image.substr(0, item.goods_image.indexOf('\_')) + '/' + item.goods_image "
 		  					  >
 		  					  </van-card>
 		  				 </view>
@@ -73,6 +73,20 @@
 			this.getlist();
 		},
 		methods: {
+			goitem(item) {
+				let id = item.store_id;
+				 uni.navigateTo({
+				              url: `/pages/index/hotel?id=${id}`
+				        });
+				console.log(item);
+			},
+			goshop(item) {
+				let store_id = item.store_id;
+				let id = item.fav_id;
+				   uni.navigateTo({
+				          url: `/pages/index/shop?id=${id}&store_id=${store_id}`
+				        });
+			},
 			upper(e) {
 				console.log(e)
 				console.log("顶部")
@@ -88,8 +102,12 @@
 			onChange(e) {
 				console.log(e);
 				this.active = e.detail.name;
+				this.store_list = [];
+				this.goods_list  = [];
+				this.page = 1;
 				if(e.detail.name == 1) {
 					this.type = 'store';
+					
 				}else {
 					this.type = 'goods';
 				}
@@ -106,11 +124,19 @@
 						page_size: this.page_size
 					},
 					success: (res) => {
-						
-						this.store_list = res.data.data.store_list;
-						this.goods_list = res.data.data.goods_list;
-						console.log(this.store_list );
-						console.log(this.goods_list );
+						let { data } = res.data;
+						console.log(data.goods_list);
+						let good = data.goods_list;
+						if(good!=0) {
+							good.forEach((items,index) => {
+								console.log(items);
+									let arr = items.goods_name.split(' ');
+									items.desarray = arr[0];
+									items.descire = items.goods_name.replace(arr[0], '');
+							})
+						}
+						this.store_list = this.store_list.concat(data.store_list);
+						this.goods_list = this.goods_list.concat(good);
 					}
 				})
 			},

+ 39 - 3
pages/myOrder/index.vue

@@ -196,21 +196,29 @@
 					  console.log(e);
 					  this.active = e.target.name;
 					  this.page = 1;
+					  this.ispull = true;
 					  this.order_list = [];
 					  if(e.target.name == 0) {
 						this.state = 'all';
+						this.getlist();
 					  }else if(e.target.name == 1) {
 						this.state = 'waiting';
+						this.getlist();
 					  }else if(e.target.name == 2) {
 						this.state = 'payed';
+						this.getlist();
 					  }else if(e.target.name == 3) {
 						this.state = 'complete';
+						this.getlist();
 					  }else if(e.target.name == 4) {
 						this.state = 'cancel';
-					  }else if(e.target.name == 5) {
-						this.state = 'refund';
+						this.getlist();
+					  }
+					  
+					  if(e.target.name == 5) {
+					  	this.state = 'refund';
+						this.refund();	
 					  }
-					  this.getlist();	
 				}else {
 					uni.navigateTo({
 						url: '/pages/myCenter/logion'
@@ -218,6 +226,34 @@
 				}
 				
 			},
+			
+			
+			// 订单退款售后列表
+			refund() {
+				this.request({
+					url: '/v3/order/refund_list',
+					method: 'POST',
+					data: {
+						state: this.state,
+						page: this.page,
+						page_size: 10
+					},
+					success: (res) => {
+						if(res.data.data.order_list.length< 10) {
+							this.ispull = false;
+						}
+						res.data.data.order_list.forEach((item,index) => {
+							item.goods.forEach(items => {
+								let arr = items.goods_name.split(' ');
+								items.desarray = arr[0];
+								items.descire = items.goods_name.replace(arr[0], '');
+							})
+						})
+						this.order_list = this.order_list.concat(res.data.data.order_list);
+					}
+				})
+			},
+			// 订单列表
 			getlist() {
 				this.request({
 					url: '/v2/order/orders',

+ 38 - 5
pages/myOrder/order.vue

@@ -37,7 +37,14 @@
 				  >
 				  </van-card>
 			  </view>
+			  <view style="clear:both;width: 100%;overflow: hidden;">
+				  <view  class="retungood" v-if="detail.status=='已收货' && items.status == 2" @click="goreturngood(items)">退货退款</view>
+				  <view class="retungood" v-if="detail.status=='已收货' && items.status == 4" @click="goreturndetail(items.or_id)">退款成功</view>
+				   <view class="retungood" v-if="detail.status=='已收货' && items.status ==3" @click="goreturndetail(items.or_id)">退款申请中</view>
+			  </view>
+			 
 	 </view>
+	 
 	 <view class="topTip">
 		  <view style="font-size: 28upx;">合计:{{detail.order_amount}}</view>
 		  <view style="padding-left: 20upx;">运费: {{detail.shipping_fee}}</view>
@@ -68,7 +75,7 @@
 			<view class="payOrder" v-if="detail.order_state == 10" @click="goPay">去付款</view>
 			<!-- detail.order_state == 40 && detail.refund_state == 0 -->
 			<view v-if=" detail.status == '已发货'" @click="cancelOrder(3)" class="deleteOrder">确认收货</view>
-			<view v-if=" detail.status == '已收货'"  class="deleteOrder">退货退款</view>
+			<!-- <view v-if=" detail.status == '已收货'"  class="deleteOrder">退货退款</view> -->
 			<view v-if=" detail.status == '已收货'" @click="estimate" class="deleteOrder">去评价</view>
 			<view v-if=" detail.status == '已完成' ||  detail.status == '已取消'" @click="cancelOrder(2)" class="deleteOrder">删除订单</view>
 		</view>
@@ -110,6 +117,25 @@
 			this.getDetail();
 		},
 		methods: {
+			// 退货退款
+			goreturngood(item) {
+				item.statusremak =  this.detail.status;
+				item.order_id =  this.id;
+				item.store_avatar = this.detail.store_avatar;
+				item.store_name = this.detail.store_name;
+				item.order_sn = this.detail.order_sn;
+				let id = JSON.stringify(item);
+				uni.navigateTo({
+					url: `/pages/myOrder/returngood?id=${id}`  // 退货页面
+				})
+			},
+			// 退款详情
+			goreturndetail(e) {
+				let id = e;
+				uni.navigateTo({
+					url: `/pages/myOrder/returndetail?id=${id}`  // 退货详情页面
+				})
+			},
 			getDetail() {
 				this.request({
 					url: '/v2/order/info',
@@ -246,11 +272,18 @@
 		background-color: #fff!important;
 	}
 	.shoplist {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
+		padding: 10upx 32upx;
+		// display: flex;
+		// justify-content: space-between;
+		// align-items: center;
+	}
+	.retungood {
+		text-align: right;
+		padding: 0upx 32upx;
+		float: right;
+		border: 1px solid #666;
+		//margin-right: 32upx;
 	}
-	
 	.adress {
 		padding: 35upx 36upx;
 		border-bottom: 14upx solid #F5F5F5;

+ 3 - 0
pages/myOrder/paymoment.vue

@@ -151,6 +151,9 @@
 								    paySign: wx.paySign,
 								    success: function (res) {
 								        console.log('success:' + JSON.stringify(res));
+										uni.navigateTo({
+											url: `/pages/myOrder/finsh?isform=${this.isform}&order_id=${this.order_id}`
+										})
 								    },
 								    fail: function (err) {
 								        console.log('fail:' + JSON.stringify(err));

+ 103 - 0
pages/myOrder/returndetail.vue

@@ -0,0 +1,103 @@
+<template>
+	<view>
+		<view class="cart-list">
+		   <view style="padding: 0 36upx;line-height: 70upx;border-bottom: 14upx solid #F5F5F5;">
+			   <span v-if="detail.status == 1">待处理</span>
+			   <span v-if="detail.status == 2">已退款 </span>
+			   <span v-if="detail.status == 3">退款失败</span>
+		   </view>  
+		   <view style="padding: 30upx 36upx 15upx 36upx;border-bottom: 1px solid #F5F5F5;">
+			   <image :src="pictureUrl+'/uploads/home/store/'+detail.store_id+'/'+detail.store_avatar" style="border-radius: 50%;
+			   width: 50upx;height: 50upx;vertical-align: middle;"></image>
+			  <span style="padding-left: 16upx;">{{detail.store_name}}</span>
+		   </view>
+		
+		
+				  <view>
+					  <van-card
+						title-class="changewidth"
+						price-class ="priceClass"
+						:price="detail.goods_price"
+						:desc="detail.descire"
+						:title="detail.desarray"
+						:thumb="pictureUrl + '/uploads/home/store/goods/'+detail.goods_image.substr(0, detail.goods_image.indexOf('\_')) + '/' + detail.goods_image"
+					  >
+					  </van-card>
+				  </view>
+		 
+		 <view class="topTip">
+			  <view style="font-size: 28upx;">合计:{{detail.goods_price}}</view>
+			
+		 </view>
+		 <view style="padding: 15upx 36upx;">订单编号:<text class="orderCode">{{detail.order_sn}}</text></view>
+		 <view style="padding: 15upx 36upx;">快递单号:<text class="orderCode">{{detail.goods_price}}</text></view>
+		 <view class="adressbottom">
+		 	<view>申请时间: <text  style="font-weight: bold;" class="time">{{detail.create_time}}</text></view>
+			<view>原因: <text  style="font-weight: bold;" class="time">{{detail.refund_remark}}</text></view> 
+		 </view>   
+	</view>
+	</view>
+</template>
+
+<script>
+	import TextArea from '@/component/textarea.vue'
+	import uploadImage from '@/component/uploadImage.vue'
+	export default {
+		components: {
+			TextArea,
+			uploadImage
+		},
+		data() {
+			return {
+				id: 0,
+				detail: {}
+			}
+		},
+		onLoad(e) {
+			this.id = e.id;
+			this.submitRemin();
+			
+		},
+		methods: {
+			
+			submitRemin() {
+				this.request({
+					url: '/v3/order/refund_info',
+					method: 'get',
+					data: {
+						id: this.id
+					},
+					success: (res) => {
+						this.detail = res.data.data;
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.topTip {
+		display: flex;
+		align-items: center;
+		justify-content: flex-start;
+		padding: 20upx 36upx;
+	}
+	.van-card {
+		background-color: #fff!important;
+	}
+	.adressbottom {
+		padding: 0 36upx;
+		color: #606266;
+		border-top: 16upx solid #F5F5F5;
+		padding-bottom: 32upx;
+		margin-bottom: 100upx;
+		view {
+			padding: 32upx 0 0 0;
+		}
+			
+		.time {
+			padding-left: 16upx;
+		}
+	}
+</style>

+ 111 - 0
pages/myOrder/returngood.vue

@@ -0,0 +1,111 @@
+<template>
+	<view>
+		<view class="cart-list">
+		   <view style="padding: 0 36upx;line-height: 70upx;border-bottom: 14upx solid #F5F5F5;">
+			   <span>{{detail.statusremak}}</span>
+		   </view>  
+		   <view style="padding: 30upx 36upx 15upx 36upx;border-bottom: 1px solid #F5F5F5;">
+			   <image :src="pictureUrl+'/uploads/home/store/'+detail.store_id+'/'+detail.store_avatar" style="border-radius: 50%;
+			   width: 50upx;height: 50upx;vertical-align: middle;"></image>
+			  <span style="padding-left: 16upx;">{{detail.store_name}}</span>
+		   </view>
+		
+		
+				  <view>
+					  <van-card
+						title-class="changewidth"
+						price-class ="priceClass"
+						:price="detail.goods_price"
+						:desc="detail.descire"
+						:title="detail.desarray"
+						:thumb="pictureUrl + '/uploads/home/store/goods/'+detail.goods_image.substr(0, detail.goods_image.indexOf('\_')) + '/' + detail.goods_image"
+					  >
+					  </van-card>
+				  </view>
+		 
+		 <view class="topTip">
+			  <view style="font-size: 28upx;">合计:{{detail.goods_price}}</view>
+			
+		 </view>
+		 <view style="padding: 15upx 36upx;">订单编号:<text class="orderCode">{{detail.order_sn}}</text></view>
+		 <view style="padding: 0upx 32upx;">
+			 <TextArea ref="getValue" :tips="tips" @submitValue="submitValue"/>
+			 <uploadImage @getImg="getImg" />	
+			 <view style="margin-top: 20upx;" class="submitRemin" @click="submitRemin">提交</view>
+		 </view>
+		   
+	</view>
+	</view>
+</template>
+
+<script>
+	import TextArea from '@/component/textarea.vue'
+	import uploadImage from '@/component/uploadImage.vue'
+	export default {
+		components: {
+			TextArea,
+			uploadImage
+		},
+		data() {
+			return {
+				id: 0,
+				pictureUrl: this.pictureUrl,
+				detail: {},
+				tips:"退款内容不能少于五个字",
+				remark:'',
+				images:''
+			}
+		},
+		onLoad(e) {
+			this.detail = JSON.parse(e.id);
+			console.log(this.detail);
+		},
+		methods: {
+			submitValue(e) {
+				this.remark = e.detail.value;
+				
+			},
+			getImg(e) {
+				this.images = e;
+			},
+			submitRemin() {
+				if(this.remark == '') {
+					this.$msg("退款内容不能为空");
+					return;
+					
+				}else if(this.remark.length < 5) {
+						this.$msg("退款理由不能少于5个字");
+						return;
+				}
+				this.request({
+					url: '/v3/Order/refund',
+					method:'post',
+					data: {
+						images: this.images,
+						remark:this.remark,
+						order_id: this.detail.order_id,
+						goods_id: this.detail.goods_id		
+					},
+					success: (res) => {
+						if(res.data.data.code == 1000) {
+							this.$msg("申请退款成功")
+						}
+						uni.navigateBack();
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	.topTip {
+		display: flex;
+		align-items: center;
+		justify-content: flex-start;
+		padding: 20upx 36upx;
+	}
+	.van-card {
+		background-color: #fff!important;
+	}
+</style>

+ 8 - 0
store/logion.js

@@ -11,6 +11,7 @@ const store = new Vuex.Store({
 		getcode: {}, // code 后获取的token session_key等值
 		//showModal: false, //登录授权弹窗
 		userInfo: {},
+		beginload: false,
 	},
 	mutations: {
 		login(state, provider) {
@@ -21,6 +22,13 @@ const store = new Vuex.Store({
 			}) 
 			console.log(state.userInfo);
 		},
+		beginload(state, provider) {
+			state.beginload = provider
+			uni.setStorage({//缓存用户登陆信息
+			    key: 'beginload',  
+			    data: provider  
+			}) 
+		},
 		setcode(state, provider) {
 			state.getcode = provider;
 			uni.setStorage({//缓存用户登陆信息

文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/Dialog.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/Gobacktop.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/assess.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/commoNar.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/mpvue-citypicker/mpvueCityPicker.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/popup.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/shopList.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/textarea.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/uinNumber.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/uinNumberCart.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/uni-icon/uni-icon.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/uni-nav-bar/uni-nav-bar.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/uni-popup.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/uni-status-bar/uni-status-bar.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/component/uploadImage.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/cart.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/feedback.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/hotel.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/hoteldetail.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/hotelsearch.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/searchresult.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/shop.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/sureBuy.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/applyfor.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/commentback.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/definite.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/index.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/information.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/myCollect.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/adress.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/adressManger.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/estimate.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/index.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/order.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/paymoment.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/reminder.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/returndetail.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myOrder/returngood.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myone/oneIndex.js.map


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myone/onedetail.js.map


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

@@ -6,6 +6,8 @@
     "pages/index/cart",
     "pages/index/shop",
     "pages/index/commemt",
+    "pages/myOrder/returngood",
+    "pages/myOrder/returndetail",
     "pages/index/searchresult",
     "pages/index/feedback",
     "pages/index/hotelsearch",
@@ -68,5 +70,6 @@
     "van-dialog": "/wxcomponents/dist/dialog/index",
     "van-rate": "/wxcomponents/dist/rate/index",
     "van-cell": "/wxcomponents/dist/cell/index"
-  }
+  },
+  "sitemapLocation": "sitemap14.json"
 }

+ 9 - 3
unpackage/dist/dev/mp-weixin/common/main.js

@@ -119,7 +119,7 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
 
 {
   methods: _objectSpread({},
-  (0, _vuex.mapMutations)(['setOpenid', 'login', 'showDialog', 'setcode', 'islogionsuccess'])),
+  (0, _vuex.mapMutations)(['setOpenid', 'login', 'showDialog', 'setcode', 'islogionsuccess', 'beginload'])),
 
   computed: _objectSpread({},
   (0, _vuex.mapState)([
@@ -127,8 +127,10 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
   'userInfo', // 同意授权用户头像
   'successlogion', // 同意手机号授权 登录成功
   'sessionId', // 登录成功的token
-  'getcode' // logion时候获取的code session_key oppen_id
-  ])),
+  'getcode', // logion时候获取的code session_key oppen_id
+  'beginload'])),
+
+
 
   onLaunch: function onLaunch() {var _this = this;
     // 用户登录
@@ -146,6 +148,7 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
           that.login(userInfo);
           that.setcode(getcode);
           that.showDialog(true);
+          that.beginload(true);
           that.islogionsuccess(true);
         },
         fail: function fail() {
@@ -174,6 +177,7 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
                     that.setOpenid(token); // 保存用户token
                     that.islogionsuccess(true);
                   }
+                  that.beginload(true);
                   that.showDialog(false); // 没有同意授权头像等;
                   that.login(); // 清空用户头像信息
                 } });
@@ -207,10 +211,12 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
               if (token == '') {
                 _this.setOpenid(token); // 保存用户token
                 _this.islogionsuccess(false);
+
               } else {
                 _this.setOpenid(token); // 保存用户token
                 _this.islogionsuccess(true);
               }
+              _this.beginload(true);
               _this.showDialog(false); // 没有同意授权头像等;
               _this.login(); // 清空用户头像信息
 

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

@@ -113,6 +113,12 @@
 
 
 
+
+
+
+
+
+
 
 
 

文件差异内容过多而无法显示
+ 17 - 7
unpackage/dist/dev/mp-weixin/common/vendor.js


文件差异内容过多而无法显示
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/Dialog.js


文件差异内容过多而无法显示
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/Gobacktop.js


文件差异内容过多而无法显示
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/assess.js


文件差异内容过多而无法显示
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/commoNar.js


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

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["component/loginDialog"],{
 
-/***/ 266:
+/***/ 272:
 /*!****************************************************!*\
   !*** 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& */ 267);
-/* harmony import */ var _loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./loginDialog.vue?vue&type=script&lang=js& */ 269);
+/* harmony import */ var _loginDialog_vue_vue_type_template_id_67987460___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./loginDialog.vue?vue&type=template&id=67987460& */ 273);
+/* harmony import */ var _loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./loginDialog.vue?vue&type=script&lang=js& */ 275);
 /* harmony 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"
 
 /***/ }),
 
-/***/ 267:
+/***/ 273:
 /*!***********************************************************************************!*\
   !*** 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& */ 268);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_loginDialog_vue_vue_type_template_id_67987460___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./loginDialog.vue?vue&type=template&id=67987460& */ 274);
 /* harmony 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__);
 
 /***/ }),
 
-/***/ 268:
+/***/ 274:
 /*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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
 
 /***/ }),
 
-/***/ 269:
+/***/ 275:
 /*!*****************************************************************************!*\
   !*** 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& */ 270);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./loginDialog.vue?vue&type=script&lang=js& */ 276);
 /* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___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); 
 
 /***/ }),
 
-/***/ 270:
+/***/ 276:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/uinapp/myuinapp/component/loginDialog.vue?vue&type=script&lang=js& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -199,7 +199,7 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
     'component/loginDialog-create-component',
     {
         'component/loginDialog-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('1')['createComponent'](__webpack_require__(266))
+            __webpack_require__('1')['createComponent'](__webpack_require__(272))
         })
     },
     [['component/loginDialog-create-component']]

文件差异内容过多而无法显示
+ 15 - 15
unpackage/dist/dev/mp-weixin/component/mpvue-citypicker/mpvueCityPicker.js


文件差异内容过多而无法显示
+ 13 - 13
unpackage/dist/dev/mp-weixin/component/popup.js


文件差异内容过多而无法显示
+ 13 - 12
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="{{$root.l0}}" wx:for-item="product" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['goshop',['$0'],[[['productList','',index]]]]]]]}}" class="uni-product" bindtap="__e"><view class="image-view"><image class="uni-product-image" src="{{pictureUrl+'/uploads/home/store/goods/'+product.g0+'/'+product.$orig.goods_image}}"></image></view><view class="uni-product-title textover">{{product.$orig.goods_name}}</view><view class="uni-product-price"><text class="uni-product-price-original">{{"¥"+product.$orig.goods_marketprice}}</text><text class="uni-product-price-favour">{{"¥"+product.$orig.goods_costprice}}</text></view></view></block></view></view>
+<view class="page"><view class="uni-product-list"><block wx:for="{{$root.l0}}" wx:for-item="product" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['goshop',['$0'],[[['productList','',index]]]]]]]}}" style="padding:20rpx;" bindtap="__e"><view class="image-view"><image class="uni-product-image" src="{{pictureUrl+'/uploads/home/store/goods/'+product.g0+'/'+product.$orig.goods_image}}"></image></view><view class="uni-product-title textover">{{product.$orig.goods_name}}</view><view class="uni-product-price"><text class="uni-product-price-original" style="color:#D9332E!important;font-weight:bold;">{{"¥"+product.$orig.goods_price}}</text><text class="uni-product-price-favour">{{"¥"+product.$orig.goods_marketprice}}</text></view><block wx:if="{{product.$orig.goods_advword!=''}}"><view class="tags">{{product.$orig.goods_advword}}</view></block></view></block></view></view>

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

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

文件差异内容过多而无法显示
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/textarea.js


文件差异内容过多而无法显示
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/uinNumber.js


文件差异内容过多而无法显示
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/uinNumberCart.js


文件差异内容过多而无法显示
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/uni-icon/uni-icon.js


文件差异内容过多而无法显示
+ 13 - 13
unpackage/dist/dev/mp-weixin/component/uni-nav-bar/uni-nav-bar.js


文件差异内容过多而无法显示
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/uni-popup.js


文件差异内容过多而无法显示
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/uni-status-bar/uni-status-bar.js


文件差异内容过多而无法显示
+ 12 - 12
unpackage/dist/dev/mp-weixin/component/uploadImage.js


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

@@ -147,7 +147,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uniNavBar = function uniNavBar() {__webpack_require__.e(/*! require.ensure | component/uni-nav-bar/uni-nav-bar */ "component/uni-nav-bar/uni-nav-bar").then((function () {return resolve(__webpack_require__(/*! @/component/uni-nav-bar/uni-nav-bar.vue */ 252));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var uninumberbox = function uninumberbox() {__webpack_require__.e(/*! require.ensure | component/uinNumberCart */ "component/uinNumberCart").then((function () {return resolve(__webpack_require__(/*! @/component/uinNumberCart.vue */ 297));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uniNavBar = function uniNavBar() {__webpack_require__.e(/*! require.ensure | component/uni-nav-bar/uni-nav-bar */ "component/uni-nav-bar/uni-nav-bar").then((function () {return resolve(__webpack_require__(/*! @/component/uni-nav-bar/uni-nav-bar.vue */ 268));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var uninumberbox = function uninumberbox() {__webpack_require__.e(/*! require.ensure | component/uinNumberCart */ "component/uinNumberCart").then((function () {return resolve(__webpack_require__(/*! @/component/uinNumberCart.vue */ 313));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

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

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

文件差异内容过多而无法显示
+ 28 - 15
unpackage/dist/dev/mp-weixin/pages/index/feedback.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/hotel.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/hotel.wxml


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

@@ -17,7 +17,7 @@
         background:rgba(0,0,0,0.2)!important;
 }
 .swiper.data-v-5ac9c6cd {
-        height: 300rpx;
+        height: 380rpx;
 }
 .swiper-item.data-v-5ac9c6cd {
         display: block;
@@ -47,10 +47,11 @@
         -webkit-box-flex: 1;
         -webkit-flex: 1;
                 flex: 1;
-        width: 20%;
-        min-width: 20%;
-        max-width: 20%;
-        margin: 24rpx 0 25rpx 4%;
+        width: 16%;
+        min-width: 16%;
+        max-width: 16%;
+        /* margin: 24rpx 0 25rpx 4%; */
+		margin: 24rpx 2%;
 }
 .active.data-v-5ac9c6cd {
         color: #F76260;

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

@@ -131,7 +131,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var shopList = function shopList() {__webpack_require__.e(/*! require.ensure | component/shopList */ "component/shopList").then((function () {return resolve(__webpack_require__(/*! @/component/shopList.vue */ 285));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var shopList = function shopList() {__webpack_require__.e(/*! require.ensure | component/shopList */ "component/shopList").then((function () {return resolve(__webpack_require__(/*! @/component/shopList.vue */ 301));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var Gobacktop = function Gobacktop() {__webpack_require__.e(/*! require.ensure | component/Gobacktop */ "component/Gobacktop").then((function () {return resolve(__webpack_require__(/*! @/component/Gobacktop.vue */ 287));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 
@@ -200,13 +200,18 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-// 商品列表	
-var _default = {
+
+
+
+
+{
   components: {
-    shopList: shopList },
+    shopList: shopList,
+    Gobacktop: Gobacktop },
 
   data: function data() {
     return {
+      isTop: 0,
       isprice: 0,
       goods_list: [],
       scrollTop: 0,
@@ -242,16 +247,24 @@ var _default = {
     this.hotelsecondmenu(); // 二级菜单
   },
   methods: {
+    getop: function getop() {
+      this.scrollTop = this.old.scrollTop;
+      this.$nextTick(function () {
+        this.scrollTop = 0;
+      });
+      this.isTop = false;
+    },
     choseType: function choseType(e) {
       this.page = 1;
       this.tabIndex = e;
-      this.goods_list = [];
+      //this.goods_list = [];
       if (this.tabIndex == 1) {// 服务
         this.istopclick = 0;
         this.isprice = 0;
         this.gc_id_2 = '';
         this.goods_price = '';
         this.goods_commonid = '';
+        this.getshopdetail(2);
       } else if (this.tabIndex == 2) {//伤
         this.chosegoods_price = true;
         console.log(this.chosegoods_commonid);
@@ -261,6 +274,7 @@ var _default = {
         this.goods_commonid = this.chosegoods_commonid ? 'asc' : 'desc';
         //this.gc_id_1 = '';
         this.chosegoods_commonid = !this.chosegoods_commonid;
+        this.getshopdetail(2);
       } else if (this.tabIndex == 3) {// 价格
         this.chosegoods_commonid = true;
         console.log(this.chosegoods_price);
@@ -270,6 +284,7 @@ var _default = {
         this.istopclick = 0;
         //this.gc_id_1 = '';
         this.chosegoods_price = !this.chosegoods_price;
+        this.getshopdetail(2);
       } else if (this.tabIndex == 4) {// 分类
         this.istopclick = 0;
         this.isprice = 0;
@@ -277,8 +292,9 @@ var _default = {
         this.goods_commonid = '';
         this.chosegoods_price = true;
         this.chosegoods_commonid = true;
+        console.log(this.goods_list);
       }
-      this.getshopdetail();
+
     },
 
     // 点击图标上下筛选切换
@@ -288,12 +304,11 @@ var _default = {
     confirm: function confirm(e) {
       console.log(e);
       this.tabIndex = 0;
-      console.log(this.tabIndex);
       this.gc_id_2 = e.gc_id;
-      this.getshopdetail();
+      this.getshopdetail(2);
     },
     // 获取商品详情
-    getshopdetail: function getshopdetail() {
+    getshopdetail: function getshopdetail(e) {
       var _this = this;
       this.request({
         url: "/v2/entry/storeGoods",
@@ -312,6 +327,9 @@ var _default = {
           } else {
             _this.ispill = false;
           }
+          if (e == 2) {
+            _this.goods_list = [];
+          }
           _this.goods_list = _this.goods_list.concat(res.data.data.goods_list);
         } });
 
@@ -349,6 +367,11 @@ var _default = {
 
     // 滚动时触发
     scroll: function scroll(e) {
+      if (e.detail.scrollTop > 400) {
+        this.isTop = true;
+      } else {//当距离小于500时显示回到顶部按钮
+        this.isTop = false;
+      }
       this.old.scrollTop = e.detail.scrollTop;
     } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))

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

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

文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/hoteldetail.wxml


文件差异内容过多而无法显示
+ 15 - 15
unpackage/dist/dev/mp-weixin/pages/index/hotelsearch.js


文件差异内容过多而无法显示
+ 1 - 0
unpackage/dist/dev/mp-weixin/pages/index/index.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/index.wxml


文件差异内容过多而无法显示
+ 15 - 15
unpackage/dist/dev/mp-weixin/pages/index/searchresult.js


文件差异内容过多而无法显示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/shop.js


文件差异内容过多而无法显示
+ 21 - 19
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"],{
 
-/***/ 195:
+/***/ 211:
 /*!************************************************************************!*\
   !*** 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 */ 196));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
+var _Settled = _interopRequireDefault(__webpack_require__(/*! ./pages/myCenter/Settled.vue */ 212));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"]))
 
 /***/ }),
 
-/***/ 196:
+/***/ 212:
 /*!*****************************************************!*\
   !*** 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& */ 197);
-/* harmony import */ var _Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Settled.vue?vue&type=script&lang=js& */ 199);
+/* harmony import */ var _Settled_vue_vue_type_template_id_dfc9d076___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Settled.vue?vue&type=template&id=dfc9d076& */ 213);
+/* harmony import */ var _Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Settled.vue?vue&type=script&lang=js& */ 215);
 /* harmony 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"
 
 /***/ }),
 
-/***/ 197:
+/***/ 213:
 /*!************************************************************************************!*\
   !*** 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& */ 198);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_template_id_dfc9d076___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./Settled.vue?vue&type=template&id=dfc9d076& */ 214);
 /* harmony 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__);
 
 /***/ }),
 
-/***/ 198:
+/***/ 214:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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
 
 /***/ }),
 
-/***/ 199:
+/***/ 215:
 /*!******************************************************************************!*\
   !*** 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& */ 200);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./Settled.vue?vue&type=script&lang=js& */ 216);
 /* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___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); 
 
 /***/ }),
 
-/***/ 200:
+/***/ 216:
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/uinapp/myuinapp/pages/myCenter/Settled.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -129,7 +129,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 318));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 334));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 
@@ -254,5 +254,5 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ })
 
-},[[195,"common/runtime","common/vendor"]]]);
+},[[211,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/myCenter/Settled.js.map

文件差异内容过多而无法显示
+ 15 - 15
unpackage/dist/dev/mp-weixin/pages/myCenter/applyfor.js


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

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pages/myCenter/business"],{
 
-/***/ 215:
+/***/ 231:
 /*!*************************************************************************!*\
   !*** 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 */ 216));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
+var _business = _interopRequireDefault(__webpack_require__(/*! ./pages/myCenter/business.vue */ 232));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"]))
 
 /***/ }),
 
-/***/ 216:
+/***/ 232:
 /*!******************************************************!*\
   !*** 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& */ 217);
-/* harmony import */ var _business_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./business.vue?vue&type=script&lang=js& */ 219);
+/* harmony import */ var _business_vue_vue_type_template_id_626f98f8___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./business.vue?vue&type=template&id=626f98f8& */ 233);
+/* harmony import */ var _business_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./business.vue?vue&type=script&lang=js& */ 235);
 /* harmony 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"
 
 /***/ }),
 
-/***/ 217:
+/***/ 233:
 /*!*************************************************************************************!*\
   !*** 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& */ 218);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_business_vue_vue_type_template_id_626f98f8___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./business.vue?vue&type=template&id=626f98f8& */ 234);
 /* harmony 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__);
 
 /***/ }),
 
-/***/ 218:
+/***/ 234:
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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
 
 /***/ }),
 
-/***/ 219:
+/***/ 235:
 /*!*******************************************************************************!*\
   !*** 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& */ 220);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_business_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./business.vue?vue&type=script&lang=js& */ 236);
 /* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_business_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___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); 
 
 /***/ }),
 
-/***/ 220:
+/***/ 236:
 /*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/uinapp/myuinapp/pages/myCenter/business.vue?vue&type=script&lang=js& ***!
   \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -162,5 +162,5 @@ var _default =
 
 /***/ })
 
-},[[215,"common/runtime","common/vendor"]]]);
+},[[231,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/myCenter/business.js.map

文件差异内容过多而无法显示
+ 14 - 14
unpackage/dist/dev/mp-weixin/pages/myCenter/commentback.js


部分文件因为文件数量过多而无法显示